Indicator Display

Merge lp://qastaging/~dobey/indicator-display/fix-i18n into lp://qastaging/indicator-display

  1. fix-i18n
  2. Merge into trunk.16.10
Proposed by dobey
Status: Merged
Approved by: Charles Kerr
Approved revision: 25
Merged at revision: 27
Proposed branch: lp://qastaging/~dobey/indicator-display/fix-i18n
Merge into: lp://qastaging/indicator-display
Diff against target: 125 lines (+58/-42)
5 files modified
.bzrignore (+3/-0)
cmake/Translations.cmake (+0/-37)
po/CMakeLists.txt (+12/-3)
po/POTFILES.in (+0/-2)
po/indicator-display.pot (+43/-0)
To merge this branch: bzr merge lp://qastaging/~dobey/indicator-display/fix-i18n
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
Pete Woods (community) Approve
Ted Gould (community) Needs Information
unity-api-1-bot continuous-integration Approve
Review via email: mp+316599@code.qastaging.launchpad.net

Commit message

Use intltool support from cmake-extras.

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:25
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-display-ci/24/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1615
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1622
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1400
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1400/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1400
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1400/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1400
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1400/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1400
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1400/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1400
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1400/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1400
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1400/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-display-ci/24/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ted Gould (ted) wrote :

Since we're seeded I don't think we need to commit the pot file and merge translations. They'll get stripped and replaced with lang packs anyway.

review: Needs Information
Revision history for this message
dobey (dobey) wrote :

> Since we're seeded I don't think we need to commit the pot file and merge
> translations. They'll get stripped and replaced with lang packs anyway.

Having the template committed and launchpad translations set up, is standard practice, and this does not quite happen for PPAs, which one of our primary distribution points is.

Revision history for this message
Pete Woods (pete-woods) :
review: Approve
Revision history for this message
Charles Kerr (charlesk) :
review: Approve

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