git.iko.soy/unity8
on xenial help sign in
Merged with trunk.
9ecb29fMirco Müller
debian/changelog+25
compare with xenial
unifiedsplit
@@ -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+
1unity8 (8.02+15.04.20150113.1-0ubuntu1) vivid; urgency=low
26unity8 (8.02+15.04.20150113.1-0ubuntu1) vivid; urgency=low
2
27
3 [ Andrea Cimitan ]
28 [ Andrea Cimitan ]
po/en_AU.po+100−94
@@ -8,26 +8,26 @@ msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2014-12-10 10:55+0100\n"
10"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"
12"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"
12"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"
13"Language-Team: English (Australia) <en_AU@li.org>\n"
13"Language-Team: English (Australia) <en_AU@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"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: 2015-01-26 06:54+0000\n"
19−"X-Generator: Launchpad (build 17286)\n"
19+"X-Generator: Launchpad (build 17306)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
22msgid "Password: "
22msgid "Password: "
23msgstr "Password: "
23msgstr "Password: "
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:45
25#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:100
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
27msgid "Pin shortcut"
27msgid "Pin shortcut"
28msgstr "Pin shortcut"
28msgstr "Pin shortcut"
29
29
30−#: plugins/Unity/Launcher/launcheritem.cpp:100
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
31msgid "Unpin shortcut"
31msgid "Unpin shortcut"
32msgstr "Unpin shortcut"
32msgstr "Unpin shortcut"
33
33
@@ -50,45 +50,45 @@ msgid_plural "Please wait %1 minutes and then try again…"
50msgstr[0] "Please wait %1 minute and then try again…"
50msgstr[0] "Please wait %1 minute and then try again…"
51msgstr[1] "Please wait %1 minutes and then try again…"
51msgstr[1] "Please wait %1 minutes and then try again…"
52
52
53−#: qml/Components/Dialogs.qml:70
53+#: qml/Components/Dialogs.qml:74
54msgid "Log out"
54msgid "Log out"
55msgstr "Log out"
55msgstr "Log out"
56
56
57−#: qml/Components/Dialogs.qml:71
57+#: qml/Components/Dialogs.qml:75
58msgid "Are you sure you want to log out?"
58msgid "Are you sure you want to log out?"
59msgstr "Are you sure you want to log out?"
59msgstr "Are you sure you want to log out?"
60
60
61−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
61+#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
62−#: qml/Components/Dialogs.qml:122
62+#: qml/Components/Dialogs.qml:126
63msgid "No"
63msgid "No"
64msgstr "No"
64msgstr "No"
65
65
66−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
66+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
67−#: qml/Components/Dialogs.qml:129
67+#: qml/Components/Dialogs.qml:133
68msgid "Yes"
68msgid "Yes"
69msgstr "Yes"
69msgstr "Yes"
70
70
71−#: qml/Components/Dialogs.qml:94
71+#: qml/Components/Dialogs.qml:98
72msgid "Shut down"
72msgid "Shut down"
73msgstr "Shut down"
73msgstr "Shut down"
74
74
75−#: qml/Components/Dialogs.qml:95
75+#: qml/Components/Dialogs.qml:99
76msgid "Are you sure you want to shut down?"
76msgid "Are you sure you want to shut down?"
77msgstr "Are you sure you want to shut down?"
77msgstr "Are you sure you want to shut down?"
78
78
79−#: qml/Components/Dialogs.qml:119
79+#: qml/Components/Dialogs.qml:123
80msgid "Reboot"
80msgid "Reboot"
81msgstr "Reboot"
81msgstr "Reboot"
82
82
83−#: qml/Components/Dialogs.qml:120
83+#: qml/Components/Dialogs.qml:124
84msgid "Are you sure you want to reboot?"
84msgid "Are you sure you want to reboot?"
85msgstr "Are you sure you want to reboot?"
85msgstr "Are you sure you want to reboot?"
86
86
87−#: qml/Components/Dialogs.qml:144
87+#: qml/Components/Dialogs.qml:148
88msgid "Power"
88msgid "Power"
89msgstr "Power"
89msgstr "Power"
90
90
91−#: qml/Components/Dialogs.qml:145
91+#: qml/Components/Dialogs.qml:149
92msgid ""
92msgid ""
93"Are you sure you would like\n"
93"Are you sure you would like\n"
94"to power off?"
94"to power off?"
@@ -96,15 +96,15 @@ msgstr ""
96"Are you sure you would like\n"
96"Are you sure you would like\n"
97"to power off?"
97"to power off?"
98
98
99−#: qml/Components/Dialogs.qml:147
99+#: qml/Components/Dialogs.qml:151
100msgid "Power off"
100msgid "Power off"
101msgstr "Power off"
101msgstr "Power off"
102
102
103−#: qml/Components/Dialogs.qml:157
103+#: qml/Components/Dialogs.qml:161
104msgid "Restart"
104msgid "Restart"
105msgstr "Restart"
105msgstr "Restart"
106
106
107−#: qml/Components/Dialogs.qml:167
107+#: qml/Components/Dialogs.qml:171
108msgid "Cancel"
108msgid "Cancel"
109msgstr "Cancel"
109msgstr "Cancel"
110
110
@@ -112,43 +112,43 @@ msgstr "Cancel"
112msgid "Skip intro"
112msgid "Skip intro"
113msgstr "Skip intro"
113msgstr "Skip intro"
114
114
115−#: qml/Components/EdgeDemo.qml:125
115+#: qml/Components/EdgeDemo.qml:112
116msgid "Right edge"
116msgid "Right edge"
117msgstr "Right edge"
117msgstr "Right edge"
118
118
119−#: qml/Components/EdgeDemo.qml:126
119+#: qml/Components/EdgeDemo.qml:113
120msgid "Try swiping from the right edge to unlock the phone"
120msgid "Try swiping from the right edge to unlock the phone"
121msgstr "Try swiping from the right edge to unlock the phone"
121msgstr "Try swiping from the right edge to unlock the phone"
122
122
123−#: qml/Components/EdgeDemo.qml:157
123+#: qml/Components/EdgeDemo.qml:144
124msgid "Top edge"
124msgid "Top edge"
125msgstr "Top edge"
125msgstr "Top edge"
126
126
127−#: qml/Components/EdgeDemo.qml:158
127+#: qml/Components/EdgeDemo.qml:145
128msgid "Try swiping from the top edge to access the indicators"
128msgid "Try swiping from the top edge to access the indicators"
129msgstr "Try swiping from the top edge to access the indicators"
129msgstr "Try swiping from the top edge to access the indicators"
130
130
131−#: qml/Components/EdgeDemo.qml:183
131+#: qml/Components/EdgeDemo.qml:170
132msgid "Close"
132msgid "Close"
133msgstr "Close"
133msgstr "Close"
134
134
135−#: qml/Components/EdgeDemo.qml:184
135+#: qml/Components/EdgeDemo.qml:171
136msgid "Swipe up again to close the settings screen"
136msgid "Swipe up again to close the settings screen"
137msgstr "Swipe up again to close the settings screen"
137msgstr "Swipe up again to close the settings screen"
138
138
139−#: qml/Components/EdgeDemo.qml:214
139+#: qml/Components/EdgeDemo.qml:201
140msgid "Left edge"
140msgid "Left edge"
141msgstr "Left edge"
141msgstr "Left edge"
142
142
143−#: qml/Components/EdgeDemo.qml:215
143+#: qml/Components/EdgeDemo.qml:202
144msgid "Swipe from the left to reveal the launcher for quick access to apps"
144msgid "Swipe from the left to reveal the launcher for quick access to apps"
145msgstr "Swipe from the left to reveal the launcher for quick access to apps"
145msgstr "Swipe from the left to reveal the launcher for quick access to apps"
146
146
147−#: qml/Components/EdgeDemo.qml:242
147+#: qml/Components/EdgeDemo.qml:229
148msgid "Well done"
148msgid "Well done"
149msgstr "Well done"
149msgstr "Well done"
150
150
151−#: qml/Components/EdgeDemo.qml:243
151+#: qml/Components/EdgeDemo.qml:230
152msgid ""
152msgid ""
153"You have now mastered the edge gestures and can start using the "
153"You have now mastered the edge gestures and can start using the "
154"phone<br><br>Tap on the screen to start"
154"phone<br><br>Tap on the screen to start"
@@ -156,44 +156,44 @@ msgstr ""
156"You have now mastered the edge gestures and can start using the "
156"You have now mastered the edge gestures and can start using the "
157"phone<br><br>Tap on the screen to start"
157"phone<br><br>Tap on the screen to start"
158
158
159−#: qml/Components/Lockscreen.qml:238
159+#: qml/Components/Lockscreen.qml:223
160msgid "Return to Call"
160msgid "Return to Call"
161−msgstr ""
161+msgstr "Return to Call"
162
162
163−#: qml/Components/Lockscreen.qml:238
163+#: qml/Components/Lockscreen.qml:223
164msgid "Emergency Call"
164msgid "Emergency Call"
165msgstr "Emergency Call"
165msgstr "Emergency Call"
166
166
167−#: qml/Components/Lockscreen.qml:270
167+#: qml/Components/Lockscreen.qml:255
168msgid "OK"
168msgid "OK"
169msgstr "OK"
169msgstr "OK"
170
170
171−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
171+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
172msgid "See less"
172msgid "See less"
173msgstr "See less"
173msgstr "See less"
174
174
175−#: qml/Dash/GenericScopeView.qml:431
175+#: qml/Dash/GenericScopeView.qml:434
176msgid "See all"
176msgid "See all"
177msgstr "See all"
177msgstr "See all"
178
178
179−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
179+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:268
180#: qml/Panel/SearchIndicator.qml:27
180#: qml/Panel/SearchIndicator.qml:27
181msgid "Search"
181msgid "Search"
182msgstr "Search"
182msgstr "Search"
183
183
184−#: qml/Dash/PageHeader.qml:260
184+#: qml/Dash/PageHeader.qml:261
185msgid "Store"
185msgid "Store"
186msgstr "Store"
186msgstr "Store"
187
187
188−#: qml/Dash/PageHeader.qml:277
188+#: qml/Dash/PageHeader.qml:278
189msgid "Settings"
189msgid "Settings"
190msgstr "Settings"
190msgstr "Settings"
191
191
192−#: qml/Dash/PageHeader.qml:284
192+#: qml/Dash/PageHeader.qml:285
193msgid "Remove from Favorites"
193msgid "Remove from Favorites"
194msgstr "Remove from Favourites"
194msgstr "Remove from Favourites"
195
195
196−#: qml/Dash/PageHeader.qml:284
196+#: qml/Dash/PageHeader.qml:285
197msgid "Add to Favorites"
197msgid "Add to Favorites"
198msgstr "Add to Favourites"
198msgstr "Add to Favourites"
199
199
@@ -227,15 +227,15 @@ msgstr "Release to refresh…"
227
227
228#: qml/Dash/ScopesList.qml:63
228#: qml/Dash/ScopesList.qml:63
229msgid "Manage"
229msgid "Manage"
230−msgstr ""
230+msgstr "Manage"
231
231
232#: qml/Dash/ScopesList.qml:107
232#: qml/Dash/ScopesList.qml:107
233msgid "Home"
233msgid "Home"
234−msgstr ""
234+msgstr "Home"
235
235
236#: qml/Dash/ScopesList.qml:108
236#: qml/Dash/ScopesList.qml:108
237msgid "Also installed"
237msgid "Also installed"
238−msgstr ""
238+msgstr "Also installed"
239
239
240#: qml/Greeter/Greeter.qml:174
240#: qml/Greeter/Greeter.qml:174
241msgid "Unlock"
241msgid "Unlock"
@@ -289,49 +289,49 @@ msgstr "Unlock SIM"
289msgid "Roaming"
289msgid "Roaming"
290msgstr "Roaming"
290msgstr "Roaming"
291
291
292−#: qml/Shell.qml:367
292+#: qml/Shell.qml:402
293#, qt-format
293#, qt-format
294msgid "Enter %1"
294msgid "Enter %1"
295msgstr "Enter %1"
295msgstr "Enter %1"
296
296
297−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
297+#: qml/Shell.qml:394
298msgid "Enter passphrase"
298msgid "Enter passphrase"
299msgstr "Enter passphrase"
299msgstr "Enter passphrase"
300
300
301−#: qml/Shell.qml:369
301+#: qml/Shell.qml:398
302msgid "Enter passcode"
302msgid "Enter passcode"
303msgstr "Enter passcode"
303msgstr "Enter passcode"
304
304
305−#: qml/Shell.qml:370
305+#: qml/Shell.qml:403
306#, qt-format
306#, qt-format
307msgid "Sorry, incorrect %1"
307msgid "Sorry, incorrect %1"
308msgstr "Sorry, incorrect %1"
308msgstr "Sorry, incorrect %1"
309
309
310−#: qml/Shell.qml:371
310+#: qml/Shell.qml:395
311msgid "Sorry, incorrect passphrase"
311msgid "Sorry, incorrect passphrase"
312msgstr "Sorry, incorrect passphrase"
312msgstr "Sorry, incorrect passphrase"
313
313
314−#: qml/Shell.qml:372
314+#: qml/Shell.qml:396
315msgid "Please re-enter"
315msgid "Please re-enter"
316msgstr "Please re-enter"
316msgstr "Please re-enter"
317
317
318−#: qml/Shell.qml:373
318+#: qml/Shell.qml:399
319msgid "Sorry, incorrect passcode"
319msgid "Sorry, incorrect passcode"
320msgstr "Sorry, incorrect passcode"
320msgstr "Sorry, incorrect passcode"
321
321
322−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
322+#: qml/Shell.qml:444
323msgid "Sorry, incorrect passphrase."
323msgid "Sorry, incorrect passphrase."
324msgstr "Sorry, incorrect passphrase."
324msgstr "Sorry, incorrect passphrase."
325
325
326−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
326+#: qml/Shell.qml:445
327msgid "Sorry, incorrect passcode."
327msgid "Sorry, incorrect passcode."
328msgstr "Sorry, incorrect passcode."
328msgstr "Sorry, incorrect passcode."
329
329
330−#: qml/Shell.qml:469
330+#: qml/Shell.qml:446
331msgid "This will be your last attempt."
331msgid "This will be your last attempt."
332msgstr "This will be your last attempt."
332msgstr "This will be your last attempt."
333
333
334−#: qml/Shell.qml:471
334+#: qml/Shell.qml:448
335msgid ""
335msgid ""
336"If passphrase is entered incorrectly, your phone will conduct a factory "
336"If passphrase is entered incorrectly, your phone will conduct a factory "
337"reset and all personal data will be deleted."
337"reset and all personal data will be deleted."
@@ -339,7 +339,7 @@ msgstr ""
339"If passphrase is entered incorrectly, your phone will conduct a factory "
339"If passphrase is entered incorrectly, your phone will conduct a factory "
340"reset and all personal data will be deleted."
340"reset and all personal data will be deleted."
341
341
342−#: qml/Shell.qml:472
342+#: qml/Shell.qml:449
343msgid ""
343msgid ""
344"If passcode is entered incorrectly, your phone will conduct a factory reset "
344"If passcode is entered incorrectly, your phone will conduct a factory reset "
345"and all personal data will be deleted."
345"and all personal data will be deleted."
@@ -349,98 +349,98 @@ msgstr ""
349
349
350#: qml/Wizard/Page.qml:89
350#: qml/Wizard/Page.qml:89
351msgid "Back"
351msgid "Back"
352−msgstr ""
352+msgstr "Back"
353
353
354#: qml/Wizard/Pages/10-welcome.qml:27
354#: qml/Wizard/Pages/10-welcome.qml:27
355msgid "Hi!"
355msgid "Hi!"
356−msgstr ""
356+msgstr "Hi!"
357
357
358#: qml/Wizard/Pages/10-welcome.qml:44
358#: qml/Wizard/Pages/10-welcome.qml:44
359msgid "Welcome to your Ubuntu phone."
359msgid "Welcome to your Ubuntu phone."
360−msgstr ""
360+msgstr "Welcome to your Ubuntu phone."
361
361
362#: qml/Wizard/Pages/10-welcome.qml:52
362#: qml/Wizard/Pages/10-welcome.qml:52
363msgid "Let’s get started."
363msgid "Let’s get started."
364−msgstr ""
364+msgstr "Let’s get started."
365
365
366#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
366#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
367#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
367#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
368#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
368#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
369#: qml/Wizard/Pages/passwd-set.qml:90
369#: qml/Wizard/Pages/passwd-set.qml:90
370msgid "Continue"
370msgid "Continue"
371−msgstr ""
371+msgstr "Continue"
372
372
373#: qml/Wizard/Pages/20-sim.qml:25
373#: qml/Wizard/Pages/20-sim.qml:25
374msgid "Add a SIM card and restart your device"
374msgid "Add a SIM card and restart your device"
375−msgstr ""
375+msgstr "Add a SIM card and restart your device"
376
376
377#: qml/Wizard/Pages/20-sim.qml:55
377#: qml/Wizard/Pages/20-sim.qml:55
378msgid "Without it, you won’t be able to make calls or use text messaging."
378msgid "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."
380
380
381#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
381#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
382msgid "Skip"
382msgid "Skip"
383−msgstr ""
383+msgstr "Skip"
384
384
385#: qml/Wizard/Pages/30-passwd-type.qml:39
385#: qml/Wizard/Pages/30-passwd-type.qml:39
386msgid "Lock security"
386msgid "Lock security"
387−msgstr ""
387+msgstr "Lock security"
388
388
389#: qml/Wizard/Pages/30-passwd-type.qml:74
389#: qml/Wizard/Pages/30-passwd-type.qml:74
390msgid "Please select how you’d like to unlock your phone."
390msgid "Please select how you’d like to unlock your phone."
391−msgstr ""
391+msgstr "Please select how you’d like to unlock your phone."
392
392
393#: qml/Wizard/Pages/30-passwd-type.qml:97
393#: qml/Wizard/Pages/30-passwd-type.qml:97
394msgid "Swipe"
394msgid "Swipe"
395−msgstr ""
395+msgstr "Swipe"
396
396
397#: qml/Wizard/Pages/30-passwd-type.qml:98
397#: qml/Wizard/Pages/30-passwd-type.qml:98
398msgid "No security"
398msgid "No security"
399−msgstr ""
399+msgstr "No security"
400
400
401#: qml/Wizard/Pages/30-passwd-type.qml:100
401#: qml/Wizard/Pages/30-passwd-type.qml:100
402msgid "Passcode"
402msgid "Passcode"
403−msgstr ""
403+msgstr "Passcode"
404
404
405#: qml/Wizard/Pages/30-passwd-type.qml:101
405#: qml/Wizard/Pages/30-passwd-type.qml:101
406msgid "4 digits only"
406msgid "4 digits only"
407−msgstr ""
407+msgstr "4 digits only"
408
408
409#: qml/Wizard/Pages/30-passwd-type.qml:103
409#: qml/Wizard/Pages/30-passwd-type.qml:103
410msgid "Passphrase"
410msgid "Passphrase"
411−msgstr ""
411+msgstr "Passphrase"
412
412
413#: qml/Wizard/Pages/30-passwd-type.qml:104
413#: qml/Wizard/Pages/30-passwd-type.qml:104
414msgid "Numbers and letters"
414msgid "Numbers and letters"
415−msgstr ""
415+msgstr "Numbers and letters"
416
416
417#: qml/Wizard/Pages/40-wifi.qml:28
417#: qml/Wizard/Pages/40-wifi.qml:28
418msgid "Connect to Wi‑Fi"
418msgid "Connect to Wi‑Fi"
419−msgstr ""
419+msgstr "Connect to Wi‑Fi"
420
420
421#: qml/Wizard/Pages/40-wifi.qml:147
421#: qml/Wizard/Pages/40-wifi.qml:147
422msgid "Available networks…"
422msgid "Available networks…"
423−msgstr ""
423+msgstr "Available networks…"
424
424
425#: qml/Wizard/Pages/40-wifi.qml:148
425#: qml/Wizard/Pages/40-wifi.qml:148
426msgid "No available networks."
426msgid "No available networks."
427−msgstr ""
427+msgstr "No available networks."
428
428
429#: qml/Wizard/Pages/50-location.qml:27
429#: qml/Wizard/Pages/50-location.qml:27
430msgid "Location"
430msgid "Location"
431−msgstr ""
431+msgstr "Location"
432
432
433#: qml/Wizard/Pages/50-location.qml:62
433#: qml/Wizard/Pages/50-location.qml:62
434msgid "Let the phone detect your location:"
434msgid "Let the phone detect your location:"
435−msgstr ""
435+msgstr "Let the phone detect your location:"
436
436
437#: qml/Wizard/Pages/50-location.qml:69
437#: qml/Wizard/Pages/50-location.qml:69
438msgid "Using GPS only (less accurate)"
438msgid "Using GPS only (less accurate)"
439−msgstr ""
439+msgstr "Using GPS only (less accurate)"
440
440
441#: qml/Wizard/Pages/50-location.qml:86
441#: qml/Wizard/Pages/50-location.qml:86
442msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
442msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
443−msgstr ""
443+msgstr "Using GPS, anonymised Wi-Fi and cellular network info (recommended)"
444
444
445#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
445#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
446#: qml/Wizard/Pages/50-location.qml:103
446#: qml/Wizard/Pages/50-location.qml:103
@@ -448,81 +448,87 @@ msgid ""
448"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
448"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
449"conditions</a>."
449"conditions</a>."
450msgstr ""
450msgstr ""
451+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
452+"conditions</a>."
451
453
452#: qml/Wizard/Pages/50-location.qml:112
454#: qml/Wizard/Pages/50-location.qml:112
453msgid "Not at all"
455msgid "Not at all"
454−msgstr ""
456+msgstr "Not at all"
455
457
456#: qml/Wizard/Pages/50-location.qml:124
458#: qml/Wizard/Pages/50-location.qml:124
457msgid "You can change your mind later in <b>System Settings</b>."
459msgid "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>."
459
461
460#: qml/Wizard/Pages/60-reporting.qml:24
462#: qml/Wizard/Pages/60-reporting.qml:24
461msgid "Improving your experience"
463msgid "Improving your experience"
462−msgstr ""
464+msgstr "Improving your experience"
463
465
464#: qml/Wizard/Pages/60-reporting.qml:36
466#: qml/Wizard/Pages/60-reporting.qml:36
465msgid ""
467msgid ""
466"Your phone is set up to automatically report errors to Canonical and its "
468"Your phone is set up to automatically report errors to Canonical and its "
467"partners, the makers of the operating system."
469"partners, the makers of the operating system."
468msgstr ""
470msgstr ""
471+"Your phone is set up to automatically report errors to Canonical and its "
472+"partners, the makers of the operating system."
469
473
470#: qml/Wizard/Pages/60-reporting.qml:43
474#: qml/Wizard/Pages/60-reporting.qml:43
471msgid ""
475msgid ""
472"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
476"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
473"Privacy</b>"
477"Privacy</b>"
474msgstr ""
478msgstr ""
479+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
480+"Privacy</b>"
475
481
476#: qml/Wizard/Pages/80-finished.qml:24
482#: qml/Wizard/Pages/80-finished.qml:24
477msgid "All done"
483msgid "All done"
478−msgstr ""
484+msgstr "All done"
479
485
480#: qml/Wizard/Pages/80-finished.qml:39
486#: qml/Wizard/Pages/80-finished.qml:39
481msgid "Nice work!"
487msgid "Nice work!"
482−msgstr ""
488+msgstr "Nice work!"
483
489
484#: qml/Wizard/Pages/80-finished.qml:46
490#: qml/Wizard/Pages/80-finished.qml:46
485msgid "Your phone is now ready to use."
491msgid "Your phone is now ready to use."
486−msgstr ""
492+msgstr "Your phone is now ready to use."
487
493
488#: qml/Wizard/Pages/80-finished.qml:53
494#: qml/Wizard/Pages/80-finished.qml:53
489msgid "Finish"
495msgid "Finish"
490−msgstr ""
496+msgstr "Finish"
491
497
492#: qml/Wizard/Pages/here-terms.qml:27
498#: qml/Wizard/Pages/here-terms.qml:27
493msgid "Terms & Conditions"
499msgid "Terms & Conditions"
494−msgstr ""
500+msgstr "Terms & Conditions"
495
501
496#: qml/Wizard/Pages/passwd-confirm.qml:49
502#: qml/Wizard/Pages/passwd-confirm.qml:49
497msgid "Confirm passphrase"
503msgid "Confirm passphrase"
498−msgstr ""
504+msgstr "Confirm passphrase"
499
505
500#: qml/Wizard/Pages/passwd-confirm.qml:50
506#: qml/Wizard/Pages/passwd-confirm.qml:50
501msgid "Confirm passcode"
507msgid "Confirm passcode"
502−msgstr ""
508+msgstr "Confirm passcode"
503
509
504#: qml/Wizard/Pages/passwd-confirm.qml:53
510#: qml/Wizard/Pages/passwd-confirm.qml:53
505#: qml/Wizard/Pages/passwd-confirm.qml:54
511#: qml/Wizard/Pages/passwd-confirm.qml:54
506msgid "Please try again."
512msgid "Please try again."
507−msgstr ""
513+msgstr "Please try again."
508
514
509#: qml/Wizard/Pages/passwd-set.qml:61
515#: qml/Wizard/Pages/passwd-set.qml:61
510msgid "Choose your passcode"
516msgid "Choose your passcode"
511−msgstr ""
517+msgstr "Choose your passcode"
512
518
513#: qml/Wizard/Pages/passwd-set.qml:68
519#: qml/Wizard/Pages/passwd-set.qml:68
514msgid "Passphrase must be 4 characters long"
520msgid "Passphrase must be 4 characters long"
515−msgstr ""
521+msgstr "Passphrase must be 4 characters long"
516
522
517#: qml/Wizard/StackButton.qml:39
523#: qml/Wizard/StackButton.qml:39
518#, qt-format
524#, qt-format
519msgid "〈 %1"
525msgid "〈 %1"
520−msgstr ""
526+msgstr "〈 %1"
521
527
522#: qml/Wizard/StackButton.qml:42
528#: qml/Wizard/StackButton.qml:42
523#, qt-format
529#, qt-format
524msgid "%1 〉"
530msgid "%1 〉"
525−msgstr ""
531+msgstr "%1 〉"
526
532
527#~ msgid "Confirm"
533#~ msgid "Confirm"
528#~ msgstr "Confirm"
534#~ msgstr "Confirm"
po/en_GB.po+47−41
@@ -8,15 +8,15 @@ msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2014-12-10 10:55+0100\n"
10"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"
12"Last-Translator: Andi Chandler <Unknown>\n"
12"Last-Translator: Andi Chandler <Unknown>\n"
13"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
13"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"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: 2015-01-23 06:48+0000\n"
19−"X-Generator: Launchpad (build 17286)\n"
19+"X-Generator: Launchpad (build 17306)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
22msgid "Password: "
22msgid "Password: "
@@ -349,98 +349,98 @@ msgstr ""
349
349
350#: qml/Wizard/Page.qml:89
350#: qml/Wizard/Page.qml:89
351msgid "Back"
351msgid "Back"
352−msgstr ""
352+msgstr "Back"
353
353
354#: qml/Wizard/Pages/10-welcome.qml:27
354#: qml/Wizard/Pages/10-welcome.qml:27
355msgid "Hi!"
355msgid "Hi!"
356−msgstr ""
356+msgstr "Hi!"
357
357
358#: qml/Wizard/Pages/10-welcome.qml:44
358#: qml/Wizard/Pages/10-welcome.qml:44
359msgid "Welcome to your Ubuntu phone."
359msgid "Welcome to your Ubuntu phone."
360−msgstr ""
360+msgstr "Welcome to your Ubuntu phone."
361
361
362#: qml/Wizard/Pages/10-welcome.qml:52
362#: qml/Wizard/Pages/10-welcome.qml:52
363msgid "Let’s get started."
363msgid "Let’s get started."
364−msgstr ""
364+msgstr "Let’s get started."
365
365
366#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
366#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
367#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
367#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
368#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
368#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
369#: qml/Wizard/Pages/passwd-set.qml:90
369#: qml/Wizard/Pages/passwd-set.qml:90
370msgid "Continue"
370msgid "Continue"
371−msgstr ""
371+msgstr "Continue"
372
372
373#: qml/Wizard/Pages/20-sim.qml:25
373#: qml/Wizard/Pages/20-sim.qml:25
374msgid "Add a SIM card and restart your device"
374msgid "Add a SIM card and restart your device"
375−msgstr ""
375+msgstr "Add a SIM card and restart your device"
376
376
377#: qml/Wizard/Pages/20-sim.qml:55
377#: qml/Wizard/Pages/20-sim.qml:55
378msgid "Without it, you won’t be able to make calls or use text messaging."
378msgid "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."
380
380
381#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
381#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
382msgid "Skip"
382msgid "Skip"
383−msgstr ""
383+msgstr "Skip"
384
384
385#: qml/Wizard/Pages/30-passwd-type.qml:39
385#: qml/Wizard/Pages/30-passwd-type.qml:39
386msgid "Lock security"
386msgid "Lock security"
387−msgstr ""
387+msgstr "Lock security"
388
388
389#: qml/Wizard/Pages/30-passwd-type.qml:74
389#: qml/Wizard/Pages/30-passwd-type.qml:74
390msgid "Please select how you’d like to unlock your phone."
390msgid "Please select how you’d like to unlock your phone."
391−msgstr ""
391+msgstr "Please select how you’d like to unlock your phone."
392
392
393#: qml/Wizard/Pages/30-passwd-type.qml:97
393#: qml/Wizard/Pages/30-passwd-type.qml:97
394msgid "Swipe"
394msgid "Swipe"
395−msgstr ""
395+msgstr "Swipe"
396
396
397#: qml/Wizard/Pages/30-passwd-type.qml:98
397#: qml/Wizard/Pages/30-passwd-type.qml:98
398msgid "No security"
398msgid "No security"
399−msgstr ""
399+msgstr "No security"
400
400
401#: qml/Wizard/Pages/30-passwd-type.qml:100
401#: qml/Wizard/Pages/30-passwd-type.qml:100
402msgid "Passcode"
402msgid "Passcode"
403−msgstr ""
403+msgstr "Passcode"
404
404
405#: qml/Wizard/Pages/30-passwd-type.qml:101
405#: qml/Wizard/Pages/30-passwd-type.qml:101
406msgid "4 digits only"
406msgid "4 digits only"
407−msgstr ""
407+msgstr "4 digits only"
408
408
409#: qml/Wizard/Pages/30-passwd-type.qml:103
409#: qml/Wizard/Pages/30-passwd-type.qml:103
410msgid "Passphrase"
410msgid "Passphrase"
411−msgstr ""
411+msgstr "Passphrase"
412
412
413#: qml/Wizard/Pages/30-passwd-type.qml:104
413#: qml/Wizard/Pages/30-passwd-type.qml:104
414msgid "Numbers and letters"
414msgid "Numbers and letters"
415−msgstr ""
415+msgstr "Numbers and letters"
416
416
417#: qml/Wizard/Pages/40-wifi.qml:28
417#: qml/Wizard/Pages/40-wifi.qml:28
418msgid "Connect to Wi‑Fi"
418msgid "Connect to Wi‑Fi"
419−msgstr ""
419+msgstr "Connect to Wi‑Fi"
420
420
421#: qml/Wizard/Pages/40-wifi.qml:147
421#: qml/Wizard/Pages/40-wifi.qml:147
422msgid "Available networks…"
422msgid "Available networks…"
423−msgstr ""
423+msgstr "Available networks…"
424
424
425#: qml/Wizard/Pages/40-wifi.qml:148
425#: qml/Wizard/Pages/40-wifi.qml:148
426msgid "No available networks."
426msgid "No available networks."
427−msgstr ""
427+msgstr "No available networks."
428
428
429#: qml/Wizard/Pages/50-location.qml:27
429#: qml/Wizard/Pages/50-location.qml:27
430msgid "Location"
430msgid "Location"
431−msgstr ""
431+msgstr "Location"
432
432
433#: qml/Wizard/Pages/50-location.qml:62
433#: qml/Wizard/Pages/50-location.qml:62
434msgid "Let the phone detect your location:"
434msgid "Let the phone detect your location:"
435−msgstr ""
435+msgstr "Let the phone detect your location:"
436
436
437#: qml/Wizard/Pages/50-location.qml:69
437#: qml/Wizard/Pages/50-location.qml:69
438msgid "Using GPS only (less accurate)"
438msgid "Using GPS only (less accurate)"
439−msgstr ""
439+msgstr "Using GPS only (less accurate)"
440
440
441#: qml/Wizard/Pages/50-location.qml:86
441#: qml/Wizard/Pages/50-location.qml:86
442msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
442msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
443−msgstr ""
443+msgstr "Using GPS, anonymised Wi-Fi and cellular network info (recommended)"
444
444
445#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
445#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
446#: qml/Wizard/Pages/50-location.qml:103
446#: qml/Wizard/Pages/50-location.qml:103
@@ -448,81 +448,87 @@ msgid ""
448"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
448"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
449"conditions</a>."
449"conditions</a>."
450msgstr ""
450msgstr ""
451+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
452+"conditions</a>."
451
453
452#: qml/Wizard/Pages/50-location.qml:112
454#: qml/Wizard/Pages/50-location.qml:112
453msgid "Not at all"
455msgid "Not at all"
454−msgstr ""
456+msgstr "Not at all"
455
457
456#: qml/Wizard/Pages/50-location.qml:124
458#: qml/Wizard/Pages/50-location.qml:124
457msgid "You can change your mind later in <b>System Settings</b>."
459msgid "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>."
459
461
460#: qml/Wizard/Pages/60-reporting.qml:24
462#: qml/Wizard/Pages/60-reporting.qml:24
461msgid "Improving your experience"
463msgid "Improving your experience"
462−msgstr ""
464+msgstr "Improving your experience"
463
465
464#: qml/Wizard/Pages/60-reporting.qml:36
466#: qml/Wizard/Pages/60-reporting.qml:36
465msgid ""
467msgid ""
466"Your phone is set up to automatically report errors to Canonical and its "
468"Your phone is set up to automatically report errors to Canonical and its "
467"partners, the makers of the operating system."
469"partners, the makers of the operating system."
468msgstr ""
470msgstr ""
471+"Your phone is set up to automatically report errors to Canonical and its "
472+"partners, the makers of the operating system."
469
473
470#: qml/Wizard/Pages/60-reporting.qml:43
474#: qml/Wizard/Pages/60-reporting.qml:43
471msgid ""
475msgid ""
472"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
476"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
473"Privacy</b>"
477"Privacy</b>"
474msgstr ""
478msgstr ""
479+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
480+"Privacy</b>"
475
481
476#: qml/Wizard/Pages/80-finished.qml:24
482#: qml/Wizard/Pages/80-finished.qml:24
477msgid "All done"
483msgid "All done"
478−msgstr ""
484+msgstr "All done"
479
485
480#: qml/Wizard/Pages/80-finished.qml:39
486#: qml/Wizard/Pages/80-finished.qml:39
481msgid "Nice work!"
487msgid "Nice work!"
482−msgstr ""
488+msgstr "Nice work!"
483
489
484#: qml/Wizard/Pages/80-finished.qml:46
490#: qml/Wizard/Pages/80-finished.qml:46
485msgid "Your phone is now ready to use."
491msgid "Your phone is now ready to use."
486−msgstr ""
492+msgstr "Your phone is now ready to use."
487
493
488#: qml/Wizard/Pages/80-finished.qml:53
494#: qml/Wizard/Pages/80-finished.qml:53
489msgid "Finish"
495msgid "Finish"
490−msgstr ""
496+msgstr "Finish"
491
497
492#: qml/Wizard/Pages/here-terms.qml:27
498#: qml/Wizard/Pages/here-terms.qml:27
493msgid "Terms & Conditions"
499msgid "Terms & Conditions"
494−msgstr ""
500+msgstr "Terms & Conditions"
495
501
496#: qml/Wizard/Pages/passwd-confirm.qml:49
502#: qml/Wizard/Pages/passwd-confirm.qml:49
497msgid "Confirm passphrase"
503msgid "Confirm passphrase"
498−msgstr ""
504+msgstr "Confirm passphrase"
499
505
500#: qml/Wizard/Pages/passwd-confirm.qml:50
506#: qml/Wizard/Pages/passwd-confirm.qml:50
501msgid "Confirm passcode"
507msgid "Confirm passcode"
502−msgstr ""
508+msgstr "Confirm passcode"
503
509
504#: qml/Wizard/Pages/passwd-confirm.qml:53
510#: qml/Wizard/Pages/passwd-confirm.qml:53
505#: qml/Wizard/Pages/passwd-confirm.qml:54
511#: qml/Wizard/Pages/passwd-confirm.qml:54
506msgid "Please try again."
512msgid "Please try again."
507−msgstr ""
513+msgstr "Please try again."
508
514
509#: qml/Wizard/Pages/passwd-set.qml:61
515#: qml/Wizard/Pages/passwd-set.qml:61
510msgid "Choose your passcode"
516msgid "Choose your passcode"
511−msgstr ""
517+msgstr "Choose your passcode"
512
518
513#: qml/Wizard/Pages/passwd-set.qml:68
519#: qml/Wizard/Pages/passwd-set.qml:68
514msgid "Passphrase must be 4 characters long"
520msgid "Passphrase must be 4 characters long"
515−msgstr ""
521+msgstr "Passphrase must be 4 characters long"
516
522
517#: qml/Wizard/StackButton.qml:39
523#: qml/Wizard/StackButton.qml:39
518#, qt-format
524#, qt-format
519msgid "〈 %1"
525msgid "〈 %1"
520−msgstr ""
526+msgstr "〈 %1"
521
527
522#: qml/Wizard/StackButton.qml:42
528#: qml/Wizard/StackButton.qml:42
523#, qt-format
529#, qt-format
524msgid "%1 〉"
530msgid "%1 〉"
525−msgstr ""
531+msgstr "%1 〉"
526
532
527#~ msgid "Confirm"
533#~ msgid "Confirm"
528#~ msgstr "Confirm"
534#~ msgstr "Confirm"
po/eu.po+51−43
@@ -8,15 +8,15 @@ msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2014-12-10 10:55+0100\n"
10"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"
12"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"
12"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"
13"Language-Team: Basque <eu@li.org>\n"
13"Language-Team: Basque <eu@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"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: 2015-01-23 06:48+0000\n"
19−"X-Generator: Launchpad (build 17286)\n"
19+"X-Generator: Launchpad (build 17306)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
22msgid "Password: "
22msgid "Password: "
@@ -231,15 +231,15 @@ msgstr "Askatu freskatzeko…"
231
231
232#: qml/Dash/ScopesList.qml:63
232#: qml/Dash/ScopesList.qml:63
233msgid "Manage"
233msgid "Manage"
234−msgstr ""
234+msgstr "Kudeatu"
235
235
236#: qml/Dash/ScopesList.qml:107
236#: qml/Dash/ScopesList.qml:107
237msgid "Home"
237msgid "Home"
238−msgstr ""
238+msgstr "Hasiera"
239
239
240#: qml/Dash/ScopesList.qml:108
240#: qml/Dash/ScopesList.qml:108
241msgid "Also installed"
241msgid "Also installed"
242−msgstr ""
242+msgstr "Hau ere instalatuta"
243
243
244#: qml/Greeter/Greeter.qml:174
244#: qml/Greeter/Greeter.qml:174
245msgid "Unlock"
245msgid "Unlock"
@@ -353,98 +353,100 @@ msgstr ""
353
353
354#: qml/Wizard/Page.qml:89
354#: qml/Wizard/Page.qml:89
355msgid "Back"
355msgid "Back"
356−msgstr ""
356+msgstr "Atzera"
357
357
358#: qml/Wizard/Pages/10-welcome.qml:27
358#: qml/Wizard/Pages/10-welcome.qml:27
359msgid "Hi!"
359msgid "Hi!"
360−msgstr ""
360+msgstr "Epa!"
361
361
362#: qml/Wizard/Pages/10-welcome.qml:44
362#: qml/Wizard/Pages/10-welcome.qml:44
363msgid "Welcome to your Ubuntu phone."
363msgid "Welcome to your Ubuntu phone."
364−msgstr ""
364+msgstr "Ongi etorri zure Ubuntu telefonora."
365
365
366#: qml/Wizard/Pages/10-welcome.qml:52
366#: qml/Wizard/Pages/10-welcome.qml:52
367msgid "Let’s get started."
367msgid "Let’s get started."
368−msgstr ""
368+msgstr "Has gaitezen."
369
369
370#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
370#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
371#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
371#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
372#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
372#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
373#: qml/Wizard/Pages/passwd-set.qml:90
373#: qml/Wizard/Pages/passwd-set.qml:90
374msgid "Continue"
374msgid "Continue"
375−msgstr ""
375+msgstr "Jarraitu"
376
376
377#: qml/Wizard/Pages/20-sim.qml:25
377#: qml/Wizard/Pages/20-sim.qml:25
378msgid "Add a SIM card and restart your device"
378msgid "Add a SIM card and restart your device"
379−msgstr ""
379+msgstr "Gehitu SIM txartel bat eta berrabiarazi zure gailua"
380
380
381#: qml/Wizard/Pages/20-sim.qml:55
381#: qml/Wizard/Pages/20-sim.qml:55
382msgid "Without it, you won’t be able to make calls or use text messaging."
382msgid "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."
384
384
385#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
385#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
386msgid "Skip"
386msgid "Skip"
387−msgstr ""
387+msgstr "Saltatu"
388
388
389#: qml/Wizard/Pages/30-passwd-type.qml:39
389#: qml/Wizard/Pages/30-passwd-type.qml:39
390msgid "Lock security"
390msgid "Lock security"
391−msgstr ""
391+msgstr "Blokeo-segurtasuna"
392
392
393#: qml/Wizard/Pages/30-passwd-type.qml:74
393#: qml/Wizard/Pages/30-passwd-type.qml:74
394msgid "Please select how you’d like to unlock your phone."
394msgid "Please select how you’d like to unlock your phone."
395−msgstr ""
395+msgstr "Aukeratu telefonoa nola desblokeatu nahi duzun."
396
396
397#: qml/Wizard/Pages/30-passwd-type.qml:97
397#: qml/Wizard/Pages/30-passwd-type.qml:97
398msgid "Swipe"
398msgid "Swipe"
399−msgstr ""
399+msgstr "Pasatu hatza"
400
400
401#: qml/Wizard/Pages/30-passwd-type.qml:98
401#: qml/Wizard/Pages/30-passwd-type.qml:98
402msgid "No security"
402msgid "No security"
403−msgstr ""
403+msgstr "Segurtasunik gabe"
404
404
405#: qml/Wizard/Pages/30-passwd-type.qml:100
405#: qml/Wizard/Pages/30-passwd-type.qml:100
406msgid "Passcode"
406msgid "Passcode"
407−msgstr ""
407+msgstr "Pasakodea"
408
408
409#: qml/Wizard/Pages/30-passwd-type.qml:101
409#: qml/Wizard/Pages/30-passwd-type.qml:101
410msgid "4 digits only"
410msgid "4 digits only"
411−msgstr ""
411+msgstr "4 digitu soilik"
412
412
413#: qml/Wizard/Pages/30-passwd-type.qml:103
413#: qml/Wizard/Pages/30-passwd-type.qml:103
414msgid "Passphrase"
414msgid "Passphrase"
415−msgstr ""
415+msgstr "Pasaesaldia"
416
416
417#: qml/Wizard/Pages/30-passwd-type.qml:104
417#: qml/Wizard/Pages/30-passwd-type.qml:104
418msgid "Numbers and letters"
418msgid "Numbers and letters"
419−msgstr ""
419+msgstr "Zenbakiak eta hizkiak"
420
420
421#: qml/Wizard/Pages/40-wifi.qml:28
421#: qml/Wizard/Pages/40-wifi.qml:28
422msgid "Connect to Wi‑Fi"
422msgid "Connect to Wi‑Fi"
423−msgstr ""
423+msgstr "Konektatu wifira"
424
424
425#: qml/Wizard/Pages/40-wifi.qml:147
425#: qml/Wizard/Pages/40-wifi.qml:147
426msgid "Available networks…"
426msgid "Available networks…"
427−msgstr ""
427+msgstr "Sare erabilgarriak…"
428
428
429#: qml/Wizard/Pages/40-wifi.qml:148
429#: qml/Wizard/Pages/40-wifi.qml:148
430msgid "No available networks."
430msgid "No available networks."
431−msgstr ""
431+msgstr "Ez dago sare erabilgarririk."
432
432
433#: qml/Wizard/Pages/50-location.qml:27
433#: qml/Wizard/Pages/50-location.qml:27
434msgid "Location"
434msgid "Location"
435−msgstr ""
435+msgstr "Kokalekua"
436
436
437#: qml/Wizard/Pages/50-location.qml:62
437#: qml/Wizard/Pages/50-location.qml:62
438msgid "Let the phone detect your location:"
438msgid "Let the phone detect your location:"
439−msgstr ""
439+msgstr "Utzi telefonoari zure kokalekua detektatzen:"
440
440
441#: qml/Wizard/Pages/50-location.qml:69
441#: qml/Wizard/Pages/50-location.qml:69
442msgid "Using GPS only (less accurate)"
442msgid "Using GPS only (less accurate)"
443−msgstr ""
443+msgstr "GPSa soilik erabiltzen (zehaztasun gutxiago)"
444
444
445#: qml/Wizard/Pages/50-location.qml:86
445#: qml/Wizard/Pages/50-location.qml:86
446msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
446msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
447msgstr ""
447msgstr ""
448+"GPSa, wifi anonimotua eta sare mugikorraren informazioa erabiltzen "
449+"(gomendatua)"
448
450
449#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
451#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
450#: qml/Wizard/Pages/50-location.qml:103
452#: qml/Wizard/Pages/50-location.qml:103
@@ -452,81 +454,87 @@ msgid ""
452"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
454"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
453"conditions</a>."
455"conditions</a>."
454msgstr ""
456msgstr ""
457+"Aukera hau hautatuz, Nokia HERE(r)en <a href='#'>baldintzak</a> onartzeko "
458+"dituzu."
455
459
456#: qml/Wizard/Pages/50-location.qml:112
460#: qml/Wizard/Pages/50-location.qml:112
457msgid "Not at all"
461msgid "Not at all"
458−msgstr ""
462+msgstr "Bat ere ez"
459
463
460#: qml/Wizard/Pages/50-location.qml:124
464#: qml/Wizard/Pages/50-location.qml:124
461msgid "You can change your mind later in <b>System Settings</b>."
465msgid "You can change your mind later in <b>System Settings</b>."
462−msgstr ""
466+msgstr "Geroago ere alda dezakezu <b>Sistemaren ezarpenetan</b>."
463
467
464#: qml/Wizard/Pages/60-reporting.qml:24
468#: qml/Wizard/Pages/60-reporting.qml:24
465msgid "Improving your experience"
469msgid "Improving your experience"
466−msgstr ""
470+msgstr "Zure esperientzia hobetuz"
467
471
468#: qml/Wizard/Pages/60-reporting.qml:36
472#: qml/Wizard/Pages/60-reporting.qml:36
469msgid ""
473msgid ""
470"Your phone is set up to automatically report errors to Canonical and its "
474"Your phone is set up to automatically report errors to Canonical and its "
471"partners, the makers of the operating system."
475"partners, the makers of the operating system."
472msgstr ""
476msgstr ""
477+"Telefonoa erroreen berria automatikoki Canonical-i eta honen bazkideei "
478+"emateko konfiguratuta dago, sistema eragilearen egileei."
473
479
474#: qml/Wizard/Pages/60-reporting.qml:43
480#: qml/Wizard/Pages/60-reporting.qml:43
475msgid ""
481msgid ""
476"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
482"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
477"Privacy</b>"
483"Privacy</b>"
478msgstr ""
484msgstr ""
485+"Hau <b>Sistemaren ezarpenetatik</b> desgaitu daiteke, <b>Segurtasuna eta "
486+"pribatutasuna</b> atalean"
479
487
480#: qml/Wizard/Pages/80-finished.qml:24
488#: qml/Wizard/Pages/80-finished.qml:24
481msgid "All done"
489msgid "All done"
482−msgstr ""
490+msgstr "Eginda"
483
491
484#: qml/Wizard/Pages/80-finished.qml:39
492#: qml/Wizard/Pages/80-finished.qml:39
485msgid "Nice work!"
493msgid "Nice work!"
486−msgstr ""
494+msgstr "Bikain!"
487
495
488#: qml/Wizard/Pages/80-finished.qml:46
496#: qml/Wizard/Pages/80-finished.qml:46
489msgid "Your phone is now ready to use."
497msgid "Your phone is now ready to use."
490−msgstr ""
498+msgstr "Zure telefonoa erabiltzeko prest dago."
491
499
492#: qml/Wizard/Pages/80-finished.qml:53
500#: qml/Wizard/Pages/80-finished.qml:53
493msgid "Finish"
501msgid "Finish"
494−msgstr ""
502+msgstr "Amaitu"
495
503
496#: qml/Wizard/Pages/here-terms.qml:27
504#: qml/Wizard/Pages/here-terms.qml:27
497msgid "Terms & Conditions"
505msgid "Terms & Conditions"
498−msgstr ""
506+msgstr "Baldintzak"
499
507
500#: qml/Wizard/Pages/passwd-confirm.qml:49
508#: qml/Wizard/Pages/passwd-confirm.qml:49
501msgid "Confirm passphrase"
509msgid "Confirm passphrase"
502−msgstr ""
510+msgstr "Berretsi pasaesaldia"
503
511
504#: qml/Wizard/Pages/passwd-confirm.qml:50
512#: qml/Wizard/Pages/passwd-confirm.qml:50
505msgid "Confirm passcode"
513msgid "Confirm passcode"
506−msgstr ""
514+msgstr "Berretsi pasakodea"
507
515
508#: qml/Wizard/Pages/passwd-confirm.qml:53
516#: qml/Wizard/Pages/passwd-confirm.qml:53
509#: qml/Wizard/Pages/passwd-confirm.qml:54
517#: qml/Wizard/Pages/passwd-confirm.qml:54
510msgid "Please try again."
518msgid "Please try again."
511−msgstr ""
519+msgstr "Saiatu berriro."
512
520
513#: qml/Wizard/Pages/passwd-set.qml:61
521#: qml/Wizard/Pages/passwd-set.qml:61
514msgid "Choose your passcode"
522msgid "Choose your passcode"
515−msgstr ""
523+msgstr "Aukeratu zure pasakodea"
516
524
517#: qml/Wizard/Pages/passwd-set.qml:68
525#: qml/Wizard/Pages/passwd-set.qml:68
518msgid "Passphrase must be 4 characters long"
526msgid "Passphrase must be 4 characters long"
519−msgstr ""
527+msgstr "Pasaesaldiak 4 karaktereko luzera izan behar du"
520
528
521#: qml/Wizard/StackButton.qml:39
529#: qml/Wizard/StackButton.qml:39
522#, qt-format
530#, qt-format
523msgid "〈 %1"
531msgid "〈 %1"
524−msgstr ""
532+msgstr "〈 %1"
525
533
526#: qml/Wizard/StackButton.qml:42
534#: qml/Wizard/StackButton.qml:42
527#, qt-format
535#, qt-format
528msgid "%1 〉"
536msgid "%1 〉"
529−msgstr ""
537+msgstr "%1 〉"
530
538
531#~ msgid "Type or say a command"
539#~ msgid "Type or say a command"
532#~ msgstr "Idatzi edo esan agindu bat"
540#~ msgstr "Idatzi edo esan agindu bat"
po/pt.po+30−29
@@ -8,15 +8,15 @@ msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2014-12-10 10:55+0100\n"
10"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11−"PO-Revision-Date: 2014-11-06 10:25+0000\n"
11+"PO-Revision-Date: 2015-01-20 21:11+0000\n"
12−"Last-Translator: Ivo Xavier <ivofernandes12@gmail.com>\n"
12+"Last-Translator: Filipe André Pinho <Unknown>\n"
13"Language-Team: Portuguese <pt@li.org>\n"
13"Language-Team: Portuguese <pt@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"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: 2015-01-21 06:43+0000\n"
19−"X-Generator: Launchpad (build 17286)\n"
19+"X-Generator: Launchpad (build 17306)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
22msgid "Password: "
22msgid "Password: "
@@ -229,15 +229,15 @@ msgstr "Solte para atualizar..."
229
229
230#: qml/Dash/ScopesList.qml:63
230#: qml/Dash/ScopesList.qml:63
231msgid "Manage"
231msgid "Manage"
232−msgstr ""
232+msgstr "Gerir"
233
233
234#: qml/Dash/ScopesList.qml:107
234#: qml/Dash/ScopesList.qml:107
235msgid "Home"
235msgid "Home"
236−msgstr ""
236+msgstr "Página inicial"
237
237
238#: qml/Dash/ScopesList.qml:108
238#: qml/Dash/ScopesList.qml:108
239msgid "Also installed"
239msgid "Also installed"
240−msgstr ""
240+msgstr "Também instalado"
241
241
242#: qml/Greeter/Greeter.qml:174
242#: qml/Greeter/Greeter.qml:174
243msgid "Unlock"
243msgid "Unlock"
@@ -351,38 +351,39 @@ msgstr ""
351
351
352#: qml/Wizard/Page.qml:89
352#: qml/Wizard/Page.qml:89
353msgid "Back"
353msgid "Back"
354−msgstr ""
354+msgstr "Anterior"
355
355
356#: qml/Wizard/Pages/10-welcome.qml:27
356#: qml/Wizard/Pages/10-welcome.qml:27
357msgid "Hi!"
357msgid "Hi!"
358−msgstr ""
358+msgstr "Olá!"
359
359
360#: qml/Wizard/Pages/10-welcome.qml:44
360#: qml/Wizard/Pages/10-welcome.qml:44
361msgid "Welcome to your Ubuntu phone."
361msgid "Welcome to your Ubuntu phone."
362−msgstr ""
362+msgstr "Bem-vindo ao seu telemóvel Ubuntu."
363
363
364#: qml/Wizard/Pages/10-welcome.qml:52
364#: qml/Wizard/Pages/10-welcome.qml:52
365msgid "Let’s get started."
365msgid "Let’s get started."
366−msgstr ""
366+msgstr "Vamos começar!"
367
367
368#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
368#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
369#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
369#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
370#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
370#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
371#: qml/Wizard/Pages/passwd-set.qml:90
371#: qml/Wizard/Pages/passwd-set.qml:90
372msgid "Continue"
372msgid "Continue"
373−msgstr ""
373+msgstr "Avançar"
374
374
375#: qml/Wizard/Pages/20-sim.qml:25
375#: qml/Wizard/Pages/20-sim.qml:25
376msgid "Add a SIM card and restart your device"
376msgid "Add a SIM card and restart your device"
377−msgstr ""
377+msgstr "Adicione o cartão SIM e reinicie o seu dispositivo"
378
378
379#: qml/Wizard/Pages/20-sim.qml:55
379#: qml/Wizard/Pages/20-sim.qml:55
380msgid "Without it, you won’t be able to make calls or use text messaging."
380msgid "Without it, you won’t be able to make calls or use text messaging."
381msgstr ""
381msgstr ""
382+"Sem o cartão SIM, não poderá fazer chamadas ou enviar mensagens de texto."
382
383
383#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
384#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
384msgid "Skip"
385msgid "Skip"
385−msgstr ""
386+msgstr "Ignorar"
386
387
387#: qml/Wizard/Pages/30-passwd-type.qml:39
388#: qml/Wizard/Pages/30-passwd-type.qml:39
388msgid "Lock security"
389msgid "Lock security"
@@ -390,7 +391,7 @@ msgstr ""
390
391
391#: qml/Wizard/Pages/30-passwd-type.qml:74
392#: qml/Wizard/Pages/30-passwd-type.qml:74
392msgid "Please select how you’d like to unlock your phone."
393msgid "Please select how you’d like to unlock your phone."
393−msgstr ""
394+msgstr "Por favor, escolha como pretende desbloquear o seu telemóvel."
394
395
395#: qml/Wizard/Pages/30-passwd-type.qml:97
396#: qml/Wizard/Pages/30-passwd-type.qml:97
396msgid "Swipe"
397msgid "Swipe"
@@ -398,7 +399,7 @@ msgstr ""
398
399
399#: qml/Wizard/Pages/30-passwd-type.qml:98
400#: qml/Wizard/Pages/30-passwd-type.qml:98
400msgid "No security"
401msgid "No security"
401−msgstr ""
402+msgstr "Sem segurança"
402
403
403#: qml/Wizard/Pages/30-passwd-type.qml:100
404#: qml/Wizard/Pages/30-passwd-type.qml:100
404msgid "Passcode"
405msgid "Passcode"
@@ -406,7 +407,7 @@ msgstr ""
406
407
407#: qml/Wizard/Pages/30-passwd-type.qml:101
408#: qml/Wizard/Pages/30-passwd-type.qml:101
408msgid "4 digits only"
409msgid "4 digits only"
409−msgstr ""
410+msgstr "4 dígitos"
410
411
411#: qml/Wizard/Pages/30-passwd-type.qml:103
412#: qml/Wizard/Pages/30-passwd-type.qml:103
412msgid "Passphrase"
413msgid "Passphrase"
@@ -414,31 +415,31 @@ msgstr ""
414
415
415#: qml/Wizard/Pages/30-passwd-type.qml:104
416#: qml/Wizard/Pages/30-passwd-type.qml:104
416msgid "Numbers and letters"
417msgid "Numbers and letters"
417−msgstr ""
418+msgstr "Números e letras"
418
419
419#: qml/Wizard/Pages/40-wifi.qml:28
420#: qml/Wizard/Pages/40-wifi.qml:28
420msgid "Connect to Wi‑Fi"
421msgid "Connect to Wi‑Fi"
421−msgstr ""
422+msgstr "Ligar ao Wi-Fi"
422
423
423#: qml/Wizard/Pages/40-wifi.qml:147
424#: qml/Wizard/Pages/40-wifi.qml:147
424msgid "Available networks…"
425msgid "Available networks…"
425−msgstr ""
426+msgstr "Redes disponíveis..."
426
427
427#: qml/Wizard/Pages/40-wifi.qml:148
428#: qml/Wizard/Pages/40-wifi.qml:148
428msgid "No available networks."
429msgid "No available networks."
429−msgstr ""
430+msgstr "Sem redes disponíveis."
430
431
431#: qml/Wizard/Pages/50-location.qml:27
432#: qml/Wizard/Pages/50-location.qml:27
432msgid "Location"
433msgid "Location"
433−msgstr ""
434+msgstr "Localização"
434
435
435#: qml/Wizard/Pages/50-location.qml:62
436#: qml/Wizard/Pages/50-location.qml:62
436msgid "Let the phone detect your location:"
437msgid "Let the phone detect your location:"
437−msgstr ""
438+msgstr "Deixe o telefone detectar a sua localização:"
438
439
439#: qml/Wizard/Pages/50-location.qml:69
440#: qml/Wizard/Pages/50-location.qml:69
440msgid "Using GPS only (less accurate)"
441msgid "Using GPS only (less accurate)"
441−msgstr ""
442+msgstr "Usar apenas GPS (menos preciso)"
442
443
443#: qml/Wizard/Pages/50-location.qml:86
444#: qml/Wizard/Pages/50-location.qml:86
444msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
445msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
@@ -461,7 +462,7 @@ msgstr ""
461
462
462#: qml/Wizard/Pages/60-reporting.qml:24
463#: qml/Wizard/Pages/60-reporting.qml:24
463msgid "Improving your experience"
464msgid "Improving your experience"
464−msgstr ""
465+msgstr "Melhore a sua experiência"
465
466
466#: qml/Wizard/Pages/60-reporting.qml:36
467#: qml/Wizard/Pages/60-reporting.qml:36
467msgid ""
468msgid ""
@@ -481,7 +482,7 @@ msgstr ""
481
482
482#: qml/Wizard/Pages/80-finished.qml:39
483#: qml/Wizard/Pages/80-finished.qml:39
483msgid "Nice work!"
484msgid "Nice work!"
484−msgstr ""
485+msgstr "Bom trabalho!"
485
486
486#: qml/Wizard/Pages/80-finished.qml:46
487#: qml/Wizard/Pages/80-finished.qml:46
487msgid "Your phone is now ready to use."
488msgid "Your phone is now ready to use."
@@ -489,7 +490,7 @@ msgstr ""
489
490
490#: qml/Wizard/Pages/80-finished.qml:53
491#: qml/Wizard/Pages/80-finished.qml:53
491msgid "Finish"
492msgid "Finish"
492−msgstr ""
493+msgstr "Concluir"
493
494
494#: qml/Wizard/Pages/here-terms.qml:27
495#: qml/Wizard/Pages/here-terms.qml:27
495msgid "Terms & Conditions"
496msgid "Terms & Conditions"
@@ -506,7 +507,7 @@ msgstr ""
506#: qml/Wizard/Pages/passwd-confirm.qml:53
507#: qml/Wizard/Pages/passwd-confirm.qml:53
507#: qml/Wizard/Pages/passwd-confirm.qml:54
508#: qml/Wizard/Pages/passwd-confirm.qml:54
508msgid "Please try again."
509msgid "Please try again."
509−msgstr ""
510+msgstr "Por favor, tente novamente."
510
511
511#: qml/Wizard/Pages/passwd-set.qml:61
512#: qml/Wizard/Pages/passwd-set.qml:61
512msgid "Choose your passcode"
513msgid "Choose your passcode"
@@ -519,7 +520,7 @@ msgstr ""
519#: qml/Wizard/StackButton.qml:39
520#: qml/Wizard/StackButton.qml:39
520#, qt-format
521#, qt-format
521msgid "〈 %1"
522msgid "〈 %1"
522−msgstr ""
523+msgstr "〈 %1"
523
524
524#: qml/Wizard/StackButton.qml:42
525#: qml/Wizard/StackButton.qml:42
525#, qt-format
526#, qt-format
qml/Dash/Previews/PreviewTable.qml+6
@@ -37,6 +37,7 @@ PreviewWidget {
37 id: column
37 id: column
38 objectName: "column"
38 objectName: "column"
39 spacing: units.gu(1)
39 spacing: units.gu(1)
40+ width: parent.width
40
41
41 Label {
42 Label {
42 id: titleLabel
43 id: titleLabel
@@ -51,6 +52,7 @@ PreviewWidget {
51 visible: text !== ""
52 visible: text !== ""
52 opacity: .8
53 opacity: .8
53 text: widgetData["title"] || ""
54 text: widgetData["title"] || ""
55+ elide: Text.ElideRight
54 }
56 }
55
57
56 GridLayout {
58 GridLayout {
@@ -72,6 +74,10 @@ PreviewWidget {
72 visible: root.expanded || rowIndex < maximumCollapsedRowCount
74 visible: root.expanded || rowIndex < maximumCollapsedRowCount
73 color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
75 color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
74 font.bold: index == 0
76 font.bold: index == 0
77+ verticalAlignment: Text.AlignTop
78+ wrapMode: Text.WordWrap
79+ Layout.fillHeight: true
80+ Layout.maximumWidth: column.width - x
75 }
81 }
76 }
82 }
77 }
83 }
qml/Shell.qml+15−3
@@ -180,8 +180,20 @@ Item {
180
180
181 WindowKeysFilter {
181 WindowKeysFilter {
182 Keys.onPressed: {
182 Keys.onPressed: {
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);
183− if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {
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) {
184− dialogs.onPowerKeyPressed();
195+ dialogs.onPowerKeyPressed();
196+ }
185 event.accepted = true;
197 event.accepted = true;
186 } else {
198 } else {
187 volumeKeyFilter.onKeyPressed(event.key);
199 volumeKeyFilter.onKeyPressed(event.key);
@@ -652,7 +664,7 @@ Item {
652 target: callManager
664 target: callManager
653
665
654 onHasCallsChanged: {
666 onHasCallsChanged: {
655− if (shell.locked && callManager.hasCalls) {
667+ if (shell.locked && callManager.hasCalls && greeter.lockedApp !== "dialer-app") {
656 // We just received an incoming call while locked. The
668 // We just received an incoming call while locked. The
657 // indicator will have already launched dialer-app for us, but
669 // indicator will have already launched dialer-app for us, but
658 // there is a race between "hasCalls" changing and the dialer
670 // there is a race between "hasCalls" changing and the dialer
qml/Stages/DesktopStage.qml+8−44
@@ -94,6 +94,8 @@ Item {
94 width: units.gu(60)
94 width: units.gu(60)
95 height: units.gu(50)
95 height: units.gu(50)
96
96
97+ readonly property int minWidth: units.gu(10)
98+ readonly property int minHeight: units.gu(10)
97
99
98 states: [
100 states: [
99 State {
101 State {
@@ -114,51 +116,13 @@ Item {
114 }
116 }
115 ]
117 ]
116
118
117− MouseArea {
119+ WindowMoveResizeArea {
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;
120+ target: appDelegate
143− }
121+ minWidth: appDelegate.minWidth
144− }
122+ minHeight: appDelegate.minHeight
145−
123+ resizeHandleWidth: units.gu(0.5)
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− }
156
124
157− onReleased: {
125+ onPressed: ApplicationManager.requestFocusApplication(model.appId)
158− resizeWidth = false;
159− resizeHeight = false;
160− drag.target = undefined;
161− }
162 }
126 }
163
127
164 DecoratedWindow {
128 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
37# LD_LIBRARY_PATH.
37# LD_LIBRARY_PATH.
38add_dependencies(MockLightDM-qml MockLightDM-full MockUserMetrics)
38add_dependencies(MockLightDM-qml MockLightDM-full MockUserMetrics)
39target_link_libraries(MockLightDM-qml
39target_link_libraries(MockLightDM-qml
40− -L${CMAKE_CURRENT_BINARY_DIR}/full
40+ MockLightDM-full
41− -llightdm-qt5-2
42 -L${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics
41 -L${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics
43 -lusermetricsoutput
42 -lusermetricsoutput
44 unity8-private
43 unity8-private
tests/plugins/LightDM/CMakeLists.txt+1−4
@@ -11,10 +11,7 @@ include_directories(
11 ${LIBLIGHTDM_INCLUDE_DIRS}
11 ${LIBLIGHTDM_INCLUDE_DIRS}
12 )
12 )
13
13
14−target_link_libraries(GreeterDBusTestExec
14+target_link_libraries(GreeterDBusTestExec MockLightDM-full)
15− -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full
16− -llightdm-qt5-2
17− )
18
15
19add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
16add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
20
17
tests/qmltests/CMakeLists.txt+1
@@ -88,5 +88,6 @@ add_qml_test(Stages PhoneStage ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/
88add_qml_test(Stages SpreadDelegate ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
88add_qml_test(Stages SpreadDelegate ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
89add_qml_test(Stages SurfaceContainer ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
89add_qml_test(Stages SurfaceContainer ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
90add_qml_test(Stages SessionContainer ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
90add_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)
91add_qml_test(Stages Splash)
92add_qml_test(Stages Splash)
92add_qml_test(Wizard Wizard)
93add_qml_test(Wizard Wizard)
tests/qmltests/Dash/Previews/tst_PreviewTable.qml+6−5
@@ -27,17 +27,18 @@ Rectangle {
27 color: Theme.palette.selected.background
27 color: Theme.palette.selected.background
28
28
29 property var widgetDataComplete: {
29 property var widgetDataComplete: {
30− "title": "Title here",
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"], [ "Label 3", "Value 3"], [ "Label 4", "Value 4"], [ "Label 5", "Value 5"] ]
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"] ]
32 }
32 }
33
33
34 property var widgetDataNoTitle: {
34 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"] ]
36 }
36 }
37
37
38− PreviewTable {
38+ PreviewWidgetFactory {
39 id: previewTable
39 id: previewTable
40 anchors { left: parent.left; right: parent.right }
40 anchors { left: parent.left; right: parent.right }
41+ widgetType: "table"
41 widgetData: widgetDataComplete
42 widgetData: widgetDataComplete
42
43
43 Rectangle {
44 Rectangle {
@@ -59,7 +60,7 @@ Rectangle {
59 compare(findChild(previewTable, "label00").text, "Long Label 1");
60 compare(findChild(previewTable, "label00").text, "Long Label 1");
60 compare(findChild(previewTable, "label01").text, "Value 1");
61 compare(findChild(previewTable, "label01").text, "Value 1");
61 compare(findChild(previewTable, "label10").text, "Label 2");
62 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");
63 compare(findChild(previewTable, "label20").text, "Label 3");
64 compare(findChild(previewTable, "label20").text, "Label 3");
64 compare(findChild(previewTable, "label21").text, "Value 3");
65 compare(findChild(previewTable, "label21").text, "Value 3");
65 compare(findChild(previewTable, "label30").text, "Label 4");
66 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+}