git.iko.soy/unity8
on xenial help sign in
fix launcher wording for pinning actions. Fixes: https://bugs.launchpad.net/bugs/1240891.

Approved by PS Jenkins bot, Albert Astals Cid.

commit95427df537c0aba6ba73d59dfd0f45804e2c23a2 authorMichael Zanetti <michael.zanetti@canonical.com> dateMon 18 Nov 2013, 09:51 (13 years ago) parentd4653995695317
2 files changed+19−8
compare with xenial
unifiedsplit
plugins/Unity/Launcher/launcheritem.cpp+4−2 po/unity8.pot+15−6
plugins/Unity/Launcher/launcheritem.cpp+4−2
@@ -20,6 +20,8 @@
2020#include "launcheritem.h"
2121#include "quicklistmodel.h"
2222
23+#include <libintl.h>
24+
2325LauncherItem::LauncherItem(const QString &appId, const QString &name, const QString &icon, QObject *parent) :
2426 LauncherItemInterface(parent),
2527 m_appId(appId),
@@ -38,7 +40,7 @@ LauncherItem::LauncherItem(const QString &appId, const QString &name, const QStr
3840 m_quickList->appendAction(nameAction);
3941 QuickListEntry pinningAction;
4042 pinningAction.setActionId("pin_item");
41− pinningAction.setText("Pin to Launcher");
43+ pinningAction.setText(gettext("Lock to Launcher"));
4244 m_quickList->appendAction(pinningAction);
4345}
4446
@@ -68,7 +70,7 @@ void LauncherItem::setPinned(bool pinned)
6870 m_pinned = pinned;
6971 QuickListEntry entry;
7072 entry.setActionId("pin_item");
71− entry.setText(pinned ? "Remove from Launcher": "Pin to Launcher");
73+ entry.setText(pinned ? gettext("Unlock from Launcher") : gettext("Lock to Launcher"));
7274 m_quickList->updateAction(entry);
7375 Q_EMIT pinnedChanged(pinned);
7476 }
po/unity8.pot+15−6
@@ -8,7 +8,7 @@ msgid ""
88msgstr ""
99"Project-Id-Version: unity8\n"
1010"Report-Msgid-Bugs-To: \n"
11−"POT-Creation-Date: 2013-11-05 17:53+0100\n"
11+"POT-Creation-Date: 2013-11-12 16:10+0100\n"
1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -86,7 +86,7 @@ msgstr ""
8686msgid "YouTube"
8787msgstr ""
8888
89−#: Components/EdgeDemoOverlay.qml:149
89+#: Components/EdgeDemoOverlay.qml:151
9090msgid "Skip intro"
9191msgstr ""
9292
@@ -132,7 +132,7 @@ msgid ""
132132"phone<br><br>Tap anywhere to start"
133133msgstr ""
134134
135−#: Components/PageHeader.qml:341
135+#: Components/PageHeader.qml:345
136136msgid "Recent searches"
137137msgstr ""
138138
@@ -152,7 +152,7 @@ msgid_plural "%1 reviews"
152152msgstr[0] ""
153153msgstr[1] ""
154154
155−#: Dash/Apps/AppPreview.qml:126
155+#: Dash/Apps/AppPreview.qml:135
156156msgid "Rate this"
157157msgstr ""
158158
@@ -172,7 +172,7 @@ msgstr ""
172172msgid "Comments:"
173173msgstr ""
174174
175−#: Greeter/Lockscreen.qml:142
175+#: Greeter/Lockscreen.qml:146
176176msgid "Emergency Call"
177177msgstr ""
178178
@@ -213,6 +213,15 @@ msgstr ""
213213msgid "Search"
214214msgstr ""
215215
216+#: plugins/Unity/Launcher/launcheritem.cpp:43
217+#: plugins/Unity/Launcher/launcheritem.cpp:73
218+msgid "Lock to Launcher"
219+msgstr ""
220+
221+#: plugins/Unity/Launcher/launcheritem.cpp:73
222+msgid "Unlock from Launcher"
223+msgstr ""
224+
216225#: plugins/Unity/scope.cpp:408
217226msgid "Sorry, there is nothing that matches your search."
218227msgstr ""
@@ -221,7 +230,7 @@ msgstr ""
221230msgid "All"
222231msgstr ""
223232
224−#: Shell.qml:438
233+#: Shell.qml:441
225234#, qt-format
226235msgid "Please enter %1"
227236msgstr ""