19bd613 · unity8 · git.iko.soy

debian/changelog+26

compare with xenial

unifiedsplit

@@ -1,3 +1,29 @@

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+

16+unity8 (8.00+14.10.20140817-0ubuntu1) utopic; urgency=low

17+

18+ [ CI bot ]

19+ * Resync trunk

20+

21+ [ Michał Sawicz ]

22+ * Fix dash overview test and prevent crash in mock ApplicationInfo's

23+ d'tor. tryCompareFunction didn't work because .item threw.

24+

25+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Sun, 17 Aug 2014 00:37:35 +0000

26+

1unity8 (8.00+14.10.20140815.1-0ubuntu1) utopic; urgency=low

27unity8 (8.00+14.10.20140815.1-0ubuntu1) utopic; urgency=low

2

28

3 [ Michael Terry ]

29 [ Michael Terry ]

plugins/Unity/Indicators/CachedUnityMenuModel.qmldeleted−60

@@ -1,60 +0,0 @@

1−/*

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 @@

1module Unity.Indicators

2plugin IndicatorsQml

3typeinfo 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()

29{

30}

31

32−

33−UnityMenuModel* UnityMenuModelCache::model(const QString& path) const

32+UnityMenuModel* UnityMenuModelCache::model(const QByteArray& bus,

33+ const QByteArray& path,

34+ const QVariantMap& actions)

34{

35{

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;

36}

52}

37

53

38−void UnityMenuModelCache::registerModel(const QString& path, UnityMenuModel* menuModel)

54+bool UnityMenuModelCache::contains(const QByteArray& path)

39{

55{

40− menuModel->setParent(this);

56+ return m_registry.contains(path);

41− m_menuModels[path] = menuModel;

42−}

57+}

plugins/Unity/Indicators/unitymenumodelcache.h+5−3

@@ -34,11 +34,13 @@ public:

34 UnityMenuModelCache(QObject*parent=NULL);

35 ~UnityMenuModelCache();

36

37− Q_INVOKABLE UnityMenuModel* model(const QString& path) const;

37+ Q_INVOKABLE UnityMenuModel* model(const QByteArray& bus,

38− Q_INVOKABLE void registerModel(const QString& path, UnityMenuModel* menuModel);

38+ const QByteArray& path,

39+ const QVariantMap& actions);

40+ Q_INVOKABLE bool contains(const QByteArray& path);

39

41

40private:

42private:

41− QHash<QString, UnityMenuModel*> m_menuModels;

43+ QHash<QByteArray, UnityMenuModel*> m_registry;

42};

44};

43

45

44#endif // UNITYMENUMODELCACHE_H

46#endif // UNITYMENUMODELCACHE_H

po/am.po+9−9

@@ -8,18 +8,18 @@ msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-08-12 20:52+0000\n"

11+"PO-Revision-Date: 2014-08-16 20:11+0000\n"

12"Last-Translator: samson <Unknown>\n"

13"Language-Team: Amharic <am@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"

18"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr ""

22+msgstr "የ መግቢያ ቃል: "

23

24#: plugins/Unity/Launcher/launcheritem.cpp:43

25#: plugins/Unity/Launcher/launcheritem.cpp:73

@@ -94,11 +94,11 @@ msgstr ""

94

95#: qml/Components/Lockscreen.qml:161

96msgid "Too many incorrect attempts"

97−msgstr ""

97+msgstr "በርካታ የተሳሳቱ ሙከራዎች"

98

99#: qml/Components/Lockscreen.qml:163

100msgid "Please wait"

101−msgstr ""

101+msgstr "እባክዎን ይቆዩ"

102

103#: qml/Components/Lockscreen.qml:245

104msgid "Emergency Call"

@@ -260,16 +260,16 @@ msgstr ""

260#: qml/Shell.qml:269

261#, qt-format

262msgid "Enter your %1"

263−msgstr ""

263+msgstr "ያስገቡ የ እርስዎን %1"

264

265#: qml/Shell.qml:270

266#, qt-format

267msgid "Incorrect %1"

268−msgstr ""

268+msgstr "የተሳሳተ %1"

269

270#: qml/Shell.qml:272

271msgid "Please re-enter"

272−msgstr ""

272+msgstr "እባክዎን እንደ ገና-ያስገቡ"

273

274#: qml/Shell.qml:306

275msgid "Sorry, incorrect passphrase."

@@ -281,7 +281,7 @@ msgstr ""

281

282#: qml/Shell.qml:308

283msgid "This will be your last attempt."

284−msgstr ""

284+msgstr "ይህ የመጨረሻ ሙከራዎ ነው"

285

286#: qml/Shell.qml:310

287msgid ""

po/ca.po+20−15

@@ -8,18 +8,18 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-08-12 09:17+0000\n"

11+"PO-Revision-Date: 2014-08-17 03:42+0000\n"

12"Last-Translator: David Planella <david.planella@ubuntu.com>\n"

13"Language-Team: Catalan <ca@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"

18"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr ""

22+msgstr "Contrasenya: "

23

24#: plugins/Unity/Launcher/launcheritem.cpp:43

25#: plugins/Unity/Launcher/launcheritem.cpp:73

@@ -102,11 +102,11 @@ msgstr ""

102

103#: qml/Components/Lockscreen.qml:161

104msgid "Too many incorrect attempts"

105−msgstr ""

105+msgstr "Massa intents incorrectes"

106

107#: qml/Components/Lockscreen.qml:163

108msgid "Please wait"

109−msgstr ""

109+msgstr "Espereu"

110

111#: qml/Components/Lockscreen.qml:245

112msgid "Emergency Call"

@@ -179,11 +179,11 @@ msgstr "Botiga"

179

180#: qml/Dash/ScopesOverviewTab.qml:36

181msgid "Favorites"

182−msgstr "Preferits"

182+msgstr "Preferides"

183

184#: qml/Dash/ScopesOverviewTab.qml:54

185msgid "All"

186−msgstr "Tots"

186+msgstr "Totes"

187

188#: qml/Greeter/Greeter.qml:157

189msgid "Swipe to unlock"

@@ -259,46 +259,51 @@ msgstr "Itinerància"

259

260#: qml/Shell.qml:267

261msgid "passphrase"

262−msgstr ""

262+msgstr "contrasenya"

263

264#: qml/Shell.qml:267

265msgid "passcode"

266−msgstr ""

266+msgstr "clau"

267

268#: qml/Shell.qml:269

269#, qt-format

270msgid "Enter your %1"

271−msgstr ""

271+msgstr "Introduïu la %1"

272

273#: qml/Shell.qml:270

274#, qt-format

275msgid "Incorrect %1"

276−msgstr ""

276+msgstr "La %1 és incorrecta"

277

278#: qml/Shell.qml:272

279msgid "Please re-enter"

280−msgstr ""

280+msgstr "Torneu-la a introduir"

281

282#: qml/Shell.qml:306

283msgid "Sorry, incorrect passphrase."

284−msgstr ""

284+msgstr "La contrasenya és incorrecta"

285

286#: qml/Shell.qml:307

287msgid "Sorry, incorrect passcode."

288−msgstr ""

288+msgstr "La clau és incorrecta"

289

290#: qml/Shell.qml:308

291msgid "This will be your last attempt."

292−msgstr ""

292+msgstr "Aquest serà el darrer intent."

293

294#: qml/Shell.qml:310

295msgid ""

296"If passphrase is entered incorrectly, your phone will conduct a factory "

297"reset and all personal data will be deleted."

298msgstr ""

299+"Si la contrasenya s'introdueix de manera incorrecta, el telèfon es "

300+"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "

301+"personals."

299

302

300#: qml/Shell.qml:311

303#: qml/Shell.qml:311

301msgid ""

304msgid ""

302"If passcode is entered incorrectly, your phone will conduct a factory reset "

305"If passcode is entered incorrectly, your phone will conduct a factory reset "

303"and all personal data will be deleted."

306"and all personal data will be deleted."

304msgstr ""

307msgstr ""

308+"Si la clau s'introdueix de manera incorrecta, el telèfon es reinicialitzarà "

309+"a l'estat de fàbrica i se suprimiran totes les dades personals."

po/de.po+15−15

@@ -8,27 +8,27 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-08-08 08:58+0000\n"

11+"PO-Revision-Date: 2014-08-17 21:46+0000\n"

12−"Last-Translator: Martin Pitt <martin.pitt@ubuntu.com>\n"

12+"Last-Translator: Phillip Sz <Unknown>\n"

13"Language-Team: German <de@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"

18"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr ""

22+msgstr "Passwort: "

23

24#: plugins/Unity/Launcher/launcheritem.cpp:43

25#: plugins/Unity/Launcher/launcheritem.cpp:73

26msgid "Pin shortcut"

27−msgstr ""

27+msgstr "Verknüpfung anheften"

28

29#: plugins/Unity/Launcher/launcheritem.cpp:73

30msgid "Unpin shortcut"

31−msgstr ""

31+msgstr "Verknüpfung entfernen"

32

33#: qml/Components/Dialogs.qml:142

34msgid "Are you sure you would like to turn power off?"

@@ -36,15 +36,15 @@ msgstr ""

36

37#: qml/Components/Dialogs.qml:144

38msgid "Power off"

39−msgstr ""

39+msgstr "Ausschalten"

40

41#: qml/Components/Dialogs.qml:153

42msgid "Restart"

43−msgstr ""

43+msgstr "Neustart"

44

45#: qml/Components/Dialogs.qml:162

46msgid "Cancel"

47−msgstr ""

47+msgstr "Abbrechen"

48

49#: qml/Components/EdgeDemoOverlay.qml:151

50msgid "Skip intro"

@@ -103,7 +103,7 @@ msgstr ""

103

104#: qml/Components/Lockscreen.qml:163

105msgid "Please wait"

106−msgstr ""

106+msgstr "Bitte warten"

107

108#: qml/Components/Lockscreen.qml:245

109msgid "Emergency Call"

@@ -168,7 +168,7 @@ msgstr ""

168

169#: qml/Dash/ScopesOverview.qml:408

170msgid "Done"

171−msgstr ""

171+msgstr "Erledigt"

172

173#: qml/Dash/ScopesOverview.qml:434

174msgid "Store"

@@ -176,11 +176,11 @@ msgstr ""

176

177#: qml/Dash/ScopesOverviewTab.qml:36

178msgid "Favorites"

179−msgstr ""

179+msgstr "Favoriten"

180

181#: qml/Dash/ScopesOverviewTab.qml:54

182msgid "All"

183−msgstr ""

183+msgstr "Alle"

184

185#: qml/Greeter/Greeter.qml:157

186msgid "Swipe to unlock"

@@ -252,11 +252,11 @@ msgstr ""

252

253#: qml/Panel/Indicators/RoamingIndication.qml:27

254msgid "Roaming"

255−msgstr ""

255+msgstr "Roaming"

256

257#: qml/Shell.qml:267

258msgid "passphrase"

259−msgstr ""

259+msgstr "Passwort"

260

261#: qml/Shell.qml:267

262msgid "passcode"

po/en_AU.po+17−13

@@ -8,18 +8,18 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-08-13 02:04+0000\n"

11+"PO-Revision-Date: 2014-08-17 09:06+0000\n"

12"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"

13"Language-Team: English (Australia) <en_AU@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"

18"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr ""

22+msgstr "Password: "

23

24#: plugins/Unity/Launcher/launcheritem.cpp:43

25#: plugins/Unity/Launcher/launcheritem.cpp:73

@@ -96,11 +96,11 @@ msgstr ""

96

97#: qml/Components/Lockscreen.qml:161

98msgid "Too many incorrect attempts"

99−msgstr ""

99+msgstr "Too many incorrect attempts"

100

101#: qml/Components/Lockscreen.qml:163

102msgid "Please wait"

103−msgstr ""

103+msgstr "Please wait"

104

105#: qml/Components/Lockscreen.qml:245

106msgid "Emergency Call"

@@ -253,46 +253,50 @@ msgstr "Roaming"

253

254#: qml/Shell.qml:267

255msgid "passphrase"

256−msgstr ""

256+msgstr "passphrase"

257

258#: qml/Shell.qml:267

259msgid "passcode"

260−msgstr ""

260+msgstr "passcode"

261

262#: qml/Shell.qml:269

263#, qt-format

264msgid "Enter your %1"

265−msgstr ""

265+msgstr "Enter your %1"

266

267#: qml/Shell.qml:270

268#, qt-format

269msgid "Incorrect %1"

270−msgstr ""

270+msgstr "Incorrect %1"

271

272#: qml/Shell.qml:272

273msgid "Please re-enter"

274−msgstr ""

274+msgstr "Please re-enter"

275

276#: qml/Shell.qml:306

277msgid "Sorry, incorrect passphrase."

278−msgstr ""

278+msgstr "Sorry, incorrect passphrase."

279

280#: qml/Shell.qml:307

281msgid "Sorry, incorrect passcode."

282−msgstr ""

282+msgstr "Sorry, incorrect passcode."

283

284#: qml/Shell.qml:308

285msgid "This will be your last attempt."

286−msgstr ""

286+msgstr "This will be your last attempt."

287

288#: qml/Shell.qml:310

289msgid ""

290"If passphrase is entered incorrectly, your phone will conduct a factory "

291"reset and all personal data will be deleted."

292msgstr ""

293+"If passphrase is entered incorrectly, your phone will conduct a factory "

294+"reset and all personal data will be deleted."

293

295

294#: qml/Shell.qml:311

296#: qml/Shell.qml:311

295msgid ""

297msgid ""

296"If passcode is entered incorrectly, your phone will conduct a factory reset "

298"If passcode is entered incorrectly, your phone will conduct a factory reset "

297"and all personal data will be deleted."

299"and all personal data will be deleted."

298msgstr ""

300msgstr ""

301+"If passcode is entered incorrectly, your phone will conduct a factory reset "

302+"and all personal data will be deleted."

po/en_GB.po+1−1

@@ -14,7 +14,7 @@ msgstr ""

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-08-16 06:51+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"

18"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

po/es.po+8−8

@@ -8,18 +8,18 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-08-15 07:13+0000\n"

11+"PO-Revision-Date: 2014-08-17 04:37+0000\n"

12−"Last-Translator: Paco Molinero <paco@byasl.com>\n"

12+"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"

13"Language-Team: Spanish <es@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-08-16 06:51+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"

18"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr "Contraseña : "

22+msgstr "Contraseña: "

23

24#: plugins/Unity/Launcher/launcheritem.cpp:43

25#: plugins/Unity/Launcher/launcheritem.cpp:73

@@ -136,7 +136,7 @@ msgstr "Ver menos"

136

137#: qml/Dash/GenericScopeView.qml:360

138msgid "See all"

139−msgstr "Ver todas"

139+msgstr "Ver todo"

140

141#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27

142msgid "Search"

@@ -270,7 +270,7 @@ msgstr "Introduzca su %1"

270#: qml/Shell.qml:270

271#, qt-format

272msgid "Incorrect %1"

273−msgstr "%1 Incorrecta"

273+msgstr "%1 incorrecta"

274

275#: qml/Shell.qml:272

276msgid "Please re-enter"

@@ -293,7 +293,7 @@ msgid ""

293"If passphrase is entered incorrectly, your phone will conduct a factory "

294"reset and all personal data will be deleted."

295msgstr ""

296−"Si se introduce la frase de paso incorrectamente, su teléfono volverá a la "

296+"Si se introduce la frase incorrectamente, el teléfono volverá a la "

297"configuración de fábrica y se perderán todos los datos personales."

298

299#: qml/Shell.qml:311

@@ -301,5 +301,5 @@ msgid ""

301"If passcode is entered incorrectly, your phone will conduct a factory reset "

302"and all personal data will be deleted."

303msgstr ""

304−"Si se introduce el código de paso incorrectamente, su teléfono volverá a la "

304+"Si se introduce el código incorrectamente, el teléfono volverá a la "

305"configuración de fábrica y se perderán todos los datos personales."

po/fa.po+1−1

@@ -14,7 +14,7 @@ msgstr ""

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-08-16 06:51+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"

18"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

po/fi.po+3−3

@@ -8,13 +8,13 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-08-15 08:10+0000\n"

11+"PO-Revision-Date: 2014-08-17 16:53+0000\n"

12"Last-Translator: Jiri Grönroos <Unknown>\n"

13"Language-Team: Finnish <fi@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-08-16 06:51+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"

18"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

@@ -271,7 +271,7 @@ msgstr "Virheellinen %1"

271

272#: qml/Shell.qml:272

273msgid "Please re-enter"

274−msgstr ""

274+msgstr "Anna uudelleen"

275

276#: qml/Shell.qml:306

277msgid "Sorry, incorrect passphrase."

po/fr.po+3−3

@@ -8,13 +8,13 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-08-15 12:51+0000\n"

11+"PO-Revision-Date: 2014-08-16 12:13+0000\n"

12"Last-Translator: Jean Marc <Unknown>\n"

13"Language-Team: French <fr@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-08-16 06:51+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"

18"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

@@ -156,7 +156,7 @@ msgstr "Moins..."

156

157#: qml/Dash/Previews/PreviewRatingInput.qml:81

158msgid "Rate this"

159−msgstr "Evaluez ceci"

159+msgstr "Évaluez ceci"

160

161#: qml/Dash/Previews/PreviewRatingInput.qml:126

162msgid "Add a review"

po/hu.po+41−37

@@ -8,18 +8,18 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-08-06 07:41+0000\n"

11+"PO-Revision-Date: 2014-08-19 07:08+0000\n"

12"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"

13"Language-Team: Hungarian <hu@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-20 06:23+0000\n"

18−"X-Generator: Launchpad (build 17156)\n"

18+"X-Generator: Launchpad (build 17163)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr ""

22+msgstr "Jelszó: "

23

24#: plugins/Unity/Launcher/launcheritem.cpp:43

25#: plugins/Unity/Launcher/launcheritem.cpp:73

@@ -32,19 +32,19 @@ msgstr "Indító feloldása"

32

33#: qml/Components/Dialogs.qml:142

34msgid "Are you sure you would like to turn power off?"

35−msgstr ""

35+msgstr "Biztos benne, hogy ki szeretné kapcsolni?"

36

37#: qml/Components/Dialogs.qml:144

38msgid "Power off"

39−msgstr ""

39+msgstr "Kikapcsolás"

40

41#: qml/Components/Dialogs.qml:153

42msgid "Restart"

43−msgstr ""

43+msgstr "Újraindítás"

44

45#: qml/Components/Dialogs.qml:162

46msgid "Cancel"

47−msgstr ""

47+msgstr "Mégse"

48

49#: qml/Components/EdgeDemoOverlay.qml:151

50msgid "Skip intro"

@@ -98,46 +98,46 @@ msgstr ""

98

99#: qml/Components/Lockscreen.qml:161

100msgid "Too many incorrect attempts"

101−msgstr ""

101+msgstr "Túl sok sikertelen kísérlet"

102

103#: qml/Components/Lockscreen.qml:163

104msgid "Please wait"

105−msgstr ""

105+msgstr "Kérem várjon"

106

107−#: qml/Components/Lockscreen.qml:245

107+#: qml/Components/Lockscreen.qml:220

108msgid "Emergency Call"

109msgstr "Vészhívás"

110

111−#: qml/Components/Lockscreen.qml:268

111+#: qml/Components/Lockscreen.qml:243

112msgid "OK"

113msgstr "Ok"

114

115−#: qml/Components/PassphraseLockscreen.qml:61

115+#: qml/Components/PassphraseLockscreen.qml:62

116#, qt-format

117msgid "Hello %1"

118msgstr "Üdv %1"

119

120−#: qml/Components/PassphraseLockscreen.qml:61

120+#: qml/Components/PassphraseLockscreen.qml:62

121msgid "Hello"

122msgstr "Üdvözöljük"

123

124−#: qml/Components/PinLockscreen.qml:197

124+#: qml/Components/PinLockscreen.qml:198

125msgid "CANCEL"

126msgstr "MÉGSE"

127

128−#: qml/Components/PinLockscreen.qml:215

128+#: qml/Components/PinLockscreen.qml:216

129msgid "DONE"

130msgstr "KÉSZ"

131

132−#: qml/Dash/GenericScopeView.qml:360

132+#: qml/Dash/GenericScopeView.qml:358

133msgid "See less"

134msgstr "Kevesebb"

135

136−#: qml/Dash/GenericScopeView.qml:360

136+#: qml/Dash/GenericScopeView.qml:358

137msgid "See all"

138msgstr "Összes megtekintése"

139

140−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27

140+#: qml/Panel/SearchIndicator.qml:27

141msgid "Search"

142msgstr "Keresés"

143

@@ -161,25 +161,25 @@ msgstr "Értékelés hozzáadása"

161msgid "Send"

162msgstr "Küldés"

163

164−#: qml/Dash/ScopesOverview.qml:201

164+#: qml/Dash/ScopesOverview.qml:200

165msgid "Manage Dash"

166−msgstr ""

166+msgstr "Dash kezelése"

167

168−#: qml/Dash/ScopesOverview.qml:408

168+#: qml/Dash/ScopesOverview.qml:405

169msgid "Done"

170−msgstr ""

170+msgstr "Kész"

171

172−#: qml/Dash/ScopesOverview.qml:434

172+#: qml/Dash/ScopesOverview.qml:431

173msgid "Store"

174−msgstr ""

174+msgstr "Áruház"

175

176#: qml/Dash/ScopesOverviewTab.qml:36

177msgid "Favorites"

178−msgstr ""

178+msgstr "Kedvencek"

179

180#: qml/Dash/ScopesOverviewTab.qml:54

181msgid "All"

182−msgstr ""

182+msgstr "Összes"

183

184#: qml/Greeter/Greeter.qml:157

185msgid "Swipe to unlock"

@@ -247,54 +247,58 @@ msgstr "Sikertelen, koppintson az újrapróbáláshoz"

247

248#: qml/Panel/Indicators/ModemInfoItem.qml:105

249msgid "Unlock SIM"

250−msgstr ""

250+msgstr "SIM feloldása"

251

252#: qml/Panel/Indicators/RoamingIndication.qml:27

253msgid "Roaming"

254−msgstr ""

254+msgstr "Barangolás"

255

256#: qml/Shell.qml:267

257msgid "passphrase"

258−msgstr ""

258+msgstr "jelmondat"

259

260#: qml/Shell.qml:267

261msgid "passcode"

262−msgstr ""

262+msgstr "jelkód"

263

264#: qml/Shell.qml:269

265#, qt-format

266msgid "Enter your %1"

267−msgstr ""

267+msgstr "Adja meg a következőt: %1"

268

269#: qml/Shell.qml:270

270#, qt-format

271msgid "Incorrect %1"

272−msgstr ""

272+msgstr "Helytelen %1"

273

274#: qml/Shell.qml:272

275msgid "Please re-enter"

276−msgstr ""

276+msgstr "Kérjük adja meg újra"

277

278#: qml/Shell.qml:306

279msgid "Sorry, incorrect passphrase."

280−msgstr ""

280+msgstr "Sajnáljuk, helytelen jelmondat."

281

282#: qml/Shell.qml:307

283msgid "Sorry, incorrect passcode."

284−msgstr ""

284+msgstr "Sajnáljuk, helytelen jelkód."

285

286#: qml/Shell.qml:308

287msgid "This will be your last attempt."

288−msgstr ""

288+msgstr "Ez az utolsó próbálkozási lehetősége."

289

290#: qml/Shell.qml:310

291msgid ""

292"If passphrase is entered incorrectly, your phone will conduct a factory "

293"reset and all personal data will be deleted."

294msgstr ""

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."

295

297

296#: qml/Shell.qml:311

298#: qml/Shell.qml:311

297msgid ""

299msgid ""

298"If passcode is entered incorrectly, your phone will conduct a factory reset "

300"If passcode is entered incorrectly, your phone will conduct a factory reset "

299"and all personal data will be deleted."

301"and all personal data will be deleted."

300msgstr ""

302msgstr ""

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 ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-08-12 07:14+0000\n"

11+"PO-Revision-Date: 2014-08-18 15:03+0000\n"

12−"Last-Translator: Shushi Kurose <md81bird@hitaki.net>\n"

12+"Last-Translator: Mitsuya Shibata <mty.shibata@gmail.com>\n"

13"Language-Team: Japanese <ja@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"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"

18"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr ""

22+msgstr "パスワード： "

23

24#: plugins/Unity/Launcher/launcheritem.cpp:43

25#: plugins/Unity/Launcher/launcheritem.cpp:73

26msgid "Pin shortcut"

27−msgstr ""

27+msgstr "ショートカットを追加する"

28

29#: plugins/Unity/Launcher/launcheritem.cpp:73

30msgid "Unpin shortcut"

31−msgstr ""

31+msgstr "ショートカットを削除する"

32

33#: qml/Components/Dialogs.qml:142

34msgid "Are you sure you would like to turn power off?"

35−msgstr ""

35+msgstr "本当に電源を切りますか？"

36

37#: qml/Components/Dialogs.qml:144

38msgid "Power off"

39−msgstr ""

39+msgstr "電源を切る"

40

41#: qml/Components/Dialogs.qml:153

42msgid "Restart"

43−msgstr ""

43+msgstr "再起動"

44

45#: qml/Components/Dialogs.qml:162

46msgid "Cancel"

47−msgstr ""

47+msgstr "キャンセル"

48

49#: qml/Components/EdgeDemoOverlay.qml:151

50msgid "Skip intro"

@@ -56,7 +56,7 @@ msgstr "右端"

56

57#: qml/Components/EdgeDemo.qml:113

58msgid "Try swiping from the right edge to unlock the phone"

59−msgstr ""

59+msgstr "アンロックするには右端からスワイプしてみてください"

60

61#: qml/Components/EdgeDemo.qml:144

62msgid "Top edge"

@@ -91,63 +91,64 @@ msgid ""

91"You have now mastered the edge gestures and can start using the "

92"phone<br><br>Tap on the screen to start"

93msgstr ""

94+"これでスマートフォンの操作に必要な、画面端を用いたジェスチャーを習得できました。<br><br>利用を開始するなら画面をタップしてください"

94

95

95#: qml/Components/Lockscreen.qml:161

96#: qml/Components/Lockscreen.qml:161

96msgid "Too many incorrect attempts"

97msgid "Too many incorrect attempts"

97−msgstr ""

98+msgstr "失敗回数が上限に達しました"

98

99

99#: qml/Components/Lockscreen.qml:163

100#: qml/Components/Lockscreen.qml:163

100msgid "Please wait"

101msgid "Please wait"

101−msgstr ""

102+msgstr "お待ちください"

102

103

103−#: qml/Components/Lockscreen.qml:245

104+#: qml/Components/Lockscreen.qml:220

104msgid "Emergency Call"

105msgid "Emergency Call"

105msgstr "緊急通報"

106msgstr "緊急通報"

106

107

107−#: qml/Components/Lockscreen.qml:268

108+#: qml/Components/Lockscreen.qml:243

108msgid "OK"

109msgid "OK"

109msgstr "OK"

110msgstr "OK"

110

111

111−#: qml/Components/PassphraseLockscreen.qml:61

112+#: qml/Components/PassphraseLockscreen.qml:62

112#, qt-format

113#, qt-format

113msgid "Hello %1"

114msgid "Hello %1"

114msgstr "こんにちは %1 さん"

115msgstr "こんにちは %1 さん"

115

116

116−#: qml/Components/PassphraseLockscreen.qml:61

117+#: qml/Components/PassphraseLockscreen.qml:62

117msgid "Hello"

118msgid "Hello"

118msgstr "こんにちは"

119msgstr "こんにちは"

119

120

120−#: qml/Components/PinLockscreen.qml:197

121+#: qml/Components/PinLockscreen.qml:198

121msgid "CANCEL"

122msgid "CANCEL"

122−msgstr ""

123+msgstr "キャンセル"

123

124

124−#: qml/Components/PinLockscreen.qml:215

125+#: qml/Components/PinLockscreen.qml:216

125msgid "DONE"

126msgid "DONE"

126−msgstr ""

127+msgstr "完了"

127

128

128−#: qml/Dash/GenericScopeView.qml:360

129+#: qml/Dash/GenericScopeView.qml:358

129msgid "See less"

130msgid "See less"

130msgstr ""

131msgstr ""

131

132

132−#: qml/Dash/GenericScopeView.qml:360

133+#: qml/Dash/GenericScopeView.qml:358

133msgid "See all"

134msgid "See all"

134−msgstr ""

135+msgstr "すべて表示する"

135

136

136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27

137+#: qml/Panel/SearchIndicator.qml:27

137msgid "Search"

138msgid "Search"

138msgstr "検索"

139msgstr "検索"

139

140

140#: qml/Dash/Previews/PreviewActionCombo.qml:34

141#: qml/Dash/Previews/PreviewActionCombo.qml:34

141msgid "More..."

142msgid "More..."

142−msgstr ""

143+msgstr "さらに ..."

143

144

144#: qml/Dash/Previews/PreviewActionCombo.qml:34

145#: qml/Dash/Previews/PreviewActionCombo.qml:34

145msgid "Less..."

146msgid "Less..."

146−msgstr ""

147+msgstr "隠す..."

147

148

148#: qml/Dash/Previews/PreviewRatingInput.qml:81

149#: qml/Dash/Previews/PreviewRatingInput.qml:81

149msgid "Rate this"

150msgid "Rate this"

150−msgstr ""

151+msgstr "評価する"

151

152

152#: qml/Dash/Previews/PreviewRatingInput.qml:126

153#: qml/Dash/Previews/PreviewRatingInput.qml:126

153msgid "Add a review"

154msgid "Add a review"

@@ -157,21 +158,21 @@ msgstr "レビューを追加"

157msgid "Send"

158msgid "Send"

158msgstr "送信"

159msgstr "送信"

159

160

160−#: qml/Dash/ScopesOverview.qml:201

161+#: qml/Dash/ScopesOverview.qml:200

161msgid "Manage Dash"

162msgid "Manage Dash"

162−msgstr ""

163+msgstr "Dashの管理"

163

164

164−#: qml/Dash/ScopesOverview.qml:408

165+#: qml/Dash/ScopesOverview.qml:405

165msgid "Done"

166msgid "Done"

166−msgstr ""

167+msgstr "完了"

167

168

168−#: qml/Dash/ScopesOverview.qml:434

169+#: qml/Dash/ScopesOverview.qml:431

169msgid "Store"

170msgid "Store"

170−msgstr ""

171+msgstr "保存"

171

172

172#: qml/Dash/ScopesOverviewTab.qml:36

173#: qml/Dash/ScopesOverviewTab.qml:36

173msgid "Favorites"

174msgid "Favorites"

174−msgstr ""

175+msgstr "お気に入り"

175

176

176#: qml/Dash/ScopesOverviewTab.qml:54

177#: qml/Dash/ScopesOverviewTab.qml:54

177msgid "All"

178msgid "All"

@@ -179,7 +180,7 @@ msgstr "すべて"

179

180

180#: qml/Greeter/Greeter.qml:157

181#: qml/Greeter/Greeter.qml:157

181msgid "Swipe to unlock"

182msgid "Swipe to unlock"

182−msgstr ""

183+msgstr "スワイプしてロック解除"

183

184

184#: qml/Hud/HudParametrizedActionsPage.qml:132

185#: qml/Hud/HudParametrizedActionsPage.qml:132

185msgid "Confirm"

186msgid "Confirm"

@@ -187,7 +188,7 @@ msgstr "確認"

187

188

188#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372

189#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372

189msgid "Type or say a command"

190msgid "Type or say a command"

190−msgstr ""

191+msgstr "コマンドを音声かキーボードから入力"

191

192

192#: qml/Hud/Hud.qml:84

193#: qml/Hud/Hud.qml:84

193msgid "Loading. Please Wait..."

194msgid "Loading. Please Wait..."

@@ -207,11 +208,11 @@ msgstr "パスワードを表示"

207

208

208#: qml/Notifications/NotificationMenuItemFactory.qml:115

209#: qml/Notifications/NotificationMenuItemFactory.qml:115

209msgid "Please enter SIM PIN"

210msgid "Please enter SIM PIN"

210−msgstr ""

211+msgstr "SIM PINを入力してください"

211

212

212#: qml/Panel/ActiveCallHint.qml:77

213#: qml/Panel/ActiveCallHint.qml:77

213msgid "Tap to return to call..."

214msgid "Tap to return to call..."

214−msgstr ""

215+msgstr "タップすると通話に戻ります..."

215

216

216#: qml/Panel/ActiveCallHint.qml:90

217#: qml/Panel/ActiveCallHint.qml:90

217msgid "Conference"

218msgid "Conference"

@@ -223,11 +224,11 @@ msgstr ""

223

224

224#: qml/Panel/Indicators/MenuItemFactory.qml:655

225#: qml/Panel/Indicators/MenuItemFactory.qml:655

225msgid "Downloading"

226msgid "Downloading"

226−msgstr ""

227+msgstr "ダウンロード中"

227

228

228#: qml/Panel/Indicators/MenuItemFactory.qml:657

229#: qml/Panel/Indicators/MenuItemFactory.qml:657

229msgid "Paused, tap to resume"

230msgid "Paused, tap to resume"

230−msgstr ""

231+msgstr "停止中、再開するにはタップしてください"

231

232

232#: qml/Panel/Indicators/MenuItemFactory.qml:659

233#: qml/Panel/Indicators/MenuItemFactory.qml:659

233msgid "Canceled"

234msgid "Canceled"

@@ -239,49 +240,49 @@ msgstr ""

239

240

240#: qml/Panel/Indicators/MenuItemFactory.qml:663

241#: qml/Panel/Indicators/MenuItemFactory.qml:663

241msgid "Failed, tap to retry"

242msgid "Failed, tap to retry"

242−msgstr ""

243+msgstr "失敗しました、再試行するにはタップしてください"

243

244

244#: qml/Panel/Indicators/ModemInfoItem.qml:105

245#: qml/Panel/Indicators/ModemInfoItem.qml:105

245msgid "Unlock SIM"

246msgid "Unlock SIM"

246−msgstr ""

247+msgstr "SIMのアンロック"

247

248

248#: qml/Panel/Indicators/RoamingIndication.qml:27

249#: qml/Panel/Indicators/RoamingIndication.qml:27

249msgid "Roaming"

250msgid "Roaming"

250−msgstr ""

251+msgstr "ローミング"

251

252

252#: qml/Shell.qml:267

253#: qml/Shell.qml:267

253msgid "passphrase"

254msgid "passphrase"

254−msgstr ""

255+msgstr "パスフレーズ"

255

256

256#: qml/Shell.qml:267

257#: qml/Shell.qml:267

257msgid "passcode"

258msgid "passcode"

258−msgstr ""

259+msgstr "パスコード"

259

260

260#: qml/Shell.qml:269

261#: qml/Shell.qml:269

261#, qt-format

262#, qt-format

262msgid "Enter your %1"

263msgid "Enter your %1"

263−msgstr ""

264+msgstr "%1を入力してください"

264

265

265#: qml/Shell.qml:270

266#: qml/Shell.qml:270

266#, qt-format

267#, qt-format

267msgid "Incorrect %1"

268msgid "Incorrect %1"

268−msgstr ""

269+msgstr "%1が間違っています"

269

270

270#: qml/Shell.qml:272

271#: qml/Shell.qml:272

271msgid "Please re-enter"

272msgid "Please re-enter"

272−msgstr ""

273+msgstr "再入力してください"

273

274

274#: qml/Shell.qml:306

275#: qml/Shell.qml:306

275msgid "Sorry, incorrect passphrase."

276msgid "Sorry, incorrect passphrase."

276−msgstr ""

277+msgstr "パスフレーズが間違っています。"

277

278

278#: qml/Shell.qml:307

279#: qml/Shell.qml:307

279msgid "Sorry, incorrect passcode."

280msgid "Sorry, incorrect passcode."

280−msgstr ""

281+msgstr "パスコードが間違っています。"

281

282

282#: qml/Shell.qml:308

283#: qml/Shell.qml:308

283msgid "This will be your last attempt."

284msgid "This will be your last attempt."

284−msgstr ""

285+msgstr "これが最後のチャンスです。"

285

286

286#: qml/Shell.qml:310

287#: qml/Shell.qml:310

287msgid ""

288msgid ""

po/km.po+32−26

@@ -8,18 +8,18 @@ msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"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"

12"Last-Translator: Sok Sophea <sksophea@gmail.com>\n"

13"Language-Team: Khmer <km@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-21 06:48+0000\n"

18−"X-Generator: Launchpad (build 17156)\n"

18+"X-Generator: Launchpad (build 17163)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr ""

22+msgstr "ពាក្យសម្ងាត់៖ "

23

24#: plugins/Unity/Launcher/launcheritem.cpp:43

25#: plugins/Unity/Launcher/launcheritem.cpp:73

@@ -98,46 +98,46 @@ msgstr ""

98

99#: qml/Components/Lockscreen.qml:161

100msgid "Too many incorrect attempts"

101−msgstr ""

101+msgstr "បានព្យាយាមខុសច្រើនដងពេក"

102

103#: qml/Components/Lockscreen.qml:163

104msgid "Please wait"

105−msgstr ""

105+msgstr "សូមរង់ចាំ"

106

107−#: qml/Components/Lockscreen.qml:245

107+#: qml/Components/Lockscreen.qml:220

108msgid "Emergency Call"

109msgstr "ការហៅពេលអាសន្ន"

110

111−#: qml/Components/Lockscreen.qml:268

111+#: qml/Components/Lockscreen.qml:243

112msgid "OK"

113msgstr "យល់ព្រម"

114

115−#: qml/Components/PassphraseLockscreen.qml:61

115+#: qml/Components/PassphraseLockscreen.qml:62

116#, qt-format

117msgid "Hello %1"

118msgstr "សួស្ដី %1"

119

120−#: qml/Components/PassphraseLockscreen.qml:61

120+#: qml/Components/PassphraseLockscreen.qml:62

121msgid "Hello"

122msgstr "សួស្តី"

123

124−#: qml/Components/PinLockscreen.qml:197

124+#: qml/Components/PinLockscreen.qml:198

125msgid "CANCEL"

126msgstr "បោះបង់"

127

128−#: qml/Components/PinLockscreen.qml:215

128+#: qml/Components/PinLockscreen.qml:216

129msgid "DONE"

130msgstr "រួចរាល់"

131

132−#: qml/Dash/GenericScopeView.qml:360

132+#: qml/Dash/GenericScopeView.qml:358

133msgid "See less"

134msgstr "មើលតិចជាង"

135

136−#: qml/Dash/GenericScopeView.qml:360

136+#: qml/Dash/GenericScopeView.qml:358

137msgid "See all"

138msgstr "មើលទាំងអស់"

139

140−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27

140+#: qml/Panel/SearchIndicator.qml:27

141msgid "Search"

142msgstr "ស្វែងរក"

143

@@ -161,15 +161,15 @@ msgstr "បន្ថែមការពិនិត្យ"

161msgid "Send"

162msgstr "ផ្ញើ"

163

164−#: qml/Dash/ScopesOverview.qml:201

164+#: qml/Dash/ScopesOverview.qml:200

165msgid "Manage Dash"

166msgstr "គ្រប់គ្រងផ្ទាំង"

167

168−#: qml/Dash/ScopesOverview.qml:408

168+#: qml/Dash/ScopesOverview.qml:405

169msgid "Done"

170msgstr "ធ្វើរួច"

171

172−#: qml/Dash/ScopesOverview.qml:434

172+#: qml/Dash/ScopesOverview.qml:431

173msgid "Store"

174msgstr "រក្សាទុក"

175

@@ -255,46 +255,52 @@ msgstr "រ៉ូមីង"

255

256#: qml/Shell.qml:267

257msgid "passphrase"

258−msgstr ""

258+msgstr "ឃ្លាសម្ងាត់"

259

260#: qml/Shell.qml:267

261msgid "passcode"

262−msgstr ""

262+msgstr "កូដសម្ងាត់"

263

264#: qml/Shell.qml:269

265#, qt-format

266msgid "Enter your %1"

267−msgstr ""

267+msgstr "បញ្ចូល %1 របស់អ្នក"

268

269#: qml/Shell.qml:270

270#, qt-format

271msgid "Incorrect %1"

272−msgstr ""

272+msgstr "មិនត្រឹមត្រូវ %1"

273

274#: qml/Shell.qml:272

275msgid "Please re-enter"

276−msgstr ""

276+msgstr "សូមបញ្ចូលឡើងវិញ"

277

278#: qml/Shell.qml:306

279msgid "Sorry, incorrect passphrase."

280−msgstr ""

280+msgstr "សូមទោស! ឃ្លាសម្ងាត់មិនត្រឹមត្រូវ។"

281

282#: qml/Shell.qml:307

283msgid "Sorry, incorrect passcode."

284−msgstr ""

284+msgstr "សូមទោស! កូដសម្ងាត់មិនត្រឹមត្រូវ។"

285

286#: qml/Shell.qml:308

287msgid "This will be your last attempt."

288−msgstr ""

288+msgstr "នេះគឺការព្យាយាមលើកចុងក្រោយ។"

289

290#: qml/Shell.qml:310

291msgid ""

292"If passphrase is entered incorrectly, your phone will conduct a factory "

293"reset and all personal data will be deleted."

294msgstr ""

295+"បើបញ្ចូលឃ្លាសម្ងាត់មិនត្រឹមត្រូវ "

296+"ទូរស័ព្ទរបស់អ្នកនឹងកំណត់ទៅទិន្នន័យពីរោងចក្រវិញ "

297+"ហើយទិន្នន័យផ្ទាល់ខ្លួនទាំងអស់របស់អ្នកនឹងត្រូវបានលុប។"

295

298

296#: qml/Shell.qml:311

299#: qml/Shell.qml:311

297msgid ""

300msgid ""

298"If passcode is entered incorrectly, your phone will conduct a factory reset "

301"If passcode is entered incorrectly, your phone will conduct a factory reset "

299"and all personal data will be deleted."

302"and all personal data will be deleted."

300msgstr ""

303msgstr ""

304+"បើបញ្ចូលកូដសម្ងាត់មិនត្រឹមត្រូវ "

305+"ទូរស័ព្ទរបស់អ្នកនឹងកំណត់ទៅទិន្នន័យពីរោងចក្រវិញ "

306+"ហើយទិន្នន័យផ្ទាល់ខ្លួនទាំងអស់របស់អ្នកនឹងត្រូវបានលុប។"

po/ko.po+42−40

@@ -8,18 +8,18 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"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"

12"Last-Translator: MinSik CHO <Unknown>\n"

13"Language-Team: Korean <ko@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-20 06:23+0000\n"

18−"X-Generator: Launchpad (build 17156)\n"

18+"X-Generator: Launchpad (build 17163)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr ""

22+msgstr "열쇠글: "

23

24#: plugins/Unity/Launcher/launcheritem.cpp:43

25#: plugins/Unity/Launcher/launcheritem.cpp:73

@@ -32,19 +32,19 @@ msgstr "바로가기를 고정 해제하기"

32

33#: qml/Components/Dialogs.qml:142

34msgid "Are you sure you would like to turn power off?"

35−msgstr ""

35+msgstr "정말로 전원을 끌까요?"

36

37#: qml/Components/Dialogs.qml:144

38msgid "Power off"

39−msgstr ""

39+msgstr "전원 끄기"

40

41#: qml/Components/Dialogs.qml:153

42msgid "Restart"

43−msgstr ""

43+msgstr "재시작"

44

45#: qml/Components/Dialogs.qml:162

46msgid "Cancel"

47−msgstr ""

47+msgstr "취소"

48

49#: qml/Components/EdgeDemoOverlay.qml:151

50msgid "Skip intro"

@@ -96,46 +96,46 @@ msgstr ""

96

97#: qml/Components/Lockscreen.qml:161

98msgid "Too many incorrect attempts"

99−msgstr ""

99+msgstr "너무 많이 틀리셨습니다"

100

101#: qml/Components/Lockscreen.qml:163

102msgid "Please wait"

103−msgstr ""

103+msgstr "기다려주십시오"

104

105−#: qml/Components/Lockscreen.qml:245

105+#: qml/Components/Lockscreen.qml:220

106msgid "Emergency Call"

107msgstr "긴급 통화"

108

109−#: qml/Components/Lockscreen.qml:268

109+#: qml/Components/Lockscreen.qml:243

110msgid "OK"

111msgstr "확인"

112

113−#: qml/Components/PassphraseLockscreen.qml:61

113+#: qml/Components/PassphraseLockscreen.qml:62

114#, qt-format

115msgid "Hello %1"

116msgstr "안녕하세요 %1"

117

118−#: qml/Components/PassphraseLockscreen.qml:61

118+#: qml/Components/PassphraseLockscreen.qml:62

119msgid "Hello"

120msgstr "안녕하세요"

121

122−#: qml/Components/PinLockscreen.qml:197

122+#: qml/Components/PinLockscreen.qml:198

123msgid "CANCEL"

124msgstr "취소"

125

126−#: qml/Components/PinLockscreen.qml:215

126+#: qml/Components/PinLockscreen.qml:216

127msgid "DONE"

128msgstr "완료"

129

130−#: qml/Dash/GenericScopeView.qml:360

130+#: qml/Dash/GenericScopeView.qml:358

131msgid "See less"

132msgstr "간단히 표시하기"

133

134−#: qml/Dash/GenericScopeView.qml:360

134+#: qml/Dash/GenericScopeView.qml:358

135msgid "See all"

136−msgstr ""

136+msgstr "모두 보기"

137

138−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27

138+#: qml/Panel/SearchIndicator.qml:27

139msgid "Search"

140msgstr "검색"

141

@@ -159,25 +159,25 @@ msgstr "평가 제출하기"

159msgid "Send"

160msgstr "보내기"

161

162−#: qml/Dash/ScopesOverview.qml:201

162+#: qml/Dash/ScopesOverview.qml:200

163msgid "Manage Dash"

164−msgstr ""

164+msgstr "대시 관리"

165

166−#: qml/Dash/ScopesOverview.qml:408

166+#: qml/Dash/ScopesOverview.qml:405

167msgid "Done"

168−msgstr ""

168+msgstr "완료"

169

170−#: qml/Dash/ScopesOverview.qml:434

170+#: qml/Dash/ScopesOverview.qml:431

171msgid "Store"

172−msgstr ""

172+msgstr "장터"

173

174#: qml/Dash/ScopesOverviewTab.qml:36

175msgid "Favorites"

176−msgstr ""

176+msgstr "즐겨찾기"

177

178#: qml/Dash/ScopesOverviewTab.qml:54

179msgid "All"

180−msgstr ""

180+msgstr "모두"

181

182#: qml/Greeter/Greeter.qml:157

183msgid "Swipe to unlock"

@@ -213,11 +213,11 @@ msgstr "심카드의 PIN 번호를 입력하세요."

213

214#: qml/Panel/ActiveCallHint.qml:77

215msgid "Tap to return to call..."

216−msgstr ""

216+msgstr "통화로 돌아가려면 터치하세요..."

217

218#: qml/Panel/ActiveCallHint.qml:90

219msgid "Conference"

220−msgstr ""

220+msgstr "회의"

221

222#: qml/Panel/Indicators/MenuItemFactory.qml:651

223msgid "In queue…"

@@ -245,54 +245,56 @@ msgstr "실패하였습니다. 재시도하려면 누르세요."

245

246#: qml/Panel/Indicators/ModemInfoItem.qml:105

247msgid "Unlock SIM"

248−msgstr ""

248+msgstr "SIM 카드 보안 해제"

249

250#: qml/Panel/Indicators/RoamingIndication.qml:27

251msgid "Roaming"

252−msgstr ""

252+msgstr "로밍"

253

254#: qml/Shell.qml:267

255msgid "passphrase"

256−msgstr ""

256+msgstr "비밀번호"

257

258#: qml/Shell.qml:267

259msgid "passcode"

260−msgstr ""

260+msgstr "비밀번호"

261

262#: qml/Shell.qml:269

263#, qt-format

264msgid "Enter your %1"

265−msgstr ""

265+msgstr "%1를 입력하세요"

266

267#: qml/Shell.qml:270

268#, qt-format

269msgid "Incorrect %1"

270−msgstr ""

270+msgstr "잘못된 %1입니다"

271

272#: qml/Shell.qml:272

273msgid "Please re-enter"

274−msgstr ""

274+msgstr "다시 입력하세요"

275

276#: qml/Shell.qml:306

277msgid "Sorry, incorrect passphrase."

278−msgstr ""

278+msgstr "잘못된 비밀번호입니다."

279

280#: qml/Shell.qml:307

281msgid "Sorry, incorrect passcode."

282−msgstr ""

282+msgstr "잘못된 비밀번호입니다."

283

284#: qml/Shell.qml:308

285msgid "This will be your last attempt."

286−msgstr ""

286+msgstr "마지막 시도입니다."

287

288#: qml/Shell.qml:310

289msgid ""

290"If passphrase is entered incorrectly, your phone will conduct a factory "

291"reset and all personal data will be deleted."

292msgstr ""

293+"만약 이번 시도에서 잘못 입력하면, 보안을 위해 휴대 전화가 공장 초기화 과정을 거쳐 모든 사용자 데이터를 삭제할 것입니다."

293

294

294#: qml/Shell.qml:311

295#: qml/Shell.qml:311

295msgid ""

296msgid ""

296"If passcode is entered incorrectly, your phone will conduct a factory reset "

297"If passcode is entered incorrectly, your phone will conduct a factory reset "

297"and all personal data will be deleted."

298"and all personal data will be deleted."

298msgstr ""

299msgstr ""

300+"만약 이번 시도에서 잘못 입력하면, 보안을 위해 휴대 전화가 공장 초기화 과정을 거쳐 모든 사용자 데이터를 삭제할 것입니다."

po/pl.po+20−20

@@ -8,13 +8,13 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-07-31 13:51+0000\n"

11+"PO-Revision-Date: 2014-08-18 20:25+0000\n"

12−"Last-Translator: Michał Radwański <radwanski.michal@outlook.com>\n"

12+"Last-Translator: Paweł Stroka <pawstr@gmail.com>\n"

13"Language-Team: Polish <pl@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"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"

18"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

@@ -104,40 +104,40 @@ msgstr ""

104msgid "Please wait"

105msgstr ""

106

107−#: qml/Components/Lockscreen.qml:245

107+#: qml/Components/Lockscreen.qml:220

108msgid "Emergency Call"

109msgstr "Telefon ratunkowy"

110

111−#: qml/Components/Lockscreen.qml:268

111+#: qml/Components/Lockscreen.qml:243

112msgid "OK"

113msgstr "OK"

114

115−#: qml/Components/PassphraseLockscreen.qml:61

115+#: qml/Components/PassphraseLockscreen.qml:62

116#, qt-format

117msgid "Hello %1"

118msgstr "Witaj %1"

119

120−#: qml/Components/PassphraseLockscreen.qml:61

120+#: qml/Components/PassphraseLockscreen.qml:62

121msgid "Hello"

122msgstr "Witaj"

123

124−#: qml/Components/PinLockscreen.qml:197

124+#: qml/Components/PinLockscreen.qml:198

125msgid "CANCEL"

126msgstr "ANULUJ"

127

128−#: qml/Components/PinLockscreen.qml:215

128+#: qml/Components/PinLockscreen.qml:216

129msgid "DONE"

130msgstr "ZROBIONE"

131

132−#: qml/Dash/GenericScopeView.qml:360

132+#: qml/Dash/GenericScopeView.qml:358

133msgid "See less"

134msgstr "Zobacz mniej"

135

136−#: qml/Dash/GenericScopeView.qml:360

136+#: qml/Dash/GenericScopeView.qml:358

137msgid "See all"

138msgstr "Zobacz wszystko"

139

140−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27

140+#: qml/Panel/SearchIndicator.qml:27

141msgid "Search"

142msgstr "Szukaj"

143

@@ -161,15 +161,15 @@ msgstr "Dodaj recenzję"

161msgid "Send"

162msgstr "Wyślij"

163

164−#: qml/Dash/ScopesOverview.qml:201

164+#: qml/Dash/ScopesOverview.qml:200

165msgid "Manage Dash"

166msgstr ""

167

168−#: qml/Dash/ScopesOverview.qml:408

168+#: qml/Dash/ScopesOverview.qml:405

169msgid "Done"

170msgstr ""

171

172−#: qml/Dash/ScopesOverview.qml:434

172+#: qml/Dash/ScopesOverview.qml:431

173msgid "Store"

174msgstr ""

175

@@ -255,11 +255,11 @@ msgstr ""

255

256#: qml/Shell.qml:267

257msgid "passphrase"

258−msgstr ""

258+msgstr "hasło"

259

260#: qml/Shell.qml:267

261msgid "passcode"

262−msgstr ""

262+msgstr "kod"

263

264#: qml/Shell.qml:269

265#, qt-format

@@ -273,15 +273,15 @@ msgstr ""

273

274#: qml/Shell.qml:272

275msgid "Please re-enter"

276−msgstr ""

276+msgstr "Proszę wprowadzić ponownie"

277

278#: qml/Shell.qml:306

279msgid "Sorry, incorrect passphrase."

280−msgstr ""

280+msgstr "Niestety, błędne hasło"

281

282#: qml/Shell.qml:307

283msgid "Sorry, incorrect passcode."

284−msgstr ""

284+msgstr "Niestety, błędny kod"

285

286#: qml/Shell.qml:308

287msgid "This will be your last attempt."

po/pt.po+13−11

@@ -8,18 +8,18 @@ msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-08-12 23:56+0000\n"

11+"PO-Revision-Date: 2014-08-17 20:27+0000\n"

12"Last-Translator: Ivo Xavier <ivofernandes12@gmail.com>\n"

13"Language-Team: Portuguese <pt@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"

18"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr ""

22+msgstr "Senha: "

23

24#: plugins/Unity/Launcher/launcheritem.cpp:43

25#: plugins/Unity/Launcher/launcheritem.cpp:73

@@ -97,11 +97,11 @@ msgstr ""

97

98#: qml/Components/Lockscreen.qml:161

99msgid "Too many incorrect attempts"

100−msgstr ""

100+msgstr "Demasiadas tentativas incorrectas"

101

102#: qml/Components/Lockscreen.qml:163

103msgid "Please wait"

104−msgstr ""

104+msgstr "Por favor aguarde"

105

106#: qml/Components/Lockscreen.qml:245

107msgid "Emergency Call"

@@ -254,7 +254,7 @@ msgstr "Roaming"

254

255#: qml/Shell.qml:267

256msgid "passphrase"

257−msgstr ""

257+msgstr "frase de acesso"

258

259#: qml/Shell.qml:267

260msgid "passcode"

@@ -263,20 +263,20 @@ msgstr ""

263#: qml/Shell.qml:269

264#, qt-format

265msgid "Enter your %1"

266−msgstr ""

266+msgstr "Introduza o seu %1"

267

268#: qml/Shell.qml:270

269#, qt-format

270msgid "Incorrect %1"

271−msgstr ""

271+msgstr "Incorreto %1"

272

273#: qml/Shell.qml:272

274msgid "Please re-enter"

275−msgstr ""

275+msgstr "Por favor, volte a reintroduzir"

276

277#: qml/Shell.qml:306

278msgid "Sorry, incorrect passphrase."

279−msgstr ""

279+msgstr "Desculpe, frase de acesso incorreta."

280

281#: qml/Shell.qml:307

282msgid "Sorry, incorrect passcode."

@@ -284,13 +284,15 @@ msgstr ""

284

285#: qml/Shell.qml:308

286msgid "This will be your last attempt."

287−msgstr ""

287+msgstr "Esta será a sua última tentativa."

288

289#: qml/Shell.qml:310

290msgid ""

291"If passphrase is entered incorrectly, your phone will conduct a factory "

292"reset and all personal data will be deleted."

293msgstr ""

294+"Se a frase de acesso for introduzida incorretamente, o seu telemóvel vai "

295+"proceder ao restauro de fábrica e apagará toda a sua informação pessoal."

294

296

295#: qml/Shell.qml:311

297#: qml/Shell.qml:311

296msgid ""

298msgid ""

po/pt_BR.po+33−29

@@ -8,18 +8,18 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-08-13 04:53+0000\n"

11+"PO-Revision-Date: 2014-08-18 14:14+0000\n"

12−"Last-Translator: Tiago Hillebrandt <tiagohillebrandt@gmail.com>\n"

12+"Last-Translator: Rafael Neri <Unknown>\n"

13"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"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"

18"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr ""

22+msgstr "Senha: "

23

24#: plugins/Unity/Launcher/launcheritem.cpp:43

25#: plugins/Unity/Launcher/launcheritem.cpp:73

@@ -98,46 +98,46 @@ msgstr ""

98

99#: qml/Components/Lockscreen.qml:161

100msgid "Too many incorrect attempts"

101−msgstr ""

101+msgstr "Muitas tentativas incorretas"

102

103#: qml/Components/Lockscreen.qml:163

104msgid "Please wait"

105−msgstr ""

105+msgstr "Por favor, aguarde"

106

107−#: qml/Components/Lockscreen.qml:245

107+#: qml/Components/Lockscreen.qml:220

108msgid "Emergency Call"

109msgstr "Chamada de emergência"

110

111−#: qml/Components/Lockscreen.qml:268

111+#: qml/Components/Lockscreen.qml:243

112msgid "OK"

113msgstr "OK"

114

115−#: qml/Components/PassphraseLockscreen.qml:61

115+#: qml/Components/PassphraseLockscreen.qml:62

116#, qt-format

117msgid "Hello %1"

118msgstr "Olá %1"

119

120−#: qml/Components/PassphraseLockscreen.qml:61

120+#: qml/Components/PassphraseLockscreen.qml:62

121msgid "Hello"

122msgstr "Olá"

123

124−#: qml/Components/PinLockscreen.qml:197

124+#: qml/Components/PinLockscreen.qml:198

125msgid "CANCEL"

126msgstr "CANCELAR"

127

128−#: qml/Components/PinLockscreen.qml:215

128+#: qml/Components/PinLockscreen.qml:216

129msgid "DONE"

130msgstr "FEITO"

131

132−#: qml/Dash/GenericScopeView.qml:360

132+#: qml/Dash/GenericScopeView.qml:358

133msgid "See less"

134msgstr "Ver menos"

135

136−#: qml/Dash/GenericScopeView.qml:360

136+#: qml/Dash/GenericScopeView.qml:358

137msgid "See all"

138msgstr "Ver todos"

139

140−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27

140+#: qml/Panel/SearchIndicator.qml:27

141msgid "Search"

142msgstr "Pesquisar"

143

@@ -161,15 +161,15 @@ msgstr "Adicionar uma análise"

161msgid "Send"

162msgstr "Enviar"

163

164−#: qml/Dash/ScopesOverview.qml:201

164+#: qml/Dash/ScopesOverview.qml:200

165msgid "Manage Dash"

166−msgstr ""

166+msgstr "Gerencia painel"

167

168−#: qml/Dash/ScopesOverview.qml:408

168+#: qml/Dash/ScopesOverview.qml:405

169msgid "Done"

170−msgstr ""

170+msgstr "Concluído"

171

172−#: qml/Dash/ScopesOverview.qml:434

172+#: qml/Dash/ScopesOverview.qml:431

173msgid "Store"

174msgstr "Loja"

175

@@ -179,7 +179,7 @@ msgstr "Favoritos"

179

180#: qml/Dash/ScopesOverviewTab.qml:54

181msgid "All"

182−msgstr ""

182+msgstr "Tudo"

183

184#: qml/Greeter/Greeter.qml:157

185msgid "Swipe to unlock"

@@ -255,46 +255,50 @@ msgstr "Roaming"

255

256#: qml/Shell.qml:267

257msgid "passphrase"

258−msgstr ""

258+msgstr "senha"

259

260#: qml/Shell.qml:267

261msgid "passcode"

262−msgstr ""

262+msgstr "código de acesso"

263

264#: qml/Shell.qml:269

265#, qt-format

266msgid "Enter your %1"

267−msgstr ""

267+msgstr "Digite o seu %1"

268

269#: qml/Shell.qml:270

270#, qt-format

271msgid "Incorrect %1"

272−msgstr ""

272+msgstr "%1 incorreto"

273

274#: qml/Shell.qml:272

275msgid "Please re-enter"

276−msgstr ""

276+msgstr "Por favor, digite novamente"

277

278#: qml/Shell.qml:306

279msgid "Sorry, incorrect passphrase."

280−msgstr ""

280+msgstr "Desculpe, senha incorreta."

281

282#: qml/Shell.qml:307

283msgid "Sorry, incorrect passcode."

284−msgstr ""

284+msgstr "Desculpe, código de acesso incorreto."

285

286#: qml/Shell.qml:308

287msgid "This will be your last attempt."

288−msgstr ""

288+msgstr "Esta será a sua última tentativa."

289

290#: qml/Shell.qml:310

291msgid ""

292"If passphrase is entered incorrectly, your phone will conduct a factory "

293"reset and all personal data will be deleted."

294msgstr ""

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."

295

297

296#: qml/Shell.qml:311

298#: qml/Shell.qml:311

297msgid ""

299msgid ""

298"If passcode is entered incorrectly, your phone will conduct a factory reset "

300"If passcode is entered incorrectly, your phone will conduct a factory reset "

299"and all personal data will be deleted."

301"and all personal data will be deleted."

300msgstr ""

302msgstr ""

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 ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"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"

12"Last-Translator: Jay ZDLin <Unknown>\n"

13"Language-Team: Russian <ru@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-21 06:48+0000\n"

18−"X-Generator: Launchpad (build 17156)\n"

18+"X-Generator: Launchpad (build 17163)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr ""

22+msgstr "Пароль: "

23

24#: plugins/Unity/Launcher/launcheritem.cpp:43

25#: plugins/Unity/Launcher/launcheritem.cpp:73

@@ -32,19 +32,19 @@ msgstr "Изъять ярлык"

32

33#: qml/Components/Dialogs.qml:142

34msgid "Are you sure you would like to turn power off?"

35−msgstr ""

35+msgstr "Отключить питание?"

36

37#: qml/Components/Dialogs.qml:144

38msgid "Power off"

39−msgstr ""

39+msgstr "Отключить"

40

41#: qml/Components/Dialogs.qml:153

42msgid "Restart"

43−msgstr ""

43+msgstr "Перезапустить"

44

45#: qml/Components/Dialogs.qml:162

46msgid "Cancel"

47−msgstr ""

47+msgstr "Отменить"

48

49#: qml/Components/EdgeDemoOverlay.qml:151

50msgid "Skip intro"

@@ -101,46 +101,46 @@ msgstr ""

101

102#: qml/Components/Lockscreen.qml:161

103msgid "Too many incorrect attempts"

104−msgstr ""

104+msgstr "Слишком много ошибок ввода"

105

106#: qml/Components/Lockscreen.qml:163

107msgid "Please wait"

108−msgstr ""

108+msgstr "Подождите"

109

110−#: qml/Components/Lockscreen.qml:245

110+#: qml/Components/Lockscreen.qml:220

111msgid "Emergency Call"

112msgstr "Экстренный вызов"

113

114−#: qml/Components/Lockscreen.qml:268

114+#: qml/Components/Lockscreen.qml:243

115msgid "OK"

116msgstr "ОК"

117

118−#: qml/Components/PassphraseLockscreen.qml:61

118+#: qml/Components/PassphraseLockscreen.qml:62

119#, qt-format

120msgid "Hello %1"

121msgstr "Привет, %1"

122

123−#: qml/Components/PassphraseLockscreen.qml:61

123+#: qml/Components/PassphraseLockscreen.qml:62

124msgid "Hello"

125msgstr "Привет"

126

127−#: qml/Components/PinLockscreen.qml:197

127+#: qml/Components/PinLockscreen.qml:198

128msgid "CANCEL"

129msgstr "ОТМЕНИТЬ"

130

131−#: qml/Components/PinLockscreen.qml:215

131+#: qml/Components/PinLockscreen.qml:216

132msgid "DONE"

133msgstr "ГОТОВО"

134

135−#: qml/Dash/GenericScopeView.qml:360

135+#: qml/Dash/GenericScopeView.qml:358

136msgid "See less"

137msgstr "Вкратце"

138

139−#: qml/Dash/GenericScopeView.qml:360

139+#: qml/Dash/GenericScopeView.qml:358

140msgid "See all"

141msgstr "Показать всё"

142

143−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27

143+#: qml/Panel/SearchIndicator.qml:27

144msgid "Search"

145msgstr "Поиск"

146

@@ -164,25 +164,25 @@ msgstr "Добавьте отзыв"

164msgid "Send"

165msgstr "Отправить"

166

167−#: qml/Dash/ScopesOverview.qml:201

167+#: qml/Dash/ScopesOverview.qml:200

168msgid "Manage Dash"

169msgstr ""

170

171−#: qml/Dash/ScopesOverview.qml:408

171+#: qml/Dash/ScopesOverview.qml:405

172msgid "Done"

173−msgstr ""

173+msgstr "Готово"

174

175−#: qml/Dash/ScopesOverview.qml:434

175+#: qml/Dash/ScopesOverview.qml:431

176msgid "Store"

177msgstr ""

178

179#: qml/Dash/ScopesOverviewTab.qml:36

180msgid "Favorites"

181−msgstr ""

181+msgstr "Избранное"

182

183#: qml/Dash/ScopesOverviewTab.qml:54

184msgid "All"

185−msgstr ""

185+msgstr "Все"

186

187#: qml/Greeter/Greeter.qml:157

188msgid "Swipe to unlock"

@@ -250,54 +250,58 @@ msgstr "Сбой, коснитесь для повтора"

250

251#: qml/Panel/Indicators/ModemInfoItem.qml:105

252msgid "Unlock SIM"

253−msgstr ""

253+msgstr "Разблокировать SIM-карту"

254

255#: qml/Panel/Indicators/RoamingIndication.qml:27

256msgid "Roaming"

257−msgstr ""

257+msgstr "Роуминг"

258

259#: qml/Shell.qml:267

260msgid "passphrase"

261−msgstr ""

261+msgstr "ключевая фраза"

262

263#: qml/Shell.qml:267

264msgid "passcode"

265−msgstr ""

265+msgstr "секретный код"

266

267#: qml/Shell.qml:269

268#, qt-format

269msgid "Enter your %1"

270−msgstr ""

270+msgstr "Введите %1"

271

272#: qml/Shell.qml:270

273#, qt-format

274msgid "Incorrect %1"

275−msgstr ""

275+msgstr "Некорректно введён %1"

276

277#: qml/Shell.qml:272

278msgid "Please re-enter"

279−msgstr ""

279+msgstr "Повторите ввод"

280

281#: qml/Shell.qml:306

282msgid "Sorry, incorrect passphrase."

283−msgstr ""

283+msgstr "Неверная ключевая фраза."

284

285#: qml/Shell.qml:307

286msgid "Sorry, incorrect passcode."

287−msgstr ""

287+msgstr "Неверный секретный код."

288

289#: qml/Shell.qml:308

290msgid "This will be your last attempt."

291−msgstr ""

291+msgstr "Осталась последняя попытка."

292

293#: qml/Shell.qml:310

294msgid ""

295"If passphrase is entered incorrectly, your phone will conduct a factory "

296"reset and all personal data will be deleted."

297msgstr ""

298+"Если ключевая фраза будет введена неверно, то телефон вернётся к заводским "

299+"настройкам, а все личные данные будут удалены."

298

300

299#: qml/Shell.qml:311

301#: qml/Shell.qml:311

300msgid ""

302msgid ""

301"If passcode is entered incorrectly, your phone will conduct a factory reset "

303"If passcode is entered incorrectly, your phone will conduct a factory reset "

302"and all personal data will be deleted."

304"and all personal data will be deleted."

303msgstr ""

305msgstr ""

306+"Если секретный код будет введен неверно, то телефон вернётся к заводским "

307+"настройкам, а все личные данные будут удалены."

po/sl.po+41−37

@@ -8,18 +8,18 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"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"

12"Last-Translator: Damir Jerovšek <Unknown>\n"

13"Language-Team: Slovenian <sl@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-20 06:23+0000\n"

18−"X-Generator: Launchpad (build 17156)\n"

18+"X-Generator: Launchpad (build 17163)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr ""

22+msgstr "Geslo: "

23

24#: plugins/Unity/Launcher/launcheritem.cpp:43

25#: plugins/Unity/Launcher/launcheritem.cpp:73

@@ -32,19 +32,19 @@ msgstr "Odpni bližnjico"

32

33#: qml/Components/Dialogs.qml:142

34msgid "Are you sure you would like to turn power off?"

35−msgstr ""

35+msgstr "Ali ste prepričani, da želite izklopiti?"

36

37#: qml/Components/Dialogs.qml:144

38msgid "Power off"

39−msgstr ""

39+msgstr "Izklopi"

40

41#: qml/Components/Dialogs.qml:153

42msgid "Restart"

43−msgstr ""

43+msgstr "Ponovno zaženi"

44

45#: qml/Components/Dialogs.qml:162

46msgid "Cancel"

47−msgstr ""

47+msgstr "Prekliči"

48

49#: qml/Components/EdgeDemoOverlay.qml:151

50msgid "Skip intro"

@@ -98,46 +98,46 @@ msgstr ""

98

99#: qml/Components/Lockscreen.qml:161

100msgid "Too many incorrect attempts"

101−msgstr ""

101+msgstr "Preveč nepravilnih poskusov"

102

103#: qml/Components/Lockscreen.qml:163

104msgid "Please wait"

105−msgstr ""

105+msgstr "Počakajte"

106

107−#: qml/Components/Lockscreen.qml:245

107+#: qml/Components/Lockscreen.qml:220

108msgid "Emergency Call"

109msgstr "Klic v sili"

110

111−#: qml/Components/Lockscreen.qml:268

111+#: qml/Components/Lockscreen.qml:243

112msgid "OK"

113msgstr "V REDU"

114

115−#: qml/Components/PassphraseLockscreen.qml:61

115+#: qml/Components/PassphraseLockscreen.qml:62

116#, qt-format

117msgid "Hello %1"

118msgstr "Pozdravljeni, %1"

119

120−#: qml/Components/PassphraseLockscreen.qml:61

120+#: qml/Components/PassphraseLockscreen.qml:62

121msgid "Hello"

122msgstr "Pozdravljeni"

123

124−#: qml/Components/PinLockscreen.qml:197

124+#: qml/Components/PinLockscreen.qml:198

125msgid "CANCEL"

126msgstr "PREKLIČI"

127

128−#: qml/Components/PinLockscreen.qml:215

128+#: qml/Components/PinLockscreen.qml:216

129msgid "DONE"

130msgstr "KONČANO"

131

132−#: qml/Dash/GenericScopeView.qml:360

132+#: qml/Dash/GenericScopeView.qml:358

133msgid "See less"

134msgstr "Pokaži manj"

135

136−#: qml/Dash/GenericScopeView.qml:360

136+#: qml/Dash/GenericScopeView.qml:358

137msgid "See all"

138msgstr "Ogled vsega"

139

140−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27

140+#: qml/Panel/SearchIndicator.qml:27

141msgid "Search"

142msgstr "Iskanje"

143

@@ -161,25 +161,25 @@ msgstr "Dodaj oceno"

161msgid "Send"

162msgstr "Pošlji"

163

164−#: qml/Dash/ScopesOverview.qml:201

164+#: qml/Dash/ScopesOverview.qml:200

165msgid "Manage Dash"

166−msgstr ""

166+msgstr "Upravljaj s pregledno ploščo"

167

168−#: qml/Dash/ScopesOverview.qml:408

168+#: qml/Dash/ScopesOverview.qml:405

169msgid "Done"

170−msgstr ""

170+msgstr "Končano"

171

172−#: qml/Dash/ScopesOverview.qml:434

172+#: qml/Dash/ScopesOverview.qml:431

173msgid "Store"

174−msgstr ""

174+msgstr "Trgovina"

175

176#: qml/Dash/ScopesOverviewTab.qml:36

177msgid "Favorites"

178−msgstr ""

178+msgstr "Priljubljeni"

179

180#: qml/Dash/ScopesOverviewTab.qml:54

181msgid "All"

182−msgstr ""

182+msgstr "Vse"

183

184#: qml/Greeter/Greeter.qml:157

185msgid "Swipe to unlock"

@@ -247,54 +247,58 @@ msgstr "Spodletelo, tapnite za ponovni poskus"

247

248#: qml/Panel/Indicators/ModemInfoItem.qml:105

249msgid "Unlock SIM"

250−msgstr ""

250+msgstr "Odkleni SIM"

251

252#: qml/Panel/Indicators/RoamingIndication.qml:27

253msgid "Roaming"

254−msgstr ""

254+msgstr "Gostovanje"

255

256#: qml/Shell.qml:267

257msgid "passphrase"

258−msgstr ""

258+msgstr "šifrirno reklo"

259

260#: qml/Shell.qml:267

261msgid "passcode"

262−msgstr ""

262+msgstr "geslo"

263

264#: qml/Shell.qml:269

265#, qt-format

266msgid "Enter your %1"

267−msgstr ""

267+msgstr "Vnesite vaš %1"

268

269#: qml/Shell.qml:270

270#, qt-format

271msgid "Incorrect %1"

272−msgstr ""

272+msgstr "Nepravilen %1"

273

274#: qml/Shell.qml:272

275msgid "Please re-enter"

276−msgstr ""

276+msgstr "Ponovno vnesite"

277

278#: qml/Shell.qml:306

279msgid "Sorry, incorrect passphrase."

280−msgstr ""

280+msgstr "Nepravilno geslo."

281

282#: qml/Shell.qml:307

283msgid "Sorry, incorrect passcode."

284−msgstr ""

284+msgstr "Nepravilno geslo."

285

286#: qml/Shell.qml:308

287msgid "This will be your last attempt."

288−msgstr ""

288+msgstr "To je vaš zadnji poskus"

289

290#: qml/Shell.qml:310

291msgid ""

292"If passphrase is entered incorrectly, your phone will conduct a factory "

293"reset and all personal data will be deleted."

294msgstr ""

295+"Če je vneseno nepravilno šifrirno reklo, bo telefon ponastavljen na "

296+"tovarniške nastavitve ter vsi osebni podatki bodo izbrisani."

295

297

296#: qml/Shell.qml:311

298#: qml/Shell.qml:311

297msgid ""

299msgid ""

298"If passcode is entered incorrectly, your phone will conduct a factory reset "

300"If passcode is entered incorrectly, your phone will conduct a factory reset "

299"and all personal data will be deleted."

301"and all personal data will be deleted."

300msgstr ""

302msgstr ""

303+"Če je vneseno nepravilno geslo, bo telefon ponastavljen na tovarniške "

304+"nastavitve ter vsi osebni podatki bodo izbrisani."

po/uk.po+17−13

@@ -8,18 +8,18 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2014-08-13 14:09-0400\n"

11−"PO-Revision-Date: 2014-08-12 14:38+0000\n"

11+"PO-Revision-Date: 2014-08-17 14:49+0000\n"

12"Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"

13"Language-Team: Ukrainian <uk@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"

18"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/LightDM/Greeter.cpp:129

21msgid "Password: "

22−msgstr ""

22+msgstr "Пароль: "

23

24#: plugins/Unity/Launcher/launcheritem.cpp:43

25#: plugins/Unity/Launcher/launcheritem.cpp:73

@@ -99,11 +99,11 @@ msgstr ""

99

100#: qml/Components/Lockscreen.qml:161

101msgid "Too many incorrect attempts"

102−msgstr ""

102+msgstr "Забагато помилкових спроб"

103

104#: qml/Components/Lockscreen.qml:163

105msgid "Please wait"

106−msgstr ""

106+msgstr "Будь ласка, зачекайте"

107

108#: qml/Components/Lockscreen.qml:245

109msgid "Emergency Call"

@@ -256,46 +256,50 @@ msgstr "Роумінг"

256

257#: qml/Shell.qml:267

258msgid "passphrase"

259−msgstr ""

259+msgstr "пароль"

260

261#: qml/Shell.qml:267

262msgid "passcode"

263−msgstr ""

263+msgstr "код-пароль"

264

265#: qml/Shell.qml:269

266#, qt-format

267msgid "Enter your %1"

268−msgstr ""

268+msgstr "Вкажіть ваш %1"

269

270#: qml/Shell.qml:270

271#, qt-format

272msgid "Incorrect %1"

273−msgstr ""

273+msgstr "Помилковий %1"

274

275#: qml/Shell.qml:272

276msgid "Please re-enter"

277−msgstr ""

277+msgstr "Будь ласка, вкажіть ще раз"

278

279#: qml/Shell.qml:306

280msgid "Sorry, incorrect passphrase."

281−msgstr ""

281+msgstr "Вибачте, помилковий пароль."

282

283#: qml/Shell.qml:307

284msgid "Sorry, incorrect passcode."

285−msgstr ""

285+msgstr "Вибачте, помилковий код-пароль."

286

287#: qml/Shell.qml:308

288msgid "This will be your last attempt."

289−msgstr ""

289+msgstr "Ця спроба буде останньою."

290

291#: qml/Shell.qml:310

292msgid ""

293"If passphrase is entered incorrectly, your phone will conduct a factory "

294"reset and all personal data will be deleted."

295msgstr ""

296+"Якщо пароль буде вказано неправильно, телефон повернеться до початкового "

297+"стану, усі особисті дані буде вилучено."

296

298

297#: qml/Shell.qml:311

299#: qml/Shell.qml:311

298msgid ""

300msgid ""

299"If passcode is entered incorrectly, your phone will conduct a factory reset "

301"If passcode is entered incorrectly, your phone will conduct a factory reset "

300"and all personal data will be deleted."

302"and all personal data will be deleted."

301msgstr ""

303msgstr ""

304+"Якщо код-пароль буде вказано неправильно, телефон повернеться до початкового "

305+"стану, усі особисті дані буде вилучено."

qml/Greeter/Clock.qml+2−1

@@ -16,6 +16,7 @@

16

17import QtQuick 2.0

18import Ubuntu.Components 0.1

19+import "../Panel/Indicators"

19import Unity.Indicators 0.1 as Indicators

20import Unity.Indicators 0.1 as Indicators

20

21

21Item {

22Item {

@@ -33,7 +34,7 @@ Item {

33 }

34 }

35 }

35

36

36− Indicators.CachedUnityMenuModel {

37+ CachedUnityMenuModel {

37 id: timeModel

38 id: timeModel

38 objectName: "timeModel"

39 objectName: "timeModel"

39

40

qml/Notifications/Notification.qml+1−1

@@ -52,7 +52,7 @@ Item {

52 implicitHeight: type !== Notification.PlaceHolder ? (fullscreen ? maxHeight : contentColumn.height + contentColumn.spacing * 2) : 0

53

54 color: Qt.rgba(0.132, 0.117, 0.109, 0.97)

55− opacity: 0

55+ opacity: 1

56

57 state: {

58 var result = "";

qml/Notifications/Notifications.qml+2−2

@@ -79,7 +79,7 @@ ListView {

79 }

80 }

81

82− populate: Transition {

82+ /*populate: Transition {

83 UbuntuNumberAnimation {

84 property: "opacity"

85 to: 1

@@ -107,5 +107,5 @@ ListView {

107 properties: "x,y"

108 duration: UbuntuAnimation.SnapDuration

109 }

110− }

110+ }*/

111}

tests/mocks/Unity/Indicators/CachedUnityMenuModel.qml → qml/Panel/Indicators/CachedUnityMenuModel.qmlrenamed+14−5

@@ -18,13 +18,22 @@

18 */

19

20import QtQuick 2.0

21+import QMenuModel 0.1

22+import Unity.Indicators 0.1 as Indicators

21

23

24+// Make sure we don't duplicate models.

22Item {

25Item {

26+ id: cachedModel

23− property string busName: ""

27+ property string busName

24− property string actionsObjectPath: ""

28+ property string actionsObjectPath

25− property string menuObjectPath: ""

29+ property string menuObjectPath

30+ readonly property bool ready: busName!=="" && actionsObjectPath!=="" && menuObjectPath!==""

26

31

27− readonly property bool ready: false

32+ property var model: {

33+ if (!ready) return null;

28

34

29− property QtObject model: null

35+ return Indicators.UnityMenuModelCache.model(cachedModel.busName,

36+ cachedModel.menuObjectPath,

37+ { "indicator": cachedModel.actionsObjectPath });

38+ }

30}

39}

qml/Panel/Indicators/DefaultIndicatorWidget.qml+2−1

@@ -63,6 +63,7 @@ IndicatorBase {

63 }

64

65 Row {

66+ id: iconRow

66 anchors {

67 anchors {

67 top: parent.top

68 top: parent.top

68 bottom: parent.bottom

69 bottom: parent.bottom

@@ -73,7 +74,7 @@ IndicatorBase {

73

74

74 Item {

75 Item {

75 width: itemImage.width + units.gu(1)

76 width: itemImage.width + units.gu(1)

76− anchors { top: parent.top; bottom: parent.bottom }

77+ height: iconRow.height

77

78

78 StatusIcon {

79 StatusIcon {

79 id: itemImage

80 id: itemImage

qml/Panel/Indicators/IndicatorBase.qml+4−2

@@ -34,6 +34,7 @@ Item {

34 property string deviceMenuObjectPath: menuObjectPath

35

36 property alias menuModel: cachedModel.model

37+ property alias rootActionState: rootAction

37

38

38 CachedUnityMenuModel {

39 CachedUnityMenuModel {

39 id: cachedModel

40 id: cachedModel

@@ -42,8 +43,9 @@ Item {

42 menuObjectPath: indicatorItem.deviceMenuObjectPath

43 menuObjectPath: indicatorItem.deviceMenuObjectPath

43 }

44 }

44

45

45− property RootActionState rootActionState: RootActionState {

46+ RootActionState {

47+ id: rootAction

46− menu: menuModel

48+ menu: menuModel ? menuModel : null

47 onUpdated: indicatorItem.rootActionStateChanged()

49 onUpdated: indicatorItem.rootActionStateChanged()

48 }

50 }

49}

51}

tests/mocks/QMenuModel/unitymenumodel.cpp+4−5

@@ -17,7 +17,6 @@

17 */

18

19#include "unitymenumodel.h"

20−#include <QDebug>

21

20

22enum MenuRoles {

21enum MenuRoles {

23 LabelRole = Qt::DisplayRole + 1,

22 LabelRole = Qt::DisplayRole + 1,

@@ -38,6 +37,10 @@ UnityMenuModel::UnityMenuModel(QObject *parent)

38{

37{

39}

38}

40

39

40+UnityMenuModel::~UnityMenuModel()

41+{

42+}

43+

41QVariant UnityMenuModel::modelData() const

44QVariant UnityMenuModel::modelData() const

42{

45{

43 return m_modelData;

46 return m_modelData;

@@ -83,10 +86,6 @@ void UnityMenuModel::removeRow(int row)

83 endRemoveRows();

86 endRemoveRows();

84}

87}

85

88

86−UnityMenuModel::~UnityMenuModel()

87−{

88−}

89−

90QByteArray UnityMenuModel::busName() const

89QByteArray UnityMenuModel::busName() const

91{

90{

92 return m_busName;

91 return m_busName;

tests/mocks/Unity/Application/ApplicationInfo.cpp+1

@@ -54,6 +54,7 @@ ApplicationInfo::~ApplicationInfo()

54 if (m_surface) {

55 Q_EMIT SurfaceManager::singleton()->surfaceDestroyed(m_surface);

56 m_surface->deleteLater();

57+ setSurface(nullptr);

57 }

58 }

58}

59}

59

60

tests/mocks/Unity/Indicators/CMakeLists.txt+6−1

@@ -14,6 +14,7 @@ set(IndicatorsFakeQml_SOURCES

14 fakeplugin.cpp

15 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/indicators.h

16 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/menucontentactivator.cpp

17+ ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/unitymenumodelcache.cpp

17 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/unitymenumodelstack.cpp

18 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/unitymenumodelstack.cpp

18 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/visibleindicatorsmodel.cpp

19 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/visibleindicatorsmodel.cpp

19 fakeindicatorsmodel.cpp

20 fakeindicatorsmodel.cpp

@@ -33,7 +34,11 @@ add_library(IndicatorsFakeQml SHARED

33)

34)

34add_definitions(-DUNITYINDICATORS_LIBRARY)

35add_definitions(-DUNITYINDICATORS_LIBRARY)

35

36

37+add_dependencies(IndicatorsFakeQml QMenuModelQml)

36−target_link_libraries(IndicatorsFakeQml)

38+target_link_libraries(IndicatorsFakeQml

39+ -L${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel

40+ -lqmenumodel

41+)

37

42

38qt5_use_modules(IndicatorsFakeQml Core Qml Quick)

43qt5_use_modules(IndicatorsFakeQml Core Qml Quick)

39

44

tests/mocks/Unity/Indicators/fakeplugin.cpp+9

@@ -26,9 +26,16 @@

26#include "fakeindicatorsmodel.h"

27#include "indicators.h"

28#include "menucontentactivator.h"

29+#include "unitymenumodelcache.h"

29#include "unitymenumodelstack.h"

30#include "unitymenumodelstack.h"

30#include "visibleindicatorsmodel.h"

31#include "visibleindicatorsmodel.h"

31

32

33+static QObject* menuModelCacheSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {

34+ Q_UNUSED(engine);

35+ Q_UNUSED(scriptEngine);

36+ return new UnityMenuModelCache;

37+}

38+

32void IndicatorsFakePlugin::registerTypes(const char * uri)

39void IndicatorsFakePlugin::registerTypes(const char * uri)

33{

40{

34 Q_INIT_RESOURCE(indicators_fake);

41 Q_INIT_RESOURCE(indicators_fake);

@@ -41,6 +48,8 @@ void IndicatorsFakePlugin::registerTypes(const char * uri)

41 qmlRegisterType<UnityMenuModelStack>(uri, 0, 1, "UnityMenuModelStack");

48 qmlRegisterType<UnityMenuModelStack>(uri, 0, 1, "UnityMenuModelStack");

42 qmlRegisterType<VisibleIndicatorsModel>(uri, 0, 1, "VisibleIndicatorsModel");

49 qmlRegisterType<VisibleIndicatorsModel>(uri, 0, 1, "VisibleIndicatorsModel");

43

50

51+ qmlRegisterSingletonType<UnityMenuModelCache>(uri, 0, 1, "UnityMenuModelCache", menuModelCacheSingleton);

52+

44 // external uncreatables

53 // external uncreatables

45 qmlRegisterUncreatableType<MenuContentState>(uri, 0, 1, "MenuContentState", "Can't create MenuContentState class");

54 qmlRegisterUncreatableType<MenuContentState>(uri, 0, 1, "MenuContentState", "Can't create MenuContentState class");

46 qmlRegisterUncreatableType<ActionState>(uri, 0, 1, "ActionState", "Can't create ActionState class");

55 qmlRegisterUncreatableType<ActionState>(uri, 0, 1, "ActionState", "Can't create ActionState class");

tests/mocks/Unity/Indicators/qmldir−1

@@ -2,7 +2,6 @@ module Unity.Indicators

2plugin IndicatorsFakeQml

3typeinfo Indicators.qmltypes

4

5−CachedUnityMenuModel 0.1 CachedUnityMenuModel.qml

6IndicatorsModel 0.1 IndicatorsModel.qml

5IndicatorsModel 0.1 IndicatorsModel.qml

7FakeMenuPage 0.1 FakeMenuPage.qml

6FakeMenuPage 0.1 FakeMenuPage.qml

8RootActionState 0.1 RootActionState.qml

7RootActionState 0.1 RootActionState.qml

tests/qmltests/CMakeLists.txt+1

@@ -72,6 +72,7 @@ add_qml_test(Panel Panel)

72add_qml_test(Panel SearchIndicator)

73add_qml_test(Panel/Indicators DefaultIndicatorWidget ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")

74add_qml_test(Panel/Indicators DefaultIndicatorPage ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")

75+add_qml_test(Panel/Indicators CachedUnityMenuModel ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")

75# These MenuItemFactory tests need the test/mocks/ to come before plugins/

76# These MenuItemFactory tests need the test/mocks/ to come before plugins/

76add_qml_test(Panel/Indicators MenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})

77add_qml_test(Panel/Indicators MenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})

77add_qml_test(Panel/Indicators MessageMenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})

78add_qml_test(Panel/Indicators MessageMenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})

tests/qmltests/Dash/tst_Dash.qml+2−1

@@ -127,8 +127,9 @@ Item {

127 tryCompare(scopes, "loaded", true);

128 var dashContentList = findChild(dash, "dashContentList");

129 tryCompare(dashContentList, "count", 6);

130+ tryCompareFunction(function() { return findChild(dash, "MockScope1 loader") != null; }, true);

130 var mockScope1Loader = findChild(dash, "MockScope1 loader");

131 var mockScope1Loader = findChild(dash, "MockScope1 loader");

131− tryCompareFunction(function() { return mockScope1Loader.item != null; }, true);

132+ tryCompare(mockScope1Loader, "status", Loader.Ready);

132

133

133 // Show the overview

134 // Show the overview

134 touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));

135 touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));

tests/qmltests/Panel/Indicators/tst_CachedUnityMenuModel.qmlnew file+137

@@ -0,0 +1,137 @@

1+/*

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+}