git.iko.soy/unity8
on xenial help sign in
Merge lp:~cimi/unity8/scope-settings
commitb41ac87894a892be4ffa0e0863fa76d9dea4821a authorMichał Sawicz <michal.sawicz@canonical.com> dateTue 26 Aug 2014, 13:18 (12 years ago) parenta5d03040110148
35 files changed+599−438
compare with xenial
unifiedsplit
debian/changelog+15 plugins/Unity/Indicators/CachedUnityMenuModel.qml−60 plugins/Unity/Indicators/qmldir−3 plugins/Unity/Indicators/unitymenumodelcache.cpp+22−7 plugins/Unity/Indicators/unitymenumodelcache.h+5−3 po/de.po+20−16 po/el.po+18−18 po/gl.po+4−4 po/hu.po+33−29 po/ja.po+53−52 po/km.po+32−26 po/ko.po+42−40 po/lv.po+14−14 po/pl.po+20−20 po/pt_BR.po+33−29 po/ru.po+39−35 po/sl.po+41−37 qml/Dash/Dash.qml+1−2 qml/Dash/DashContent.qml+4−6 qml/Dash/GenericScopeView.qml+8−14 qml/Dash/PreviewListView.qml+4−1 qml/Greeter/Clock.qml+2−1 qml/Notifications/Notification.qml+1−1 qml/Notifications/Notifications.qml+2−2 tests/mocks/Unity/Indicators/CachedUnityMenuModel.qml → qml/Panel/Indicators/CachedUnityMenuModel.qml+14−5 qml/Panel/Indicators/DefaultIndicatorWidget.qml+2−1 qml/Panel/Indicators/IndicatorBase.qml+4−2 tests/autopilot/unity8/shell/emulators/dash.py+1 tests/mocks/QMenuModel/unitymenumodel.cpp+4−5 tests/mocks/Unity/Indicators/CMakeLists.txt+6−1 tests/mocks/Unity/Indicators/fakeplugin.cpp+9 tests/mocks/Unity/Indicators/qmldir−1 tests/qmltests/CMakeLists.txt+1 tests/qmltests/Dash/tst_GenericScopeView.qml+8−3 tests/qmltests/Panel/Indicators/tst_CachedUnityMenuModel.qml+137
debian/changelog+15
@@ -1,3 +1,18 @@
1+unity8 (8.00+14.10.20140820-0ubuntu1) utopic; urgency=low
2+
3+ [ CI bot ]
4+ * Resync trunk
5+
6+ [ Nick Dedekind ]
7+ * Fixed CachedUnityMenuModel destruction unhinging indicators. (LP:
8+ #1328646)
9+
10+ [ Mirco Müller ]
11+ * Temporarily disable any opacity-animation for notifications to
12+ unblock the train due to LP: 1354406. (LP: #1354406)
13+
14+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 20 Aug 2014 20:03:55 +0000
15+
116unity8 (8.00+14.10.20140817-0ubuntu1) utopic; urgency=low
217
318 [ CI bot ]
plugins/Unity/Indicators/CachedUnityMenuModel.qmldeleted−60
@@ -1,60 +0,0 @@
1−/*
2− * Copyright 2013 Canonical Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU Lesser General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU Lesser General Public License for more details.
12− *
13− * You should have received a copy of the GNU Lesser General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Authors:
17− * Nick Dedekind <nick.dedekind@canonical.com>
18− */
19−
20−import QtQuick 2.0
21−import QMenuModel 0.1 as QMenuModel
22−import Unity.Indicators 0.1 as Indicators
23−
24−// Make sure we don't duplicate models.
25−Item {
26− id: cachedModel
27− property string busName: ""
28− property string actionsObjectPath: ""
29− property string menuObjectPath: ""
30−
31− readonly property bool ready: busName!=="" && actionsObjectPath!=="" && menuObjectPath!==""
32−
33− property QtObject model: {
34− if (!ready) {
35− return null;
36− }
37−
38− var component = Indicators.UnityMenuModelCache.model(menuObjectPath);
39− if (!component) {
40− component = modelComponent.createObject(cachedModel);
41− return component;
42− }
43− return component;
44− }
45−
46− Component {
47− id: modelComponent
48−
49− QMenuModel.UnityMenuModel {
50− id: unityModel
51− busName: cachedModel.busName
52− actions: { "indicator": cachedModel.actionsObjectPath }
53− menuObjectPath: cachedModel.menuObjectPath
54−
55− Component.onCompleted: {
56− Indicators.UnityMenuModelCache.registerModel(cachedModel.menuObjectPath, unityModel);
57− }
58− }
59− }
60−}
plugins/Unity/Indicators/qmldir−3
@@ -1,6 +1,3 @@
11module Unity.Indicators
22plugin IndicatorsQml
33typeinfo Indicators.qmltypes
4−
5−CachedUnityMenuModel 0.1 CachedUnityMenuModel.qml
6−IndicatorBase 0.1 IndicatorBase.qml
plugins/Unity/Indicators/unitymenumodelcache.cpp+22−7
@@ -29,14 +29,29 @@ UnityMenuModelCache::~UnityMenuModelCache()
2929{
3030}
3131
32−
33−UnityMenuModel* UnityMenuModelCache::model(const QString& path) const
32+UnityMenuModel* UnityMenuModelCache::model(const QByteArray& bus,
33+ const QByteArray& path,
34+ const QVariantMap& actions)
3435{
35− return m_menuModels.value(path, NULL);
36+ if (m_registry.contains(path))
37+ return m_registry[path];
38+
39+ UnityMenuModel* menuModel = new UnityMenuModel;
40+ connect(menuModel, &QObject::destroyed, this, [menuModel, this](QObject*) {
41+ QList<QByteArray> keys = m_registry.keys(menuModel);
42+ Q_FOREACH(const QByteArray& key, keys) {
43+ m_registry.remove(key);
44+ }
45+ });
46+ m_registry[path] = menuModel;
47+
48+ menuModel->setBusName(bus);
49+ menuModel->setMenuObjectPath(path);
50+ menuModel->setActions(actions);
51+ return menuModel;
3652}
3753
38−void UnityMenuModelCache::registerModel(const QString& path, UnityMenuModel* menuModel)
54+bool UnityMenuModelCache::contains(const QByteArray& path)
3955{
40− menuModel->setParent(this);
41− m_menuModels[path] = menuModel;
42−}
56+ return m_registry.contains(path);
57+}
plugins/Unity/Indicators/unitymenumodelcache.h+5−3
@@ -34,11 +34,13 @@ public:
3434 UnityMenuModelCache(QObject*parent=NULL);
3535 ~UnityMenuModelCache();
3636
37− Q_INVOKABLE UnityMenuModel* model(const QString& path) const;
38− Q_INVOKABLE void registerModel(const QString& path, UnityMenuModel* menuModel);
37+ Q_INVOKABLE UnityMenuModel* model(const QByteArray& bus,
38+ const QByteArray& path,
39+ const QVariantMap& actions);
40+ Q_INVOKABLE bool contains(const QByteArray& path);
3941
4042private:
41− QHash<QString, UnityMenuModel*> m_menuModels;
43+ QHash<QByteArray, UnityMenuModel*> m_registry;
4244};
4345
4446#endif // UNITYMENUMODELCACHE_H
po/de.po+20−16
@@ -8,14 +8,14 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-08-17 21:46+0000\n"
12−"Last-Translator: Phillip Sz <Unknown>\n"
11+"PO-Revision-Date: 2014-08-21 16:18+0000\n"
12+"Last-Translator: Martin Pitt <martin.pitt@ubuntu.com>\n"
1313"Language-Team: German <de@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
17+"X-Launchpad-Export-Date: 2014-08-22 07:39+0000\n"
18+"X-Generator: Launchpad (build 17163)\n"
1919
2020#: plugins/LightDM/Greeter.cpp:129
2121msgid "Password: "
@@ -32,7 +32,7 @@ msgstr "Verknüpfung entfernen"
3232
3333#: qml/Components/Dialogs.qml:142
3434msgid "Are you sure you would like to turn power off?"
35−msgstr ""
35+msgstr "Sind Sie sicher dass das Telefon ausgeschaltet werden soll?"
3636
3737#: qml/Components/Dialogs.qml:144
3838msgid "Power off"
@@ -99,7 +99,7 @@ msgstr ""
9999
100100#: qml/Components/Lockscreen.qml:161
101101msgid "Too many incorrect attempts"
102−msgstr ""
102+msgstr "Zu viele falsche Versuche"
103103
104104#: qml/Components/Lockscreen.qml:163
105105msgid "Please wait"
@@ -164,7 +164,7 @@ msgstr "Senden"
164164
165165#: qml/Dash/ScopesOverview.qml:201
166166msgid "Manage Dash"
167−msgstr ""
167+msgstr "Dash verwalten"
168168
169169#: qml/Dash/ScopesOverview.qml:408
170170msgid "Done"
@@ -172,7 +172,7 @@ msgstr "Erledigt"
172172
173173#: qml/Dash/ScopesOverview.qml:434
174174msgid "Store"
175−msgstr ""
175+msgstr "Store"
176176
177177#: qml/Dash/ScopesOverviewTab.qml:36
178178msgid "Favorites"
@@ -248,7 +248,7 @@ msgstr "Fehlgeschlagen, tippen Sie zum Wiederholen"
248248
249249#: qml/Panel/Indicators/ModemInfoItem.qml:105
250250msgid "Unlock SIM"
251−msgstr ""
251+msgstr "SIM-Karte entsprerren"
252252
253253#: qml/Panel/Indicators/RoamingIndication.qml:27
254254msgid "Roaming"
@@ -260,42 +260,46 @@ msgstr "Passwort"
260260
261261#: qml/Shell.qml:267
262262msgid "passcode"
263−msgstr ""
263+msgstr "Passwort"
264264
265265#: qml/Shell.qml:269
266266#, qt-format
267267msgid "Enter your %1"
268−msgstr ""
268+msgstr "%1 eingeben"
269269
270270#: qml/Shell.qml:270
271271#, qt-format
272272msgid "Incorrect %1"
273−msgstr ""
273+msgstr "%1 falsch"
274274
275275#: qml/Shell.qml:272
276276msgid "Please re-enter"
277−msgstr ""
277+msgstr "Bitte neu eingeben"
278278
279279#: qml/Shell.qml:306
280280msgid "Sorry, incorrect passphrase."
281−msgstr ""
281+msgstr "Falsches Passwort."
282282
283283#: qml/Shell.qml:307
284284msgid "Sorry, incorrect passcode."
285−msgstr ""
285+msgstr "Falsche PIN"
286286
287287#: qml/Shell.qml:308
288288msgid "This will be your last attempt."
289−msgstr ""
289+msgstr "Dies ist Ihr letzter Versuch."
290290
291291#: qml/Shell.qml:310
292292msgid ""
293293"If passphrase is entered incorrectly, your phone will conduct a factory "
294294"reset and all personal data will be deleted."
295295msgstr ""
296+"Wird das Passwort falsch eingegeben, wird das Telefon auf den Werkszustand "
297+"zurückgesetzt und alle Daten werden gelöscht."
296298
297299#: qml/Shell.qml:311
298300msgid ""
299301"If passcode is entered incorrectly, your phone will conduct a factory reset "
300302"and all personal data will be deleted."
301303msgstr ""
304+"Wird die PIN falsch eingegeben, wird das Telefon auf den Werkszustand "
305+"zurückgesetzt und alle Daten werden gelöscht."
po/el.po+18−18
@@ -8,18 +8,18 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-08-08 13:03+0000\n"
12−"Last-Translator: Simos Xenitellis <Unknown>\n"
11+"PO-Revision-Date: 2014-08-21 12:06+0000\n"
12+"Last-Translator: Chris Taklis (aka Kailor) <ctaklis@gmail.com>\n"
1313"Language-Team: Greek <el@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
17+"X-Launchpad-Export-Date: 2014-08-22 07:39+0000\n"
18+"X-Generator: Launchpad (build 17163)\n"
1919
2020#: plugins/LightDM/Greeter.cpp:129
2121msgid "Password: "
22−msgstr ""
22+msgstr "Κωδικός πρόσβασης: "
2323
2424#: plugins/Unity/Launcher/launcheritem.cpp:43
2525#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -36,15 +36,15 @@ msgstr ""
3636
3737#: qml/Components/Dialogs.qml:144
3838msgid "Power off"
39−msgstr ""
39+msgstr "Τερματισμός"
4040
4141#: qml/Components/Dialogs.qml:153
4242msgid "Restart"
43−msgstr ""
43+msgstr "Επανεκκίνηση"
4444
4545#: qml/Components/Dialogs.qml:162
4646msgid "Cancel"
47−msgstr ""
47+msgstr "Ακύρωση"
4848
4949#: qml/Components/EdgeDemoOverlay.qml:151
5050msgid "Skip intro"
@@ -98,11 +98,11 @@ msgstr ""
9898
9999#: qml/Components/Lockscreen.qml:161
100100msgid "Too many incorrect attempts"
101−msgstr ""
101+msgstr "Πολλές άκυρες προσπάθειες"
102102
103103#: qml/Components/Lockscreen.qml:163
104104msgid "Please wait"
105−msgstr ""
105+msgstr "Παρακαλώ περιμένετε"
106106
107107#: qml/Components/Lockscreen.qml:245
108108msgid "Emergency Call"
@@ -167,19 +167,19 @@ msgstr ""
167167
168168#: qml/Dash/ScopesOverview.qml:408
169169msgid "Done"
170−msgstr ""
170+msgstr "Ολοκληρώθηκε"
171171
172172#: qml/Dash/ScopesOverview.qml:434
173173msgid "Store"
174−msgstr ""
174+msgstr "Κατάστημα"
175175
176176#: qml/Dash/ScopesOverviewTab.qml:36
177177msgid "Favorites"
178−msgstr ""
178+msgstr "Αγαπημένα"
179179
180180#: qml/Dash/ScopesOverviewTab.qml:54
181181msgid "All"
182−msgstr ""
182+msgstr "Όλα"
183183
184184#: qml/Greeter/Greeter.qml:157
185185msgid "Swipe to unlock"
@@ -247,11 +247,11 @@ msgstr "Αποτυχία, πατήστε για να ξαναπροσπαθήσ
247247
248248#: qml/Panel/Indicators/ModemInfoItem.qml:105
249249msgid "Unlock SIM"
250−msgstr ""
250+msgstr "Ξεκλείδωμα SIM"
251251
252252#: qml/Panel/Indicators/RoamingIndication.qml:27
253253msgid "Roaming"
254−msgstr ""
254+msgstr "Περιαγωγή"
255255
256256#: qml/Shell.qml:267
257257msgid "passphrase"
@@ -264,7 +264,7 @@ msgstr ""
264264#: qml/Shell.qml:269
265265#, qt-format
266266msgid "Enter your %1"
267−msgstr ""
267+msgstr "Εισάγετε το %1"
268268
269269#: qml/Shell.qml:270
270270#, qt-format
@@ -273,7 +273,7 @@ msgstr ""
273273
274274#: qml/Shell.qml:272
275275msgid "Please re-enter"
276−msgstr ""
276+msgstr "Παρακαλούμε εισάγετε ξανά"
277277
278278#: qml/Shell.qml:306
279279msgid "Sorry, incorrect passphrase."
po/gl.po+4−4
@@ -8,14 +8,14 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-08-14 14:23+0000\n"
11+"PO-Revision-Date: 2014-08-21 14:32+0000\n"
1212"Last-Translator: Marcos Lans <Unknown>\n"
1313"Language-Team: Galician <gl@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
17+"X-Launchpad-Export-Date: 2014-08-22 07:39+0000\n"
18+"X-Generator: Launchpad (build 17163)\n"
1919
2020#: plugins/LightDM/Greeter.cpp:129
2121msgid "Password: "
@@ -163,7 +163,7 @@ msgstr "Enviar"
163163
164164#: qml/Dash/ScopesOverview.qml:201
165165msgid "Manage Dash"
166−msgstr "Xestionar o Panel"
166+msgstr "Xestión do Panel"
167167
168168#: qml/Dash/ScopesOverview.qml:408
169169msgid "Done"
po/hu.po+33−29
@@ -8,14 +8,14 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-08-16 12:36+0000\n"
11+"PO-Revision-Date: 2014-08-19 07:08+0000\n"
1212"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"
1313"Language-Team: Hungarian <hu@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
17+"X-Launchpad-Export-Date: 2014-08-20 06:23+0000\n"
18+"X-Generator: Launchpad (build 17163)\n"
1919
2020#: plugins/LightDM/Greeter.cpp:129
2121msgid "Password: "
@@ -32,7 +32,7 @@ msgstr "Indító feloldása"
3232
3333#: qml/Components/Dialogs.qml:142
3434msgid "Are you sure you would like to turn power off?"
35−msgstr ""
35+msgstr "Biztos benne, hogy ki szeretné kapcsolni?"
3636
3737#: qml/Components/Dialogs.qml:144
3838msgid "Power off"
@@ -44,7 +44,7 @@ msgstr "Újraindítás"
4444
4545#: qml/Components/Dialogs.qml:162
4646msgid "Cancel"
47−msgstr ""
47+msgstr "Mégse"
4848
4949#: qml/Components/EdgeDemoOverlay.qml:151
5050msgid "Skip intro"
@@ -98,46 +98,46 @@ msgstr ""
9898
9999#: qml/Components/Lockscreen.qml:161
100100msgid "Too many incorrect attempts"
101−msgstr ""
101+msgstr "Túl sok sikertelen kísérlet"
102102
103103#: qml/Components/Lockscreen.qml:163
104104msgid "Please wait"
105105msgstr "Kérem várjon"
106106
107−#: qml/Components/Lockscreen.qml:245
107+#: qml/Components/Lockscreen.qml:220
108108msgid "Emergency Call"
109109msgstr "Vészhívás"
110110
111−#: qml/Components/Lockscreen.qml:268
111+#: qml/Components/Lockscreen.qml:243
112112msgid "OK"
113113msgstr "Ok"
114114
115−#: qml/Components/PassphraseLockscreen.qml:61
115+#: qml/Components/PassphraseLockscreen.qml:62
116116#, qt-format
117117msgid "Hello %1"
118118msgstr "Üdv %1"
119119
120−#: qml/Components/PassphraseLockscreen.qml:61
120+#: qml/Components/PassphraseLockscreen.qml:62
121121msgid "Hello"
122122msgstr "Üdvözöljük"
123123
124−#: qml/Components/PinLockscreen.qml:197
124+#: qml/Components/PinLockscreen.qml:198
125125msgid "CANCEL"
126126msgstr "MÉGSE"
127127
128−#: qml/Components/PinLockscreen.qml:215
128+#: qml/Components/PinLockscreen.qml:216
129129msgid "DONE"
130130msgstr "KÉSZ"
131131
132−#: qml/Dash/GenericScopeView.qml:360
132+#: qml/Dash/GenericScopeView.qml:358
133133msgid "See less"
134134msgstr "Kevesebb"
135135
136−#: qml/Dash/GenericScopeView.qml:360
136+#: qml/Dash/GenericScopeView.qml:358
137137msgid "See all"
138138msgstr "Összes megtekintése"
139139
140−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
140+#: qml/Panel/SearchIndicator.qml:27
141141msgid "Search"
142142msgstr "Keresés"
143143
@@ -161,17 +161,17 @@ msgstr "Értékelés hozzáadása"
161161msgid "Send"
162162msgstr "Küldés"
163163
164−#: qml/Dash/ScopesOverview.qml:201
164+#: qml/Dash/ScopesOverview.qml:200
165165msgid "Manage Dash"
166−msgstr ""
166+msgstr "Dash kezelése"
167167
168−#: qml/Dash/ScopesOverview.qml:408
168+#: qml/Dash/ScopesOverview.qml:405
169169msgid "Done"
170−msgstr ""
170+msgstr "Kész"
171171
172−#: qml/Dash/ScopesOverview.qml:434
172+#: qml/Dash/ScopesOverview.qml:431
173173msgid "Store"
174−msgstr ""
174+msgstr "Áruház"
175175
176176#: qml/Dash/ScopesOverviewTab.qml:36
177177msgid "Favorites"
@@ -255,46 +255,50 @@ msgstr "Barangolás"
255255
256256#: qml/Shell.qml:267
257257msgid "passphrase"
258−msgstr ""
258+msgstr "jelmondat"
259259
260260#: qml/Shell.qml:267
261261msgid "passcode"
262−msgstr ""
262+msgstr "jelkód"
263263
264264#: qml/Shell.qml:269
265265#, qt-format
266266msgid "Enter your %1"
267−msgstr ""
267+msgstr "Adja meg a következőt: %1"
268268
269269#: qml/Shell.qml:270
270270#, qt-format
271271msgid "Incorrect %1"
272−msgstr ""
272+msgstr "Helytelen %1"
273273
274274#: qml/Shell.qml:272
275275msgid "Please re-enter"
276−msgstr ""
276+msgstr "Kérjük adja meg újra"
277277
278278#: qml/Shell.qml:306
279279msgid "Sorry, incorrect passphrase."
280−msgstr ""
280+msgstr "Sajnáljuk, helytelen jelmondat."
281281
282282#: qml/Shell.qml:307
283283msgid "Sorry, incorrect passcode."
284−msgstr ""
284+msgstr "Sajnáljuk, helytelen jelkód."
285285
286286#: qml/Shell.qml:308
287287msgid "This will be your last attempt."
288−msgstr ""
288+msgstr "Ez az utolsó próbálkozási lehetősége."
289289
290290#: qml/Shell.qml:310
291291msgid ""
292292"If passphrase is entered incorrectly, your phone will conduct a factory "
293293"reset and all personal data will be deleted."
294294msgstr ""
295+"Ha helytelen jelmondatot ad meg, a telefonja visszaállítja a gyári "
296+"beállításokat és törli minden személyes adatát."
295297
296298#: qml/Shell.qml:311
297299msgid ""
298300"If passcode is entered incorrectly, your phone will conduct a factory reset "
299301"and all personal data will be deleted."
300302msgstr ""
303+"Ha helytelen jelkódot ad meg, a telefonja visszaállítja a gyári "
304+"beállításokat és törli minden személyes adatát."
po/ja.po+53−52
@@ -8,43 +8,43 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-08-12 07:14+0000\n"
12−"Last-Translator: Shushi Kurose <md81bird@hitaki.net>\n"
11+"PO-Revision-Date: 2014-08-18 15:03+0000\n"
12+"Last-Translator: Mitsuya Shibata <mty.shibata@gmail.com>\n"
1313"Language-Team: Japanese <ja@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-19 06:59+0000\n"
1818"X-Generator: Launchpad (build 17156)\n"
1919
2020#: plugins/LightDM/Greeter.cpp:129
2121msgid "Password: "
22−msgstr ""
22+msgstr "パスワード： "
2323
2424#: plugins/Unity/Launcher/launcheritem.cpp:43
2525#: plugins/Unity/Launcher/launcheritem.cpp:73
2626msgid "Pin shortcut"
27−msgstr ""
27+msgstr "ショートカットを追加する"
2828
2929#: plugins/Unity/Launcher/launcheritem.cpp:73
3030msgid "Unpin shortcut"
31−msgstr ""
31+msgstr "ショートカットを削除する"
3232
3333#: qml/Components/Dialogs.qml:142
3434msgid "Are you sure you would like to turn power off?"
35−msgstr ""
35+msgstr "本当に電源を切りますか？"
3636
3737#: qml/Components/Dialogs.qml:144
3838msgid "Power off"
39−msgstr ""
39+msgstr "電源を切る"
4040
4141#: qml/Components/Dialogs.qml:153
4242msgid "Restart"
43−msgstr ""
43+msgstr "再起動"
4444
4545#: qml/Components/Dialogs.qml:162
4646msgid "Cancel"
47−msgstr ""
47+msgstr "キャンセル"
4848
4949#: qml/Components/EdgeDemoOverlay.qml:151
5050msgid "Skip intro"
@@ -56,7 +56,7 @@ msgstr "右端"
5656
5757#: qml/Components/EdgeDemo.qml:113
5858msgid "Try swiping from the right edge to unlock the phone"
59−msgstr ""
59+msgstr "アンロックするには右端からスワイプしてみてください"
6060
6161#: qml/Components/EdgeDemo.qml:144
6262msgid "Top edge"
@@ -91,63 +91,64 @@ msgid ""
9191"You have now mastered the edge gestures and can start using the "
9292"phone<br><br>Tap on the screen to start"
9393msgstr ""
94+"これでスマートフォンの操作に必要な、画面端を用いたジェスチャーを習得できました。<br><br>利用を開始するなら画面をタップしてください"
9495
9596#: qml/Components/Lockscreen.qml:161
9697msgid "Too many incorrect attempts"
97−msgstr ""
98+msgstr "失敗回数が上限に達しました"
9899
99100#: qml/Components/Lockscreen.qml:163
100101msgid "Please wait"
101−msgstr ""
102+msgstr "お待ちください"
102103
103−#: qml/Components/Lockscreen.qml:245
104+#: qml/Components/Lockscreen.qml:220
104105msgid "Emergency Call"
105106msgstr "緊急通報"
106107
107−#: qml/Components/Lockscreen.qml:268
108+#: qml/Components/Lockscreen.qml:243
108109msgid "OK"
109110msgstr "OK"
110111
111−#: qml/Components/PassphraseLockscreen.qml:61
112+#: qml/Components/PassphraseLockscreen.qml:62
112113#, qt-format
113114msgid "Hello %1"
114115msgstr "こんにちは %1 さん"
115116
116−#: qml/Components/PassphraseLockscreen.qml:61
117+#: qml/Components/PassphraseLockscreen.qml:62
117118msgid "Hello"
118119msgstr "こんにちは"
119120
120−#: qml/Components/PinLockscreen.qml:197
121+#: qml/Components/PinLockscreen.qml:198
121122msgid "CANCEL"
122−msgstr ""
123+msgstr "キャンセル"
123124
124−#: qml/Components/PinLockscreen.qml:215
125+#: qml/Components/PinLockscreen.qml:216
125126msgid "DONE"
126−msgstr ""
127+msgstr "完了"
127128
128−#: qml/Dash/GenericScopeView.qml:360
129+#: qml/Dash/GenericScopeView.qml:358
129130msgid "See less"
130131msgstr ""
131132
132−#: qml/Dash/GenericScopeView.qml:360
133+#: qml/Dash/GenericScopeView.qml:358
133134msgid "See all"
134−msgstr ""
135+msgstr "すべて表示する"
135136
136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
137+#: qml/Panel/SearchIndicator.qml:27
137138msgid "Search"
138139msgstr "検索"
139140
140141#: qml/Dash/Previews/PreviewActionCombo.qml:34
141142msgid "More..."
142−msgstr ""
143+msgstr "さらに ..."
143144
144145#: qml/Dash/Previews/PreviewActionCombo.qml:34
145146msgid "Less..."
146−msgstr ""
147+msgstr "隠す..."
147148
148149#: qml/Dash/Previews/PreviewRatingInput.qml:81
149150msgid "Rate this"
150−msgstr ""
151+msgstr "評価する"
151152
152153#: qml/Dash/Previews/PreviewRatingInput.qml:126
153154msgid "Add a review"
@@ -157,21 +158,21 @@ msgstr "レビューを追加"
157158msgid "Send"
158159msgstr "送信"
159160
160−#: qml/Dash/ScopesOverview.qml:201
161+#: qml/Dash/ScopesOverview.qml:200
161162msgid "Manage Dash"
162−msgstr ""
163+msgstr "Dashの管理"
163164
164−#: qml/Dash/ScopesOverview.qml:408
165+#: qml/Dash/ScopesOverview.qml:405
165166msgid "Done"
166−msgstr ""
167+msgstr "完了"
167168
168−#: qml/Dash/ScopesOverview.qml:434
169+#: qml/Dash/ScopesOverview.qml:431
169170msgid "Store"
170−msgstr ""
171+msgstr "保存"
171172
172173#: qml/Dash/ScopesOverviewTab.qml:36
173174msgid "Favorites"
174−msgstr ""
175+msgstr "お気に入り"
175176
176177#: qml/Dash/ScopesOverviewTab.qml:54
177178msgid "All"
@@ -179,7 +180,7 @@ msgstr "すべて"
179180
180181#: qml/Greeter/Greeter.qml:157
181182msgid "Swipe to unlock"
182−msgstr ""
183+msgstr "スワイプしてロック解除"
183184
184185#: qml/Hud/HudParametrizedActionsPage.qml:132
185186msgid "Confirm"
@@ -187,7 +188,7 @@ msgstr "確認"
187188
188189#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
189190msgid "Type or say a command"
190−msgstr ""
191+msgstr "コマンドを音声かキーボードから入力"
191192
192193#: qml/Hud/Hud.qml:84
193194msgid "Loading. Please Wait..."
@@ -207,11 +208,11 @@ msgstr "パスワードを表示"
207208
208209#: qml/Notifications/NotificationMenuItemFactory.qml:115
209210msgid "Please enter SIM PIN"
210−msgstr ""
211+msgstr "SIM PINを入力してください"
211212
212213#: qml/Panel/ActiveCallHint.qml:77
213214msgid "Tap to return to call..."
214−msgstr ""
215+msgstr "タップすると通話に戻ります..."
215216
216217#: qml/Panel/ActiveCallHint.qml:90
217218msgid "Conference"
@@ -223,11 +224,11 @@ msgstr ""
223224
224225#: qml/Panel/Indicators/MenuItemFactory.qml:655
225226msgid "Downloading"
226−msgstr ""
227+msgstr "ダウンロード中"
227228
228229#: qml/Panel/Indicators/MenuItemFactory.qml:657
229230msgid "Paused, tap to resume"
230−msgstr ""
231+msgstr "停止中、再開するにはタップしてください"
231232
232233#: qml/Panel/Indicators/MenuItemFactory.qml:659
233234msgid "Canceled"
@@ -239,49 +240,49 @@ msgstr ""
239240
240241#: qml/Panel/Indicators/MenuItemFactory.qml:663
241242msgid "Failed, tap to retry"
242−msgstr ""
243+msgstr "失敗しました、再試行するにはタップしてください"
243244
244245#: qml/Panel/Indicators/ModemInfoItem.qml:105
245246msgid "Unlock SIM"
246−msgstr ""
247+msgstr "SIMのアンロック"
247248
248249#: qml/Panel/Indicators/RoamingIndication.qml:27
249250msgid "Roaming"
250−msgstr ""
251+msgstr "ローミング"
251252
252253#: qml/Shell.qml:267
253254msgid "passphrase"
254−msgstr ""
255+msgstr "パスフレーズ"
255256
256257#: qml/Shell.qml:267
257258msgid "passcode"
258−msgstr ""
259+msgstr "パスコード"
259260
260261#: qml/Shell.qml:269
261262#, qt-format
262263msgid "Enter your %1"
263−msgstr ""
264+msgstr "%1を入力してください"
264265
265266#: qml/Shell.qml:270
266267#, qt-format
267268msgid "Incorrect %1"
268−msgstr ""
269+msgstr "%1が間違っています"
269270
270271#: qml/Shell.qml:272
271272msgid "Please re-enter"
272−msgstr ""
273+msgstr "再入力してください"
273274
274275#: qml/Shell.qml:306
275276msgid "Sorry, incorrect passphrase."
276−msgstr ""
277+msgstr "パスフレーズが間違っています。"
277278
278279#: qml/Shell.qml:307
279280msgid "Sorry, incorrect passcode."
280−msgstr ""
281+msgstr "パスコードが間違っています。"
281282
282283#: qml/Shell.qml:308
283284msgid "This will be your last attempt."
284−msgstr ""
285+msgstr "これが最後のチャンスです。"
285286
286287#: qml/Shell.qml:310
287288msgid ""
po/km.po+32−26
@@ -8,18 +8,18 @@ msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-08-13 04:57+0000\n"
11+"PO-Revision-Date: 2014-08-20 02:48+0000\n"
1212"Last-Translator: Sok Sophea <sksophea@gmail.com>\n"
1313"Language-Team: Khmer <km@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
17+"X-Launchpad-Export-Date: 2014-08-21 06:48+0000\n"
18+"X-Generator: Launchpad (build 17163)\n"
1919
2020#: plugins/LightDM/Greeter.cpp:129
2121msgid "Password: "
22−msgstr ""
22+msgstr "ពាក្យសម្ងាត់៖ "
2323
2424#: plugins/Unity/Launcher/launcheritem.cpp:43
2525#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -98,46 +98,46 @@ msgstr ""
9898
9999#: qml/Components/Lockscreen.qml:161
100100msgid "Too many incorrect attempts"
101−msgstr ""
101+msgstr "បាន​ព្យាយាម​ខុស​ច្រើន​ដង​ពេក"
102102
103103#: qml/Components/Lockscreen.qml:163
104104msgid "Please wait"
105−msgstr ""
105+msgstr "សូមរង់ចាំ"
106106
107−#: qml/Components/Lockscreen.qml:245
107+#: qml/Components/Lockscreen.qml:220
108108msgid "Emergency Call"
109109msgstr "ការ​ហៅ​ពេល​អាសន្ន"
110110
111−#: qml/Components/Lockscreen.qml:268
111+#: qml/Components/Lockscreen.qml:243
112112msgid "OK"
113113msgstr "យល់ព្រម"
114114
115−#: qml/Components/PassphraseLockscreen.qml:61
115+#: qml/Components/PassphraseLockscreen.qml:62
116116#, qt-format
117117msgid "Hello %1"
118118msgstr "សួស្ដី %1"
119119
120−#: qml/Components/PassphraseLockscreen.qml:61
120+#: qml/Components/PassphraseLockscreen.qml:62
121121msgid "Hello"
122122msgstr "សួស្តី"
123123
124−#: qml/Components/PinLockscreen.qml:197
124+#: qml/Components/PinLockscreen.qml:198
125125msgid "CANCEL"
126126msgstr "បោះបង់"
127127
128−#: qml/Components/PinLockscreen.qml:215
128+#: qml/Components/PinLockscreen.qml:216
129129msgid "DONE"
130130msgstr "រួចរាល់"
131131
132−#: qml/Dash/GenericScopeView.qml:360
132+#: qml/Dash/GenericScopeView.qml:358
133133msgid "See less"
134134msgstr "មើល​តិច​ជាង"
135135
136−#: qml/Dash/GenericScopeView.qml:360
136+#: qml/Dash/GenericScopeView.qml:358
137137msgid "See all"
138138msgstr "មើល​ទាំងអស់"
139139
140−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
140+#: qml/Panel/SearchIndicator.qml:27
141141msgid "Search"
142142msgstr "ស្វែង​រក"
143143
@@ -161,15 +161,15 @@ msgstr "បន្ថែម​ការ​ពិនិត្យ"
161161msgid "Send"
162162msgstr "ផ្ញើ"
163163
164−#: qml/Dash/ScopesOverview.qml:201
164+#: qml/Dash/ScopesOverview.qml:200
165165msgid "Manage Dash"
166166msgstr "គ្រប់គ្រង​ផ្ទាំង"
167167
168−#: qml/Dash/ScopesOverview.qml:408
168+#: qml/Dash/ScopesOverview.qml:405
169169msgid "Done"
170170msgstr "ធ្វើរួច"
171171
172−#: qml/Dash/ScopesOverview.qml:434
172+#: qml/Dash/ScopesOverview.qml:431
173173msgid "Store"
174174msgstr "រក្សាទុក"
175175
@@ -255,46 +255,52 @@ msgstr "រ៉ូមីង"
255255
256256#: qml/Shell.qml:267
257257msgid "passphrase"
258−msgstr ""
258+msgstr "ឃ្លា​សម្ងាត់"
259259
260260#: qml/Shell.qml:267
261261msgid "passcode"
262−msgstr ""
262+msgstr "កូដ​សម្ងាត់"
263263
264264#: qml/Shell.qml:269
265265#, qt-format
266266msgid "Enter your %1"
267−msgstr ""
267+msgstr "បញ្ចូល %1 របស់​អ្នក"
268268
269269#: qml/Shell.qml:270
270270#, qt-format
271271msgid "Incorrect %1"
272−msgstr ""
272+msgstr "មិន​ត្រឹមត្រូវ %1"
273273
274274#: qml/Shell.qml:272
275275msgid "Please re-enter"
276−msgstr ""
276+msgstr "សូម​បញ្ចូល​ឡើងវិញ"
277277
278278#: qml/Shell.qml:306
279279msgid "Sorry, incorrect passphrase."
280−msgstr ""
280+msgstr "សូមទោស! ឃ្លា​សម្ងាត់​មិន​ត្រឹមត្រូវ។"
281281
282282#: qml/Shell.qml:307
283283msgid "Sorry, incorrect passcode."
284−msgstr ""
284+msgstr "សូមទោស! កូដ​សម្ងាត់​មិន​ត្រឹមត្រូវ។"
285285
286286#: qml/Shell.qml:308
287287msgid "This will be your last attempt."
288−msgstr ""
288+msgstr "នេះ​គឺ​ការ​ព្យាយាម​លើក​ចុងក្រោយ។"
289289
290290#: qml/Shell.qml:310
291291msgid ""
292292"If passphrase is entered incorrectly, your phone will conduct a factory "
293293"reset and all personal data will be deleted."
294294msgstr ""
295+"បើ​បញ្ចូល​ឃ្លា​សម្ងាត់​មិន​ត្រឹមត្រូវ "
296+"ទូរស័ព្ទ​របស់​អ្នក​នឹង​កំណត់​ទៅ​ទិន្នន័យ​ពី​រោងចក្រ​វិញ "
297+"ហើយ​ទិន្នន័យ​ផ្ទាល់ខ្លួន​ទាំងអស់​របស់​អ្នក​នឹង​ត្រូវ​បាន​លុប។"
295298
296299#: qml/Shell.qml:311
297300msgid ""
298301"If passcode is entered incorrectly, your phone will conduct a factory reset "
299302"and all personal data will be deleted."
300303msgstr ""
304+"បើ​បញ្ចូល​កូដ​សម្ងាត់​មិន​ត្រឹមត្រូវ "
305+"ទូរស័ព្ទ​របស់​អ្នក​នឹង​កំណត់​ទៅ​ទិន្នន័យ​ពី​រោងចក្រ​វិញ "
306+"ហើយ​ទិន្នន័យ​ផ្ទាល់ខ្លួន​ទាំងអស់​របស់​អ្នក​នឹង​ត្រូវ​បាន​លុប។"
po/ko.po+42−40
@@ -8,18 +8,18 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-07-17 03:56+0000\n"
11+"PO-Revision-Date: 2014-08-19 13:02+0000\n"
1212"Last-Translator: MinSik CHO <Unknown>\n"
1313"Language-Team: Korean <ko@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
17+"X-Launchpad-Export-Date: 2014-08-20 06:23+0000\n"
18+"X-Generator: Launchpad (build 17163)\n"
1919
2020#: plugins/LightDM/Greeter.cpp:129
2121msgid "Password: "
22−msgstr ""
22+msgstr "열쇠글: "
2323
2424#: plugins/Unity/Launcher/launcheritem.cpp:43
2525#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -32,19 +32,19 @@ msgstr "바로가기를 고정 해제하기"
3232
3333#: qml/Components/Dialogs.qml:142
3434msgid "Are you sure you would like to turn power off?"
35−msgstr ""
35+msgstr "정말로 전원을 끌까요?"
3636
3737#: qml/Components/Dialogs.qml:144
3838msgid "Power off"
39−msgstr ""
39+msgstr "전원 끄기"
4040
4141#: qml/Components/Dialogs.qml:153
4242msgid "Restart"
43−msgstr ""
43+msgstr "재시작"
4444
4545#: qml/Components/Dialogs.qml:162
4646msgid "Cancel"
47−msgstr ""
47+msgstr "취소"
4848
4949#: qml/Components/EdgeDemoOverlay.qml:151
5050msgid "Skip intro"
@@ -96,46 +96,46 @@ msgstr ""
9696
9797#: qml/Components/Lockscreen.qml:161
9898msgid "Too many incorrect attempts"
99−msgstr ""
99+msgstr "너무 많이 틀리셨습니다"
100100
101101#: qml/Components/Lockscreen.qml:163
102102msgid "Please wait"
103−msgstr ""
103+msgstr "기다려주십시오"
104104
105−#: qml/Components/Lockscreen.qml:245
105+#: qml/Components/Lockscreen.qml:220
106106msgid "Emergency Call"
107107msgstr "긴급 통화"
108108
109−#: qml/Components/Lockscreen.qml:268
109+#: qml/Components/Lockscreen.qml:243
110110msgid "OK"
111111msgstr "확인"
112112
113−#: qml/Components/PassphraseLockscreen.qml:61
113+#: qml/Components/PassphraseLockscreen.qml:62
114114#, qt-format
115115msgid "Hello %1"
116116msgstr "안녕하세요 %1"
117117
118−#: qml/Components/PassphraseLockscreen.qml:61
118+#: qml/Components/PassphraseLockscreen.qml:62
119119msgid "Hello"
120120msgstr "안녕하세요"
121121
122−#: qml/Components/PinLockscreen.qml:197
122+#: qml/Components/PinLockscreen.qml:198
123123msgid "CANCEL"
124124msgstr "취소"
125125
126−#: qml/Components/PinLockscreen.qml:215
126+#: qml/Components/PinLockscreen.qml:216
127127msgid "DONE"
128128msgstr "완료"
129129
130−#: qml/Dash/GenericScopeView.qml:360
130+#: qml/Dash/GenericScopeView.qml:358
131131msgid "See less"
132132msgstr "간단히 표시하기"
133133
134−#: qml/Dash/GenericScopeView.qml:360
134+#: qml/Dash/GenericScopeView.qml:358
135135msgid "See all"
136−msgstr ""
136+msgstr "모두 보기"
137137
138−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
138+#: qml/Panel/SearchIndicator.qml:27
139139msgid "Search"
140140msgstr "검색"
141141
@@ -159,25 +159,25 @@ msgstr "평가 제출하기"
159159msgid "Send"
160160msgstr "보내기"
161161
162−#: qml/Dash/ScopesOverview.qml:201
162+#: qml/Dash/ScopesOverview.qml:200
163163msgid "Manage Dash"
164−msgstr ""
164+msgstr "대시 관리"
165165
166−#: qml/Dash/ScopesOverview.qml:408
166+#: qml/Dash/ScopesOverview.qml:405
167167msgid "Done"
168−msgstr ""
168+msgstr "완료"
169169
170−#: qml/Dash/ScopesOverview.qml:434
170+#: qml/Dash/ScopesOverview.qml:431
171171msgid "Store"
172−msgstr ""
172+msgstr "장터"
173173
174174#: qml/Dash/ScopesOverviewTab.qml:36
175175msgid "Favorites"
176−msgstr ""
176+msgstr "즐겨찾기"
177177
178178#: qml/Dash/ScopesOverviewTab.qml:54
179179msgid "All"
180−msgstr ""
180+msgstr "모두"
181181
182182#: qml/Greeter/Greeter.qml:157
183183msgid "Swipe to unlock"
@@ -213,11 +213,11 @@ msgstr "심카드의 PIN 번호를 입력하세요."
213213
214214#: qml/Panel/ActiveCallHint.qml:77
215215msgid "Tap to return to call..."
216−msgstr ""
216+msgstr "통화로 돌아가려면 터치하세요..."
217217
218218#: qml/Panel/ActiveCallHint.qml:90
219219msgid "Conference"
220−msgstr ""
220+msgstr "회의"
221221
222222#: qml/Panel/Indicators/MenuItemFactory.qml:651
223223msgid "In queue…"
@@ -245,54 +245,56 @@ msgstr "실패하였습니다. 재시도하려면 누르세요."
245245
246246#: qml/Panel/Indicators/ModemInfoItem.qml:105
247247msgid "Unlock SIM"
248−msgstr ""
248+msgstr "SIM 카드 보안 해제"
249249
250250#: qml/Panel/Indicators/RoamingIndication.qml:27
251251msgid "Roaming"
252−msgstr ""
252+msgstr "로밍"
253253
254254#: qml/Shell.qml:267
255255msgid "passphrase"
256−msgstr ""
256+msgstr "비밀번호"
257257
258258#: qml/Shell.qml:267
259259msgid "passcode"
260−msgstr ""
260+msgstr "비밀번호"
261261
262262#: qml/Shell.qml:269
263263#, qt-format
264264msgid "Enter your %1"
265−msgstr ""
265+msgstr "%1를 입력하세요"
266266
267267#: qml/Shell.qml:270
268268#, qt-format
269269msgid "Incorrect %1"
270−msgstr ""
270+msgstr "잘못된 %1입니다"
271271
272272#: qml/Shell.qml:272
273273msgid "Please re-enter"
274−msgstr ""
274+msgstr "다시 입력하세요"
275275
276276#: qml/Shell.qml:306
277277msgid "Sorry, incorrect passphrase."
278−msgstr ""
278+msgstr "잘못된 비밀번호입니다."
279279
280280#: qml/Shell.qml:307
281281msgid "Sorry, incorrect passcode."
282−msgstr ""
282+msgstr "잘못된 비밀번호입니다."
283283
284284#: qml/Shell.qml:308
285285msgid "This will be your last attempt."
286−msgstr ""
286+msgstr "마지막 시도입니다."
287287
288288#: qml/Shell.qml:310
289289msgid ""
290290"If passphrase is entered incorrectly, your phone will conduct a factory "
291291"reset and all personal data will be deleted."
292292msgstr ""
293+"만약 이번 시도에서 잘못 입력하면, 보안을 위해 휴대 전화가 공장 초기화 과정을 거쳐 모든 사용자 데이터를 삭제할 것입니다."
293294
294295#: qml/Shell.qml:311
295296msgid ""
296297"If passcode is entered incorrectly, your phone will conduct a factory reset "
297298"and all personal data will be deleted."
298299msgstr ""
300+"만약 이번 시도에서 잘못 입력하면, 보안을 위해 휴대 전화가 공장 초기화 과정을 거쳐 모든 사용자 데이터를 삭제할 것입니다."
po/lv.po+14−14
@@ -8,18 +8,18 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-08-12 19:07+0000\n"
11+"PO-Revision-Date: 2014-08-21 09:46+0000\n"
1212"Last-Translator: Jānis-Marks Gailis <jm-gailis@fai-vianet.fr>\n"
1313"Language-Team: Latvian <lv@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
17+"X-Launchpad-Export-Date: 2014-08-22 07:39+0000\n"
18+"X-Generator: Launchpad (build 17163)\n"
1919
2020#: plugins/LightDM/Greeter.cpp:129
2121msgid "Password: "
22−msgstr ""
22+msgstr "Parole: "
2323
2424#: plugins/Unity/Launcher/launcheritem.cpp:43
2525#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -32,7 +32,7 @@ msgstr ""
3232
3333#: qml/Components/Dialogs.qml:142
3434msgid "Are you sure you would like to turn power off?"
35−msgstr ""
35+msgstr "Vai esat drošs ka vēlaties izslēgt?"
3636
3737#: qml/Components/Dialogs.qml:144
3838msgid "Power off"
@@ -98,7 +98,7 @@ msgstr ""
9898
9999#: qml/Components/Lockscreen.qml:163
100100msgid "Please wait"
101−msgstr ""
101+msgstr "Lūdzu, uzgaidiet"
102102
103103#: qml/Components/Lockscreen.qml:245
104104msgid "Emergency Call"
@@ -167,7 +167,7 @@ msgstr "Pabeigts"
167167
168168#: qml/Dash/ScopesOverview.qml:434
169169msgid "Store"
170−msgstr ""
170+msgstr "Veikals"
171171
172172#: qml/Dash/ScopesOverviewTab.qml:36
173173msgid "Favorites"
@@ -219,7 +219,7 @@ msgstr "Konference"
219219
220220#: qml/Panel/Indicators/MenuItemFactory.qml:651
221221msgid "In queue…"
222−msgstr ""
222+msgstr "Sarakstā..."
223223
224224#: qml/Panel/Indicators/MenuItemFactory.qml:655
225225msgid "Downloading"
@@ -239,7 +239,7 @@ msgstr "Pabeigts"
239239
240240#: qml/Panel/Indicators/MenuItemFactory.qml:663
241241msgid "Failed, tap to retry"
242−msgstr ""
242+msgstr "Neizdevās, spiest lai mēģināt vēlreiz"
243243
244244#: qml/Panel/Indicators/ModemInfoItem.qml:105
245245msgid "Unlock SIM"
@@ -247,7 +247,7 @@ msgstr "Atbloķēt SIM"
247247
248248#: qml/Panel/Indicators/RoamingIndication.qml:27
249249msgid "Roaming"
250−msgstr ""
250+msgstr "Viesabonēšana"
251251
252252#: qml/Shell.qml:267
253253msgid "passphrase"
@@ -260,16 +260,16 @@ msgstr ""
260260#: qml/Shell.qml:269
261261#, qt-format
262262msgid "Enter your %1"
263−msgstr ""
263+msgstr "Ievadiet jūsu %1"
264264
265265#: qml/Shell.qml:270
266266#, qt-format
267267msgid "Incorrect %1"
268−msgstr ""
268+msgstr "Nepareizs %1"
269269
270270#: qml/Shell.qml:272
271271msgid "Please re-enter"
272−msgstr ""
272+msgstr "Lūdzu ievadiet vēlreiz"
273273
274274#: qml/Shell.qml:306
275275msgid "Sorry, incorrect passphrase."
@@ -281,7 +281,7 @@ msgstr ""
281281
282282#: qml/Shell.qml:308
283283msgid "This will be your last attempt."
284−msgstr ""
284+msgstr "Šīs būs jūs pēdējais mēģinājums."
285285
286286#: qml/Shell.qml:310
287287msgid ""
po/pl.po+20−20
@@ -8,13 +8,13 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-07-31 13:51+0000\n"
12−"Last-Translator: Michał Radwański <radwanski.michal@outlook.com>\n"
11+"PO-Revision-Date: 2014-08-18 20:25+0000\n"
12+"Last-Translator: Paweł Stroka <pawstr@gmail.com>\n"
1313"Language-Team: Polish <pl@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-19 06:59+0000\n"
1818"X-Generator: Launchpad (build 17156)\n"
1919
2020#: plugins/LightDM/Greeter.cpp:129
@@ -104,40 +104,40 @@ msgstr ""
104104msgid "Please wait"
105105msgstr ""
106106
107−#: qml/Components/Lockscreen.qml:245
107+#: qml/Components/Lockscreen.qml:220
108108msgid "Emergency Call"
109109msgstr "Telefon ratunkowy"
110110
111−#: qml/Components/Lockscreen.qml:268
111+#: qml/Components/Lockscreen.qml:243
112112msgid "OK"
113113msgstr "OK"
114114
115−#: qml/Components/PassphraseLockscreen.qml:61
115+#: qml/Components/PassphraseLockscreen.qml:62
116116#, qt-format
117117msgid "Hello %1"
118118msgstr "Witaj %1"
119119
120−#: qml/Components/PassphraseLockscreen.qml:61
120+#: qml/Components/PassphraseLockscreen.qml:62
121121msgid "Hello"
122122msgstr "Witaj"
123123
124−#: qml/Components/PinLockscreen.qml:197
124+#: qml/Components/PinLockscreen.qml:198
125125msgid "CANCEL"
126126msgstr "ANULUJ"
127127
128−#: qml/Components/PinLockscreen.qml:215
128+#: qml/Components/PinLockscreen.qml:216
129129msgid "DONE"
130130msgstr "ZROBIONE"
131131
132−#: qml/Dash/GenericScopeView.qml:360
132+#: qml/Dash/GenericScopeView.qml:358
133133msgid "See less"
134134msgstr "Zobacz mniej"
135135
136−#: qml/Dash/GenericScopeView.qml:360
136+#: qml/Dash/GenericScopeView.qml:358
137137msgid "See all"
138138msgstr "Zobacz wszystko"
139139
140−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
140+#: qml/Panel/SearchIndicator.qml:27
141141msgid "Search"
142142msgstr "Szukaj"
143143
@@ -161,15 +161,15 @@ msgstr "Dodaj recenzję"
161161msgid "Send"
162162msgstr "Wyślij"
163163
164−#: qml/Dash/ScopesOverview.qml:201
164+#: qml/Dash/ScopesOverview.qml:200
165165msgid "Manage Dash"
166166msgstr ""
167167
168−#: qml/Dash/ScopesOverview.qml:408
168+#: qml/Dash/ScopesOverview.qml:405
169169msgid "Done"
170170msgstr ""
171171
172−#: qml/Dash/ScopesOverview.qml:434
172+#: qml/Dash/ScopesOverview.qml:431
173173msgid "Store"
174174msgstr ""
175175
@@ -255,11 +255,11 @@ msgstr ""
255255
256256#: qml/Shell.qml:267
257257msgid "passphrase"
258−msgstr ""
258+msgstr "hasło"
259259
260260#: qml/Shell.qml:267
261261msgid "passcode"
262−msgstr ""
262+msgstr "kod"
263263
264264#: qml/Shell.qml:269
265265#, qt-format
@@ -273,15 +273,15 @@ msgstr ""
273273
274274#: qml/Shell.qml:272
275275msgid "Please re-enter"
276−msgstr ""
276+msgstr "Proszę wprowadzić ponownie"
277277
278278#: qml/Shell.qml:306
279279msgid "Sorry, incorrect passphrase."
280−msgstr ""
280+msgstr "Niestety, błędne hasło"
281281
282282#: qml/Shell.qml:307
283283msgid "Sorry, incorrect passcode."
284−msgstr ""
284+msgstr "Niestety, błędny kod"
285285
286286#: qml/Shell.qml:308
287287msgid "This will be your last attempt."
po/pt_BR.po+33−29
@@ -8,18 +8,18 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-08-13 04:53+0000\n"
12−"Last-Translator: Tiago Hillebrandt <tiagohillebrandt@gmail.com>\n"
11+"PO-Revision-Date: 2014-08-18 14:14+0000\n"
12+"Last-Translator: Rafael Neri <Unknown>\n"
1313"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-19 06:59+0000\n"
1818"X-Generator: Launchpad (build 17156)\n"
1919
2020#: plugins/LightDM/Greeter.cpp:129
2121msgid "Password: "
22−msgstr ""
22+msgstr "Senha: "
2323
2424#: plugins/Unity/Launcher/launcheritem.cpp:43
2525#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -98,46 +98,46 @@ msgstr ""
9898
9999#: qml/Components/Lockscreen.qml:161
100100msgid "Too many incorrect attempts"
101−msgstr ""
101+msgstr "Muitas tentativas incorretas"
102102
103103#: qml/Components/Lockscreen.qml:163
104104msgid "Please wait"
105−msgstr ""
105+msgstr "Por favor, aguarde"
106106
107−#: qml/Components/Lockscreen.qml:245
107+#: qml/Components/Lockscreen.qml:220
108108msgid "Emergency Call"
109109msgstr "Chamada de emergência"
110110
111−#: qml/Components/Lockscreen.qml:268
111+#: qml/Components/Lockscreen.qml:243
112112msgid "OK"
113113msgstr "OK"
114114
115−#: qml/Components/PassphraseLockscreen.qml:61
115+#: qml/Components/PassphraseLockscreen.qml:62
116116#, qt-format
117117msgid "Hello %1"
118118msgstr "Olá %1"
119119
120−#: qml/Components/PassphraseLockscreen.qml:61
120+#: qml/Components/PassphraseLockscreen.qml:62
121121msgid "Hello"
122122msgstr "Olá"
123123
124−#: qml/Components/PinLockscreen.qml:197
124+#: qml/Components/PinLockscreen.qml:198
125125msgid "CANCEL"
126126msgstr "CANCELAR"
127127
128−#: qml/Components/PinLockscreen.qml:215
128+#: qml/Components/PinLockscreen.qml:216
129129msgid "DONE"
130130msgstr "FEITO"
131131
132−#: qml/Dash/GenericScopeView.qml:360
132+#: qml/Dash/GenericScopeView.qml:358
133133msgid "See less"
134134msgstr "Ver menos"
135135
136−#: qml/Dash/GenericScopeView.qml:360
136+#: qml/Dash/GenericScopeView.qml:358
137137msgid "See all"
138138msgstr "Ver todos"
139139
140−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
140+#: qml/Panel/SearchIndicator.qml:27
141141msgid "Search"
142142msgstr "Pesquisar"
143143
@@ -161,15 +161,15 @@ msgstr "Adicionar uma análise"
161161msgid "Send"
162162msgstr "Enviar"
163163
164−#: qml/Dash/ScopesOverview.qml:201
164+#: qml/Dash/ScopesOverview.qml:200
165165msgid "Manage Dash"
166−msgstr ""
166+msgstr "Gerencia painel"
167167
168−#: qml/Dash/ScopesOverview.qml:408
168+#: qml/Dash/ScopesOverview.qml:405
169169msgid "Done"
170−msgstr ""
170+msgstr "Concluído"
171171
172−#: qml/Dash/ScopesOverview.qml:434
172+#: qml/Dash/ScopesOverview.qml:431
173173msgid "Store"
174174msgstr "Loja"
175175
@@ -179,7 +179,7 @@ msgstr "Favoritos"
179179
180180#: qml/Dash/ScopesOverviewTab.qml:54
181181msgid "All"
182−msgstr ""
182+msgstr "Tudo"
183183
184184#: qml/Greeter/Greeter.qml:157
185185msgid "Swipe to unlock"
@@ -255,46 +255,50 @@ msgstr "Roaming"
255255
256256#: qml/Shell.qml:267
257257msgid "passphrase"
258−msgstr ""
258+msgstr "senha"
259259
260260#: qml/Shell.qml:267
261261msgid "passcode"
262−msgstr ""
262+msgstr "código de acesso"
263263
264264#: qml/Shell.qml:269
265265#, qt-format
266266msgid "Enter your %1"
267−msgstr ""
267+msgstr "Digite o seu %1"
268268
269269#: qml/Shell.qml:270
270270#, qt-format
271271msgid "Incorrect %1"
272−msgstr ""
272+msgstr "%1 incorreto"
273273
274274#: qml/Shell.qml:272
275275msgid "Please re-enter"
276−msgstr ""
276+msgstr "Por favor, digite novamente"
277277
278278#: qml/Shell.qml:306
279279msgid "Sorry, incorrect passphrase."
280−msgstr ""
280+msgstr "Desculpe, senha incorreta."
281281
282282#: qml/Shell.qml:307
283283msgid "Sorry, incorrect passcode."
284−msgstr ""
284+msgstr "Desculpe, código de acesso incorreto."
285285
286286#: qml/Shell.qml:308
287287msgid "This will be your last attempt."
288−msgstr ""
288+msgstr "Esta será a sua última tentativa."
289289
290290#: qml/Shell.qml:310
291291msgid ""
292292"If passphrase is entered incorrectly, your phone will conduct a factory "
293293"reset and all personal data will be deleted."
294294msgstr ""
295+"Se a senha for digitada incorretamente, o telefone será restaurado aos "
296+"padrões de fábrica e todos os dados pessoais serão apagados."
295297
296298#: qml/Shell.qml:311
297299msgid ""
298300"If passcode is entered incorrectly, your phone will conduct a factory reset "
299301"and all personal data will be deleted."
300302msgstr ""
303+"Se o código de acesso for digitado incorretamente, o telefone será "
304+"restaurado aos padrões de fábrica e todos os dados pessoais serão apagados."
po/ru.po+39−35
@@ -8,18 +8,18 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-07-31 09:39+0000\n"
11+"PO-Revision-Date: 2014-08-20 12:41+0000\n"
1212"Last-Translator: Jay ZDLin <Unknown>\n"
1313"Language-Team: Russian <ru@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
17+"X-Launchpad-Export-Date: 2014-08-21 06:48+0000\n"
18+"X-Generator: Launchpad (build 17163)\n"
1919
2020#: plugins/LightDM/Greeter.cpp:129
2121msgid "Password: "
22−msgstr ""
22+msgstr "Пароль: "
2323
2424#: plugins/Unity/Launcher/launcheritem.cpp:43
2525#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -32,19 +32,19 @@ msgstr "Изъять ярлык"
3232
3333#: qml/Components/Dialogs.qml:142
3434msgid "Are you sure you would like to turn power off?"
35−msgstr ""
35+msgstr "Отключить питание?"
3636
3737#: qml/Components/Dialogs.qml:144
3838msgid "Power off"
39−msgstr ""
39+msgstr "Отключить"
4040
4141#: qml/Components/Dialogs.qml:153
4242msgid "Restart"
43−msgstr ""
43+msgstr "Перезапустить"
4444
4545#: qml/Components/Dialogs.qml:162
4646msgid "Cancel"
47−msgstr ""
47+msgstr "Отменить"
4848
4949#: qml/Components/EdgeDemoOverlay.qml:151
5050msgid "Skip intro"
@@ -101,46 +101,46 @@ msgstr ""
101101
102102#: qml/Components/Lockscreen.qml:161
103103msgid "Too many incorrect attempts"
104−msgstr ""
104+msgstr "Слишком много ошибок ввода"
105105
106106#: qml/Components/Lockscreen.qml:163
107107msgid "Please wait"
108−msgstr ""
108+msgstr "Подождите"
109109
110−#: qml/Components/Lockscreen.qml:245
110+#: qml/Components/Lockscreen.qml:220
111111msgid "Emergency Call"
112112msgstr "Экстренный вызов"
113113
114−#: qml/Components/Lockscreen.qml:268
114+#: qml/Components/Lockscreen.qml:243
115115msgid "OK"
116116msgstr "ОК"
117117
118−#: qml/Components/PassphraseLockscreen.qml:61
118+#: qml/Components/PassphraseLockscreen.qml:62
119119#, qt-format
120120msgid "Hello %1"
121121msgstr "Привет, %1"
122122
123−#: qml/Components/PassphraseLockscreen.qml:61
123+#: qml/Components/PassphraseLockscreen.qml:62
124124msgid "Hello"
125125msgstr "Привет"
126126
127−#: qml/Components/PinLockscreen.qml:197
127+#: qml/Components/PinLockscreen.qml:198
128128msgid "CANCEL"
129129msgstr "ОТМЕНИТЬ"
130130
131−#: qml/Components/PinLockscreen.qml:215
131+#: qml/Components/PinLockscreen.qml:216
132132msgid "DONE"
133133msgstr "ГОТОВО"
134134
135−#: qml/Dash/GenericScopeView.qml:360
135+#: qml/Dash/GenericScopeView.qml:358
136136msgid "See less"
137137msgstr "Вкратце"
138138
139−#: qml/Dash/GenericScopeView.qml:360
139+#: qml/Dash/GenericScopeView.qml:358
140140msgid "See all"
141141msgstr "Показать всё"
142142
143−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
143+#: qml/Panel/SearchIndicator.qml:27
144144msgid "Search"
145145msgstr "Поиск"
146146
@@ -164,25 +164,25 @@ msgstr "Добавьте отзыв"
164164msgid "Send"
165165msgstr "Отправить"
166166
167−#: qml/Dash/ScopesOverview.qml:201
167+#: qml/Dash/ScopesOverview.qml:200
168168msgid "Manage Dash"
169169msgstr ""
170170
171−#: qml/Dash/ScopesOverview.qml:408
171+#: qml/Dash/ScopesOverview.qml:405
172172msgid "Done"
173−msgstr ""
173+msgstr "Готово"
174174
175−#: qml/Dash/ScopesOverview.qml:434
175+#: qml/Dash/ScopesOverview.qml:431
176176msgid "Store"
177177msgstr ""
178178
179179#: qml/Dash/ScopesOverviewTab.qml:36
180180msgid "Favorites"
181−msgstr ""
181+msgstr "Избранное"
182182
183183#: qml/Dash/ScopesOverviewTab.qml:54
184184msgid "All"
185−msgstr ""
185+msgstr "Все"
186186
187187#: qml/Greeter/Greeter.qml:157
188188msgid "Swipe to unlock"
@@ -250,54 +250,58 @@ msgstr "Сбой, коснитесь для повтора"
250250
251251#: qml/Panel/Indicators/ModemInfoItem.qml:105
252252msgid "Unlock SIM"
253−msgstr ""
253+msgstr "Разблокировать SIM-карту"
254254
255255#: qml/Panel/Indicators/RoamingIndication.qml:27
256256msgid "Roaming"
257−msgstr ""
257+msgstr "Роуминг"
258258
259259#: qml/Shell.qml:267
260260msgid "passphrase"
261−msgstr ""
261+msgstr "ключевая фраза"
262262
263263#: qml/Shell.qml:267
264264msgid "passcode"
265−msgstr ""
265+msgstr "секретный код"
266266
267267#: qml/Shell.qml:269
268268#, qt-format
269269msgid "Enter your %1"
270−msgstr ""
270+msgstr "Введите %1"
271271
272272#: qml/Shell.qml:270
273273#, qt-format
274274msgid "Incorrect %1"
275−msgstr ""
275+msgstr "Некорректно введён %1"
276276
277277#: qml/Shell.qml:272
278278msgid "Please re-enter"
279−msgstr ""
279+msgstr "Повторите ввод"
280280
281281#: qml/Shell.qml:306
282282msgid "Sorry, incorrect passphrase."
283−msgstr ""
283+msgstr "Неверная ключевая фраза."
284284
285285#: qml/Shell.qml:307
286286msgid "Sorry, incorrect passcode."
287−msgstr ""
287+msgstr "Неверный секретный код."
288288
289289#: qml/Shell.qml:308
290290msgid "This will be your last attempt."
291−msgstr ""
291+msgstr "Осталась последняя попытка."
292292
293293#: qml/Shell.qml:310
294294msgid ""
295295"If passphrase is entered incorrectly, your phone will conduct a factory "
296296"reset and all personal data will be deleted."
297297msgstr ""
298+"Если ключевая фраза будет введена неверно, то телефон вернётся к заводским "
299+"настройкам, а все личные данные будут удалены."
298300
299301#: qml/Shell.qml:311
300302msgid ""
301303"If passcode is entered incorrectly, your phone will conduct a factory reset "
302304"and all personal data will be deleted."
303305msgstr ""
306+"Если секретный код будет введен неверно, то телефон вернётся к заводским "
307+"настройкам, а все личные данные будут удалены."
po/sl.po+41−37
@@ -8,18 +8,18 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11−"PO-Revision-Date: 2014-08-06 06:11+0000\n"
11+"PO-Revision-Date: 2014-08-19 12:54+0000\n"
1212"Last-Translator: Damir Jerovšek <Unknown>\n"
1313"Language-Team: Slovenian <sl@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
17+"X-Launchpad-Export-Date: 2014-08-20 06:23+0000\n"
18+"X-Generator: Launchpad (build 17163)\n"
1919
2020#: plugins/LightDM/Greeter.cpp:129
2121msgid "Password: "
22−msgstr ""
22+msgstr "Geslo: "
2323
2424#: plugins/Unity/Launcher/launcheritem.cpp:43
2525#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -32,19 +32,19 @@ msgstr "Odpni bližnjico"
3232
3333#: qml/Components/Dialogs.qml:142
3434msgid "Are you sure you would like to turn power off?"
35−msgstr ""
35+msgstr "Ali ste prepričani, da želite izklopiti?"
3636
3737#: qml/Components/Dialogs.qml:144
3838msgid "Power off"
39−msgstr ""
39+msgstr "Izklopi"
4040
4141#: qml/Components/Dialogs.qml:153
4242msgid "Restart"
43−msgstr ""
43+msgstr "Ponovno zaženi"
4444
4545#: qml/Components/Dialogs.qml:162
4646msgid "Cancel"
47−msgstr ""
47+msgstr "Prekliči"
4848
4949#: qml/Components/EdgeDemoOverlay.qml:151
5050msgid "Skip intro"
@@ -98,46 +98,46 @@ msgstr ""
9898
9999#: qml/Components/Lockscreen.qml:161
100100msgid "Too many incorrect attempts"
101−msgstr ""
101+msgstr "Preveč nepravilnih poskusov"
102102
103103#: qml/Components/Lockscreen.qml:163
104104msgid "Please wait"
105−msgstr ""
105+msgstr "Počakajte"
106106
107−#: qml/Components/Lockscreen.qml:245
107+#: qml/Components/Lockscreen.qml:220
108108msgid "Emergency Call"
109109msgstr "Klic v sili"
110110
111−#: qml/Components/Lockscreen.qml:268
111+#: qml/Components/Lockscreen.qml:243
112112msgid "OK"
113113msgstr "V REDU"
114114
115−#: qml/Components/PassphraseLockscreen.qml:61
115+#: qml/Components/PassphraseLockscreen.qml:62
116116#, qt-format
117117msgid "Hello %1"
118118msgstr "Pozdravljeni, %1"
119119
120−#: qml/Components/PassphraseLockscreen.qml:61
120+#: qml/Components/PassphraseLockscreen.qml:62
121121msgid "Hello"
122122msgstr "Pozdravljeni"
123123
124−#: qml/Components/PinLockscreen.qml:197
124+#: qml/Components/PinLockscreen.qml:198
125125msgid "CANCEL"
126126msgstr "PREKLIČI"
127127
128−#: qml/Components/PinLockscreen.qml:215
128+#: qml/Components/PinLockscreen.qml:216
129129msgid "DONE"
130130msgstr "KONČANO"
131131
132−#: qml/Dash/GenericScopeView.qml:360
132+#: qml/Dash/GenericScopeView.qml:358
133133msgid "See less"
134134msgstr "Pokaži manj"
135135
136−#: qml/Dash/GenericScopeView.qml:360
136+#: qml/Dash/GenericScopeView.qml:358
137137msgid "See all"
138138msgstr "Ogled vsega"
139139
140−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
140+#: qml/Panel/SearchIndicator.qml:27
141141msgid "Search"
142142msgstr "Iskanje"
143143
@@ -161,25 +161,25 @@ msgstr "Dodaj oceno"
161161msgid "Send"
162162msgstr "Pošlji"
163163
164−#: qml/Dash/ScopesOverview.qml:201
164+#: qml/Dash/ScopesOverview.qml:200
165165msgid "Manage Dash"
166−msgstr ""
166+msgstr "Upravljaj s pregledno ploščo"
167167
168−#: qml/Dash/ScopesOverview.qml:408
168+#: qml/Dash/ScopesOverview.qml:405
169169msgid "Done"
170−msgstr ""
170+msgstr "Končano"
171171
172−#: qml/Dash/ScopesOverview.qml:434
172+#: qml/Dash/ScopesOverview.qml:431
173173msgid "Store"
174−msgstr ""
174+msgstr "Trgovina"
175175
176176#: qml/Dash/ScopesOverviewTab.qml:36
177177msgid "Favorites"
178−msgstr ""
178+msgstr "Priljubljeni"
179179
180180#: qml/Dash/ScopesOverviewTab.qml:54
181181msgid "All"
182−msgstr ""
182+msgstr "Vse"
183183
184184#: qml/Greeter/Greeter.qml:157
185185msgid "Swipe to unlock"
@@ -247,54 +247,58 @@ msgstr "Spodletelo, tapnite za ponovni poskus"
247247
248248#: qml/Panel/Indicators/ModemInfoItem.qml:105
249249msgid "Unlock SIM"
250−msgstr ""
250+msgstr "Odkleni SIM"
251251
252252#: qml/Panel/Indicators/RoamingIndication.qml:27
253253msgid "Roaming"
254−msgstr ""
254+msgstr "Gostovanje"
255255
256256#: qml/Shell.qml:267
257257msgid "passphrase"
258−msgstr ""
258+msgstr "šifrirno reklo"
259259
260260#: qml/Shell.qml:267
261261msgid "passcode"
262−msgstr ""
262+msgstr "geslo"
263263
264264#: qml/Shell.qml:269
265265#, qt-format
266266msgid "Enter your %1"
267−msgstr ""
267+msgstr "Vnesite vaš %1"
268268
269269#: qml/Shell.qml:270
270270#, qt-format
271271msgid "Incorrect %1"
272−msgstr ""
272+msgstr "Nepravilen %1"
273273
274274#: qml/Shell.qml:272
275275msgid "Please re-enter"
276−msgstr ""
276+msgstr "Ponovno vnesite"
277277
278278#: qml/Shell.qml:306
279279msgid "Sorry, incorrect passphrase."
280−msgstr ""
280+msgstr "Nepravilno geslo."
281281
282282#: qml/Shell.qml:307
283283msgid "Sorry, incorrect passcode."
284−msgstr ""
284+msgstr "Nepravilno geslo."
285285
286286#: qml/Shell.qml:308
287287msgid "This will be your last attempt."
288−msgstr ""
288+msgstr "To je vaš zadnji poskus"
289289
290290#: qml/Shell.qml:310
291291msgid ""
292292"If passphrase is entered incorrectly, your phone will conduct a factory "
293293"reset and all personal data will be deleted."
294294msgstr ""
295+"Če je vneseno nepravilno šifrirno reklo, bo telefon ponastavljen na "
296+"tovarniške nastavitve ter vsi osebni podatki bodo izbrisani."
295297
296298#: qml/Shell.qml:311
297299msgid ""
298300"If passcode is entered incorrectly, your phone will conduct a factory reset "
299301"and all personal data will be deleted."
300302msgstr ""
303+"Če je vneseno nepravilno geslo, bo telefon ponastavljen na tovarniške "
304+"nastavitve ter vsi osebni podatki bodo izbrisani."
qml/Dash/Dash.qml+1−2
@@ -341,8 +341,7 @@ Showable {
341341 objectName: "overviewDragHandle"
342342 z: 1
343343 direction: Direction.Upwards
344− enabled: !dashContent.previewShown &&
345− !dashContent.settingsShown &&
344+ enabled: !dashContent.subPageShown &&
346345 dashContent.currentScope &&
347346 dashContent.currentScope.searchQuery == "" &&
348347 (overviewController.progress == 0 || dragging)
qml/Dash/DashContent.qml+4−6
@@ -27,10 +27,8 @@ Item {
2727 readonly property alias currentIndex: dashContentList.currentIndex
2828 readonly property string currentScopeId: dashContentList.currentItem ? dashContentList.currentItem.scopeId : ""
2929 readonly property var currentScope: dashContentList.currentItem ? dashContentList.currentItem.theScope : null
30− readonly property bool previewShown: dashContentList.currentItem && dashContentList.currentItem.item ?
31− dashContentList.currentItem.item.previewShown : false
32− readonly property bool settingsShown: dashContentList.currentItem && dashContentList.currentItem.item ?
33− dashContentList.currentItem.item.settingsShown : false
30+ readonly property bool subPageShown: dashContentList.currentItem && dashContentList.currentItem.item ?
31+ dashContentList.currentItem.item.subPageShown : false
3432 readonly property bool processing: dashContentList.currentItem && dashContentList.currentItem.item
3533 && dashContentList.currentItem.item.processing || false
3634 readonly property bool pageHeaderTotallyVisible: dashContentList.currentItem && dashContentList.currentItem.item
@@ -98,7 +96,7 @@ Item {
9896 id: dashContentList
9997 objectName: "dashContentList"
10098
101− interactive: dashContent.scopes.loaded && currentItem && !currentItem.moving && !currentItem.navigationShown && !currentItem.settingsShown
99+ interactive: dashContent.scopes.loaded && currentItem && !currentItem.moving && !currentItem.navigationShown && !currentItem.subPageShown
102100 anchors.fill: parent
103101 orientation: ListView.Horizontal
104102 boundsBehavior: Flickable.DragAndOvershootBounds
@@ -155,7 +153,7 @@ Item {
155153
156154 readonly property bool moving: item ? item.moving : false
157155 readonly property bool navigationShown: item ? item.navigationShown : false
158− readonly property bool settingsShown: item ? item.settingsShown : false
156+ readonly property bool subPageShown: item ? item.subPageShown : false
159157 readonly property var categoryView: item ? item.categoryView : null
160158 readonly property var theScope: scope
161159
qml/Dash/GenericScopeView.qml+8−14
@@ -34,8 +34,7 @@ FocusScope {
3434 property bool enableHeightBehaviorOnNextCreation: false
3535 property var categoryView: categoryView
3636 property bool showPageHeader: true
37− readonly property alias previewShown: subPageLoader.previewShown
38− readonly property alias settingsShown: subPageLoader.settingsShown
37+ readonly property alias subPageShown: subPageLoader.subPageShown
3938 property int paginationCount: 0
4039 property int paginationIndex: 0
4140 property alias pageHeaderTotallyVisible: categoryView.pageHeaderTotallyVisible
@@ -425,7 +424,7 @@ FocusScope {
425424 searchHint: scopeView.scope && scopeView.scope.searchHint || i18n.tr("Search")
426425 showBackButton: scopeView.hasBackAction
427426 searchEntryEnabled: true
428− settingsEnabled: scopeView.scope ? scopeView.scope.settings && scopeView.scope.settings.count > 0 : false
427+ settingsEnabled: scopeView.scope && scopeView.scope.settings && scopeView.scope.settings.count > 0 || false
429428 favoriteEnabled: scopeView.scope && scopeView.scope.id !== "clickscope"
430429 scope: scopeView.scope
431430 scopeStyle: scopeView.scopeStyle
@@ -469,23 +468,21 @@ FocusScope {
469468
470469 readonly property bool processing: item && item.processing || false
471470 readonly property int count: item && item.count || 0
472− readonly property int currentIndex: item && item.currentIndex || -1
473− readonly property var currentItem: item && item.currentItem || null
471+ readonly property int currentIndex: item && item.currentIndex || 0
472+ readonly property var currentItem: item && item.currentItem || null
474473
475474 property string subPage: ""
476− readonly property bool previewShown: visible && subPage == "preview"
477− readonly property bool settingsShown: visible && subPage == "settings"
475+ readonly property bool subPageShown: visible && status === Loader.Ready
478476
479477 function openSubPage(page) {
480478 subPage = page;
481− open = true;
482479 }
483480
484481 function closeSubPage() {
485482 open = false;
486483 }
487484
488− source: visible && subPage && (subPage == "preview" ? "PreviewListView.qml" : "ScopeSettingsPage.qml") || ""
485+ source: subPage && (subPage == "preview" ? "PreviewListView.qml" : "ScopeSettingsPage.qml") || ""
489486
490487 onLoaded: {
491488 if (status === Loader.Ready) {
@@ -496,16 +493,13 @@ FocusScope {
496493 item.initialIndex = Qt.binding(function() { return subPageLoader.initialIndex } )
497494 item.model = Qt.binding(function() { return subPageLoader.model } )
498495 }
496+ open = true;
499497 }
500498 }
501499
502500 onOpenChanged: pageHeaderLoader.item.unfocus();
503501
504− onVisibleChanged: {
505− if (!visible) {
506− subPage = "";
507− }
508− }
502+ onVisibleChanged: if (!visible) subPage = "";
509503
510504 Connections {
511505 target: subPageLoader.item
qml/Dash/PreviewListView.qml+4−1
@@ -82,7 +82,10 @@ Item {
8282 }
8383
8484 onCountChanged: {
85− if (count > 0) currentIndex = initialIndex;
85+ if (count > 0 && initialIndex >= 0) {
86+ currentIndex = initialIndex;
87+ initialIndex = -1;
88+ }
8689 }
8790
8891 delegate: Previews.Preview {
qml/Greeter/Clock.qml+2−1
@@ -16,6 +16,7 @@
1616
1717import QtQuick 2.0
1818import Ubuntu.Components 0.1
19+import "../Panel/Indicators"
1920import Unity.Indicators 0.1 as Indicators
2021
2122Item {
@@ -33,7 +34,7 @@ Item {
3334 }
3435 }
3536
36− Indicators.CachedUnityMenuModel {
37+ CachedUnityMenuModel {
3738 id: timeModel
3839 objectName: "timeModel"
3940
qml/Notifications/Notification.qml+1−1
@@ -52,7 +52,7 @@ Item {
5252 implicitHeight: type !== Notification.PlaceHolder ? (fullscreen ? maxHeight : contentColumn.height + contentColumn.spacing * 2) : 0
5353
5454 color: Qt.rgba(0.132, 0.117, 0.109, 0.97)
55− opacity: 0
55+ opacity: 1
5656
5757 state: {
5858 var result = "";
qml/Notifications/Notifications.qml+2−2
@@ -79,7 +79,7 @@ ListView {
7979 }
8080 }
8181
82− populate: Transition {
82+ /*populate: Transition {
8383 UbuntuNumberAnimation {
8484 property: "opacity"
8585 to: 1
@@ -107,5 +107,5 @@ ListView {
107107 properties: "x,y"
108108 duration: UbuntuAnimation.SnapDuration
109109 }
110− }
110+ }*/
111111}
tests/mocks/Unity/Indicators/CachedUnityMenuModel.qml → qml/Panel/Indicators/CachedUnityMenuModel.qmlrenamed+14−5
@@ -18,13 +18,22 @@
1818 */
1919
2020import QtQuick 2.0
21+import QMenuModel 0.1
22+import Unity.Indicators 0.1 as Indicators
2123
24+// Make sure we don't duplicate models.
2225Item {
23− property string busName: ""
24− property string actionsObjectPath: ""
25− property string menuObjectPath: ""
26+ id: cachedModel
27+ property string busName
28+ property string actionsObjectPath
29+ property string menuObjectPath
30+ readonly property bool ready: busName!=="" && actionsObjectPath!=="" && menuObjectPath!==""
2631
27− readonly property bool ready: false
32+ property var model: {
33+ if (!ready) return null;
2834
29− property QtObject model: null
35+ return Indicators.UnityMenuModelCache.model(cachedModel.busName,
36+ cachedModel.menuObjectPath,
37+ { "indicator": cachedModel.actionsObjectPath });
38+ }
3039}
qml/Panel/Indicators/DefaultIndicatorWidget.qml+2−1
@@ -63,6 +63,7 @@ IndicatorBase {
6363 }
6464
6565 Row {
66+ id: iconRow
6667 anchors {
6768 top: parent.top
6869 bottom: parent.bottom
@@ -73,7 +74,7 @@ IndicatorBase {
7374
7475 Item {
7576 width: itemImage.width + units.gu(1)
76− anchors { top: parent.top; bottom: parent.bottom }
77+ height: iconRow.height
7778
7879 StatusIcon {
7980 id: itemImage
qml/Panel/Indicators/IndicatorBase.qml+4−2
@@ -34,6 +34,7 @@ Item {
3434 property string deviceMenuObjectPath: menuObjectPath
3535
3636 property alias menuModel: cachedModel.model
37+ property alias rootActionState: rootAction
3738
3839 CachedUnityMenuModel {
3940 id: cachedModel
@@ -42,8 +43,9 @@ Item {
4243 menuObjectPath: indicatorItem.deviceMenuObjectPath
4344 }
4445
45− property RootActionState rootActionState: RootActionState {
46− menu: menuModel
46+ RootActionState {
47+ id: rootAction
48+ menu: menuModel ? menuModel : null
4749 onUpdated: indicatorItem.rootActionStateChanged()
4850 }
4951}
tests/autopilot/unity8/shell/emulators/dash.py+1
@@ -186,6 +186,7 @@ class GenericScopeView(emulators.UnityEmulatorBase):
186186 self.click_scope_item(category, app_name)
187187 preview_list = self.wait_select_single(
188188 'QQuickLoader', objectName='subPageLoader')
189+ preview_list.subPageShown.wait_for(True)
189190 preview_list.x.wait_for(0)
190191 return preview_list.select_single(
191192 Preview, objectName='preview{}'.format(preview_list.currentIndex))
tests/mocks/QMenuModel/unitymenumodel.cpp+4−5
@@ -17,7 +17,6 @@
1717 */
1818
1919#include "unitymenumodel.h"
20−#include <QDebug>
2120
2221enum MenuRoles {
2322 LabelRole = Qt::DisplayRole + 1,
@@ -38,6 +37,10 @@ UnityMenuModel::UnityMenuModel(QObject *parent)
3837{
3938}
4039
40+UnityMenuModel::~UnityMenuModel()
41+{
42+}
43+
4144QVariant UnityMenuModel::modelData() const
4245{
4346 return m_modelData;
@@ -83,10 +86,6 @@ void UnityMenuModel::removeRow(int row)
8386 endRemoveRows();
8487}
8588
86−UnityMenuModel::~UnityMenuModel()
87−{
88−}
89−
9089QByteArray UnityMenuModel::busName() const
9190{
9291 return m_busName;
tests/mocks/Unity/Indicators/CMakeLists.txt+6−1
@@ -14,6 +14,7 @@ set(IndicatorsFakeQml_SOURCES
1414 fakeplugin.cpp
1515 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/indicators.h
1616 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/menucontentactivator.cpp
17+ ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/unitymenumodelcache.cpp
1718 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/unitymenumodelstack.cpp
1819 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/visibleindicatorsmodel.cpp
1920 fakeindicatorsmodel.cpp
@@ -33,7 +34,11 @@ add_library(IndicatorsFakeQml SHARED
3334)
3435add_definitions(-DUNITYINDICATORS_LIBRARY)
3536
36−target_link_libraries(IndicatorsFakeQml)
37+add_dependencies(IndicatorsFakeQml QMenuModelQml)
38+target_link_libraries(IndicatorsFakeQml
39+ -L${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel
40+ -lqmenumodel
41+)
3742
3843qt5_use_modules(IndicatorsFakeQml Core Qml Quick)
3944
tests/mocks/Unity/Indicators/fakeplugin.cpp+9
@@ -26,9 +26,16 @@
2626#include "fakeindicatorsmodel.h"
2727#include "indicators.h"
2828#include "menucontentactivator.h"
29+#include "unitymenumodelcache.h"
2930#include "unitymenumodelstack.h"
3031#include "visibleindicatorsmodel.h"
3132
33+static QObject* menuModelCacheSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {
34+ Q_UNUSED(engine);
35+ Q_UNUSED(scriptEngine);
36+ return new UnityMenuModelCache;
37+}
38+
3239void IndicatorsFakePlugin::registerTypes(const char * uri)
3340{
3441 Q_INIT_RESOURCE(indicators_fake);
@@ -41,6 +48,8 @@ void IndicatorsFakePlugin::registerTypes(const char * uri)
4148 qmlRegisterType<UnityMenuModelStack>(uri, 0, 1, "UnityMenuModelStack");
4249 qmlRegisterType<VisibleIndicatorsModel>(uri, 0, 1, "VisibleIndicatorsModel");
4350
51+ qmlRegisterSingletonType<UnityMenuModelCache>(uri, 0, 1, "UnityMenuModelCache", menuModelCacheSingleton);
52+
4453 // external uncreatables
4554 qmlRegisterUncreatableType<MenuContentState>(uri, 0, 1, "MenuContentState", "Can't create MenuContentState class");
4655 qmlRegisterUncreatableType<ActionState>(uri, 0, 1, "ActionState", "Can't create ActionState class");
tests/mocks/Unity/Indicators/qmldir−1
@@ -2,7 +2,6 @@ module Unity.Indicators
22plugin IndicatorsFakeQml
33typeinfo Indicators.qmltypes
44
5−CachedUnityMenuModel 0.1 CachedUnityMenuModel.qml
65IndicatorsModel 0.1 IndicatorsModel.qml
76FakeMenuPage 0.1 FakeMenuPage.qml
87RootActionState 0.1 RootActionState.qml
tests/qmltests/CMakeLists.txt+1
@@ -77,6 +77,7 @@ add_qml_test(Panel Panel)
7777add_qml_test(Panel SearchIndicator)
7878add_qml_test(Panel/Indicators DefaultIndicatorWidget ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
7979add_qml_test(Panel/Indicators DefaultIndicatorPage ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
80+add_qml_test(Panel/Indicators CachedUnityMenuModel ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
8081# These MenuItemFactory tests need the test/mocks/ to come before plugins/
8182add_qml_test(Panel/Indicators MenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
8283add_qml_test(Panel/Indicators MessageMenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
tests/qmltests/Dash/tst_GenericScopeView.qml+8−3
@@ -283,10 +283,12 @@ Item {
283283 mouseClick(closePreviewMouseArea, units.gu(2), units.gu(2));
284284
285285 tryCompare(testCase.subPageLoader, "open", false);
286+ tryCompare(testCase.subPageLoader, "visible", false);
286287 }
287288
288289 function test_previewOpenClose() {
289290 tryCompare(testCase.subPageLoader, "open", false);
291+ tryCompare(testCase.subPageLoader, "visible", false);
290292
291293 var categoryListView = findChild(genericScopeView, "categoryListView");
292294 categoryListView.positionAtBeginning();
@@ -371,20 +373,23 @@ Item {
371373
372374 // open
373375 tryCompare(testCase.subPageLoader, "open", false);
376+ tryCompare(testCase.subPageLoader, "visible", false);
374377 var settings = findChild(innerHeader, "settings_header_button");
375378 mouseClick(settings, settings.width / 2, settings.height / 2);
376379 tryCompare(testCase.subPageLoader, "open", true);
377− verify(("" + subPageLoader.source).indexOf("ScopeSettingsPage.qml") != -1);
378− compare(genericScopeView.settingsShown, true)
380+ tryCompareFunction(function() { return ("" + subPageLoader.source).indexOf("ScopeSettingsPage.qml") != -1; }, true);
381+ tryCompare(genericScopeView, "subPageShown", true);
382+ compare(testCase.subPageLoader.subPage, "settings");
379383 tryCompare(testCase.subPageLoader, "x", 0);
380384
381385 // close
382386 var settingsHeader = findChild(testCase.subPageLoader.item, "pageHeader");
383387 mouseClick(settingsHeader, units.gu(2), units.gu(2));
384388 tryCompare(testCase.subPageLoader, "open", false);
385− compare(genericScopeView.settingsShown, false);
389+ tryCompare(genericScopeView, "subPageShown", false);
386390 var categoryListView = findChild(genericScopeView, "categoryListView");
387391 tryCompare(categoryListView, "x", 0);
392+ tryCompare(testCase.subPageLoader, "visible", false);
388393 }
389394
390395 function test_header_style_data() {
tests/qmltests/Panel/Indicators/tst_CachedUnityMenuModel.qmlnew file+137
@@ -0,0 +1,137 @@
1+/*
2+ * Copyright 2014 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+import QtQuick 2.0
18+import QtTest 1.0
19+import Unity.Test 0.1 as UT
20+import QMenuModel 0.1
21+import Unity.Indicators 0.1 as Indicators
22+import "../../../../qml/Panel/Indicators"
23+
24+Item {
25+ id: root
26+ width: units.gu(40)
27+ height: units.gu(70)
28+
29+ Component {
30+ id: model
31+ CachedUnityMenuModel {}
32+ }
33+
34+ UT.UnityTestCase {
35+ name: "CachedUnityMenuModel"
36+ when: windowShown
37+
38+ function cleanup() {
39+ doGC();
40+ }
41+
42+ function doGC() {
43+ // need to put some wait cycles here to get gc going properly.
44+ wait(10);
45+ gc();
46+ wait(10);
47+ }
48+
49+ function test_createDifferent() {
50+ var cachedObject = model.createObject(null,
51+ {
52+ "busName": "com.canonical.test1",
53+ "menuObjectPath": "/com/canonical/test1",
54+ "actionsObjectPath": "/com/canonical/test1"
55+ });
56+
57+ var cachedObject2 = model.createObject(null,
58+ {
59+ "busName": "com.canonical.test2",
60+ "menuObjectPath": "/com/canonical/test2",
61+ "actionsObjectPath": "/com/canonical/test2"
62+ });
63+
64+ verify(cachedObject.model !== cachedObject2.model);
65+ }
66+
67+ function test_createSame() {
68+ var cachedObject = model.createObject(null,
69+ {
70+ "busName": "com.canonical.test3",
71+ "menuObjectPath": "/com/canonical/test3",
72+ "actionsObjectPath": "/com/canonical/test3"
73+ });
74+
75+ var cachedObject2 = model.createObject(null,
76+ {
77+ "busName": "com.canonical.test3",
78+ "menuObjectPath": "/com/canonical/test3",
79+ "actionsObjectPath": "/com/canonical/test3"
80+ });
81+
82+ verify(cachedObject.model === cachedObject2.model);
83+ }
84+
85+ // Tests that changing cached model data does not change the model path of others
86+ function test_lp1328646() {
87+ var cachedObject = model.createObject(null,
88+ {
89+ "busName": "com.canonical.test4",
90+ "menuObjectPath": "/com/canonical/test4",
91+ "actionsObjectPath": "/com/canonical/test4"
92+ });
93+
94+ var cachedObject2 = model.createObject(null,
95+ {
96+ "busName": "com.canonical.test4",
97+ "menuObjectPath": "/com/canonical/test4",
98+ "actionsObjectPath": "/com/canonical/test4"
99+ });
100+
101+ cachedObject.menuObjectPath = "/com/canonical/test5";
102+ compare(cachedObject.model.menuObjectPath, "/com/canonical/test5");
103+ compare(cachedObject2.model.menuObjectPath, "/com/canonical/test4");
104+
105+ verify(cachedObject.model !== cachedObject2.model);
106+ }
107+
108+ function createAndDestroy(test) {
109+ var cachedObject = model.createObject(null,
110+ {
111+ "busName": "com.canonical."+test,
112+ "menuObjectPath": "/com/canonical/"+test,
113+ "actionsObjectPath": "/com/canonical/"+test
114+ });
115+ var cachedObject2 = model.createObject(null,
116+ {
117+ "busName": "com.canonical."+test,
118+ "menuObjectPath": "/com/canonical/"+test,
119+ "actionsObjectPath": "/com/canonical/"+test
120+ });
121+ cachedObject.destroy();
122+ return cachedObject2;
123+ }
124+
125+ function test_destroyAllDeletesModel() {
126+ createAndDestroy("test6");
127+ doGC();
128+ compare(Indicators.UnityMenuModelCache.contains("/com/canonical/test6"), false);
129+ }
130+
131+ function test_destroyPartialKeepsModel() {
132+ var model = createAndDestroy("test7");
133+ doGC();
134+ compare(Indicators.UnityMenuModelCache.contains("/com/canonical/test7"), true);
135+ }
136+ }
137+}