Merge lp:~seb128/ubuntu-system-settings/security-use-ctr into lp:ubuntu-system-settings

[Sebastien Bacher]

security: use new i18n.ctr rather than qsTr which doesn't use gettext

security: use new i18n.ctr rather than qsTr which doesn't use gettext

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1292
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1960/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1190
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/230
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1051
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1188
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1188/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17805

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

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Thanks!

review: Approve

[lp:~seb128/ubuntu-system-settings/security-use-ctr]

1293. By Sebastien Bacher on 2015-02-09

the argument is after the context

1294. By Sebastien Bacher on 2015-02-09

use matching syntax

=== modified file 'debian/control'
--- debian/control	2015-01-30 18:09:06 +0000
+++ debian/control	2015-02-09 15:43:26 +0000
@@ -76,7 +76,7 @@
          qtdeclarative5-systeminfo-plugin,
          qtdeclarative5-ubuntu-content1,
          qtdeclarative5-ubuntu-settings-components (>> 0.2),
-         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),
+         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1347) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1347),
          suru-icon-theme,
          whoopsie-preferences (>= 0.9),
          libsystemsettings1 (= ${binary:Version}),

=== modified file 'plugins/security-privacy/PhoneLocking.qml'
--- plugins/security-privacy/PhoneLocking.qml	2014-11-04 12:08:12 +0000
+++ plugins/security-privacy/PhoneLocking.qml	2015-02-09 15:43:26 +0000
@@ -42,7 +42,7 @@
         anchors.right: parent.right
 
         ListItem.SingleValue {
-            property string swipe: qsTr("None", "Unlock with swipe")
+            property string swipe: i18n.ctr("Unlock with swipe", "None")
             property string passcode: i18n.tr("Passcode")
             property string passphrase: i18n.tr("Passphrase")
 

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2014-09-11 16:08:04 +0000
+++ po/CMakeLists.txt	2015-02-09 15:43:26 +0000
@@ -42,7 +42,7 @@
                             --copyright=\"Canonical Ltd.\"
                             --package-name ubuntu-system-settings
                             --qt --c++ --add-comments=TRANSLATORS
-                            --keyword=QT_TR_NOOP --keyword=qsTr:1,2c
+                            --keyword=QT_TR_NOOP --keyword=ctr:1c,2
                             --keyword=tr --keyword=tr:1,2 --from-code=UTF-8
                             ${QMLFILES} "${CMAKE_CURRENT_BINARY_DIR}/settings.js"
     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"