git.iko.soy/unity8
on xenial help sign in
Merged with trunk.
commit9ecb29f713da56624975d678b73abd20f039d7b3 authorMirco Müller <mirco.mueller@ubuntu.com> dateMon 26 Jan 2015, 13:19 (12 years ago) parente2781710af2085
14 files changed+527−265
compare with xenial
unifiedsplit
debian/changelog+25 po/en_AU.po+100−94 po/en_GB.po+47−41 po/eu.po+51−43 po/pt.po+30−29 qml/Dash/Previews/PreviewTable.qml+6 qml/Shell.qml+15−3 qml/Stages/DesktopStage.qml+8−44 qml/Stages/WindowMoveResizeArea.qml+98 tests/mocks/LightDM/CMakeLists.txt+1−2 tests/plugins/LightDM/CMakeLists.txt+1−4 tests/qmltests/CMakeLists.txt+1 tests/qmltests/Dash/Previews/tst_PreviewTable.qml+6−5 tests/qmltests/Stages/tst_WindowMoveResizeArea.qml+138
debian/changelog+25
@@ -1,3 +1,28 @@
1+unity8 (8.02+15.04.20150121.2-0ubuntu1) vivid; urgency=low
2+
3+ [ Michael Terry ]
4+ * Don't show any power dialogs while the screen is off. This is a
5+ band-aid to avoid the symptom, while we still investigate the source
6+ of why the screen doesn't turn on (and why we seem to not handle the
7+ power-button-release event). (LP: #1409003, #1410830)
8+ * Don't refocus the dialer-app when a call is started by the user.
9+ Because of how qtmir works, this would cause the dialer-app to
10+ unfocus momentarily, causing interface oddities for the user. (LP:
11+ #1413065)
12+
13+ [ CI Train Bot ]
14+ * Resync trunk
15+
16+ [ Albert Astals Cid ]
17+ * Build with ninja
18+ * Fixes for Table Preview Widget (LP: #1410420)
19+
20+ [ Michael Zanetti ]
21+ * Add support for earpiece media buttons (LP: #1398427)
22+ * Add a WindowMoveResizeArea and tests for it
23+
24+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 21 Jan 2015 18:33:18 +0000
25+
126unity8 (8.02+15.04.20150113.1-0ubuntu1) vivid; urgency=low
227
328 [ Andrea Cimitan ]
po/en_AU.po+100−94
@@ -8,26 +8,26 @@ 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-10-12 09:41+0000\n"
11+"PO-Revision-Date: 2015-01-25 05:57+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"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19−"X-Generator: Launchpad (build 17286)\n"
18+"X-Launchpad-Export-Date: 2015-01-26 06:54+0000\n"
19+"X-Generator: Launchpad (build 17306)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Password: "
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 "Pin shortcut"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:100
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3131msgid "Unpin shortcut"
3232msgstr "Unpin shortcut"
3333
@@ -50,45 +50,45 @@ msgid_plural "Please wait %1 minutes and then try again…"
5050msgstr[0] "Please wait %1 minute and then try again…"
5151msgstr[1] "Please wait %1 minutes and then try again…"
5252
53−#: qml/Components/Dialogs.qml:70
53+#: qml/Components/Dialogs.qml:74
5454msgid "Log out"
5555msgstr "Log out"
5656
57−#: qml/Components/Dialogs.qml:71
57+#: qml/Components/Dialogs.qml:75
5858msgid "Are you sure you want to log out?"
5959msgstr "Are you sure you want to log out?"
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 "No"
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 "Yes"
7070
71−#: qml/Components/Dialogs.qml:94
71+#: qml/Components/Dialogs.qml:98
7272msgid "Shut down"
7373msgstr "Shut down"
7474
75−#: qml/Components/Dialogs.qml:95
75+#: qml/Components/Dialogs.qml:99
7676msgid "Are you sure you want to shut down?"
7777msgstr "Are you sure you want to shut down?"
7878
79−#: qml/Components/Dialogs.qml:119
79+#: qml/Components/Dialogs.qml:123
8080msgid "Reboot"
8181msgstr "Reboot"
8282
83−#: qml/Components/Dialogs.qml:120
83+#: qml/Components/Dialogs.qml:124
8484msgid "Are you sure you want to reboot?"
8585msgstr "Are you sure you want to reboot?"
8686
87−#: qml/Components/Dialogs.qml:144
87+#: qml/Components/Dialogs.qml:148
8888msgid "Power"
8989msgstr "Power"
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"Are you sure you would like\n"
9797"to power off?"
9898
99−#: qml/Components/Dialogs.qml:147
99+#: qml/Components/Dialogs.qml:151
100100msgid "Power off"
101101msgstr "Power off"
102102
103−#: qml/Components/Dialogs.qml:157
103+#: qml/Components/Dialogs.qml:161
104104msgid "Restart"
105105msgstr "Restart"
106106
107−#: qml/Components/Dialogs.qml:167
107+#: qml/Components/Dialogs.qml:171
108108msgid "Cancel"
109109msgstr "Cancel"
110110
@@ -112,43 +112,43 @@ msgstr "Cancel"
112112msgid "Skip intro"
113113msgstr "Skip intro"
114114
115−#: qml/Components/EdgeDemo.qml:125
115+#: qml/Components/EdgeDemo.qml:112
116116msgid "Right edge"
117117msgstr "Right edge"
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 "Try swiping from the right edge to unlock the phone"
122122
123−#: qml/Components/EdgeDemo.qml:157
123+#: qml/Components/EdgeDemo.qml:144
124124msgid "Top edge"
125125msgstr "Top edge"
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 "Try swiping from the top edge to access the indicators"
130130
131−#: qml/Components/EdgeDemo.qml:183
131+#: qml/Components/EdgeDemo.qml:170
132132msgid "Close"
133133msgstr "Close"
134134
135−#: qml/Components/EdgeDemo.qml:184
135+#: qml/Components/EdgeDemo.qml:171
136136msgid "Swipe up again to close the settings screen"
137137msgstr "Swipe up again to close the settings screen"
138138
139−#: qml/Components/EdgeDemo.qml:214
139+#: qml/Components/EdgeDemo.qml:201
140140msgid "Left edge"
141141msgstr "Left edge"
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 "Swipe from the left to reveal the launcher for quick access to apps"
146146
147−#: qml/Components/EdgeDemo.qml:242
147+#: qml/Components/EdgeDemo.qml:229
148148msgid "Well done"
149149msgstr "Well done"
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"
@@ -156,44 +156,44 @@ msgstr ""
156156"You have now mastered the edge gestures and can start using the "
157157"phone<br><br>Tap on the screen to start"
158158
159−#: qml/Components/Lockscreen.qml:238
159+#: qml/Components/Lockscreen.qml:223
160160msgid "Return to Call"
161−msgstr ""
161+msgstr "Return to Call"
162162
163−#: qml/Components/Lockscreen.qml:238
163+#: qml/Components/Lockscreen.qml:223
164164msgid "Emergency Call"
165165msgstr "Emergency Call"
166166
167−#: qml/Components/Lockscreen.qml:270
167+#: qml/Components/Lockscreen.qml:255
168168msgid "OK"
169169msgstr "OK"
170170
171−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
171+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
172172msgid "See less"
173173msgstr "See less"
174174
175−#: qml/Dash/GenericScopeView.qml:431
175+#: qml/Dash/GenericScopeView.qml:434
176176msgid "See all"
177177msgstr "See all"
178178
179−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
179+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:268
180180#: qml/Panel/SearchIndicator.qml:27
181181msgid "Search"
182182msgstr "Search"
183183
184−#: qml/Dash/PageHeader.qml:260
184+#: qml/Dash/PageHeader.qml:261
185185msgid "Store"
186186msgstr "Store"
187187
188−#: qml/Dash/PageHeader.qml:277
188+#: qml/Dash/PageHeader.qml:278
189189msgid "Settings"
190190msgstr "Settings"
191191
192−#: qml/Dash/PageHeader.qml:284
192+#: qml/Dash/PageHeader.qml:285
193193msgid "Remove from Favorites"
194194msgstr "Remove from Favourites"
195195
196−#: qml/Dash/PageHeader.qml:284
196+#: qml/Dash/PageHeader.qml:285
197197msgid "Add to Favorites"
198198msgstr "Add to Favourites"
199199
@@ -227,15 +227,15 @@ msgstr "Release to refresh…"
227227
228228#: qml/Dash/ScopesList.qml:63
229229msgid "Manage"
230−msgstr ""
230+msgstr "Manage"
231231
232232#: qml/Dash/ScopesList.qml:107
233233msgid "Home"
234−msgstr ""
234+msgstr "Home"
235235
236236#: qml/Dash/ScopesList.qml:108
237237msgid "Also installed"
238−msgstr ""
238+msgstr "Also installed"
239239
240240#: qml/Greeter/Greeter.qml:174
241241msgid "Unlock"
@@ -289,49 +289,49 @@ msgstr "Unlock SIM"
289289msgid "Roaming"
290290msgstr "Roaming"
291291
292−#: qml/Shell.qml:367
292+#: qml/Shell.qml:402
293293#, qt-format
294294msgid "Enter %1"
295295msgstr "Enter %1"
296296
297−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
297+#: qml/Shell.qml:394
298298msgid "Enter passphrase"
299299msgstr "Enter passphrase"
300300
301−#: qml/Shell.qml:369
301+#: qml/Shell.qml:398
302302msgid "Enter passcode"
303303msgstr "Enter passcode"
304304
305−#: qml/Shell.qml:370
305+#: qml/Shell.qml:403
306306#, qt-format
307307msgid "Sorry, incorrect %1"
308308msgstr "Sorry, incorrect %1"
309309
310−#: qml/Shell.qml:371
310+#: qml/Shell.qml:395
311311msgid "Sorry, incorrect passphrase"
312312msgstr "Sorry, incorrect passphrase"
313313
314−#: qml/Shell.qml:372
314+#: qml/Shell.qml:396
315315msgid "Please re-enter"
316316msgstr "Please re-enter"
317317
318−#: qml/Shell.qml:373
318+#: qml/Shell.qml:399
319319msgid "Sorry, incorrect passcode"
320320msgstr "Sorry, incorrect passcode"
321321
322−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
322+#: qml/Shell.qml:444
323323msgid "Sorry, incorrect passphrase."
324324msgstr "Sorry, incorrect passphrase."
325325
326−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
326+#: qml/Shell.qml:445
327327msgid "Sorry, incorrect passcode."
328328msgstr "Sorry, incorrect passcode."
329329
330−#: qml/Shell.qml:469
330+#: qml/Shell.qml:446
331331msgid "This will be your last attempt."
332332msgstr "This will be your last attempt."
333333
334−#: qml/Shell.qml:471
334+#: qml/Shell.qml:448
335335msgid ""
336336"If passphrase is entered incorrectly, your phone will conduct a factory "
337337"reset and all personal data will be deleted."
@@ -339,7 +339,7 @@ msgstr ""
339339"If passphrase is entered incorrectly, your phone will conduct a factory "
340340"reset and all personal data will be deleted."
341341
342−#: qml/Shell.qml:472
342+#: qml/Shell.qml:449
343343msgid ""
344344"If passcode is entered incorrectly, your phone will conduct a factory reset "
345345"and all personal data will be deleted."
@@ -349,98 +349,98 @@ msgstr ""
349349
350350#: qml/Wizard/Page.qml:89
351351msgid "Back"
352−msgstr ""
352+msgstr "Back"
353353
354354#: qml/Wizard/Pages/10-welcome.qml:27
355355msgid "Hi!"
356−msgstr ""
356+msgstr "Hi!"
357357
358358#: qml/Wizard/Pages/10-welcome.qml:44
359359msgid "Welcome to your Ubuntu phone."
360−msgstr ""
360+msgstr "Welcome to your Ubuntu phone."
361361
362362#: qml/Wizard/Pages/10-welcome.qml:52
363363msgid "Let’s get started."
364−msgstr ""
364+msgstr "Let’s get started."
365365
366366#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
367367#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
368368#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
369369#: qml/Wizard/Pages/passwd-set.qml:90
370370msgid "Continue"
371−msgstr ""
371+msgstr "Continue"
372372
373373#: qml/Wizard/Pages/20-sim.qml:25
374374msgid "Add a SIM card and restart your device"
375−msgstr ""
375+msgstr "Add a SIM card and restart your device"
376376
377377#: qml/Wizard/Pages/20-sim.qml:55
378378msgid "Without it, you won’t be able to make calls or use text messaging."
379−msgstr ""
379+msgstr "Without it, you won’t be able to make calls or use text messaging."
380380
381381#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
382382msgid "Skip"
383−msgstr ""
383+msgstr "Skip"
384384
385385#: qml/Wizard/Pages/30-passwd-type.qml:39
386386msgid "Lock security"
387−msgstr ""
387+msgstr "Lock security"
388388
389389#: qml/Wizard/Pages/30-passwd-type.qml:74
390390msgid "Please select how you’d like to unlock your phone."
391−msgstr ""
391+msgstr "Please select how you’d like to unlock your phone."
392392
393393#: qml/Wizard/Pages/30-passwd-type.qml:97
394394msgid "Swipe"
395−msgstr ""
395+msgstr "Swipe"
396396
397397#: qml/Wizard/Pages/30-passwd-type.qml:98
398398msgid "No security"
399−msgstr ""
399+msgstr "No security"
400400
401401#: qml/Wizard/Pages/30-passwd-type.qml:100
402402msgid "Passcode"
403−msgstr ""
403+msgstr "Passcode"
404404
405405#: qml/Wizard/Pages/30-passwd-type.qml:101
406406msgid "4 digits only"
407−msgstr ""
407+msgstr "4 digits only"
408408
409409#: qml/Wizard/Pages/30-passwd-type.qml:103
410410msgid "Passphrase"
411−msgstr ""
411+msgstr "Passphrase"
412412
413413#: qml/Wizard/Pages/30-passwd-type.qml:104
414414msgid "Numbers and letters"
415−msgstr ""
415+msgstr "Numbers and letters"
416416
417417#: qml/Wizard/Pages/40-wifi.qml:28
418418msgid "Connect to Wi‑Fi"
419−msgstr ""
419+msgstr "Connect to Wi‑Fi"
420420
421421#: qml/Wizard/Pages/40-wifi.qml:147
422422msgid "Available networks…"
423−msgstr ""
423+msgstr "Available networks…"
424424
425425#: qml/Wizard/Pages/40-wifi.qml:148
426426msgid "No available networks."
427−msgstr ""
427+msgstr "No available networks."
428428
429429#: qml/Wizard/Pages/50-location.qml:27
430430msgid "Location"
431−msgstr ""
431+msgstr "Location"
432432
433433#: qml/Wizard/Pages/50-location.qml:62
434434msgid "Let the phone detect your location:"
435−msgstr ""
435+msgstr "Let the phone detect your location:"
436436
437437#: qml/Wizard/Pages/50-location.qml:69
438438msgid "Using GPS only (less accurate)"
439−msgstr ""
439+msgstr "Using GPS only (less accurate)"
440440
441441#: qml/Wizard/Pages/50-location.qml:86
442442msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
443−msgstr ""
443+msgstr "Using GPS, anonymised Wi-Fi and cellular network info (recommended)"
444444
445445#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
446446#: qml/Wizard/Pages/50-location.qml:103
@@ -448,81 +448,87 @@ msgid ""
448448"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
449449"conditions</a>."
450450msgstr ""
451+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
452+"conditions</a>."
451453
452454#: qml/Wizard/Pages/50-location.qml:112
453455msgid "Not at all"
454−msgstr ""
456+msgstr "Not at all"
455457
456458#: qml/Wizard/Pages/50-location.qml:124
457459msgid "You can change your mind later in <b>System Settings</b>."
458−msgstr ""
460+msgstr "You can change your mind later in <b>System Settings</b>."
459461
460462#: qml/Wizard/Pages/60-reporting.qml:24
461463msgid "Improving your experience"
462−msgstr ""
464+msgstr "Improving your experience"
463465
464466#: qml/Wizard/Pages/60-reporting.qml:36
465467msgid ""
466468"Your phone is set up to automatically report errors to Canonical and its "
467469"partners, the makers of the operating system."
468470msgstr ""
471+"Your phone is set up to automatically report errors to Canonical and its "
472+"partners, the makers of the operating system."
469473
470474#: qml/Wizard/Pages/60-reporting.qml:43
471475msgid ""
472476"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
473477"Privacy</b>"
474478msgstr ""
479+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
480+"Privacy</b>"
475481
476482#: qml/Wizard/Pages/80-finished.qml:24
477483msgid "All done"
478−msgstr ""
484+msgstr "All done"
479485
480486#: qml/Wizard/Pages/80-finished.qml:39
481487msgid "Nice work!"
482−msgstr ""
488+msgstr "Nice work!"
483489
484490#: qml/Wizard/Pages/80-finished.qml:46
485491msgid "Your phone is now ready to use."
486−msgstr ""
492+msgstr "Your phone is now ready to use."
487493
488494#: qml/Wizard/Pages/80-finished.qml:53
489495msgid "Finish"
490−msgstr ""
496+msgstr "Finish"
491497
492498#: qml/Wizard/Pages/here-terms.qml:27
493499msgid "Terms & Conditions"
494−msgstr ""
500+msgstr "Terms & Conditions"
495501
496502#: qml/Wizard/Pages/passwd-confirm.qml:49
497503msgid "Confirm passphrase"
498−msgstr ""
504+msgstr "Confirm passphrase"
499505
500506#: qml/Wizard/Pages/passwd-confirm.qml:50
501507msgid "Confirm passcode"
502−msgstr ""
508+msgstr "Confirm passcode"
503509
504510#: qml/Wizard/Pages/passwd-confirm.qml:53
505511#: qml/Wizard/Pages/passwd-confirm.qml:54
506512msgid "Please try again."
507−msgstr ""
513+msgstr "Please try again."
508514
509515#: qml/Wizard/Pages/passwd-set.qml:61
510516msgid "Choose your passcode"
511−msgstr ""
517+msgstr "Choose your passcode"
512518
513519#: qml/Wizard/Pages/passwd-set.qml:68
514520msgid "Passphrase must be 4 characters long"
515−msgstr ""
521+msgstr "Passphrase must be 4 characters long"
516522
517523#: qml/Wizard/StackButton.qml:39
518524#, qt-format
519525msgid "〈 %1"
520−msgstr ""
526+msgstr "〈 %1"
521527
522528#: qml/Wizard/StackButton.qml:42
523529#, qt-format
524530msgid "%1 〉"
525−msgstr ""
531+msgstr "%1 〉"
526532
527533#~ msgid "Confirm"
528534#~ msgstr "Confirm"
po/en_GB.po+47−41
@@ -8,15 +8,15 @@ 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 18:59+0000\n"
11+"PO-Revision-Date: 2015-01-22 12:14+0000\n"
1212"Last-Translator: Andi Chandler <Unknown>\n"
1313"Language-Team: English (United Kingdom) <en_GB@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"
19−"X-Generator: Launchpad (build 17286)\n"
18+"X-Launchpad-Export-Date: 2015-01-23 06:48+0000\n"
19+"X-Generator: Launchpad (build 17306)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
@@ -349,98 +349,98 @@ msgstr ""
349349
350350#: qml/Wizard/Page.qml:89
351351msgid "Back"
352−msgstr ""
352+msgstr "Back"
353353
354354#: qml/Wizard/Pages/10-welcome.qml:27
355355msgid "Hi!"
356−msgstr ""
356+msgstr "Hi!"
357357
358358#: qml/Wizard/Pages/10-welcome.qml:44
359359msgid "Welcome to your Ubuntu phone."
360−msgstr ""
360+msgstr "Welcome to your Ubuntu phone."
361361
362362#: qml/Wizard/Pages/10-welcome.qml:52
363363msgid "Let’s get started."
364−msgstr ""
364+msgstr "Let’s get started."
365365
366366#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
367367#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
368368#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
369369#: qml/Wizard/Pages/passwd-set.qml:90
370370msgid "Continue"
371−msgstr ""
371+msgstr "Continue"
372372
373373#: qml/Wizard/Pages/20-sim.qml:25
374374msgid "Add a SIM card and restart your device"
375−msgstr ""
375+msgstr "Add a SIM card and restart your device"
376376
377377#: qml/Wizard/Pages/20-sim.qml:55
378378msgid "Without it, you won’t be able to make calls or use text messaging."
379−msgstr ""
379+msgstr "Without it, you won’t be able to make calls or use text messaging."
380380
381381#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
382382msgid "Skip"
383−msgstr ""
383+msgstr "Skip"
384384
385385#: qml/Wizard/Pages/30-passwd-type.qml:39
386386msgid "Lock security"
387−msgstr ""
387+msgstr "Lock security"
388388
389389#: qml/Wizard/Pages/30-passwd-type.qml:74
390390msgid "Please select how you’d like to unlock your phone."
391−msgstr ""
391+msgstr "Please select how you’d like to unlock your phone."
392392
393393#: qml/Wizard/Pages/30-passwd-type.qml:97
394394msgid "Swipe"
395−msgstr ""
395+msgstr "Swipe"
396396
397397#: qml/Wizard/Pages/30-passwd-type.qml:98
398398msgid "No security"
399−msgstr ""
399+msgstr "No security"
400400
401401#: qml/Wizard/Pages/30-passwd-type.qml:100
402402msgid "Passcode"
403−msgstr ""
403+msgstr "Passcode"
404404
405405#: qml/Wizard/Pages/30-passwd-type.qml:101
406406msgid "4 digits only"
407−msgstr ""
407+msgstr "4 digits only"
408408
409409#: qml/Wizard/Pages/30-passwd-type.qml:103
410410msgid "Passphrase"
411−msgstr ""
411+msgstr "Passphrase"
412412
413413#: qml/Wizard/Pages/30-passwd-type.qml:104
414414msgid "Numbers and letters"
415−msgstr ""
415+msgstr "Numbers and letters"
416416
417417#: qml/Wizard/Pages/40-wifi.qml:28
418418msgid "Connect to Wi‑Fi"
419−msgstr ""
419+msgstr "Connect to Wi‑Fi"
420420
421421#: qml/Wizard/Pages/40-wifi.qml:147
422422msgid "Available networks…"
423−msgstr ""
423+msgstr "Available networks…"
424424
425425#: qml/Wizard/Pages/40-wifi.qml:148
426426msgid "No available networks."
427−msgstr ""
427+msgstr "No available networks."
428428
429429#: qml/Wizard/Pages/50-location.qml:27
430430msgid "Location"
431−msgstr ""
431+msgstr "Location"
432432
433433#: qml/Wizard/Pages/50-location.qml:62
434434msgid "Let the phone detect your location:"
435−msgstr ""
435+msgstr "Let the phone detect your location:"
436436
437437#: qml/Wizard/Pages/50-location.qml:69
438438msgid "Using GPS only (less accurate)"
439−msgstr ""
439+msgstr "Using GPS only (less accurate)"
440440
441441#: qml/Wizard/Pages/50-location.qml:86
442442msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
443−msgstr ""
443+msgstr "Using GPS, anonymised Wi-Fi and cellular network info (recommended)"
444444
445445#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
446446#: qml/Wizard/Pages/50-location.qml:103
@@ -448,81 +448,87 @@ msgid ""
448448"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
449449"conditions</a>."
450450msgstr ""
451+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
452+"conditions</a>."
451453
452454#: qml/Wizard/Pages/50-location.qml:112
453455msgid "Not at all"
454−msgstr ""
456+msgstr "Not at all"
455457
456458#: qml/Wizard/Pages/50-location.qml:124
457459msgid "You can change your mind later in <b>System Settings</b>."
458−msgstr ""
460+msgstr "You can change your mind later in <b>System Settings</b>."
459461
460462#: qml/Wizard/Pages/60-reporting.qml:24
461463msgid "Improving your experience"
462−msgstr ""
464+msgstr "Improving your experience"
463465
464466#: qml/Wizard/Pages/60-reporting.qml:36
465467msgid ""
466468"Your phone is set up to automatically report errors to Canonical and its "
467469"partners, the makers of the operating system."
468470msgstr ""
471+"Your phone is set up to automatically report errors to Canonical and its "
472+"partners, the makers of the operating system."
469473
470474#: qml/Wizard/Pages/60-reporting.qml:43
471475msgid ""
472476"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
473477"Privacy</b>"
474478msgstr ""
479+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
480+"Privacy</b>"
475481
476482#: qml/Wizard/Pages/80-finished.qml:24
477483msgid "All done"
478−msgstr ""
484+msgstr "All done"
479485
480486#: qml/Wizard/Pages/80-finished.qml:39
481487msgid "Nice work!"
482−msgstr ""
488+msgstr "Nice work!"
483489
484490#: qml/Wizard/Pages/80-finished.qml:46
485491msgid "Your phone is now ready to use."
486−msgstr ""
492+msgstr "Your phone is now ready to use."
487493
488494#: qml/Wizard/Pages/80-finished.qml:53
489495msgid "Finish"
490−msgstr ""
496+msgstr "Finish"
491497
492498#: qml/Wizard/Pages/here-terms.qml:27
493499msgid "Terms & Conditions"
494−msgstr ""
500+msgstr "Terms & Conditions"
495501
496502#: qml/Wizard/Pages/passwd-confirm.qml:49
497503msgid "Confirm passphrase"
498−msgstr ""
504+msgstr "Confirm passphrase"
499505
500506#: qml/Wizard/Pages/passwd-confirm.qml:50
501507msgid "Confirm passcode"
502−msgstr ""
508+msgstr "Confirm passcode"
503509
504510#: qml/Wizard/Pages/passwd-confirm.qml:53
505511#: qml/Wizard/Pages/passwd-confirm.qml:54
506512msgid "Please try again."
507−msgstr ""
513+msgstr "Please try again."
508514
509515#: qml/Wizard/Pages/passwd-set.qml:61
510516msgid "Choose your passcode"
511−msgstr ""
517+msgstr "Choose your passcode"
512518
513519#: qml/Wizard/Pages/passwd-set.qml:68
514520msgid "Passphrase must be 4 characters long"
515−msgstr ""
521+msgstr "Passphrase must be 4 characters long"
516522
517523#: qml/Wizard/StackButton.qml:39
518524#, qt-format
519525msgid "〈 %1"
520−msgstr ""
526+msgstr "〈 %1"
521527
522528#: qml/Wizard/StackButton.qml:42
523529#, qt-format
524530msgid "%1 〉"
525−msgstr ""
531+msgstr "%1 〉"
526532
527533#~ msgid "Confirm"
528534#~ msgstr "Confirm"
po/eu.po+51−43
@@ -8,15 +8,15 @@ 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-08 14:44+0000\n"
11+"PO-Revision-Date: 2015-01-22 21:40+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-12-13 07:10+0000\n"
19−"X-Generator: Launchpad (build 17286)\n"
18+"X-Launchpad-Export-Date: 2015-01-23 06:48+0000\n"
19+"X-Generator: Launchpad (build 17306)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
@@ -231,15 +231,15 @@ msgstr "Askatu freskatzeko…"
231231
232232#: qml/Dash/ScopesList.qml:63
233233msgid "Manage"
234−msgstr ""
234+msgstr "Kudeatu"
235235
236236#: qml/Dash/ScopesList.qml:107
237237msgid "Home"
238−msgstr ""
238+msgstr "Hasiera"
239239
240240#: qml/Dash/ScopesList.qml:108
241241msgid "Also installed"
242−msgstr ""
242+msgstr "Hau ere instalatuta"
243243
244244#: qml/Greeter/Greeter.qml:174
245245msgid "Unlock"
@@ -353,98 +353,100 @@ msgstr ""
353353
354354#: qml/Wizard/Page.qml:89
355355msgid "Back"
356−msgstr ""
356+msgstr "Atzera"
357357
358358#: qml/Wizard/Pages/10-welcome.qml:27
359359msgid "Hi!"
360−msgstr ""
360+msgstr "Epa!"
361361
362362#: qml/Wizard/Pages/10-welcome.qml:44
363363msgid "Welcome to your Ubuntu phone."
364−msgstr ""
364+msgstr "Ongi etorri zure Ubuntu telefonora."
365365
366366#: qml/Wizard/Pages/10-welcome.qml:52
367367msgid "Let’s get started."
368−msgstr ""
368+msgstr "Has gaitezen."
369369
370370#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
371371#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
372372#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
373373#: qml/Wizard/Pages/passwd-set.qml:90
374374msgid "Continue"
375−msgstr ""
375+msgstr "Jarraitu"
376376
377377#: qml/Wizard/Pages/20-sim.qml:25
378378msgid "Add a SIM card and restart your device"
379−msgstr ""
379+msgstr "Gehitu SIM txartel bat eta berrabiarazi zure gailua"
380380
381381#: qml/Wizard/Pages/20-sim.qml:55
382382msgid "Without it, you won’t be able to make calls or use text messaging."
383−msgstr ""
383+msgstr "Hura gabe, ezingo duzu deirik egin edo testu-mezularitza erabili."
384384
385385#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
386386msgid "Skip"
387−msgstr ""
387+msgstr "Saltatu"
388388
389389#: qml/Wizard/Pages/30-passwd-type.qml:39
390390msgid "Lock security"
391−msgstr ""
391+msgstr "Blokeo-segurtasuna"
392392
393393#: qml/Wizard/Pages/30-passwd-type.qml:74
394394msgid "Please select how you’d like to unlock your phone."
395−msgstr ""
395+msgstr "Aukeratu telefonoa nola desblokeatu nahi duzun."
396396
397397#: qml/Wizard/Pages/30-passwd-type.qml:97
398398msgid "Swipe"
399−msgstr ""
399+msgstr "Pasatu hatza"
400400
401401#: qml/Wizard/Pages/30-passwd-type.qml:98
402402msgid "No security"
403−msgstr ""
403+msgstr "Segurtasunik gabe"
404404
405405#: qml/Wizard/Pages/30-passwd-type.qml:100
406406msgid "Passcode"
407−msgstr ""
407+msgstr "Pasakodea"
408408
409409#: qml/Wizard/Pages/30-passwd-type.qml:101
410410msgid "4 digits only"
411−msgstr ""
411+msgstr "4 digitu soilik"
412412
413413#: qml/Wizard/Pages/30-passwd-type.qml:103
414414msgid "Passphrase"
415−msgstr ""
415+msgstr "Pasaesaldia"
416416
417417#: qml/Wizard/Pages/30-passwd-type.qml:104
418418msgid "Numbers and letters"
419−msgstr ""
419+msgstr "Zenbakiak eta hizkiak"
420420
421421#: qml/Wizard/Pages/40-wifi.qml:28
422422msgid "Connect to Wi‑Fi"
423−msgstr ""
423+msgstr "Konektatu wifira"
424424
425425#: qml/Wizard/Pages/40-wifi.qml:147
426426msgid "Available networks…"
427−msgstr ""
427+msgstr "Sare erabilgarriak…"
428428
429429#: qml/Wizard/Pages/40-wifi.qml:148
430430msgid "No available networks."
431−msgstr ""
431+msgstr "Ez dago sare erabilgarririk."
432432
433433#: qml/Wizard/Pages/50-location.qml:27
434434msgid "Location"
435−msgstr ""
435+msgstr "Kokalekua"
436436
437437#: qml/Wizard/Pages/50-location.qml:62
438438msgid "Let the phone detect your location:"
439−msgstr ""
439+msgstr "Utzi telefonoari zure kokalekua detektatzen:"
440440
441441#: qml/Wizard/Pages/50-location.qml:69
442442msgid "Using GPS only (less accurate)"
443−msgstr ""
443+msgstr "GPSa soilik erabiltzen (zehaztasun gutxiago)"
444444
445445#: qml/Wizard/Pages/50-location.qml:86
446446msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
447447msgstr ""
448+"GPSa, wifi anonimotua eta sare mugikorraren informazioa erabiltzen "
449+"(gomendatua)"
448450
449451#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
450452#: qml/Wizard/Pages/50-location.qml:103
@@ -452,81 +454,87 @@ msgid ""
452454"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
453455"conditions</a>."
454456msgstr ""
457+"Aukera hau hautatuz, Nokia HERE(r)en <a href='#'>baldintzak</a> onartzeko "
458+"dituzu."
455459
456460#: qml/Wizard/Pages/50-location.qml:112
457461msgid "Not at all"
458−msgstr ""
462+msgstr "Bat ere ez"
459463
460464#: qml/Wizard/Pages/50-location.qml:124
461465msgid "You can change your mind later in <b>System Settings</b>."
462−msgstr ""
466+msgstr "Geroago ere alda dezakezu <b>Sistemaren ezarpenetan</b>."
463467
464468#: qml/Wizard/Pages/60-reporting.qml:24
465469msgid "Improving your experience"
466−msgstr ""
470+msgstr "Zure esperientzia hobetuz"
467471
468472#: qml/Wizard/Pages/60-reporting.qml:36
469473msgid ""
470474"Your phone is set up to automatically report errors to Canonical and its "
471475"partners, the makers of the operating system."
472476msgstr ""
477+"Telefonoa erroreen berria automatikoki Canonical-i eta honen bazkideei "
478+"emateko konfiguratuta dago, sistema eragilearen egileei."
473479
474480#: qml/Wizard/Pages/60-reporting.qml:43
475481msgid ""
476482"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
477483"Privacy</b>"
478484msgstr ""
485+"Hau <b>Sistemaren ezarpenetatik</b> desgaitu daiteke, <b>Segurtasuna eta "
486+"pribatutasuna</b> atalean"
479487
480488#: qml/Wizard/Pages/80-finished.qml:24
481489msgid "All done"
482−msgstr ""
490+msgstr "Eginda"
483491
484492#: qml/Wizard/Pages/80-finished.qml:39
485493msgid "Nice work!"
486−msgstr ""
494+msgstr "Bikain!"
487495
488496#: qml/Wizard/Pages/80-finished.qml:46
489497msgid "Your phone is now ready to use."
490−msgstr ""
498+msgstr "Zure telefonoa erabiltzeko prest dago."
491499
492500#: qml/Wizard/Pages/80-finished.qml:53
493501msgid "Finish"
494−msgstr ""
502+msgstr "Amaitu"
495503
496504#: qml/Wizard/Pages/here-terms.qml:27
497505msgid "Terms & Conditions"
498−msgstr ""
506+msgstr "Baldintzak"
499507
500508#: qml/Wizard/Pages/passwd-confirm.qml:49
501509msgid "Confirm passphrase"
502−msgstr ""
510+msgstr "Berretsi pasaesaldia"
503511
504512#: qml/Wizard/Pages/passwd-confirm.qml:50
505513msgid "Confirm passcode"
506−msgstr ""
514+msgstr "Berretsi pasakodea"
507515
508516#: qml/Wizard/Pages/passwd-confirm.qml:53
509517#: qml/Wizard/Pages/passwd-confirm.qml:54
510518msgid "Please try again."
511−msgstr ""
519+msgstr "Saiatu berriro."
512520
513521#: qml/Wizard/Pages/passwd-set.qml:61
514522msgid "Choose your passcode"
515−msgstr ""
523+msgstr "Aukeratu zure pasakodea"
516524
517525#: qml/Wizard/Pages/passwd-set.qml:68
518526msgid "Passphrase must be 4 characters long"
519−msgstr ""
527+msgstr "Pasaesaldiak 4 karaktereko luzera izan behar du"
520528
521529#: qml/Wizard/StackButton.qml:39
522530#, qt-format
523531msgid "〈 %1"
524−msgstr ""
532+msgstr "〈 %1"
525533
526534#: qml/Wizard/StackButton.qml:42
527535#, qt-format
528536msgid "%1 〉"
529−msgstr ""
537+msgstr "%1 〉"
530538
531539#~ msgid "Type or say a command"
532540#~ msgstr "Idatzi edo esan agindu bat"
po/pt.po+30−29
@@ -8,15 +8,15 @@ 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 10:25+0000\n"
12−"Last-Translator: Ivo Xavier <ivofernandes12@gmail.com>\n"
11+"PO-Revision-Date: 2015-01-20 21:11+0000\n"
12+"Last-Translator: Filipe André Pinho <Unknown>\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-12-13 07:11+0000\n"
19−"X-Generator: Launchpad (build 17286)\n"
18+"X-Launchpad-Export-Date: 2015-01-21 06:43+0000\n"
19+"X-Generator: Launchpad (build 17306)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
@@ -229,15 +229,15 @@ msgstr "Solte para atualizar..."
229229
230230#: qml/Dash/ScopesList.qml:63
231231msgid "Manage"
232−msgstr ""
232+msgstr "Gerir"
233233
234234#: qml/Dash/ScopesList.qml:107
235235msgid "Home"
236−msgstr ""
236+msgstr "Página inicial"
237237
238238#: qml/Dash/ScopesList.qml:108
239239msgid "Also installed"
240−msgstr ""
240+msgstr "Também instalado"
241241
242242#: qml/Greeter/Greeter.qml:174
243243msgid "Unlock"
@@ -351,38 +351,39 @@ msgstr ""
351351
352352#: qml/Wizard/Page.qml:89
353353msgid "Back"
354−msgstr ""
354+msgstr "Anterior"
355355
356356#: qml/Wizard/Pages/10-welcome.qml:27
357357msgid "Hi!"
358−msgstr ""
358+msgstr "Olá!"
359359
360360#: qml/Wizard/Pages/10-welcome.qml:44
361361msgid "Welcome to your Ubuntu phone."
362−msgstr ""
362+msgstr "Bem-vindo ao seu telemóvel Ubuntu."
363363
364364#: qml/Wizard/Pages/10-welcome.qml:52
365365msgid "Let’s get started."
366−msgstr ""
366+msgstr "Vamos começar!"
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 "Avançar"
374374
375375#: qml/Wizard/Pages/20-sim.qml:25
376376msgid "Add a SIM card and restart your device"
377−msgstr ""
377+msgstr "Adicione o cartão SIM e reinicie o seu dispositivo"
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+"Sem o cartão SIM, não poderá fazer chamadas ou enviar mensagens de texto."
382383
383384#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
384385msgid "Skip"
385−msgstr ""
386+msgstr "Ignorar"
386387
387388#: qml/Wizard/Pages/30-passwd-type.qml:39
388389msgid "Lock security"
@@ -390,7 +391,7 @@ msgstr ""
390391
391392#: qml/Wizard/Pages/30-passwd-type.qml:74
392393msgid "Please select how you’d like to unlock your phone."
393−msgstr ""
394+msgstr "Por favor, escolha como pretende desbloquear o seu telemóvel."
394395
395396#: qml/Wizard/Pages/30-passwd-type.qml:97
396397msgid "Swipe"
@@ -398,7 +399,7 @@ msgstr ""
398399
399400#: qml/Wizard/Pages/30-passwd-type.qml:98
400401msgid "No security"
401−msgstr ""
402+msgstr "Sem segurança"
402403
403404#: qml/Wizard/Pages/30-passwd-type.qml:100
404405msgid "Passcode"
@@ -406,7 +407,7 @@ msgstr ""
406407
407408#: qml/Wizard/Pages/30-passwd-type.qml:101
408409msgid "4 digits only"
409−msgstr ""
410+msgstr "4 dígitos"
410411
411412#: qml/Wizard/Pages/30-passwd-type.qml:103
412413msgid "Passphrase"
@@ -414,31 +415,31 @@ msgstr ""
414415
415416#: qml/Wizard/Pages/30-passwd-type.qml:104
416417msgid "Numbers and letters"
417−msgstr ""
418+msgstr "Números e letras"
418419
419420#: qml/Wizard/Pages/40-wifi.qml:28
420421msgid "Connect to Wi‑Fi"
421−msgstr ""
422+msgstr "Ligar ao Wi-Fi"
422423
423424#: qml/Wizard/Pages/40-wifi.qml:147
424425msgid "Available networks…"
425−msgstr ""
426+msgstr "Redes disponíveis..."
426427
427428#: qml/Wizard/Pages/40-wifi.qml:148
428429msgid "No available networks."
429−msgstr ""
430+msgstr "Sem redes disponíveis."
430431
431432#: qml/Wizard/Pages/50-location.qml:27
432433msgid "Location"
433−msgstr ""
434+msgstr "Localização"
434435
435436#: qml/Wizard/Pages/50-location.qml:62
436437msgid "Let the phone detect your location:"
437−msgstr ""
438+msgstr "Deixe o telefone detectar a sua localização:"
438439
439440#: qml/Wizard/Pages/50-location.qml:69
440441msgid "Using GPS only (less accurate)"
441−msgstr ""
442+msgstr "Usar apenas GPS (menos preciso)"
442443
443444#: qml/Wizard/Pages/50-location.qml:86
444445msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
@@ -461,7 +462,7 @@ msgstr ""
461462
462463#: qml/Wizard/Pages/60-reporting.qml:24
463464msgid "Improving your experience"
464−msgstr ""
465+msgstr "Melhore a sua experiência"
465466
466467#: qml/Wizard/Pages/60-reporting.qml:36
467468msgid ""
@@ -481,7 +482,7 @@ msgstr ""
481482
482483#: qml/Wizard/Pages/80-finished.qml:39
483484msgid "Nice work!"
484−msgstr ""
485+msgstr "Bom trabalho!"
485486
486487#: qml/Wizard/Pages/80-finished.qml:46
487488msgid "Your phone is now ready to use."
@@ -489,7 +490,7 @@ msgstr ""
489490
490491#: qml/Wizard/Pages/80-finished.qml:53
491492msgid "Finish"
492−msgstr ""
493+msgstr "Concluir"
493494
494495#: qml/Wizard/Pages/here-terms.qml:27
495496msgid "Terms & Conditions"
@@ -506,7 +507,7 @@ msgstr ""
506507#: qml/Wizard/Pages/passwd-confirm.qml:53
507508#: qml/Wizard/Pages/passwd-confirm.qml:54
508509msgid "Please try again."
509−msgstr ""
510+msgstr "Por favor, tente novamente."
510511
511512#: qml/Wizard/Pages/passwd-set.qml:61
512513msgid "Choose your passcode"
@@ -519,7 +520,7 @@ msgstr ""
519520#: qml/Wizard/StackButton.qml:39
520521#, qt-format
521522msgid "〈 %1"
522−msgstr ""
523+msgstr "〈 %1"
523524
524525#: qml/Wizard/StackButton.qml:42
525526#, qt-format
qml/Dash/Previews/PreviewTable.qml+6
@@ -37,6 +37,7 @@ PreviewWidget {
3737 id: column
3838 objectName: "column"
3939 spacing: units.gu(1)
40+ width: parent.width
4041
4142 Label {
4243 id: titleLabel
@@ -51,6 +52,7 @@ PreviewWidget {
5152 visible: text !== ""
5253 opacity: .8
5354 text: widgetData["title"] || ""
55+ elide: Text.ElideRight
5456 }
5557
5658 GridLayout {
@@ -72,6 +74,10 @@ PreviewWidget {
7274 visible: root.expanded || rowIndex < maximumCollapsedRowCount
7375 color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
7476 font.bold: index == 0
77+ verticalAlignment: Text.AlignTop
78+ wrapMode: Text.WordWrap
79+ Layout.fillHeight: true
80+ Layout.maximumWidth: column.width - x
7581 }
7682 }
7783 }
qml/Shell.qml+15−3
@@ -180,8 +180,20 @@ Item {
180180
181181 WindowKeysFilter {
182182 Keys.onPressed: {
183− if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {
184− dialogs.onPowerKeyPressed();
183+ // Nokia earpieces give TogglePlayPause, while the iPhone's earpiece gives Play
184+ if (event.key == Qt.Key_MediaTogglePlayPause || event.key == Qt.Key_MediaPlay) {
185+ event.accepted = callManager.handleMediaKey(false);
186+ } else if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {
187+ // FIXME: We only consider power key presses if the screen is
188+ // on because of bugs 1410830/1409003. The theory is that when
189+ // those bugs are encountered, there is a >2s delay between the
190+ // power press event and the power release event, which causes
191+ // the shutdown dialog to appear on resume. So to avoid that
192+ // symptom while we investigate the root cause, we simply won't
193+ // initiate any dialogs when the screen is off.
194+ if (Powerd.status === Powerd.On) {
195+ dialogs.onPowerKeyPressed();
196+ }
185197 event.accepted = true;
186198 } else {
187199 volumeKeyFilter.onKeyPressed(event.key);
@@ -652,7 +664,7 @@ Item {
652664 target: callManager
653665
654666 onHasCallsChanged: {
655− if (shell.locked && callManager.hasCalls) {
667+ if (shell.locked && callManager.hasCalls && greeter.lockedApp !== "dialer-app") {
656668 // We just received an incoming call while locked. The
657669 // indicator will have already launched dialer-app for us, but
658670 // there is a race between "hasCalls" changing and the dialer
qml/Stages/DesktopStage.qml+8−44
@@ -94,6 +94,8 @@ Item {
9494 width: units.gu(60)
9595 height: units.gu(50)
9696
97+ readonly property int minWidth: units.gu(10)
98+ readonly property int minHeight: units.gu(10)
9799
98100 states: [
99101 State {
@@ -114,51 +116,13 @@ Item {
114116 }
115117 ]
116118
117− MouseArea {
118− anchors.fill: parent
119− anchors.margins: -units.gu(0.5)
120−
121− property bool resizeWidth: false
122− property bool resizeHeight: false
123−
124− property int startX: 0
125− property int startWidth: 0
126− property int startY: 0
127− property int startHeight: 0
128−
129− onPressed: {
130− ApplicationManager.requestFocusApplication(model.appId)
131− if (mouseX > width - units.gu(1)) {
132− resizeWidth = true;
133− startX = mouseX;
134− startWidth = appDelegate.width;
135− }
136− if (mouseY > height - units.gu(1)) {
137− resizeHeight = true;
138− startY = mouseY;
139− startHeight = appDelegate.height;
140− }
141− if (!resizeHeight && !resizeWidth) {
142− drag.target = appDelegate;
143− }
144− }
145−
146− onMouseXChanged: {
147− if (resizeWidth) {
148− appDelegate.width = startWidth + (mouseX - startX)
149− }
150− }
151− onMouseYChanged: {
152− if (resizeHeight) {
153− appDelegate.height = startHeight + (mouseY - startY)
154− }
155− }
119+ WindowMoveResizeArea {
120+ target: appDelegate
121+ minWidth: appDelegate.minWidth
122+ minHeight: appDelegate.minHeight
123+ resizeHandleWidth: units.gu(0.5)
156124
157− onReleased: {
158− resizeWidth = false;
159− resizeHeight = false;
160− drag.target = undefined;
161− }
125+ onPressed: ApplicationManager.requestFocusApplication(model.appId)
162126 }
163127
164128 DecoratedWindow {
qml/Stages/WindowMoveResizeArea.qmlnew file+98
@@ -0,0 +1,98 @@
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+ * Authors: Michael Zanetti <michael.zanetti@canonical.com>
17+ */
18+
19+import QtQuick 2.3
20+import Ubuntu.Components 1.1
21+
22+MouseArea {
23+ id: root
24+ anchors.fill: target
25+ anchors.margins: -resizeHandleWidth
26+
27+ // The target item managed by this. Must be a parent or a sibling
28+ // The area will anchor to it and manage move and resize events
29+ property var target: null
30+ property int resizeHandleWidth: 0
31+ property int minWidth: 0
32+ property int minHeight: 0
33+
34+ QtObject {
35+ id: priv
36+ readonly property int windowWidth: root.width - root.resizeHandleWidth * 2
37+ readonly property int windowHeight: root.height - resizeHandleWidth * 2
38+
39+ property var startPoint
40+ property int startWidth
41+ property int startHeight
42+
43+ property bool resizeTop: false
44+ property bool resizeBottom: false
45+ property bool resizeLeft: false
46+ property bool resizeRight: false
47+
48+ }
49+
50+ onPressed: {
51+ priv.startPoint = mapToItem(null, Qt.point(mouse.x, mouse.y)).x;
52+ priv.startWidth = root.width;
53+ priv.startHeight = root.height;
54+ priv.resizeTop = mouseY < root.resizeHandleWidth;
55+ priv.resizeBottom = mouseY > (root.height - root.resizeHandleWidth);
56+ priv.resizeLeft = mouseX < root.resizeHandleWidth;
57+ priv.resizeRight = mouseX > (root.width - root.resizeHandleWidth);
58+ }
59+
60+ onPositionChanged: {
61+ var currentPoint = mapToItem(null, Qt.point(mouse.x, mouse.y)).x;
62+ var mouseDiff = Qt.point(currentPoint.x - priv.startPoint.x, currentPoint.y - priv.startPoint.y);
63+ var moveDiff = Qt.point(0, 0);
64+ var sizeDiff = Qt.point(0, 0);
65+ if (priv.resizeTop || priv.resizeBottom || priv.resizeLeft || priv.resizeRight) {
66+ if (priv.resizeTop) {
67+ moveDiff.y += mouseDiff.y;
68+ sizeDiff.y += -mouseDiff.y;
69+ } else if (priv.resizeBottom) {
70+ sizeDiff.y += mouse.y - priv.startPoint.y;
71+ priv.startPoint.y = mouse.y
72+ }
73+ if (priv.resizeLeft) {
74+ moveDiff.x += mouseDiff.x;
75+ sizeDiff.x += -mouseDiff.x;
76+ } else if (priv.resizeRight) {
77+ sizeDiff.x += mouse.x - priv.startPoint.x;
78+ priv.startPoint.x = mouse.x
79+ }
80+ if (priv.windowWidth + sizeDiff.x < root.minWidth) {
81+ sizeDiff.x = root.minWidth - priv.windowWidth;
82+ moveDiff.x = moveDiff.x == 0 ? 0 : -sizeDiff.x;
83+ }
84+ if (priv.windowHeight + sizeDiff.y < root.minHeight) {
85+ sizeDiff.y = root.minHeight - priv.windowHeight;
86+ moveDiff.y = moveDiff.y == 0 ? 0 : -sizeDiff.y;
87+ }
88+
89+ target.x += moveDiff.x;
90+ target.y += moveDiff.y;
91+ target.width += sizeDiff.x;
92+ target.height += sizeDiff.y;
93+ } else {
94+ target.x += mouseDiff.x;
95+ target.y += mouseDiff.y;
96+ }
97+ }
98+}
tests/mocks/LightDM/CMakeLists.txt+1−2
@@ -37,8 +37,7 @@ add_library(MockLightDM-qml MODULE
3737# LD_LIBRARY_PATH.
3838add_dependencies(MockLightDM-qml MockLightDM-full MockUserMetrics)
3939target_link_libraries(MockLightDM-qml
40− -L${CMAKE_CURRENT_BINARY_DIR}/full
41− -llightdm-qt5-2
40+ MockLightDM-full
4241 -L${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics
4342 -lusermetricsoutput
4443 unity8-private
tests/plugins/LightDM/CMakeLists.txt+1−4
@@ -11,10 +11,7 @@ include_directories(
1111 ${LIBLIGHTDM_INCLUDE_DIRS}
1212 )
1313
14−target_link_libraries(GreeterDBusTestExec
15− -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full
16− -llightdm-qt5-2
17− )
14+target_link_libraries(GreeterDBusTestExec MockLightDM-full)
1815
1916add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
2017
tests/qmltests/CMakeLists.txt+1
@@ -88,5 +88,6 @@ add_qml_test(Stages PhoneStage ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/
8888add_qml_test(Stages SpreadDelegate ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
8989add_qml_test(Stages SurfaceContainer ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
9090add_qml_test(Stages SessionContainer ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
91+add_qml_test(Stages WindowMoveResizeArea)
9192add_qml_test(Stages Splash)
9293add_qml_test(Wizard Wizard)
tests/qmltests/Dash/Previews/tst_PreviewTable.qml+6−5
@@ -27,17 +27,18 @@ Rectangle {
2727 color: Theme.palette.selected.background
2828
2929 property var widgetDataComplete: {
30− "title": "Title here",
31− "values": [ [ "Long Label 1", "Value 1"], [ "Label 2", "Long Value 2"], [ "Label 3", "Value 3"], [ "Label 4", "Value 4"], [ "Label 5", "Value 5"] ]
30+ "title": "Title here longa long long long long long long long long long long",
31+ "values": [ [ "Long Label 1", "Value 1"], [ "Label 2", "Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2"], [ "Label 3", "Value 3"], [ "Label 4", "Value 4"], [ "Label 5", "Value 5"] ]
3232 }
3333
3434 property var widgetDataNoTitle: {
35− "values": [ [ "Long Label 1", "Value 1"], [ "Label 2", "Long Value 2"], [ "Label 3", "Value 3"], [ "Label 4", "Value 4"], [ "Label 5", "Value 5"] ]
35+ "values": [ [ "Long Label 1", "Value 1"], [ "Label 2", "Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2"], [ "Label 3", "Value 3"], [ "Label 4", "Value 4"], [ "Label 5", "Value 5"] ]
3636 }
3737
38− PreviewTable {
38+ PreviewWidgetFactory {
3939 id: previewTable
4040 anchors { left: parent.left; right: parent.right }
41+ widgetType: "table"
4142 widgetData: widgetDataComplete
4243
4344 Rectangle {
@@ -59,7 +60,7 @@ Rectangle {
5960 compare(findChild(previewTable, "label00").text, "Long Label 1");
6061 compare(findChild(previewTable, "label01").text, "Value 1");
6162 compare(findChild(previewTable, "label10").text, "Label 2");
62− compare(findChild(previewTable, "label11").text, "Long Value 2");
63+ compare(findChild(previewTable, "label11").text, "Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2");
6364 compare(findChild(previewTable, "label20").text, "Label 3");
6465 compare(findChild(previewTable, "label21").text, "Value 3");
6566 compare(findChild(previewTable, "label30").text, "Label 4");
tests/qmltests/Stages/tst_WindowMoveResizeArea.qmlnew file+138
@@ -0,0 +1,138 @@
1+/*
2+ * Copyright 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.1
18+import QtQuick.Layouts 1.1
19+import QtTest 1.0
20+import Unity.Test 0.1 as UT
21+import ".."
22+import "../../../qml/Stages"
23+import Ubuntu.Components 0.1
24+import Ubuntu.Components.ListItems 1.0 as ListItem
25+import Unity.Application 0.1
26+
27+Item {
28+ id: root
29+ height: units.gu(60)
30+ width: units.gu(60)
31+
32+ Rectangle {
33+ id: fakeWindow
34+ height: units.gu(20)
35+ width: units.gu(20)
36+ color: "khaki"
37+ WindowMoveResizeArea {
38+ id: moveResizeArea
39+ target: fakeWindow
40+ resizeHandleWidth: units.gu(0.5)
41+ minWidth: units.gu(15)
42+ minHeight: units.gu(10)
43+ }
44+ }
45+
46+ UT.UnityTestCase {
47+ when: windowShown
48+
49+ function init() {
50+ fakeWindow.x = units.gu(20)
51+ fakeWindow.y = units.gu(20)
52+ fakeWindow.width = units.gu(20)
53+ fakeWindow.height = units.gu(20)
54+ }
55+
56+ function test_dragWindow_data() {
57+ return [
58+ { tag: "up", dx: 0, dy: units.gu(-10) },
59+ { tag: "down", dx: 0, dy: units.gu(10) },
60+ { tag: "left", dx: units.gu(-10), dy: 0 },
61+ { tag: "right", dx: units.gu(10), dy: 0 },
62+ { tag: "right/down", dx: units.gu(10), dy: units.gu(10) },
63+ { tag: "left/down", dx: units.gu(-10), dy: units.gu(10) }
64+ ]
65+ }
66+
67+ function test_dragWindow(data) {
68+ var initialWindowX = fakeWindow.x;
69+ var initialWindowY = fakeWindow.y;
70+ var initialWindowWidth = fakeWindow.width
71+ var initialWindowHeight = fakeWindow.height
72+
73+ var startDragX = initialWindowX + fakeWindow.width / 2;
74+ var startDragY = initialWindowY + fakeWindow.height / 2;
75+ mouseFlick(root, startDragX, startDragY, startDragX + data.dx, startDragY + data.dy, true, true, units.gu(.5), 10)
76+
77+ tryCompare(fakeWindow, "x", initialWindowX + data.dx)
78+ tryCompare(fakeWindow, "y", initialWindowX + data.dy)
79+
80+ compare(fakeWindow.height, initialWindowHeight);
81+ compare(fakeWindow.width, initialWindowWidth);
82+ }
83+
84+ function test_resizeWindowRightBottom_data() {
85+ return [
86+ { tag: "width", dx: units.gu(10), dy: 0 },
87+ { tag: "height", dx: 0, dy: units.gu(10) },
88+ { tag: "both", dx: units.gu(10), dy: units.gu(10) },
89+ { tag: "smaller than minimum size", dx: -units.gu(15), dy: -units.gu(15) }
90+ ]
91+ }
92+
93+ function test_resizeWindowRightBottom(data) {
94+ var initialWindowX = fakeWindow.x;
95+ var initialWindowY = fakeWindow.y;
96+ var initialWindowWidth = fakeWindow.width
97+ var initialWindowHeight = fakeWindow.height
98+
99+ var startDragX = initialWindowX + initialWindowWidth + 1
100+ var startDragY = initialWindowY + initialWindowHeight + 1
101+ mouseFlick(root, startDragX, startDragY, startDragX + data.dx, startDragY + data.dy, true, true, units.gu(.5), 10);
102+
103+ tryCompare(fakeWindow, "width", Math.max(initialWindowWidth + data.dx, moveResizeArea.minWidth));
104+ tryCompare(fakeWindow, "height", Math.max(initialWindowHeight + data.dy, moveResizeArea.minHeight));
105+
106+ compare(fakeWindow.x, initialWindowX);
107+ compare(fakeWindow.y, initialWindowY);
108+ }
109+
110+ function test_resizeWindowLeftTop_data() {
111+ return [
112+ { tag: "width", dx: -units.gu(10), dy: 0 },
113+ { tag: "height", dx: 0, dy: -units.gu(10) },
114+ { tag: "both", dx: -units.gu(10), dy: -units.gu(10) },
115+ { tag: "smaller than minimum size", dx: units.gu(15), dy: units.gu(15) }
116+ ]
117+ }
118+
119+ function test_resizeWindowLeftTop(data) {
120+ var initialWindowX = fakeWindow.x;
121+ var initialWindowY = fakeWindow.y;
122+ var initialWindowWidth = fakeWindow.width
123+ var initialWindowHeight = fakeWindow.height
124+
125+ var startDragX = initialWindowX - 1
126+ var startDragY = initialWindowY - 1
127+ mouseFlick(root, startDragX, startDragY, startDragX + data.dx, startDragY + data.dy, true, true, units.gu(.5), 10);
128+
129+ tryCompare(fakeWindow, "width", Math.max(initialWindowWidth - data.dx, moveResizeArea.minWidth));
130+ tryCompare(fakeWindow, "height", Math.max(initialWindowHeight - data.dy, moveResizeArea.minHeight));
131+
132+ var maxMoveX = initialWindowWidth - moveResizeArea.minWidth;
133+ var maxMoveY = initialWindowHeight - moveResizeArea.minHeight;
134+ compare(fakeWindow.x, Math.min(initialWindowX + data.dx, initialWindowX + maxMoveX));
135+ compare(fakeWindow.y, Math.min(initialWindowY + data.dy, initialWindowY + maxMoveY));
136+ }
137+ }
138+}