indicator-power

Merge lp://staging/~dobey/indicator-power/fix-i18n into lp://staging/indicator-power

  1. fix-i18n
  2. Merge into trunk.16.10
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 307
Merged at revision: 307
Proposed branch: lp://staging/~dobey/indicator-power/fix-i18n
Merge into: lp://staging/indicator-power
Prerequisite: lp://staging/~dobey/indicator-power/fix-coverage
Diff against target: 327 lines (+236/-48)
6 files modified
.bzrignore (+4/-0)
cmake/Translations.cmake (+0/-37)
debian/control (+3/-4)
po/CMakeLists.txt (+12/-3)
po/POTFILES.in (+0/-4)
po/indicator-power.pot (+217/-0)
To merge this branch: bzr merge lp://staging/~dobey/indicator-power/fix-i18n
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
Pete Woods (community) Approve
unity-api-1-bot continuous-integration Approve
Review via email: mp+316624@code.staging.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:307
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-power-ci/9/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1625
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1632
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1410
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1410/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1410
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1410/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1410
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1410/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1410
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1410/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1410
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1410/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1410
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1410/artifact/output/*zip*/output.zip

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

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

I still have the reservations that we discussed in IRC, but it's not a dealbreaker. I'm more interested in us handling things in a consistent way across repos and these branches improve that story

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