Merge lp:~mzanetti/unity8/launcher-quicklist-wording into lp:unity8

[Michael Zanetti]

change wording in launcher quicklist

 * 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?

no

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

design review requested

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:978
http://jenkins.qa.ubuntu.com/job/unity8-ci/3194/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1093
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/198
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/288
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/288
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/288/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/288
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1461
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1913
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1913/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8719

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

review: Needs Fixing (continuous-integration)

[Ying-Chun Liu (paulliu)]

Tested. Good.

review: Approve

[Ying-Chun Liu (paulliu)]

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

 * Did CI run pass? If not, please explain why.

No. Don't know why.

[Michał Sawicz (saviq)]

All the failures were known and are fixed in trunk now (except for the Shell one).

[lp:~mzanetti/unity8/launcher-quicklist-wording]

979. By Michael Zanetti on 2014-07-01

merge trunk

=== modified file 'plugins/Unity/Launcher/launcheritem.cpp'
--- plugins/Unity/Launcher/launcheritem.cpp	2014-06-11 15:36:51 +0000
+++ plugins/Unity/Launcher/launcheritem.cpp	2014-07-01 10:44:21 +0000
@@ -40,7 +40,7 @@
     m_quickList->appendAction(nameAction);
     QuickListEntry pinningAction;
     pinningAction.setActionId("pin_item");
-    pinningAction.setText(gettext("Lock to Launcher"));
+    pinningAction.setText(gettext("Pin shortcut"));
     m_quickList->appendAction(pinningAction);
 }
 
@@ -70,7 +70,7 @@
         m_pinned = pinned;
         QuickListEntry entry;
         entry.setActionId("pin_item");
-        entry.setText(pinned ? gettext("Unlock from Launcher") : gettext("Lock to Launcher"));
+        entry.setText(pinned ? gettext("Unpin shortcut") : gettext("Pin shortcut"));
         m_quickList->updateAction(entry);
         Q_EMIT pinnedChanged(pinned);
     }