camera-app

Merge lp://staging/~unity-api-team/camera-app/infographics-translations into lp://staging/camera-app

  1. infographics-translations
  2. Merge into trunk
Proposed by Pete Woods
Status: Needs review
Proposed branch: lp://staging/~unity-api-team/camera-app/infographics-translations
Merge into: lp://staging/camera-app
Diff against target: 38 lines (+5/-5)
2 files modified
camera-app.qml (+4/-4)
po/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp://staging/~unity-api-team/camera-app/infographics-translations
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+250616@code.staging.launchpad.net

Commit message

Perform infographic translations server-side, instead of client-side

Description of the change

Perform infographic translations server-side, instead of client-side

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:519
http://jenkins.qa.ubuntu.com/job/camera-app-ci/393/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/89/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/89/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/89/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/159
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/638/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/793
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/363
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18272
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/752/console

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

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Florian Boucault (fboucault) wrote :

Thanks Pete!
Any chance you could fix https://bugs.launchpad.net/camera-app/+bug/1323373 while you are at it? :)

Reply

Unmerged revisions

519. By Pete Woods

Tag infographic strings for extraction, rather than translate directly

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