Merge ~osomon/software-properties:update-pot into software-properties:ubuntu/master
- Git
- lp:~osomon/software-properties
- update-pot
- Merge into ubuntu/master
Proposed by
Olivier Tilloy
Status: | Merged |
---|---|
Merged at revision: | b5db3e042b548989c60cf4fcb15fa837a9286134 |
Proposed branch: | ~osomon/software-properties:update-pot |
Merge into: | software-properties:ubuntu/master |
Diff against target: |
837 lines (+336/-189) 1 file modified
po/software-properties.pot (+336/-189) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Didier Roche-Tolomelli | Approve | ||
Review via email: mp+379339@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | diff --git a/po/software-properties.pot b/po/software-properties.pot |
2 | index dfb8fe3..06e1e31 100644 |
3 | --- a/po/software-properties.pot |
4 | +++ b/po/software-properties.pot |
5 | @@ -7,8 +7,8 @@ |
6 | msgid "" |
7 | msgstr "" |
8 | "Project-Id-Version: PACKAGE VERSION\n" |
9 | -"Report-Msgid-Bugs-To: Sebastian Heinlein <sebi@glatzor.de>\n" |
10 | -"POT-Creation-Date: 2018-04-12 14:18-0400\n" |
11 | +"Report-Msgid-Bugs-To: \n" |
12 | +"POT-Creation-Date: 2020-02-17 17:37+0100\n" |
13 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
14 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
15 | "Language-Team: LANGUAGE <LL@li.org>\n" |
16 | @@ -59,11 +59,19 @@ msgid "" |
17 | msgstr "" |
18 | |
19 | #: ../data/software-properties-qt.desktop.in.h:1 |
20 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:685 |
21 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:704 |
22 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:693 |
23 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:712 |
24 | msgid "Software Sources" |
25 | msgstr "" |
26 | |
27 | +#: ../data/software-properties-livepatch.desktop.in.h:1 |
28 | +msgid "Manage Canonical Livepatch" |
29 | +msgstr "" |
30 | + |
31 | +#: ../data/software-properties-livepatch.desktop.in.h:2 |
32 | +msgid "Security;Update;" |
33 | +msgstr "" |
34 | + |
35 | #: ../software-properties-gtk:96 |
36 | msgid "" |
37 | "The --enable-component/-e command-line switch has been deprecated. Instead " |
38 | @@ -89,18 +97,22 @@ msgid "Enable the specified component of the distro's repositories" |
39 | msgstr "" |
40 | |
41 | #: ../software-properties-qt:86 |
42 | -msgid "Enable PPA with the given name" |
43 | +msgid "Open specific tab number on startup" |
44 | msgstr "" |
45 | |
46 | #: ../software-properties-qt:90 |
47 | +msgid "Enable PPA with the given name" |
48 | +msgstr "" |
49 | + |
50 | +#: ../software-properties-qt:94 |
51 | msgid "Legacy option, unused" |
52 | msgstr "" |
53 | |
54 | -#: ../software-properties-qt:93 |
55 | +#: ../software-properties-qt:97 |
56 | msgid "Win ID to act as a dialogue for" |
57 | msgstr "" |
58 | |
59 | -#: ../software-properties-qt:96 |
60 | +#: ../software-properties-qt:100 |
61 | msgid "data directory for UI files" |
62 | msgstr "" |
63 | |
64 | @@ -222,6 +234,7 @@ msgstr "" |
65 | |
66 | #: ../softwareproperties/qt/DialogMirror.py:184 |
67 | #: ../softwareproperties/qt/DialogMirror.py:187 |
68 | +#: ../data/gtkbuilder/dialog-auth.ui.h:2 |
69 | msgid "Cancel" |
70 | msgstr "" |
71 | |
72 | @@ -232,7 +245,6 @@ msgstr "" |
73 | |
74 | #: ../softwareproperties/qt/DialogMirror.py:220 |
75 | #: ../softwareproperties/gtk/DialogMirror.py:338 |
76 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1536 |
77 | msgid "Please check your Internet connection." |
78 | msgstr "" |
79 | |
80 | @@ -241,108 +253,196 @@ msgstr "" |
81 | msgid "Canceling..." |
82 | msgstr "" |
83 | |
84 | -#: ../softwareproperties/qt/SoftwarePropertiesQt.py:162 |
85 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:211 |
86 | #: ../data/gtkbuilder/main.ui.h:9 |
87 | msgid "Daily" |
88 | msgstr "" |
89 | |
90 | -#: ../softwareproperties/qt/SoftwarePropertiesQt.py:163 |
91 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:212 |
92 | #: ../data/gtkbuilder/main.ui.h:10 |
93 | msgid "Every two days" |
94 | msgstr "" |
95 | |
96 | -#: ../softwareproperties/qt/SoftwarePropertiesQt.py:164 |
97 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:213 |
98 | #: ../data/gtkbuilder/main.ui.h:11 |
99 | msgid "Weekly" |
100 | msgstr "" |
101 | |
102 | -#: ../softwareproperties/qt/SoftwarePropertiesQt.py:165 |
103 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:214 |
104 | #: ../data/gtkbuilder/main.ui.h:12 |
105 | msgid "Every two weeks" |
106 | msgstr "" |
107 | |
108 | -#: ../softwareproperties/qt/SoftwarePropertiesQt.py:172 |
109 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:258 |
110 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:221 |
111 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:266 |
112 | #, python-format |
113 | msgid "Every %s days" |
114 | msgstr "" |
115 | |
116 | -#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu |
117 | -#: ../softwareproperties/qt/SoftwarePropertiesQt.py:214 |
118 | -#, python-format |
119 | -msgid "%s updates" |
120 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:262 |
121 | +msgid "Software updates" |
122 | msgstr "" |
123 | |
124 | -#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu |
125 | -#: ../softwareproperties/qt/SoftwarePropertiesQt.py:218 |
126 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:318 |
127 | -#, python-format |
128 | -msgid "%s Software" |
129 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:264 |
130 | +msgid "Ubuntu Software" |
131 | msgstr "" |
132 | |
133 | #. TRANSLATORS: Label for the components in the Internet section |
134 | #. first %s is the description of the component |
135 | #. second %s is the code name of the comp, eg main, universe |
136 | -#: ../softwareproperties/qt/SoftwarePropertiesQt.py:237 |
137 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:331 |
138 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:282 |
139 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:339 |
140 | #, python-format |
141 | msgid "%s (%s)" |
142 | msgstr "" |
143 | |
144 | #. add a separator and the option to choose another mirror from the list |
145 | #. #FIXME server_store.append(["sep", None, True]) |
146 | -#: ../softwareproperties/qt/SoftwarePropertiesQt.py:300 |
147 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:461 |
148 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:554 |
149 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:345 |
150 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:469 |
151 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:562 |
152 | msgid "Other..." |
153 | msgstr "" |
154 | |
155 | -#: ../softwareproperties/qt/SoftwarePropertiesQt.py:668 |
156 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:977 |
157 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:713 |
158 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:985 |
159 | msgid "Import key" |
160 | msgstr "" |
161 | |
162 | -#: ../softwareproperties/qt/SoftwarePropertiesQt.py:671 |
163 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:991 |
164 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:716 |
165 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:999 |
166 | msgid "Error importing selected file" |
167 | msgstr "" |
168 | |
169 | -#: ../softwareproperties/qt/SoftwarePropertiesQt.py:672 |
170 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:992 |
171 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:717 |
172 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1000 |
173 | msgid "The selected file may not be a GPG key file or it might be corrupt." |
174 | msgstr "" |
175 | |
176 | -#: ../softwareproperties/qt/SoftwarePropertiesQt.py:685 |
177 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1008 |
178 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:730 |
179 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1016 |
180 | msgid "Error removing the key" |
181 | msgstr "" |
182 | |
183 | -#: ../softwareproperties/qt/SoftwarePropertiesQt.py:686 |
184 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1009 |
185 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:731 |
186 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1017 |
187 | msgid "The key you selected could not be removed. Please report this as a bug." |
188 | msgstr "" |
189 | |
190 | -#: ../softwareproperties/qt/SoftwarePropertiesQt.py:703 |
191 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:752 |
192 | +msgid "Could not refresh cache" |
193 | +msgstr "" |
194 | + |
195 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:762 |
196 | msgid "Reload" |
197 | msgstr "" |
198 | |
199 | -#: ../softwareproperties/qt/SoftwarePropertiesQt.py:705 |
200 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:764 |
201 | msgid "Your local copy of the software catalog is out of date." |
202 | msgstr "" |
203 | |
204 | -#: ../softwareproperties/qt/SoftwarePropertiesQt.py:706 |
205 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:765 |
206 | msgid "A new copy will be downloaded." |
207 | msgstr "" |
208 | |
209 | -#: ../softwareproperties/qt/SoftwarePropertiesQt.py:730 |
210 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:770 |
211 | +#: ../softwareproperties/gtk/DialogCacheOutdated.py:61 |
212 | +msgid "Refreshing software cache" |
213 | +msgstr "" |
214 | + |
215 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:772 |
216 | +#: ../softwareproperties/gtk/DialogCacheOutdated.py:41 |
217 | +msgid "Cache Refresh" |
218 | +msgstr "" |
219 | + |
220 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:814 |
221 | msgid "CD Error" |
222 | msgstr "" |
223 | |
224 | -#: ../softwareproperties/qt/SoftwarePropertiesQt.py:731 |
225 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:843 |
226 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:815 |
227 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:851 |
228 | msgid "Error scanning the CD" |
229 | msgstr "" |
230 | |
231 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:857 |
232 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1080 |
233 | +msgid "Error while applying changes" |
234 | +msgstr "" |
235 | + |
236 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1101 |
237 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1313 |
238 | +msgid "This device is using the recommended driver." |
239 | +msgstr "" |
240 | + |
241 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1103 |
242 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1314 |
243 | +msgid "This device is using an alternative driver." |
244 | +msgstr "" |
245 | + |
246 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1105 |
247 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1315 |
248 | +msgid "This device is using a manually-installed driver." |
249 | +msgstr "" |
250 | + |
251 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1106 |
252 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1316 |
253 | +msgid "This device is not working." |
254 | +msgstr "" |
255 | + |
256 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1115 |
257 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1325 |
258 | +msgid "Continue using a manually installed driver" |
259 | +msgstr "" |
260 | + |
261 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1142 |
262 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1352 |
263 | +msgid "Using {} from {}" |
264 | +msgstr "" |
265 | + |
266 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1144 |
267 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1354 |
268 | +msgid "Using {}" |
269 | +msgstr "" |
270 | + |
271 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1151 |
272 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1361 |
273 | +msgid "open source" |
274 | +msgstr "" |
275 | + |
276 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1153 |
277 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1363 |
278 | +msgid "proprietary" |
279 | +msgstr "" |
280 | + |
281 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1156 |
282 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1366 |
283 | +#, python-brace-format |
284 | +msgid "{base_description} ({licence}, tested)" |
285 | +msgstr "" |
286 | + |
287 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1158 |
288 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1368 |
289 | +#, python-brace-format |
290 | +msgid "{base_description} ({licence})" |
291 | +msgstr "" |
292 | + |
293 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1176 |
294 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1388 |
295 | +msgid "Do not use the device" |
296 | +msgstr "" |
297 | + |
298 | +#. 1 for priority over the icon to stretch |
299 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1219 |
300 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1426 |
301 | +msgid "Unknown" |
302 | +msgstr "" |
303 | + |
304 | +#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1287 |
305 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1494 |
306 | +#: ../data/gtkbuilder/main.ui.h:37 |
307 | +msgid "No proprietary drivers are in use." |
308 | +msgstr "" |
309 | + |
310 | #: ../softwareproperties/qt/CdromProgress.py:54 |
311 | msgid "CD Name" |
312 | msgstr "" |
313 | @@ -381,47 +481,34 @@ msgstr "" |
314 | msgid "Source code" |
315 | msgstr "" |
316 | |
317 | -#: ../softwareproperties/SoftwareProperties.py:526 |
318 | -#: ../softwareproperties/SoftwareProperties.py:533 |
319 | +#: ../softwareproperties/SoftwareProperties.py:516 |
320 | +#: ../softwareproperties/SoftwareProperties.py:523 |
321 | msgid "(Source Code)" |
322 | msgstr "" |
323 | |
324 | -#: ../softwareproperties/SoftwareProperties.py:539 |
325 | +#: ../softwareproperties/SoftwareProperties.py:529 |
326 | msgid "Source Code" |
327 | msgstr "" |
328 | |
329 | -#: ../softwareproperties/SoftwareProperties.py:940 |
330 | -#: ../softwareproperties/SoftwareProperties.py:987 |
331 | -msgid "Canonical Livepatch snap cannot be installed." |
332 | -msgstr "" |
333 | - |
334 | -#: ../softwareproperties/SoftwareProperties.py:976 |
335 | -msgid "Canonical Livepatch snap cannot be enabled." |
336 | +#: ../softwareproperties/gtk/DialogAuth.py:85 |
337 | +#: ../softwareproperties/gtk/DialogAuth.py:100 |
338 | +msgid "To use Livepatch, you need to use an Ubuntu One account." |
339 | msgstr "" |
340 | |
341 | -#: ../softwareproperties/SoftwareProperties.py:990 |
342 | -msgid "Canonical Livepatch cannot be enabled." |
343 | +#: ../softwareproperties/gtk/DialogAuth.py:89 |
344 | +msgid "Sign In / Register…" |
345 | msgstr "" |
346 | |
347 | -#: ../softwareproperties/SoftwareProperties.py:1005 |
348 | -msgid "Canonical Livepatch cannot be disabled." |
349 | +#: ../softwareproperties/gtk/DialogAuth.py:92 |
350 | +msgid "To use Livepatch, you need to use your Ubuntu One account." |
351 | msgstr "" |
352 | |
353 | -#: ../softwareproperties/gtk/DialogAuth.py:74 |
354 | -msgid "To continue choose an Ubuntu Single Sign-On account." |
355 | +#: ../softwareproperties/gtk/DialogAuth.py:97 |
356 | +msgid "Continue" |
357 | msgstr "" |
358 | |
359 | -#: ../softwareproperties/gtk/DialogAuth.py:75 |
360 | -msgid "Use another account…" |
361 | -msgstr "" |
362 | - |
363 | -#: ../softwareproperties/gtk/DialogAuth.py:77 |
364 | -msgid "To continue you need an Ubuntu Single Sign-On account." |
365 | -msgstr "" |
366 | - |
367 | -#: ../softwareproperties/gtk/DialogAuth.py:78 |
368 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1514 |
369 | -msgid "Sign In…" |
370 | +#: ../softwareproperties/gtk/DialogAuth.py:104 |
371 | +msgid "Use" |
372 | msgstr "" |
373 | |
374 | #: ../softwareproperties/gtk/DialogMirror.py:250 |
375 | @@ -433,190 +520,199 @@ msgstr "" |
376 | msgid "Completed %s of %s tests" |
377 | msgstr "" |
378 | |
379 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:695 |
380 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:714 |
381 | +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu |
382 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:326 |
383 | +#, python-format |
384 | +msgid "%s Software" |
385 | +msgstr "" |
386 | + |
387 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:703 |
388 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:722 |
389 | msgid "Active" |
390 | msgstr "" |
391 | |
392 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:753 |
393 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:761 |
394 | msgid "Key" |
395 | msgstr "" |
396 | |
397 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:770 |
398 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:778 |
399 | msgid "_Add key from paste data" |
400 | msgstr "" |
401 | |
402 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:783 |
403 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:794 |
404 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:791 |
405 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:802 |
406 | msgid "Error importing key" |
407 | msgstr "" |
408 | |
409 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:784 |
410 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:795 |
411 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:792 |
412 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:803 |
413 | msgid "The selected data may not be a GPG key file or it might be corrupt." |
414 | msgstr "" |
415 | |
416 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:844 |
417 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:852 |
418 | msgid "Could not find a suitable CD." |
419 | msgstr "" |
420 | |
421 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1059 |
422 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1069 |
423 | msgid "Applying changes..." |
424 | msgstr "" |
425 | |
426 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1158 |
427 | -#: ../data/gtkbuilder/main.ui.h:43 |
428 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1188 |
429 | +#: ../data/gtkbuilder/main.ui.h:45 |
430 | msgid "Re_vert" |
431 | msgstr "" |
432 | |
433 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1160 |
434 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1190 |
435 | msgid "_Apply Changes" |
436 | msgstr "" |
437 | |
438 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1162 |
439 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1192 |
440 | msgid "_Cancel" |
441 | msgstr "" |
442 | |
443 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1164 |
444 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1194 |
445 | msgid "_Restart..." |
446 | msgstr "" |
447 | |
448 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1179 |
449 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1209 |
450 | msgid "Searching for available drivers..." |
451 | msgstr "" |
452 | |
453 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1209 |
454 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1239 |
455 | msgid "An error occurred while searching for drivers." |
456 | msgstr "" |
457 | |
458 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1283 |
459 | -msgid "This device is using the recommended driver." |
460 | +#. No drivers found. |
461 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1408 |
462 | +msgid "No additional drivers available." |
463 | msgstr "" |
464 | |
465 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1284 |
466 | -msgid "This device is using an alternative driver." |
467 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1475 |
468 | +msgid "You need to restart the computer to complete the driver changes." |
469 | msgstr "" |
470 | |
471 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1285 |
472 | -msgid "This device is using a manually-installed driver." |
473 | -msgstr "" |
474 | +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1489 |
475 | +#, python-format |
476 | +msgid "%(count)d proprietary driver in use." |
477 | +msgid_plural "%(count)d proprietary drivers in use." |
478 | +msgstr[0] "" |
479 | +msgstr[1] "" |
480 | |
481 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1286 |
482 | -msgid "This device is not working." |
483 | +#: ../softwareproperties/gtk/DialogAddSourcesList.py:46 |
484 | +msgid "Add Software Channels" |
485 | msgstr "" |
486 | |
487 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1295 |
488 | -msgid "Continue using a manually installed driver" |
489 | -msgstr "" |
490 | +#: ../softwareproperties/gtk/DialogAddSourcesList.py:87 |
491 | +msgid "Install software additionally or only from this source?" |
492 | +msgid_plural "Install software additionally or only from these sources?" |
493 | +msgstr[0] "" |
494 | +msgstr[1] "" |
495 | |
496 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1322 |
497 | -msgid "Using {} from {}" |
498 | +#: ../softwareproperties/gtk/DialogAddSourcesList.py:92 |
499 | +msgid "" |
500 | +"You can either add the following sources or replace your current sources by " |
501 | +"them. Only install software from trusted sources." |
502 | msgstr "" |
503 | |
504 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1324 |
505 | -msgid "Using {}" |
506 | +#: ../softwareproperties/gtk/DialogAddSourcesList.py:107 |
507 | +msgid "There are no sources to install software from" |
508 | msgstr "" |
509 | |
510 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1331 |
511 | -msgid "open source" |
512 | +#: ../softwareproperties/gtk/DialogAddSourcesList.py:108 |
513 | +#, python-format |
514 | +msgid "The file '%s' does not contain any valid software sources." |
515 | msgstr "" |
516 | |
517 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1333 |
518 | -msgid "proprietary" |
519 | +#. L10N: the example is of the format: deb http://ftp.debian.org sarge main |
520 | +#: ../softwareproperties/gtk/DialogAdd.py:64 |
521 | +#, python-format |
522 | +msgid "" |
523 | +"The APT line includes the type, location and components of a repository, for " |
524 | +"example '%s'." |
525 | msgstr "" |
526 | |
527 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1336 |
528 | -#, python-brace-format |
529 | -msgid "{base_description} ({licence}, tested)" |
530 | +#: ../softwareproperties/gtk/DialogCacheOutdated.py:89 |
531 | +msgid "Error while refreshing cache" |
532 | msgstr "" |
533 | |
534 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1338 |
535 | -#, python-brace-format |
536 | -msgid "{base_description} ({licence})" |
537 | +#: ../softwareproperties/gtk/DialogLivepatchError.py:36 |
538 | +msgid "Sorry, there's been a problem with setting up Canonical Livepatch." |
539 | msgstr "" |
540 | |
541 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1358 |
542 | -msgid "Do not use the device" |
543 | +#: ../softwareproperties/gtk/LivepatchPage.py:42 |
544 | +msgid "" |
545 | +"Canonical Livepatch has experienced an internal error. Please refer to {} " |
546 | +"for further information." |
547 | msgstr "" |
548 | |
549 | -#. No drivers found. |
550 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1378 |
551 | -msgid "No additional drivers available." |
552 | +#: ../softwareproperties/gtk/LivepatchPage.py:151 |
553 | +msgid "Checking availability…" |
554 | msgstr "" |
555 | |
556 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1396 |
557 | -msgid "Unknown" |
558 | +#: ../softwareproperties/gtk/LivepatchPage.py:153 |
559 | +msgid "Livepatch requires an Internet connection." |
560 | msgstr "" |
561 | |
562 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1445 |
563 | -msgid "You need to restart the computer to complete the driver changes." |
564 | +#: ../softwareproperties/gtk/LivepatchPage.py:155 |
565 | +msgid "Livepatch is not available for this system." |
566 | msgstr "" |
567 | |
568 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1459 |
569 | -#, python-format |
570 | -msgid "%(count)d proprietary driver in use." |
571 | -msgid_plural "%(count)d proprietary drivers in use." |
572 | -msgstr[0] "" |
573 | -msgstr[1] "" |
574 | - |
575 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1464 |
576 | -#: ../data/gtkbuilder/main.ui.h:38 |
577 | -msgid "No proprietary drivers are in use." |
578 | +#: ../softwareproperties/gtk/LivepatchPage.py:158 |
579 | +msgid "Livepatch is on." |
580 | msgstr "" |
581 | |
582 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1502 |
583 | -msgid "Sign Out" |
584 | +#: ../softwareproperties/gtk/LivepatchPage.py:160 |
585 | +msgid "To use Livepatch you need to sign in." |
586 | msgstr "" |
587 | |
588 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1506 |
589 | -#, python-format |
590 | -msgid "Signed in as %s" |
591 | +#: ../softwareproperties/gtk/LivepatchPage.py:162 |
592 | +msgid "Livepatch is off." |
593 | msgstr "" |
594 | |
595 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1509 |
596 | -#, python-format |
597 | -msgid "%s isn't authorized to use Livepatch." |
598 | +#: ../softwareproperties/gtk/LivepatchPage.py:176 |
599 | +msgid "Sign Out" |
600 | msgstr "" |
601 | |
602 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1515 |
603 | -msgid "To use Livepatch you need to sign in." |
604 | +#: ../softwareproperties/gtk/LivepatchPage.py:176 |
605 | +msgid "Sign In…" |
606 | msgstr "" |
607 | |
608 | -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1535 |
609 | -msgid "Error enabling Canonical Livepatch" |
610 | -msgstr "" |
611 | +#: ../softwareproperties/gtk/LivepatchPage.py:237 |
612 | +msgid "({} day ago)" |
613 | +msgid_plural "({} days ago)" |
614 | +msgstr[0] "" |
615 | +msgstr[1] "" |
616 | |
617 | -#: ../softwareproperties/gtk/DialogAddSourcesList.py:46 |
618 | -msgid "Add Software Channels" |
619 | -msgstr "" |
620 | +#: ../softwareproperties/gtk/LivepatchPage.py:242 |
621 | +msgid "({} hour ago)" |
622 | +msgid_plural "({} hours ago)" |
623 | +msgstr[0] "" |
624 | +msgstr[1] "" |
625 | |
626 | -#: ../softwareproperties/gtk/DialogAddSourcesList.py:87 |
627 | -msgid "Install software additionally or only from this source?" |
628 | -msgid_plural "Install software additionally or only from these sources?" |
629 | +#: ../softwareproperties/gtk/LivepatchPage.py:247 |
630 | +msgid "({} minute ago)" |
631 | +msgid_plural "({} minutes ago)" |
632 | msgstr[0] "" |
633 | msgstr[1] "" |
634 | |
635 | -#: ../softwareproperties/gtk/DialogAddSourcesList.py:92 |
636 | -msgid "" |
637 | -"You can either add the following sources or replace your current sources by " |
638 | -"them. Only install software from trusted sources." |
639 | +#: ../softwareproperties/gtk/LivepatchPage.py:266 |
640 | +msgid "Failed to retrieve Livepatch status." |
641 | msgstr "" |
642 | |
643 | -#: ../softwareproperties/gtk/DialogAddSourcesList.py:107 |
644 | -msgid "There are no sources to install software from" |
645 | +#: ../softwareproperties/gtk/LivepatchPage.py:284 |
646 | +msgid "Last check for updates: {}" |
647 | msgstr "" |
648 | |
649 | -#: ../softwareproperties/gtk/DialogAddSourcesList.py:108 |
650 | -#, python-format |
651 | -msgid "The file '%s' does not contain any valid software sources." |
652 | +#: ../softwareproperties/gtk/LivepatchPage.py:285 |
653 | +msgid "None yet" |
654 | msgstr "" |
655 | |
656 | -#. L10N: the example is of the format: deb http://ftp.debian.org sarge main |
657 | -#: ../softwareproperties/gtk/DialogAdd.py:64 |
658 | -#, python-format |
659 | -msgid "" |
660 | -"The APT line includes the type, location and components of a repository, for " |
661 | -"example '%s'." |
662 | +#: ../softwareproperties/gtk/LivepatchPage.py:288 |
663 | +msgid "No updates currently applied." |
664 | +msgstr "" |
665 | + |
666 | +#: ../softwareproperties/gtk/LivepatchPage.py:291 |
667 | +msgid "Updates currently applied:" |
668 | msgstr "" |
669 | |
670 | #. some known keys |
671 | @@ -640,6 +736,42 @@ msgstr "" |
672 | msgid "Ubuntu Extras Archive Automatic Signing Key <ftpmaster@ubuntu.com>" |
673 | msgstr "" |
674 | |
675 | +#: ../softwareproperties/LivepatchService.py:70 |
676 | +msgid "Failed to enable Livepatch: {}" |
677 | +msgstr "" |
678 | + |
679 | +#: ../softwareproperties/LivepatchService.py:71 |
680 | +msgid "Failed to disable Livepatch: {}" |
681 | +msgstr "" |
682 | + |
683 | +#: ../softwareproperties/LivepatchService.py:133 |
684 | +msgid "Canonical Livepatch snap is not available." |
685 | +msgstr "" |
686 | + |
687 | +#: ../softwareproperties/LivepatchService.py:135 |
688 | +msgid "Gnome Online Accounts is required to enable Livepatch." |
689 | +msgstr "" |
690 | + |
691 | +#: ../softwareproperties/LivepatchService.py:137 |
692 | +msgid "Livepatch is not available for this release." |
693 | +msgstr "" |
694 | + |
695 | +#: ../softwareproperties/LivepatchService.py:139 |
696 | +msgid "The current release is no longer supported." |
697 | +msgstr "" |
698 | + |
699 | +#: ../softwareproperties/LivepatchSnap.py:71 |
700 | +msgid "Canonical Livepatch snap cannot be installed." |
701 | +msgstr "" |
702 | + |
703 | +#: ../softwareproperties/LivepatchSnap.py:116 |
704 | +msgid "Canonical Livepatch snap cannot be installed: {}" |
705 | +msgstr "" |
706 | + |
707 | +#: ../softwareproperties/LivepatchSnap.py:133 |
708 | +msgid "Canonical Livepatch snap cannot be enabled: {}" |
709 | +msgstr "" |
710 | + |
711 | #: ../data/gtkbuilder/dialog-edit-source.ui.h:2 |
712 | msgid "Source" |
713 | msgstr "" |
714 | @@ -757,72 +889,83 @@ msgid "When there are other updates:" |
715 | msgstr "" |
716 | |
717 | #: ../data/gtkbuilder/main.ui.h:27 |
718 | -msgid "Use Canonical Livepatch to increase security between restarts" |
719 | -msgstr "" |
720 | - |
721 | -#: ../data/gtkbuilder/main.ui.h:28 |
722 | msgid "Notify me of a new Ubuntu version:" |
723 | msgstr "" |
724 | |
725 | -#: ../data/gtkbuilder/main.ui.h:29 |
726 | +#: ../data/gtkbuilder/main.ui.h:28 |
727 | msgid "Updates" |
728 | msgstr "" |
729 | |
730 | -#: ../data/gtkbuilder/main.ui.h:30 |
731 | +#: ../data/gtkbuilder/main.ui.h:29 |
732 | msgid "<b>Trusted software providers</b>" |
733 | msgstr "" |
734 | |
735 | -#: ../data/gtkbuilder/main.ui.h:31 |
736 | +#: ../data/gtkbuilder/main.ui.h:30 |
737 | msgid " " |
738 | msgstr "" |
739 | |
740 | -#: ../data/gtkbuilder/main.ui.h:32 |
741 | +#: ../data/gtkbuilder/main.ui.h:31 |
742 | msgid "" |
743 | "Keys are used to authenticate the correct source of software and so protect " |
744 | "your computer from malicious software" |
745 | msgstr "" |
746 | |
747 | -#: ../data/gtkbuilder/main.ui.h:33 |
748 | +#: ../data/gtkbuilder/main.ui.h:32 |
749 | msgid "_Import Key File..." |
750 | msgstr "" |
751 | |
752 | -#: ../data/gtkbuilder/main.ui.h:34 |
753 | +#: ../data/gtkbuilder/main.ui.h:33 |
754 | msgid "Import the public key from a trusted software provider" |
755 | msgstr "" |
756 | |
757 | -#: ../data/gtkbuilder/main.ui.h:35 |
758 | +#: ../data/gtkbuilder/main.ui.h:34 |
759 | msgid "Restore _Defaults" |
760 | msgstr "" |
761 | |
762 | -#: ../data/gtkbuilder/main.ui.h:36 |
763 | +#: ../data/gtkbuilder/main.ui.h:35 |
764 | msgid "Restore the default keys of your distribution" |
765 | msgstr "" |
766 | |
767 | -#: ../data/gtkbuilder/main.ui.h:37 |
768 | +#: ../data/gtkbuilder/main.ui.h:36 |
769 | msgid "Authentication" |
770 | msgstr "" |
771 | |
772 | -#: ../data/gtkbuilder/main.ui.h:39 |
773 | +#: ../data/gtkbuilder/main.ui.h:38 |
774 | msgid "" |
775 | "<small>A proprietary driver has private code that Ubuntu developers can't " |
776 | "review or improve. Security and other updates are dependent on the driver " |
777 | "vendor.</small>" |
778 | msgstr "" |
779 | |
780 | -#: ../data/gtkbuilder/main.ui.h:40 |
781 | +#: ../data/gtkbuilder/main.ui.h:39 |
782 | msgid "Additional Drivers" |
783 | msgstr "" |
784 | |
785 | -#: ../data/gtkbuilder/main.ui.h:41 |
786 | +#: ../data/gtkbuilder/main.ui.h:40 |
787 | msgid "" |
788 | "Use proposed updates if you’re willing to report bugs on any problems that " |
789 | "occur." |
790 | msgstr "" |
791 | |
792 | -#: ../data/gtkbuilder/main.ui.h:42 |
793 | +#: ../data/gtkbuilder/main.ui.h:41 |
794 | msgid "Developer Options" |
795 | msgstr "" |
796 | |
797 | +#: ../data/gtkbuilder/main.ui.h:42 |
798 | +msgid "" |
799 | +"Canonical Livepatch helps keep your system secure by applying security " |
800 | +"updates that don't require a restart. <a href=\"https://www.ubuntu.com/" |
801 | +"livepatch\">Learn More</a>" |
802 | +msgstr "" |
803 | + |
804 | +#: ../data/gtkbuilder/main.ui.h:43 |
805 | +msgid "column" |
806 | +msgstr "" |
807 | + |
808 | +#: ../data/gtkbuilder/main.ui.h:44 |
809 | +msgid "Show Livepatch status in the top bar" |
810 | +msgstr "" |
811 | + |
812 | #: ../data/gtkbuilder/dialog-cache-outofdate.ui.h:1 |
813 | #: ../data/gtkbuilder/dialog-mirror.ui.h:6 |
814 | msgid " " |
815 | @@ -885,13 +1028,17 @@ msgid "_Add Source" |
816 | msgstr "" |
817 | |
818 | #: ../data/gtkbuilder/dialog-auth.ui.h:1 |
819 | -msgid "To enable Livepatch choose an Ubuntu Single Sign-on account." |
820 | +msgid "Add another…" |
821 | msgstr "" |
822 | |
823 | -#: ../data/gtkbuilder/dialog-auth.ui.h:2 |
824 | -msgid "<b>Use another account...</b>" |
825 | +#: ../data/gtkbuilder/dialog-livepatch-error.ui.h:1 |
826 | +msgid "Settings…" |
827 | +msgstr "" |
828 | + |
829 | +#: ../data/gtkbuilder/dialog-livepatch-error.ui.h:2 |
830 | +msgid "Ignore" |
831 | msgstr "" |
832 | |
833 | -#: ../data/gtkbuilder/dialog-auth.ui.h:3 |
834 | -msgid "Choose an account" |
835 | +#: ../data/gtkbuilder/dialog-livepatch-error.ui.h:3 |
836 | +msgid "The error was:" |
837 | msgstr "" |
ack, let’s merge this :)