Merge lp:~mpt/ubuntu-system-settings/1359344-restart-install into lp:ubuntu-system-settings

[Matthew Paul Thomas]

Changes "Install & Restart" to "Restart & Install" and "Not Now" to "Cancel". lp:1359344

Fixes bug 1359344 by changing "Install & Restart" to "Restart & Install". Also changes "Not Now" to "Cancel".

[Sebastien Bacher (seb128)]

Thanks Matthew

review: Approve

[Jonas G. Drange (jonas-drange)]

LGTM!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1450
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2167/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/200
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/28
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/134
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/200
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/200/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21543

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1450
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2169/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/203
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/30
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/136
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/203
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/203/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21545

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

review: Needs Fixing (continuous-integration)

[Matthew Paul Thomas (mpt)]

I don't understand those failures, or why they're different from one test run to the next. The only one I can see that might possibly have been caused by this change is ubuntu_system_settings.tests.test_system_updates.SystemUpdatesTestCases.test_no_updates_state, but even that seems implausible, and "_StringException: Binary content: FailedTestScreenshot (image/png)" is useless for telling what went wrong.

[Sebastien Bacher (seb128)]

@Matthew, the tests have started to be unreliable due to what might be an unity8 issue, that has been reported as bug #1468029 and is being investigated, the errors are probably not due to your changes there

=== modified file 'plugins/system-update/PageComponent.qml'
--- plugins/system-update/PageComponent.qml	2015-05-01 18:06:27 +0000
+++ plugins/system-update/PageComponent.qml	2015-06-29 13:13:25 +0000
@@ -96,7 +96,7 @@
              text: root.batterySafeForUpdate ? i18n.tr("The phone needs to restart to install the system update.") : i18n.tr("Connect the phone to power before installing the system update.")
 
              Button {
-                 text: i18n.tr("Install & Restart")
+                 text: i18n.tr("Restart & Install")
                  visible: root.batterySafeForUpdate ? true : false
                  color: UbuntuColors.orange
                  onClicked: {
@@ -106,7 +106,7 @@
                  }
              }
              Button {
-                 text: i18n.tr("Not Now")
+                 text: i18n.tr("Cancel")
                  color: UbuntuColors.warmGrey
                  onClicked: {
                      updateList.currentIndex = 0;