ubuntu-system-settings

Merge lp://staging/~dobey/ubuntu-system-settings/fix-settings-i18n into lp://staging/ubuntu-system-settings

  1. fix-settings-i18n
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: Ken VanDine
Approved revision: 1616
Merged at revision: 1619
Proposed branch: lp://staging/~dobey/ubuntu-system-settings/fix-settings-i18n
Merge into: lp://staging/ubuntu-system-settings
Diff against target: 25 lines (+3/-4)
1 file modified
po/CMakeLists.txt (+3/-4)
To merge this branch: bzr merge lp://staging/~dobey/ubuntu-system-settings/fix-settings-i18n
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ken VanDine Needs Fixing
Review via email: mp+289079@code.staging.launchpad.net

Commit message

Fix the CMakeLists.txt to handle settings.js generation and translations better.

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

You should drop the changes to the pot file from the branch

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

FAILED: Continuous integration, rev:1615
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2662/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6771/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/436
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/845
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5136/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6782
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6782/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28034

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2662/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~dobey/ubuntu-system-settings/fix-settings-i18n updated
1616. By dobey

Revert the pot file update.

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

FAILED: Continuous integration, rev:1616
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2665/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6776/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/439
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/848
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5138/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6787
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6787/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28039

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2665/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