Merge lp:~unity-team/ubuntu-settings-components/local-translation-update into lp:~registry/ubuntu-settings-components/trunk

[Nick Dedekind]

Fixed ModemInfoItem translation to use ubuntu-settings-components domain.

Fixed ModemInfoItem translation to use ubuntu-settings-components domain.

[Nick Dedekind (nick-dedekind)]

Unfortunately we loose all unity8 translations of this now... can they be transfered across easily?

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:112
https://unity8-jenkins.ubuntu.com/job/lp-ubuntu-settings-components-ci/18/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/960
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/976
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/976
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/974
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/974/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/974
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/974/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/974
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/974/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/974
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/974/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/974
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/974/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/974
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/974/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-ubuntu-settings-components-ci/18/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:112
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/145/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-vivid/70
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-amd64-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/52
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/52/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~unity-team/ubuntu-settings-components/local-translation-update]

113. By Nick Dedekind on 2016-03-17

merged trunk

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:114
https://unity8-jenkins.ubuntu.com/job/lp-ubuntu-settings-components-ci/19/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1004
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1020
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1020
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1018
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1018/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/1018
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/1018/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1018
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1018/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/1018
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/1018/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1018
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1018/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/1018
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/1018/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-ubuntu-settings-components-ci/19/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:114
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/148/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-vivid/73
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-amd64-ci/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/55
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/55/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Jonas G. Drange (jonas-drange)]

LGTM

review: Approve

[Michael Zanetti (mzanetti)]

+1, however we can't land this before OTA-10 as we're in string freeze

review: Approve

[Michael Zanetti (mzanetti)]

> +1, however we can't land this before OTA-10 as we're in string freeze

ok. scratch this... looks like this doesn't kill existing translation like mentioned in comment one.

[Lukáš Tinkl (lukas-kde)]

We need to land this to fix lpbug:#1560039

[lp:~unity-team/ubuntu-settings-components/local-translation-update]

114. By Michał Sawicz on 2016-05-05

Merge trunk

=== modified file 'plugins/Ubuntu/Settings/Menus/ModemInfoItem.qml'
--- plugins/Ubuntu/Settings/Menus/ModemInfoItem.qml	2016-01-27 13:13:15 +0000
+++ plugins/Ubuntu/Settings/Menus/ModemInfoItem.qml	2016-05-05 17:35:58 +0000
@@ -97,7 +97,7 @@
                         id: labelRoaming
                         elide: Text.ElideRight
                         fontSize: "x-small"
-                        text: i18n.tr("Roaming")
+                        text: i18n.dtr("ubuntu-settings-components", "Roaming")
                         opacity: 0.6
                     }
 
@@ -119,7 +119,7 @@
             objectName: "buttonUnlockSim"
             visible: menu.locked
 
-            text: i18n.tr("Unlock SIM")
+            text: i18n.dtr("ubuntu-settings-components", "Unlock SIM")
             Layout.preferredWidth: implicitWidth + units.gu(5)
 
             onTriggered: menu.unlock()