content-hub

Merge lp://staging/~seb128/content-hub/update-translations-template into lp://staging/content-hub

  1. update-translations-template
  2. Merge into trunk
Proposed by Sebastien Bacher
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 153
Merged at revision: 149
Proposed branch: lp://staging/~seb128/content-hub/update-translations-template
Merge into: lp://staging/content-hub
Diff against target: 139 lines (+19/-12)
5 files modified
debian/rules (+3/-0)
import/Ubuntu/Content/ContentPeerPicker10.qml (+5/-5)
import/Ubuntu/Content/ContentPeerPicker11.qml (+5/-5)
import/Ubuntu/Content/ContentTransferHint.qml (+2/-2)
po/POTFILES.in (+4/-0)
To merge this branch: bzr merge lp://staging/~seb128/content-hub/update-translations-template
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ken VanDine Approve
Review via email: mp+238003@code.staging.launchpad.net

Commit message

Include missing sources in the translation template, use the custom rule to update it and load the translations from the correct domain

Description of the change

Include missing sources in the translation template, use the custom rule to update it and load the translations from the correct domain

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Thanks, looks good.

review: Approve
lp://staging/~seb128/content-hub/update-translations-template updated
152. By Sebastien Bacher

it's building out of srcdir

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

FAILED: Continuous integration, rev:151
http://jenkins.qa.ubuntu.com/job/content-hub-ci/199/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-amd64-ci/56/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/56/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-i386-ci/56/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/199/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~seb128/content-hub/update-translations-template updated
153. By Sebastien Bacher

don't copy back the pot, it's not needed

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

PASSED: Continuous integration, rev:153
http://jenkins.qa.ubuntu.com/job/content-hub-ci/200/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-amd64-ci/57
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/57
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/57/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-i386-ci/57

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/200/rebuild

review: Approve (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