ubuntu-system-settings

Merge lp:~laney/ubuntu-system-settings/translation-tweaks into lp:ubuntu-system-settings

  1. translation-tweaks
  2. Merge into trunk
Proposed by Iain Lane
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 412
Merged at revision: 409
Proposed branch: lp:~laney/ubuntu-system-settings/translation-tweaks
Merge into: lp:ubuntu-system-settings
Diff against target: 934 lines (+187/-155)
11 files modified
plugins/battery/PageComponent.qml (+16/-10)
plugins/battery/SleepValues.qml (+20/-15)
plugins/bluetooth/ConfirmPasskeyDialog.qml (+1/-0)
plugins/bluetooth/PageComponent.qml (+2/-0)
plugins/phone/PageComponent.qml (+1/-0)
plugins/phone/Services.qml (+1/-0)
plugins/security-privacy/LockSecurity.qml (+5/-5)
plugins/security-privacy/PageComponent.qml (+8/-3)
plugins/security-privacy/PhoneLocking.qml (+4/-3)
plugins/system-update/PageComponent.qml (+7/-2)
po/ubuntu-system-settings.pot (+122/-117)
To merge this branch: bzr merge lp:~laney/ubuntu-system-settings/translation-tweaks
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Sebastien Bacher (community) Approve
Review via email: mp+188374@code.launchpad.net

Commit message

Various translation tweaks as noted in LP: #1233214

Description of the change

Various translation tweaks as noted in LP: #1233214

To post a comment you must log in.
lp:~laney/ubuntu-system-settings/translation-tweaks updated
410. By Iain Lane

Give argument for singular form in all translations

411. By Iain Lane

make pot

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:409
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/427/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/427

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-system-settings-ci/427/rebuild

review: Approve (continuous-integration)
lp:~laney/ubuntu-system-settings/translation-tweaks updated
412. By Iain Lane

Fix plural translations harder

Revision history for this message
Sebastien Bacher (seb128) wrote :

looks fine to me

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:411
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/429/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/429

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-system-settings-ci/429/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/battery/PageComponent.qml'
2--- plugins/battery/PageComponent.qml 2013-09-30 11:09:29 +0000
3+++ plugins/battery/PageComponent.qml 2013-09-30 16:48:42 +0000
4@@ -43,13 +43,17 @@
5 hr = Math.round (timeDelta / 3600),
6 day = Math.round (timeDelta / 86400);
7 if (sec < 60)
8- return i18n.tr("%1 second ago".arg(sec), "%1 seconds ago".arg(sec), sec)
9+ // TRANSLATORS: %1 is the number of seconds
10+ return i18n.tr("%1 second ago", "%1 seconds ago", sec).arg(sec)
11 else if (min < 60)
12- return i18n.tr("%1 minute ago".arg(min), "%1 minutes ago".arg(min), min)
13+ // TRANSLATORS: %1 is the number of minutes
14+ return i18n.tr("%1 minute ago", "%1 minutes ago", min).arg(min)
15 else if (hr < 24)
16- return i18n.tr("%1 hour ago".arg(hr), "%1 hours ago".arg(hr), hr)
17+ // TRANSLATORS: %1 is the number of hours
18+ return i18n.tr("%1 hour ago", "%1 hours ago", hr).arg(hr)
19 else
20- return i18n.tr("%1 day ago".arg(day), "%1 days ago".arg(day), day)
21+ // TRANSLATORS: %1 is the number of days
22+ return i18n.tr("%1 day ago", "%1 days ago", day).arg(day)
23 }
24
25 GSettings {
26@@ -243,17 +247,19 @@
27 if (batteryBackend.powerdRunning ) {
28 var timeout = Math.round(powerSettings.activityTimeout/60)
29 return (powerSettings.activityTimeout != 0) ?
30- i18n.tr("After %1 minute".arg(timeout),
31- "After %1 minutes".arg(timeout),
32- timeout) :
33+ // TRANSLATORS: %1 is the number of minutes
34+ i18n.tr("After %1 minute",
35+ "After %1 minutes",
36+ timeout).arg(timeout) :
37 i18n.tr("Never")
38 }
39 else {
40 var timeout = Math.round(powerSettings.idleDelay/60)
41 return (powerSettings.idleDelay != 0) ?
42- i18n.tr("After %1 minute".arg(timeout),
43- "After %1 minutes".arg(timeout),
44- timeout) :
45+ // TRANSLATORS: %1 is the number of minutes
46+ i18n.tr("After %1 minute",
47+ "After %1 minutes",
48+ timeout).arg(timeout) :
49 i18n.tr("Never")
50 }
51 }
52
53=== modified file 'plugins/battery/SleepValues.qml'
54--- plugins/battery/SleepValues.qml 2013-09-09 14:34:08 +0000
55+++ plugins/battery/SleepValues.qml 2013-09-30 16:48:42 +0000
56@@ -73,21 +73,26 @@
57 id: sleepSelector
58 text: lockOnSuspend ? i18n.tr("Lock the phone when it's not in use:") : i18n.tr("Put the phone to sleep when it is not in use:")
59 model: [
60- i18n.tr("After %1 minute".arg(1),
61- "After %1 minutes".arg(1),
62- 1),
63- i18n.tr("After %1 minute".arg(2),
64- "After %1 minutes".arg(2),
65- 2),
66- i18n.tr("After %1 minute".arg(3),
67- "After %1 minutes".arg(3),
68- 3),
69- i18n.tr("After %1 minute".arg(4),
70- "After %1 minutes".arg(4),
71- 4),
72- i18n.tr("After %1 minute".arg(5),
73- "After %1 minutes".arg(5),
74- 5),
75+ // TRANSLATORS: %1 is the number of minutes
76+ i18n.tr("After %1 minute",
77+ "After %1 minutes",
78+ 1).arg(1),
79+ // TRANSLATORS: %1 is the number of minutes
80+ i18n.tr("After %1 minute",
81+ "After %1 minutes",
82+ 2).arg(2),
83+ // TRANSLATORS: %1 is the number of minutes
84+ i18n.tr("After %1 minute",
85+ "After %1 minutes",
86+ 3).arg(3),
87+ // TRANSLATORS: %1 is the number of minutes
88+ i18n.tr("After %1 minute",
89+ "After %1 minutes",
90+ 4).arg(4),
91+ // TRANSLATORS: %1 is the number of minutes
92+ i18n.tr("After %1 minute",
93+ "After %1 minutes",
94+ 5).arg(5),
95 i18n.tr("Never")]
96 expanded: true
97 onDelegateClicked: {
98
99=== modified file 'plugins/bluetooth/ConfirmPasskeyDialog.qml'
100--- plugins/bluetooth/ConfirmPasskeyDialog.qml 2013-09-23 02:50:33 +0000
101+++ plugins/bluetooth/ConfirmPasskeyDialog.qml 2013-09-30 16:48:42 +0000
102@@ -33,6 +33,7 @@
103 signal canceled
104 signal confirmed
105
106+ // TRANSLATORS: %1 is the name of the bluetooth device being paired
107 text: i18n.tr("Please confirm that the PIN displayed on '%1' matches this one").arg(root.name)
108
109 Label {
110
111=== modified file 'plugins/bluetooth/PageComponent.qml'
112--- plugins/bluetooth/PageComponent.qml 2013-09-27 03:18:36 +0000
113+++ plugins/bluetooth/PageComponent.qml 2013-09-30 16:48:42 +0000
114@@ -66,8 +66,10 @@
115
116 function getDisplayName(connection, displayName) {
117 if (connection == Device.Connecting)
118+ // TRANSLATORS: %1 is the display name of the device that is connecting
119 return i18n.tr("%1 (Connecting…)").arg(displayName);
120 else if (connection == Device.Disconnecting)
121+ // TRANSLATORS: %1 is the display name of the device that is disconnecting
122 return i18n.tr("%1 (Disconnecting…)").arg(displayName);
123 else
124 return displayName;
125
126=== modified file 'plugins/phone/PageComponent.qml'
127--- plugins/phone/PageComponent.qml 2013-08-07 17:58:12 +0000
128+++ plugins/phone/PageComponent.qml 2013-09-30 16:48:42 +0000
129@@ -57,6 +57,7 @@
130 ListItem.Divider {}
131
132 ListItem.Standard {
133+ // TRANSLATORS: %1 is the name of the (network) carrier
134 text: i18n.tr("%1 Services").arg(carrierString)
135 progression: true
136 enabled: sim.present
137
138=== modified file 'plugins/phone/Services.qml'
139--- plugins/phone/Services.qml 2013-07-31 01:51:36 +0000
140+++ plugins/phone/Services.qml 2013-09-30 16:48:42 +0000
141@@ -26,6 +26,7 @@
142 ItemPage {
143 property string carrierString
144 property var sim
145+ // TRANSLATORS: %1 is the name of the (network) carrier
146 title: i18n.tr("%1 Services").arg(carrierString)
147
148 Column {
149
150=== modified file 'plugins/security-privacy/LockSecurity.qml'
151--- plugins/security-privacy/LockSecurity.qml 2013-09-17 16:13:49 +0000
152+++ plugins/security-privacy/LockSecurity.qml 2013-09-30 16:48:42 +0000
153@@ -79,7 +79,7 @@
154 case UbuntuSecurityPrivacyPanel.Passphrase:
155 return i18n.tr("Change passphrase")
156 default: // To stop the runtime complaining
157- return i18n.tr("Change")
158+ return ""
159 }
160 } else {
161 switch (changeSecurityDialog.newMethod) {
162@@ -102,7 +102,7 @@
163 return i18n.tr("Existing passphrase")
164 // Shouldn't be reached when visible but still evaluated
165 default:
166- return i18n.tr("Existing")
167+ return ""
168 }
169 }
170
171@@ -168,7 +168,7 @@
172 return i18n.tr("Choose passphrase")
173 // Shouldn't be reached when visible but still evaluated
174 default:
175- return i18n.tr("Choose")
176+ return ""
177 }
178 }
179 visible: newInput.visible
180@@ -214,7 +214,7 @@
181 return i18n.tr("Confirm passphrase")
182 // Shouldn't be reached when visible but still evaluated
183 default:
184- return i18n.tr("Confirm")
185+ return ""
186 }
187 }
188 visible: confirmInput.visible
189@@ -259,7 +259,7 @@
190 return i18n.tr("Those passphrases don't match. Try again.")
191
192 //Fallback to prevent warnings. Not displayed.
193- return i18n.tr("Incorrect. Try again.")
194+ return ""
195 }
196 visible: false
197 color: "darkred"
198
199=== modified file 'plugins/security-privacy/PageComponent.qml'
200--- plugins/security-privacy/PageComponent.qml 2013-09-25 17:39:19 +0000
201+++ plugins/security-privacy/PageComponent.qml 2013-09-30 16:48:42 +0000
202@@ -68,9 +68,10 @@
203 }
204 ListItem.SingleValue {
205 text: i18n.tr("Phone locking")
206- value: i18n.tr("1 minute",
207- "%1 minutes".arg(5),
208- 5)
209+ // TRANSLATORS: %1 is the number of minutes
210+ value: i18n.tr("%1 minute",
211+ "%1 minutes",
212+ 5).arg(5)
213 progression: true
214 onClicked: pageStack.push(Qt.resolvedUrl("PhoneLocking.qml"))
215 visible: showAllUI
216@@ -147,7 +148,11 @@
217 text: i18n.tr("Diagnostics")
218 progression: true
219 value: diagnosticsWidget.canReportCrashes ?
220+ /* TRANSLATORS: This string is shown when crash
221+ reports are to be sent by the system. */
222 i18n.tr("Sent") :
223+ /* TRANSLATORS: This string is shown when crash
224+ reports are not to be sent by the system */
225 i18n.tr("Not sent")
226 onClicked: {
227 var path = "../diagnostics/PageComponent.qml";
228
229=== modified file 'plugins/security-privacy/PhoneLocking.qml'
230--- plugins/security-privacy/PhoneLocking.qml 2013-09-06 15:05:51 +0000
231+++ plugins/security-privacy/PhoneLocking.qml 2013-09-30 16:48:42 +0000
232@@ -61,9 +61,10 @@
233 UbuntuSecurityPrivacyPanel.Swipe
234 text: lockOnSuspend ? i18n.tr("Lock when idle")
235 : i18n.tr("Sleep when idle")
236- value: i18n.tr("1 minute",
237- "%1 minutes".arg(5),
238- 5)
239+ // TRANSLATORS: %1 is the number of minutes
240+ value: i18n.tr("%1 minute",
241+ "%1 minutes",
242+ 5).arg(5)
243 progression: true
244 onClicked:
245 pageStack.push(
246
247=== modified file 'plugins/system-update/PageComponent.qml'
248--- plugins/system-update/PageComponent.qml 2013-09-27 09:52:33 +0000
249+++ plugins/system-update/PageComponent.qml 2013-09-30 16:48:42 +0000
250@@ -63,7 +63,7 @@
251 currentUpdateState = UbuntuUpdatePanel.CheckingError;
252 return;
253 }
254- currentUpdateState = UbuntuUpdatePanel.Checking;
255+ currentUpdateStminutesate = UbuntuUpdatePanel.Checking;
256 infoMessage = checkinfoMessage;
257 CheckForUpdate();
258 }
259@@ -103,8 +103,10 @@
260 updateVersion = availableVersion;
261 var sizeInMB = updateSize/(1024*1024);
262 if (sizeInMB > 1024)
263+ // TRANSLATORS: %1 is the size of the update in GB
264 updateBackend.updateSize = i18n.tr("%1 GB").arg(Math.round(sizeInMB/1024*10)/10);
265- else
266+
267+ // TRANSLATORS: %1 is the size of the update in MB
268 updateBackend.updateSize = i18n.tr("%1 MB").arg(Math.round(sizeInMB*10)/10);
269 updateDescriptions = descriptions;
270
271@@ -113,6 +115,7 @@
272 }
273 else {
274 currentUpdateState = UbuntuUpdatePanel.NoUpdate;
275+ // TRANSLATORS: %1 is the date when the device was last updated
276 infoMessage = i18n.tr("No software update available") + "<br/>" + i18n.tr("Last updated %1").arg(lastUpdateDate);
277 }
278
279@@ -125,6 +128,7 @@
280 onUpdateProgress: {
281 downloadProgress = percentage;
282 if (eta > 0)
283+ // TRANSLATORS: %1 is the number of seconds remaining
284 downloadRemainingTime = i18n.tr("About %1 second remaining", "About %1 seconds remaining", eta).arg(eta);
285 else
286 downloadRemainingTime = i18n.tr("No estimate for the download");
287@@ -239,6 +243,7 @@
288
289 ListItem.Standard {
290 id: versionId
291+ // TRANSLATORS: %1 is the version of the update
292 text: i18n.tr("Version %1").arg(updateBackend.updateVersion)
293 showDivider: false
294 }
295
296=== modified file 'po/ubuntu-system-settings.pot'
297--- po/ubuntu-system-settings.pot 2013-09-30 09:43:13 +0000
298+++ po/ubuntu-system-settings.pot 2013-09-30 16:48:42 +0000
299@@ -8,7 +8,7 @@
300 msgstr ""
301 "Project-Id-Version: ubuntu-system-settings\n"
302 "Report-Msgid-Bugs-To: \n"
303-"POT-Creation-Date: 2013-09-30 09:38+0000\n"
304+"POT-Creation-Date: 2013-09-30 16:31+0000\n"
305 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
306 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
307 "Language-Team: LANGUAGE <LL@li.org>\n"
308@@ -27,8 +27,8 @@
309 msgstr ""
310
311 #: ../plugins/about/PageComponent.qml:77 ../plugins/about/PageComponent.qml:84
312-#: ../plugins/about/Storage.qml:190 ../plugins/battery/PageComponent.qml:124
313-#: ../plugins/battery/PageComponent.qml:136
314+#: ../plugins/about/Storage.qml:190 ../plugins/battery/PageComponent.qml:128
315+#: ../plugins/battery/PageComponent.qml:140
316 #: ../plugins/cellular/PageComponent.qml:73
317 msgid "N/A"
318 msgstr ""
319@@ -46,11 +46,11 @@
320 msgstr ""
321
322 #: ../plugins/about/PageComponent.qml:98
323-#: ../plugins/battery/PageComponent.qml:249
324-#: ../plugins/battery/PageComponent.qml:257
325-#: ../plugins/battery/SleepValues.qml:91
326+#: ../plugins/battery/PageComponent.qml:254
327+#: ../plugins/battery/PageComponent.qml:263
328+#: ../plugins/battery/SleepValues.qml:96
329 #: ../plugins/system-update/Download.qml:53
330-#: ../plugins/system-update/PageComponent.qml:334
331+#: ../plugins/system-update/PageComponent.qml:339
332 msgid "Never"
333 msgstr ""
334
335@@ -142,101 +142,106 @@
336 msgid "Battery"
337 msgstr ""
338
339-#: ../plugins/battery/PageComponent.qml:46
340+#. TRANSLATORS: %1 is the number of seconds
341+#: ../plugins/battery/PageComponent.qml:47
342 #, qt-format
343 msgid "%1 second ago"
344 msgid_plural "%1 seconds ago"
345 msgstr[0] ""
346 msgstr[1] ""
347
348-#: ../plugins/battery/PageComponent.qml:48
349+#. TRANSLATORS: %1 is the number of minutes
350+#: ../plugins/battery/PageComponent.qml:50
351 #, qt-format
352 msgid "%1 minute ago"
353 msgid_plural "%1 minutes ago"
354 msgstr[0] ""
355 msgstr[1] ""
356
357-#: ../plugins/battery/PageComponent.qml:50
358+#. TRANSLATORS: %1 is the number of hours
359+#: ../plugins/battery/PageComponent.qml:53
360 #, qt-format
361 msgid "%1 hour ago"
362 msgid_plural "%1 hours ago"
363 msgstr[0] ""
364 msgstr[1] ""
365
366-#: ../plugins/battery/PageComponent.qml:52
367+#. TRANSLATORS: %1 is the number of days
368+#: ../plugins/battery/PageComponent.qml:56
369 #, qt-format
370 msgid "%1 day ago"
371 msgid_plural "%1 days ago"
372 msgstr[0] ""
373 msgstr[1] ""
374
375-#: ../plugins/battery/PageComponent.qml:72
376+#: ../plugins/battery/PageComponent.qml:76
377 msgid "Charging now"
378 msgstr ""
379
380-#: ../plugins/battery/PageComponent.qml:76
381+#: ../plugins/battery/PageComponent.qml:80
382 msgid "Last full charge"
383 msgstr ""
384
385-#: ../plugins/battery/PageComponent.qml:80
386+#: ../plugins/battery/PageComponent.qml:84
387 msgid "Fully charged"
388 msgstr ""
389
390-#: ../plugins/battery/PageComponent.qml:119
391+#: ../plugins/battery/PageComponent.qml:123
392 msgid "Charge level"
393 msgstr ""
394
395 #. TRANSLATORS: %1 refers to a percentage that indicates the charging level of the battery
396-#: ../plugins/battery/PageComponent.qml:127
397+#: ../plugins/battery/PageComponent.qml:131
398 #, qt-format
399 msgid "%1%"
400 msgstr ""
401
402-#: ../plugins/battery/PageComponent.qml:180
403+#: ../plugins/battery/PageComponent.qml:184
404 msgid "Ways to reduce battery use:"
405 msgstr ""
406
407-#: ../plugins/battery/PageComponent.qml:184
408+#: ../plugins/battery/PageComponent.qml:188
409 msgid "Display brightness"
410 msgstr ""
411
412-#: ../plugins/battery/PageComponent.qml:241
413+#: ../plugins/battery/PageComponent.qml:245
414 #: ../plugins/security-privacy/PhoneLocking.qml:62
415 msgid "Lock when idle"
416 msgstr ""
417
418-#: ../plugins/battery/PageComponent.qml:241
419+#: ../plugins/battery/PageComponent.qml:245
420 #: ../plugins/security-privacy/PhoneLocking.qml:63
421 msgid "Sleep when idle"
422 msgstr ""
423
424-#: ../plugins/battery/PageComponent.qml:246
425-#: ../plugins/battery/PageComponent.qml:254
426-#: ../plugins/battery/SleepValues.qml:76 ../plugins/battery/SleepValues.qml:79
427-#: ../plugins/battery/SleepValues.qml:82 ../plugins/battery/SleepValues.qml:85
428-#: ../plugins/battery/SleepValues.qml:88
429+#. TRANSLATORS: %1 is the number of minutes
430+#: ../plugins/battery/PageComponent.qml:251
431+#: ../plugins/battery/PageComponent.qml:260
432+#: ../plugins/battery/SleepValues.qml:77 ../plugins/battery/SleepValues.qml:81
433+#: ../plugins/battery/SleepValues.qml:85 ../plugins/battery/SleepValues.qml:89
434+#: ../plugins/battery/SleepValues.qml:93
435 #, qt-format
436 msgid "After %1 minute"
437 msgid_plural "After %1 minutes"
438 msgstr[0] ""
439 msgstr[1] ""
440
441-#: ../plugins/battery/PageComponent.qml:267
442+#: ../plugins/battery/PageComponent.qml:273
443 #: ../plugins/wifi/PageComponent.qml:27 ../.build/settings.js:18
444 msgid "Wi-Fi"
445 msgstr ""
446
447-#: ../plugins/battery/PageComponent.qml:291
448-#: ../plugins/bluetooth/PageComponent.qml:98
449-#: ../plugins/bluetooth/PageComponent.qml:106 ../.build/settings.js:5
450+#: ../plugins/battery/PageComponent.qml:297
451+#: ../plugins/bluetooth/PageComponent.qml:100
452+#: ../plugins/bluetooth/PageComponent.qml:108 ../.build/settings.js:5
453 msgid "Bluetooth"
454 msgstr ""
455
456-#: ../plugins/battery/PageComponent.qml:320
457+#: ../plugins/battery/PageComponent.qml:326
458 msgid "GPS"
459 msgstr ""
460
461-#: ../plugins/battery/PageComponent.qml:338
462+#: ../plugins/battery/PageComponent.qml:344
463 msgid "Accurate location detection requires GPS and/or Wi-Fi."
464 msgstr ""
465
466@@ -248,13 +253,13 @@
467 msgid "Put the phone to sleep when it is not in use:"
468 msgstr ""
469
470-#: ../plugins/battery/SleepValues.qml:102
471+#: ../plugins/battery/SleepValues.qml:107
472 msgid ""
473 "Shorter times are more secure. Phone won't lock during calls or video "
474 "playback."
475 msgstr ""
476
477-#: ../plugins/battery/SleepValues.qml:102
478+#: ../plugins/battery/SleepValues.qml:107
479 msgid "Phone won’t sleep during calls or video playback."
480 msgstr ""
481
482@@ -263,12 +268,13 @@
483 msgid "Bluetooth Pairing Request"
484 msgstr ""
485
486-#: ../plugins/bluetooth/ConfirmPasskeyDialog.qml:36
487+#. TRANSLATORS: %1 is the name of the bluetooth device being paired
488+#: ../plugins/bluetooth/ConfirmPasskeyDialog.qml:37
489 #, qt-format
490 msgid "Please confirm that the PIN displayed on '%1' matches this one"
491 msgstr ""
492
493-#: ../plugins/bluetooth/ConfirmPasskeyDialog.qml:48
494+#: ../plugins/bluetooth/ConfirmPasskeyDialog.qml:49
495 #: ../plugins/bluetooth/ProvidePasskeyDialog.qml:54
496 #: ../plugins/language/DisplayLanguage.qml:95
497 #: ../plugins/phone/CallForwarding.qml:113
498@@ -280,133 +286,135 @@
499 msgid "Cancel"
500 msgstr ""
501
502-#: ../plugins/bluetooth/ConfirmPasskeyDialog.qml:56
503+#: ../plugins/bluetooth/ConfirmPasskeyDialog.qml:57
504 msgid "Confirm PIN"
505 msgstr ""
506
507-#: ../plugins/bluetooth/PageComponent.qml:59
508+#. TRANSLATORS: %1 is the display name of the device that is connecting
509+#: ../plugins/bluetooth/PageComponent.qml:60
510 #, qt-format
511 msgid "%1 (Connecting…)"
512 msgstr ""
513
514-#: ../plugins/bluetooth/PageComponent.qml:61
515+#. TRANSLATORS: %1 is the display name of the device that is disconnecting
516+#: ../plugins/bluetooth/PageComponent.qml:63
517 #, qt-format
518 msgid "%1 (Disconnecting…)"
519 msgstr ""
520
521-#: ../plugins/bluetooth/PageComponent.qml:68
522+#: ../plugins/bluetooth/PageComponent.qml:70
523 msgid "Computer"
524 msgstr ""
525
526-#: ../plugins/bluetooth/PageComponent.qml:69
527+#: ../plugins/bluetooth/PageComponent.qml:71
528 #: ../plugins/phone/PageComponent.qml:28 ../.build/settings.js:12
529 msgid "Phone"
530 msgstr ""
531
532-#: ../plugins/bluetooth/PageComponent.qml:70
533+#: ../plugins/bluetooth/PageComponent.qml:72
534 msgid "Modem"
535 msgstr ""
536
537-#: ../plugins/bluetooth/PageComponent.qml:71 ../src/qml/MainWindow.qml:90
538+#: ../plugins/bluetooth/PageComponent.qml:73 ../src/qml/MainWindow.qml:90
539 msgid "Network"
540 msgstr ""
541
542-#: ../plugins/bluetooth/PageComponent.qml:72
543+#: ../plugins/bluetooth/PageComponent.qml:74
544 msgid "Headset"
545 msgstr ""
546
547-#: ../plugins/bluetooth/PageComponent.qml:73
548+#: ../plugins/bluetooth/PageComponent.qml:75
549 msgid "Headphones"
550 msgstr ""
551
552-#: ../plugins/bluetooth/PageComponent.qml:74
553+#: ../plugins/bluetooth/PageComponent.qml:76
554 msgid "Video"
555 msgstr ""
556
557-#: ../plugins/bluetooth/PageComponent.qml:75
558+#: ../plugins/bluetooth/PageComponent.qml:77
559 msgid "Other Audio"
560 msgstr ""
561
562-#: ../plugins/bluetooth/PageComponent.qml:76
563+#: ../plugins/bluetooth/PageComponent.qml:78
564 msgid "Joypad"
565 msgstr ""
566
567-#: ../plugins/bluetooth/PageComponent.qml:77
568+#: ../plugins/bluetooth/PageComponent.qml:79
569 msgid "Keyboard"
570 msgstr ""
571
572-#: ../plugins/bluetooth/PageComponent.qml:78
573+#: ../plugins/bluetooth/PageComponent.qml:80
574 msgid "Tablet"
575 msgstr ""
576
577-#: ../plugins/bluetooth/PageComponent.qml:79
578+#: ../plugins/bluetooth/PageComponent.qml:81
579 msgid "Mouse"
580 msgstr ""
581
582-#: ../plugins/bluetooth/PageComponent.qml:80
583+#: ../plugins/bluetooth/PageComponent.qml:82
584 msgid "Printer"
585 msgstr ""
586
587-#: ../plugins/bluetooth/PageComponent.qml:81
588+#: ../plugins/bluetooth/PageComponent.qml:83
589 msgid "Camera"
590 msgstr ""
591
592-#: ../plugins/bluetooth/PageComponent.qml:82
593+#: ../plugins/bluetooth/PageComponent.qml:84
594 msgid "Other"
595 msgstr ""
596
597-#: ../plugins/bluetooth/PageComponent.qml:88
598+#: ../plugins/bluetooth/PageComponent.qml:90
599 msgid "Excellent"
600 msgstr ""
601
602-#: ../plugins/bluetooth/PageComponent.qml:89
603+#: ../plugins/bluetooth/PageComponent.qml:91
604 msgid "Good"
605 msgstr ""
606
607-#: ../plugins/bluetooth/PageComponent.qml:90
608+#: ../plugins/bluetooth/PageComponent.qml:92
609 msgid "Fair"
610 msgstr ""
611
612-#: ../plugins/bluetooth/PageComponent.qml:91
613+#: ../plugins/bluetooth/PageComponent.qml:93
614 msgid "Poor"
615 msgstr ""
616
617-#: ../plugins/bluetooth/PageComponent.qml:92
618-#: ../plugins/bluetooth/PageComponent.qml:175
619+#: ../plugins/bluetooth/PageComponent.qml:94
620 #: ../plugins/bluetooth/PageComponent.qml:183
621+#: ../plugins/bluetooth/PageComponent.qml:191
622 #: ../plugins/security-privacy/PhoneLocking.qml:40
623 msgid "None"
624 msgstr ""
625
626-#: ../plugins/bluetooth/PageComponent.qml:118
627+#: ../plugins/bluetooth/PageComponent.qml:120
628 msgid "Connected headset:"
629 msgstr ""
630
631-#: ../plugins/bluetooth/PageComponent.qml:146
632+#: ../plugins/bluetooth/PageComponent.qml:148
633 msgid "Connect a different headset:"
634 msgstr ""
635
636-#: ../plugins/bluetooth/PageComponent.qml:146
637+#: ../plugins/bluetooth/PageComponent.qml:148
638 msgid "Connect a headset:"
639 msgstr ""
640
641-#: ../plugins/bluetooth/PageComponent.qml:167
642+#: ../plugins/bluetooth/PageComponent.qml:174
643 msgid "None detected"
644 msgstr ""
645
646-#: ../plugins/bluetooth/PageComponent.qml:182
647+#: ../plugins/bluetooth/PageComponent.qml:190
648 msgid "Name"
649 msgstr ""
650
651-#: ../plugins/bluetooth/PageComponent.qml:186
652+#: ../plugins/bluetooth/PageComponent.qml:194
653 msgid "Type"
654 msgstr ""
655
656-#: ../plugins/bluetooth/PageComponent.qml:190
657+#: ../plugins/bluetooth/PageComponent.qml:198
658 msgid "Signal Strength"
659 msgstr ""
660
661-#: ../plugins/bluetooth/PageComponent.qml:195
662+#: ../plugins/bluetooth/PageComponent.qml:203
663 msgid "Disconnect"
664 msgstr ""
665
666@@ -470,7 +478,6 @@
667 msgstr ""
668
669 #: ../plugins/language/DisplayLanguage.qml:115
670-#: ../plugins/security-privacy/LockSecurity.qml:217
671 msgid "Confirm"
672 msgstr ""
673
674@@ -574,7 +581,8 @@
675 msgid "SIM"
676 msgstr ""
677
678-#: ../plugins/phone/PageComponent.qml:60 ../plugins/phone/Services.qml:29
679+#. TRANSLATORS: %1 is the name of the (network) carrier
680+#: ../plugins/phone/PageComponent.qml:61 ../plugins/phone/Services.qml:30
681 #, qt-format
682 msgid "%1 Services"
683 msgstr ""
684@@ -625,7 +633,7 @@
685 msgstr ""
686
687 #: ../plugins/security-privacy/Dash.qml:29
688-#: ../plugins/security-privacy/PageComponent.qml:116
689+#: ../plugins/security-privacy/PageComponent.qml:117
690 msgid "Dash search"
691 msgstr ""
692
693@@ -635,13 +643,13 @@
694
695 #: ../plugins/security-privacy/Dash.qml:50
696 #: ../plugins/security-privacy/PageComponent.qml:52
697-#: ../plugins/security-privacy/PageComponent.qml:119
698+#: ../plugins/security-privacy/PageComponent.qml:120
699 msgid "Phone only"
700 msgstr ""
701
702 #: ../plugins/security-privacy/Dash.qml:50
703 #: ../plugins/security-privacy/PageComponent.qml:50
704-#: ../plugins/security-privacy/PageComponent.qml:118
705+#: ../plugins/security-privacy/PageComponent.qml:119
706 msgid "Phone and Internet"
707 msgstr ""
708
709@@ -713,10 +721,6 @@
710 msgid "Change passphrase"
711 msgstr ""
712
713-#: ../plugins/security-privacy/LockSecurity.qml:82
714-msgid "Change"
715-msgstr ""
716-
717 #: ../plugins/security-privacy/LockSecurity.qml:87
718 msgid "Switch to swipe"
719 msgstr ""
720@@ -737,10 +741,6 @@
721 msgid "Existing passphrase"
722 msgstr ""
723
724-#: ../plugins/security-privacy/LockSecurity.qml:105
725-msgid "Existing"
726-msgstr ""
727-
728 #: ../plugins/security-privacy/LockSecurity.qml:150
729 msgid "Incorrect passcode. Try again."
730 msgstr ""
731@@ -750,7 +750,6 @@
732 msgstr ""
733
734 #: ../plugins/security-privacy/LockSecurity.qml:156
735-#: ../plugins/security-privacy/LockSecurity.qml:262
736 msgid "Incorrect. Try again."
737 msgstr ""
738
739@@ -762,10 +761,6 @@
740 msgid "Choose passphrase"
741 msgstr ""
742
743-#: ../plugins/security-privacy/LockSecurity.qml:171
744-msgid "Choose"
745-msgstr ""
746-
747 #: ../plugins/security-privacy/LockSecurity.qml:212
748 msgid "Confirm passcode"
749 msgstr ""
750@@ -840,47 +835,52 @@
751 msgid "Phone locking"
752 msgstr ""
753
754-#: ../plugins/security-privacy/PageComponent.qml:71
755-#: ../plugins/security-privacy/PhoneLocking.qml:64
756+#. TRANSLATORS: %1 is the number of minutes
757+#: ../plugins/security-privacy/PageComponent.qml:72
758+#: ../plugins/security-privacy/PhoneLocking.qml:65
759 #, qt-format
760-msgid "1 minute"
761+msgid "%1 minute"
762 msgid_plural "%1 minutes"
763 msgstr[0] ""
764 msgstr[1] ""
765
766-#: ../plugins/security-privacy/PageComponent.qml:79
767+#: ../plugins/security-privacy/PageComponent.qml:80
768 msgid "SIM PIN"
769 msgstr ""
770
771-#: ../plugins/security-privacy/PageComponent.qml:85
772+#: ../plugins/security-privacy/PageComponent.qml:86
773 msgid "Privacy:"
774 msgstr ""
775
776-#: ../plugins/security-privacy/PageComponent.qml:88
777+#: ../plugins/security-privacy/PageComponent.qml:89
778 msgid "Stats on welcome screen"
779 msgstr ""
780
781-#: ../plugins/security-privacy/PageComponent.qml:101
782+#: ../plugins/security-privacy/PageComponent.qml:102
783 msgid "Messages on welcome screen"
784 msgstr ""
785
786-#: ../plugins/security-privacy/PageComponent.qml:134
787+#: ../plugins/security-privacy/PageComponent.qml:135
788 msgid "Location access"
789 msgstr ""
790
791-#: ../plugins/security-privacy/PageComponent.qml:142
792+#: ../plugins/security-privacy/PageComponent.qml:143
793 msgid "Other app access"
794 msgstr ""
795
796-#: ../plugins/security-privacy/PageComponent.qml:147
797+#: ../plugins/security-privacy/PageComponent.qml:148
798 msgid "Diagnostics"
799 msgstr ""
800
801-#: ../plugins/security-privacy/PageComponent.qml:150
802+#. TRANSLATORS: This string is shown when crash
803+#. reports are to be sent by the system.
804+#: ../plugins/security-privacy/PageComponent.qml:153
805 msgid "Sent"
806 msgstr ""
807
808-#: ../plugins/security-privacy/PageComponent.qml:151
809+#. TRANSLATORS: This string is shown when crash
810+#. reports are not to be sent by the system
811+#: ../plugins/security-privacy/PageComponent.qml:156
812 msgid "Not sent"
813 msgstr ""
814
815@@ -888,7 +888,7 @@
816 msgid "Passcode"
817 msgstr ""
818
819-#: ../plugins/security-privacy/PhoneLocking.qml:76
820+#: ../plugins/security-privacy/PhoneLocking.qml:77
821 msgid "Sleep locks immediately"
822 msgstr ""
823
824@@ -937,7 +937,7 @@
825 msgstr ""
826
827 #: ../plugins/system-update/Download.qml:29
828-#: ../plugins/system-update/PageComponent.qml:331
829+#: ../plugins/system-update/PageComponent.qml:336
830 msgid "Auto download"
831 msgstr ""
832
833@@ -973,79 +973,84 @@
834 msgid "Pause failed:"
835 msgstr ""
836
837-#: ../plugins/system-update/PageComponent.qml:106
838+#. TRANSLATORS: %1 is the size of the update in GB
839+#: ../plugins/system-update/PageComponent.qml:107
840 #, qt-format
841 msgid "%1 GB"
842 msgstr ""
843
844-#: ../plugins/system-update/PageComponent.qml:108
845+#. TRANSLATORS: %1 is the size of the update in MB
846+#: ../plugins/system-update/PageComponent.qml:110
847 #, qt-format
848 msgid "%1 MB"
849 msgstr ""
850
851-#: ../plugins/system-update/PageComponent.qml:116
852+#. TRANSLATORS: %1 is the date when the device was last updated
853+#: ../plugins/system-update/PageComponent.qml:119
854 msgid "No software update available"
855 msgstr ""
856
857-#: ../plugins/system-update/PageComponent.qml:116
858+#: ../plugins/system-update/PageComponent.qml:119
859 #, qt-format
860 msgid "Last updated %1"
861 msgstr ""
862
863-#: ../plugins/system-update/PageComponent.qml:128
864+#. TRANSLATORS: %1 is the number of seconds remaining
865+#: ../plugins/system-update/PageComponent.qml:132
866 #, qt-format
867 msgid "About %1 second remaining"
868 msgid_plural "About %1 seconds remaining"
869 msgstr[0] ""
870 msgstr[1] ""
871
872-#: ../plugins/system-update/PageComponent.qml:130
873+#: ../plugins/system-update/PageComponent.qml:134
874 msgid "No estimate for the download"
875 msgstr ""
876
877-#: ../plugins/system-update/PageComponent.qml:136
878+#: ../plugins/system-update/PageComponent.qml:140
879 msgid "Paused"
880 msgstr ""
881
882-#: ../plugins/system-update/PageComponent.qml:145
883+#: ../plugins/system-update/PageComponent.qml:149
884 msgid "Download failed:"
885 msgstr ""
886
887-#: ../plugins/system-update/PageComponent.qml:200
888-#: ../plugins/system-update/PageComponent.qml:309
889+#: ../plugins/system-update/PageComponent.qml:204
890+#: ../plugins/system-update/PageComponent.qml:314
891 msgid "Retry"
892 msgstr ""
893
894-#: ../plugins/system-update/PageComponent.qml:230
895+#: ../plugins/system-update/PageComponent.qml:234
896 msgid "Ubuntu Phone"
897 msgstr ""
898
899-#: ../plugins/system-update/PageComponent.qml:242
900+#. TRANSLATORS: %1 is the version of the update
901+#: ../plugins/system-update/PageComponent.qml:247
902 #, qt-format
903 msgid "Version %1"
904 msgstr ""
905
906-#: ../plugins/system-update/PageComponent.qml:279
907+#: ../plugins/system-update/PageComponent.qml:284
908 msgid "Pause downloading"
909 msgstr ""
910
911-#: ../plugins/system-update/PageComponent.qml:286
912+#: ../plugins/system-update/PageComponent.qml:291
913 msgid "Resume downloading"
914 msgstr ""
915
916-#: ../plugins/system-update/PageComponent.qml:302
917+#: ../plugins/system-update/PageComponent.qml:307
918 msgid "Download"
919 msgstr ""
920
921-#: ../plugins/system-update/PageComponent.qml:316
922+#: ../plugins/system-update/PageComponent.qml:321
923 msgid "Install & Restart"
924 msgstr ""
925
926-#: ../plugins/system-update/PageComponent.qml:336
927+#: ../plugins/system-update/PageComponent.qml:341
928 msgid "On wi-fi"
929 msgstr ""
930
931-#: ../plugins/system-update/PageComponent.qml:338
932+#: ../plugins/system-update/PageComponent.qml:343
933 msgid "Always"
934 msgstr ""
935

Subscribers

People subscribed via source and target branches