git.iko.soy/unity8
on xenial help sign in
Merged with trunk.
commit19542b2634488b136e775d52efc40b12880503c7 authorLeo Arias <leo.arias@canonical.com> dateMon 5 Jan 2015, 08:35 (12 years ago) parentaf1a5adab98493
11 files changed+289−266
compare with xenial
unifiedsplit
debian/changelog+11 po/am.po+96−93 po/br.po+45−37 po/hu.po+106−98 qml/Dash/DashNavigationButton.qml+10−20 qml/Dash/ScopesListCategoryItem.qml+3−2 tests/mocks/Unity/fake_navigation.cpp+1−1 tests/mocks/Unity/fake_scope.cpp+2−7 tests/mocks/Unity/fake_scopes.cpp+1−1 tests/mocks/Unity/fake_scopesoverview.cpp+1−1 tests/qmltests/Dash/tst_DashContent.qml+13−6
debian/changelog+11
@@ -1,3 +1,14 @@
1+unity8 (8.02+15.04.20141216.1-0ubuntu1) vivid; urgency=low
2+
3+ [ Ubuntu daily release ]
4+ * New rebuild forced
5+
6+ [ Albert Astals ]
7+ * Need to wait until loaded is true to use the count property
8+ * Manage Dash: Ellide properly
9+
10+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 16 Dec 2014 11:03:37 +0000
11+
112unity8 (8.02+15.04.20141215.3-0ubuntu1) vivid; urgency=low
213
314 [ Albert Astals Cid ]
po/am.po+96−93
@@ -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-12-10 10:55+0100\n"
11−"PO-Revision-Date: 2014-11-06 00:53+0000\n"
11+"PO-Revision-Date: 2014-12-27 19:44+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-12-13 07:10+0000\n"
18+"X-Launchpad-Export-Date: 2014-12-28 06:07+0000\n"
1919"X-Generator: Launchpad (build 17286)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
@@ -23,11 +23,11 @@ msgid "Password: "
2323msgstr "የ መግቢያ ቃል: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:100
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2727msgid "Pin shortcut"
2828msgstr "አቋራጭ ማጣበቂያ"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:100
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3131msgid "Unpin shortcut"
3232msgstr "አቋራጭ መለያያ"
3333
@@ -50,45 +50,45 @@ msgid_plural "Please wait %1 minutes and then try again…"
5050msgstr[0] "እባክዎን ይቆዩ %1 ደቂቃ እና ከዛ እንደ ገና ይምክሩ…"
5151msgstr[1] "እባክዎን ይቆዩ %1 ደቂቃዎች እና ከዛ እንደ ገና ይምክሩ…"
5252
53−#: qml/Components/Dialogs.qml:70
53+#: qml/Components/Dialogs.qml:74
5454msgid "Log out"
5555msgstr "መውጫ"
5656
57−#: qml/Components/Dialogs.qml:71
57+#: qml/Components/Dialogs.qml:75
5858msgid "Are you sure you want to log out?"
5959msgstr "በእርግጥ መውጣት ይፈልጋሉ?"
6060
61−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
62−#: qml/Components/Dialogs.qml:122
61+#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
62+#: qml/Components/Dialogs.qml:126
6363msgid "No"
6464msgstr "አይ"
6565
66−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
67−#: qml/Components/Dialogs.qml:129
66+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
67+#: qml/Components/Dialogs.qml:133
6868msgid "Yes"
6969msgstr "አዎ"
7070
71−#: qml/Components/Dialogs.qml:94
71+#: qml/Components/Dialogs.qml:98
7272msgid "Shut down"
7373msgstr "ማጥፊያ"
7474
75−#: qml/Components/Dialogs.qml:95
75+#: qml/Components/Dialogs.qml:99
7676msgid "Are you sure you want to shut down?"
7777msgstr "በእርግጥ ማጥፋት ይፈልጋሉ?"
7878
79−#: qml/Components/Dialogs.qml:119
79+#: qml/Components/Dialogs.qml:123
8080msgid "Reboot"
8181msgstr "እንደገና ማስነሻ"
8282
83−#: qml/Components/Dialogs.qml:120
83+#: qml/Components/Dialogs.qml:124
8484msgid "Are you sure you want to reboot?"
8585msgstr "በእርግጥ እንደገና ማስነሳት ይፈልጋሉ?"
8686
87−#: qml/Components/Dialogs.qml:144
87+#: qml/Components/Dialogs.qml:148
8888msgid "Power"
8989msgstr "ሐይል"
9090
91−#: qml/Components/Dialogs.qml:145
91+#: qml/Components/Dialogs.qml:149
9292msgid ""
9393"Are you sure you would like\n"
9494"to power off?"
@@ -96,15 +96,15 @@ msgstr ""
9696"በእርግጥ ሐይሉን ማጥፋት\n"
9797"ይፈልጋሉ?"
9898
99−#: qml/Components/Dialogs.qml:147
99+#: qml/Components/Dialogs.qml:151
100100msgid "Power off"
101101msgstr "ማጥፊያ"
102102
103−#: qml/Components/Dialogs.qml:157
103+#: qml/Components/Dialogs.qml:161
104104msgid "Restart"
105105msgstr "እንደገና ማስጀመሪያ"
106106
107−#: qml/Components/Dialogs.qml:167
107+#: qml/Components/Dialogs.qml:171
108108msgid "Cancel"
109109msgstr "መሰረዣ"
110110
@@ -112,87 +112,87 @@ msgstr "መሰረዣ"
112112msgid "Skip intro"
113113msgstr "መግቢያውን መዝለያ"
114114
115−#: qml/Components/EdgeDemo.qml:125
115+#: qml/Components/EdgeDemo.qml:112
116116msgid "Right edge"
117117msgstr "የቀኝ ጠርዝ"
118118
119−#: qml/Components/EdgeDemo.qml:126
119+#: qml/Components/EdgeDemo.qml:113
120120msgid "Try swiping from the right edge to unlock the phone"
121121msgstr "ስልኩን ለመክፈት ከ ቀኝ ጠርዝ በኩል ወደ ግራ ይጥረጉ"
122122
123−#: qml/Components/EdgeDemo.qml:157
123+#: qml/Components/EdgeDemo.qml:144
124124msgid "Top edge"
125125msgstr "የላይ ጠርዝ"
126126
127−#: qml/Components/EdgeDemo.qml:158
127+#: qml/Components/EdgeDemo.qml:145
128128msgid "Try swiping from the top edge to access the indicators"
129129msgstr "ጠቋሚዎች ጋር ለመድረስ ከ ላይ ጠርዝ በኩል ወደ ታች ይጥረጉ"
130130
131−#: qml/Components/EdgeDemo.qml:183
131+#: qml/Components/EdgeDemo.qml:170
132132msgid "Close"
133133msgstr "መዝጊያ"
134134
135−#: qml/Components/EdgeDemo.qml:184
135+#: qml/Components/EdgeDemo.qml:171
136136msgid "Swipe up again to close the settings screen"
137137msgstr "የማሰናጃውን መመልከቻ ለመዝጋት እንደገና ወደ ላይ ይጥረጉ"
138138
139−#: qml/Components/EdgeDemo.qml:214
139+#: qml/Components/EdgeDemo.qml:201
140140msgid "Left edge"
141141msgstr "የግራ ጠርዝ"
142142
143−#: qml/Components/EdgeDemo.qml:215
143+#: qml/Components/EdgeDemo.qml:202
144144msgid "Swipe from the left to reveal the launcher for quick access to apps"
145145msgstr "ከ ግራ በኩል ወደ ቀኝ ይጥረጉ በፍጥነት መተግበሪያዎች ጋር ለመድረስ እና ለማስጀመር"
146146
147−#: qml/Components/EdgeDemo.qml:242
147+#: qml/Components/EdgeDemo.qml:229
148148msgid "Well done"
149149msgstr "ጥሩ አድረገዋል"
150150
151−#: qml/Components/EdgeDemo.qml:243
151+#: qml/Components/EdgeDemo.qml:230
152152msgid ""
153153"You have now mastered the edge gestures and can start using the "
154154"phone<br><br>Tap on the screen to start"
155155msgstr ""
156156"አሁን የ ጠርዝ እንቅስቃሴን አውቀዋል እና መጀመር ይችላሉ ስልኩን መጠቀም <br><br>መመልከቻውን መታ ያድርጉ ለመጀመር"
157157
158−#: qml/Components/Lockscreen.qml:238
158+#: qml/Components/Lockscreen.qml:223
159159msgid "Return to Call"
160160msgstr "ወደ ጥሪ መመለሻ"
161161
162−#: qml/Components/Lockscreen.qml:238
162+#: qml/Components/Lockscreen.qml:223
163163msgid "Emergency Call"
164164msgstr "የ ድንገተኛ ጥሪ"
165165
166−#: qml/Components/Lockscreen.qml:270
166+#: qml/Components/Lockscreen.qml:255
167167msgid "OK"
168168msgstr "እሺ"
169169
170−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
170+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
171171msgid "See less"
172172msgstr "አነስተኛ መመልከቻ"
173173
174−#: qml/Dash/GenericScopeView.qml:431
174+#: qml/Dash/GenericScopeView.qml:434
175175msgid "See all"
176176msgstr "ሁሉንም መመልከቻ"
177177
178−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
178+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:268
179179#: qml/Panel/SearchIndicator.qml:27
180180msgid "Search"
181181msgstr "መፈለጊያ"
182182
183−#: qml/Dash/PageHeader.qml:260
183+#: qml/Dash/PageHeader.qml:261
184184msgid "Store"
185185msgstr "ማስቀመጫ"
186186
187−#: qml/Dash/PageHeader.qml:277
187+#: qml/Dash/PageHeader.qml:278
188188msgid "Settings"
189189msgstr "ማሰናጃ"
190190
191−#: qml/Dash/PageHeader.qml:284
191+#: qml/Dash/PageHeader.qml:285
192192msgid "Remove from Favorites"
193193msgstr "ከምወዳቸው ማስወገጃ"
194194
195−#: qml/Dash/PageHeader.qml:284
195+#: qml/Dash/PageHeader.qml:285
196196msgid "Add to Favorites"
197197msgstr "ወደምወዳቸው መጨመሪያ"
198198
@@ -226,15 +226,15 @@ msgstr "ይልቀቁ ለማነቃቃት…"
226226
227227#: qml/Dash/ScopesList.qml:63
228228msgid "Manage"
229−msgstr ""
229+msgstr "አስተዳዳሪ"
230230
231231#: qml/Dash/ScopesList.qml:107
232232msgid "Home"
233−msgstr ""
233+msgstr "ቤት"
234234
235235#: qml/Dash/ScopesList.qml:108
236236msgid "Also installed"
237−msgstr ""
237+msgstr "እንዲሁም የተገጠሙ"
238238
239239#: qml/Greeter/Greeter.qml:174
240240msgid "Unlock"
@@ -288,49 +288,49 @@ msgstr "ሲም መክፈቻ"
288288msgid "Roaming"
289289msgstr "ማዘዋወሪያ"
290290
291−#: qml/Shell.qml:367
291+#: qml/Shell.qml:402
292292#, qt-format
293293msgid "Enter %1"
294294msgstr "ማስገቢያ %1"
295295
296−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
296+#: qml/Shell.qml:394
297297msgid "Enter passphrase"
298298msgstr "የ ማለፊያ ሀረግ ያስገቡ"
299299
300−#: qml/Shell.qml:369
300+#: qml/Shell.qml:398
301301msgid "Enter passcode"
302302msgstr "የ ማለፊያ ኮድ ያስገቡ"
303303
304−#: qml/Shell.qml:370
304+#: qml/Shell.qml:403
305305#, qt-format
306306msgid "Sorry, incorrect %1"
307307msgstr "አዝናለሁ: የተሳሳተ%1"
308308
309−#: qml/Shell.qml:371
309+#: qml/Shell.qml:395
310310msgid "Sorry, incorrect passphrase"
311311msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
312312
313−#: qml/Shell.qml:372
313+#: qml/Shell.qml:396
314314msgid "Please re-enter"
315315msgstr "እባክዎን እንደገና-ያስገቡ"
316316
317−#: qml/Shell.qml:373
317+#: qml/Shell.qml:399
318318msgid "Sorry, incorrect passcode"
319319msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
320320
321−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
321+#: qml/Shell.qml:444
322322msgid "Sorry, incorrect passphrase."
323323msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
324324
325−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
325+#: qml/Shell.qml:445
326326msgid "Sorry, incorrect passcode."
327327msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
328328
329−#: qml/Shell.qml:469
329+#: qml/Shell.qml:446
330330msgid "This will be your last attempt."
331331msgstr "ይህ የመጨረሻ ሙከራዎ ነው"
332332
333−#: qml/Shell.qml:471
333+#: qml/Shell.qml:448
334334msgid ""
335335"If passphrase is entered incorrectly, your phone will conduct a factory "
336336"reset and all personal data will be deleted."
@@ -338,7 +338,7 @@ msgstr ""
338338"የተሳሳተ የማለፊያ ሐረግ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "
339339"ይጠፋል"
340340
341−#: qml/Shell.qml:472
341+#: qml/Shell.qml:449
342342msgid ""
343343"If passcode is entered incorrectly, your phone will conduct a factory reset "
344344"and all personal data will be deleted."
@@ -348,180 +348,183 @@ msgstr ""
348348
349349#: qml/Wizard/Page.qml:89
350350msgid "Back"
351−msgstr ""
351+msgstr "ወደ ኋላ"
352352
353353#: qml/Wizard/Pages/10-welcome.qml:27
354354msgid "Hi!"
355−msgstr ""
355+msgstr "ሰላም"
356356
357357#: qml/Wizard/Pages/10-welcome.qml:44
358358msgid "Welcome to your Ubuntu phone."
359−msgstr ""
359+msgstr "እንኳን ደህና መጡ ወደ እርስዎ ኡቡንቱ ስልክ"
360360
361361#: qml/Wizard/Pages/10-welcome.qml:52
362362msgid "Let’s get started."
363−msgstr ""
363+msgstr "ስራ እንጀምር"
364364
365365#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
366366#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
367367#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
368368#: qml/Wizard/Pages/passwd-set.qml:90
369369msgid "Continue"
370−msgstr ""
370+msgstr "ይቀጥሉ"
371371
372372#: qml/Wizard/Pages/20-sim.qml:25
373373msgid "Add a SIM card and restart your device"
374−msgstr ""
374+msgstr "የ ሲም ካርድ ይጨምሩ እና አካሉን እንደገና ያስነሱ"
375375
376376#: qml/Wizard/Pages/20-sim.qml:55
377377msgid "Without it, you won’t be able to make calls or use text messaging."
378−msgstr ""
378+msgstr "ያለ እሱ ጥሪ መፈጸም ወይንም የ ጽሁፍ መልእክት መላክ አይችሉም"
379379
380380#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
381381msgid "Skip"
382−msgstr ""
382+msgstr "መዝለያ"
383383
384384#: qml/Wizard/Pages/30-passwd-type.qml:39
385385msgid "Lock security"
386−msgstr ""
386+msgstr "ደህንነት መቆለፊያ"
387387
388388#: qml/Wizard/Pages/30-passwd-type.qml:74
389389msgid "Please select how you’d like to unlock your phone."
390−msgstr ""
390+msgstr "እባክዎን የ እርስዎን ስልክ እንዴት እንደሚከፍቱ ይምረጡ"
391391
392392#: qml/Wizard/Pages/30-passwd-type.qml:97
393393msgid "Swipe"
394−msgstr ""
394+msgstr "መጥረጊያ"
395395
396396#: qml/Wizard/Pages/30-passwd-type.qml:98
397397msgid "No security"
398−msgstr ""
398+msgstr "ደህንነት አልተገኘም"
399399
400400#: qml/Wizard/Pages/30-passwd-type.qml:100
401401msgid "Passcode"
402−msgstr ""
402+msgstr "ማለፊያ ኮድ"
403403
404404#: qml/Wizard/Pages/30-passwd-type.qml:101
405405msgid "4 digits only"
406−msgstr ""
406+msgstr "4 ዲጂትስ ብቻ"
407407
408408#: qml/Wizard/Pages/30-passwd-type.qml:103
409409msgid "Passphrase"
410−msgstr ""
410+msgstr "ማለፊያ ሐረግ"
411411
412412#: qml/Wizard/Pages/30-passwd-type.qml:104
413413msgid "Numbers and letters"
414−msgstr ""
414+msgstr "ቁጥሮች እና ፊደሎች"
415415
416416#: qml/Wizard/Pages/40-wifi.qml:28
417417msgid "Connect to Wi‑Fi"
418−msgstr ""
418+msgstr "ወደ ዋይ‑ፋይ መገናኛ"
419419
420420#: qml/Wizard/Pages/40-wifi.qml:147
421421msgid "Available networks…"
422−msgstr ""
422+msgstr "ዝግጁ ኔትዎርኮች…"
423423
424424#: qml/Wizard/Pages/40-wifi.qml:148
425425msgid "No available networks."
426−msgstr ""
426+msgstr "ዝግጁ ኔትዎርኮች አልተገኙም"
427427
428428#: qml/Wizard/Pages/50-location.qml:27
429429msgid "Location"
430−msgstr ""
430+msgstr "አካባቢ"
431431
432432#: qml/Wizard/Pages/50-location.qml:62
433433msgid "Let the phone detect your location:"
434−msgstr ""
434+msgstr "እባክዎን እርስዎ ያሉበትን አካባቢ ስልኩ እራሱ ይፈልግ:"
435435
436436#: qml/Wizard/Pages/50-location.qml:69
437437msgid "Using GPS only (less accurate)"
438−msgstr ""
438+msgstr "ጂፒኤስን ብቻ መጠቀሚያ(በጣም ቅርብ)"
439439
440440#: qml/Wizard/Pages/50-location.qml:86
441441msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
442−msgstr ""
442+msgstr "ይጠቀሙ ጂፒኤስ ግልጽ ያልሆነ ዋይ-ፋይ እና ተንቀሳቃሽ ኔትዎርክ መረጃ (ይመከራሉ)"
443443
444444#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
445445#: qml/Wizard/Pages/50-location.qml:103
446446msgid ""
447447"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
448448"conditions</a>."
449−msgstr ""
449+msgstr "ይህን ምርጫ በመምረጥ ተስማምቻለሁ ከ Nokia HERE <a href='#'>ውሎች እና ሁኔታዎች ጋር</a>."
450450
451451#: qml/Wizard/Pages/50-location.qml:112
452452msgid "Not at all"
453−msgstr ""
453+msgstr "አይደለም"
454454
455455#: qml/Wizard/Pages/50-location.qml:124
456456msgid "You can change your mind later in <b>System Settings</b>."
457−msgstr ""
457+msgstr "እርስዎ በኋላ መቀየር ይችላሉ ከ <b>ስርአት ማሰናጃዎች</b>."
458458
459459#: qml/Wizard/Pages/60-reporting.qml:24
460460msgid "Improving your experience"
461−msgstr ""
461+msgstr "የ እርስዎን ልምምድ ማሻሻያ"
462462
463463#: qml/Wizard/Pages/60-reporting.qml:36
464464msgid ""
465465"Your phone is set up to automatically report errors to Canonical and its "
466466"partners, the makers of the operating system."
467467msgstr ""
468+"የ እርስዎ ስልክ ራሱ በራሱ የ ስህተት መግለጫዎች ወደ Canonical and its partners, የ መስሪያ ስርአት "
469+"አምራቾች"
468470
469471#: qml/Wizard/Pages/60-reporting.qml:43
470472msgid ""
471473"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
472474"Privacy</b>"
473475msgstr ""
476+"ይህን ግልጋሎት ማሰናከል ይችላሉ ከ <b>ስርአት ማሰናጃዎች</b> under <b>Security &amp; Privacy</b>"
474477
475478#: qml/Wizard/Pages/80-finished.qml:24
476479msgid "All done"
477−msgstr ""
480+msgstr "ሁሉም ተፈጽሟል"
478481
479482#: qml/Wizard/Pages/80-finished.qml:39
480483msgid "Nice work!"
481−msgstr ""
484+msgstr "ጥሩ ሰርተዋል!"
482485
483486#: qml/Wizard/Pages/80-finished.qml:46
484487msgid "Your phone is now ready to use."
485−msgstr ""
488+msgstr "ስልኩ አሁን ለመጠቀም ዝግጁ ነው"
486489
487490#: qml/Wizard/Pages/80-finished.qml:53
488491msgid "Finish"
489−msgstr ""
492+msgstr "መጨረሻ"
490493
491494#: qml/Wizard/Pages/here-terms.qml:27
492495msgid "Terms & Conditions"
493−msgstr ""
496+msgstr "ውሎች & ሁኔታዎች"
494497
495498#: qml/Wizard/Pages/passwd-confirm.qml:49
496499msgid "Confirm passphrase"
497−msgstr ""
500+msgstr "የ ማለፊያ ሐረግ ማረጋገጫ"
498501
499502#: qml/Wizard/Pages/passwd-confirm.qml:50
500503msgid "Confirm passcode"
501−msgstr ""
504+msgstr "የማለፊያ ኮድ ማረጋገጫ"
502505
503506#: qml/Wizard/Pages/passwd-confirm.qml:53
504507#: qml/Wizard/Pages/passwd-confirm.qml:54
505508msgid "Please try again."
506−msgstr ""
509+msgstr "እባክዎን እንደገና ይሞክሩ"
507510
508511#: qml/Wizard/Pages/passwd-set.qml:61
509512msgid "Choose your passcode"
510−msgstr ""
513+msgstr "የ እርስዎን የማለፊያ ኮድ ይምረጡ"
511514
512515#: qml/Wizard/Pages/passwd-set.qml:68
513516msgid "Passphrase must be 4 characters long"
514−msgstr ""
517+msgstr "የ ማለፊያ ሀረግ ቢያንስ 4 ባህሪዎች መሆን አለበት"
515518
516519#: qml/Wizard/StackButton.qml:39
517520#, qt-format
518521msgid "〈 %1"
519−msgstr ""
522+msgstr "〈 %1"
520523
521524#: qml/Wizard/StackButton.qml:42
522525#, qt-format
523526msgid "%1 〉"
524−msgstr ""
527+msgstr "%1 〉"
525528
526529#~ msgid "Type or say a command"
527530#~ msgstr "ትእዛዝ ይናገሩ ወይንም ይጻፉ"
po/br.po+45−37
@@ -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-12-10 10:55+0100\n"
11−"PO-Revision-Date: 2014-12-10 07:14+0000\n"
11+"PO-Revision-Date: 2014-12-16 07:27+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-12-13 07:11+0000\n"
18+"X-Launchpad-Export-Date: 2014-12-17 07:06+0000\n"
1919"X-Generator: Launchpad (build 17286)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
@@ -358,98 +358,100 @@ msgstr ""
358358
359359#: qml/Wizard/Page.qml:89
360360msgid "Back"
361−msgstr ""
361+msgstr "Distreiñ"
362362
363363#: qml/Wizard/Pages/10-welcome.qml:27
364364msgid "Hi!"
365−msgstr ""
365+msgstr "Salud deoc'h !"
366366
367367#: qml/Wizard/Pages/10-welcome.qml:44
368368msgid "Welcome to your Ubuntu phone."
369−msgstr ""
369+msgstr "Deuet-mat oc'h en ho pellgomzer Ubuntu."
370370
371371#: qml/Wizard/Pages/10-welcome.qml:52
372372msgid "Let’s get started."
373−msgstr ""
373+msgstr "Krogomp ganti."
374374
375375#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
376376#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
377377#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
378378#: qml/Wizard/Pages/passwd-set.qml:90
379379msgid "Continue"
380−msgstr ""
380+msgstr "Kenderc'hel"
381381
382382#: qml/Wizard/Pages/20-sim.qml:25
383383msgid "Add a SIM card and restart your device"
384−msgstr ""
384+msgstr "Lakait ur gartenn SIM hag adloc'hit ho penveg"
385385
386386#: qml/Wizard/Pages/20-sim.qml:55
387387msgid "Without it, you won’t be able to make calls or use text messaging."
388−msgstr ""
388+msgstr "Ne vioc'h ket evit pellgomz pe kas kemennadennoù hepti."
389389
390390#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
391391msgid "Skip"
392−msgstr ""
392+msgstr "Tremen hebiou"
393393
394394#: qml/Wizard/Pages/30-passwd-type.qml:39
395395msgid "Lock security"
396−msgstr ""
396+msgstr "Surentez ar prennañ"
397397
398398#: qml/Wizard/Pages/30-passwd-type.qml:74
399399msgid "Please select how you’d like to unlock your phone."
400400msgstr ""
401+"Diuzit e peseurt mod e fell deoc'h dibrennañ ho pellgomzer, mar plij."
401402
402403#: qml/Wizard/Pages/30-passwd-type.qml:97
403404msgid "Swipe"
404−msgstr ""
405+msgstr "Riklañ"
405406
406407#: qml/Wizard/Pages/30-passwd-type.qml:98
407408msgid "No security"
408−msgstr ""
409+msgstr "Tamm surentez ebet"
409410
410411#: qml/Wizard/Pages/30-passwd-type.qml:100
411412msgid "Passcode"
412−msgstr ""
413+msgstr "Kod-tremen"
413414
414415#: qml/Wizard/Pages/30-passwd-type.qml:101
415416msgid "4 digits only"
416−msgstr ""
417+msgstr "4 sifr hepken"
417418
418419#: qml/Wizard/Pages/30-passwd-type.qml:103
419420msgid "Passphrase"
420−msgstr ""
421+msgstr "Frazenn-dremen"
421422
422423#: qml/Wizard/Pages/30-passwd-type.qml:104
423424msgid "Numbers and letters"
424−msgstr ""
425+msgstr "Sifroù ha lizherennoù"
425426
426427#: qml/Wizard/Pages/40-wifi.qml:28
427428msgid "Connect to Wi‑Fi"
428−msgstr ""
429+msgstr "Kevreañ ouzh ar Wi-Fi"
429430
430431#: qml/Wizard/Pages/40-wifi.qml:147
431432msgid "Available networks…"
432−msgstr ""
433+msgstr "Rouedadoù a c'haller kaout..."
433434
434435#: qml/Wizard/Pages/40-wifi.qml:148
435436msgid "No available networks."
436−msgstr ""
437+msgstr "N'eus rouedad ebet da gaout."
437438
438439#: qml/Wizard/Pages/50-location.qml:27
439440msgid "Location"
440−msgstr ""
441+msgstr "Lec'h"
441442
442443#: qml/Wizard/Pages/50-location.qml:62
443444msgid "Let the phone detect your location:"
444−msgstr ""
445+msgstr "Lezel ar pellgomzer da gavout pelec'h emaoc'h :"
445446
446447#: qml/Wizard/Pages/50-location.qml:69
447448msgid "Using GPS only (less accurate)"
448−msgstr ""
449+msgstr "Implijout ar GPS hepken (n'eo ket ken resis)"
449450
450451#: qml/Wizard/Pages/50-location.qml:86
451452msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
452453msgstr ""
454+"Implijout ar GPS, Wi-Fi dizanv pe titouroù ar rouedad kelligel (aliet)"
453455
454456#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
455457#: qml/Wizard/Pages/50-location.qml:103
@@ -457,81 +459,87 @@ msgid ""
457459"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
458460"conditions</a>."
459461msgstr ""
462+"Pa ziuzit an dibarzh-mañ ez asantit da <a href='#'>zivizoù implij</a> Nokia."
460463
461464#: qml/Wizard/Pages/50-location.qml:112
462465msgid "Not at all"
463−msgstr ""
466+msgstr "Tamm ebet"
464467
465468#: qml/Wizard/Pages/50-location.qml:124
466469msgid "You can change your mind later in <b>System Settings</b>."
467470msgstr ""
471+"Gallout a rit cheñch soñj diwezhatoc'h en <b>Arventennoù ar reizhad</b>."
468472
469473#: qml/Wizard/Pages/60-reporting.qml:24
470474msgid "Improving your experience"
471−msgstr ""
475+msgstr "Gwellaat ho skiant-prenet"
472476
473477#: qml/Wizard/Pages/60-reporting.qml:36
474478msgid ""
475479"Your phone is set up to automatically report errors to Canonical and its "
476480"partners, the makers of the operating system."
477481msgstr ""
482+"Arventennet eo ho pellgomzer evit titourañ ent emgefre ar fazioù da "
483+"gCanonical ha d'e gevelerien, ar re o deus savet ar reizhiad korvoiñ."
478484
479485#: qml/Wizard/Pages/60-reporting.qml:43
480486msgid ""
481487"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
482488"Privacy</b>"
483489msgstr ""
490+"Gallout a ra bezañ diweredekaet e-barzh <b>Arventennoù ar reizhiad</b> "
491+"dindan <b>Surentez &amp; Prevezded</b>"
484492
485493#: qml/Wizard/Pages/80-finished.qml:24
486494msgid "All done"
487−msgstr ""
495+msgstr "Echu penn-da-benn"
488496
489497#: qml/Wizard/Pages/80-finished.qml:39
490498msgid "Nice work!"
491−msgstr ""
499+msgstr "Gwellat labour !"
492500
493501#: qml/Wizard/Pages/80-finished.qml:46
494502msgid "Your phone is now ready to use."
495−msgstr ""
503+msgstr "Prest eo ho pellgomzer da vezañ implijet bremañ."
496504
497505#: qml/Wizard/Pages/80-finished.qml:53
498506msgid "Finish"
499−msgstr ""
507+msgstr "Echuiñ"
500508
501509#: qml/Wizard/Pages/here-terms.qml:27
502510msgid "Terms & Conditions"
503−msgstr ""
511+msgstr "Penndivizoù implij"
504512
505513#: qml/Wizard/Pages/passwd-confirm.qml:49
506514msgid "Confirm passphrase"
507−msgstr ""
515+msgstr "Kadarnaat ar frazenn-dremen"
508516
509517#: qml/Wizard/Pages/passwd-confirm.qml:50
510518msgid "Confirm passcode"
511−msgstr ""
519+msgstr "Kadarnaat ar c'hod-tremen"
512520
513521#: qml/Wizard/Pages/passwd-confirm.qml:53
514522#: qml/Wizard/Pages/passwd-confirm.qml:54
515523msgid "Please try again."
516−msgstr ""
524+msgstr "Esaeit en-dro, mar plij."
517525
518526#: qml/Wizard/Pages/passwd-set.qml:61
519527msgid "Choose your passcode"
520−msgstr ""
528+msgstr "Choaz ho kod-tremen"
521529
522530#: qml/Wizard/Pages/passwd-set.qml:68
523531msgid "Passphrase must be 4 characters long"
524−msgstr ""
532+msgstr "4 arouezenn a rank bezañ er frazenn-dremen"
525533
526534#: qml/Wizard/StackButton.qml:39
527535#, qt-format
528536msgid "〈 %1"
529−msgstr ""
537+msgstr "〈 %1"
530538
531539#: qml/Wizard/StackButton.qml:42
532540#, qt-format
533541msgid "%1 〉"
534−msgstr ""
542+msgstr "%1 〉"
535543
536544#~ msgid "Loading. Please Wait..."
537545#~ msgstr "O kargañ. Gortozit, mar plij..."
po/hu.po+106−98
@@ -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-12-10 10:55+0100\n"
11−"PO-Revision-Date: 2014-11-05 15:45+0000\n"
11+"PO-Revision-Date: 2014-12-21 15:13+0000\n"
1212"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"
1313"Language-Team: Hungarian <hu@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
18+"X-Launchpad-Export-Date: 2014-12-22 07:05+0000\n"
1919"X-Generator: Launchpad (build 17286)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
@@ -23,11 +23,11 @@ msgid "Password: "
2323msgstr "Jelszó: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:100
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2727msgid "Pin shortcut"
2828msgstr "Indító rögzítése"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:100
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3131msgid "Unpin shortcut"
3232msgstr "Indító feloldása"
3333
@@ -47,48 +47,48 @@ msgstr "A túl sok hibás jelkód próbálkozás miatt le lett zárva az eszköz
4747#, qt-format
4848msgid "Please wait %1 minute and then try again…"
4949msgid_plural "Please wait %1 minutes and then try again…"
50−msgstr[0] "Kérjük várjon %1 percet és próbálja újra…"
51−msgstr[1] "Kérjük várjon %1 percet és próbálja újra…"
50+msgstr[0] "Várjon %1 percet és próbálja újra…"
51+msgstr[1] "Várjon %1 percet és próbálja újra…"
5252
53−#: qml/Components/Dialogs.qml:70
53+#: qml/Components/Dialogs.qml:74
5454msgid "Log out"
5555msgstr "Kijelentkezés"
5656
57−#: qml/Components/Dialogs.qml:71
57+#: qml/Components/Dialogs.qml:75
5858msgid "Are you sure you want to log out?"
5959msgstr "Biztos benne, hogy kijelentkezik?"
6060
61−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
62−#: qml/Components/Dialogs.qml:122
61+#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
62+#: qml/Components/Dialogs.qml:126
6363msgid "No"
6464msgstr "Nem"
6565
66−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
67−#: qml/Components/Dialogs.qml:129
66+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
67+#: qml/Components/Dialogs.qml:133
6868msgid "Yes"
6969msgstr "Igen"
7070
71−#: qml/Components/Dialogs.qml:94
71+#: qml/Components/Dialogs.qml:98
7272msgid "Shut down"
7373msgstr "Leállítás"
7474
75−#: qml/Components/Dialogs.qml:95
75+#: qml/Components/Dialogs.qml:99
7676msgid "Are you sure you want to shut down?"
7777msgstr "Biztosan le szeretné állítani?"
7878
79−#: qml/Components/Dialogs.qml:119
79+#: qml/Components/Dialogs.qml:123
8080msgid "Reboot"
8181msgstr "Újraindítás"
8282
83−#: qml/Components/Dialogs.qml:120
83+#: qml/Components/Dialogs.qml:124
8484msgid "Are you sure you want to reboot?"
8585msgstr "Biztosan újra szeretné indítani?"
8686
87−#: qml/Components/Dialogs.qml:144
87+#: qml/Components/Dialogs.qml:148
8888msgid "Power"
8989msgstr "Kikapcsolás"
9090
91−#: qml/Components/Dialogs.qml:145
91+#: qml/Components/Dialogs.qml:149
9292msgid ""
9393"Are you sure you would like\n"
9494"to power off?"
@@ -96,15 +96,15 @@ msgstr ""
9696"Biztos benne, hogy ki\n"
9797"szeretné kapcsolni?"
9898
99−#: qml/Components/Dialogs.qml:147
99+#: qml/Components/Dialogs.qml:151
100100msgid "Power off"
101101msgstr "Kikapcsolás"
102102
103−#: qml/Components/Dialogs.qml:157
103+#: qml/Components/Dialogs.qml:161
104104msgid "Restart"
105105msgstr "Újraindítás"
106106
107−#: qml/Components/Dialogs.qml:167
107+#: qml/Components/Dialogs.qml:171
108108msgid "Cancel"
109109msgstr "Mégse"
110110
@@ -112,45 +112,45 @@ msgstr "Mégse"
112112msgid "Skip intro"
113113msgstr "A bemutató kihagyása"
114114
115−#: qml/Components/EdgeDemo.qml:125
115+#: qml/Components/EdgeDemo.qml:112
116116msgid "Right edge"
117117msgstr "Jobb szél"
118118
119−#: qml/Components/EdgeDemo.qml:126
119+#: qml/Components/EdgeDemo.qml:113
120120msgid "Try swiping from the right edge to unlock the phone"
121121msgstr "A telefon feloldásához csúsztassa ujját a jobb szélről"
122122
123−#: qml/Components/EdgeDemo.qml:157
123+#: qml/Components/EdgeDemo.qml:144
124124msgid "Top edge"
125125msgstr "Felső szél"
126126
127−#: qml/Components/EdgeDemo.qml:158
127+#: qml/Components/EdgeDemo.qml:145
128128msgid "Try swiping from the top edge to access the indicators"
129129msgstr "Az állapotmenük eléréséhez csúsztassa ujját a felső szélről"
130130
131−#: qml/Components/EdgeDemo.qml:183
131+#: qml/Components/EdgeDemo.qml:170
132132msgid "Close"
133133msgstr "Bezárás"
134134
135−#: qml/Components/EdgeDemo.qml:184
135+#: qml/Components/EdgeDemo.qml:171
136136msgid "Swipe up again to close the settings screen"
137137msgstr "A beállítások bezárásához csúsztassa ujját újra felfelé"
138138
139−#: qml/Components/EdgeDemo.qml:214
139+#: qml/Components/EdgeDemo.qml:201
140140msgid "Left edge"
141141msgstr "Bal szél"
142142
143−#: qml/Components/EdgeDemo.qml:215
143+#: qml/Components/EdgeDemo.qml:202
144144msgid "Swipe from the left to reveal the launcher for quick access to apps"
145145msgstr ""
146146"Csúsztassa ujját a bal szélről az indítón található alkalmazások gyors "
147147"eléréséhez"
148148
149−#: qml/Components/EdgeDemo.qml:242
149+#: qml/Components/EdgeDemo.qml:229
150150msgid "Well done"
151151msgstr "Rendben"
152152
153−#: qml/Components/EdgeDemo.qml:243
153+#: qml/Components/EdgeDemo.qml:230
154154msgid ""
155155"You have now mastered the edge gestures and can start using the "
156156"phone<br><br>Tap on the screen to start"
@@ -158,44 +158,44 @@ msgstr ""
158158"Elsajátította a gesztusokat, és megkezdheti a telefon "
159159"használatát.<br><br>Koppintson a képernyőre a kezdéshez."
160160
161−#: qml/Components/Lockscreen.qml:238
161+#: qml/Components/Lockscreen.qml:223
162162msgid "Return to Call"
163163msgstr "Vissza a híváshoz"
164164
165−#: qml/Components/Lockscreen.qml:238
165+#: qml/Components/Lockscreen.qml:223
166166msgid "Emergency Call"
167167msgstr "Vészhívás"
168168
169−#: qml/Components/Lockscreen.qml:270
169+#: qml/Components/Lockscreen.qml:255
170170msgid "OK"
171171msgstr "Ok"
172172
173−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
173+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
174174msgid "See less"
175175msgstr "Kevesebb"
176176
177−#: qml/Dash/GenericScopeView.qml:431
177+#: qml/Dash/GenericScopeView.qml:434
178178msgid "See all"
179179msgstr "Összes megtekintése"
180180
181−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
181+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:268
182182#: qml/Panel/SearchIndicator.qml:27
183183msgid "Search"
184184msgstr "Keresés"
185185
186−#: qml/Dash/PageHeader.qml:260
186+#: qml/Dash/PageHeader.qml:261
187187msgid "Store"
188188msgstr "Áruház"
189189
190−#: qml/Dash/PageHeader.qml:277
190+#: qml/Dash/PageHeader.qml:278
191191msgid "Settings"
192192msgstr "Beállítások"
193193
194−#: qml/Dash/PageHeader.qml:284
194+#: qml/Dash/PageHeader.qml:285
195195msgid "Remove from Favorites"
196196msgstr "Eltávolítás a kedvencek közül"
197197
198−#: qml/Dash/PageHeader.qml:284
198+#: qml/Dash/PageHeader.qml:285
199199msgid "Add to Favorites"
200200msgstr "Hozzáadás a kedvencekhez"
201201
@@ -229,15 +229,15 @@ msgstr "Engedje el a frissítéshez…"
229229
230230#: qml/Dash/ScopesList.qml:63
231231msgid "Manage"
232−msgstr ""
232+msgstr "Kezelés"
233233
234234#: qml/Dash/ScopesList.qml:107
235235msgid "Home"
236−msgstr ""
236+msgstr "Kezdőlapon"
237237
238238#: qml/Dash/ScopesList.qml:108
239239msgid "Also installed"
240−msgstr ""
240+msgstr "Szintén telepítve"
241241
242242#: qml/Greeter/Greeter.qml:174
243243msgid "Unlock"
@@ -291,49 +291,49 @@ msgstr "SIM feloldása"
291291msgid "Roaming"
292292msgstr "Barangolás"
293293
294−#: qml/Shell.qml:367
294+#: qml/Shell.qml:402
295295#, qt-format
296296msgid "Enter %1"
297297msgstr "Adja meg: %1"
298298
299−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
299+#: qml/Shell.qml:394
300300msgid "Enter passphrase"
301301msgstr "Jelmondat megadása"
302302
303−#: qml/Shell.qml:369
303+#: qml/Shell.qml:398
304304msgid "Enter passcode"
305305msgstr "Jelkód megadása"
306306
307−#: qml/Shell.qml:370
307+#: qml/Shell.qml:403
308308#, qt-format
309309msgid "Sorry, incorrect %1"
310−msgstr "Sajnáljuk, helytelen %1"
310+msgstr "Sajnálom, helytelen %1"
311311
312−#: qml/Shell.qml:371
312+#: qml/Shell.qml:395
313313msgid "Sorry, incorrect passphrase"
314−msgstr "Sajnáljuk, helytelen jelmondat"
314+msgstr "Sajnálom, helytelen jelmondat"
315315
316−#: qml/Shell.qml:372
316+#: qml/Shell.qml:396
317317msgid "Please re-enter"
318−msgstr "Kérjük próbálja újra"
318+msgstr "Próbálja újra"
319319
320−#: qml/Shell.qml:373
320+#: qml/Shell.qml:399
321321msgid "Sorry, incorrect passcode"
322−msgstr "Sajnáljuk, helytelen jelkód"
322+msgstr "Sajnálom, helytelen jelkód"
323323
324−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
324+#: qml/Shell.qml:444
325325msgid "Sorry, incorrect passphrase."
326−msgstr "Sajnáljuk, helytelen jelmondat."
326+msgstr "Sajnálom, helytelen jelmondat."
327327
328−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
328+#: qml/Shell.qml:445
329329msgid "Sorry, incorrect passcode."
330−msgstr "Sajnáljuk, helytelen jelkód."
330+msgstr "Sajnálom, helytelen jelkód."
331331
332−#: qml/Shell.qml:469
332+#: qml/Shell.qml:446
333333msgid "This will be your last attempt."
334334msgstr "Ez az utolsó próbálkozási lehetősége."
335335
336−#: qml/Shell.qml:471
336+#: qml/Shell.qml:448
337337msgid ""
338338"If passphrase is entered incorrectly, your phone will conduct a factory "
339339"reset and all personal data will be deleted."
@@ -341,7 +341,7 @@ msgstr ""
341341"Ha helytelen jelmondatot ad meg, a telefonja visszaállítja a gyári "
342342"beállításokat és törli minden személyes adatát."
343343
344−#: qml/Shell.qml:472
344+#: qml/Shell.qml:449
345345msgid ""
346346"If passcode is entered incorrectly, your phone will conduct a factory reset "
347347"and all personal data will be deleted."
@@ -351,98 +351,100 @@ msgstr ""
351351
352352#: qml/Wizard/Page.qml:89
353353msgid "Back"
354−msgstr ""
354+msgstr "Vissza"
355355
356356#: qml/Wizard/Pages/10-welcome.qml:27
357357msgid "Hi!"
358−msgstr ""
358+msgstr "Üdv!"
359359
360360#: qml/Wizard/Pages/10-welcome.qml:44
361361msgid "Welcome to your Ubuntu phone."
362−msgstr ""
362+msgstr "Üdvözöljük az Ubuntu telefonos változatában."
363363
364364#: qml/Wizard/Pages/10-welcome.qml:52
365365msgid "Let’s get started."
366−msgstr ""
366+msgstr "Kezdjünk is bele."
367367
368368#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
369369#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
370370#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
371371#: qml/Wizard/Pages/passwd-set.qml:90
372372msgid "Continue"
373−msgstr ""
373+msgstr "Folytatás"
374374
375375#: qml/Wizard/Pages/20-sim.qml:25
376376msgid "Add a SIM card and restart your device"
377−msgstr ""
377+msgstr "Helyezzen be egy SIM kártyát és indítsa újra az eszközét"
378378
379379#: qml/Wizard/Pages/20-sim.qml:55
380380msgid "Without it, you won’t be able to make calls or use text messaging."
381381msgstr ""
382+"Anélkül nem indíthat vagy fogadhat hívásokat és nem küldhet vagy fogadhat "
383+"üzeneteket."
382384
383385#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
384386msgid "Skip"
385−msgstr ""
387+msgstr "Kihagyás"
386388
387389#: qml/Wizard/Pages/30-passwd-type.qml:39
388390msgid "Lock security"
389−msgstr ""
391+msgstr "Képernyőzárolás"
390392
391393#: qml/Wizard/Pages/30-passwd-type.qml:74
392394msgid "Please select how you’d like to unlock your phone."
393−msgstr ""
395+msgstr "Válassza ki, hogy milyen módon kívánja feloldani a telefonját."
394396
395397#: qml/Wizard/Pages/30-passwd-type.qml:97
396398msgid "Swipe"
397−msgstr ""
399+msgstr "Csúsztatás"
398400
399401#: qml/Wizard/Pages/30-passwd-type.qml:98
400402msgid "No security"
401−msgstr ""
403+msgstr "Nem biztonságos"
402404
403405#: qml/Wizard/Pages/30-passwd-type.qml:100
404406msgid "Passcode"
405−msgstr ""
407+msgstr "Jelkód"
406408
407409#: qml/Wizard/Pages/30-passwd-type.qml:101
408410msgid "4 digits only"
409−msgstr ""
411+msgstr "4 számjegy"
410412
411413#: qml/Wizard/Pages/30-passwd-type.qml:103
412414msgid "Passphrase"
413−msgstr ""
415+msgstr "Jelmondat"
414416
415417#: qml/Wizard/Pages/30-passwd-type.qml:104
416418msgid "Numbers and letters"
417−msgstr ""
419+msgstr "Betűk és számok"
418420
419421#: qml/Wizard/Pages/40-wifi.qml:28
420422msgid "Connect to Wi‑Fi"
421−msgstr ""
423+msgstr "Csatlakozás Wi-Fi hálózathoz"
422424
423425#: qml/Wizard/Pages/40-wifi.qml:147
424426msgid "Available networks…"
425−msgstr ""
427+msgstr "Elérhető hálózatok…"
426428
427429#: qml/Wizard/Pages/40-wifi.qml:148
428430msgid "No available networks."
429−msgstr ""
431+msgstr "Nincsenek elérhető hálózatok."
430432
431433#: qml/Wizard/Pages/50-location.qml:27
432434msgid "Location"
433−msgstr ""
435+msgstr "Tartózkodási hely"
434436
435437#: qml/Wizard/Pages/50-location.qml:62
436438msgid "Let the phone detect your location:"
437−msgstr ""
439+msgstr "A telefon megpróbálja megállapítani az Ön tartózkodási helyét:"
438440
439441#: qml/Wizard/Pages/50-location.qml:69
440442msgid "Using GPS only (less accurate)"
441−msgstr ""
443+msgstr "Csak GPS használata (kevésbé pontos)"
442444
443445#: qml/Wizard/Pages/50-location.qml:86
444446msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
445−msgstr ""
447+msgstr "GPS és névtelen Wi-Fi és mobilhálózati adatok (ajánlott)"
446448
447449#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
448450#: qml/Wizard/Pages/50-location.qml:103
@@ -450,6 +452,8 @@ msgid ""
450452"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
451453"conditions</a>."
452454msgstr ""
455+"A lehetőség kiválasztásával elfogadja a Nokia HERE <a href='#'>felhasználási "
456+"feltételeit</a>."
453457
454458#: qml/Wizard/Pages/50-location.qml:112
455459msgid "Not at all"
@@ -457,74 +461,78 @@ msgstr ""
457461
458462#: qml/Wizard/Pages/50-location.qml:124
459463msgid "You can change your mind later in <b>System Settings</b>."
460−msgstr ""
464+msgstr "Ezt később a <b>Rendszerbeállítások</b> alatt módosíthatja."
461465
462466#: qml/Wizard/Pages/60-reporting.qml:24
463467msgid "Improving your experience"
464−msgstr ""
468+msgstr "Javítson az élményen"
465469
466470#: qml/Wizard/Pages/60-reporting.qml:36
467471msgid ""
468472"Your phone is set up to automatically report errors to Canonical and its "
469473"partners, the makers of the operating system."
470474msgstr ""
475+"A telefonja automatikus hibajelentéseket küld az operációs rendszert készítő "
476+"Canonical, és annak partnerei felé."
471477
472478#: qml/Wizard/Pages/60-reporting.qml:43
473479msgid ""
474480"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
475481"Privacy</b>"
476482msgstr ""
483+"Ezt kikapcsolhatja a <b>Rendszerbeállítások</b> alatt található <b>Biztonság "
484+"és adatvédelem</b> alatt"
477485
478486#: qml/Wizard/Pages/80-finished.qml:24
479487msgid "All done"
480−msgstr ""
488+msgstr "Készen van"
481489
482490#: qml/Wizard/Pages/80-finished.qml:39
483491msgid "Nice work!"
484−msgstr ""
492+msgstr "Szép munka!"
485493
486494#: qml/Wizard/Pages/80-finished.qml:46
487495msgid "Your phone is now ready to use."
488−msgstr ""
496+msgstr "A telefonja készen áll a használatra."
489497
490498#: qml/Wizard/Pages/80-finished.qml:53
491499msgid "Finish"
492−msgstr ""
500+msgstr "Befejezés"
493501
494502#: qml/Wizard/Pages/here-terms.qml:27
495503msgid "Terms & Conditions"
496−msgstr ""
504+msgstr "Felhasználási feltételek"
497505
498506#: qml/Wizard/Pages/passwd-confirm.qml:49
499507msgid "Confirm passphrase"
500−msgstr ""
508+msgstr "Jelmondat megerősítése"
501509
502510#: qml/Wizard/Pages/passwd-confirm.qml:50
503511msgid "Confirm passcode"
504−msgstr ""
512+msgstr "Jelkód megerősítése"
505513
506514#: qml/Wizard/Pages/passwd-confirm.qml:53
507515#: qml/Wizard/Pages/passwd-confirm.qml:54
508516msgid "Please try again."
509−msgstr ""
517+msgstr "Próbálja újra."
510518
511519#: qml/Wizard/Pages/passwd-set.qml:61
512520msgid "Choose your passcode"
513−msgstr ""
521+msgstr "Jelkód kiválasztása"
514522
515523#: qml/Wizard/Pages/passwd-set.qml:68
516524msgid "Passphrase must be 4 characters long"
517−msgstr ""
525+msgstr "A jelmondat legalább 4 karakter hosszú legyen"
518526
519527#: qml/Wizard/StackButton.qml:39
520528#, qt-format
521529msgid "〈 %1"
522−msgstr ""
530+msgstr "〈 %1"
523531
524532#: qml/Wizard/StackButton.qml:42
525533#, qt-format
526534msgid "%1 〉"
527−msgstr ""
535+msgstr "%1 〉"
528536
529537#~ msgid "Confirm"
530538#~ msgstr "Megerősítés"
qml/Dash/DashNavigationButton.qml+10−20
@@ -188,36 +188,26 @@ AbstractButton {
188188 visible: root.showList
189189 }
190190
191+ property bool isFirstLoad: false
191192 onScopeChanged: {
192− setNewNavigation();
193+ navigationModel.clear();
194+ isFirstLoad = true;
193195 }
194−
195196 function setNewNavigation() {
196− navigationModel.clear();
197− if (scope && scope[hasNavigation]) {
198− var navigation = getNavigation(scope[currentNavigationId]);
199− if (navigation.count > 0) {
197+ if (isFirstLoad && currentNavigation && currentNavigation.loaded) {
198+ isFirstLoad = false;
199+ if (currentNavigation.count > 0) {
200200 navigationModel.append({"navigationId": scope[currentNavigationId], "nullifyNavigation": false});
201201 } else {
202− navigationModel.append({"navigationId": navigation.parentNavigationId, "nullifyNavigation": false});
202+ navigationModel.append({"navigationId": currentNavigation.parentNavigationId, "nullifyNavigation": false});
203203 }
204204 }
205205 }
206−
207206 Connections {
208− target: scope
209− // This is duplicated since we can't have something based on the dynamic hasNavigation string property
210− onHasNavigationChanged: {
211− if (!root.isAltNavigation) {
212− setNewNavigation();
213− }
214− }
215− onHasAltNavigationChanged: {
216− if (root.isAltNavigation) {
217− setNewNavigation();
218− }
219− }
207+ target: currentNavigation
208+ onLoadedChanged: setNewNavigation();
220209 }
210+ onCurrentNavigationChanged: setNewNavigation();
221211
222212 InverseMouseArea {
223213 anchors.fill: navigationListView
qml/Dash/ScopesListCategoryItem.qml+3−2
@@ -61,12 +61,12 @@ MouseArea {
6161 anchors {
6262 left: shape.right
6363 leftMargin: units.gu(1)
64− right: starArea.right
65− rightMargin: units.gu(1)
64+ right: starArea.left
6665 verticalCenter: parent.verticalCenter
6766 }
6867 Label {
6968 id: titleLabel
69+ Layout.fillWidth: true
7070 elide: Text.ElideRight
7171 wrapMode: Text.Wrap
7272 maximumLineCount: 1
@@ -74,6 +74,7 @@ MouseArea {
7474 }
7575 Label {
7676 id: subtitleLabel
77+ Layout.fillWidth: true
7778 elide: Text.ElideRight
7879 fontSize: "xx-small"
7980 wrapMode: Text.Wrap
tests/mocks/Unity/fake_navigation.cpp+1−1
@@ -88,7 +88,7 @@ bool Navigation::hidden() const
8888
8989int Navigation::rowCount(const QModelIndex & /*parent*/) const
9090{
91− if (!m_loaded || m_navigationId.startsWith("child") || m_navigationId == "middle3")
91+ if (!m_loaded || m_navigationId.startsWith("child") || m_navigationId.startsWith("altrootChild") || m_navigationId == "middle3")
9292 return 0;
9393 else
9494 return 8;
tests/mocks/Unity/fake_scope.cpp+2−7
@@ -36,7 +36,7 @@ Scope::Scope(QString const& id, QString const& name, bool favorite, Scopes* pare
3636 , m_favorite(favorite)
3737 , m_isActive(false)
3838 , m_currentNavigationId("root")
39− , m_currentAltNavigationId("altroot")
39+ , m_currentAltNavigationId("altrootChild1")
4040 , m_previewRendererName("preview-generic")
4141 , m_categories(new Categories(categories, this))
4242 , m_openScope(nullptr)
@@ -297,12 +297,7 @@ unity::shell::scopes::NavigationInterface* Scope::getAltNavigation(QString const
297297 parentId = "altroot";
298298 parentLabel = "altroot";
299299 }
300− auto result = new Navigation(id, id, "all"+id, parentId, parentLabel, this);
301− if (id == "altroot") {
302− m_currentAltNavigationId = "altrootChild1";
303− Q_EMIT currentAltNavigationIdChanged();
304− }
305− return result;
300+ return new Navigation(id, id, "all"+id, parentId, parentLabel, this);
306301}
307302
308303void Scope::setNavigationState(const QString &navigationId, bool isAltNavigation)
tests/mocks/Unity/fake_scopes.cpp+1−1
@@ -52,7 +52,7 @@ void Scopes::updateScopes()
5252 addScope(new Scope("MockScope1", "People", true, this));
5353 addScope(new Scope("MockScope2", "Music", false, this));
5454 addScope(new Scope("clickscope", "Apps", true, this));
55− addScope(new Scope("MockScope5", "Videos", true, this));
55+ addScope(new Scope("MockScope5", "Videos this is long ab cd ef gh ij kl", true, this));
5656 addScope(new Scope("SingleCategoryScope", "Single", true, this, 1));
5757 addScope(new Scope("MockScope4", "MS4", true, this));
5858 addScope(new Scope("MockScope6", "MS6", true, this));
tests/mocks/Unity/fake_scopesoverview.cpp+1−1
@@ -305,7 +305,7 @@ QVariant ScopesOverviewResultsModel::data(const QModelIndex& index, int role) co
305305 case RoleTitle:
306306 return scope ? scope->name() : QString("Title.%1.%2").arg(categoryId()).arg(index.row());
307307 case RoleSubtitle:
308− return scope && scope->name() == "Videos" ? "tube, movies, cinema" : QString();
308+ return scope && scope->name() == "Videos this is long ab cd ef gh ij kl" ? "tube, movies, cinema, pictures, art, moving images, magic in a box" : QString();
309309 case RoleArt:
310310 return qmlDirectory() + "graphics/applicationIcons/dash.png";
311311 case RoleMascot:
tests/qmltests/Dash/tst_DashContent.qml+13−6
@@ -288,12 +288,14 @@ Item {
288288 var dashNavigationButton = findChild(dashContentList.currentItem, "navigationButton");
289289 compare(dashNavigationButton.showList, false);
290290 waitForRendering(dashNavigationButton);
291− mouseClick(dashNavigationButton, 0, 0);
291+ mouseClick(dashNavigationButton, dashNavigationButton.width / 2, dashNavigationButton.height / 2);
292292 compare(dashNavigationButton.showList, true);
293293
294294 var navigationListView = findChild(dashNavigationButton, "navigationListView");
295− compare(navigationListView.count, 1);
296− tryCompare(navigationListView.currentItem.navigation, "loaded", true);
295+ tryCompareFunction(function() {
296+ return navigationListView.currentItem &&
297+ navigationListView.currentItem.navigation &&
298+ navigationListView.currentItem.navigation.loaded; }, true);
297299
298300 waitForRendering(navigationListView);
299301 waitForRendering(navigationListView.currentItem);
@@ -410,8 +412,10 @@ Item {
410412 compare(dashNavigationButton.showList, true);
411413
412414 var navigationListView = findChild(dashNavigationButton, "navigationListView");
413− compare(navigationListView.count, 1);
414− tryCompare(navigationListView.currentItem.navigation, "loaded", true);
415+ tryCompareFunction(function() {
416+ return navigationListView.currentItem &&
417+ navigationListView.currentItem.navigation &&
418+ navigationListView.currentItem.navigation.loaded; }, true);
415419
416420 waitForRendering(navigationListView);
417421 waitForRendering(navigationListView.currentItem);
@@ -475,7 +479,10 @@ Item {
475479 compare(dashAltNavigationButton.showList, true);
476480
477481 var navigationListView = findChild(dashAltNavigationButton, "navigationListView");
478− tryCompare(navigationListView.currentItem.navigation, "loaded", true);
482+ tryCompareFunction(function() {
483+ return navigationListView.currentItem &&
484+ navigationListView.currentItem.navigation &&
485+ navigationListView.currentItem.navigation.loaded; }, true);
479486
480487 var blackRect = findChild(dashNavigation, "blackRect");
481488 tryCompare(blackRect, "opacity", 0.5);