024b7b4 · unity8 · git.iko.soy

build.sh+1

compare with xenial

unifiedsplit

@@ -44,6 +44,7 @@ install_dependencies() {

44 gsettings-ubuntu-schemas \

45 pay-service \

46 qmenumodel-qml \

47+ qml-module-qtquick-layouts \

47 qml-module-qtquick-xmllistmodel \

48 qml-module-qtquick-xmllistmodel \

48 qtdeclarative5-gsettings1.0 \

49 qtdeclarative5-gsettings1.0 \

49 qtdeclarative5-ubuntu-ui-toolkit-plugin \

50 qtdeclarative5-ubuntu-ui-toolkit-plugin \

debian/changelog+41

@@ -1,3 +1,44 @@

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

2+

3+ [ CI bot ]

4+ * Resync trunk

5+

6+ [ Michał Sawicz ]

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

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

9+

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

11+

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

13+

14+ [ Michael Terry ]

15+ * Bring dialer to front on incoming call even when device is locked

16+ (LP: #1354532)

17+

18+ [ CI bot ]

19+ * Resync trunk

20+

21+ [ Michał Sawicz ]

22+ * Use palette's baseText for text colour in dash.

23+ * Update qmltypes definitions

24+ * Move PageHeader out of qml/Components into qml/Dash

25+ * Reshuffle and update dependencies

26+ * Fix cardtool test and make card creator output debugging info on

27+ errors.

28+ * Support previews for scopes in overview and hook up preview

29+ processing to activity indicator.

30+ * Fix notifications indicator title

31+ * Fix horizontal list activation and add test for it.

32+

33+ [ Ying-Chun Liu ]

34+ * Add button colors and i18n for power off dialog. (LP: #1354506)

35+

36+ [ Mirco Müller ]

37+ * Force plain-text rendering for summary- and body-text. (LP:

38+ #1335787)

39+

40+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 15 Aug 2014 17:38:07 +0000

41+

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

42unity8 (8.00+14.10.20140814.1-0ubuntu1) utopic; urgency=low

2

43

3 [ Michael Terry ]

44 [ Michael Terry ]

debian/control+4−2

@@ -32,6 +32,7 @@ Build-Depends: cmake,

32 python3-all:any,

33 python3-setuptools,

34 python:any (>= 2.7),

35+ qml-module-qtquick-layouts,

35 qml-module-qtquick-xmllistmodel,

36 qml-module-qtquick-xmllistmodel,

36 qml-module-qtquick2,

37 qml-module-qtquick2,

37 qml-module-qttest,

38 qml-module-qttest,

@@ -84,7 +85,6 @@ Depends: gsettings-desktop-schemas,

84 qml-module-qtquick-xmllistmodel,

85 qml-module-qtquick-xmllistmodel,

85 qtdeclarative5-gsettings1.0,

86 qtdeclarative5-gsettings1.0,

86 qtdeclarative5-qtmir-plugin (>= 0.4.1),

87 qtdeclarative5-qtmir-plugin (>= 0.4.1),

87− qtdeclarative5-ubuntu-settings-components (>= 0.3),

88 qtdeclarative5-ubuntu-telephony0.1,

89 unity-launcher-impl-3,

90 unity8-common (= ${source:Version}),

@@ -105,7 +105,9 @@ Description: Unity 8 shell

105

106Package: unity8-common

107Architecture: all

108+Depends: qml-module-qtquick-layouts,

109+ qtdeclarative5-ubuntu-settings-components (>= 0.3),

108−Depends: qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,

110+ qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,

109 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),

111 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),

110 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,

112 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,

111 ubuntu-thumbnailer-impl-0,

113 ubuntu-thumbnailer-impl-0,

plugins/AccountsService/AccountsService.qmltypes+8

@@ -14,9 +14,17 @@ Module {

14 isCreatable: false

15 isSingleton: true

16 exportMetaObjectRevisions: [0]

17+ Enum {

18+ name: "PasswordDisplayHint"

19+ values: {

20+ "Keyboard": 0,

21+ "Numeric": 1

22+ }

23+ }

17 Property { name: "user"; type: "string" }

24 Property { name: "user"; type: "string" }

18 Property { name: "demoEdges"; type: "bool" }

25 Property { name: "demoEdges"; type: "bool" }

19 Property { name: "backgroundFile"; type: "string"; isReadonly: true }

26 Property { name: "backgroundFile"; type: "string"; isReadonly: true }

20 Property { name: "statsWelcomeScreen"; type: "bool"; isReadonly: true }

27 Property { name: "statsWelcomeScreen"; type: "bool"; isReadonly: true }

28+ Property { name: "passwordDisplayHint"; type: "PasswordDisplayHint"; isReadonly: true }

21 }

29 }

22}

30}

plugins/Dash/CardCreator.js+15−1

@@ -639,7 +639,10 @@ function cardString(template, components) {

639 implicitHeight += 'titleLabel.y + titleLabel.height + units.gu(1);\n';

640 } else if (hasArt) {

641 implicitHeight += 'artShapeHolder.height;\n';

642+ } else {

643+ implicitHeight = '';

642 }

644 }

645+

643 // Close the AbstractButton

646 // Close the AbstractButton

644 code += implicitHeight + '}\n';

647 code += implicitHeight + '}\n';

645

648

@@ -654,5 +657,16 @@ function createCardComponent(parent, template, components) {

654 var card = cardString(template, components);

657 var card = cardString(template, components);

655 var code = imports + 'Component {\n' + card + '}\n';

658 var code = imports + 'Component {\n' + card + '}\n';

656

659

660+ try {

657− return Qt.createQmlObject(code, parent, "createCardComponent");

661+ return Qt.createQmlObject(code, parent, "createCardComponent");

662+ } catch (e) {

663+ console.error("ERROR: Invalid component created.");

664+ console.error("Template:");

665+ console.error(JSON.stringify(template));

666+ console.error("Components:");

667+ console.error(JSON.stringify(components));

668+ console.error("Code:");

669+ console.error(code);

670+ throw e;

671+ }

658}

672}

plugins/Dash/Dash.qmltypes+1

@@ -39,6 +39,7 @@ Module {

39 Property { name: "sectionProperty"; type: "string" }

40 Property { name: "forceNoClip"; type: "bool" }

41 Property { name: "stickyHeaderHeight"; type: "int"; isReadonly: true }

42+ Property { name: "headerItemShownHeight"; type: "double"; isReadonly: true }

42 Signal { name: "headerChanged" }

43 Signal { name: "headerChanged" }

43 Method { name: "positionAtBeginning" }

44 Method { name: "positionAtBeginning" }

44 Method { name: "showHeader" }

45 Method { name: "showHeader" }

plugins/LightDM/LightDM.qmltypes+7

@@ -14,6 +14,7 @@ Module {

14 isCreatable: false

15 isSingleton: true

16 exportMetaObjectRevisions: [0]

17+ Property { name: "active"; type: "bool" }

17 Property { name: "authenticated"; type: "bool"; isReadonly: true }

18 Property { name: "authenticated"; type: "bool"; isReadonly: true }

18 Property { name: "authenticationUser"; type: "string"; isReadonly: true }

19 Property { name: "authenticationUser"; type: "string"; isReadonly: true }

19 Property { name: "promptless"; type: "bool"; isReadonly: true }

20 Property { name: "promptless"; type: "bool"; isReadonly: true }

@@ -32,6 +33,8 @@ Module {

32 name: "authenticationUserChanged"

33 name: "authenticationUserChanged"

33 Parameter { name: "user"; type: "string" }

34 Parameter { name: "user"; type: "string" }

34 }

35 }

36+ Signal { name: "isActiveChanged" }

37+ Signal { name: "showGreeter" }

35 Signal {

38 Signal {

36 name: "requestAuthenticationUser"

39 name: "requestAuthenticationUser"

37 Parameter { name: "user"; type: "string" }

40 Parameter { name: "user"; type: "string" }

@@ -51,6 +54,10 @@ Module {

51 Parameter { name: "session"; type: "string" }

54 Parameter { name: "session"; type: "string" }

52 }

55 }

53 Method { name: "startSessionSync"; type: "bool" }

56 Method { name: "startSessionSync"; type: "bool" }

57+ Method {

58+ name: "setIsActive"

59+ Parameter { name: "isActive"; type: "bool" }

60+ }

54 }

61 }

55 Component {

62 Component {

56 name: "QAbstractProxyModel"

63 name: "QAbstractProxyModel"

plugins/Unity/DashCommunicator/DashCommunicator.qmltypesnew file+34

@@ -0,0 +1,34 @@

1+import QtQuick.tooling 1.1

2+

3+// This file describes the plugin-supplied types contained in the library.

4+// It is used for QML tooling purposes only.

5+//

6+// This file was auto-generated by:

7+// 'qmlplugindump -notrelocatable Unity.DashCommunicator 0.1 plugins'

8+

9+Module {

10+ Component {

11+ name: "DashCommunicator"

12+ prototype: "QObject"

13+ exports: ["Unity.DashCommunicator/DashCommunicator 0.1"]

14+ exportMetaObjectRevisions: [0]

15+ Method {

16+ name: "setCurrentScope"

17+ Parameter { name: "scopeId"; type: "string" }

18+ Parameter { name: "animate"; type: "bool" }

19+ Parameter { name: "reset"; type: "bool" }

20+ }

21+ }

22+ Component {

23+ name: "DashCommunicatorService"

24+ prototype: "QObject"

25+ exports: ["Unity.DashCommunicator/DashCommunicatorService 0.1"]

26+ exportMetaObjectRevisions: [0]

27+ Signal {

28+ name: "setCurrentScopeRequested"

29+ Parameter { name: "scopeId"; type: "string" }

30+ Parameter { name: "animate"; type: "bool" }

31+ Parameter { name: "reset"; type: "bool" }

32+ }

33+ }

34+}

plugins/Unity/Session/Session.qmltypes+12

@@ -18,8 +18,20 @@ Module {

18 name: "logoutRequested"

19 Parameter { name: "have_inhibitors"; type: "bool" }

20 }

21+ Signal {

22+ name: "rebootRequested"

23+ Parameter { name: "have_inhibitors"; type: "bool" }

24+ }

25+ Signal {

26+ name: "shutdownRequested"

27+ Parameter { name: "have_inhibitors"; type: "bool" }

28+ }

21 Signal { name: "logoutReady" }

29 Signal { name: "logoutReady" }

22 Method { name: "Logout" }

30 Method { name: "Logout" }

31+ Method { name: "Reboot" }

32+ Method { name: "Shutdown" }

23 Method { name: "RequestLogout" }

33 Method { name: "RequestLogout" }

34+ Method { name: "RequestReboot" }

35+ Method { name: "RequestShutdown" }

24 }

36 }

25}

37}

plugins/Utils/Utils.qmltypes+7

@@ -140,4 +140,11 @@ Module {

140 Property { name: "actionsHint"; type: "QByteArray" }

141 Property { name: "menuObjectPathHint"; type: "QByteArray" }

142 }

143+ Component {

144+ name: "WindowKeysFilter"

145+ defaultProperty: "data"

146+ prototype: "QQuickItem"

147+ exports: ["Utils/WindowKeysFilter 0.1"]

148+ exportMetaObjectRevisions: [0]

149+ }

143}

150}

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+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 12:46+0000\n"

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

12"Last-Translator: Alan Pope ㋛ <alan@ubuntu.com>\n"

13"Language-Team: English (United Kingdom) <en_GB@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/es.po+30−26

@@ -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 15:24+0000\n"

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

12−"Last-Translator: Leo Arias <leo.arias@canonical.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-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 "Contraseña: "

23

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

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

@@ -32,19 +32,19 @@ msgstr "Desanclar"

32

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

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

35−msgstr ""

35+msgstr "¿Está seguro de que quiere apagarlo?"

36

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

38msgid "Power off"

39−msgstr ""

39+msgstr "Apagar"

40

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

42msgid "Restart"

43−msgstr ""

43+msgstr "Reiniciar"

44

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

46msgid "Cancel"

47−msgstr ""

47+msgstr "Cancelar"

48

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

50msgid "Skip intro"

@@ -99,11 +99,11 @@ msgstr ""

99

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

101msgid "Too many incorrect attempts"

102−msgstr ""

102+msgstr "Demasiados intentos incorrectos"

103

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

105msgid "Please wait"

106−msgstr ""

106+msgstr "Espere un momento"

107

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

109msgid "Emergency Call"

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

@@ -164,23 +164,23 @@ msgstr "Enviar"

164

165#: qml/Dash/ScopesOverview.qml:201

166msgid "Manage Dash"

167−msgstr ""

167+msgstr "Gestionar tablero"

168

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

170msgid "Done"

171−msgstr ""

171+msgstr "Hecho"

172

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

174msgid "Store"

175−msgstr ""

175+msgstr "Tienda"

176

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

178msgid "Favorites"

179−msgstr ""

179+msgstr "Favoritos"

180

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

182msgid "All"

183−msgstr ""

183+msgstr "Todo"

184

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

186msgid "Swipe to unlock"

@@ -248,54 +248,58 @@ msgstr "Falló, toque para reintentar"

248

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

250msgid "Unlock SIM"

251−msgstr ""

251+msgstr "Desbloquear SIM"

252

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

254msgid "Roaming"

255−msgstr ""

255+msgstr "Itinerancia"

256

257#: qml/Shell.qml:267

258msgid "passphrase"

259−msgstr ""

259+msgstr "frase de paso"

260

261#: qml/Shell.qml:267

262msgid "passcode"

263−msgstr ""

263+msgstr "Código de paso"

264

265#: qml/Shell.qml:269

266#, qt-format

267msgid "Enter your %1"

268−msgstr ""

268+msgstr "Introduzca su %1"

269

270#: qml/Shell.qml:270

271#, qt-format

272msgid "Incorrect %1"

273−msgstr ""

273+msgstr "%1 incorrecta"

274

275#: qml/Shell.qml:272

276msgid "Please re-enter"

277−msgstr ""

277+msgstr "Vuelva a introducirla"

278

279#: qml/Shell.qml:306

280msgid "Sorry, incorrect passphrase."

281−msgstr ""

281+msgstr "Frase de paso incorrecta"

282

283#: qml/Shell.qml:307

284msgid "Sorry, incorrect passcode."

285−msgstr ""

285+msgstr "Código de paso incorrecto"

286

287#: qml/Shell.qml:308

288msgid "This will be your last attempt."

289−msgstr ""

289+msgstr "Este será su último intento."

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

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+"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+17−13

@@ -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 13:40+0000\n"

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

12"Last-Translator: Danial Behzadi <dani.behzi@gmail.com>\n"

13"Language-Team: Persian <fa@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

@@ -96,11 +96,11 @@ 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

106msgid "Emergency Call"

@@ -253,46 +253,50 @@ 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+"اگر عبارت‌عبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "

294+"اطّلاعات شخصی حذف خواهند شد."

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+"اگر رمزعبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "

302+"اطّلاعات شخصی حذف خواهند شد."

po/fi.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 06:38+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-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 "Salasana: "

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 "Liian monta virheellistä yritystä"

100

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

102msgid "Please wait"

103−msgstr ""

103+msgstr "Odota hetki"

104

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

106msgid "Emergency Call"

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

253

254#: qml/Shell.qml:267

255msgid "passphrase"

256−msgstr ""

256+msgstr "tunnuslause"

257

258#: qml/Shell.qml:267

259msgid "passcode"

260−msgstr ""

260+msgstr "tunnuskoodi"

261

262#: qml/Shell.qml:269

263#, qt-format

264msgid "Enter your %1"

265−msgstr ""

265+msgstr "Anna %1"

266

267#: qml/Shell.qml:270

268#, qt-format

269msgid "Incorrect %1"

270−msgstr ""

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

278−msgstr ""

278+msgstr "Virheellinen tunnuslause."

279

280#: qml/Shell.qml:307

281msgid "Sorry, incorrect passcode."

282−msgstr ""

282+msgstr "Virheellinen tunnuskoodi."

283

284#: qml/Shell.qml:308

285msgid "This will be your last attempt."

286−msgstr ""

286+msgstr "Tämä on viimeinen yritys."

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+"Jos kirjoitat tunnuslauseen virheellisesti, puhelimesi palautetaan "

294+"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."

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+"Jos kirjoitat tunnuskoodin virheellisesti, puhelimesi palautetaan "

302+"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."

po/fr.po+25−19

@@ -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 18:47+0000\n"

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

12−"Last-Translator: Sébastien Maes <nautilussebastien@gmail.com>\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-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 "Mot de passe : "

23

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

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

@@ -103,11 +103,11 @@ msgstr ""

103

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

105msgid "Too many incorrect attempts"

106−msgstr ""

106+msgstr "Trop de tentatives incorrectes"

107

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

109msgid "Please wait"

110−msgstr ""

110+msgstr "Veuillez patienter"

111

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

113msgid "Emergency Call"

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

@@ -172,7 +172,7 @@ msgstr "Gérer le tableau de bord"

172

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

174msgid "Done"

175−msgstr ""

175+msgstr "Terminé"

176

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

178msgid "Store"

@@ -180,11 +180,11 @@ msgstr ""

180

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

182msgid "Favorites"

183−msgstr ""

183+msgstr "Favorites"

184

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

186msgid "All"

187−msgstr ""

187+msgstr "Toutes"

188

189#: qml/Greeter/Greeter.qml:157

190msgid "Swipe to unlock"

@@ -256,50 +256,56 @@ msgstr "Déverrouiller la carte SIM"

256

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

258msgid "Roaming"

259−msgstr ""

259+msgstr "Roaming"

260

261#: qml/Shell.qml:267

262msgid "passphrase"

263−msgstr ""

263+msgstr "phrase secrète"

264

265#: qml/Shell.qml:267

266msgid "passcode"

267−msgstr ""

267+msgstr "code"

268

269#: qml/Shell.qml:269

270#, qt-format

271msgid "Enter your %1"

272−msgstr ""

272+msgstr "Saisissez votre %1"

273

274#: qml/Shell.qml:270

275#, qt-format

276msgid "Incorrect %1"

277−msgstr ""

277+msgstr "%1 non valide"

278

279#: qml/Shell.qml:272

280msgid "Please re-enter"

281−msgstr ""

281+msgstr "Veuillez recommencer"

282

283#: qml/Shell.qml:306

284msgid "Sorry, incorrect passphrase."

285−msgstr ""

285+msgstr "Désolé, phrase secrète incorrecte."

286

287#: qml/Shell.qml:307

288msgid "Sorry, incorrect passcode."

289−msgstr ""

289+msgstr "Désolé, code incorrect."

290

291#: qml/Shell.qml:308

292msgid "This will be your last attempt."

293−msgstr ""

293+msgstr "Ceci sera votre dernière tentative."

294

295#: qml/Shell.qml:310

296msgid ""

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

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

299msgstr ""

300+"Si la phrase secrète est saisie de manière incorrecte, votre téléphone "

301+"effectuera une réinitialisation aux paramètres d'usine et toutes les données "

302+"personnelles seront supprimées."

300

303

301#: qml/Shell.qml:311

304#: qml/Shell.qml:311

302msgid ""

305msgid ""

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

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

304"and all personal data will be deleted."

307"and all personal data will be deleted."

305msgstr ""

308msgstr ""

309+"Si le code est saisi de manière incorrecte, votre téléphone effectuera une "

310+"réinitialisation aux paramètres d'usine et toutes les données personnelles "

311+"seront supprimées."

po/hu.po+10−10

@@ -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-16 12:36+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-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 "Jelszó: "

23

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

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

@@ -36,11 +36,11 @@ msgstr ""

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"

@@ -102,7 +102,7 @@ msgstr ""

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

108msgid "Emergency Call"

@@ -175,11 +175,11 @@ msgstr ""

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,11 +247,11 @@ 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"

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/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/Components/Dialogs.qml+21−25

@@ -18,15 +18,18 @@ import QtQuick 2.0

18

19import Unity.Application 0.1

20import Unity.Session 0.1

21−import Ubuntu.Components 0.1

21+import Ubuntu.Components 1.1

22import Ubuntu.Components.Popups 0.1

23

24Item {

25 id: root

26

27 function onPowerKeyPressed() {

28+ // FIXME: event.isAutoRepeat is always false on Nexus 4.

29+ // So we use powerKeyTimer.running to avoid the PowerOff key repeat

30+ // https://launchpad.net/bugs/1349416

28 if (!powerKeyTimer.running) {

31 if (!powerKeyTimer.running) {

29− powerKeyTimer.start();

32+ powerKeyTimer.restart();

30 }

33 }

31 }

34 }

32

35

@@ -64,17 +67,17 @@ Item {

64 id: logoutDialog

67 id: logoutDialog

65 Dialog {

68 Dialog {

66 id: dialogueLogout

69 id: dialogueLogout

67− title: "Logout"

70+ title: i18n.tr("Log out")

68− text: "Are you sure that you want to logout?"

71+ text: i18n.tr("Are you sure you want to log out?")

69 Button {

72 Button {

70− text: "Cancel"

73+ text: i18n.tr("No")

71 onClicked: {

74 onClicked: {

72 PopupUtils.close(dialogueLogout);

75 PopupUtils.close(dialogueLogout);

73 d.dialogShown = false;

76 d.dialogShown = false;

74 }

77 }

75 }

78 }

76 Button {

79 Button {

77− text: "Yes"

80+ text: i18n.tr("Yes")

78 onClicked: {

81 onClicked: {

79 DBusUnitySessionService.Logout();

82 DBusUnitySessionService.Logout();

80 PopupUtils.close(dialogueLogout);

83 PopupUtils.close(dialogueLogout);

@@ -88,17 +91,17 @@ Item {

88 id: shutdownDialog

91 id: shutdownDialog

89 Dialog {

92 Dialog {

90 id: dialogueShutdown

93 id: dialogueShutdown

91− title: "Shutdown"

94+ title: i18n.tr("Shut down")

92− text: "Are you sure that you want to shutdown?"

95+ text: i18n.tr("Are you sure you want to shut down?")

93 Button {

96 Button {

94− text: "Cancel"

97+ text: i18n.tr("No")

95 onClicked: {

98 onClicked: {

96 PopupUtils.close(dialogueShutdown);

99 PopupUtils.close(dialogueShutdown);

97 d.dialogShown = false;

100 d.dialogShown = false;

98 }

101 }

99 }

102 }

100 Button {

103 Button {

101− text: "Yes"

104+ text: i18n.tr("Yes")

102 onClicked: {

105 onClicked: {

103 dBusUnitySessionServiceConnection.closeAllApps();

106 dBusUnitySessionServiceConnection.closeAllApps();

104 DBusUnitySessionService.Shutdown();

107 DBusUnitySessionService.Shutdown();

@@ -113,17 +116,17 @@ Item {

113 id: rebootDialog

116 id: rebootDialog

114 Dialog {

117 Dialog {

115 id: dialogueReboot

118 id: dialogueReboot

116− title: "Reboot"

119+ title: i18n.tr("Reboot")

117− text: "Are you sure that you want to reboot?"

120+ text: i18n.tr("Are you sure you want to reboot?")

118 Button {

121 Button {

119− text: "Cancel"

122+ text: i18n.tr("No")

120 onClicked: {

123 onClicked: {

121 PopupUtils.close(dialogueReboot)

124 PopupUtils.close(dialogueReboot)

122 d.dialogShown = false;

125 d.dialogShown = false;

123 }

126 }

124 }

127 }

125 Button {

128 Button {

126− text: "Yes"

129+ text: i18n.tr("Yes")

127 onClicked: {

130 onClicked: {

128 dBusUnitySessionServiceConnection.closeAllApps();

131 dBusUnitySessionServiceConnection.closeAllApps();

129 DBusUnitySessionService.Reboot();

132 DBusUnitySessionService.Reboot();

@@ -138,8 +141,8 @@ Item {

138 id: powerDialog

141 id: powerDialog

139 Dialog {

142 Dialog {

140 id: dialoguePower

143 id: dialoguePower

141− title: "Power"

144+ title: i18n.tr("Power")

142− text: i18n.tr("Are you sure you would like to turn power off?")

145+ text: i18n.tr("Are you sure you would like\nto power off?")

143 Button {

146 Button {

144 text: i18n.tr("Power off")

147 text: i18n.tr("Power off")

145 onClicked: {

148 onClicked: {

@@ -148,15 +151,7 @@ Item {

148 d.dialogShown = false;

151 d.dialogShown = false;

149 root.powerOffClicked();

152 root.powerOffClicked();

150 }

153 }

151− }

154+ color: UbuntuColors.red

152− Button {

153− text: i18n.tr("Restart")

154− onClicked: {

155− dBusUnitySessionServiceConnection.closeAllApps();

156− DBusUnitySessionService.Reboot();

157− PopupUtils.close(dialoguePower);

158− d.dialogShown = false;

159− }

160 }

155 }

161 Button {

156 Button {

162 text: i18n.tr("Cancel")

157 text: i18n.tr("Cancel")

@@ -164,6 +159,7 @@ Item {

164 PopupUtils.close(dialoguePower);

159 PopupUtils.close(dialoguePower);

165 d.dialogShown = false;

160 d.dialogShown = false;

166 }

161 }

162+ color: UbuntuColors.coolGrey

167 }

163 }

168 }

164 }

169 }

165 }

qml/Dash/CardHorizontalList.qml+2−2

@@ -54,8 +54,8 @@ DashRenderer {

54 }

55 Connections {

56 target: loader.item

57− onClicked: root.clicked(index, result)

57+ onClicked: root.clicked(index, result, loader.item, model)

58− onPressAndHold: root.pressAndHold(index)

58+ onPressAndHold: root.pressAndHold(index, model)

59 }

60 }

61 }

qml/Dash/ScopesOverview.qml+11−4

@@ -32,7 +32,7 @@ Item {

32 property alias currentTab: tabBar.currentTab

33

34 // Properties used by parent

35− readonly property bool processing: searchResultsViewer.processing || tempScopeItem.processing

35+ readonly property bool processing: searchResultsViewer.processing || tempScopeItem.processing || previewListView.processing

36 property bool growingDashFromPos: false

37 readonly property bool searching: scope && scope.searchQuery == ""

38 readonly property bool showingNonFavoriteScope: tempScopeItem.scope != null

@@ -371,7 +371,16 @@ Item {

371 }

372

373 function itemPressedAndHeld(index, itemModel, resultsModel, limitedCategoryItemCount) {

374− // Do nothing

374+ if (itemModel.uri.indexOf("scope://") === 0) {

375+ // Preview can call openScope so make sure restorePosition and restoreSize are set

376+ scopesOverviewXYScaler.restorePosition = undefined;

377+ scopesOverviewXYScaler.restoreSize = allCardSize;

378+

379+ previewListView.model = resultsModel;

380+ previewListView.currentIndex = -1;

381+ previewListView.currentIndex = index;

382+ previewListView.open = true;

383+ }

375 }

384 }

376 }

385 }

377

386

@@ -460,8 +469,6 @@ Item {

460 anchors.left: scopesOverviewContent.right

469 anchors.left: scopesOverviewContent.right

461 }

470 }

462

471

463−

464−

465 Item {

472 Item {

466 id: scopesOverviewXYScaler

473 id: scopesOverviewXYScaler

467 width: parent.width

474 width: parent.width

qml/Notifications/Notification.qml+2

@@ -257,6 +257,7 @@ Item {

257 font.bold: true

258 color: Theme.palette.selected.backgroundText

259 elide: Text.ElideRight

260+ textFormat: Text.PlainText

260 }

261 }

261

262

262 Label {

263 Label {

@@ -274,6 +275,7 @@ Item {

274 wrapMode: Text.WordWrap

275 wrapMode: Text.WordWrap

275 maximumLineCount: 10

276 maximumLineCount: 10

276 elide: Text.ElideRight

277 elide: Text.ElideRight

278+ textFormat: Text.PlainText

277 }

279 }

278 }

280 }

279 }

281 }

qml/Shell.qml+18−6

@@ -68,6 +68,13 @@ Item {

68 }

69 }

70

71+ function setFakeActiveForApp(app) {

72+ if (shell.locked) {

73+ greeter.fakeActiveForApp = app

74+ lockscreen.hide()

75+ }

76+ }

77+

71 Binding {

78 Binding {

72 target: LauncherModel

79 target: LauncherModel

73 property: "applicationManager"

80 property: "applicationManager"

@@ -130,7 +137,11 @@ Item {

130 Connections {

137 Connections {

131 target: ApplicationManager

138 target: ApplicationManager

132 onFocusRequested: {

139 onFocusRequested: {

140+ if (appId === "dialer-app") {

141+ // Always let the dialer-app through. Either user asked

142+ // for an emergency call or accepted an incoming call.

143+ setFakeActiveForApp(appId)

133− if (greeter.fakeActiveForApp !== "" && greeter.fakeActiveForApp !== appId) {

144+ } else if (greeter.fakeActiveForApp !== "" && greeter.fakeActiveForApp !== appId) {

134 lockscreen.show();

145 lockscreen.show();

135 }

146 }

136 greeter.hide();

147 greeter.hide();

@@ -147,6 +158,11 @@ Item {

147 if (greeter.shown && appId != "unity8-dash") {

158 if (greeter.shown && appId != "unity8-dash") {

148 greeter.hide();

159 greeter.hide();

149 }

160 }

161+ if (appId === "dialer-app") {

162+ // Always let the dialer-app through. Either user asked

163+ // for an emergency call or accepted an incoming call.

164+ setFakeActiveForApp(appId)

165+ }

150 }

166 }

151 }

167 }

152

168

@@ -239,11 +255,7 @@ Item {

239

255

240 onEntered: LightDM.Greeter.respond(passphrase);

256 onEntered: LightDM.Greeter.respond(passphrase);

241 onCancel: greeter.show()

257 onCancel: greeter.show()

242− onEmergencyCall: {

243− greeter.fakeActiveForApp = "dialer-app"

244− shell.activateApplication("dialer-app")

258+ onEmergencyCall: shell.activateApplication("dialer-app") // will automatically enter fake-active mode

245− lockscreen.hide()

246− }

247

259

248 onShownChanged: if (shown) greeter.fakeActiveForApp = ""

260 onShownChanged: if (shown) greeter.fakeActiveForApp = ""

249

261

tests/autopilot/unity8/indicators/tests/test_indicators.py+1−1

@@ -76,7 +76,7 @@ class IndicatorPageTitleMatchesWidgetTestCase(IndicatorTestCase):

76 ('Location', dict(indicator_name='indicator-location',

77 title='Location')),

78 ('Messaging', dict(indicator_name='indicator-messages',

79− title='Incoming')),

79+ title='Notification center')),

80 ('Network', dict(indicator_name='indicator-network',

81 title='Network')),

82 ('Power', dict(indicator_name='indicator-power',

tests/mocks/AccountsService/AccountsService.qmltypes+8

@@ -14,9 +14,17 @@ Module {

14 isCreatable: false

15 isSingleton: true

16 exportMetaObjectRevisions: [0]

17+ Enum {

18+ name: "PasswordDisplayHint"

19+ values: {

20+ "Keyboard": 0,

21+ "Numeric": 1

22+ }

23+ }

17 Property { name: "user"; type: "string" }

24 Property { name: "user"; type: "string" }

18 Property { name: "demoEdges"; type: "bool" }

25 Property { name: "demoEdges"; type: "bool" }

19 Property { name: "backgroundFile"; type: "string" }

26 Property { name: "backgroundFile"; type: "string" }

20 Property { name: "statsWelcomeScreen"; type: "bool" }

27 Property { name: "statsWelcomeScreen"; type: "bool" }

28+ Property { name: "passwordDisplayHint"; type: "PasswordDisplayHint"; isReadonly: true }

21 }

29 }

22}

30}

tests/mocks/LightDM/LightDM.qmltypes+7

@@ -14,6 +14,7 @@ Module {

14 isCreatable: false

15 isSingleton: true

16 exportMetaObjectRevisions: [0]

17+ Property { name: "active"; type: "bool" }

17 Property { name: "authenticated"; type: "bool"; isReadonly: true }

18 Property { name: "authenticated"; type: "bool"; isReadonly: true }

18 Property { name: "authenticationUser"; type: "string"; isReadonly: true }

19 Property { name: "authenticationUser"; type: "string"; isReadonly: true }

19 Property { name: "promptless"; type: "bool"; isReadonly: true }

20 Property { name: "promptless"; type: "bool"; isReadonly: true }

@@ -32,6 +33,8 @@ Module {

32 name: "authenticationUserChanged"

33 name: "authenticationUserChanged"

33 Parameter { name: "user"; type: "string" }

34 Parameter { name: "user"; type: "string" }

34 }

35 }

36+ Signal { name: "isActiveChanged" }

37+ Signal { name: "showGreeter" }

35 Signal {

38 Signal {

36 name: "requestAuthenticationUser"

39 name: "requestAuthenticationUser"

37 Parameter { name: "user"; type: "string" }

40 Parameter { name: "user"; type: "string" }

@@ -51,6 +54,10 @@ Module {

51 Parameter { name: "session"; type: "string" }

54 Parameter { name: "session"; type: "string" }

52 }

55 }

53 Method { name: "startSessionSync"; type: "bool" }

56 Method { name: "startSessionSync"; type: "bool" }

57+ Method {

58+ name: "setIsActive"

59+ Parameter { name: "isActive"; type: "bool" }

60+ }

54 }

61 }

55 Component {

62 Component {

56 name: "QAbstractProxyModel"

63 name: "QAbstractProxyModel"

tests/mocks/QMenuModel/QMenuModel.qmltypes+1

@@ -23,6 +23,7 @@ Module {

23 Property { name: "actions"; type: "QVariantMap" }

24 Property { name: "menuObjectPath"; type: "QByteArray" }

25 Property { name: "actionStateParser"; type: "ActionStateParser"; isPointer: true }

26+ Property { name: "nameOwner"; type: "string"; isReadonly: true }

26 Method {

27 Method {

27 name: "insertRow"

28 name: "insertRow"

28 Parameter { name: "row"; type: "int" }

29 Parameter { name: "row"; type: "int" }

tests/mocks/Ubuntu/Telephony/Telephony.qmltypesnew file+57

@@ -0,0 +1,57 @@

1+import QtQuick.tooling 1.1

2+

3+// This file describes the plugin-supplied types contained in the library.

4+// It is used for QML tooling purposes only.

5+//

6+// This file was auto-generated by:

7+// 'qmlplugindump -notrelocatable Ubuntu.Telephony 0.1 tests/mocks'

8+

9+Module {

10+ Component {

11+ name: "ContactWatcherData"

12+ prototype: "QObject"

13+ exports: ["Ubuntu.Telephony/ContactWatcherData 0.1"]

14+ isCreatable: false

15+ exportMetaObjectRevisions: [0]

16+ Property { name: "contactData"; type: "QVariant" }

17+ }

18+ Component {

19+ name: "MockCallEntry"

20+ prototype: "QObject"

21+ exports: ["Ubuntu.Telephony/CallEntry 0.1"]

22+ exportMetaObjectRevisions: [0]

23+ Property { name: "phoneNumber"; type: "string" }

24+ Property { name: "isConference"; type: "bool" }

25+ Property { name: "elapsedTime"; type: "int"; isReadonly: true }

26+ }

27+ Component {

28+ name: "MockCallManager"

29+ prototype: "QObject"

30+ exports: ["Ubuntu.Telephony/CallManager 0.1"]

31+ isCreatable: false

32+ exportMetaObjectRevisions: [0]

33+ Property { name: "foregroundCall"; type: "QObject"; isPointer: true }

34+ Property { name: "backgroundCall"; type: "QObject"; isPointer: true }

35+ Property { name: "hasCalls"; type: "bool"; isReadonly: true }

36+ Property { name: "callIndicatorVisible"; type: "bool" }

37+ }

38+ Component {

39+ name: "MockContactWatcher"

40+ prototype: "QObject"

41+ exports: ["Ubuntu.Telephony/ContactWatcher 0.1"]

42+ exportMetaObjectRevisions: [0]

43+ Property { name: "phoneNumber"; type: "string" }

44+ Property { name: "alias"; type: "string"; isReadonly: true }

45+ }

46+ Component {

47+ name: "MockTelepathyHelper"

48+ prototype: "QObject"

49+ exports: ["Ubuntu.Telephony/TelepathyHelper 0.1"]

50+ isCreatable: false

51+ exportMetaObjectRevisions: [0]

52+ Method {

53+ name: "registerChannelObserver"

54+ Parameter { name: "name"; type: "string" }

55+ }

56+ }

57+}

tests/mocks/Unity/Application/Application.qmltypes+133−8

@@ -33,15 +33,58 @@ Module {

33 exportMetaObjectRevisions: [0]

34 Property { name: "fullscreen"; type: "bool" }

35 Property { name: "stage"; type: "Stage" }

36+ Property { name: "surface"; type: "MirSurfaceItem"; isReadonly: true; isPointer: true }

37+ Property { name: "promptSurfaces"; type: "MirSurfaceItem"; isList: true; isReadonly: true }

36 Property { name: "imageQml"; type: "string" }

38 Property { name: "imageQml"; type: "string" }

37 Property { name: "windowQml"; type: "string" }

39 Property { name: "windowQml"; type: "string" }

40+ Signal {

38− Signal { name: "appIdChanged" }

41+ name: "appIdChanged"

42+ Parameter { type: "string" }

43+ }

44+ Signal {

39− Signal { name: "nameChanged" }

45+ name: "nameChanged"

46+ Parameter { type: "string" }

47+ }

48+ Signal {

40− Signal { name: "commentChanged" }

49+ name: "commentChanged"

50+ Parameter { type: "string" }

51+ }

52+ Signal {

41− Signal { name: "iconChanged" }

53+ name: "iconChanged"

54+ Parameter { type: "QUrl" }

55+ }

56+ Signal {

57+ name: "stageChanged"

58+ Parameter { type: "Stage" }

59+ }

60+ Signal {

42− Signal { name: "stateChanged" }

61+ name: "stateChanged"

62+ Parameter { type: "State" }

63+ }

64+ Signal {

43− Signal { name: "focusedChanged" }

65+ name: "focusedChanged"

66+ Parameter { type: "bool" }

67+ }

68+ Signal {

69+ name: "fullscreenChanged"

70+ Parameter { type: "bool" }

71+ }

72+ Signal {

73+ name: "imageQmlChanged"

74+ Parameter { type: "string" }

75+ }

76+ Signal {

77+ name: "windowQmlChanged"

78+ Parameter { type: "string" }

79+ }

80+ Signal {

44− Signal { name: "screenshotChanged" }

81+ name: "screenshotChanged"

82+ Parameter { type: "QUrl" }

83+ }

84+ Signal {

85+ name: "surfaceChanged"

86+ Parameter { type: "MirSurfaceItem"; isPointer: true }

87+ }

45 }

88 }

46 Component {

89 Component {

47 name: "ApplicationManager"

90 name: "ApplicationManager"

@@ -102,11 +145,11 @@ Module {

102 "ForceMainStage": 1

145 "ForceMainStage": 1

103 }

146 }

104 }

147 }

148+ Property { name: "empty"; type: "bool"; isReadonly: true }

105 Property { name: "sideStageWidth"; type: "int"; isReadonly: true }

149 Property { name: "sideStageWidth"; type: "int"; isReadonly: true }

106 Property { name: "stageHint"; type: "StageHint"; isReadonly: true }

150 Property { name: "stageHint"; type: "StageHint"; isReadonly: true }

107 Property { name: "formFactorHint"; type: "FormFactorHint"; isReadonly: true }

151 Property { name: "formFactorHint"; type: "FormFactorHint"; isReadonly: true }

108 Property { name: "fake"; type: "bool"; isReadonly: true }

152 Property { name: "fake"; type: "bool"; isReadonly: true }

109− Property { name: "rightMargin"; type: "int" }

110 Signal {

153 Signal {

111 name: "focusRequested"

154 name: "focusRequested"

112 Parameter { name: "favoriteApplication"; type: "FavoriteApplication" }

155 Parameter { name: "favoriteApplication"; type: "FavoriteApplication" }

@@ -115,6 +158,10 @@ Module {

115 name: "focusRequested"

158 name: "focusRequested"

116 Parameter { name: "appId"; type: "string" }

159 Parameter { name: "appId"; type: "string" }

117 }

160 }

161+ Signal {

162+ name: "emptyChanged"

163+ Parameter { name: "empty"; type: "bool" }

164+ }

118 Method {

165 Method {

119 name: "get"

166 name: "get"

120 type: "ApplicationInfo*"

167 type: "ApplicationInfo*"

@@ -177,6 +224,84 @@ Module {

177 }

224 }

178 Method { name: "availableApplications"; type: "QStringList" }

225 Method { name: "availableApplications"; type: "QStringList" }

179 }

226 }

227+ Component {

228+ name: "MirSurfaceItem"

229+ defaultProperty: "data"

230+ prototype: "QQuickPaintedItem"

231+ exports: ["Unity.Application/MirSurfaceItem 0.1"]

232+ isCreatable: false

233+ exportMetaObjectRevisions: [0]

234+ Enum {

235+ name: "Type"

236+ values: {

237+ "Normal": 0,

238+ "Utility": 1,

239+ "Dialog": 2,

240+ "Overlay": 3,

241+ "Freestyle": 4,

242+ "Popover": 5,

243+ "InputMethod": 6

244+ }

245+ }

246+ Enum {

247+ name: "State"

248+ values: {

249+ "Unknown": 0,

250+ "Restored": 1,

251+ "Minimized": 2,

252+ "Maximized": 3,

253+ "VertMaximized": 4,

254+ "Fullscreen": 5

255+ }

256+ }

257+ Property { name: "type"; type: "Type"; isReadonly: true }

258+ Property { name: "state"; type: "State"; isReadonly: true }

259+ Property { name: "name"; type: "string"; isReadonly: true }

260+ Property { name: "parentSurface"; type: "MirSurfaceItem"; isReadonly: true; isPointer: true }

261+ Property { name: "childSurfaces"; type: "MirSurfaceItem"; isList: true; isReadonly: true }

262+ Signal {

263+ name: "typeChanged"

264+ Parameter { type: "Type" }

265+ }

266+ Signal {

267+ name: "stateChanged"

268+ Parameter { type: "State" }

269+ }

270+ Signal {

271+ name: "nameChanged"

272+ Parameter { type: "string" }

273+ }

274+ Signal {

275+ name: "parentSurfaceChanged"

276+ Parameter { type: "MirSurfaceItem"; isPointer: true }

277+ }

278+ Signal { name: "removed" }

279+ Signal { name: "inputMethodRequested" }

280+ Signal { name: "inputMethodDismissed" }

281+ Method {

282+ name: "setState"

283+ Parameter { name: "newState"; type: "State" }

284+ }

285+ Method { name: "release" }

286+ }

287+ Component {

288+ name: "SurfaceManager"

289+ prototype: "QObject"

290+ exports: ["Unity.Application/SurfaceManager 0.1"]

291+ isCreatable: false

292+ isSingleton: true

293+ exportMetaObjectRevisions: [0]

294+ Signal { name: "countChanged" }

295+ Signal {

296+ name: "surfaceCreated"

297+ Parameter { name: "surface"; type: "MirSurfaceItem"; isPointer: true }

298+ }

299+ Signal {

300+ name: "surfaceDestroyed"

301+ Parameter { name: "surface"; type: "MirSurfaceItem"; isPointer: true }

302+ }

303+ Method { name: "inputMethodSurface"; type: "MirSurfaceItem*" }

304+ }

180 Component {

305 Component {

181 name: "unity::shell::application::ApplicationInfoInterface"

306 name: "unity::shell::application::ApplicationInfoInterface"

182 prototype: "QObject"

307 prototype: "QObject"

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/DashCommunicator/DashCommunicator.qmltypesnew file+46

@@ -0,0 +1,46 @@

1+import QtQuick.tooling 1.1

2+

3+// This file describes the plugin-supplied types contained in the library.

4+// It is used for QML tooling purposes only.

5+//

6+// This file was auto-generated by:

7+// 'qmlplugindump -notrelocatable Unity.DashCommunicator 0.1 tests/mocks'

8+

9+Module {

10+ Component {

11+ name: "DashCommunicator"

12+ prototype: "QObject"

13+ exports: ["Unity.DashCommunicator/DashCommunicator 0.1"]

14+ exportMetaObjectRevisions: [0]

15+ Signal {

16+ name: "setCurrentScopeCalled"

17+ Parameter { name: "scopeId"; type: "string" }

18+ Parameter { name: "animate"; type: "bool" }

19+ Parameter { name: "reset"; type: "bool" }

20+ }

21+ Method {

22+ name: "setCurrentScope"

23+ Parameter { name: "scopeId"; type: "string" }

24+ Parameter { name: "animate"; type: "bool" }

25+ Parameter { name: "reset"; type: "bool" }

26+ }

27+ }

28+ Component {

29+ name: "DashCommunicatorService"

30+ prototype: "QObject"

31+ exports: ["Unity.DashCommunicator/DashCommunicatorService 0.1"]

32+ exportMetaObjectRevisions: [0]

33+ Signal {

34+ name: "setCurrentScopeRequested"

35+ Parameter { name: "scopeId"; type: "string" }

36+ Parameter { name: "animate"; type: "bool" }

37+ Parameter { name: "reset"; type: "bool" }

38+ }

39+ Method {

40+ name: "mockSetCurrentScope"

41+ Parameter { name: "scopeId"; type: "string" }

42+ Parameter { name: "animate"; type: "bool" }

43+ Parameter { name: "reset"; type: "bool" }

44+ }

45+ }

46+}

tests/mocks/Unity/fake_categories.cpp+3

@@ -149,6 +149,9 @@ Categories::data(const QModelIndex& index, int role) const

149 map["card-size"] = "medium";

150 map["overlay"] = true;

151 }

152+ if (index.row() == 18) {

153+ map["category-layout"] = "horizontal-list";

154+ }

152 if (index.row() == 19) {

155 if (index.row() == 19) {

153 map["category-layout"] = "grid";

156 map["category-layout"] = "grid";

154 map["collapsed-rows"] = 0;

157 map["collapsed-rows"] = 0;

tests/qmltests/Dash/tst_CardTool.qml+13−5

@@ -237,7 +237,7 @@ Rectangle {

237

238 UT.UnityTestCase {

239 id: testCase

240− name: "Card"

240+ name: "CardTool"

241

242 property var internalCard: findChild(cardTool, "cardToolCard")

243

@@ -272,10 +272,18 @@ Rectangle {

272 { tag: "MediumCarousel", width: units.gu(22), height: units.gu(22), viewWidth: 84, index: 0, layout_index: 4},

273 { tag: "LargeCarousel", width: units.gu(26), height: units.gu(26), viewWidth: 140, index: 0, layout_index: 4},

274 { tag: "PortraitCarousel", width: units.gu(22), height: units.gu(44), viewWidth: 84, index: 10, layout_index: 4},

275− { tag: "SmallHorizontalList", width: units.gu(18), height: units.gu(39.5), viewWidth: 30, index: 0, layout_index: 5},

275+ { tag: "SmallHorizontalList", width: units.gu(18),

276+ height: function() { return internalCard ? internalCard.height : 0 },

277+ viewWidth: 30, index: 0, layout_index: 5 },

276− { tag: "MediumHorizontalList", width: units.gu(22), height: units.gu(43.5), viewWidth: 84, index: 0, layout_index: 5},

278+ { tag: "MediumHorizontalList", width: units.gu(22),

279+ height: function() { return internalCard ? internalCard.height : 0 },

280+ viewWidth: 84, index: 0, layout_index: 5 },

277− { tag: "LargeHorizontalList", width: units.gu(26), height: units.gu(47.5), viewWidth: 140, index: 0, layout_index: 5},

281+ { tag: "LargeHorizontalList", width: units.gu(26),

282+ height: function() { return internalCard ? internalCard.height : 0 },

283+ viewWidth: 140, index: 0, layout_index: 5 },

278− { tag: "PortraitHorizontalList", width: units.gu(22), height: units.gu(65.5), viewWidth: 84, index: 10, layout_index: 5},

284+ { tag: "PortraitHorizontalList", width: units.gu(22),

285+ height: function() { return internalCard ? internalCard.height : 0 },

286+ viewWidth: 84, index: 10, layout_index: 5 },

279 ]

287 ]

280 }

288 }

281

289

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/Dash/tst_GenericScopeView.qml+48−17

@@ -76,6 +76,20 @@ Item {

76 spy.signalName = "";

77 }

78

79+ function scrollToCategory(category) {

80+ var categoryListView = findChild(genericScopeView, "categoryListView");

81+ tryCompareFunction(function() {

82+ if (findChild(genericScopeView, category)) return true;

83+ mouseFlick(genericScopeView, genericScopeView.width/2, genericScopeView.height,

84+ genericScopeView.width/2, genericScopeView.y)

85+ tryCompare(categoryListView, "moving", false);

86+ return findChild(genericScopeView, category) !== null;

87+ }, true);

88+

89+ tryCompareFunction(function() { return findChild(genericScopeView, "delegate0") !== null; }, true);

90+ return findChild(genericScopeView, category);

91+ }

92+

79 function test_isActive() {

93 function test_isActive() {

80 tryCompare(genericScopeView.scope, "isActive", false)

94 tryCompare(genericScopeView.scope, "isActive", false)

81 genericScopeView.isCurrent = true

95 genericScopeView.isCurrent = true

@@ -222,12 +236,7 @@ Item {

222 }

236 }

223

237

224 function test_forced_category_expansion() {

238 function test_forced_category_expansion() {

225− tryCompareFunction(function() {

226− mouseFlick(genericScopeView, genericScopeView.width/2, genericScopeView.height,

227− genericScopeView.width/2, genericScopeView.y)

228− return findChild(genericScopeView, "dashCategory19") !== null;

229− }, true);

230− var category = findChild(genericScopeView, "dashCategory19")

239+ var category = scrollToCategory("dashCategory19");

231 compare(category.expandable, false, "Category with collapsed-rows: 0 should not be expandable");

240 compare(category.expandable, false, "Category with collapsed-rows: 0 should not be expandable");

232

241

233 var grid = findChild(category, "19");

242 var grid = findChild(category, "19");

@@ -285,20 +294,13 @@ Item {

285 }

294 }

286

295

287 function test_showPreviewCarousel() {

296 function test_showPreviewCarousel() {

288− tryCompareFunction(function() {

297+ var category = scrollToCategory("dashCategory1");

289− var dashCategory1 = findChild(genericScopeView, "dashCategory1");

290− if (dashCategory1 != null) {

291− var tile = findChild(dashCategory1, "carouselDelegate1");

292− return tile != null;

293− }

294− return false;

295− },

296− true);

297

298

298 tryCompare(testCase.previewListView, "open", false);

299 tryCompare(testCase.previewListView, "open", false);

299

300

300− var dashCategory1 = findChild(genericScopeView, "dashCategory1");

301− var tile = findChild(dashCategory1, "carouselDelegate1");

301+ var tile = findChild(category, "carouselDelegate1");

302+ verify(tile, "Could not find delegate");

303+

302 mouseClick(tile, tile.width / 2, tile.height / 2);

304 mouseClick(tile, tile.width / 2, tile.height / 2);

303 tryCompare(tile, "explicitlyScaled", true);

305 tryCompare(tile, "explicitlyScaled", true);

304 mouseClick(tile, tile.width / 2, tile.height / 2);

306 mouseClick(tile, tile.width / 2, tile.height / 2);

@@ -306,6 +308,35 @@ Item {

306 tryCompare(testCase.previewListView, "x", 0);

308 tryCompare(testCase.previewListView, "x", 0);

307

309

308 closePreview();

310 closePreview();

311+

312+ mousePress(tile, tile.width / 2, tile.height / 2);

313+ tryCompare(testCase.previewListView, "open", true);

314+ tryCompare(testCase.previewListView, "x", 0);

315+ mouseRelease(tile, tile.width / 2, tile.height / 2);

316+

317+ closePreview();

318+ }

319+

320+ function test_showPreviewHorizontalList() {

321+ var category = scrollToCategory("dashCategory18");

322+

323+ tryCompare(testCase.previewListView, "open", false);

324+

325+ var tile = findChild(category, "delegate1");

326+ verify(tile, "Could not find delegate");

327+

328+ mouseClick(tile, tile.width / 2, tile.height / 2);

329+ tryCompare(testCase.previewListView, "open", true);

330+ tryCompare(testCase.previewListView, "x", 0);

331+

332+ closePreview();

333+

334+ mousePress(tile, tile.width / 2, tile.height / 2);

335+ tryCompare(testCase.previewListView, "open", true);

336+ tryCompare(testCase.previewListView, "x", 0);

337+ mouseRelease(tile, tile.width / 2, tile.height / 2);

338+

339+ closePreview();

309 }

340 }

310

341

311 function test_previewCycle() {

342 function test_previewCycle() {