Merge lp:~lukas-kde/unity8/removePhoneMentions into lp:unity8

[Lukáš Tinkl]

Replace the word "phone" with a more generic term "device" in the welcome wizard

Replace the word "phone" with a more generic term "device" in the welcome wizard

* Are there any related MPs required for this MP to build/function as expected? Please list.

No

* Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

* Did you make sure that your branch does not contain spurious tags?

Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

Yes

* If you changed the UI, has there been a design review?

Yes

[lp:~lukas-kde/unity8/removePhoneMentions]

2174. By Lukáš Tinkl on 2016-02-09

also the screenlock page

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
just a string change agreed with design
 * Did CI run pass? If not, please explain why.
 * Did you make sure that the branch does not contain spurious tags?
clean

review: Approve

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

FAILED: Continuous integration, rev:2173
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/296/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/417/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/440
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/458
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/458
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/454
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/454/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/454/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/454
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/454/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/454/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/454
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/454/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/454/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/296/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2173
http://jenkins.qa.ubuntu.com/job/unity8-ci/7238/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6385
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/653/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1943
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/646/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1838
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1838
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/645/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/644/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4896
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6396
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6396/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27410
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/651/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7238/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'qml/Wizard/Pages/10-welcome.qml'
--- qml/Wizard/Pages/10-welcome.qml	2015-07-15 15:07:19 +0000
+++ qml/Wizard/Pages/10-welcome.qml	2016-02-09 12:36:40 +0000
@@ -41,7 +41,7 @@
             anchors.left: parent.left
             anchors.right: parent.right
             wrapMode: Text.Wrap
-            text: i18n.tr("Welcome to your Ubuntu phone.")
+            text: i18n.tr("Welcome to your Ubuntu device.")
         }
 
         Label {

=== modified file 'qml/Wizard/Pages/30-passwd-type.qml'
--- qml/Wizard/Pages/30-passwd-type.qml	2016-01-07 20:14:56 +0000
+++ qml/Wizard/Pages/30-passwd-type.qml	2016-02-09 12:36:40 +0000
@@ -76,7 +76,7 @@
             anchors.left: parent.left
             anchors.right: parent.right
             wrapMode: Text.Wrap
-            text: i18n.tr("Please select how you’d like to unlock your phone.")
+            text: i18n.tr("Please select how you’d like to unlock your device.")
         }
 
         ItemSelector {

=== modified file 'qml/Wizard/Pages/80-finished.qml'
--- qml/Wizard/Pages/80-finished.qml	2015-07-15 15:07:19 +0000
+++ qml/Wizard/Pages/80-finished.qml	2016-02-09 12:36:40 +0000
@@ -43,7 +43,7 @@
             anchors.left: parent.left
             anchors.right: parent.right
             wrapMode: Text.Wrap
-            text: i18n.tr("Your phone is now ready to use.")
+            text: i18n.tr("Your device is now ready to use.")
         }
     }