Merge lp:~seb128/ubuntu-system-settings/security-translation-context into lp:ubuntu-system-settings

[Sebastien Bacher]

[security] give a translation context to the 'None' string

[security] give a translation context to the 'None' string

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:982
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1357/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4318
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3238
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/549
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4120
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5570
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5570/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12467
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2655
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3531
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3531/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Wouldn't the string "Swipe" make more sense than "None"? It's commonly referred to as "Swipe to unlock", I'd prefer to change the string, but I know it's pretty late for that. thoughts?

[Sebastien Bacher (seb128)]

That's what the design recommends, better to check with mpt I guess

[Ken VanDine (ken-vandine)]

I'll +1 the change

review: Approve

=== modified file 'plugins/security-privacy/PhoneLocking.qml'
--- plugins/security-privacy/PhoneLocking.qml	2014-08-28 18:11:36 +0000
+++ plugins/security-privacy/PhoneLocking.qml	2014-09-02 09:49:38 +0000
@@ -42,7 +42,7 @@
         anchors.right: parent.right
 
         ListItem.SingleValue {
-            property string swipe: i18n.tr("None")
+            property string swipe: qsTr("None", "Unlock with swipe")
             property string passcode: i18n.tr("PIN code")
             property string passphrase: i18n.tr("Passphrase")
 

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