Merge lp:~mzanetti/ubuntu-system-settings/drop-reboot-label-in-launcher-reset into lp:ubuntu-system-settings

[Michael Zanetti]

Drop reboot notification label on launcher reset.

Should land together with https://code.launchpad.net/~mzanetti/unity8/launcher-update-on-dconf-change/+merge/236561

[Sebastien Bacher (seb128)]

Thanks, let's try to have it in a silo with the corresponding unity changes then (or land it after unity8), though it's only a label so it wouldn't be too buggy to land it out of sync

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1099
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1593/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5422
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3887
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/785
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5127
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6674
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6674/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14058
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3264
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4204
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4204/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/reset/ResetLauncherHome.qml'
--- plugins/reset/ResetLauncherHome.qml	2014-10-02 13:10:35 +0000
+++ plugins/reset/ResetLauncherHome.qml	2014-10-02 13:10:35 +0000
@@ -55,11 +55,5 @@
             text: i18n.tr("Cancel")
             onClicked: PopupUtils.close(dialog)
         }
-        Label {
-            text: i18n.tr("The phone needs to restart for changes to take effect.")
-            width: parent.width
-            wrapMode: Text.Wrap
-            horizontalAlignment: Text.AlignHCenter
-        }
     }
 }