on xenial help sign in
merge prereq
commit6015c9c95591de9f6de448f9c54de5d08ffb15d8 authorMichael Zanetti <michael.zanetti@canonical.com> dateWed 23 Jul 2014, 07:42 (12 years ago) parent9a47628d63f867
26 files changed+596−291
debian/changelog+14 po/am.po+18−18 po/en_AU.po+24−22 po/fr.po+6−6 po/gl.po+6−6 po/is.po+23−23 po/nl.po+3−3 po/pl.po+14−14 po/pt.po+29−26 po/sv.po+34−32 po/te.po+36−36 po/ug.po+4−4 po/zh_TW.po+34−34 qml/Components/Lockscreen.qml+17−5 qml/Dash/GenericScopeView.qml+4 qml/Dash/PreviewListView.qml+1−3 qml/Greeter/Greeter.qml+1−1 qml/Shell.qml+87−30 qml/Stages/PhoneStage.qml+3−2 tests/mocks/LightDM/single-pin/GreeterPrivate.cpp+1−9 tests/mocks/QMenuModel/unitymenumodel.cpp+6−7 tests/mocks/QMenuModel/unitymenumodel.h+5−6 tests/qmltests/CMakeLists.txt+3−3 tests/qmltests/Greeter/tst_Lockscreen.qml+1−1 tests/qmltests/tst_Shell.qml+19 tests/qmltests/tst_ShellWithPin.qml+203
debian/changelog+14
@@ -12,6 +12,20 @@ unity8 (8.00) UNRELEASED; urgency=medium
1212
1313 -- Gerry Boland <gerry.boland@canonical.com> Thu, 10 Jul 2014 10:34:18 +0100
1414
15+unity8 (7.90+14.10.20140721.1-0ubuntu1) utopic; urgency=low
16+
17+ [ Michael Terry ]
18+ * Allow running the dialer-app in emergency mode when the screen is
19+ locked.
20+
21+ [ Michał Sawicz ]
22+ * Add missing nameOwner property to mock UnityMenuModel.
23+
24+ [ Albert Astals ]
25+ * Fix name, There's nothing called pageHeader in this file
26+
27+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 21 Jul 2014 14:57:08 +0000
28+
1529unity8 (7.90+14.10.20140717.3-0ubuntu1) utopic; urgency=low
1630
1731 [ Nick Dedekind ]
po/am.po+18−18
@@ -8,23 +8,23 @@ msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-07-07 12:15+0100\n"
11−"PO-Revision-Date: 2014-01-18 19:28+0000\n"
11+"PO-Revision-Date: 2014-07-20 18:16+0000\n"
1212"Last-Translator: samson <Unknown>\n"
1313"Language-Team: Amharic <am@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-09 06:36+0000\n"
18−"X-Generator: Launchpad (build 17100)\n"
17+"X-Launchpad-Export-Date: 2014-07-21 07:05+0000\n"
18+"X-Generator: Launchpad (build 17114)\n"
1919
2020#: plugins/Unity/Launcher/launcheritem.cpp:43
2121#: plugins/Unity/Launcher/launcheritem.cpp:73
2222msgid "Pin shortcut"
23−msgstr ""
23+msgstr "አቋራጭ ማጣበቂያ"
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:73
2626msgid "Unpin shortcut"
27−msgstr ""
27+msgstr "አቋራጭ መለያያ"
2828
2929#: qml/Components/EdgeDemoOverlay.qml:151
3030msgid "Skip intro"
@@ -74,15 +74,15 @@ msgstr ""
7474
7575#: qml/Components/Lockscreen.qml:214
7676msgid "Emergency Call"
77−msgstr ""
77+msgstr "የ ድንገተኛ ጥሪ"
7878
7979#: qml/Components/Lockscreen.qml:231
8080msgid "OK"
81−msgstr ""
81+msgstr "እሺ"
8282
8383#: qml/Components/PageHeader.qml:366
8484msgid "Recent searches"
85−msgstr ""
85+msgstr "በቅርብ የፈለጉዋቸው"
8686
8787#: qml/Components/PassphraseLockscreen.qml:60
8888#, qt-format
@@ -95,31 +95,31 @@ msgstr "ሰላም"
9595
9696#: qml/Components/PinLockscreen.qml:198
9797msgid "CANCEL"
98−msgstr ""
98+msgstr "መሰረዣ"
9999
100100#: qml/Components/PinLockscreen.qml:216
101101msgid "DONE"
102−msgstr ""
102+msgstr "ጨርሷል"
103103
104104#: qml/Components/SeeMore.qml:35
105105msgid "See more"
106−msgstr ""
106+msgstr "ተጨማሪ መመልከቻ"
107107
108108#: qml/Components/SeeMore.qml:58
109109msgid "See less"
110−msgstr ""
110+msgstr "አነስተኛ መመልከቻ"
111111
112112#: qml/Dash/DashApps.qml:37
113113msgid "Recent"
114−msgstr ""
114+msgstr "የቅርብ ጊዜ"
115115
116116#: qml/Dash/Previews/PreviewActionCombo.qml:34
117117msgid "More..."
118−msgstr ""
118+msgstr "ተጨማሪ..."
119119
120120#: qml/Dash/Previews/PreviewActionCombo.qml:34
121121msgid "Less..."
122−msgstr ""
122+msgstr "አነስተኛ..."
123123
124124#: qml/Dash/Previews/PreviewRatingInput.qml:82
125125msgid "Rate this"
@@ -171,7 +171,7 @@ msgstr ""
171171
172172#: qml/Panel/Indicators/MenuItemFactory.qml:587
173173msgid "Downloading"
174−msgstr ""
174+msgstr "በማውረድ ላይ"
175175
176176#: qml/Panel/Indicators/MenuItemFactory.qml:589
177177msgid "Paused, tap to resume"
@@ -179,11 +179,11 @@ msgstr ""
179179
180180#: qml/Panel/Indicators/MenuItemFactory.qml:591
181181msgid "Canceled"
182−msgstr ""
182+msgstr "ተሰርዟል"
183183
184184#: qml/Panel/Indicators/MenuItemFactory.qml:593
185185msgid "Finished"
186−msgstr ""
186+msgstr "ጨርሷል"
187187
188188#: qml/Panel/Indicators/MenuItemFactory.qml:595
189189msgid "Failed, tap to retry"
po/en_AU.po+24−22
@@ -8,23 +8,23 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-07-07 12:15+0100\n"
11−"PO-Revision-Date: 2013-09-28 07:46+0000\n"
11+"PO-Revision-Date: 2014-07-18 10:38+0000\n"
1212"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"
1313"Language-Team: English (Australia) <en_AU@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-09 06:37+0000\n"
18−"X-Generator: Launchpad (build 17100)\n"
17+"X-Launchpad-Export-Date: 2014-07-19 06:19+0000\n"
18+"X-Generator: Launchpad (build 17114)\n"
1919
2020#: plugins/Unity/Launcher/launcheritem.cpp:43
2121#: plugins/Unity/Launcher/launcheritem.cpp:73
2222msgid "Pin shortcut"
23−msgstr ""
23+msgstr "Pin shortcut"
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:73
2626msgid "Unpin shortcut"
27−msgstr ""
27+msgstr "Unpin shortcut"
2828
2929#: qml/Components/EdgeDemoOverlay.qml:151
3030msgid "Skip intro"
@@ -71,6 +71,8 @@ msgid ""
7171"You have now mastered the edge gestures and can start using the "
7272"phone<br><br>Tap on the screen to start"
7373msgstr ""
74+"You have now mastered the edge gestures and can start using the "
75+"phone<br><br>Tap on the screen to start"
7476
7577#: qml/Components/Lockscreen.qml:214
7678msgid "Emergency Call"
@@ -78,7 +80,7 @@ msgstr "Emergency Call"
7880
7981#: qml/Components/Lockscreen.qml:231
8082msgid "OK"
81−msgstr ""
83+msgstr "OK"
8284
8385#: qml/Components/PageHeader.qml:366
8486msgid "Recent searches"
@@ -95,31 +97,31 @@ msgstr "Hello"
9597
9698#: qml/Components/PinLockscreen.qml:198
9799msgid "CANCEL"
98−msgstr ""
100+msgstr "CANCEL"
99101
100102#: qml/Components/PinLockscreen.qml:216
101103msgid "DONE"
102−msgstr ""
104+msgstr "DONE"
103105
104106#: qml/Components/SeeMore.qml:35
105107msgid "See more"
106−msgstr ""
108+msgstr "See more"
107109
108110#: qml/Components/SeeMore.qml:58
109111msgid "See less"
110−msgstr ""
112+msgstr "See less"
111113
112114#: qml/Dash/DashApps.qml:37
113115msgid "Recent"
114−msgstr ""
116+msgstr "Recent"
115117
116118#: qml/Dash/Previews/PreviewActionCombo.qml:34
117119msgid "More..."
118−msgstr ""
120+msgstr "More..."
119121
120122#: qml/Dash/Previews/PreviewActionCombo.qml:34
121123msgid "Less..."
122−msgstr ""
124+msgstr "Less..."
123125
124126#: qml/Dash/Previews/PreviewRatingInput.qml:82
125127msgid "Rate this"
@@ -135,7 +137,7 @@ msgstr "Send"
135137
136138#: qml/Greeter/Greeter.qml:157
137139msgid "Swipe to unlock"
138−msgstr ""
140+msgstr "Swipe to unlock"
139141
140142#: qml/Hud/HudParametrizedActionsPage.qml:132
141143msgid "Confirm"
@@ -159,35 +161,35 @@ msgstr "Speaking..."
159161
160162#: qml/Notifications/NotificationMenuItemFactory.qml:91
161163msgid "Show password"
162−msgstr ""
164+msgstr "Show password"
163165
164166#: qml/Notifications/NotificationMenuItemFactory.qml:103
165167msgid "Please enter SIM PIN"
166−msgstr ""
168+msgstr "Please enter SIM PIN"
167169
168170#: qml/Panel/Indicators/MenuItemFactory.qml:583
169171msgid "In queue…"
170−msgstr ""
172+msgstr "In queue…"
171173
172174#: qml/Panel/Indicators/MenuItemFactory.qml:587
173175msgid "Downloading"
174−msgstr ""
176+msgstr "Downloading"
175177
176178#: qml/Panel/Indicators/MenuItemFactory.qml:589
177179msgid "Paused, tap to resume"
178−msgstr ""
180+msgstr "Paused, tap to resume"
179181
180182#: qml/Panel/Indicators/MenuItemFactory.qml:591
181183msgid "Canceled"
182−msgstr ""
184+msgstr "Cancelled"
183185
184186#: qml/Panel/Indicators/MenuItemFactory.qml:593
185187msgid "Finished"
186−msgstr ""
188+msgstr "Finished"
187189
188190#: qml/Panel/Indicators/MenuItemFactory.qml:595
189191msgid "Failed, tap to retry"
190−msgstr ""
192+msgstr "Failed, tap to retry"
191193
192194#: qml/Panel/SearchIndicator.qml:27
193195msgid "Search"
po/fr.po+6−6
@@ -8,14 +8,14 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-07-07 12:15+0100\n"
11−"PO-Revision-Date: 2014-07-10 12:11+0000\n"
12−"Last-Translator: Anne <anneonyme017@gmail.com>\n"
11+"PO-Revision-Date: 2014-07-18 18:31+0000\n"
12+"Last-Translator: Nicolas Delvaux <Unknown>\n"
1313"Language-Team: French <fr@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-11 06:15+0000\n"
18−"X-Generator: Launchpad (build 17111)\n"
17+"X-Launchpad-Export-Date: 2014-07-19 06:19+0000\n"
18+"X-Generator: Launchpad (build 17114)\n"
1919
2020#: plugins/Unity/Launcher/launcheritem.cpp:43
2121#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -108,7 +108,7 @@ msgstr "ANNULER"
108108
109109#: qml/Components/PinLockscreen.qml:216
110110msgid "DONE"
111−msgstr "TERMINÉ"
111+msgstr "VALIDER"
112112
113113#: qml/Components/SeeMore.qml:35
114114msgid "See more"
@@ -172,7 +172,7 @@ msgstr "Afficher le mot de passe"
172172
173173#: qml/Notifications/NotificationMenuItemFactory.qml:103
174174msgid "Please enter SIM PIN"
175−msgstr "Veuillez entrer le code PIN de votre carte SIM"
175+msgstr "Entrez le code PIN"
176176
177177#: qml/Panel/Indicators/MenuItemFactory.qml:583
178178msgid "In queue…"
po/gl.po+6−6
@@ -8,23 +8,23 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-07-07 12:15+0100\n"
11−"PO-Revision-Date: 2014-07-17 19:55+0000\n"
11+"PO-Revision-Date: 2014-07-21 16:08+0000\n"
1212"Last-Translator: Marcos Lans <Unknown>\n"
1313"Language-Team: Galician <gl@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-18 05:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-07-22 07:17+0000\n"
1818"X-Generator: Launchpad (build 17114)\n"
1919
2020#: plugins/Unity/Launcher/launcheritem.cpp:43
2121#: plugins/Unity/Launcher/launcheritem.cpp:73
2222msgid "Pin shortcut"
23−msgstr "Pegar o atallo"
23+msgstr "Fixar o atallo"
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:73
2626msgid "Unpin shortcut"
27−msgstr "Despegar o atallo"
27+msgstr "Eliminar o atallo"
2828
2929#: qml/Components/EdgeDemoOverlay.qml:151
3030msgid "Skip intro"
@@ -61,12 +61,12 @@ msgstr "Bordo esquerdo"
6161#: qml/Components/EdgeDemo.qml:200
6262msgid "Swipe from the left to reveal the launcher for quick access to apps"
6363msgstr ""
64−"Esvare o dedo desde a esquerda para mostrar o iniciador rápido aos "
64+"Esvare o dedo desde a esquerda para mostrar o iniciador rápido dos "
6565"aplicativos"
6666
6767#: qml/Components/EdgeDemo.qml:227
6868msgid "Well done"
69−msgstr "Ben feito"
69+msgstr "Ben feito!"
7070
7171#: qml/Components/EdgeDemo.qml:228
7272msgid ""
po/is.po+23−23
@@ -8,14 +8,14 @@ msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-07-07 12:15+0100\n"
11−"PO-Revision-Date: 2013-09-18 16:22+0000\n"
12−"Last-Translator: Andri Thorlacius <Unknown>\n"
11+"PO-Revision-Date: 2014-07-18 11:20+0000\n"
12+"Last-Translator: Sveinn í Felli <sv1@fellsnet.is>\n"
1313"Language-Team: Icelandic <is@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-09 06:37+0000\n"
18−"X-Generator: Launchpad (build 17100)\n"
17+"X-Launchpad-Export-Date: 2014-07-19 06:19+0000\n"
18+"X-Generator: Launchpad (build 17114)\n"
1919
2020#: plugins/Unity/Launcher/launcheritem.cpp:43
2121#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -45,7 +45,7 @@ msgstr "Efri brún"
4545
4646#: qml/Components/EdgeDemo.qml:146
4747msgid "Try swiping from the top edge to access the indicators"
48−msgstr ""
48+msgstr "Reyndu að renna frá toppi til að fá aðgang að tilkynningum"
4949
5050#: qml/Components/EdgeDemo.qml:171
5151msgid "Close"
@@ -53,7 +53,7 @@ msgstr "Loka"
5353
5454#: qml/Components/EdgeDemo.qml:172
5555msgid "Swipe up again to close the settings screen"
56−msgstr ""
56+msgstr "Renndu upp til að loka stillingum"
5757
5858#: qml/Components/EdgeDemo.qml:199
5959msgid "Left edge"
@@ -61,7 +61,7 @@ msgstr "Vinstri brún"
6161
6262#: qml/Components/EdgeDemo.qml:200
6363msgid "Swipe from the left to reveal the launcher for quick access to apps"
64−msgstr ""
64+msgstr "Renndu frá vinstri til að afhjúpa flýtiræsi forrita"
6565
6666#: qml/Components/EdgeDemo.qml:227
6767msgid "Well done"
@@ -79,7 +79,7 @@ msgstr "Neyðarsímtal"
7979
8080#: qml/Components/Lockscreen.qml:231
8181msgid "OK"
82−msgstr ""
82+msgstr "Í lagi"
8383
8484#: qml/Components/PageHeader.qml:366
8585msgid "Recent searches"
@@ -96,31 +96,31 @@ msgstr "Hæ"
9696
9797#: qml/Components/PinLockscreen.qml:198
9898msgid "CANCEL"
99−msgstr ""
99+msgstr "HÆTTA VIÐ"
100100
101101#: qml/Components/PinLockscreen.qml:216
102102msgid "DONE"
103−msgstr ""
103+msgstr "BÚIÐ"
104104
105105#: qml/Components/SeeMore.qml:35
106106msgid "See more"
107−msgstr ""
107+msgstr "Sjá meira"
108108
109109#: qml/Components/SeeMore.qml:58
110110msgid "See less"
111−msgstr ""
111+msgstr "Sjá minna"
112112
113113#: qml/Dash/DashApps.qml:37
114114msgid "Recent"
115−msgstr ""
115+msgstr "Nýlegt"
116116
117117#: qml/Dash/Previews/PreviewActionCombo.qml:34
118118msgid "More..."
119−msgstr ""
119+msgstr "Meira..."
120120
121121#: qml/Dash/Previews/PreviewActionCombo.qml:34
122122msgid "Less..."
123−msgstr ""
123+msgstr "Minna..."
124124
125125#: qml/Dash/Previews/PreviewRatingInput.qml:82
126126msgid "Rate this"
@@ -136,7 +136,7 @@ msgstr "Senda"
136136
137137#: qml/Greeter/Greeter.qml:157
138138msgid "Swipe to unlock"
139−msgstr ""
139+msgstr "Strjóka til að aflæsa"
140140
141141#: qml/Hud/HudParametrizedActionsPage.qml:132
142142msgid "Confirm"
@@ -160,19 +160,19 @@ msgstr "Tala..."
160160
161161#: qml/Notifications/NotificationMenuItemFactory.qml:91
162162msgid "Show password"
163−msgstr ""
163+msgstr "Birta lykilorð"
164164
165165#: qml/Notifications/NotificationMenuItemFactory.qml:103
166166msgid "Please enter SIM PIN"
167−msgstr ""
167+msgstr "Settu inn PIN fyrir SIM"
168168
169169#: qml/Panel/Indicators/MenuItemFactory.qml:583
170170msgid "In queue…"
171−msgstr ""
171+msgstr "Í biðröð..."
172172
173173#: qml/Panel/Indicators/MenuItemFactory.qml:587
174174msgid "Downloading"
175−msgstr ""
175+msgstr "Sæki"
176176
177177#: qml/Panel/Indicators/MenuItemFactory.qml:589
178178msgid "Paused, tap to resume"
@@ -180,11 +180,11 @@ msgstr ""
180180
181181#: qml/Panel/Indicators/MenuItemFactory.qml:591
182182msgid "Canceled"
183−msgstr ""
183+msgstr "Hætt við"
184184
185185#: qml/Panel/Indicators/MenuItemFactory.qml:593
186186msgid "Finished"
187−msgstr ""
187+msgstr "Lokið"
188188
189189#: qml/Panel/Indicators/MenuItemFactory.qml:595
190190msgid "Failed, tap to retry"
@@ -197,4 +197,4 @@ msgstr "Leita"
197197#: qml/Shell.qml:359
198198#, qt-format
199199msgid "Please enter %1"
200−msgstr ""
200+msgstr "Settu inn %1"
po/nl.po+3−3
@@ -8,13 +8,13 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-07-07 12:15+0100\n"
11−"PO-Revision-Date: 2014-07-17 19:21+0000\n"
12−"Last-Translator: Pjotr12345 <Unknown>\n"
11+"PO-Revision-Date: 2014-07-20 17:25+0000\n"
12+"Last-Translator: Hannie Dumoleyn <Unknown>\n"
1313"Language-Team: Dutch <nl@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-18 05:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-07-21 07:05+0000\n"
1818"X-Generator: Launchpad (build 17114)\n"
1919
2020#: plugins/Unity/Launcher/launcheritem.cpp:43
po/pl.po+14−14
@@ -8,23 +8,23 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-07-07 12:15+0100\n"
11−"PO-Revision-Date: 2014-05-27 15:20+0000\n"
11+"PO-Revision-Date: 2014-07-19 14:10+0000\n"
1212"Last-Translator: GTriderXC <gtriderxc@yahoo.com>\n"
1313"Language-Team: Polish <pl@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-09 06:37+0000\n"
18−"X-Generator: Launchpad (build 17100)\n"
17+"X-Launchpad-Export-Date: 2014-07-20 06:18+0000\n"
18+"X-Generator: Launchpad (build 17114)\n"
1919
2020#: plugins/Unity/Launcher/launcheritem.cpp:43
2121#: plugins/Unity/Launcher/launcheritem.cpp:73
2222msgid "Pin shortcut"
23−msgstr ""
23+msgstr "Przypnij skrót"
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:73
2626msgid "Unpin shortcut"
27−msgstr ""
27+msgstr "Odepnij skrót"
2828
2929#: qml/Components/EdgeDemoOverlay.qml:151
3030msgid "Skip intro"
@@ -82,7 +82,7 @@ msgstr "Telefon ratunkowy"
8282
8383#: qml/Components/Lockscreen.qml:231
8484msgid "OK"
85−msgstr ""
85+msgstr "OK"
8686
8787#: qml/Components/PageHeader.qml:366
8888msgid "Recent searches"
@@ -99,11 +99,11 @@ msgstr "Witaj"
9999
100100#: qml/Components/PinLockscreen.qml:198
101101msgid "CANCEL"
102−msgstr ""
102+msgstr "ANULUJ"
103103
104104#: qml/Components/PinLockscreen.qml:216
105105msgid "DONE"
106−msgstr ""
106+msgstr "ZROBIONE"
107107
108108#: qml/Components/SeeMore.qml:35
109109msgid "See more"
@@ -171,27 +171,27 @@ msgstr "Wprowadź kod PIN karty SIM"
171171
172172#: qml/Panel/Indicators/MenuItemFactory.qml:583
173173msgid "In queue…"
174−msgstr ""
174+msgstr "W kolejce..."
175175
176176#: qml/Panel/Indicators/MenuItemFactory.qml:587
177177msgid "Downloading"
178−msgstr ""
178+msgstr "Pobieranie"
179179
180180#: qml/Panel/Indicators/MenuItemFactory.qml:589
181181msgid "Paused, tap to resume"
182−msgstr ""
182+msgstr "Wstrzymano, kliknij by wznowić"
183183
184184#: qml/Panel/Indicators/MenuItemFactory.qml:591
185185msgid "Canceled"
186−msgstr ""
186+msgstr "Anulowano"
187187
188188#: qml/Panel/Indicators/MenuItemFactory.qml:593
189189msgid "Finished"
190−msgstr ""
190+msgstr "Zakończono"
191191
192192#: qml/Panel/Indicators/MenuItemFactory.qml:595
193193msgid "Failed, tap to retry"
194−msgstr ""
194+msgstr "Błąd, kliknij aby powtórzyć"
195195
196196#: qml/Panel/SearchIndicator.qml:27
197197msgid "Search"
po/pt.po+29−26
@@ -8,13 +8,13 @@ msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-07-07 12:15+0100\n"
11−"PO-Revision-Date: 2014-07-18 00:00+0000\n"
12−"Last-Translator: Nuno André <Unknown>\n"
11+"PO-Revision-Date: 2014-07-18 22:56+0000\n"
12+"Last-Translator: Hugo Cardoso <hugocardoso94@gmail.com>\n"
1313"Language-Team: Portuguese <pt@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-18 05:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-07-19 06:19+0000\n"
1818"X-Generator: Launchpad (build 17114)\n"
1919
2020#: plugins/Unity/Launcher/launcheritem.cpp:43
@@ -28,39 +28,40 @@ msgstr "Remover atalho"
2828
2929#: qml/Components/EdgeDemoOverlay.qml:151
3030msgid "Skip intro"
31−msgstr ""
31+msgstr "Saltar introdução"
3232
3333#: qml/Components/EdgeDemo.qml:113
3434msgid "Right edge"
35−msgstr ""
35+msgstr "Limite direito"
3636
3737#: qml/Components/EdgeDemo.qml:114
3838msgid "Try swiping from the right edge to unlock the phone"
39−msgstr ""
39+msgstr "Tente deslizar do limite direito para desbloquear o telefone"
4040
4141#: qml/Components/EdgeDemo.qml:145
4242msgid "Top edge"
43−msgstr ""
43+msgstr "Limite superior"
4444
4545#: qml/Components/EdgeDemo.qml:146
4646msgid "Try swiping from the top edge to access the indicators"
47−msgstr ""
47+msgstr "Tente deslizar do topo para aceder aos indicadores"
4848
4949#: qml/Components/EdgeDemo.qml:171
5050msgid "Close"
51−msgstr ""
51+msgstr "Fechar"
5252
5353#: qml/Components/EdgeDemo.qml:172
5454msgid "Swipe up again to close the settings screen"
55−msgstr ""
55+msgstr "Deslize de novo para cima para fechar o ecrã de definições"
5656
5757#: qml/Components/EdgeDemo.qml:199
5858msgid "Left edge"
59−msgstr ""
59+msgstr "Limite esquerdo"
6060
6161#: qml/Components/EdgeDemo.qml:200
6262msgid "Swipe from the left to reveal the launcher for quick access to apps"
6363msgstr ""
64+"Deslize da esquerda para mostrar o lançador para acesso rápido às aplicações"
6465
6566#: qml/Components/EdgeDemo.qml:227
6667msgid "Well done"
@@ -71,6 +72,8 @@ msgid ""
7172"You have now mastered the edge gestures and can start using the "
7273"phone<br><br>Tap on the screen to start"
7374msgstr ""
75+"Já domina os gestos dos limites e pode começar a usar o "
76+"telefone<br><br>Toque no ecrã para começar"
7477
7578#: qml/Components/Lockscreen.qml:214
7679msgid "Emergency Call"
@@ -78,7 +81,7 @@ msgstr "Chamada de emergência"
7881
7982#: qml/Components/Lockscreen.qml:231
8083msgid "OK"
81−msgstr ""
84+msgstr "OK"
8285
8386#: qml/Components/PageHeader.qml:366
8487msgid "Recent searches"
@@ -95,11 +98,11 @@ msgstr "Olá"
9598
9699#: qml/Components/PinLockscreen.qml:198
97100msgid "CANCEL"
98−msgstr ""
101+msgstr "CANCELAR"
99102
100103#: qml/Components/PinLockscreen.qml:216
101104msgid "DONE"
102−msgstr ""
105+msgstr "FEITO"
103106
104107#: qml/Components/SeeMore.qml:35
105108msgid "See more"
@@ -111,7 +114,7 @@ msgstr "Ver menos"
111114
112115#: qml/Dash/DashApps.qml:37
113116msgid "Recent"
114−msgstr ""
117+msgstr "Recentes"
115118
116119#: qml/Dash/Previews/PreviewActionCombo.qml:34
117120msgid "More..."
@@ -123,11 +126,11 @@ msgstr "Menos..."
123126
124127#: qml/Dash/Previews/PreviewRatingInput.qml:82
125128msgid "Rate this"
126−msgstr ""
129+msgstr "Classifique isto"
127130
128131#: qml/Dash/Previews/PreviewRatingInput.qml:128
129132msgid "Add a review"
130−msgstr ""
133+msgstr "Adicione uma crítica"
131134
132135#: qml/Dash/Previews/PreviewRatingInput.qml:168
133136msgid "Send"
@@ -135,7 +138,7 @@ msgstr "Enviar"
135138
136139#: qml/Greeter/Greeter.qml:157
137140msgid "Swipe to unlock"
138−msgstr ""
141+msgstr "Deslize para desbloquear"
139142
140143#: qml/Hud/HudParametrizedActionsPage.qml:132
141144msgid "Confirm"
@@ -147,7 +150,7 @@ msgstr "Digite ou diga um comando"
147150
148151#: qml/Hud/Hud.qml:84
149152msgid "Loading. Please Wait..."
150−msgstr ""
153+msgstr "A carregar. Aguarde por favor..."
151154
152155#: qml/Hud/Hud.qml:89
153156msgid "Speak Now..."
@@ -159,7 +162,7 @@ msgstr "A falar..."
159162
160163#: qml/Notifications/NotificationMenuItemFactory.qml:91
161164msgid "Show password"
162−msgstr ""
165+msgstr "Mostrar palavra-passe"
163166
164167#: qml/Notifications/NotificationMenuItemFactory.qml:103
165168msgid "Please enter SIM PIN"
@@ -167,11 +170,11 @@ msgstr "Por favor insira o PIN"
167170
168171#: qml/Panel/Indicators/MenuItemFactory.qml:583
169172msgid "In queue…"
170−msgstr ""
173+msgstr "Em fila..."
171174
172175#: qml/Panel/Indicators/MenuItemFactory.qml:587
173176msgid "Downloading"
174−msgstr ""
177+msgstr "A transferir"
175178
176179#: qml/Panel/Indicators/MenuItemFactory.qml:589
177180msgid "Paused, tap to resume"
@@ -183,17 +186,17 @@ msgstr "Cancelado"
183186
184187#: qml/Panel/Indicators/MenuItemFactory.qml:593
185188msgid "Finished"
186−msgstr ""
189+msgstr "Concluído"
187190
188191#: qml/Panel/Indicators/MenuItemFactory.qml:595
189192msgid "Failed, tap to retry"
190−msgstr ""
193+msgstr "Falhou, toque para repetir"
191194
192195#: qml/Panel/SearchIndicator.qml:27
193196msgid "Search"
194−msgstr ""
197+msgstr "Procurar"
195198
196199#: qml/Shell.qml:359
197200#, qt-format
198201msgid "Please enter %1"
199−msgstr ""
202+msgstr "Por favor, introduza %1"
po/sv.po+34−32
@@ -8,27 +8,27 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-07-07 12:15+0100\n"
11−"PO-Revision-Date: 2014-06-07 19:14+0000\n"
12−"Last-Translator: mikasjoman <Unknown>\n"
11+"PO-Revision-Date: 2014-07-20 19:14+0000\n"
12+"Last-Translator: Gunnar Hjalmarsson <Unknown>\n"
1313"Language-Team: Swedish <sv@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-09 06:37+0000\n"
18−"X-Generator: Launchpad (build 17100)\n"
17+"X-Launchpad-Export-Date: 2014-07-21 07:05+0000\n"
18+"X-Generator: Launchpad (build 17114)\n"
1919
2020#: plugins/Unity/Launcher/launcheritem.cpp:43
2121#: plugins/Unity/Launcher/launcheritem.cpp:73
2222msgid "Pin shortcut"
23−msgstr ""
23+msgstr "Fäst genväg"
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:73
2626msgid "Unpin shortcut"
27−msgstr ""
27+msgstr "Släpp genväg"
2828
2929#: qml/Components/EdgeDemoOverlay.qml:151
3030msgid "Skip intro"
31−msgstr ""
31+msgstr "Skippa intro"
3232
3333#: qml/Components/EdgeDemo.qml:113
3434msgid "Right edge"
@@ -44,7 +44,7 @@ msgstr "Överkant"
4444
4545#: qml/Components/EdgeDemo.qml:146
4646msgid "Try swiping from the top edge to access the indicators"
47−msgstr ""
47+msgstr "Svep från överkanten för att komma åt indikatorerna"
4848
4949#: qml/Components/EdgeDemo.qml:171
5050msgid "Close"
@@ -52,7 +52,7 @@ msgstr "Stäng"
5252
5353#: qml/Components/EdgeDemo.qml:172
5454msgid "Swipe up again to close the settings screen"
55−msgstr ""
55+msgstr "Svep upp igen för att stänga inställningsfönstret"
5656
5757#: qml/Components/EdgeDemo.qml:199
5858msgid "Left edge"
@@ -60,17 +60,19 @@ msgstr "Vänsterkant"
6060
6161#: qml/Components/EdgeDemo.qml:200
6262msgid "Swipe from the left to reveal the launcher for quick access to apps"
63−msgstr ""
63+msgstr "Svep från vänster för att visa programstartaren"
6464
6565#: qml/Components/EdgeDemo.qml:227
6666msgid "Well done"
67−msgstr ""
67+msgstr "Bra gjort"
6868
6969#: qml/Components/EdgeDemo.qml:228
7070msgid ""
7171"You have now mastered the edge gestures and can start using the "
7272"phone<br><br>Tap on the screen to start"
7373msgstr ""
74+"Du har nu bemästrat kantgesterna och kan börja använda telefonen<br><br>Peka "
75+"på skärmen för att starta"
7476
7577#: qml/Components/Lockscreen.qml:214
7678msgid "Emergency Call"
@@ -78,52 +80,52 @@ msgstr "Nödsamtal"
7880
7981#: qml/Components/Lockscreen.qml:231
8082msgid "OK"
81−msgstr ""
83+msgstr "Ok"
8284
8385#: qml/Components/PageHeader.qml:366
8486msgid "Recent searches"
85−msgstr ""
87+msgstr "Senaste sökningar"
8688
8789#: qml/Components/PassphraseLockscreen.qml:60
8890#, qt-format
8991msgid "Hello %1"
90−msgstr ""
92+msgstr "Hej %1"
9193
9294#: qml/Components/PassphraseLockscreen.qml:60
9395msgid "Hello"
94−msgstr ""
96+msgstr "Hej"
9597
9698#: qml/Components/PinLockscreen.qml:198
9799msgid "CANCEL"
98−msgstr ""
100+msgstr "AVBRYT"
99101
100102#: qml/Components/PinLockscreen.qml:216
101103msgid "DONE"
102−msgstr ""
104+msgstr "KLAR"
103105
104106#: qml/Components/SeeMore.qml:35
105107msgid "See more"
106−msgstr ""
108+msgstr "Se mer"
107109
108110#: qml/Components/SeeMore.qml:58
109111msgid "See less"
110−msgstr ""
112+msgstr "Se mindre"
111113
112114#: qml/Dash/DashApps.qml:37
113115msgid "Recent"
114−msgstr ""
116+msgstr "Senaste"
115117
116118#: qml/Dash/Previews/PreviewActionCombo.qml:34
117119msgid "More..."
118−msgstr ""
120+msgstr "Mer..."
119121
120122#: qml/Dash/Previews/PreviewActionCombo.qml:34
121123msgid "Less..."
122−msgstr ""
124+msgstr "Mindre..."
123125
124126#: qml/Dash/Previews/PreviewRatingInput.qml:82
125127msgid "Rate this"
126−msgstr ""
128+msgstr "Betygsätt detta"
127129
128130#: qml/Dash/Previews/PreviewRatingInput.qml:128
129131msgid "Add a review"
@@ -131,11 +133,11 @@ msgstr "Lägg till en recension"
131133
132134#: qml/Dash/Previews/PreviewRatingInput.qml:168
133135msgid "Send"
134−msgstr ""
136+msgstr "Skicka"
135137
136138#: qml/Greeter/Greeter.qml:157
137139msgid "Swipe to unlock"
138−msgstr ""
140+msgstr "Svep för att låsa upp"
139141
140142#: qml/Hud/HudParametrizedActionsPage.qml:132
141143msgid "Confirm"
@@ -163,31 +165,31 @@ msgstr "Visa lösenord"
163165
164166#: qml/Notifications/NotificationMenuItemFactory.qml:103
165167msgid "Please enter SIM PIN"
166−msgstr ""
168+msgstr "Ange SIM PIN-kod"
167169
168170#: qml/Panel/Indicators/MenuItemFactory.qml:583
169171msgid "In queue…"
170−msgstr ""
172+msgstr "I kö..."
171173
172174#: qml/Panel/Indicators/MenuItemFactory.qml:587
173175msgid "Downloading"
174−msgstr ""
176+msgstr "Hämtar"
175177
176178#: qml/Panel/Indicators/MenuItemFactory.qml:589
177179msgid "Paused, tap to resume"
178−msgstr ""
180+msgstr "Pausad, peka för att fortsätta"
179181
180182#: qml/Panel/Indicators/MenuItemFactory.qml:591
181183msgid "Canceled"
182−msgstr ""
184+msgstr "Avbröt"
183185
184186#: qml/Panel/Indicators/MenuItemFactory.qml:593
185187msgid "Finished"
186−msgstr ""
188+msgstr "Klart"
187189
188190#: qml/Panel/Indicators/MenuItemFactory.qml:595
189191msgid "Failed, tap to retry"
190−msgstr ""
192+msgstr "Misslyckades, peka för att försöka igen"
191193
192194#: qml/Panel/SearchIndicator.qml:27
193195msgid "Search"
po/te.po+36−36
@@ -8,14 +8,14 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-07-07 12:15+0100\n"
11−"PO-Revision-Date: 2013-06-27 09:57+0000\n"
12−"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"
11+"PO-Revision-Date: 2014-07-19 10:04+0000\n"
12+"Last-Translator: Praveen Illa <mail2ipn@gmail.com>\n"
1313"Language-Team: Telugu <te@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-09 06:37+0000\n"
18−"X-Generator: Launchpad (build 17100)\n"
17+"X-Launchpad-Export-Date: 2014-07-20 06:18+0000\n"
18+"X-Generator: Launchpad (build 17114)\n"
1919
2020#: plugins/Unity/Launcher/launcheritem.cpp:43
2121#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -28,19 +28,19 @@ msgstr ""
2828
2929#: qml/Components/EdgeDemoOverlay.qml:151
3030msgid "Skip intro"
31−msgstr ""
31+msgstr "పరిచయాన్ని దాటవేయి"
3232
3333#: qml/Components/EdgeDemo.qml:113
3434msgid "Right edge"
35−msgstr ""
35+msgstr "కుడి అంచు"
3636
3737#: qml/Components/EdgeDemo.qml:114
3838msgid "Try swiping from the right edge to unlock the phone"
39−msgstr ""
39+msgstr "ఫోను తాళంతీయుటకు కుడి అంచు నుండి స్వైప్ చేయ ప్రయత్నించండి"
4040
4141#: qml/Components/EdgeDemo.qml:145
4242msgid "Top edge"
43−msgstr ""
43+msgstr "పై అంచు"
4444
4545#: qml/Components/EdgeDemo.qml:146
4646msgid "Try swiping from the top edge to access the indicators"
@@ -48,15 +48,15 @@ msgstr ""
4848
4949#: qml/Components/EdgeDemo.qml:171
5050msgid "Close"
51−msgstr ""
51+msgstr "మూసివేయి"
5252
5353#: qml/Components/EdgeDemo.qml:172
5454msgid "Swipe up again to close the settings screen"
55−msgstr ""
55+msgstr "అమరికల తెరను మూసివేయుటకు మరలా పైకి స్వైప్ చేయండి"
5656
5757#: qml/Components/EdgeDemo.qml:199
5858msgid "Left edge"
59−msgstr ""
59+msgstr "ఎడమ అంచు"
6060
6161#: qml/Components/EdgeDemo.qml:200
6262msgid "Swipe from the left to reveal the launcher for quick access to apps"
@@ -64,7 +64,7 @@ msgstr ""
6464
6565#: qml/Components/EdgeDemo.qml:227
6666msgid "Well done"
67−msgstr ""
67+msgstr "బాగా చేశారు"
6868
6969#: qml/Components/EdgeDemo.qml:228
7070msgid ""
@@ -74,36 +74,36 @@ msgstr ""
7474
7575#: qml/Components/Lockscreen.qml:214
7676msgid "Emergency Call"
77−msgstr ""
77+msgstr "అత్యవసర పిలుపు"
7878
7979#: qml/Components/Lockscreen.qml:231
8080msgid "OK"
81−msgstr ""
81+msgstr "సరే"
8282
8383#: qml/Components/PageHeader.qml:366
8484msgid "Recent searches"
85−msgstr ""
85+msgstr "ఇటీవలి వెతుకులాటలు"
8686
8787#: qml/Components/PassphraseLockscreen.qml:60
8888#, qt-format
8989msgid "Hello %1"
90−msgstr ""
90+msgstr "హలో %1"
9191
9292#: qml/Components/PassphraseLockscreen.qml:60
9393msgid "Hello"
94−msgstr ""
94+msgstr "హలో"
9595
9696#: qml/Components/PinLockscreen.qml:198
9797msgid "CANCEL"
98−msgstr ""
98+msgstr "రద్దుచేయి"
9999
100100#: qml/Components/PinLockscreen.qml:216
101101msgid "DONE"
102−msgstr ""
102+msgstr "పూర్తయ్యింది"
103103
104104#: qml/Components/SeeMore.qml:35
105105msgid "See more"
106−msgstr ""
106+msgstr "మరింత చూడండి"
107107
108108#: qml/Components/SeeMore.qml:58
109109msgid "See less"
@@ -111,11 +111,11 @@ msgstr ""
111111
112112#: qml/Dash/DashApps.qml:37
113113msgid "Recent"
114−msgstr ""
114+msgstr "ఇటీవలివి"
115115
116116#: qml/Dash/Previews/PreviewActionCombo.qml:34
117117msgid "More..."
118−msgstr ""
118+msgstr "మరిన్ని..."
119119
120120#: qml/Dash/Previews/PreviewActionCombo.qml:34
121121msgid "Less..."
@@ -127,19 +127,19 @@ msgstr ""
127127
128128#: qml/Dash/Previews/PreviewRatingInput.qml:128
129129msgid "Add a review"
130−msgstr ""
130+msgstr "ఒక సమీక్షను వ్రాయండి"
131131
132132#: qml/Dash/Previews/PreviewRatingInput.qml:168
133133msgid "Send"
134−msgstr ""
134+msgstr "పంపు"
135135
136136#: qml/Greeter/Greeter.qml:157
137137msgid "Swipe to unlock"
138−msgstr ""
138+msgstr "తాళంతీయుటకు గీకండి"
139139
140140#: qml/Hud/HudParametrizedActionsPage.qml:132
141141msgid "Confirm"
142−msgstr ""
142+msgstr "నిర్ధారించండి"
143143
144144#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
145145msgid "Type or say a command"
@@ -147,23 +147,23 @@ msgstr ""
147147
148148#: qml/Hud/Hud.qml:84
149149msgid "Loading. Please Wait..."
150−msgstr ""
150+msgstr "లోడవుతోంది. దయచేసి వేచివుండండి..."
151151
152152#: qml/Hud/Hud.qml:89
153153msgid "Speak Now..."
154−msgstr ""
154+msgstr "ఇప్పుడు మాట్లాడండి..."
155155
156156#: qml/Hud/Hud.qml:94
157157msgid "Speaking..."
158−msgstr ""
158+msgstr "మాట్లాడుతున్నారు..."
159159
160160#: qml/Notifications/NotificationMenuItemFactory.qml:91
161161msgid "Show password"
162−msgstr ""
162+msgstr "సంకేతపదాన్ని చూపించు"
163163
164164#: qml/Notifications/NotificationMenuItemFactory.qml:103
165165msgid "Please enter SIM PIN"
166−msgstr ""
166+msgstr "దయచేసి సిమ్ పిన్ ఇవ్వండి"
167167
168168#: qml/Panel/Indicators/MenuItemFactory.qml:583
169169msgid "In queue…"
@@ -171,7 +171,7 @@ msgstr ""
171171
172172#: qml/Panel/Indicators/MenuItemFactory.qml:587
173173msgid "Downloading"
174−msgstr ""
174+msgstr "దింపుకుంటున్నది"
175175
176176#: qml/Panel/Indicators/MenuItemFactory.qml:589
177177msgid "Paused, tap to resume"
@@ -179,11 +179,11 @@ msgstr ""
179179
180180#: qml/Panel/Indicators/MenuItemFactory.qml:591
181181msgid "Canceled"
182−msgstr ""
182+msgstr "రద్దుచేయబడింది"
183183
184184#: qml/Panel/Indicators/MenuItemFactory.qml:593
185185msgid "Finished"
186−msgstr ""
186+msgstr "పూర్తయింది"
187187
188188#: qml/Panel/Indicators/MenuItemFactory.qml:595
189189msgid "Failed, tap to retry"
@@ -191,9 +191,9 @@ msgstr ""
191191
192192#: qml/Panel/SearchIndicator.qml:27
193193msgid "Search"
194−msgstr ""
194+msgstr "వెతుకు"
195195
196196#: qml/Shell.qml:359
197197#, qt-format
198198msgid "Please enter %1"
199−msgstr ""
199+msgstr "దయచేసి %1 ప్రవేశపెట్టండి"
po/ug.po+4−4
@@ -8,14 +8,14 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-07-07 12:15+0100\n"
11−"PO-Revision-Date: 2014-07-10 23:16+0000\n"
11+"PO-Revision-Date: 2014-07-21 02:30+0000\n"
1212"Last-Translator: Gheyret T.Kenji <Unknown>\n"
1313"Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-11 06:15+0000\n"
18−"X-Generator: Launchpad (build 17111)\n"
17+"X-Launchpad-Export-Date: 2014-07-22 07:17+0000\n"
18+"X-Generator: Launchpad (build 17114)\n"
1919
2020#: plugins/Unity/Launcher/launcheritem.cpp:43
2121#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -169,7 +169,7 @@ msgstr "سىم(SIM) كارتىڭىزنىڭ PIN نومۇرىنى كىرگۈزۈڭ
169169
170170#: qml/Panel/Indicators/MenuItemFactory.qml:583
171171msgid "In queue…"
172−msgstr ""
172+msgstr "قاتاردا…"
173173
174174#: qml/Panel/Indicators/MenuItemFactory.qml:587
175175msgid "Downloading"
po/zh_TW.po+34−34
@@ -8,23 +8,23 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-07-07 12:15+0100\n"
11−"PO-Revision-Date: 2014-01-16 06:04+0000\n"
11+"PO-Revision-Date: 2014-07-18 10:14+0000\n"
1212"Last-Translator: Henry Yang <henry9846@hotmail.com>\n"
1313"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-09 06:37+0000\n"
18−"X-Generator: Launchpad (build 17100)\n"
17+"X-Launchpad-Export-Date: 2014-07-19 06:19+0000\n"
18+"X-Generator: Launchpad (build 17114)\n"
1919
2020#: plugins/Unity/Launcher/launcheritem.cpp:43
2121#: plugins/Unity/Launcher/launcheritem.cpp:73
2222msgid "Pin shortcut"
23−msgstr ""
23+msgstr "釘住捷徑"
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:73
2626msgid "Unpin shortcut"
27−msgstr ""
27+msgstr "取消捷徑釘選"
2828
2929#: qml/Components/EdgeDemoOverlay.qml:151
3030msgid "Skip intro"
@@ -32,19 +32,19 @@ msgstr "略過導覽"
3232
3333#: qml/Components/EdgeDemo.qml:113
3434msgid "Right edge"
35−msgstr "右方邊界"
35+msgstr "右側邊緣"
3636
3737#: qml/Components/EdgeDemo.qml:114
3838msgid "Try swiping from the right edge to unlock the phone"
39−msgstr "向左滑動以解鎖手機"
39+msgstr "從螢幕右緣向左滑動解鎖手機"
4040
4141#: qml/Components/EdgeDemo.qml:145
4242msgid "Top edge"
43−msgstr "頂部邊界"
43+msgstr "上方邊緣"
4444
4545#: qml/Components/EdgeDemo.qml:146
4646msgid "Try swiping from the top edge to access the indicators"
47−msgstr "向下滑動以開啟指引"
47+msgstr "從螢幕上緣向下滑動打開指示器"
4848
4949#: qml/Components/EdgeDemo.qml:171
5050msgid "Close"
@@ -52,33 +52,33 @@ msgstr "關閉"
5252
5353#: qml/Components/EdgeDemo.qml:172
5454msgid "Swipe up again to close the settings screen"
55−msgstr "再次向上滑動以關財設定頁面"
55+msgstr "再次向上滑動關閉設定畫面"
5656
5757#: qml/Components/EdgeDemo.qml:199
5858msgid "Left edge"
59−msgstr "左方邊界"
59+msgstr "左方邊緣"
6060
6161#: qml/Components/EdgeDemo.qml:200
6262msgid "Swipe from the left to reveal the launcher for quick access to apps"
63−msgstr ""
63+msgstr "從螢幕左緣向右滑動揭開啟動器可快速存取程式"
6464
6565#: qml/Components/EdgeDemo.qml:227
6666msgid "Well done"
67−msgstr ""
67+msgstr "做得好"
6868
6969#: qml/Components/EdgeDemo.qml:228
7070msgid ""
7171"You have now mastered the edge gestures and can start using the "
7272"phone<br><br>Tap on the screen to start"
73−msgstr ""
73+msgstr "您現在已熟練邊緣手勢,可以開始使用手機了<br><br>輕觸螢幕開始使用"
7474
7575#: qml/Components/Lockscreen.qml:214
7676msgid "Emergency Call"
77−msgstr "緊急連絡"
77+msgstr "緊急通話"
7878
7979#: qml/Components/Lockscreen.qml:231
8080msgid "OK"
81−msgstr ""
81+msgstr "確定"
8282
8383#: qml/Components/PageHeader.qml:366
8484msgid "Recent searches"
@@ -95,39 +95,39 @@ msgstr "您好"
9595
9696#: qml/Components/PinLockscreen.qml:198
9797msgid "CANCEL"
98−msgstr ""
98+msgstr "取消"
9999
100100#: qml/Components/PinLockscreen.qml:216
101101msgid "DONE"
102−msgstr ""
102+msgstr "完成"
103103
104104#: qml/Components/SeeMore.qml:35
105105msgid "See more"
106−msgstr ""
106+msgstr "查看更多"
107107
108108#: qml/Components/SeeMore.qml:58
109109msgid "See less"
110−msgstr ""
110+msgstr "縮減查看"
111111
112112#: qml/Dash/DashApps.qml:37
113113msgid "Recent"
114−msgstr ""
114+msgstr "最近"
115115
116116#: qml/Dash/Previews/PreviewActionCombo.qml:34
117117msgid "More..."
118−msgstr ""
118+msgstr "更多…"
119119
120120#: qml/Dash/Previews/PreviewActionCombo.qml:34
121121msgid "Less..."
122−msgstr ""
122+msgstr "縮減…"
123123
124124#: qml/Dash/Previews/PreviewRatingInput.qml:82
125125msgid "Rate this"
126−msgstr "對此評比"
126+msgstr "給予評等"
127127
128128#: qml/Dash/Previews/PreviewRatingInput.qml:128
129129msgid "Add a review"
130−msgstr "新增回覆"
130+msgstr "新增評論"
131131
132132#: qml/Dash/Previews/PreviewRatingInput.qml:168
133133msgid "Send"
@@ -135,7 +135,7 @@ msgstr "發送"
135135
136136#: qml/Greeter/Greeter.qml:157
137137msgid "Swipe to unlock"
138−msgstr ""
138+msgstr "滑開解除鎖定"
139139
140140#: qml/Hud/HudParametrizedActionsPage.qml:132
141141msgid "Confirm"
@@ -163,31 +163,31 @@ msgstr "顯示密碼"
163163
164164#: qml/Notifications/NotificationMenuItemFactory.qml:103
165165msgid "Please enter SIM PIN"
166−msgstr ""
166+msgstr "請輸入 SIM 卡 PIN 碼"
167167
168168#: qml/Panel/Indicators/MenuItemFactory.qml:583
169169msgid "In queue…"
170−msgstr ""
170+msgstr "佇列中…"
171171
172172#: qml/Panel/Indicators/MenuItemFactory.qml:587
173173msgid "Downloading"
174−msgstr ""
174+msgstr "下載中"
175175
176176#: qml/Panel/Indicators/MenuItemFactory.qml:589
177177msgid "Paused, tap to resume"
178−msgstr ""
178+msgstr "已暫停,輕觸可繼續"
179179
180180#: qml/Panel/Indicators/MenuItemFactory.qml:591
181181msgid "Canceled"
182−msgstr ""
182+msgstr "已取消"
183183
184184#: qml/Panel/Indicators/MenuItemFactory.qml:593
185185msgid "Finished"
186−msgstr ""
186+msgstr "已完成"
187187
188188#: qml/Panel/Indicators/MenuItemFactory.qml:595
189189msgid "Failed, tap to retry"
190−msgstr ""
190+msgstr "失敗,輕觸可重試"
191191
192192#: qml/Panel/SearchIndicator.qml:27
193193msgid "Search"
@@ -196,4 +196,4 @@ msgstr "搜尋"
196196#: qml/Shell.qml:359
197197#, qt-format
198198msgid "Please enter %1"
199−msgstr ""
199+msgstr "請輸入 %1"
qml/Components/Lockscreen.qml+17−5
@@ -186,6 +186,17 @@ Showable {
186186 }
187187
188188 Column {
189+ id: emergencyCallColumn
190+
191+ // FIXME: We *should* show emergency dialer if there is a SIM present,
192+ // regardless of whether the side stage is enabled. But right now,
193+ // the assumption is that narrow screens are phones which have SIMs
194+ // and wider screens are tablets which don't. When we do allow this
195+ // on devices with a side stage and a SIM, work should be done to
196+ // ensure that the main stage is disabled while the dialer is present
197+ // in the side stage.
198+ visible: !shell.sideStageEnabled
199+
189200 anchors {
190201 left: parent.left
191202 bottom: parent.bottom
@@ -203,11 +214,6 @@ Showable {
203214 name: "phone-app-call-symbolic"
204215 color: "#f3f3e7"
205216 opacity: 0.6
206−
207− MouseArea {
208− anchors.fill: parent
209− onClicked: root.emergencyCall()
210− }
211217 }
212218
213219 Label {
@@ -219,6 +225,12 @@ Showable {
219225 }
220226 }
221227
228+ MouseArea {
229+ anchors.fill: emergencyCallColumn
230+ onClicked: root.emergencyCall()
231+ enabled: emergencyCallColumn.visible
232+ }
233+
222234 Component {
223235 id: infoPopupComponent
224236 Dialog {
qml/Dash/GenericScopeView.qml+4
@@ -352,6 +352,10 @@ FocusScope {
352352 width: parent.width
353353 height: parent.height
354354 anchors.left: categoryView.right
355+
356+ onOpenChanged: {
357+ pageHeader.unfocus();
358+ }
355359 }
356360
357361}
qml/Dash/PreviewListView.qml+1−3
@@ -73,9 +73,7 @@ Item {
7373 property bool open: false
7474
7575 onOpenChanged: {
76− if (open) {
77− pageHeader.unfocus();
78− } else {
76+ if (!open) {
7977 // Cancel any pending preview requests or actions
8078 if (previewListView.currentItem && previewListView.currentItem.previewData !== undefined) {
8179 previewListView.currentItem.previewData.cancelAction();
qml/Greeter/Greeter.qml+1−1
@@ -70,7 +70,7 @@ Showable {
7070 DraggingArea {
7171 id: dragHandle
7272 anchors.fill: parent
73− enabled: greeter.narrowMode || !greeter.locked
73+ enabled: (greeter.narrowMode || !greeter.locked) && greeter.enabled
7474 orientation: Qt.Horizontal
7575 propagateComposedEvents: true
7676
qml/Shell.qml+87−30
@@ -134,7 +134,7 @@ Item {
134134 id: dash
135135 objectName: "dash"
136136
137− available: !greeter.shown && !lockscreen.shown
137+ available: !LightDM.Greeter.active
138138 hides: [stages, launcher, panel.indicators]
139139 shown: disappearingAnimationProgress !== 1.0 && greeterWrapper.showProgress !== 1.0 &&
140140 !(panel.indicators.fullyOpened && !sideStageEnabled)
@@ -193,7 +193,7 @@ Item {
193193
194194 x: {
195195 if (shown) {
196− if (locked) {
196+ if (locked || greeter.fakeActiveForApp !== "") {
197197 return 0;
198198 }
199199 return launcher.progress;
@@ -241,12 +241,19 @@ Item {
241241 Connections {
242242 target: ApplicationManager
243243 onFocusRequested: {
244− if (greeter.shown) {
245− greeter.hide();
244+ if (greeter.fakeActiveForApp !== "" && greeter.fakeActiveForApp !== appId) {
245+ lockscreen.show();
246246 }
247+ greeter.hide();
247248 stages.show();
248249 }
249250
251+ onFocusedApplicationIdChanged: {
252+ if (greeter.fakeActiveForApp !== "" && greeter.fakeActiveForApp !== ApplicationManager.focusedApplicationId) {
253+ lockscreen.show();
254+ }
255+ }
256+
250257 onApplicationAdded: {
251258 if (greeter.shown) {
252259 greeter.hide();
@@ -433,6 +440,11 @@ Item {
433440
434441 source: shell.sideStageEnabled ? "Stages/TabletStage.qml" : "Stages/PhoneStage.qml"
435442
443+ Binding {
444+ target: applicationsDisplayLoader.item
445+ property: "objectName"
446+ value: "stage"
447+ }
436448 Binding {
437449 target: applicationsDisplayLoader.item
438450 property: "dragAreaWidth"
@@ -449,6 +461,11 @@ Item {
449461 property: "interactive"
450462 value: stages.roughlyFullyShown && !greeter.shown && !lockscreen.shown
451463 }
464+ Binding {
465+ target: applicationsDisplayLoader.item
466+ property: "spreadEnabled"
467+ value: greeter.fakeActiveForApp === "" // to support emergency dialer hack
468+ }
452469 }
453470 }
454471
@@ -499,6 +516,13 @@ Item {
499516
500517 onEntered: LightDM.Greeter.respond(passphrase);
501518 onCancel: greeter.show()
519+ onEmergencyCall: {
520+ greeter.fakeActiveForApp = "dialer-app"
521+ shell.activateApplication("dialer-app")
522+ lockscreen.hide()
523+ }
524+
525+ onShownChanged: if (shown) greeter.fakeActiveForApp = ""
502526
503527 Component.onCompleted: {
504528 if (LightDM.Users.count == 1) {
@@ -531,6 +555,7 @@ Item {
531555 }
532556 if (LightDM.Greeter.authenticated) {
533557 lockscreen.hide();
558+ greeter.login();
534559 } else {
535560 lockscreen.clear(true);
536561 }
@@ -540,7 +565,7 @@ Item {
540565 Binding {
541566 target: LightDM.Greeter
542567 property: "active"
543− value: greeter.shown || lockscreen.shown
568+ value: greeter.shown || lockscreen.shown || greeter.fakeActiveForApp != ""
544569 }
545570
546571 Rectangle {
@@ -563,11 +588,16 @@ Item {
563588 }
564589
565590 readonly property real showProgress: MathUtils.clamp((1 - x/width) + greeter.showProgress - 1, 0, 1)
591+ onShowProgressChanged: if (LightDM.Greeter.promptless && showProgress === 0) greeter.login()
566592
567593 Greeter {
568594 id: greeter
569595 objectName: "greeter"
570596
597+ signal sessionStarted() // helpful for tests
598+
599+ property string fakeActiveForApp: ""
600+
571601 available: true
572602 hides: [launcher, panel.indicators]
573603 shown: true
@@ -579,6 +609,16 @@ Item {
579609
580610 dragHandleWidth: shell.edgeSize
581611
612+ function login() {
613+ enabled = false;
614+ LightDM.Greeter.startSessionSync();
615+ sessionStarted();
616+ greeter.hide();
617+ lockscreen.hide();
618+ launcher.hide();
619+ enabled = true;
620+ }
621+
582622 onShownChanged: {
583623 if (shown) {
584624 lockscreen.reset();
@@ -590,6 +630,7 @@ Item {
590630 if (LightDM.Users.count == 1) {
591631 LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
592632 }
633+ greeter.fakeActiveForApp = "";
593634 greeter.forceActiveFocus();
594635 }
595636 }
@@ -633,12 +674,40 @@ Item {
633674 }
634675
635676 function showHome() {
636− var animate = !greeter.shown && !stages.shown
637− greeter.hide()
677+ if (edgeDemo.running) {
678+ return
679+ }
680+
681+ if (LightDM.Greeter.active) {
682+ if (!LightDM.Greeter.promptless) {
683+ lockscreen.show()
684+ }
685+ greeter.hide()
686+ }
687+
688+ var animate = !LightDM.Greeter.active && !stages.shown
638689 dash.setCurrentScope("clickscope", animate, false)
639690 stages.hide()
640691 }
641692
693+ function showDash() {
694+ if (LightDM.Greeter.active && !LightDM.Greeter.promptless) {
695+ return;
696+ }
697+
698+ if (!stages.locked) {
699+ stages.hide();
700+ launcher.fadeOut();
701+ } else {
702+ launcher.switchToNextState("visible");
703+ }
704+
705+ if (greeter.shown) {
706+ greeter.hideRight();
707+ launcher.fadeOut();
708+ }
709+ }
710+
642711 Item {
643712 id: overlay
644713 z: 10
@@ -647,10 +716,11 @@ Item {
647716
648717 Panel {
649718 id: panel
719+ objectName: "panel"
650720 anchors.fill: parent //because this draws indicator menus
651721 indicators {
652722 hides: [launcher]
653− available: edgeDemo.panelEnabled
723+ available: edgeDemo.panelEnabled && greeter.fakeActiveForApp === ""
654724 contentEnabled: edgeDemo.panelContentEnabled
655725 width: parent.width > units.gu(60) ? units.gu(40) : parent.width
656726 panelHeight: units.gu(3)
@@ -660,12 +730,13 @@ Item {
660730 ApplicationManager.focusedApplicationId &&
661731 ApplicationManager.findApplication(ApplicationManager.focusedApplicationId).fullscreen
662732
663− fullscreenMode: stages.roughlyFullyShown && topmostApplicationIsFullscreen
664− && !greeter.shown && !lockscreen.shown
733+ fullscreenMode: (stages.roughlyFullyShown && topmostApplicationIsFullscreen
734+ && !LightDM.Greeter.active) || greeter.fakeActiveForApp !== ""
665735 }
666736
667737 Launcher {
668738 id: launcher
739+ objectName: "launcher"
669740
670741 readonly property bool dashSwipe: progress > 0
671742
@@ -673,29 +744,15 @@ Item {
673744 anchors.bottom: parent.bottom
674745 width: parent.width
675746 dragAreaWidth: shell.edgeSize
676− available: edgeDemo.launcherEnabled
747+ available: edgeDemo.launcherEnabled && greeter.fakeActiveForApp === ""
677748
678− onShowDashHome: {
679− if (edgeDemo.running)
680− return;
681−
682− showHome()
683− }
684− onDash: {
685− if (!stages.locked) {
686− stages.hide();
687− launcher.fadeOut();
688− } else {
689− launcher.switchToNextState("visible");
690− }
691−
692− if (greeter.shown) {
693− greeter.hideRight();
694− launcher.fadeOut();
695− }
696− }
749+ onShowDashHome: showHome()
750+ onDash: showDash()
697751 onDashSwipeChanged: if (dashSwipe && stages.shown) dash.setCurrentScope("clickscope", false, true)
698752 onLauncherApplicationSelected: {
753+ if (greeter.fakeActiveForApp !== "") {
754+ lockscreen.show()
755+ }
699756 if (!edgeDemo.running)
700757 shell.activateApplication(appId)
701758 }
qml/Stages/PhoneStage.qml+3−2
@@ -28,6 +28,7 @@ Item {
2828 property int dragAreaWidth
2929 property real maximizedAppTopMargin
3030 property bool interactive
31+ property bool spreadEnabled: true // If false, animations and right edge will be disabled
3132
3233 // State information propagated to the outside
3334 readonly property bool locked: spreadView.phase == 2
@@ -276,7 +277,7 @@ Item {
276277 }
277278
278279 Behavior on x {
279− enabled: spreadView.focusChanging && index == 0
280+ enabled: spreadView.focusChanging && index == 0 && root.spreadEnabled
280281 UbuntuNumberAnimation {
281282 duration: UbuntuAnimation.FastDuration
282283 onRunningChanged: {
@@ -351,7 +352,7 @@ Item {
351352 EdgeDragArea {
352353 id: spreadDragArea
353354 direction: Direction.Leftwards
354− enabled: spreadView.phase != 2
355+ enabled: spreadView.phase != 2 && root.spreadEnabled
355356
356357 anchors { top: parent.top; right: parent.right; bottom: parent.bottom }
357358 width: root.dragAreaWidth
tests/mocks/LightDM/single-pin/GreeterPrivate.cpp+1−9
@@ -19,8 +19,6 @@
1919#include "../Greeter.h"
2020#include "../GreeterPrivate.h"
2121
22−#include <QDebug>
23−
2422namespace QLightDM
2523{
2624
@@ -34,19 +32,13 @@ GreeterPrivate::GreeterPrivate(Greeter* parent)
3432void GreeterPrivate::handleAuthenticate()
3533{
3634 Q_Q(Greeter);
37−
38− qDebug() << "handleAuthentication called!" << authenticationUser;
39−
40− Q_EMIT q->showPrompt("PIN:", Greeter::PromptTypeSecret);
35+ Q_EMIT q->showPrompt("PIN", Greeter::PromptTypeSecret);
4136}
4237
4338void GreeterPrivate::handleRespond(const QString &response)
4439{
4540 Q_Q(Greeter);
46−
47−
4841 authenticated = (response == "1234");
49− qDebug() << "responding" << response << authenticated;
5042 Q_EMIT q->authenticationComplete();
5143}
5244
tests/mocks/QMenuModel/unitymenumodel.cpp+6−7
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2013-2014 Canonical, Ltd.
2+ * Copyright (C) 2013 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,6 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 *
1616 * Authors: Nick Dedekind <nick.dedekind@canonical.com>
17− * Daniel d'Andrada <daniel.dandrada@canonical.com>
1817 */
1918
2019#include "unitymenumodel.h"
@@ -127,6 +126,11 @@ void UnityMenuModel::setActionStateParser(ActionStateParser*)
127126{
128127}
129128
129+QString UnityMenuModel::nameOwner() const
130+{
131+ return QString("");
132+}
133+
130134int UnityMenuModel::rowCount(const QModelIndex&) const
131135{
132136 return m_modelData.count();
@@ -241,8 +245,3 @@ void UnityMenuModel::registerAction(UnityMenuAction*)
241245void UnityMenuModel::unregisterAction(UnityMenuAction*)
242246{
243247}
244−
245−QByteArray UnityMenuModel::nameOwner() const
246−{
247− return QByteArray();
248−}
tests/mocks/QMenuModel/unitymenumodel.h+5−6
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2013-2014 Canonical, Ltd.
2+ * Copyright (C) 2013 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,6 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 *
1616 * Authors: Nick Dedekind <nick.dedekind@canonical.com>
17− * Daniel d'Andrada <daniel.dandrada@canonical.com>
1817 */
1918
2019#ifndef MOCK_UNITYMENUMODEL_H
@@ -30,10 +29,10 @@ class Q_DECL_EXPORT UnityMenuModel : public QAbstractListModel
3029 Q_OBJECT
3130 Q_PROPERTY(QVariant modelData READ modelData WRITE setModelData NOTIFY modelDataChanged)
3231 Q_PROPERTY(QByteArray busName READ busName WRITE setBusName NOTIFY busNameChanged)
33− Q_PROPERTY(QByteArray nameOwner READ nameOwner NOTIFY nameOwnerChanged)
3432 Q_PROPERTY(QVariantMap actions READ actions WRITE setActions NOTIFY actionsChanged)
3533 Q_PROPERTY(QByteArray menuObjectPath READ menuObjectPath WRITE setMenuObjectPath NOTIFY menuObjectPathChanged)
3634 Q_PROPERTY(ActionStateParser* actionStateParser READ actionStateParser WRITE setActionStateParser NOTIFY actionStateParserChanged)
35+ Q_PROPERTY(QString nameOwner READ nameOwner NOTIFY nameOwnerChanged)
3736
3837public:
3938 UnityMenuModel(QObject *parent = NULL);
@@ -49,8 +48,6 @@ public:
4948 QByteArray busName() const;
5049 void setBusName(const QByteArray &busName);
5150
52− QByteArray nameOwner() const;
53−
5451 QVariantMap actions() const;
5552 void setActions(const QVariantMap &actions);
5653
@@ -60,6 +57,8 @@ public:
6057 ActionStateParser* actionStateParser() const;
6158 void setActionStateParser(ActionStateParser* actionStateParser);
6259
60+ QString nameOwner() const;
61+
6362 int rowCount(const QModelIndex &parent = QModelIndex()) const;
6463 int columnCount(const QModelIndex &parent = QModelIndex()) const;
6564 QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
@@ -79,11 +78,11 @@ public:
7978
8079Q_SIGNALS:
8180 void busNameChanged();
82− void nameOwnerChanged(const QByteArray &owner);
8381 void actionsChanged();
8482 void menuObjectPathChanged();
8583 void actionStateParserChanged();
8684 void modelDataChanged();
85+ void nameOwnerChanged();
8786
8887private:
8988 QVariantMap rowData(int row) const;
tests/qmltests/CMakeLists.txt+3−3
@@ -19,8 +19,8 @@ set(qmltest_DEFAULT_TARGETS qmluitests)
1919set(qmltest_DEFAULT_NO_ADD_TEST TRUE)
2020set(qmltest_DEFAULT_PROPERTIES ENVIRONMENT "LC_ALL=C")
2121
22−add_qml_test(. Shell IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks
23− ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
22+add_qml_test(. Shell ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
23+add_qml_test(. ShellWithPin ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single-pin")
2424add_qml_test(Components Carousel)
2525add_qml_test(Components DraggingArea)
2626add_qml_test(Components EdgeDemoOverlay)
@@ -74,4 +74,4 @@ add_qml_test(Panel/Indicators DefaultIndicatorPage ENVIRONMENT "LD_LIBRARY_PATH=
7474# These MenuItemFactory tests need the test/mocks/ to come before plugins/
7575add_qml_test(Panel/Indicators MenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
7676add_qml_test(Panel/Indicators MessageMenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
77−add_qml_test(Stages PhoneStage)
77+add_qml_test(Stages PhoneStage ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
tests/qmltests/Greeter/tst_Lockscreen.qml+1−1
@@ -57,7 +57,7 @@ Rectangle {
5757 target: LightDM.Greeter
5858
5959 onShowPrompt: {
60− if (text.indexOf("PIN") >= 0) {
60+ if (text === "PIN") {
6161 pinPadCheckBox.checked = false
6262 } else {
6363 pinPadCheckBox.checked = true
tests/qmltests/tst_Shell.qml+19
@@ -51,6 +51,11 @@ Item {
5151 id: shell
5252 }
5353
54+ SignalSpy {
55+ id: sessionSpy
56+ signalName: "sessionStarted"
57+ }
58+
5459 UT.UnityTestCase {
5560 name: "Shell"
5661 when: windowShown
@@ -92,6 +97,8 @@ Item {
9297 verify(ok);
9398
9499 swipeAwayGreeter();
100+
101+ sessionSpy.target = findChild(shell, "greeter")
95102 }
96103
97104 function cleanup() {
@@ -524,5 +531,17 @@ Item {
524531 LightDM.Greeter.showGreeter()
525532 tryCompare(greeter, "showProgress", 1)
526533 }
534+
535+ function test_login() {
536+ sessionSpy.clear()
537+
538+ var greeter = findChild(shell, "greeter")
539+ greeter.show()
540+ tryCompare(greeter, "showProgress", 1)
541+
542+ tryCompare(sessionSpy, "count", 0)
543+ swipeAwayGreeter()
544+ tryCompare(sessionSpy, "count", 1)
545+ }
527546 }
528547}
tests/qmltests/tst_ShellWithPin.qmlnew file+203
@@ -0,0 +1,203 @@
1+/*
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+import QtQuick 2.0
18+import QtTest 1.0
19+import GSettings 1.0
20+import LightDM 0.1 as LightDM
21+import Unity.Application 0.1
22+import Unity.Test 0.1 as UT
23+import Powerd 0.1
24+
25+import "../../qml"
26+
27+Item {
28+ width: shell.width
29+ height: shell.height
30+
31+ QtObject {
32+ id: applicationArguments
33+
34+ function hasGeometry() {
35+ return false;
36+ }
37+
38+ function width() {
39+ return 0;
40+ }
41+
42+ function height() {
43+ return 0;
44+ }
45+ }
46+
47+ Shell {
48+ id: shell
49+ }
50+
51+ SignalSpy {
52+ id: sessionSpy
53+ signalName: "sessionStarted"
54+ }
55+
56+ UT.UnityTestCase {
57+ name: "ShellWithPin"
58+ when: windowShown
59+
60+ function initTestCase() {
61+ var ok = false;
62+ var attempts = 0;
63+ var maxAttempts = 1000;
64+
65+ // Qt loads a qml scene asynchronously. So early on, some findChild() calls made in
66+ // tests may fail because the desired child item wasn't loaded yet.
67+ // Thus here we try to ensure the scene has been fully loaded before proceeding with the tests.
68+ // As I couldn't find an API in QQuickView & friends to tell me that the scene is 100% loaded
69+ // (all items instantiated, etc), I resort to checking the existence of some key items until
70+ // repeatedly until they're all there.
71+ do {
72+ var dashContentList = findChild(shell, "dashContentList");
73+ waitForRendering(dashContentList);
74+ var homeLoader = findChild(dashContentList, "clickscope loader");
75+ ok = homeLoader !== null
76+ && homeLoader.item !== undefined;
77+
78+ var greeter = findChild(shell, "greeter");
79+ ok &= greeter !== null;
80+
81+ var launcherPanel = findChild(shell, "launcherPanel");
82+ ok &= launcherPanel !== null;
83+
84+ attempts++;
85+ if (!ok) {
86+ console.log("Attempt " + attempts + " failed. Waiting a bit before trying again.");
87+ // wait a bit before retrying
88+ wait(100);
89+ } else {
90+ console.log("All seem fine after " + attempts + " attempts.");
91+ }
92+ } while (!ok && attempts <= maxAttempts);
93+
94+ verify(ok);
95+
96+ sessionSpy.target = findChild(shell, "greeter")
97+ }
98+
99+ function init() {
100+ swipeAwayGreeter()
101+ }
102+
103+ function cleanup() {
104+ LightDM.Greeter.showGreeter()
105+ var greeter = findChild(shell, "greeter")
106+ tryCompare(greeter, "showProgress", 1)
107+
108+ // kill all (fake) running apps
109+ killApps()
110+ }
111+
112+ function killApps() {
113+ while (ApplicationManager.count > 0) {
114+ ApplicationManager.stopApplication(ApplicationManager.get(0).appId)
115+ }
116+ compare(ApplicationManager.count, 0)
117+ }
118+
119+ function swipeAwayGreeter() {
120+ var greeter = findChild(shell, "greeter");
121+ tryCompare(greeter, "showProgress", 1);
122+
123+ var touchX = shell.width - (shell.edgeSize / 2);
124+ var touchY = shell.height / 2;
125+ touchFlick(shell, touchX, touchY, shell.width * 0.1, touchY);
126+
127+ // wait until the animation has finished
128+ tryCompare(greeter, "showProgress", 0);
129+
130+ // and for pin to be ready
131+ var lockscreen = findChild(shell, "lockscreen");
132+ var pinPadLoader = findChild(lockscreen, "pinPadLoader");
133+ tryCompare(pinPadLoader, "status", Loader.Ready)
134+ waitForRendering(lockscreen)
135+ }
136+
137+ function enterPin(pin) {
138+ var inputField = findChild(shell, "pinentryField")
139+ for (var i = 0; i < pin.length; ++i) {
140+ var character = pin.charAt(i)
141+ var button = findChild(shell, "pinPadButton" + character)
142+ mouseClick(button, units.gu(1), units.gu(1))
143+ }
144+ }
145+
146+ function test_login() {
147+ tryCompare(sessionSpy, "count", 0)
148+ enterPin("1234")
149+ tryCompare(sessionSpy, "count", 1)
150+ }
151+
152+ function test_emergencyCall() {
153+ var greeter = findChild(shell, "greeter")
154+ var lockscreen = findChild(shell, "lockscreen")
155+ var emergencyButton = findChild(lockscreen, "emergencyCallIcon")
156+ var panel = findChild(shell, "panel")
157+ var indicators = findChild(shell, "indicators")
158+ var launcher = findChild(shell, "launcher")
159+ var stage = findChild(shell, "stage")
160+
161+ mouseClick(emergencyButton, units.gu(1), units.gu(1))
162+
163+ tryCompare(greeter, "fakeActiveForApp", "dialer-app")
164+ tryCompare(lockscreen, "shown", false)
165+ tryCompare(panel, "fullscreenMode", true)
166+ tryCompare(indicators, "available", false)
167+ tryCompare(launcher, "available", false)
168+ tryCompare(stage, "spreadEnabled", false)
169+
170+ // Cancel emergency mode, and go back to normal
171+ waitForRendering(greeter)
172+ LightDM.Greeter.showGreeter()
173+
174+ tryCompare(greeter, "shown", true)
175+ tryCompare(greeter, "fakeActiveForApp", "")
176+ tryCompare(lockscreen, "shown", true)
177+ tryCompare(panel, "fullscreenMode", false)
178+ tryCompare(indicators, "available", true)
179+ tryCompare(launcher, "available", true)
180+ tryCompare(stage, "spreadEnabled", true)
181+ }
182+
183+ function test_emergencyCallCrash() {
184+ var lockscreen = findChild(shell, "lockscreen")
185+ var emergencyButton = findChild(lockscreen, "emergencyCallIcon")
186+ mouseClick(emergencyButton, units.gu(1), units.gu(1))
187+
188+ tryCompare(lockscreen, "shown", false)
189+ killApps() // kill dialer-app, as if it crashed
190+ tryCompare(lockscreen, "shown", true)
191+ }
192+
193+ function test_emergencyCallAppLaunch() {
194+ var lockscreen = findChild(shell, "lockscreen")
195+ var emergencyButton = findChild(lockscreen, "emergencyCallIcon")
196+ mouseClick(emergencyButton, units.gu(1), units.gu(1))
197+
198+ tryCompare(lockscreen, "shown", false)
199+ ApplicationManager.startApplication("gallery-app", ApplicationManager.NoFlag)
200+ tryCompare(lockscreen, "shown", true)
201+ }
202+ }
203+}