ubuntu-system-settings

Merge lp://staging/~seb128/ubuntu-system-settings/translations into lp://staging/ubuntu-system-settings

  1. translations
  2. Merge into trunk
Proposed by Sebastien Bacher
Status: Merged
Approved by: Ken VanDine
Approved revision: 50
Merged at revision: 50
Proposed branch: lp://staging/~seb128/ubuntu-system-settings/translations
Merge into: lp://staging/ubuntu-system-settings
Diff against target: 415 lines (+296/-36)
10 files modified
debian/ubuntu-system-settings.install (+1/-0)
plugins/about/about.settings (+1/-1)
plugins/flight-mode/flight-mode.settings (+1/-1)
plugins/orientation-lock/orientation-lock.settings (+1/-1)
po/Makefile (+0/-31)
po/fr.po (+106/-0)
po/po.pro (+75/-0)
po/ubuntu-system-settings.pot (+106/-0)
src/qml/MainWindow.qml (+4/-1)
src/system-settings.pro (+1/-1)
To merge this branch: bzr merge lp://staging/~seb128/ubuntu-system-settings/translations
Reviewer Review Type Date Requested Status
Ken VanDine Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+169249@code.staging.launchpad.net

Commit message

setings: set up for translations

Use "ubuntu-system-settings" for the domain, better to namespace to avoid
name conflicts since all the translation are installed in the same directory.

The po.pro will make the translation be compiled and installed on build,
there is also a "make pot" target to refresh the template.

This commit also includes a first translation (fr.po) which was used
to test that things are working correctly.

Description of the change

setings: set up for translations

Use "ubuntu-system-settings" for the domain, better to namespace to avoid
name conflicts since all the translation are installed in the same directory.

The po.pro will make the translation be compiled and installed on build,
there is also a "make pot" target to refresh the template.

This commit also includes a first translation (fr.po) which was used
to test that things are working correctly.

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

PASSED: Continuous integration, rev:49
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/17

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

review: Approve (continuous-integration)
lp://staging/~seb128/ubuntu-system-settings/translations updated
50. By Sebastien Bacher

settings: set domain before swapping the page, it's cleaner this way

Revision history for this message
Sebastien Bacher (seb128) wrote :

Alberto pointed out that it's cleaner to set the domain before pushing the page, did that in r50

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

PASSED: Continuous integration, rev:50
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/18/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/18

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

review: Approve (continuous-integration)
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Please add --with translations in rules and dh-translations builddep, then it's good to go!

review: Needs Fixing
Revision history for this message
Sebastien Bacher (seb128) wrote :

hum, that will not work with the qmake build system, dh-translations is intltool centric and knows about autotools and cmake build systems... that's a good idea and I will look at making that work, but please don't block that merge on that, that's blocking other merges and making my work on other branches harder

Revision history for this message
Ken VanDine (ken-vandine) wrote :

Ok, dh-translations doesn't play well with custom packages like this yet, so lets not block on that.

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