camera-app

Merge lp://staging/~fboucault/camera-app/make_options_strings_translatable into lp://staging/camera-app

  1. make_options_strings_translatable
  2. Merge into trunk
Proposed by Florian Boucault
Status: Merged
Approved by: Florian Boucault
Approved revision: 382
Merged at revision: 386
Proposed branch: lp://staging/~fboucault/camera-app/make_options_strings_translatable
Merge into: lp://staging/camera-app
Diff against target: 211 lines (+45/-26)
4 files modified
OptionsOverlay.qml (+1/-1)
ViewFinderOverlay.qml (+10/-10)
po/CMakeLists.txt (+1/-0)
po/camera-app.pot (+33/-15)
To merge this branch: bzr merge lp://staging/~fboucault/camera-app/make_options_strings_translatable
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Víctor R. Ruiz (community) Approve
Review via email: mp+233504@code.staging.launchpad.net

Commit message

Mark options strings for translation.

To post a comment you must log in.
Revision history for this message
Víctor R. Ruiz (vrruiz) wrote :

Looks good to me.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:382
http://jenkins.qa.ubuntu.com/job/camera-app-ci/284/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/100
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/100/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/100
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/357/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3346
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/496/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/561
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12727
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2752
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3648
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3648/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/284/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches