Merge lp:~aacid/unity8/no_preview_in_preview_title into lp:unity8

[Albert Astals Cid]

Drop the " Preview" suffix from Preview title

As requested in https://bugs.launchpad.net/unity8/+bug/1316671

* Are there any related MPs required for this MP to build/function as expected?
 Prerequisite Branch

* 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?
N/A

 * If you changed the UI, has there been a design review?
It's a design driven change.

[Michał Sawicz (saviq)]

 * 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.
Not yet.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:968
http://jenkins.qa.ubuntu.com/job/unity8-ci/3126/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/843/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1864/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/220
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/220
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/220/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/220/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1257/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1543
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1543/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8379

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:968
http://jenkins.qa.ubuntu.com/job/unity8-ci/3134/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/858
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/138
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/228
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/228
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/228/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/228
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1272
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1583
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1583/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8417

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:968
http://jenkins.qa.ubuntu.com/job/unity8-ci/3144/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/871
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/148
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/238
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/238
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/238/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/238
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1282
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1600
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1600/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8434

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

review: Approve (continuous-integration)

=== modified file 'po/unity8.pot'
--- po/unity8.pot	2014-05-27 20:48:17 +0000
+++ po/unity8.pot	2014-06-13 07:58:33 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: unity8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-27 22:48+0200\n"
+"POT-Creation-Date: 2014-06-13 09:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -72,10 +72,35 @@
 "phone<br><br>Tap on the screen to start"
 msgstr ""
 
+#: qml/Components/Lockscreen.qml:214
+msgid "Emergency Call"
+msgstr ""
+
+#: qml/Components/Lockscreen.qml:231
+msgid "OK"
+msgstr ""
+
 #: qml/Components/PageHeader.qml:365
 msgid "Recent searches"
 msgstr ""
 
+#: qml/Components/PassphraseLockscreen.qml:60
+#, qt-format
+msgid "Hello %1"
+msgstr ""
+
+#: qml/Components/PassphraseLockscreen.qml:60
+msgid "Hello"
+msgstr ""
+
+#: qml/Components/PinLockscreen.qml:198
+msgid "CANCEL"
+msgstr ""
+
+#: qml/Components/PinLockscreen.qml:216
+msgid "DONE"
+msgstr ""
+
 #: qml/Components/SeeMore.qml:35
 msgid "See more"
 msgstr ""
@@ -88,11 +113,6 @@
 msgid "Recent"
 msgstr ""
 
-#: qml/Dash/PreviewListView.qml:52
-#, qt-format
-msgid "%1 Preview"
-msgstr ""
-
 #: qml/Dash/Previews/PreviewActionCombo.qml:34
 msgid "More..."
 msgstr ""
@@ -117,31 +137,6 @@
 msgid "Swipe to unlock"
 msgstr ""
 
-#: qml/Greeter/Lockscreen.qml:215
-msgid "Emergency Call"
-msgstr ""
-
-#: qml/Greeter/Lockscreen.qml:232
-msgid "OK"
-msgstr ""
-
-#: qml/Greeter/PassphraseLockscreen.qml:60
-#, qt-format
-msgid "Hello %1"
-msgstr ""
-
-#: qml/Greeter/PassphraseLockscreen.qml:60
-msgid "Hello"
-msgstr ""
-
-#: qml/Greeter/PinLockscreen.qml:198
-msgid "CANCEL"
-msgstr ""
-
-#: qml/Greeter/PinLockscreen.qml:216
-msgid "DONE"
-msgstr ""
-
 #: qml/Hud/HudParametrizedActionsPage.qml:132
 msgid "Confirm"
 msgstr ""
@@ -162,15 +157,15 @@
 msgid "Speaking..."
 msgstr ""
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:92
+#: qml/Notifications/NotificationMenuItemFactory.qml:91
 msgid "Show password"
 msgstr ""
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:104
+#: qml/Notifications/NotificationMenuItemFactory.qml:103
 msgid "Please enter SIM PIN"
 msgstr ""
 
-#: qml/Panel/SearchIndicator.qml:27 test.qml:7
+#: qml/Panel/SearchIndicator.qml:27
 msgid "Search"
 msgstr ""
 

=== modified file 'qml/Dash/PreviewListView.qml'
--- qml/Dash/PreviewListView.qml	2014-05-19 11:10:58 +0000
+++ qml/Dash/PreviewListView.qml	2014-06-13 07:58:33 +0000
@@ -49,7 +49,7 @@
                 right: parent.right
                 verticalCenter: parent.verticalCenter
             }
-            text: scope ? i18n.tr("%1 Preview").arg(scope.name) : ""
+            text: scope ? scope.name : ""
             // TODO Saviq: These should come from updated Ubuntu Palette.
             color: "#888888"
             font.family: "Ubuntu"