git.iko.soy/unity8
on xenial help sign in
[ Michael Zanetti ]

* Dual SIM pin unlocking. Hook up the UI to the backend. (LP: #1267135) [ Antti Kaijanmäki ] * Dual SIM pin unlocking. Hook up the UI to the backend. (LP: #1267135) [ Ubuntu daily release ] * New rebuild forced

commit29da25400a6206c7f006137e2c332a35c6709733 authorjosharenson <joshua.arenson@canonical.com> dateWed 8 Oct 2014, 13:19 (12 years ago) parent4e45571816fd34
16 files changed+173−92
compare with xenial
unifiedsplit
debian/changelog+15 po/am.po+4−4 po/br.po+4−4 po/ca.po+4−4 po/eu.po+4−4 po/fi.po+4−4 po/gl.po+4−4 po/nb.po+4−4 po/pt.po+4−4 po/ro.po+5−5 po/sl.po+4−4 po/sv.po+14−14 po/ug.po+4−4 po/unity8.pot+19−27 qml/Components/Lockscreen.qml+3−1 qml/Notifications/NotificationMenuItemFactory.qml+77−5
debian/changelog+15
@@ -1,3 +1,18 @@
1+unity8 (8.00+14.10.20141008-0ubuntu1) utopic; urgency=low
2+
3+ [ Michael Zanetti ]
4+ * Dual SIM pin unlocking. Hook up the UI to the backend. (LP:
5+ #1267135)
6+
7+ [ Antti Kaijanmäki ]
8+ * Dual SIM pin unlocking. Hook up the UI to the backend. (LP:
9+ #1267135)
10+
11+ [ Ubuntu daily release ]
12+ * New rebuild forced
13+
14+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 08 Oct 2014 09:41:32 +0000
15+
116unity8 (8.00+14.10.20141006-0ubuntu1) utopic; urgency=low
217
318 [ Andrea Cimitan ]
po/am.po+4−4
@@ -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-10-03 08:13-0400\n"
11−"PO-Revision-Date: 2014-10-04 15:36+0000\n"
11+"PO-Revision-Date: 2014-10-08 00:48+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"
1717"Plural-Forms: nplurals=2; plural=n > 1;\n"
18−"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-08 07:39+0000\n"
1919"X-Generator: Launchpad (build 17196)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
@@ -210,11 +210,11 @@ msgstr "መላኪያ"
210210
211211#: qml/Dash/PullToRefreshScopeStyle.qml:55
212212msgid "Pull to refresh…"
213−msgstr ""
213+msgstr "ይሳቡ ለማነቃቃት…"
214214
215215#: qml/Dash/PullToRefreshScopeStyle.qml:60
216216msgid "Release to refresh…"
217−msgstr ""
217+msgstr "ይልቀቁ ለማነቃቃት…"
218218
219219#: qml/Dash/ScopesOverview.qml:206
220220msgid "Manage Scopes"
po/br.po+4−4
@@ -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-10-03 08:13-0400\n"
11−"PO-Revision-Date: 2014-10-03 06:52+0000\n"
11+"PO-Revision-Date: 2014-10-07 07:03+0000\n"
1212"Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n"
1313"Language-Team: Breton <br@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n > 1;\n"
18−"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-08 07:39+0000\n"
1919"X-Generator: Launchpad (build 17196)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
@@ -220,11 +220,11 @@ msgstr "Kas"
220220
221221#: qml/Dash/PullToRefreshScopeStyle.qml:55
222222msgid "Pull to refresh…"
223−msgstr ""
223+msgstr "Tennañ evit freskaat..."
224224
225225#: qml/Dash/PullToRefreshScopeStyle.qml:60
226226msgid "Release to refresh…"
227−msgstr ""
227+msgstr "Lezel da vont evit freskaat..."
228228
229229#: qml/Dash/ScopesOverview.qml:206
230230msgid "Manage Scopes"
po/ca.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-10-03 08:13-0400\n"
11−"PO-Revision-Date: 2014-10-06 12:16+0000\n"
11+"PO-Revision-Date: 2014-10-07 10:51+0000\n"
1212"Last-Translator: David Planella <david.planella@ubuntu.com>\n"
1313"Language-Team: Catalan <ca@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-08 07:39+0000\n"
1919"X-Generator: Launchpad (build 17196)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
@@ -221,11 +221,11 @@ msgstr "Envia"
221221
222222#: qml/Dash/PullToRefreshScopeStyle.qml:55
223223msgid "Pull to refresh…"
224−msgstr ""
224+msgstr "Estireu per actualitzar..."
225225
226226#: qml/Dash/PullToRefreshScopeStyle.qml:60
227227msgid "Release to refresh…"
228−msgstr ""
228+msgstr "Deixeu anar per actualitzar..."
229229
230230#: qml/Dash/ScopesOverview.qml:206
231231msgid "Manage Scopes"
po/eu.po+4−4
@@ -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-10-03 08:13-0400\n"
11−"PO-Revision-Date: 2014-10-04 01:50+0000\n"
11+"PO-Revision-Date: 2014-10-07 19:21+0000\n"
1212"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"
1313"Language-Team: Basque <eu@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-08 07:39+0000\n"
1919"X-Generator: Launchpad (build 17196)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
@@ -215,11 +215,11 @@ msgstr "Bidali"
215215
216216#: qml/Dash/PullToRefreshScopeStyle.qml:55
217217msgid "Pull to refresh…"
218−msgstr ""
218+msgstr "Tiratu freskatzeko…"
219219
220220#: qml/Dash/PullToRefreshScopeStyle.qml:60
221221msgid "Release to refresh…"
222−msgstr ""
222+msgstr "Askatu freskatzeko…"
223223
224224#: qml/Dash/ScopesOverview.qml:206
225225msgid "Manage Scopes"
po/fi.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-10-03 08:13-0400\n"
11−"PO-Revision-Date: 2014-10-04 08:00+0000\n"
11+"PO-Revision-Date: 2014-10-07 13:10+0000\n"
1212"Last-Translator: Jiri Grönroos <Unknown>\n"
1313"Language-Team: Finnish <fi@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-08 07:39+0000\n"
1919"X-Generator: Launchpad (build 17196)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
@@ -213,11 +213,11 @@ msgstr "Lähetä"
213213
214214#: qml/Dash/PullToRefreshScopeStyle.qml:55
215215msgid "Pull to refresh…"
216−msgstr ""
216+msgstr "Vedä päivittääksesi…"
217217
218218#: qml/Dash/PullToRefreshScopeStyle.qml:60
219219msgid "Release to refresh…"
220−msgstr ""
220+msgstr "Vapauta päivittääksesi…"
221221
222222#: qml/Dash/ScopesOverview.qml:206
223223msgid "Manage Scopes"
po/gl.po+4−4
@@ -8,14 +8,14 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-10-03 08:13-0400\n"
11−"PO-Revision-Date: 2014-10-03 04:55+0000\n"
11+"PO-Revision-Date: 2014-10-07 10:01+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"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-08 07:39+0000\n"
1919"X-Generator: Launchpad (build 17196)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
@@ -211,11 +211,11 @@ msgstr "Enviar"
211211
212212#: qml/Dash/PullToRefreshScopeStyle.qml:55
213213msgid "Pull to refresh…"
214−msgstr ""
214+msgstr "Tirar para actualizar..."
215215
216216#: qml/Dash/PullToRefreshScopeStyle.qml:60
217217msgid "Release to refresh…"
218−msgstr ""
218+msgstr "Soltar para actualizar"
219219
220220#: qml/Dash/ScopesOverview.qml:206
221221msgid "Manage Scopes"
po/nb.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-10-03 08:13-0400\n"
11−"PO-Revision-Date: 2014-10-03 08:44+0000\n"
11+"PO-Revision-Date: 2014-10-07 10:32+0000\n"
1212"Last-Translator: Åka Sikrom <Unknown>\n"
1313"Language-Team: Norwegian Bokmal <nb@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-08 07:39+0000\n"
1919"X-Generator: Launchpad (build 17196)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
@@ -213,11 +213,11 @@ msgstr "Send"
213213
214214#: qml/Dash/PullToRefreshScopeStyle.qml:55
215215msgid "Pull to refresh…"
216−msgstr ""
216+msgstr "Dra for å oppdatere …"
217217
218218#: qml/Dash/PullToRefreshScopeStyle.qml:60
219219msgid "Release to refresh…"
220−msgstr ""
220+msgstr "Slipp for å oppdatere …"
221221
222222#: qml/Dash/ScopesOverview.qml:206
223223msgid "Manage Scopes"
po/pt.po+4−4
@@ -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-10-03 08:13-0400\n"
11−"PO-Revision-Date: 2014-10-03 16:17+0000\n"
11+"PO-Revision-Date: 2014-10-07 08:31+0000\n"
1212"Last-Translator: Ivo Xavier <ivofernandes12@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"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-08 07:39+0000\n"
1919"X-Generator: Launchpad (build 17196)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
@@ -212,11 +212,11 @@ msgstr "Enviar"
212212
213213#: qml/Dash/PullToRefreshScopeStyle.qml:55
214214msgid "Pull to refresh…"
215−msgstr ""
215+msgstr "Puxe para atualizar..."
216216
217217#: qml/Dash/PullToRefreshScopeStyle.qml:60
218218msgid "Release to refresh…"
219−msgstr ""
219+msgstr "Solte para atualizar..."
220220
221221#: qml/Dash/ScopesOverview.qml:206
222222msgid "Manage Scopes"
po/ro.po+5−5
@@ -8,7 +8,7 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-10-03 08:13-0400\n"
11−"PO-Revision-Date: 2014-10-04 11:36+0000\n"
11+"PO-Revision-Date: 2014-10-07 15:54+0000\n"
1212"Last-Translator: Marian Vasile <marianvasile1972@gmail.com>\n"
1313"Language-Team: Romanian <ro@li.org>\n"
1414"MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
1818"== 0) && (n != 0))) ? 2: 1));\n"
19−"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"
19+"X-Launchpad-Export-Date: 2014-10-08 07:39+0000\n"
2020"X-Generator: Launchpad (build 17196)\n"
2121
2222#: plugins/LightDM/Greeter.cpp:130
@@ -219,11 +219,11 @@ msgstr "Trimite"
219219
220220#: qml/Dash/PullToRefreshScopeStyle.qml:55
221221msgid "Pull to refresh…"
222−msgstr ""
222+msgstr "Trageți pentru a actualiza..."
223223
224224#: qml/Dash/PullToRefreshScopeStyle.qml:60
225225msgid "Release to refresh…"
226−msgstr ""
226+msgstr "Eliberați pentru a actualiza..."
227227
228228#: qml/Dash/ScopesOverview.qml:206
229229msgid "Manage Scopes"
@@ -348,7 +348,7 @@ msgstr "Parolă incorectă"
348348#: qml/Shell.qml:348
349349#, qt-format
350350msgid "Enter %1"
351−msgstr ""
351+msgstr "Introducere %1"
352352
353353#: qml/Shell.qml:349
354354#, qt-format
po/sl.po+4−4
@@ -8,7 +8,7 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-10-03 08:13-0400\n"
11−"PO-Revision-Date: 2014-10-03 17:37+0000\n"
11+"PO-Revision-Date: 2014-10-07 09:28+0000\n"
1212"Last-Translator: Damir Jerovšek <Unknown>\n"
1313"Language-Team: Slovenian <sl@li.org>\n"
1414"MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
1818"n%100==4 ? 3 : 0);\n"
19−"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"
19+"X-Launchpad-Export-Date: 2014-10-08 07:39+0000\n"
2020"X-Generator: Launchpad (build 17196)\n"
2121
2222#: plugins/LightDM/Greeter.cpp:130
@@ -216,11 +216,11 @@ msgstr "Pošlji"
216216
217217#: qml/Dash/PullToRefreshScopeStyle.qml:55
218218msgid "Pull to refresh…"
219−msgstr ""
219+msgstr "Povlecite za osvežitev ..."
220220
221221#: qml/Dash/PullToRefreshScopeStyle.qml:60
222222msgid "Release to refresh…"
223−msgstr ""
223+msgstr "Spustite za osvežitev ..."
224224
225225#: qml/Dash/ScopesOverview.qml:206
226226msgid "Manage Scopes"
po/sv.po+14−14
@@ -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-10-03 08:13-0400\n"
11−"PO-Revision-Date: 2014-09-23 08:37+0000\n"
11+"PO-Revision-Date: 2014-10-07 14:28+0000\n"
1212"Last-Translator: Josef Andersson <Unknown>\n"
1313"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-08 07:39+0000\n"
1919"X-Generator: Launchpad (build 17196)\n"
2020"Language: sv\n"
2121
@@ -34,22 +34,22 @@ msgstr "Släpp genväg"
3434
3535#: qml/Components/DelayedLockscreen.qml:47
3636msgid "Device Locked"
37−msgstr ""
37+msgstr "Enhet låst"
3838
3939#: qml/Components/DelayedLockscreen.qml:62
4040msgid "You have been locked out due to too many failed passphrase attempts."
41−msgstr ""
41+msgstr "Du har blivit utlåst efter för många misslyckade lösenfrasförsök."
4242
4343#: qml/Components/DelayedLockscreen.qml:63
4444msgid "You have been locked out due to too many failed passcode attempts."
45−msgstr ""
45+msgstr "Du har blivit utlåst efter för många misslyckade lösenkodsförsök."
4646
4747#: qml/Components/DelayedLockscreen.qml:72
4848#, qt-format
4949msgid "Please wait %1 minute and then try again…"
5050msgid_plural "Please wait %1 minutes and then try again…"
51−msgstr[0] ""
52−msgstr[1] ""
51+msgstr[0] "Vänta %1 minut och prova sedan igen..."
52+msgstr[1] "Vänta %1 minuter och prova sedan igen..."
5353
5454#: qml/Components/Dialogs.qml:70
5555msgid "Log out"
@@ -212,11 +212,11 @@ msgstr "Skicka"
212212
213213#: qml/Dash/PullToRefreshScopeStyle.qml:55
214214msgid "Pull to refresh…"
215−msgstr ""
215+msgstr "Dra för att uppdatera..."
216216
217217#: qml/Dash/PullToRefreshScopeStyle.qml:60
218218msgid "Release to refresh…"
219−msgstr ""
219+msgstr "Släpp för uppdatera..."
220220
221221#: qml/Dash/ScopesOverview.qml:206
222222msgid "Manage Scopes"
@@ -240,7 +240,7 @@ msgstr "Alla"
240240
241241#: qml/Greeter/Greeter.qml:157
242242msgid "Unlock"
243−msgstr ""
243+msgstr "Lås upp"
244244
245245#: qml/Hud/HudParametrizedActionsPage.qml:139
246246msgid "Confirm"
@@ -320,7 +320,7 @@ msgstr "Roaming"
320320
321321#: qml/Shell.qml:340
322322msgid "Enter passphrase"
323−msgstr ""
323+msgstr "Ange lösenfras"
324324
325325#: qml/Shell.qml:341
326326msgid "Sorry, incorrect passphrase"
@@ -328,11 +328,11 @@ msgstr "Felaktig lösenfras"
328328
329329#: qml/Shell.qml:342
330330msgid "Please re-enter"
331−msgstr ""
331+msgstr "Ange igen"
332332
333333#: qml/Shell.qml:344
334334msgid "Enter passcode"
335−msgstr ""
335+msgstr "Ange lösenkod"
336336
337337#: qml/Shell.qml:345
338338msgid "Sorry, incorrect passcode"
@@ -341,7 +341,7 @@ msgstr "Felaktig lösenkod"
341341#: qml/Shell.qml:348
342342#, qt-format
343343msgid "Enter %1"
344−msgstr ""
344+msgstr "Ange %1"
345345
346346#: qml/Shell.qml:349
347347#, qt-format
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-10-03 08:13-0400\n"
11−"PO-Revision-Date: 2014-10-06 00:47+0000\n"
11+"PO-Revision-Date: 2014-10-07 09:00+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"
1717"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-08 07:39+0000\n"
1919"X-Generator: Launchpad (build 17196)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
@@ -210,11 +210,11 @@ msgstr "يوللا"
210210
211211#: qml/Dash/PullToRefreshScopeStyle.qml:55
212212msgid "Pull to refresh…"
213−msgstr ""
213+msgstr "تارتسا يېڭىلىنىدۇ…"
214214
215215#: qml/Dash/PullToRefreshScopeStyle.qml:60
216216msgid "Release to refresh…"
217−msgstr ""
217+msgstr "قويۇۋەتسە يېڭىلىنىدۇ…"
218218
219219#: qml/Dash/ScopesOverview.qml:206
220220msgid "Manage Scopes"
po/unity8.pot+19−27
@@ -8,7 +8,7 @@ msgid ""
88msgstr ""
99"Project-Id-Version: unity8\n"
1010"Report-Msgid-Bugs-To: \n"
11−"POT-Creation-Date: 2014-10-03 08:13-0400\n"
11+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -152,23 +152,23 @@ msgid ""
152152"phone<br><br>Tap on the screen to start"
153153msgstr ""
154154
155−#: qml/Components/Lockscreen.qml:218
155+#: qml/Components/Lockscreen.qml:220
156156msgid "Emergency Call"
157157msgstr ""
158158
159−#: qml/Components/Lockscreen.qml:250
159+#: qml/Components/Lockscreen.qml:252
160160msgid "OK"
161161msgstr ""
162162
163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
164164msgid "See less"
165165msgstr ""
166166
167−#: qml/Dash/GenericScopeView.qml:411
167+#: qml/Dash/GenericScopeView.qml:434
168168msgid "See all"
169169msgstr ""
170170
171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
172172#: qml/Panel/SearchIndicator.qml:27
173173msgid "Search"
174174msgstr ""
@@ -257,18 +257,10 @@ msgstr ""
257257msgid "Speaking..."
258258msgstr ""
259259
260−#: qml/Notifications/NotificationMenuItemFactory.qml:108
260+#: qml/Notifications/NotificationMenuItemFactory.qml:116
261261msgid "Show password"
262262msgstr ""
263263
264−#: qml/Notifications/NotificationMenuItemFactory.qml:124
265−msgid "Enter SIM PIN"
266−msgstr ""
267−
268−#: qml/Notifications/NotificationMenuItemFactory.qml:125
269−msgid "Sorry, incorrect PIN"
270−msgstr ""
271−
272264#: qml/Panel/ActiveCallHint.qml:77
273265msgid "Tap to return to call..."
274266msgstr ""
@@ -313,55 +305,55 @@ msgstr ""
313305msgid "Roaming"
314306msgstr ""
315307
316−#: qml/Shell.qml:340
308+#: qml/Shell.qml:346
317309msgid "Enter passphrase"
318310msgstr ""
319311
320−#: qml/Shell.qml:341
312+#: qml/Shell.qml:347
321313msgid "Sorry, incorrect passphrase"
322314msgstr ""
323315
324−#: qml/Shell.qml:342
316+#: qml/Shell.qml:348
325317msgid "Please re-enter"
326318msgstr ""
327319
328−#: qml/Shell.qml:344
320+#: qml/Shell.qml:350
329321msgid "Enter passcode"
330322msgstr ""
331323
332−#: qml/Shell.qml:345
324+#: qml/Shell.qml:351
333325msgid "Sorry, incorrect passcode"
334326msgstr ""
335327
336−#: qml/Shell.qml:348
328+#: qml/Shell.qml:354
337329#, qt-format
338330msgid "Enter %1"
339331msgstr ""
340332
341−#: qml/Shell.qml:349
333+#: qml/Shell.qml:355
342334#, qt-format
343335msgid "Sorry, incorrect %1"
344336msgstr ""
345337
346−#: qml/Shell.qml:384
338+#: qml/Shell.qml:390
347339msgid "Sorry, incorrect passphrase."
348340msgstr ""
349341
350−#: qml/Shell.qml:385
342+#: qml/Shell.qml:391
351343msgid "Sorry, incorrect passcode."
352344msgstr ""
353345
354−#: qml/Shell.qml:386
346+#: qml/Shell.qml:392
355347msgid "This will be your last attempt."
356348msgstr ""
357349
358−#: qml/Shell.qml:388
350+#: qml/Shell.qml:394
359351msgid ""
360352"If passphrase is entered incorrectly, your phone will conduct a factory "
361353"reset and all personal data will be deleted."
362354msgstr ""
363355
364−#: qml/Shell.qml:389
356+#: qml/Shell.qml:395
365357msgid ""
366358"If passcode is entered incorrectly, your phone will conduct a factory reset "
367359"and all personal data will be deleted."
qml/Components/Lockscreen.qml+3−1
@@ -78,7 +78,9 @@ Showable {
7878 }
7979
8080 function showInfoPopup(title, text) {
81− PopupUtils.open(infoPopupComponent, root, {title: title, text: text})
81+ var popup = PopupUtils.open(infoPopupComponent, root, {title: title, text: text})
82+ // FIXME: SDK will do this internally soonish
83+ popup.z = Number.MAX_VALUE
8284 }
8385
8486 Rectangle {
qml/Notifications/NotificationMenuItemFactory.qml+77−5
@@ -19,6 +19,7 @@
1919
2020import QtQuick 2.0
2121import Ubuntu.Components 0.1
22+import QMenuModel 0.1
2223import "../Components"
2324
2425Loader {
@@ -26,7 +27,7 @@ Loader {
2627
2728 property QtObject menuModel: null
2829 property QtObject menuData: null
29− property int menuIndex
30+ property int menuIndex : -1
3031 property int maxHeight
3132 readonly property bool fullscreen: menuData.type === "com.canonical.snapdecision.pinlock"
3233
@@ -46,6 +47,13 @@ Loader {
4647 }
4748 }
4849
50+ function getExtendedProperty(object, propertyName, defaultValue) {
51+ if (object && object.hasOwnProperty(propertyName)) {
52+ return object[propertyName];
53+ }
54+ return defaultValue;
55+ }
56+
4957 Component {
5058 id: textfield
5159
@@ -121,14 +129,14 @@ Loader {
121129 right: parent.right
122130 }
123131 height: menuFactory.maxHeight
124− infoText: i18n.tr("Enter SIM PIN")
125− errorText: i18n.tr("Sorry, incorrect PIN")
126− minPinLength: 4
127− maxPinLength: 8
132+ infoText: notification.summary
133+ errorText: errorAction.valid ? errorAction.state : ""
134+ retryText: notification.body
128135 background: shell.background
129136
130137 onEntered: {
131138 menuModel.changeState(menuIndex, passphrase);
139+ clear(false);
132140 }
133141
134142 onCancel: {
@@ -139,6 +147,70 @@ Loader {
139147 shell.activateApplication("dialer-app")
140148 menuModel.activate(menuIndex, false)
141149 }
150+
151+ property var extendedData: menuData && menuData.ext || undefined
152+
153+ property var pinMinMaxAction : UnityMenuAction {
154+ model: menuModel
155+ index: menuIndex
156+ name: getExtendedProperty(extendedData, "xCanonicalPinMinMax", "")
157+
158+ onStateChanged: {
159+ var min = pinMinMaxAction.state[0];
160+ var max = pinMinMaxAction.state[1];
161+
162+ if (min === 0) min = -1;
163+ if (max === 0) max = -1;
164+
165+ minPinLength = min
166+ maxPinLength = max
167+ }
168+ }
169+
170+ property var popupAction: UnityMenuAction {
171+ model: menuModel
172+ index: menuIndex
173+ name: getExtendedProperty(extendedData, "xCanonicalPinPopup", "")
174+ onStateChanged: {
175+ if (state !== "")
176+ showInfoPopup("", state);
177+ }
178+ }
179+ onInfoPopupConfirmed: {
180+ popupAction.activate();
181+ }
182+
183+ Timer {
184+ id: errorTimer
185+ interval: 4000;
186+ running: false;
187+ repeat: false
188+ onTriggered: {
189+ errorAction.activate();
190+ }
191+ }
192+ property var errorAction: UnityMenuAction {
193+ model: menuModel
194+ index: menuIndex
195+ name: getExtendedProperty(extendedData, "xCanonicalPinError", "")
196+ onStateChanged: {
197+ errorText = state;
198+ if (state !== "") {
199+ clear(true);
200+ errorTimer.running = true;
201+ }
202+ }
203+ }
204+
205+ function loadAttributes() {
206+ if (!menuModel || menuIndex == -1) return;
207+ menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-pin-min-max': 'string',
208+ 'x-canonical-pin-popup': 'string',
209+ 'x-canonical-pin-error': 'string'});
210+ }
211+ Component.onCompleted: {
212+ loadAttributes();
213+ }
142214 }
143215 }
144216}