Merge ~seb128/ubiquity:master into ubiquity:master

Proposed by Sebastien Bacher on 2020-10-08
Status: Merged
Merged at revision: 4a946f82f59f33d96f9fdfa031b6b6e4e90ba495
Proposed branch: ~seb128/ubiquity:master
Merge into: ubiquity:master
Diff against target: 212821 lines (+45644/-29320)
136 files modified
debian/real-po/aa.po (+299/-196)
debian/real-po/ace.po (+292/-192)
debian/real-po/af.po (+351/-215)
debian/real-po/am.po (+312/-194)
debian/real-po/an.po (+292/-192)
debian/real-po/ar.po (+343/-215)
debian/real-po/as.po (+294/-192)
debian/real-po/ast.po (+351/-213)
debian/real-po/az.po (+296/-192)
debian/real-po/be.po (+338/-209)
debian/real-po/bem.po (+292/-192)
debian/real-po/bg.po (+332/-200)
debian/real-po/bn.po (+439/-326)
debian/real-po/bo.po (+432/-354)
debian/real-po/br.po (+308/-199)
debian/real-po/bs.po (+332/-203)
debian/real-po/ca.po (+343/-205)
debian/real-po/ca@valencia.po (+334/-204)
debian/real-po/ce.po (+292/-192)
debian/real-po/ckb.po (+350/-225)
debian/real-po/cs.po (+351/-211)
debian/real-po/csb.po (+331/-203)
debian/real-po/cv.po (+292/-192)
debian/real-po/cy.po (+335/-205)
debian/real-po/da.po (+348/-209)
debian/real-po/de.po (+348/-210)
debian/real-po/dv.po (+296/-192)
debian/real-po/dz.po (+294/-192)
debian/real-po/el.po (+354/-216)
debian/real-po/en_AU.po (+349/-213)
debian/real-po/en_CA.po (+339/-211)
debian/real-po/en_GB.po (+353/-217)
debian/real-po/eo.po (+342/-213)
debian/real-po/es.po (+351/-215)
debian/real-po/et.po (+349/-211)
debian/real-po/eu.po (+356/-217)
debian/real-po/fa.po (+392/-256)
debian/real-po/fi.po (+345/-205)
debian/real-po/fil.po (+334/-206)
debian/real-po/fo.po (+300/-192)
debian/real-po/fr.po (+351/-212)
debian/real-po/fr_CA.po (+349/-210)
debian/real-po/frp.po (+297/-194)
debian/real-po/fy.po (+304/-200)
debian/real-po/ga.po (+296/-192)
debian/real-po/gd.po (+344/-218)
debian/real-po/gl.po (+348/-208)
debian/real-po/gu.po (+304/-202)
debian/real-po/gv.po (+292/-192)
debian/real-po/he.po (+350/-210)
debian/real-po/hi.po (+437/-325)
debian/real-po/hr.po (+361/-221)
debian/real-po/hu.po (+347/-209)
debian/real-po/hy.po (+302/-195)
debian/real-po/ia.po (+337/-207)
debian/real-po/id.po (+358/-221)
debian/real-po/is.po (+339/-209)
debian/real-po/it.po (+355/-216)
debian/real-po/ja.po (+515/-290)
debian/real-po/ka.po (+296/-192)
debian/real-po/kab.po (+302/-193)
debian/real-po/kk.po (+339/-211)
debian/real-po/kl.po (+292/-192)
debian/real-po/km.po (+435/-380)
debian/real-po/kn.po (+308/-207)
debian/real-po/ko.po (+490/-278)
debian/real-po/ku.po (+341/-211)
debian/real-po/kw.po (+301/-198)
debian/real-po/ky.po (+298/-192)
debian/real-po/lb.po (+296/-192)
debian/real-po/lo.po (+292/-192)
debian/real-po/lt.po (+340/-200)
debian/real-po/lv.po (+337/-209)
debian/real-po/mg.po (+300/-192)
debian/real-po/mhr.po (+298/-192)
debian/real-po/mjw.po (+313/-195)
debian/real-po/mk.po (+297/-194)
debian/real-po/ml.po (+325/-230)
debian/real-po/mnw.po (+315/-223)
debian/real-po/mr.po (+429/-316)
debian/real-po/ms.po (+340/-203)
debian/real-po/my.po (+416/-339)
debian/real-po/nb.po (+339/-209)
debian/real-po/nds.po (+292/-192)
debian/real-po/ne.po (+437/-331)
debian/real-po/nl.po (+353/-215)
debian/real-po/nl_NL.po (+293/-192)
debian/real-po/nn.po (+335/-207)
debian/real-po/ny.po (+297/-194)
debian/real-po/oc.po (+360/-225)
debian/real-po/oj.po (+292/-192)
debian/real-po/om.po (+292/-192)
debian/real-po/or.po (+292/-192)
debian/real-po/os.po (+298/-196)
debian/real-po/pa.po (+321/-215)
debian/real-po/pl.po (+342/-215)
debian/real-po/pt.po (+346/-208)
debian/real-po/pt_BR.po (+333/-203)
debian/real-po/ro.po (+333/-204)
debian/real-po/ru.po (+341/-201)
debian/real-po/sa.po (+303/-204)
debian/real-po/sco.po (+296/-192)
debian/real-po/sd.po (+311/-195)
debian/real-po/se.po (+296/-192)
debian/real-po/shn.po (+294/-192)
debian/real-po/si.po (+406/-297)
debian/real-po/sk.po (+334/-203)
debian/real-po/sl.po (+346/-208)
debian/real-po/sn.po (+295/-196)
debian/real-po/sq.po (+346/-205)
debian/real-po/sr.po (+349/-209)
debian/real-po/sv.po (+332/-200)
debian/real-po/sw.po (+292/-192)
debian/real-po/szl.po (+338/-207)
debian/real-po/ta.po (+446/-343)
debian/real-po/ta_LK.po (+301/-195)
debian/real-po/te.po (+417/-330)
debian/real-po/templates.pot (+281/-179)
debian/real-po/tet.po (+292/-192)
debian/real-po/tg.po (+335/-205)
debian/real-po/th.po (+385/-296)
debian/real-po/tl.po (+297/-194)
debian/real-po/tr.po (+352/-215)
debian/real-po/tt.po (+292/-192)
debian/real-po/ug.po (+345/-214)
debian/real-po/uk.po (+349/-211)
debian/real-po/ur.po (+294/-192)
debian/real-po/uz.po (+344/-215)
debian/real-po/vec.po (+340/-208)
debian/real-po/vi.po (+337/-206)
debian/real-po/wae.po (+292/-192)
debian/real-po/wo.po (+296/-192)
debian/real-po/xh.po (+296/-192)
debian/real-po/zh_CN.po (+405/-235)
debian/real-po/zh_HK.po (+413/-239)
debian/real-po/zh_TW.po (+434/-250)
Reviewer Review Type Date Requested Status
Iain Lane 2020-10-08 Approve on 2020-10-08
Review via email: mp+391994@code.launchpad.net

Commit message

Refresh the translations

To post a comment you must log in.
Iain Lane (laney) wrote :

Cheers

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/real-po/aa.po b/debian/real-po/aa.po
2index 427714c..db562ba 100644
3--- a/debian/real-po/aa.po
4+++ b/debian/real-po/aa.po
5@@ -7,16 +7,16 @@ msgid ""
6 msgstr ""
7 "Project-Id-Version: ubiquity\n"
8 "Report-Msgid-Bugs-To: ubiquity@packages.debian.org\n"
9-"POT-Creation-Date: 2020-04-08 09:24+0100\n"
10+"POT-Creation-Date: 2020-10-01 17:47+0200\n"
11 "PO-Revision-Date: 2016-09-02 01:13+0000\n"
12 "Last-Translator: Charif AYFARAH <ayfarah@ymail.com>\n"
13 "Language-Team: Afar <aa@li.org>\n"
14+"Language: aa\n"
15 "MIME-Version: 1.0\n"
16 "Content-Type: text/plain; charset=UTF-8\n"
17 "Content-Transfer-Encoding: 8bit\n"
18 "X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
19 "X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
20-"Language: aa\n"
21
22 #. Type: text
23 #. Description
24@@ -47,7 +47,7 @@ msgstr ""
25 #. This is used as a window title.
26 #. Type: text
27 #. Description
28-#: ../ubiquity.templates:7001 ../ubiquity.templates:184001
29+#: ../ubiquity.templates:7001 ../ubiquity.templates:185001
30 msgid "Install"
31 msgstr "Daabis"
32
33@@ -109,15 +109,14 @@ msgid ""
34 "You may wish to read the <a href=\"release-notes\">release notes</a> or <a "
35 "href=\"update\">update this installer</a>."
36 msgstr ""
37-"<a href=\"release-notes\">Maybalaalaqâ kasenta</a> hinnay <a "
38-"href=\"update\">A daabiseyna asaakis</a> kawissam faxxa koo."
39+"<a href=\"release-notes\">Maybalaalaqâ kasenta</a> hinnay <a href=\"update"
40+"\">A daabiseyna asaakis</a> kawissam faxxa koo."
41
42 #. Type: text
43 #. Description
44 #: ../ubiquity.templates:14001
45 msgid "You may wish to read the <a href=\"release-notes\">release notes</a>."
46-msgstr ""
47-"<a href=\"release-notes\">Maybalaalaqâ kasenta</a> kawissam faxxa koo."
48+msgstr "<a href=\"release-notes\">Maybalaalaqâ kasenta</a> kawissam faxxa koo."
49
50 #. Type: text
51 #. Description
52@@ -208,8 +207,7 @@ msgstr ""
53 #. Type: text
54 #. Description
55 #: ../ubiquity.templates:29001
56-msgid ""
57-"May only contain lower-case letters, digits, hyphens, and underscores."
58+msgid "May only contain lower-case letters, digits, hyphens, and underscores."
59 msgstr ""
60
61 #. Type: text
62@@ -557,7 +555,7 @@ msgstr "Dug..."
63 #. An action, displayed on a button or as a menu item.
64 #. Type: text
65 #. Description
66-#: ../ubiquity.templates:84001 ../ubiquity.templates:303001
67+#: ../ubiquity.templates:84001 ../ubiquity.templates:305001
68 msgid "Revert"
69 msgstr "Wadir-gacis"
70
71@@ -927,78 +925,86 @@ msgstr "Ugus-abeh okkoro..."
72 #. Type: text
73 #. Description
74 #: ../ubiquity.templates:134001
75+#, fuzzy
76+#| msgid "Configuring time zone..."
77+msgid "Configuring Active Directory..."
78+msgstr "Waqlâ dabbih okkoro..."
79+
80+#. Type: text
81+#. Description
82+#: ../ubiquity.templates:135001
83 msgid "Saving installed packages..."
84 msgstr ""
85
86 #. Type: text
87 #. Description
88-#: ../ubiquity.templates:135001
89+#: ../ubiquity.templates:136001
90 msgid "Restoring previously installed packages..."
91 msgstr ""
92
93 #. Type: text
94 #. Description
95-#: ../ubiquity.templates:136001
96+#: ../ubiquity.templates:137001
97 msgid "Installing additional packages..."
98 msgstr "Ossi bakkookah daabisso..."
99
100 #. Type: text
101 #. Description
102-#: ../ubiquity.templates:137001
103+#: ../ubiquity.templates:138001
104 msgid "Checking for packages to install..."
105 msgstr "Daabisan bakkookah efeegedi..."
106
107 #. Type: text
108 #. Description
109-#: ../ubiquity.templates:138001
110+#: ../ubiquity.templates:139001
111 msgid "Removing extra packages..."
112 msgstr "Fuli bakkookah kalti..."
113
114 #. Type: text
115 #. Description
116-#: ../ubiquity.templates:139001
117+#: ../ubiquity.templates:140001
118 msgid "Checking for packages to remove..."
119 msgstr "Kalti faxxa bakkookah efeegedi..."
120
121 #. Type: text
122 #. Description
123-#: ../ubiquity.templates:140001
124+#: ../ubiquity.templates:141001
125 msgid "Downloading packages (${TIME} remaining)..."
126 msgstr "Bakkookah qulo ( raqtem ${TIME})..."
127
128 #. Type: text
129 #. Description
130-#: ../ubiquity.templates:141001
131+#: ../ubiquity.templates:142001
132 msgid "Downloading package lists..."
133 msgstr "Bakko rorsitteh qulo..."
134
135 #. Type: text
136 #. Description
137-#: ../ubiquity.templates:142001
138+#: ../ubiquity.templates:143001
139 msgid "Downloading package lists (${TIME} remaining)..."
140 msgstr "Bakko rorsitteh qulo ( raqtem ${TIME})..."
141
142 #. Type: error
143 #. Description
144-#: ../ubiquity.templates:144001
145+#: ../ubiquity.templates:145001
146 msgid "Error installing ${PACKAGE}"
147 msgstr "${PACKAGE} daabissoh soka"
148
149 #. Type: error
150 #. Description
151-#: ../ubiquity.templates:145001
152+#: ../ubiquity.templates:146001
153 msgid "Error removing ${PACKAGE}"
154 msgstr "${PACKAGE} kaltih soka"
155
156 #. Type: error
157 #. Description
158-#: ../ubiquity.templates:146001
159+#: ../ubiquity.templates:147001
160 msgid "Error while installing packages"
161 msgstr "Bakkooka daabisak sugen waqdi soki matre"
162
163 #. Type: error
164 #. Description
165-#: ../ubiquity.templates:146001
166+#: ../ubiquity.templates:147001
167 msgid "An error occurred while installing packages:"
168 msgstr "Bakkooka daabisak sugen waqdi soki yibbixe:"
169
170@@ -1006,7 +1012,7 @@ msgstr "Bakkooka daabisak sugen waqdi soki yibbixe:"
171 #. Description
172 #. Type: error
173 #. Description
174-#: ../ubiquity.templates:146001 ../ubiquity.templates:147001
175+#: ../ubiquity.templates:147001 ../ubiquity.templates:148001
176 msgid "The following packages are in a broken state:"
177 msgstr "A katatta bakkooka diglo le:"
178
179@@ -1014,38 +1020,38 @@ msgstr "A katatta bakkooka diglo le:"
180 #. Description
181 #. Type: error
182 #. Description
183-#: ../ubiquity.templates:146001 ../ubiquity.templates:147001
184+#: ../ubiquity.templates:147001 ../ubiquity.templates:148001
185 msgid ""
186 "This may be due to using an old installer image, or it may be due to a bug "
187-"in some of the packages listed above. More details may be found in "
188-"/var/log/syslog. The installer will try to continue anyway, but may fail at "
189-"a later point, and will not be able to install or remove other packages "
190-"(possibly including itself) from the installed system. You should first look "
191-"for newer versions of your installer image, or failing that report the "
192-"problem to your distributor."
193+"in some of the packages listed above. More details may be found in /var/log/"
194+"syslog. The installer will try to continue anyway, but may fail at a later "
195+"point, and will not be able to install or remove other packages (possibly "
196+"including itself) from the installed system. You should first look for newer "
197+"versions of your installer image, or failing that report the problem to your "
198+"distributor."
199 msgstr ""
200
201 #. Type: error
202 #. Description
203-#: ../ubiquity.templates:147001
204+#: ../ubiquity.templates:148001
205 msgid "Error while removing packages"
206 msgstr "Bakkooka kalak sugen waqdi soki matre"
207
208 #. Type: error
209 #. Description
210-#: ../ubiquity.templates:147001
211+#: ../ubiquity.templates:148001
212 msgid "An error occurred while removing packages:"
213 msgstr "Bakkooka kalak sugen waqdi soki yibbixe:"
214
215 #. Type: error
216 #. Description
217-#: ../ubiquity.templates:148001
218+#: ../ubiquity.templates:149001
219 msgid "Error copying network configuration"
220 msgstr "Rettah okkoroh korraaqot soki yan"
221
222 #. Type: error
223 #. Description
224-#: ../ubiquity.templates:148001
225+#: ../ubiquity.templates:149001
226 msgid ""
227 "An error occurred while copying the network settings. The installation will "
228 "continue, but the network configuration will have to be set up again in the "
229@@ -1054,13 +1060,13 @@ msgstr ""
230
231 #. Type: error
232 #. Description
233-#: ../ubiquity.templates:149001
234+#: ../ubiquity.templates:150001
235 msgid "Error copying bluetooth configuration"
236 msgstr ""
237
238 #. Type: error
239 #. Description
240-#: ../ubiquity.templates:149001
241+#: ../ubiquity.templates:150001
242 msgid ""
243 "An error occurred while copying the bluetooth settings. The installation "
244 "will continue, but the bluetooth configuration will have to be set up again "
245@@ -1069,46 +1075,45 @@ msgstr ""
246
247 #. Type: error
248 #. Description
249-#: ../ubiquity.templates:150001
250-msgid "Error restoring installed applications"
251+#: ../ubiquity.templates:151001
252+msgid "Error configuring connection to Active Directory"
253 msgstr ""
254
255 #. Type: error
256 #. Description
257-#: ../ubiquity.templates:150001
258+#: ../ubiquity.templates:151001
259 msgid ""
260-"An error occurred while restoring previously-installed applications. The "
261-"installation will continue, but you may have to manually reinstall some "
262-"applications after the computer reboots."
263+"Sorry, Active Directory can't be set up at the moment. Once your system is "
264+"up and running, visit help.ubuntu.com/activedirectory for help."
265 msgstr ""
266
267 #. Type: text
268 #. Description
269-#: ../ubiquity.templates:154001
270+#: ../ubiquity.templates:155001
271 msgid "Calculating files to skip copying..."
272 msgstr "Korraaqak caban kibaabih loowo..."
273
274 #. Type: title
275 #. Description
276-#: ../ubiquity.templates:155001
277+#: ../ubiquity.templates:156001
278 msgid "Installing language packs"
279 msgstr "Afti bakkookah daabisso"
280
281 #. Type: text
282 #. Description
283-#: ../ubiquity.templates:156001
284+#: ../ubiquity.templates:157001
285 msgid "Downloading language packs (${TIME} remaining)..."
286 msgstr "Afti bakkookah qulo (raqtem ${TIME})..."
287
288 #. Type: boolean
289 #. Description
290-#: ../ubiquity.templates:165001
291+#: ../ubiquity.templates:166001
292 msgid "Failed to unmount partitions"
293 msgstr "Kuritteh obtih efferi"
294
295 #. Type: boolean
296 #. Description
297-#: ../ubiquity.templates:165001
298+#: ../ubiquity.templates:166001
299 msgid ""
300 "The installer needs to commit changes to partition tables, but cannot do so "
301 "because partitions on the following mount points could not be unmounted:"
302@@ -1116,26 +1121,25 @@ msgstr ""
303
304 #. Type: boolean
305 #. Description
306-#: ../ubiquity.templates:165001
307+#: ../ubiquity.templates:166001
308 msgid "Please close any applications using these mount points."
309 msgstr "Ku maganak, kurittet xoqoysimta abnissoosa alif."
310
311 #. Type: boolean
312 #. Description
313-#: ../ubiquity.templates:165001
314-msgid ""
315-"Would you like the installer to try to unmount these partitions again?"
316+#: ../ubiquity.templates:166001
317+msgid "Would you like the installer to try to unmount these partitions again?"
318 msgstr "Daabiseyni kuritteh obti kaadu gabbatam maay faxxa?"
319
320 #. Type: boolean
321 #. Description
322-#: ../ubiquity.templates:171001
323+#: ../ubiquity.templates:172001
324 msgid "Do you want to return to the partitioner?"
325 msgstr "Kureynal taduurem maay faxxa?"
326
327 #. Type: boolean
328 #. Description
329-#: ../ubiquity.templates:171001
330+#: ../ubiquity.templates:172001
331 msgid ""
332 "Some of the partitions you created are too small. Please make the following "
333 "partitions at least this large:"
334@@ -1143,7 +1147,7 @@ msgstr ""
335
336 #. Type: boolean
337 #. Description
338-#: ../ubiquity.templates:171001
339+#: ../ubiquity.templates:172001
340 msgid ""
341 "If you do not go back to the partitioner and increase the size of these "
342 "partitions, the installation may fail."
343@@ -1151,7 +1155,7 @@ msgstr ""
344
345 #. Type: text
346 #. Description
347-#: ../ubiquity.templates:173001
348+#: ../ubiquity.templates:174001
349 msgid "System Configuration"
350 msgstr "Siirah okkoro"
351
352@@ -1159,25 +1163,25 @@ msgstr "Siirah okkoro"
353 #. Description
354 #. Type: text
355 #. Description
356-#: ../ubiquity.templates:174001 ../ubiquity.templates:257001
357+#: ../ubiquity.templates:175001 ../ubiquity.templates:258001
358 msgid "Welcome"
359 msgstr "Arcib"
360
361 #. Type: text
362 #. Description
363-#: ../ubiquity.templates:175001
364+#: ../ubiquity.templates:176001
365 msgid "Network configuration"
366 msgstr "Rettah okkoro"
367
368 #. Type: text
369 #. Description
370-#: ../ubiquity.templates:176001
371+#: ../ubiquity.templates:177001
372 msgid "Software selection"
373 msgstr "Fantaaso dooro"
374
375 #. Type: text
376 #. Description
377-#: ../ubiquity.templates:177001
378+#: ../ubiquity.templates:178001
379 msgid "Language"
380 msgstr "Afa"
381
382@@ -1185,111 +1189,111 @@ msgstr "Afa"
383 #. Description
384 #. Type: text
385 #. Description
386-#: ../ubiquity.templates:178001 ../ubiquity.templates:202001
387+#: ../ubiquity.templates:179001 ../ubiquity.templates:203001
388 msgid "Wireless"
389 msgstr ""
390
391 #. Type: text
392 #. Description
393-#: ../ubiquity.templates:179001
394+#: ../ubiquity.templates:180001
395 msgid "Software"
396 msgstr ""
397
398 #. Type: text
399 #. Description
400-#: ../ubiquity.templates:180001
401+#: ../ubiquity.templates:181001
402 msgid "Timezone"
403 msgstr "Waqlâ-dabba"
404
405 #. Type: text
406 #. Description
407-#: ../ubiquity.templates:181001
408+#: ../ubiquity.templates:182001
409 msgid "Keyboard"
410 msgstr "Maftaci"
411
412 #. Type: text
413 #. Description
414-#: ../ubiquity.templates:182001
415+#: ../ubiquity.templates:183001
416 msgid "Disk Setup"
417 msgstr "Galaad maymaaqa"
418
419 #. Type: text
420 #. Description
421-#: ../ubiquity.templates:183001
422+#: ../ubiquity.templates:184001
423 msgid "User Info"
424 msgstr "Xoqoysimê xaagu"
425
426 #. Type: text
427 #. Description
428-#: ../ubiquity.templates:185001
429+#: ../ubiquity.templates:186001
430 msgid "installation process"
431 msgstr "Daabissô gexsiti"
432
433 #. Type: text
434 #. Description
435-#: ../ubiquity.templates:187001
436+#: ../ubiquity.templates:188001
437 msgid "Checking for installer updates"
438 msgstr "Daabiseynah asaakiisa efeeged"
439
440 #. Type: text
441 #. Description
442-#: ../ubiquity.templates:188001
443+#: ../ubiquity.templates:189001
444 msgid "Reading package information"
445 msgstr "Bakkô xaagih kawsa"
446
447 #. Type: text
448 #. Description
449-#: ../ubiquity.templates:189001
450+#: ../ubiquity.templates:190001
451 msgid "Updating package information"
452 msgstr "Bakkô xaagih asaakisi"
453
454 #. Type: text
455 #. Description
456-#: ../ubiquity.templates:190001
457+#: ../ubiquity.templates:191001
458 msgid "File ${INDEX} of ${TOTAL} at ${SPEED}/s"
459 msgstr "${INDEX} kiba ${TOTAL} yanik, sissikal ${SPEED}/s"
460
461 #. Type: text
462 #. Description
463-#: ../ubiquity.templates:191001
464+#: ../ubiquity.templates:192001
465 msgid "File ${INDEX} of ${TOTAL}"
466 msgstr "${INDEX} kiba ${TOTAL} yanik"
467
468 #. Type: text
469 #. Description
470-#: ../ubiquity.templates:192001
471+#: ../ubiquity.templates:193001
472 msgid "Installing update"
473 msgstr "Asaakis daabisso"
474
475 #. Type: text
476 #. Description
477-#: ../ubiquity.templates:193001
478+#: ../ubiquity.templates:194001
479 msgid "Error updating installer"
480 msgstr "Daabiseyni asaakisit soki yan"
481
482 #. Type: text
483 #. Description
484-#: ../ubiquity.templates:193001
485+#: ../ubiquity.templates:194001
486 msgid "The installer encountered an error while trying to update itself:"
487 msgstr "Daabiseyni is asaakisak suge waqdi, soki kaat matre:"
488
489 #. Type: text
490 #. Description
491 #. Translated acronym for Universal Serial Bus.
492-#: ../ubiquity.templates:194001
493+#: ../ubiquity.templates:195001
494 msgid "USB disk"
495 msgstr ""
496
497 #. Type: text
498 #. Description
499 #. Translated acronym for Compact Disc.
500-#: ../ubiquity.templates:195001
501+#: ../ubiquity.templates:196001
502 msgid "CD"
503 msgstr "CD"
504
505 #. Type: text
506 #. Description
507-#: ../ubiquity.templates:196001
508+#: ../ubiquity.templates:197001
509 msgid ""
510 "Please choose the language to use for the install process. This language "
511 "will be the default language for this computer."
512@@ -1297,7 +1301,7 @@ msgstr ""
513
514 #. Type: text
515 #. Description
516-#: ../ubiquity.templates:197001
517+#: ../ubiquity.templates:198001
518 msgid ""
519 "Please choose the language used for the configuration process. This language "
520 "will be the default language for this computer."
521@@ -1309,13 +1313,13 @@ msgstr ""
522 #. Description
523 #. Type: text
524 #. Description
525-#: ../ubiquity.templates:198001 ../ubiquity.templates:199001
526+#: ../ubiquity.templates:199001 ../ubiquity.templates:200001
527 msgid "Installation failed"
528 msgstr "Daabisso ma bicinna"
529
530 #. Type: text
531 #. Description
532-#: ../ubiquity.templates:198001
533+#: ../ubiquity.templates:199001
534 msgid ""
535 "The installer encountered an unrecoverable error. A desktop session will "
536 "now be run so that you may investigate the problem or try installing again."
537@@ -1323,19 +1327,19 @@ msgstr ""
538
539 #. Type: text
540 #. Description
541-#: ../ubiquity.templates:199001
542+#: ../ubiquity.templates:200001
543 msgid "The installer encountered an unrecoverable error and will now reboot."
544 msgstr ""
545
546 #. Type: text
547 #. Description
548-#: ../ubiquity.templates:201001
549+#: ../ubiquity.templates:202001
550 msgid "Updates and other software"
551 msgstr ""
552
553 #. Type: text
554 #. Description
555-#: ../ubiquity.templates:203001
556+#: ../ubiquity.templates:204001
557 msgid ""
558 "Connecting this computer to a wi-fi network allows you to install third-"
559 "party software, download updates, automatically detect your timezone, and "
560@@ -1344,49 +1348,51 @@ msgstr ""
561
562 #. Type: text
563 #. Description
564-#: ../ubiquity.templates:204001
565+#. Type: text
566+#. Description
567+#: ../ubiquity.templates:205001 ../ubiquity.templates:327001
568 msgid "Password:"
569 msgstr ""
570
571 #. Type: text
572 #. Description
573-#: ../ubiquity.templates:205001
574+#: ../ubiquity.templates:206001
575 msgid "Display password"
576 msgstr ""
577
578 #. Type: text
579 #. Description
580-#: ../ubiquity.templates:206001
581+#: ../ubiquity.templates:207001
582 msgid "I don't want to connect to a wi-fi network right now"
583 msgstr ""
584
585 #. Type: text
586 #. Description
587-#: ../ubiquity.templates:207001
588+#: ../ubiquity.templates:208001
589 msgid "Connect to this network"
590 msgstr ""
591
592 #. Type: text
593 #. Description
594-#: ../ubiquity.templates:213001
595+#: ../ubiquity.templates:214001
596 msgid "Select drive:"
597 msgstr ""
598
599 #. Type: text
600 #. Description
601-#: ../ubiquity.templates:214001
602+#: ../ubiquity.templates:215001
603 msgid "Allocate drive space by dragging the divider below:"
604 msgstr ""
605
606 #. Type: text
607 #. Description
608-#: ../ubiquity.templates:215001
609+#: ../ubiquity.templates:216001
610 msgid "The entire disk will be used:"
611 msgstr ""
612
613 #. Type: text
614 #. Description
615-#: ../ubiquity.templates:216001
616+#: ../ubiquity.templates:217001
617 #, no-c-format
618 msgid ""
619 "<small>%d smaller partitions are hidden, use the <a href=\"\">advanced "
620@@ -1395,7 +1401,7 @@ msgstr ""
621
622 #. Type: text
623 #. Description
624-#: ../ubiquity.templates:217001
625+#: ../ubiquity.templates:218001
626 msgid ""
627 "<small>1 smaller partition is hidden, use the <a href=\"\">advanced "
628 "partitioning tool</a> for more control</small>"
629@@ -1403,7 +1409,7 @@ msgstr ""
630
631 #. Type: text
632 #. Description
633-#: ../ubiquity.templates:218001
634+#: ../ubiquity.templates:219001
635 #, no-c-format
636 msgid ""
637 "%d partitions will be deleted, use the <a href=\"\">advanced partitioning "
638@@ -1412,7 +1418,7 @@ msgstr ""
639
640 #. Type: text
641 #. Description
642-#: ../ubiquity.templates:219001
643+#: ../ubiquity.templates:220001
644 msgid ""
645 "1 partition will be deleted, use the <a href=\"\">advanced partitioning "
646 "tool</a> for more control"
647@@ -1420,85 +1426,85 @@ msgstr ""
648
649 #. Type: text
650 #. Description
651-#: ../ubiquity.templates:220001
652+#: ../ubiquity.templates:221001
653 msgid "Split Largest Partition"
654 msgstr ""
655
656 #. Type: text
657 #. Description
658-#: ../ubiquity.templates:222001
659+#: ../ubiquity.templates:223001
660 msgid "For best results, please ensure that this computer:"
661 msgstr ""
662
663 #. Type: text
664 #. Description
665-#: ../ubiquity.templates:223001
666+#: ../ubiquity.templates:224001
667 msgid "Sorry"
668 msgstr ""
669
670 #. Type: text
671 #. Description
672 #. RST means "Rapid Storage Technology". Don't translate it.
673-#: ../ubiquity.templates:224001
674+#: ../ubiquity.templates:225001
675 msgid "Turn off RST"
676 msgstr ""
677
678 #. Type: text
679 #. Description
680-#: ../ubiquity.templates:225001
681+#: ../ubiquity.templates:226001
682 msgid ""
683 "This computer uses Intel RST (Rapid Storage Technology). You need to turn "
684 "off RST before installing Ubuntu. For instructions, open this page on a "
685-"phone or other device: <a "
686-"href=\"https://help.ubuntu.com/rst\">help.ubuntu.com/rst</a>"
687+"phone or other device: <a href=\"https://help.ubuntu.com/rst\">help.ubuntu."
688+"com/rst</a>"
689 msgstr ""
690
691 #. Type: text
692 #. Description
693-#: ../ubiquity.templates:226001
694+#: ../ubiquity.templates:227001
695 msgid "Turn off BitLocker"
696 msgstr ""
697
698 #. Type: text
699 #. Description
700-#: ../ubiquity.templates:227001
701+#: ../ubiquity.templates:228001
702 msgid ""
703 "This computer uses Windows BitLocker encryption. You need to turn off "
704 "BitLocker in Windows before installing Ubuntu. For instructions, open this "
705-"page on a phone or other device: <a "
706-"href=\"https://help.ubuntu.com/bitlocker\">help.ubuntu.com/bitlocker</a>"
707+"page on a phone or other device: <a href=\"https://help.ubuntu.com/bitlocker"
708+"\">help.ubuntu.com/bitlocker</a>"
709 msgstr ""
710
711 #. Type: text
712 #. Description
713 #. SIZE is a variable substituted into this string, and may be '3.7 GB'
714 #. RELEASE is a variable substituted into this string, the Ubuntu flavor'
715-#: ../ubiquity.templates:228001
716+#: ../ubiquity.templates:229001
717 msgid "You need at least ${SIZE} disk space to install ${RELEASE}."
718 msgstr ""
719
720 #. Type: text
721 #. Description
722 #. SIZE is a variable substituted into this string, and may be '3.7 GB'
723-#: ../ubiquity.templates:229001
724+#: ../ubiquity.templates:230001
725 msgid "This computer has only ${SIZE}."
726 msgstr ""
727
728 #. Type: text
729 #. Description
730-#: ../ubiquity.templates:230001
731+#: ../ubiquity.templates:231001
732 msgid "is plugged in to a power source"
733 msgstr ""
734
735 #. Type: text
736 #. Description
737-#: ../ubiquity.templates:231001
738+#: ../ubiquity.templates:232001
739 msgid "is connected to the Internet"
740 msgstr ""
741
742 #. Type: text
743 #. Description
744-#: ../ubiquity.templates:232001
745+#: ../ubiquity.templates:233001
746 msgid ""
747 "This software is subject to license terms included with its documentation. "
748 "Some is proprietary."
749@@ -1506,7 +1512,7 @@ msgstr ""
750
751 #. Type: text
752 #. Description
753-#: ../ubiquity.templates:233001
754+#: ../ubiquity.templates:234001
755 msgid ""
756 "Install third-party software for graphics and Wi-Fi hardware and additional "
757 "media formats"
758@@ -1514,67 +1520,67 @@ msgstr ""
759
760 #. Type: text
761 #. Description
762-#: ../ubiquity.templates:234001
763+#: ../ubiquity.templates:235001
764 msgid "Download updates while installing ${RELEASE}"
765 msgstr ""
766
767 #. Type: text
768 #. Description
769-#: ../ubiquity.templates:235001
770+#: ../ubiquity.templates:236001
771 msgid "This saves time after installation."
772 msgstr ""
773
774 #. Type: text
775 #. Description
776-#: ../ubiquity.templates:236001
777+#: ../ubiquity.templates:237001
778 msgid "Not available because there is no Internet connection."
779 msgstr ""
780
781 #. Type: text
782 #. Description
783-#: ../ubiquity.templates:237001
784+#: ../ubiquity.templates:238001
785 msgid "What apps would you like to install to start with?"
786 msgstr ""
787
788 #. Type: text
789 #. Description
790-#: ../ubiquity.templates:238001
791+#: ../ubiquity.templates:239001
792 msgid "Which applications would you like to start with?"
793 msgstr ""
794
795 #. Type: text
796 #. Description
797-#: ../ubiquity.templates:239001
798+#: ../ubiquity.templates:240001
799 msgid "Minimal installation"
800 msgstr ""
801
802 #. Type: text
803 #. Description
804-#: ../ubiquity.templates:240001
805+#: ../ubiquity.templates:241001
806 msgid "Web browser and basic utilities."
807 msgstr ""
808
809 #. Type: text
810 #. Description
811-#: ../ubiquity.templates:241001
812+#: ../ubiquity.templates:242001
813 msgid "Web browser plus basic utilities and applications."
814 msgstr ""
815
816 #. Type: text
817 #. Description
818-#: ../ubiquity.templates:242001
819+#: ../ubiquity.templates:243001
820 msgid "Normal installation"
821 msgstr ""
822
823 #. Type: text
824 #. Description
825-#: ../ubiquity.templates:243001
826+#: ../ubiquity.templates:244001
827 msgid "Web browser, utilities, office software, games, and media players."
828 msgstr ""
829
830 #. Type: text
831 #. Description
832-#: ../ubiquity.templates:244001
833+#: ../ubiquity.templates:245001
834 msgid ""
835 "Web browser, utilities, office software, plus additional internet "
836 "applications and media players."
837@@ -1582,13 +1588,13 @@ msgstr ""
838
839 #. Type: text
840 #. Description
841-#: ../ubiquity.templates:245001
842+#: ../ubiquity.templates:246001
843 msgid "Other options"
844 msgstr ""
845
846 #. Type: text
847 #. Description
848-#: ../ubiquity.templates:246001
849+#: ../ubiquity.templates:247001
850 msgid ""
851 "Installing third-party drivers requires configuring Secure Boot. To do this, "
852 "you need to choose a security key now, and enter it when the system restarts."
853@@ -1596,25 +1602,25 @@ msgstr ""
854
855 #. Type: text
856 #. Description
857-#: ../ubiquity.templates:250001
858+#: ../ubiquity.templates:251001
859 msgid "Layout:"
860 msgstr "Raku:"
861
862 #. Type: text
863 #. Description
864-#: ../ubiquity.templates:251001
865+#: ../ubiquity.templates:252001
866 msgid "Variant:"
867 msgstr "Qaynatak teyna:"
868
869 #. Type: text
870 #. Description
871-#: ../ubiquity.templates:252001
872+#: ../ubiquity.templates:253001
873 msgid "Below is an image of your current layout:"
874 msgstr "Ahak gubal tanim, away lito rakih muuci:"
875
876 #. Type: text
877 #. Description
878-#: ../ubiquity.templates:253001
879+#: ../ubiquity.templates:254001
880 msgid ""
881 "Select your location, so that the system can use appropriate display "
882 "conventions for your country, fetch updates from sites close to you, and set "
883@@ -1625,19 +1631,19 @@ msgstr ""
884
885 #. Type: text
886 #. Description
887-#: ../ubiquity.templates:254001
888+#: ../ubiquity.templates:255001
889 msgid "Time Zone:"
890 msgstr "Waqlâ Dabba:"
891
892 #. Type: text
893 #. Description
894-#: ../ubiquity.templates:255001
895+#: ../ubiquity.templates:256001
896 msgid "Region:"
897 msgstr "Rakaakaya:"
898
899 #. Type: text
900 #. Description
901-#: ../ubiquity.templates:256001
902+#: ../ubiquity.templates:257001
903 msgid "[type here to change]"
904 msgstr ""
905
906@@ -1645,14 +1651,14 @@ msgstr ""
907 #. Description
908 #. OS is a variable substituted into this string, and may be 'Windows 7'
909 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
910-#: ../ubiquity.templates:259001
911+#: ../ubiquity.templates:260001
912 msgid "Replace ${OS} with ${DISTRO}"
913 msgstr ""
914
915 #. Type: text
916 #. Description
917 #. OS is a variable substituted into this string, and may be 'Windows 7'
918-#: ../ubiquity.templates:259001
919+#: ../ubiquity.templates:260001
920 msgid ""
921 "<span foreground=\"darkred\">Warning:</span> This will delete all of your "
922 "${OS} programs, documents, photos, music, and any other files."
923@@ -1662,7 +1668,7 @@ msgstr ""
924 #. Description
925 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
926 #. OS is a variable substituted into this string, and may be 'Windows 7'
927-#: ../ubiquity.templates:260001
928+#: ../ubiquity.templates:261001
929 msgid "Install ${DISTRO} alongside ${OS}"
930 msgstr ""
931
932@@ -1674,8 +1680,8 @@ msgstr ""
933 #. Description
934 #. Type: text
935 #. Description
936-#: ../ubiquity.templates:260001 ../ubiquity.templates:261001
937-#: ../ubiquity.templates:264001 ../ubiquity.templates:269001
938+#: ../ubiquity.templates:261001 ../ubiquity.templates:262001
939+#: ../ubiquity.templates:265001 ../ubiquity.templates:270001
940 msgid ""
941 "Documents, music, and other personal files will be kept. You can choose "
942 "which operating system you want each time the computer starts up."
943@@ -1685,20 +1691,20 @@ msgstr ""
944 #. Description
945 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
946 #. OS is a variable substituted into this string, and may be 'Windows 7'
947-#: ../ubiquity.templates:261001
948+#: ../ubiquity.templates:262001
949 msgid "Install ${DISTRO} inside ${OS}"
950 msgstr ""
951
952 #. Type: text
953 #. Description
954-#: ../ubiquity.templates:262001
955+#: ../ubiquity.templates:263001
956 msgid "Something else"
957 msgstr ""
958
959 #. Type: text
960 #. Description
961 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
962-#: ../ubiquity.templates:262001
963+#: ../ubiquity.templates:263001
964 msgid ""
965 "You can create or resize partitions yourself, or choose multiple partitions "
966 "for ${DISTRO}."
967@@ -1707,14 +1713,14 @@ msgstr ""
968 #. Type: text
969 #. Description
970 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
971-#: ../ubiquity.templates:263001
972+#: ../ubiquity.templates:264001
973 msgid "Erase ${CURDISTRO} and reinstall"
974 msgstr ""
975
976 #. Type: text
977 #. Description
978 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
979-#: ../ubiquity.templates:263001
980+#: ../ubiquity.templates:264001
981 msgid ""
982 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
983 "${CURDISTRO} programs, documents, photos, music, and any other files."
984@@ -1725,7 +1731,7 @@ msgstr ""
985 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
986 #. VER is a variable substituted into this string, and may be '11.04'
987 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
988-#: ../ubiquity.templates:264001
989+#: ../ubiquity.templates:265001
990 msgid "Install ${DISTRO} ${VER} alongside ${CURDISTRO}"
991 msgstr ""
992
993@@ -1735,13 +1741,13 @@ msgstr ""
994 #. Type: text
995 #. Description
996 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
997-#: ../ubiquity.templates:265001 ../ubiquity.templates:268001
998+#: ../ubiquity.templates:266001 ../ubiquity.templates:269001
999 msgid "Erase disk and install ${DISTRO}"
1000 msgstr ""
1001
1002 #. Type: text
1003 #. Description
1004-#: ../ubiquity.templates:265001
1005+#: ../ubiquity.templates:266001
1006 msgid ""
1007 "<span foreground=\"darkred\">Warning:</span> This will delete any files on "
1008 "the disk."
1009@@ -1749,7 +1755,7 @@ msgstr ""
1010
1011 #. Type: text
1012 #. Description
1013-#: ../ubiquity.templates:266001
1014+#: ../ubiquity.templates:267001
1015 msgid "Erase everything and reinstall"
1016 msgstr ""
1017
1018@@ -1757,7 +1763,7 @@ msgstr ""
1019 #. Description
1020 #. OS is a variable substituted into this string, and may be 'Windows 7'
1021 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
1022-#: ../ubiquity.templates:266001
1023+#: ../ubiquity.templates:267001
1024 msgid ""
1025 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
1026 "programs, documents, photos, music, and other files in both ${OS} and "
1027@@ -1767,21 +1773,21 @@ msgstr ""
1028 #. Type: text
1029 #. Description
1030 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
1031-#: ../ubiquity.templates:267001
1032+#: ../ubiquity.templates:268001
1033 msgid "Reinstall ${CURDISTRO}"
1034 msgstr ""
1035
1036 #. Type: text
1037 #. Description
1038-#: ../ubiquity.templates:267001
1039+#: ../ubiquity.templates:268001
1040 msgid ""
1041 "Documents, music, and other personal files will be kept. Installed software "
1042-"will be kept where possible. System-wide settings will be cleared."
1043+"and system-wide settings will be cleared."
1044 msgstr ""
1045
1046 #. Type: text
1047 #. Description
1048-#: ../ubiquity.templates:268001
1049+#: ../ubiquity.templates:269001
1050 msgid ""
1051 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
1052 "programs, documents, photos, music, and any other files in all operating "
1053@@ -1791,14 +1797,14 @@ msgstr ""
1054 #. Type: text
1055 #. Description
1056 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
1057-#: ../ubiquity.templates:269001
1058+#: ../ubiquity.templates:270001
1059 msgid "Install ${DISTRO} alongside them"
1060 msgstr ""
1061
1062 #. Type: text
1063 #. Description
1064 #. OS is a variable substituted into this string, and may be 'Windows 7'
1065-#: ../ubiquity.templates:270001
1066+#: ../ubiquity.templates:271001
1067 msgid "This computer currently has ${OS} on it. What would you like to do?"
1068 msgstr ""
1069
1070@@ -1806,7 +1812,7 @@ msgstr ""
1071 #. Description
1072 #. OS1 is a variable substituted into this string, and may be 'Windows 7'
1073 #. OS2 is a variable substituted into this string, and may be 'Mac OS X'
1074-#: ../ubiquity.templates:271001
1075+#: ../ubiquity.templates:272001
1076 msgid ""
1077 "This computer currently has ${OS1} and ${OS2} on it. What would you like to "
1078 "do?"
1079@@ -1814,7 +1820,7 @@ msgstr ""
1080
1081 #. Type: text
1082 #. Description
1083-#: ../ubiquity.templates:272001
1084+#: ../ubiquity.templates:273001
1085 msgid ""
1086 "This computer currently has multiple operating systems on it. What would you "
1087 "like to do?"
1088@@ -1822,7 +1828,7 @@ msgstr ""
1089
1090 #. Type: text
1091 #. Description
1092-#: ../ubiquity.templates:273001
1093+#: ../ubiquity.templates:274001
1094 msgid ""
1095 "This computer currently has no detected operating systems. What would you "
1096 "like to do?"
1097@@ -1830,37 +1836,37 @@ msgstr ""
1098
1099 #. Type: text
1100 #. Description
1101-#: ../ubiquity.templates:274001
1102+#: ../ubiquity.templates:275001
1103 msgid "Before:"
1104 msgstr "Duma:"
1105
1106 #. Type: text
1107 #. Description
1108-#: ../ubiquity.templates:275001
1109+#: ../ubiquity.templates:276001
1110 msgid "After:"
1111 msgstr "Sarra:"
1112
1113 #. Type: text
1114 #. Description
1115-#: ../ubiquity.templates:276001
1116+#: ../ubiquity.templates:277001
1117 msgid "Encrypt the new ${RELEASE} installation for security"
1118 msgstr ""
1119
1120 #. Type: text
1121 #. Description
1122-#: ../ubiquity.templates:277001
1123+#: ../ubiquity.templates:278001
1124 msgid "You will choose a security key in the next step."
1125 msgstr ""
1126
1127 #. Type: text
1128 #. Description
1129-#: ../ubiquity.templates:278001
1130+#: ../ubiquity.templates:279001
1131 msgid "Use LVM with the new ${RELEASE} installation"
1132 msgstr ""
1133
1134 #. Type: text
1135 #. Description
1136-#: ../ubiquity.templates:279001
1137+#: ../ubiquity.templates:280001
1138 msgid ""
1139 "This will set up Logical Volume Management. It allows taking snapshots and "
1140 "easier partition resizing."
1141@@ -1868,28 +1874,27 @@ msgstr ""
1142
1143 #. Type: text
1144 #. Description
1145-#: ../ubiquity.templates:280001
1146-msgid "EXPERIMENTAL: Erase disk and use ZFS"
1147+#: ../ubiquity.templates:281001
1148+msgid "Erase disk and use ZFS"
1149 msgstr ""
1150
1151 #. Type: text
1152 #. Description
1153-#: ../ubiquity.templates:281001
1154+#: ../ubiquity.templates:282001
1155 msgid ""
1156 "<span foreground=\"darkred\">Warning:</span> This will delete all your files "
1157-"on all operating systems. This is experimental and may cause data loss. Do "
1158-"not use on production systems."
1159+"on all operating systems."
1160 msgstr ""
1161
1162 #. Type: text
1163 #. Description
1164-#: ../ubiquity.templates:283001
1165+#: ../ubiquity.templates:284001
1166 msgid "Advanced Features"
1167 msgstr ""
1168
1169 #. Type: text
1170 #. Description
1171-#: ../ubiquity.templates:284001
1172+#: ../ubiquity.templates:285001
1173 msgid "None"
1174 msgstr ""
1175
1176@@ -1897,49 +1902,55 @@ msgstr ""
1177 #. Description
1178 #. Type: text
1179 #. Description
1180-#: ../ubiquity.templates:285001 ../ubiquity.templates:287001
1181+#: ../ubiquity.templates:286001 ../ubiquity.templates:288001
1182 msgid "None selected"
1183 msgstr ""
1184
1185 #. Type: text
1186 #. Description
1187-#: ../ubiquity.templates:286001
1188+#: ../ubiquity.templates:287001
1189 msgid "Advanced features..."
1190 msgstr ""
1191
1192 #. Type: text
1193 #. Description
1194-#: ../ubiquity.templates:288001
1195+#: ../ubiquity.templates:289001
1196 msgid "LVM selected"
1197 msgstr ""
1198
1199 #. Type: text
1200 #. Description
1201-#: ../ubiquity.templates:289001
1202+#: ../ubiquity.templates:290001
1203 msgid "LVM and encryption selected"
1204 msgstr ""
1205
1206 #. Type: text
1207 #. Description
1208-#: ../ubiquity.templates:290001
1209+#: ../ubiquity.templates:291001
1210 msgid "ZFS selected"
1211 msgstr ""
1212
1213 #. Type: text
1214 #. Description
1215-#: ../ubiquity.templates:291001
1216+#: ../ubiquity.templates:292001
1217+msgid "ZFS and encryption selected"
1218+msgstr ""
1219+
1220+#. Type: text
1221+#. Description
1222+#: ../ubiquity.templates:293001
1223 msgid "Confirm the security key:"
1224 msgstr ""
1225
1226 #. Type: text
1227 #. Description
1228-#: ../ubiquity.templates:292001
1229+#: ../ubiquity.templates:294001
1230 msgid "Choose a security key:"
1231 msgstr ""
1232
1233 #. Type: text
1234 #. Description
1235-#: ../ubiquity.templates:293001
1236+#: ../ubiquity.templates:295001
1237 msgid ""
1238 "Disk encryption protects your files in case you lose your computer. It "
1239 "requires you to enter a security key each time the computer starts up."
1240@@ -1947,13 +1958,13 @@ msgstr ""
1241
1242 #. Type: text
1243 #. Description
1244-#: ../ubiquity.templates:294001
1245+#: ../ubiquity.templates:296001
1246 msgid "Any files outside of ${RELEASE} will not be encrypted."
1247 msgstr ""
1248
1249 #. Type: text
1250 #. Description
1251-#: ../ubiquity.templates:295001
1252+#: ../ubiquity.templates:297001
1253 msgid ""
1254 "<span foreground=\"darkred\">Warning:</span> If you lose this security key, "
1255 "all data will be lost. If you need to, write down your key and keep it in a "
1256@@ -1962,61 +1973,61 @@ msgstr ""
1257
1258 #. Type: text
1259 #. Description
1260-#: ../ubiquity.templates:296001
1261+#: ../ubiquity.templates:298001
1262 msgid "For more security:"
1263 msgstr ""
1264
1265 #. Type: text
1266 #. Description
1267-#: ../ubiquity.templates:297001
1268+#: ../ubiquity.templates:299001
1269 msgid "Overwrite empty disk space"
1270 msgstr ""
1271
1272 #. Type: text
1273 #. Description
1274-#: ../ubiquity.templates:298001
1275+#: ../ubiquity.templates:300001
1276 msgid "The installation may take much longer."
1277 msgstr ""
1278
1279 #. Type: text
1280 #. description
1281-#: ../ubiquity.templates:299001
1282+#: ../ubiquity.templates:301001
1283 msgid "LVM..."
1284 msgstr ""
1285
1286 #. Type: text
1287 #. Description
1288-#: ../ubiquity.templates:300001
1289+#: ../ubiquity.templates:302001
1290 msgid "Volume groups:"
1291 msgstr ""
1292
1293 #. Type: text
1294 #. Description
1295-#: ../ubiquity.templates:301001
1296+#: ../ubiquity.templates:303001
1297 msgid "Encryption Options"
1298 msgstr ""
1299
1300 #. Type: text
1301 #. Description
1302-#: ../ubiquity.templates:302001
1303+#: ../ubiquity.templates:304001
1304 msgid "Physical volumes:"
1305 msgstr ""
1306
1307 #. Type: text
1308 #. Description
1309-#: ../ubiquity.templates:304001
1310+#: ../ubiquity.templates:306001
1311 msgid "Encrypt this partition (LUKS)"
1312 msgstr ""
1313
1314 #. Type: text
1315 #. Description
1316-#: ../ubiquity.templates:305001
1317+#: ../ubiquity.templates:307001
1318 msgid "MB"
1319 msgstr ""
1320
1321 #. Type: text
1322 #. Description
1323-#: ../ubiquity.templates:306001
1324+#: ../ubiquity.templates:308001
1325 msgid ""
1326 "Logical Volume Management (LVM) lets ${RELEASE} treat multiple physical "
1327 "volumes as a single volume."
1328@@ -2024,25 +2035,25 @@ msgstr ""
1329
1330 #. Type: text
1331 #. Description
1332-#: ../ubiquity.templates:307001
1333+#: ../ubiquity.templates:309001
1334 msgid "Logical Volume Management"
1335 msgstr ""
1336
1337 #. Type: text
1338 #. Description
1339-#: ../ubiquity.templates:308001
1340+#: ../ubiquity.templates:310001
1341 msgid "Encryption options..."
1342 msgstr ""
1343
1344 #. Type: text
1345 #. Description
1346-#: ../ubiquity.templates:309001
1347+#: ../ubiquity.templates:311001
1348 msgid "UEFI Secure Boot"
1349 msgstr ""
1350
1351 #. Type: text
1352 #. Description
1353-#: ../ubiquity.templates:310001
1354+#: ../ubiquity.templates:312001
1355 msgid ""
1356 "You have chosen to enable third-party software as part of your install, "
1357 "which for this system includes hardware drivers for graphics and/or wi-fi "
1358@@ -2052,7 +2063,7 @@ msgstr ""
1359
1360 #. Type: text
1361 #. Description
1362-#: ../ubiquity.templates:310001
1363+#: ../ubiquity.templates:312001
1364 msgid ""
1365 "After installation completes, Ubuntu will assist you in configuring UEFI "
1366 "Secure Boot. To ensure that this change is being made by you as an "
1367@@ -2062,7 +2073,7 @@ msgstr ""
1368
1369 #. Type: text
1370 #. Description
1371-#: ../ubiquity.templates:310001
1372+#: ../ubiquity.templates:312001
1373 msgid ""
1374 "<span foreground=\"darkred\">Warning</span>: If you choose not to install "
1375 "these drivers, or if you proceed but do not confirm the password upon "
1376@@ -2072,17 +2083,109 @@ msgstr ""
1377
1378 #. Type: password
1379 #. Description
1380-#: ../ubiquity.templates:311001
1381+#: ../ubiquity.templates:313001
1382 msgid "SecureBoot key for MokPW"
1383 msgstr ""
1384
1385 #. Type: text
1386 #. Description
1387-#: ../ubiquity.templates:312001
1388+#: ../ubiquity.templates:314001
1389 #, no-c-format
1390 msgid "partition #%(partid)s as %(parttype)s used for %(partusage)s"
1391 msgstr ""
1392
1393+#. Type: password
1394+#. Description
1395+#: ../ubiquity.templates:315001
1396+msgid "Key to secure the keystore on ZFS installations"
1397+msgstr ""
1398+
1399+#. Type: text
1400+#. Description
1401+#: ../ubiquity.templates:316001
1402+msgid "Authenticate against a directory"
1403+msgstr ""
1404+
1405+#. Type: text
1406+#. Description
1407+#: ../ubiquity.templates:317001
1408+msgid "Active Directory domain name"
1409+msgstr ""
1410+
1411+#. Type: text
1412+#. Description
1413+#: ../ubiquity.templates:318001
1414+msgid "Administrator to join the domain"
1415+msgstr ""
1416+
1417+#. Type: password
1418+#. Description
1419+#: ../ubiquity.templates:319001
1420+msgid "Administrator password to join the domain"
1421+msgstr ""
1422+
1423+#. Type: text
1424+#. Description
1425+#: ../ubiquity.templates:320001
1426+msgid "Use Active Directory"
1427+msgstr ""
1428+
1429+#. Type: text
1430+#. Description
1431+#: ../ubiquity.templates:321001
1432+msgid " You'll enter domain and other details in the next step."
1433+msgstr ""
1434+
1435+#. Type: text
1436+#. Description
1437+#: ../ubiquity.templates:322001
1438+msgid "Domain:"
1439+msgstr ""
1440+
1441+#. Type: text
1442+#. Description
1443+#: ../ubiquity.templates:323001
1444+msgid "You must enter a domain name"
1445+msgstr ""
1446+
1447+#. Type: text
1448+#. Description
1449+#: ../ubiquity.templates:324001
1450+msgid "Test Connection"
1451+msgstr ""
1452+
1453+#. Type: text
1454+#. Description
1455+#: ../ubiquity.templates:325001
1456+msgid "Domain Administrator:"
1457+msgstr ""
1458+
1459+#. Type: text
1460+#. Description
1461+#: ../ubiquity.templates:326001
1462+msgid "You must enter a user name"
1463+msgstr ""
1464+
1465+#. Type: text
1466+#. Description
1467+#: ../ubiquity.templates:328001
1468+msgid "Configure Active Directory"
1469+msgstr ""
1470+
1471+#. Type: text
1472+#. Description
1473+#: ../ubiquity.templates:329001
1474+msgid "That name already exists on the network."
1475+msgstr ""
1476+
1477+#. Type: text
1478+#. Description
1479+#: ../ubiquity.templates:330001
1480+#, fuzzy
1481+#| msgid "Failed to unmount partitions"
1482+msgid "Failed to connect to domain."
1483+msgstr "Kuritteh obtih efferi"
1484+
1485 #. Type: title
1486 #. Description
1487 #. Info message displayed when running in OEM mode
1488diff --git a/debian/real-po/ace.po b/debian/real-po/ace.po
1489index 63c6393..5ebc07f 100644
1490--- a/debian/real-po/ace.po
1491+++ b/debian/real-po/ace.po
1492@@ -7,16 +7,16 @@ msgid ""
1493 msgstr ""
1494 "Project-Id-Version: ubiquity\n"
1495 "Report-Msgid-Bugs-To: ubiquity@packages.debian.org\n"
1496-"POT-Creation-Date: 2020-04-08 09:24+0100\n"
1497+"POT-Creation-Date: 2020-10-01 17:47+0200\n"
1498 "PO-Revision-Date: 2012-06-02 13:15+0000\n"
1499 "Last-Translator: machroezar <Unknown>\n"
1500 "Language-Team: Acehnese <ace@li.org>\n"
1501+"Language: \n"
1502 "MIME-Version: 1.0\n"
1503 "Content-Type: text/plain; charset=UTF-8\n"
1504 "Content-Transfer-Encoding: 8bit\n"
1505 "X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
1506 "X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
1507-"Language: \n"
1508
1509 #. Type: text
1510 #. Description
1511@@ -47,7 +47,7 @@ msgstr "Peu Udep untuk Jak Ukeu"
1512 #. This is used as a window title.
1513 #. Type: text
1514 #. Description
1515-#: ../ubiquity.templates:7001 ../ubiquity.templates:184001
1516+#: ../ubiquity.templates:7001 ../ubiquity.templates:185001
1517 msgid "Install"
1518 msgstr "neupasoe"
1519
1520@@ -209,8 +209,7 @@ msgstr ""
1521 #. Type: text
1522 #. Description
1523 #: ../ubiquity.templates:29001
1524-msgid ""
1525-"May only contain lower-case letters, digits, hyphens, and underscores."
1526+msgid "May only contain lower-case letters, digits, hyphens, and underscores."
1527 msgstr ""
1528
1529 #. Type: text
1530@@ -556,7 +555,7 @@ msgstr ""
1531 #. An action, displayed on a button or as a menu item.
1532 #. Type: text
1533 #. Description
1534-#: ../ubiquity.templates:84001 ../ubiquity.templates:303001
1535+#: ../ubiquity.templates:84001 ../ubiquity.templates:305001
1536 msgid "Revert"
1537 msgstr ""
1538
1539@@ -919,78 +918,84 @@ msgstr ""
1540 #. Type: text
1541 #. Description
1542 #: ../ubiquity.templates:134001
1543-msgid "Saving installed packages..."
1544+msgid "Configuring Active Directory..."
1545 msgstr ""
1546
1547 #. Type: text
1548 #. Description
1549 #: ../ubiquity.templates:135001
1550-msgid "Restoring previously installed packages..."
1551+msgid "Saving installed packages..."
1552 msgstr ""
1553
1554 #. Type: text
1555 #. Description
1556 #: ../ubiquity.templates:136001
1557-msgid "Installing additional packages..."
1558+msgid "Restoring previously installed packages..."
1559 msgstr ""
1560
1561 #. Type: text
1562 #. Description
1563 #: ../ubiquity.templates:137001
1564-msgid "Checking for packages to install..."
1565+msgid "Installing additional packages..."
1566 msgstr ""
1567
1568 #. Type: text
1569 #. Description
1570 #: ../ubiquity.templates:138001
1571-msgid "Removing extra packages..."
1572+msgid "Checking for packages to install..."
1573 msgstr ""
1574
1575 #. Type: text
1576 #. Description
1577 #: ../ubiquity.templates:139001
1578-msgid "Checking for packages to remove..."
1579+msgid "Removing extra packages..."
1580 msgstr ""
1581
1582 #. Type: text
1583 #. Description
1584 #: ../ubiquity.templates:140001
1585-msgid "Downloading packages (${TIME} remaining)..."
1586+msgid "Checking for packages to remove..."
1587 msgstr ""
1588
1589 #. Type: text
1590 #. Description
1591 #: ../ubiquity.templates:141001
1592-msgid "Downloading package lists..."
1593+msgid "Downloading packages (${TIME} remaining)..."
1594 msgstr ""
1595
1596 #. Type: text
1597 #. Description
1598 #: ../ubiquity.templates:142001
1599+msgid "Downloading package lists..."
1600+msgstr ""
1601+
1602+#. Type: text
1603+#. Description
1604+#: ../ubiquity.templates:143001
1605 msgid "Downloading package lists (${TIME} remaining)..."
1606 msgstr ""
1607
1608 #. Type: error
1609 #. Description
1610-#: ../ubiquity.templates:144001
1611+#: ../ubiquity.templates:145001
1612 msgid "Error installing ${PACKAGE}"
1613 msgstr ""
1614
1615 #. Type: error
1616 #. Description
1617-#: ../ubiquity.templates:145001
1618+#: ../ubiquity.templates:146001
1619 msgid "Error removing ${PACKAGE}"
1620 msgstr ""
1621
1622 #. Type: error
1623 #. Description
1624-#: ../ubiquity.templates:146001
1625+#: ../ubiquity.templates:147001
1626 msgid "Error while installing packages"
1627 msgstr ""
1628
1629 #. Type: error
1630 #. Description
1631-#: ../ubiquity.templates:146001
1632+#: ../ubiquity.templates:147001
1633 msgid "An error occurred while installing packages:"
1634 msgstr ""
1635
1636@@ -998,7 +1003,7 @@ msgstr ""
1637 #. Description
1638 #. Type: error
1639 #. Description
1640-#: ../ubiquity.templates:146001 ../ubiquity.templates:147001
1641+#: ../ubiquity.templates:147001 ../ubiquity.templates:148001
1642 msgid "The following packages are in a broken state:"
1643 msgstr ""
1644
1645@@ -1006,38 +1011,38 @@ msgstr ""
1646 #. Description
1647 #. Type: error
1648 #. Description
1649-#: ../ubiquity.templates:146001 ../ubiquity.templates:147001
1650+#: ../ubiquity.templates:147001 ../ubiquity.templates:148001
1651 msgid ""
1652 "This may be due to using an old installer image, or it may be due to a bug "
1653-"in some of the packages listed above. More details may be found in "
1654-"/var/log/syslog. The installer will try to continue anyway, but may fail at "
1655-"a later point, and will not be able to install or remove other packages "
1656-"(possibly including itself) from the installed system. You should first look "
1657-"for newer versions of your installer image, or failing that report the "
1658-"problem to your distributor."
1659+"in some of the packages listed above. More details may be found in /var/log/"
1660+"syslog. The installer will try to continue anyway, but may fail at a later "
1661+"point, and will not be able to install or remove other packages (possibly "
1662+"including itself) from the installed system. You should first look for newer "
1663+"versions of your installer image, or failing that report the problem to your "
1664+"distributor."
1665 msgstr ""
1666
1667 #. Type: error
1668 #. Description
1669-#: ../ubiquity.templates:147001
1670+#: ../ubiquity.templates:148001
1671 msgid "Error while removing packages"
1672 msgstr ""
1673
1674 #. Type: error
1675 #. Description
1676-#: ../ubiquity.templates:147001
1677+#: ../ubiquity.templates:148001
1678 msgid "An error occurred while removing packages:"
1679 msgstr ""
1680
1681 #. Type: error
1682 #. Description
1683-#: ../ubiquity.templates:148001
1684+#: ../ubiquity.templates:149001
1685 msgid "Error copying network configuration"
1686 msgstr ""
1687
1688 #. Type: error
1689 #. Description
1690-#: ../ubiquity.templates:148001
1691+#: ../ubiquity.templates:149001
1692 msgid ""
1693 "An error occurred while copying the network settings. The installation will "
1694 "continue, but the network configuration will have to be set up again in the "
1695@@ -1046,13 +1051,13 @@ msgstr ""
1696
1697 #. Type: error
1698 #. Description
1699-#: ../ubiquity.templates:149001
1700+#: ../ubiquity.templates:150001
1701 msgid "Error copying bluetooth configuration"
1702 msgstr ""
1703
1704 #. Type: error
1705 #. Description
1706-#: ../ubiquity.templates:149001
1707+#: ../ubiquity.templates:150001
1708 msgid ""
1709 "An error occurred while copying the bluetooth settings. The installation "
1710 "will continue, but the bluetooth configuration will have to be set up again "
1711@@ -1061,46 +1066,45 @@ msgstr ""
1712
1713 #. Type: error
1714 #. Description
1715-#: ../ubiquity.templates:150001
1716-msgid "Error restoring installed applications"
1717+#: ../ubiquity.templates:151001
1718+msgid "Error configuring connection to Active Directory"
1719 msgstr ""
1720
1721 #. Type: error
1722 #. Description
1723-#: ../ubiquity.templates:150001
1724+#: ../ubiquity.templates:151001
1725 msgid ""
1726-"An error occurred while restoring previously-installed applications. The "
1727-"installation will continue, but you may have to manually reinstall some "
1728-"applications after the computer reboots."
1729+"Sorry, Active Directory can't be set up at the moment. Once your system is "
1730+"up and running, visit help.ubuntu.com/activedirectory for help."
1731 msgstr ""
1732
1733 #. Type: text
1734 #. Description
1735-#: ../ubiquity.templates:154001
1736+#: ../ubiquity.templates:155001
1737 msgid "Calculating files to skip copying..."
1738 msgstr ""
1739
1740 #. Type: title
1741 #. Description
1742-#: ../ubiquity.templates:155001
1743+#: ../ubiquity.templates:156001
1744 msgid "Installing language packs"
1745 msgstr ""
1746
1747 #. Type: text
1748 #. Description
1749-#: ../ubiquity.templates:156001
1750+#: ../ubiquity.templates:157001
1751 msgid "Downloading language packs (${TIME} remaining)..."
1752 msgstr ""
1753
1754 #. Type: boolean
1755 #. Description
1756-#: ../ubiquity.templates:165001
1757+#: ../ubiquity.templates:166001
1758 msgid "Failed to unmount partitions"
1759 msgstr ""
1760
1761 #. Type: boolean
1762 #. Description
1763-#: ../ubiquity.templates:165001
1764+#: ../ubiquity.templates:166001
1765 msgid ""
1766 "The installer needs to commit changes to partition tables, but cannot do so "
1767 "because partitions on the following mount points could not be unmounted:"
1768@@ -1108,26 +1112,25 @@ msgstr ""
1769
1770 #. Type: boolean
1771 #. Description
1772-#: ../ubiquity.templates:165001
1773+#: ../ubiquity.templates:166001
1774 msgid "Please close any applications using these mount points."
1775 msgstr ""
1776
1777 #. Type: boolean
1778 #. Description
1779-#: ../ubiquity.templates:165001
1780-msgid ""
1781-"Would you like the installer to try to unmount these partitions again?"
1782+#: ../ubiquity.templates:166001
1783+msgid "Would you like the installer to try to unmount these partitions again?"
1784 msgstr ""
1785
1786 #. Type: boolean
1787 #. Description
1788-#: ../ubiquity.templates:171001
1789+#: ../ubiquity.templates:172001
1790 msgid "Do you want to return to the partitioner?"
1791 msgstr ""
1792
1793 #. Type: boolean
1794 #. Description
1795-#: ../ubiquity.templates:171001
1796+#: ../ubiquity.templates:172001
1797 msgid ""
1798 "Some of the partitions you created are too small. Please make the following "
1799 "partitions at least this large:"
1800@@ -1135,7 +1138,7 @@ msgstr ""
1801
1802 #. Type: boolean
1803 #. Description
1804-#: ../ubiquity.templates:171001
1805+#: ../ubiquity.templates:172001
1806 msgid ""
1807 "If you do not go back to the partitioner and increase the size of these "
1808 "partitions, the installation may fail."
1809@@ -1143,7 +1146,7 @@ msgstr ""
1810
1811 #. Type: text
1812 #. Description
1813-#: ../ubiquity.templates:173001
1814+#: ../ubiquity.templates:174001
1815 msgid "System Configuration"
1816 msgstr ""
1817
1818@@ -1151,25 +1154,25 @@ msgstr ""
1819 #. Description
1820 #. Type: text
1821 #. Description
1822-#: ../ubiquity.templates:174001 ../ubiquity.templates:257001
1823+#: ../ubiquity.templates:175001 ../ubiquity.templates:258001
1824 msgid "Welcome"
1825 msgstr "Seulamat troh teuka"
1826
1827 #. Type: text
1828 #. Description
1829-#: ../ubiquity.templates:175001
1830+#: ../ubiquity.templates:176001
1831 msgid "Network configuration"
1832 msgstr ""
1833
1834 #. Type: text
1835 #. Description
1836-#: ../ubiquity.templates:176001
1837+#: ../ubiquity.templates:177001
1838 msgid "Software selection"
1839 msgstr ""
1840
1841 #. Type: text
1842 #. Description
1843-#: ../ubiquity.templates:177001
1844+#: ../ubiquity.templates:178001
1845 msgid "Language"
1846 msgstr ""
1847
1848@@ -1177,111 +1180,111 @@ msgstr ""
1849 #. Description
1850 #. Type: text
1851 #. Description
1852-#: ../ubiquity.templates:178001 ../ubiquity.templates:202001
1853+#: ../ubiquity.templates:179001 ../ubiquity.templates:203001
1854 msgid "Wireless"
1855 msgstr ""
1856
1857 #. Type: text
1858 #. Description
1859-#: ../ubiquity.templates:179001
1860+#: ../ubiquity.templates:180001
1861 msgid "Software"
1862 msgstr ""
1863
1864 #. Type: text
1865 #. Description
1866-#: ../ubiquity.templates:180001
1867+#: ../ubiquity.templates:181001
1868 msgid "Timezone"
1869 msgstr ""
1870
1871 #. Type: text
1872 #. Description
1873-#: ../ubiquity.templates:181001
1874+#: ../ubiquity.templates:182001
1875 msgid "Keyboard"
1876 msgstr ""
1877
1878 #. Type: text
1879 #. Description
1880-#: ../ubiquity.templates:182001
1881+#: ../ubiquity.templates:183001
1882 msgid "Disk Setup"
1883 msgstr ""
1884
1885 #. Type: text
1886 #. Description
1887-#: ../ubiquity.templates:183001
1888+#: ../ubiquity.templates:184001
1889 msgid "User Info"
1890 msgstr ""
1891
1892 #. Type: text
1893 #. Description
1894-#: ../ubiquity.templates:185001
1895+#: ../ubiquity.templates:186001
1896 msgid "installation process"
1897 msgstr ""
1898
1899 #. Type: text
1900 #. Description
1901-#: ../ubiquity.templates:187001
1902+#: ../ubiquity.templates:188001
1903 msgid "Checking for installer updates"
1904 msgstr ""
1905
1906 #. Type: text
1907 #. Description
1908-#: ../ubiquity.templates:188001
1909+#: ../ubiquity.templates:189001
1910 msgid "Reading package information"
1911 msgstr ""
1912
1913 #. Type: text
1914 #. Description
1915-#: ../ubiquity.templates:189001
1916+#: ../ubiquity.templates:190001
1917 msgid "Updating package information"
1918 msgstr ""
1919
1920 #. Type: text
1921 #. Description
1922-#: ../ubiquity.templates:190001
1923+#: ../ubiquity.templates:191001
1924 msgid "File ${INDEX} of ${TOTAL} at ${SPEED}/s"
1925 msgstr ""
1926
1927 #. Type: text
1928 #. Description
1929-#: ../ubiquity.templates:191001
1930+#: ../ubiquity.templates:192001
1931 msgid "File ${INDEX} of ${TOTAL}"
1932 msgstr ""
1933
1934 #. Type: text
1935 #. Description
1936-#: ../ubiquity.templates:192001
1937+#: ../ubiquity.templates:193001
1938 msgid "Installing update"
1939 msgstr ""
1940
1941 #. Type: text
1942 #. Description
1943-#: ../ubiquity.templates:193001
1944+#: ../ubiquity.templates:194001
1945 msgid "Error updating installer"
1946 msgstr ""
1947
1948 #. Type: text
1949 #. Description
1950-#: ../ubiquity.templates:193001
1951+#: ../ubiquity.templates:194001
1952 msgid "The installer encountered an error while trying to update itself:"
1953 msgstr ""
1954
1955 #. Type: text
1956 #. Description
1957 #. Translated acronym for Universal Serial Bus.
1958-#: ../ubiquity.templates:194001
1959+#: ../ubiquity.templates:195001
1960 msgid "USB disk"
1961 msgstr ""
1962
1963 #. Type: text
1964 #. Description
1965 #. Translated acronym for Compact Disc.
1966-#: ../ubiquity.templates:195001
1967+#: ../ubiquity.templates:196001
1968 msgid "CD"
1969 msgstr ""
1970
1971 #. Type: text
1972 #. Description
1973-#: ../ubiquity.templates:196001
1974+#: ../ubiquity.templates:197001
1975 msgid ""
1976 "Please choose the language to use for the install process. This language "
1977 "will be the default language for this computer."
1978@@ -1289,7 +1292,7 @@ msgstr ""
1979
1980 #. Type: text
1981 #. Description
1982-#: ../ubiquity.templates:197001
1983+#: ../ubiquity.templates:198001
1984 msgid ""
1985 "Please choose the language used for the configuration process. This language "
1986 "will be the default language for this computer."
1987@@ -1299,13 +1302,13 @@ msgstr ""
1988 #. Description
1989 #. Type: text
1990 #. Description
1991-#: ../ubiquity.templates:198001 ../ubiquity.templates:199001
1992+#: ../ubiquity.templates:199001 ../ubiquity.templates:200001
1993 msgid "Installation failed"
1994 msgstr ""
1995
1996 #. Type: text
1997 #. Description
1998-#: ../ubiquity.templates:198001
1999+#: ../ubiquity.templates:199001
2000 msgid ""
2001 "The installer encountered an unrecoverable error. A desktop session will "
2002 "now be run so that you may investigate the problem or try installing again."
2003@@ -1313,19 +1316,19 @@ msgstr ""
2004
2005 #. Type: text
2006 #. Description
2007-#: ../ubiquity.templates:199001
2008+#: ../ubiquity.templates:200001
2009 msgid "The installer encountered an unrecoverable error and will now reboot."
2010 msgstr ""
2011
2012 #. Type: text
2013 #. Description
2014-#: ../ubiquity.templates:201001
2015+#: ../ubiquity.templates:202001
2016 msgid "Updates and other software"
2017 msgstr ""
2018
2019 #. Type: text
2020 #. Description
2021-#: ../ubiquity.templates:203001
2022+#: ../ubiquity.templates:204001
2023 msgid ""
2024 "Connecting this computer to a wi-fi network allows you to install third-"
2025 "party software, download updates, automatically detect your timezone, and "
2026@@ -1334,49 +1337,51 @@ msgstr ""
2027
2028 #. Type: text
2029 #. Description
2030-#: ../ubiquity.templates:204001
2031+#. Type: text
2032+#. Description
2033+#: ../ubiquity.templates:205001 ../ubiquity.templates:327001
2034 msgid "Password:"
2035 msgstr ""
2036
2037 #. Type: text
2038 #. Description
2039-#: ../ubiquity.templates:205001
2040+#: ../ubiquity.templates:206001
2041 msgid "Display password"
2042 msgstr ""
2043
2044 #. Type: text
2045 #. Description
2046-#: ../ubiquity.templates:206001
2047+#: ../ubiquity.templates:207001
2048 msgid "I don't want to connect to a wi-fi network right now"
2049 msgstr ""
2050
2051 #. Type: text
2052 #. Description
2053-#: ../ubiquity.templates:207001
2054+#: ../ubiquity.templates:208001
2055 msgid "Connect to this network"
2056 msgstr ""
2057
2058 #. Type: text
2059 #. Description
2060-#: ../ubiquity.templates:213001
2061+#: ../ubiquity.templates:214001
2062 msgid "Select drive:"
2063 msgstr ""
2064
2065 #. Type: text
2066 #. Description
2067-#: ../ubiquity.templates:214001
2068+#: ../ubiquity.templates:215001
2069 msgid "Allocate drive space by dragging the divider below:"
2070 msgstr ""
2071
2072 #. Type: text
2073 #. Description
2074-#: ../ubiquity.templates:215001
2075+#: ../ubiquity.templates:216001
2076 msgid "The entire disk will be used:"
2077 msgstr ""
2078
2079 #. Type: text
2080 #. Description
2081-#: ../ubiquity.templates:216001
2082+#: ../ubiquity.templates:217001
2083 #, no-c-format
2084 msgid ""
2085 "<small>%d smaller partitions are hidden, use the <a href=\"\">advanced "
2086@@ -1385,7 +1390,7 @@ msgstr ""
2087
2088 #. Type: text
2089 #. Description
2090-#: ../ubiquity.templates:217001
2091+#: ../ubiquity.templates:218001
2092 msgid ""
2093 "<small>1 smaller partition is hidden, use the <a href=\"\">advanced "
2094 "partitioning tool</a> for more control</small>"
2095@@ -1393,7 +1398,7 @@ msgstr ""
2096
2097 #. Type: text
2098 #. Description
2099-#: ../ubiquity.templates:218001
2100+#: ../ubiquity.templates:219001
2101 #, no-c-format
2102 msgid ""
2103 "%d partitions will be deleted, use the <a href=\"\">advanced partitioning "
2104@@ -1402,7 +1407,7 @@ msgstr ""
2105
2106 #. Type: text
2107 #. Description
2108-#: ../ubiquity.templates:219001
2109+#: ../ubiquity.templates:220001
2110 msgid ""
2111 "1 partition will be deleted, use the <a href=\"\">advanced partitioning "
2112 "tool</a> for more control"
2113@@ -1410,85 +1415,85 @@ msgstr ""
2114
2115 #. Type: text
2116 #. Description
2117-#: ../ubiquity.templates:220001
2118+#: ../ubiquity.templates:221001
2119 msgid "Split Largest Partition"
2120 msgstr ""
2121
2122 #. Type: text
2123 #. Description
2124-#: ../ubiquity.templates:222001
2125+#: ../ubiquity.templates:223001
2126 msgid "For best results, please ensure that this computer:"
2127 msgstr ""
2128
2129 #. Type: text
2130 #. Description
2131-#: ../ubiquity.templates:223001
2132+#: ../ubiquity.templates:224001
2133 msgid "Sorry"
2134 msgstr ""
2135
2136 #. Type: text
2137 #. Description
2138 #. RST means "Rapid Storage Technology". Don't translate it.
2139-#: ../ubiquity.templates:224001
2140+#: ../ubiquity.templates:225001
2141 msgid "Turn off RST"
2142 msgstr ""
2143
2144 #. Type: text
2145 #. Description
2146-#: ../ubiquity.templates:225001
2147+#: ../ubiquity.templates:226001
2148 msgid ""
2149 "This computer uses Intel RST (Rapid Storage Technology). You need to turn "
2150 "off RST before installing Ubuntu. For instructions, open this page on a "
2151-"phone or other device: <a "
2152-"href=\"https://help.ubuntu.com/rst\">help.ubuntu.com/rst</a>"
2153+"phone or other device: <a href=\"https://help.ubuntu.com/rst\">help.ubuntu."
2154+"com/rst</a>"
2155 msgstr ""
2156
2157 #. Type: text
2158 #. Description
2159-#: ../ubiquity.templates:226001
2160+#: ../ubiquity.templates:227001
2161 msgid "Turn off BitLocker"
2162 msgstr ""
2163
2164 #. Type: text
2165 #. Description
2166-#: ../ubiquity.templates:227001
2167+#: ../ubiquity.templates:228001
2168 msgid ""
2169 "This computer uses Windows BitLocker encryption. You need to turn off "
2170 "BitLocker in Windows before installing Ubuntu. For instructions, open this "
2171-"page on a phone or other device: <a "
2172-"href=\"https://help.ubuntu.com/bitlocker\">help.ubuntu.com/bitlocker</a>"
2173+"page on a phone or other device: <a href=\"https://help.ubuntu.com/bitlocker"
2174+"\">help.ubuntu.com/bitlocker</a>"
2175 msgstr ""
2176
2177 #. Type: text
2178 #. Description
2179 #. SIZE is a variable substituted into this string, and may be '3.7 GB'
2180 #. RELEASE is a variable substituted into this string, the Ubuntu flavor'
2181-#: ../ubiquity.templates:228001
2182+#: ../ubiquity.templates:229001
2183 msgid "You need at least ${SIZE} disk space to install ${RELEASE}."
2184 msgstr ""
2185
2186 #. Type: text
2187 #. Description
2188 #. SIZE is a variable substituted into this string, and may be '3.7 GB'
2189-#: ../ubiquity.templates:229001
2190+#: ../ubiquity.templates:230001
2191 msgid "This computer has only ${SIZE}."
2192 msgstr ""
2193
2194 #. Type: text
2195 #. Description
2196-#: ../ubiquity.templates:230001
2197+#: ../ubiquity.templates:231001
2198 msgid "is plugged in to a power source"
2199 msgstr ""
2200
2201 #. Type: text
2202 #. Description
2203-#: ../ubiquity.templates:231001
2204+#: ../ubiquity.templates:232001
2205 msgid "is connected to the Internet"
2206 msgstr ""
2207
2208 #. Type: text
2209 #. Description
2210-#: ../ubiquity.templates:232001
2211+#: ../ubiquity.templates:233001
2212 msgid ""
2213 "This software is subject to license terms included with its documentation. "
2214 "Some is proprietary."
2215@@ -1496,7 +1501,7 @@ msgstr ""
2216
2217 #. Type: text
2218 #. Description
2219-#: ../ubiquity.templates:233001
2220+#: ../ubiquity.templates:234001
2221 msgid ""
2222 "Install third-party software for graphics and Wi-Fi hardware and additional "
2223 "media formats"
2224@@ -1504,67 +1509,67 @@ msgstr ""
2225
2226 #. Type: text
2227 #. Description
2228-#: ../ubiquity.templates:234001
2229+#: ../ubiquity.templates:235001
2230 msgid "Download updates while installing ${RELEASE}"
2231 msgstr ""
2232
2233 #. Type: text
2234 #. Description
2235-#: ../ubiquity.templates:235001
2236+#: ../ubiquity.templates:236001
2237 msgid "This saves time after installation."
2238 msgstr ""
2239
2240 #. Type: text
2241 #. Description
2242-#: ../ubiquity.templates:236001
2243+#: ../ubiquity.templates:237001
2244 msgid "Not available because there is no Internet connection."
2245 msgstr ""
2246
2247 #. Type: text
2248 #. Description
2249-#: ../ubiquity.templates:237001
2250+#: ../ubiquity.templates:238001
2251 msgid "What apps would you like to install to start with?"
2252 msgstr ""
2253
2254 #. Type: text
2255 #. Description
2256-#: ../ubiquity.templates:238001
2257+#: ../ubiquity.templates:239001
2258 msgid "Which applications would you like to start with?"
2259 msgstr ""
2260
2261 #. Type: text
2262 #. Description
2263-#: ../ubiquity.templates:239001
2264+#: ../ubiquity.templates:240001
2265 msgid "Minimal installation"
2266 msgstr ""
2267
2268 #. Type: text
2269 #. Description
2270-#: ../ubiquity.templates:240001
2271+#: ../ubiquity.templates:241001
2272 msgid "Web browser and basic utilities."
2273 msgstr ""
2274
2275 #. Type: text
2276 #. Description
2277-#: ../ubiquity.templates:241001
2278+#: ../ubiquity.templates:242001
2279 msgid "Web browser plus basic utilities and applications."
2280 msgstr ""
2281
2282 #. Type: text
2283 #. Description
2284-#: ../ubiquity.templates:242001
2285+#: ../ubiquity.templates:243001
2286 msgid "Normal installation"
2287 msgstr ""
2288
2289 #. Type: text
2290 #. Description
2291-#: ../ubiquity.templates:243001
2292+#: ../ubiquity.templates:244001
2293 msgid "Web browser, utilities, office software, games, and media players."
2294 msgstr ""
2295
2296 #. Type: text
2297 #. Description
2298-#: ../ubiquity.templates:244001
2299+#: ../ubiquity.templates:245001
2300 msgid ""
2301 "Web browser, utilities, office software, plus additional internet "
2302 "applications and media players."
2303@@ -1572,13 +1577,13 @@ msgstr ""
2304
2305 #. Type: text
2306 #. Description
2307-#: ../ubiquity.templates:245001
2308+#: ../ubiquity.templates:246001
2309 msgid "Other options"
2310 msgstr ""
2311
2312 #. Type: text
2313 #. Description
2314-#: ../ubiquity.templates:246001
2315+#: ../ubiquity.templates:247001
2316 msgid ""
2317 "Installing third-party drivers requires configuring Secure Boot. To do this, "
2318 "you need to choose a security key now, and enter it when the system restarts."
2319@@ -1586,25 +1591,25 @@ msgstr ""
2320
2321 #. Type: text
2322 #. Description
2323-#: ../ubiquity.templates:250001
2324+#: ../ubiquity.templates:251001
2325 msgid "Layout:"
2326 msgstr "Susunan:"
2327
2328 #. Type: text
2329 #. Description
2330-#: ../ubiquity.templates:251001
2331+#: ../ubiquity.templates:252001
2332 msgid "Variant:"
2333 msgstr ""
2334
2335 #. Type: text
2336 #. Description
2337-#: ../ubiquity.templates:252001
2338+#: ../ubiquity.templates:253001
2339 msgid "Below is an image of your current layout:"
2340 msgstr ""
2341
2342 #. Type: text
2343 #. Description
2344-#: ../ubiquity.templates:253001
2345+#: ../ubiquity.templates:254001
2346 msgid ""
2347 "Select your location, so that the system can use appropriate display "
2348 "conventions for your country, fetch updates from sites close to you, and set "
2349@@ -1613,19 +1618,19 @@ msgstr ""
2350
2351 #. Type: text
2352 #. Description
2353-#: ../ubiquity.templates:254001
2354+#: ../ubiquity.templates:255001
2355 msgid "Time Zone:"
2356 msgstr "Zona Wate:"
2357
2358 #. Type: text
2359 #. Description
2360-#: ../ubiquity.templates:255001
2361+#: ../ubiquity.templates:256001
2362 msgid "Region:"
2363 msgstr "Wilayah:"
2364
2365 #. Type: text
2366 #. Description
2367-#: ../ubiquity.templates:256001
2368+#: ../ubiquity.templates:257001
2369 msgid "[type here to change]"
2370 msgstr ""
2371
2372@@ -1633,14 +1638,14 @@ msgstr ""
2373 #. Description
2374 #. OS is a variable substituted into this string, and may be 'Windows 7'
2375 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
2376-#: ../ubiquity.templates:259001
2377+#: ../ubiquity.templates:260001
2378 msgid "Replace ${OS} with ${DISTRO}"
2379 msgstr ""
2380
2381 #. Type: text
2382 #. Description
2383 #. OS is a variable substituted into this string, and may be 'Windows 7'
2384-#: ../ubiquity.templates:259001
2385+#: ../ubiquity.templates:260001
2386 msgid ""
2387 "<span foreground=\"darkred\">Warning:</span> This will delete all of your "
2388 "${OS} programs, documents, photos, music, and any other files."
2389@@ -1650,7 +1655,7 @@ msgstr ""
2390 #. Description
2391 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
2392 #. OS is a variable substituted into this string, and may be 'Windows 7'
2393-#: ../ubiquity.templates:260001
2394+#: ../ubiquity.templates:261001
2395 msgid "Install ${DISTRO} alongside ${OS}"
2396 msgstr ""
2397
2398@@ -1662,8 +1667,8 @@ msgstr ""
2399 #. Description
2400 #. Type: text
2401 #. Description
2402-#: ../ubiquity.templates:260001 ../ubiquity.templates:261001
2403-#: ../ubiquity.templates:264001 ../ubiquity.templates:269001
2404+#: ../ubiquity.templates:261001 ../ubiquity.templates:262001
2405+#: ../ubiquity.templates:265001 ../ubiquity.templates:270001
2406 msgid ""
2407 "Documents, music, and other personal files will be kept. You can choose "
2408 "which operating system you want each time the computer starts up."
2409@@ -1673,20 +1678,20 @@ msgstr ""
2410 #. Description
2411 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
2412 #. OS is a variable substituted into this string, and may be 'Windows 7'
2413-#: ../ubiquity.templates:261001
2414+#: ../ubiquity.templates:262001
2415 msgid "Install ${DISTRO} inside ${OS}"
2416 msgstr ""
2417
2418 #. Type: text
2419 #. Description
2420-#: ../ubiquity.templates:262001
2421+#: ../ubiquity.templates:263001
2422 msgid "Something else"
2423 msgstr ""
2424
2425 #. Type: text
2426 #. Description
2427 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
2428-#: ../ubiquity.templates:262001
2429+#: ../ubiquity.templates:263001
2430 msgid ""
2431 "You can create or resize partitions yourself, or choose multiple partitions "
2432 "for ${DISTRO}."
2433@@ -1695,14 +1700,14 @@ msgstr ""
2434 #. Type: text
2435 #. Description
2436 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
2437-#: ../ubiquity.templates:263001
2438+#: ../ubiquity.templates:264001
2439 msgid "Erase ${CURDISTRO} and reinstall"
2440 msgstr ""
2441
2442 #. Type: text
2443 #. Description
2444 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
2445-#: ../ubiquity.templates:263001
2446+#: ../ubiquity.templates:264001
2447 msgid ""
2448 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
2449 "${CURDISTRO} programs, documents, photos, music, and any other files."
2450@@ -1713,7 +1718,7 @@ msgstr ""
2451 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
2452 #. VER is a variable substituted into this string, and may be '11.04'
2453 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
2454-#: ../ubiquity.templates:264001
2455+#: ../ubiquity.templates:265001
2456 msgid "Install ${DISTRO} ${VER} alongside ${CURDISTRO}"
2457 msgstr ""
2458
2459@@ -1723,13 +1728,13 @@ msgstr ""
2460 #. Type: text
2461 #. Description
2462 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
2463-#: ../ubiquity.templates:265001 ../ubiquity.templates:268001
2464+#: ../ubiquity.templates:266001 ../ubiquity.templates:269001
2465 msgid "Erase disk and install ${DISTRO}"
2466 msgstr ""
2467
2468 #. Type: text
2469 #. Description
2470-#: ../ubiquity.templates:265001
2471+#: ../ubiquity.templates:266001
2472 msgid ""
2473 "<span foreground=\"darkred\">Warning:</span> This will delete any files on "
2474 "the disk."
2475@@ -1737,7 +1742,7 @@ msgstr ""
2476
2477 #. Type: text
2478 #. Description
2479-#: ../ubiquity.templates:266001
2480+#: ../ubiquity.templates:267001
2481 msgid "Erase everything and reinstall"
2482 msgstr ""
2483
2484@@ -1745,7 +1750,7 @@ msgstr ""
2485 #. Description
2486 #. OS is a variable substituted into this string, and may be 'Windows 7'
2487 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
2488-#: ../ubiquity.templates:266001
2489+#: ../ubiquity.templates:267001
2490 msgid ""
2491 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
2492 "programs, documents, photos, music, and other files in both ${OS} and "
2493@@ -1755,21 +1760,21 @@ msgstr ""
2494 #. Type: text
2495 #. Description
2496 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
2497-#: ../ubiquity.templates:267001
2498+#: ../ubiquity.templates:268001
2499 msgid "Reinstall ${CURDISTRO}"
2500 msgstr ""
2501
2502 #. Type: text
2503 #. Description
2504-#: ../ubiquity.templates:267001
2505+#: ../ubiquity.templates:268001
2506 msgid ""
2507 "Documents, music, and other personal files will be kept. Installed software "
2508-"will be kept where possible. System-wide settings will be cleared."
2509+"and system-wide settings will be cleared."
2510 msgstr ""
2511
2512 #. Type: text
2513 #. Description
2514-#: ../ubiquity.templates:268001
2515+#: ../ubiquity.templates:269001
2516 msgid ""
2517 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
2518 "programs, documents, photos, music, and any other files in all operating "
2519@@ -1779,14 +1784,14 @@ msgstr ""
2520 #. Type: text
2521 #. Description
2522 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
2523-#: ../ubiquity.templates:269001
2524+#: ../ubiquity.templates:270001
2525 msgid "Install ${DISTRO} alongside them"
2526 msgstr ""
2527
2528 #. Type: text
2529 #. Description
2530 #. OS is a variable substituted into this string, and may be 'Windows 7'
2531-#: ../ubiquity.templates:270001
2532+#: ../ubiquity.templates:271001
2533 msgid "This computer currently has ${OS} on it. What would you like to do?"
2534 msgstr ""
2535
2536@@ -1794,7 +1799,7 @@ msgstr ""
2537 #. Description
2538 #. OS1 is a variable substituted into this string, and may be 'Windows 7'
2539 #. OS2 is a variable substituted into this string, and may be 'Mac OS X'
2540-#: ../ubiquity.templates:271001
2541+#: ../ubiquity.templates:272001
2542 msgid ""
2543 "This computer currently has ${OS1} and ${OS2} on it. What would you like to "
2544 "do?"
2545@@ -1802,7 +1807,7 @@ msgstr ""
2546
2547 #. Type: text
2548 #. Description
2549-#: ../ubiquity.templates:272001
2550+#: ../ubiquity.templates:273001
2551 msgid ""
2552 "This computer currently has multiple operating systems on it. What would you "
2553 "like to do?"
2554@@ -1810,7 +1815,7 @@ msgstr ""
2555
2556 #. Type: text
2557 #. Description
2558-#: ../ubiquity.templates:273001
2559+#: ../ubiquity.templates:274001
2560 msgid ""
2561 "This computer currently has no detected operating systems. What would you "
2562 "like to do?"
2563@@ -1818,37 +1823,37 @@ msgstr ""
2564
2565 #. Type: text
2566 #. Description
2567-#: ../ubiquity.templates:274001
2568+#: ../ubiquity.templates:275001
2569 msgid "Before:"
2570 msgstr ""
2571
2572 #. Type: text
2573 #. Description
2574-#: ../ubiquity.templates:275001
2575+#: ../ubiquity.templates:276001
2576 msgid "After:"
2577 msgstr ""
2578
2579 #. Type: text
2580 #. Description
2581-#: ../ubiquity.templates:276001
2582+#: ../ubiquity.templates:277001
2583 msgid "Encrypt the new ${RELEASE} installation for security"
2584 msgstr ""
2585
2586 #. Type: text
2587 #. Description
2588-#: ../ubiquity.templates:277001
2589+#: ../ubiquity.templates:278001
2590 msgid "You will choose a security key in the next step."
2591 msgstr ""
2592
2593 #. Type: text
2594 #. Description
2595-#: ../ubiquity.templates:278001
2596+#: ../ubiquity.templates:279001
2597 msgid "Use LVM with the new ${RELEASE} installation"
2598 msgstr ""
2599
2600 #. Type: text
2601 #. Description
2602-#: ../ubiquity.templates:279001
2603+#: ../ubiquity.templates:280001
2604 msgid ""
2605 "This will set up Logical Volume Management. It allows taking snapshots and "
2606 "easier partition resizing."
2607@@ -1856,28 +1861,27 @@ msgstr ""
2608
2609 #. Type: text
2610 #. Description
2611-#: ../ubiquity.templates:280001
2612-msgid "EXPERIMENTAL: Erase disk and use ZFS"
2613+#: ../ubiquity.templates:281001
2614+msgid "Erase disk and use ZFS"
2615 msgstr ""
2616
2617 #. Type: text
2618 #. Description
2619-#: ../ubiquity.templates:281001
2620+#: ../ubiquity.templates:282001
2621 msgid ""
2622 "<span foreground=\"darkred\">Warning:</span> This will delete all your files "
2623-"on all operating systems. This is experimental and may cause data loss. Do "
2624-"not use on production systems."
2625+"on all operating systems."
2626 msgstr ""
2627
2628 #. Type: text
2629 #. Description
2630-#: ../ubiquity.templates:283001
2631+#: ../ubiquity.templates:284001
2632 msgid "Advanced Features"
2633 msgstr ""
2634
2635 #. Type: text
2636 #. Description
2637-#: ../ubiquity.templates:284001
2638+#: ../ubiquity.templates:285001
2639 msgid "None"
2640 msgstr ""
2641
2642@@ -1885,49 +1889,55 @@ msgstr ""
2643 #. Description
2644 #. Type: text
2645 #. Description
2646-#: ../ubiquity.templates:285001 ../ubiquity.templates:287001
2647+#: ../ubiquity.templates:286001 ../ubiquity.templates:288001
2648 msgid "None selected"
2649 msgstr ""
2650
2651 #. Type: text
2652 #. Description
2653-#: ../ubiquity.templates:286001
2654+#: ../ubiquity.templates:287001
2655 msgid "Advanced features..."
2656 msgstr ""
2657
2658 #. Type: text
2659 #. Description
2660-#: ../ubiquity.templates:288001
2661+#: ../ubiquity.templates:289001
2662 msgid "LVM selected"
2663 msgstr ""
2664
2665 #. Type: text
2666 #. Description
2667-#: ../ubiquity.templates:289001
2668+#: ../ubiquity.templates:290001
2669 msgid "LVM and encryption selected"
2670 msgstr ""
2671
2672 #. Type: text
2673 #. Description
2674-#: ../ubiquity.templates:290001
2675+#: ../ubiquity.templates:291001
2676 msgid "ZFS selected"
2677 msgstr ""
2678
2679 #. Type: text
2680 #. Description
2681-#: ../ubiquity.templates:291001
2682+#: ../ubiquity.templates:292001
2683+msgid "ZFS and encryption selected"
2684+msgstr ""
2685+
2686+#. Type: text
2687+#. Description
2688+#: ../ubiquity.templates:293001
2689 msgid "Confirm the security key:"
2690 msgstr ""
2691
2692 #. Type: text
2693 #. Description
2694-#: ../ubiquity.templates:292001
2695+#: ../ubiquity.templates:294001
2696 msgid "Choose a security key:"
2697 msgstr ""
2698
2699 #. Type: text
2700 #. Description
2701-#: ../ubiquity.templates:293001
2702+#: ../ubiquity.templates:295001
2703 msgid ""
2704 "Disk encryption protects your files in case you lose your computer. It "
2705 "requires you to enter a security key each time the computer starts up."
2706@@ -1935,13 +1945,13 @@ msgstr ""
2707
2708 #. Type: text
2709 #. Description
2710-#: ../ubiquity.templates:294001
2711+#: ../ubiquity.templates:296001
2712 msgid "Any files outside of ${RELEASE} will not be encrypted."
2713 msgstr ""
2714
2715 #. Type: text
2716 #. Description
2717-#: ../ubiquity.templates:295001
2718+#: ../ubiquity.templates:297001
2719 msgid ""
2720 "<span foreground=\"darkred\">Warning:</span> If you lose this security key, "
2721 "all data will be lost. If you need to, write down your key and keep it in a "
2722@@ -1950,61 +1960,61 @@ msgstr ""
2723
2724 #. Type: text
2725 #. Description
2726-#: ../ubiquity.templates:296001
2727+#: ../ubiquity.templates:298001
2728 msgid "For more security:"
2729 msgstr ""
2730
2731 #. Type: text
2732 #. Description
2733-#: ../ubiquity.templates:297001
2734+#: ../ubiquity.templates:299001
2735 msgid "Overwrite empty disk space"
2736 msgstr ""
2737
2738 #. Type: text
2739 #. Description
2740-#: ../ubiquity.templates:298001
2741+#: ../ubiquity.templates:300001
2742 msgid "The installation may take much longer."
2743 msgstr ""
2744
2745 #. Type: text
2746 #. description
2747-#: ../ubiquity.templates:299001
2748+#: ../ubiquity.templates:301001
2749 msgid "LVM..."
2750 msgstr ""
2751
2752 #. Type: text
2753 #. Description
2754-#: ../ubiquity.templates:300001
2755+#: ../ubiquity.templates:302001
2756 msgid "Volume groups:"
2757 msgstr ""
2758
2759 #. Type: text
2760 #. Description
2761-#: ../ubiquity.templates:301001
2762+#: ../ubiquity.templates:303001
2763 msgid "Encryption Options"
2764 msgstr ""
2765
2766 #. Type: text
2767 #. Description
2768-#: ../ubiquity.templates:302001
2769+#: ../ubiquity.templates:304001
2770 msgid "Physical volumes:"
2771 msgstr ""
2772
2773 #. Type: text
2774 #. Description
2775-#: ../ubiquity.templates:304001
2776+#: ../ubiquity.templates:306001
2777 msgid "Encrypt this partition (LUKS)"
2778 msgstr ""
2779
2780 #. Type: text
2781 #. Description
2782-#: ../ubiquity.templates:305001
2783+#: ../ubiquity.templates:307001
2784 msgid "MB"
2785 msgstr ""
2786
2787 #. Type: text
2788 #. Description
2789-#: ../ubiquity.templates:306001
2790+#: ../ubiquity.templates:308001
2791 msgid ""
2792 "Logical Volume Management (LVM) lets ${RELEASE} treat multiple physical "
2793 "volumes as a single volume."
2794@@ -2012,25 +2022,25 @@ msgstr ""
2795
2796 #. Type: text
2797 #. Description
2798-#: ../ubiquity.templates:307001
2799+#: ../ubiquity.templates:309001
2800 msgid "Logical Volume Management"
2801 msgstr ""
2802
2803 #. Type: text
2804 #. Description
2805-#: ../ubiquity.templates:308001
2806+#: ../ubiquity.templates:310001
2807 msgid "Encryption options..."
2808 msgstr ""
2809
2810 #. Type: text
2811 #. Description
2812-#: ../ubiquity.templates:309001
2813+#: ../ubiquity.templates:311001
2814 msgid "UEFI Secure Boot"
2815 msgstr ""
2816
2817 #. Type: text
2818 #. Description
2819-#: ../ubiquity.templates:310001
2820+#: ../ubiquity.templates:312001
2821 msgid ""
2822 "You have chosen to enable third-party software as part of your install, "
2823 "which for this system includes hardware drivers for graphics and/or wi-fi "
2824@@ -2040,7 +2050,7 @@ msgstr ""
2825
2826 #. Type: text
2827 #. Description
2828-#: ../ubiquity.templates:310001
2829+#: ../ubiquity.templates:312001
2830 msgid ""
2831 "After installation completes, Ubuntu will assist you in configuring UEFI "
2832 "Secure Boot. To ensure that this change is being made by you as an "
2833@@ -2050,7 +2060,7 @@ msgstr ""
2834
2835 #. Type: text
2836 #. Description
2837-#: ../ubiquity.templates:310001
2838+#: ../ubiquity.templates:312001
2839 msgid ""
2840 "<span foreground=\"darkred\">Warning</span>: If you choose not to install "
2841 "these drivers, or if you proceed but do not confirm the password upon "
2842@@ -2060,17 +2070,107 @@ msgstr ""
2843
2844 #. Type: password
2845 #. Description
2846-#: ../ubiquity.templates:311001
2847+#: ../ubiquity.templates:313001
2848 msgid "SecureBoot key for MokPW"
2849 msgstr ""
2850
2851 #. Type: text
2852 #. Description
2853-#: ../ubiquity.templates:312001
2854+#: ../ubiquity.templates:314001
2855 #, no-c-format
2856 msgid "partition #%(partid)s as %(parttype)s used for %(partusage)s"
2857 msgstr ""
2858
2859+#. Type: password
2860+#. Description
2861+#: ../ubiquity.templates:315001
2862+msgid "Key to secure the keystore on ZFS installations"
2863+msgstr ""
2864+
2865+#. Type: text
2866+#. Description
2867+#: ../ubiquity.templates:316001
2868+msgid "Authenticate against a directory"
2869+msgstr ""
2870+
2871+#. Type: text
2872+#. Description
2873+#: ../ubiquity.templates:317001
2874+msgid "Active Directory domain name"
2875+msgstr ""
2876+
2877+#. Type: text
2878+#. Description
2879+#: ../ubiquity.templates:318001
2880+msgid "Administrator to join the domain"
2881+msgstr ""
2882+
2883+#. Type: password
2884+#. Description
2885+#: ../ubiquity.templates:319001
2886+msgid "Administrator password to join the domain"
2887+msgstr ""
2888+
2889+#. Type: text
2890+#. Description
2891+#: ../ubiquity.templates:320001
2892+msgid "Use Active Directory"
2893+msgstr ""
2894+
2895+#. Type: text
2896+#. Description
2897+#: ../ubiquity.templates:321001
2898+msgid " You'll enter domain and other details in the next step."
2899+msgstr ""
2900+
2901+#. Type: text
2902+#. Description
2903+#: ../ubiquity.templates:322001
2904+msgid "Domain:"
2905+msgstr ""
2906+
2907+#. Type: text
2908+#. Description
2909+#: ../ubiquity.templates:323001
2910+msgid "You must enter a domain name"
2911+msgstr ""
2912+
2913+#. Type: text
2914+#. Description
2915+#: ../ubiquity.templates:324001
2916+msgid "Test Connection"
2917+msgstr ""
2918+
2919+#. Type: text
2920+#. Description
2921+#: ../ubiquity.templates:325001
2922+msgid "Domain Administrator:"
2923+msgstr ""
2924+
2925+#. Type: text
2926+#. Description
2927+#: ../ubiquity.templates:326001
2928+msgid "You must enter a user name"
2929+msgstr ""
2930+
2931+#. Type: text
2932+#. Description
2933+#: ../ubiquity.templates:328001
2934+msgid "Configure Active Directory"
2935+msgstr ""
2936+
2937+#. Type: text
2938+#. Description
2939+#: ../ubiquity.templates:329001
2940+msgid "That name already exists on the network."
2941+msgstr ""
2942+
2943+#. Type: text
2944+#. Description
2945+#: ../ubiquity.templates:330001
2946+msgid "Failed to connect to domain."
2947+msgstr ""
2948+
2949 #. Type: title
2950 #. Description
2951 #. Info message displayed when running in OEM mode
2952diff --git a/debian/real-po/af.po b/debian/real-po/af.po
2953index 786512e..fe241bc 100644
2954--- a/debian/real-po/af.po
2955+++ b/debian/real-po/af.po
2956@@ -7,16 +7,16 @@ msgid ""
2957 msgstr ""
2958 "Project-Id-Version: debian-installer\n"
2959 "Report-Msgid-Bugs-To: ubiquity@packages.debian.org\n"
2960-"POT-Creation-Date: 2020-04-08 09:24+0100\n"
2961+"POT-Creation-Date: 2020-10-01 17:47+0200\n"
2962 "PO-Revision-Date: 2020-04-15 02:30+0000\n"
2963 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
2964 "Language-Team: Afrikaans <af@li.org>\n"
2965+"Language: af\n"
2966 "MIME-Version: 1.0\n"
2967 "Content-Type: text/plain; charset=UTF-8\n"
2968 "Content-Transfer-Encoding: 8bit\n"
2969 "X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
2970 "X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
2971-"Language: af\n"
2972
2973 #. Type: text
2974 #. Description
2975@@ -47,7 +47,7 @@ msgstr "Herbegin om voort te gaan"
2976 #. This is used as a window title.
2977 #. Type: text
2978 #. Description
2979-#: ../ubiquity.templates:7001 ../ubiquity.templates:184001
2980+#: ../ubiquity.templates:7001 ../ubiquity.templates:185001
2981 msgid "Install"
2982 msgstr "Installeer"
2983
2984@@ -113,8 +113,8 @@ msgid ""
2985 "You may wish to read the <a href=\"release-notes\">release notes</a> or <a "
2986 "href=\"update\">update this installer</a>."
2987 msgstr ""
2988-"Jy kan die <a href=\"release-notes\">vrystelingsnotas</a> lees of <a "
2989-"href=\"update\">die installeerder bywerk</a>."
2990+"Jy kan die <a href=\"release-notes\">vrystelingsnotas</a> lees of <a href="
2991+"\"update\">die installeerder bywerk</a>."
2992
2993 #. Type: text
2994 #. Description
2995@@ -213,8 +213,7 @@ msgstr "Moet 'n kleinletter begin."
2996 #. Type: text
2997 #. Description
2998 #: ../ubiquity.templates:29001
2999-msgid ""
3000-"May only contain lower-case letters, digits, hyphens, and underscores."
3001+msgid "May only contain lower-case letters, digits, hyphens, and underscores."
3002 msgstr ""
3003 "Mag slegs kleinletters, getalle, koppeltekens en onderstreeptekens bevat."
3004
3005@@ -237,8 +236,8 @@ msgid ""
3006 "&lt;small&gt;Enter the same password twice, so that it can be checked for "
3007 "typing errors.&lt;/small&gt;"
3008 msgstr ""
3009-"&lt;small&gt;Voer die selfde wagwoord twee keer in om tikfoute te "
3010-"bespeur.&lt;/small&gt;"
3011+"&lt;small&gt;Voer die selfde wagwoord twee keer in om tikfoute te bespeur."
3012+"&lt;/small&gt;"
3013
3014 #. Type: text
3015 #. Description
3016@@ -574,7 +573,7 @@ msgstr "Verwyder"
3017 #. An action, displayed on a button or as a menu item.
3018 #. Type: text
3019 #. Description
3020-#: ../ubiquity.templates:84001 ../ubiquity.templates:303001
3021+#: ../ubiquity.templates:84001 ../ubiquity.templates:305001
3022 msgid "Revert"
3023 msgstr "Terugval"
3024
3025@@ -961,78 +960,86 @@ msgstr "Stel boot-laaier op..."
3026 #. Type: text
3027 #. Description
3028 #: ../ubiquity.templates:134001
3029+#, fuzzy
3030+#| msgid "Configuring time zone..."
3031+msgid "Configuring Active Directory..."
3032+msgstr "Stel tydsone op..."
3033+
3034+#. Type: text
3035+#. Description
3036+#: ../ubiquity.templates:135001
3037 msgid "Saving installed packages..."
3038 msgstr "Besig om geïnstalleerde pakkette te stoor..."
3039
3040 #. Type: text
3041 #. Description
3042-#: ../ubiquity.templates:135001
3043+#: ../ubiquity.templates:136001
3044 msgid "Restoring previously installed packages..."
3045 msgstr "Besig om voorheen geïnstalleerde pakkette te herwin..."
3046
3047 #. Type: text
3048 #. Description
3049-#: ../ubiquity.templates:136001
3050+#: ../ubiquity.templates:137001
3051 msgid "Installing additional packages..."
3052 msgstr "Besig om bykomende pakkette te installeer..."
3053
3054 #. Type: text
3055 #. Description
3056-#: ../ubiquity.templates:137001
3057+#: ../ubiquity.templates:138001
3058 msgid "Checking for packages to install..."
3059 msgstr "Besig met nagaan van pakkette om te installeer..."
3060
3061 #. Type: text
3062 #. Description
3063-#: ../ubiquity.templates:138001
3064+#: ../ubiquity.templates:139001
3065 msgid "Removing extra packages..."
3066 msgstr "Verwyder ekstra pakette..."
3067
3068 #. Type: text
3069 #. Description
3070-#: ../ubiquity.templates:139001
3071+#: ../ubiquity.templates:140001
3072 msgid "Checking for packages to remove..."
3073 msgstr "Soek pakette om te verwyder..."
3074
3075 #. Type: text
3076 #. Description
3077-#: ../ubiquity.templates:140001
3078+#: ../ubiquity.templates:141001
3079 msgid "Downloading packages (${TIME} remaining)..."
3080 msgstr "Laai pakette af (${TIME} bly nog oor)..."
3081
3082 #. Type: text
3083 #. Description
3084-#: ../ubiquity.templates:141001
3085+#: ../ubiquity.templates:142001
3086 msgid "Downloading package lists..."
3087 msgstr "Besig met aflaai van pakketlyste..."
3088
3089 #. Type: text
3090 #. Description
3091-#: ../ubiquity.templates:142001
3092+#: ../ubiquity.templates:143001
3093 msgid "Downloading package lists (${TIME} remaining)..."
3094 msgstr "Besig met aflaai van pakketlyste (${TIME} oorblywend)"
3095
3096 #. Type: error
3097 #. Description
3098-#: ../ubiquity.templates:144001
3099+#: ../ubiquity.templates:145001
3100 msgid "Error installing ${PACKAGE}"
3101 msgstr "Fout met installasie van ${PACKAGE}"
3102
3103 #. Type: error
3104 #. Description
3105-#: ../ubiquity.templates:145001
3106+#: ../ubiquity.templates:146001
3107 msgid "Error removing ${PACKAGE}"
3108 msgstr "Fout met verwydering van ${PACKAGE}"
3109
3110 #. Type: error
3111 #. Description
3112-#: ../ubiquity.templates:146001
3113+#: ../ubiquity.templates:147001
3114 msgid "Error while installing packages"
3115 msgstr "Fout tydens die installering van pakkette"
3116
3117 #. Type: error
3118 #. Description
3119-#: ../ubiquity.templates:146001
3120+#: ../ubiquity.templates:147001
3121 msgid "An error occurred while installing packages:"
3122 msgstr "Fout het voorgekom met installasie van pakkette:"
3123
3124@@ -1040,7 +1047,7 @@ msgstr "Fout het voorgekom met installasie van pakkette:"
3125 #. Description
3126 #. Type: error
3127 #. Description
3128-#: ../ubiquity.templates:146001 ../ubiquity.templates:147001
3129+#: ../ubiquity.templates:147001 ../ubiquity.templates:148001
3130 msgid "The following packages are in a broken state:"
3131 msgstr "Die volgende pakkette is in 'n gebroke toestand:"
3132
3133@@ -1048,15 +1055,15 @@ msgstr "Die volgende pakkette is in 'n gebroke toestand:"
3134 #. Description
3135 #. Type: error
3136 #. Description
3137-#: ../ubiquity.templates:146001 ../ubiquity.templates:147001
3138+#: ../ubiquity.templates:147001 ../ubiquity.templates:148001
3139 msgid ""
3140 "This may be due to using an old installer image, or it may be due to a bug "
3141-"in some of the packages listed above. More details may be found in "
3142-"/var/log/syslog. The installer will try to continue anyway, but may fail at "
3143-"a later point, and will not be able to install or remove other packages "
3144-"(possibly including itself) from the installed system. You should first look "
3145-"for newer versions of your installer image, or failing that report the "
3146-"problem to your distributor."
3147+"in some of the packages listed above. More details may be found in /var/log/"
3148+"syslog. The installer will try to continue anyway, but may fail at a later "
3149+"point, and will not be able to install or remove other packages (possibly "
3150+"including itself) from the installed system. You should first look for newer "
3151+"versions of your installer image, or failing that report the problem to your "
3152+"distributor."
3153 msgstr ""
3154 "Dit kan die gevolg wees van die gebruik van 'n ou installasieafbeelding, of "
3155 "as gevolg van 'n fout in een van die bogenoemde pakkette. Meer inligting kan "
3156@@ -1069,25 +1076,25 @@ msgstr ""
3157
3158 #. Type: error
3159 #. Description
3160-#: ../ubiquity.templates:147001
3161+#: ../ubiquity.templates:148001
3162 msgid "Error while removing packages"
3163 msgstr "fout tydens die verwydering van pakkette"
3164
3165 #. Type: error
3166 #. Description
3167-#: ../ubiquity.templates:147001
3168+#: ../ubiquity.templates:148001
3169 msgid "An error occurred while removing packages:"
3170 msgstr "Fout het voorgekom tydens die verwydering van pakkette:"
3171
3172 #. Type: error
3173 #. Description
3174-#: ../ubiquity.templates:148001
3175+#: ../ubiquity.templates:149001
3176 msgid "Error copying network configuration"
3177 msgstr "Fout met kopiëring van netwerkkonfigurasie"
3178
3179 #. Type: error
3180 #. Description
3181-#: ../ubiquity.templates:148001
3182+#: ../ubiquity.templates:149001
3183 msgid ""
3184 "An error occurred while copying the network settings. The installation will "
3185 "continue, but the network configuration will have to be set up again in the "
3186@@ -1099,13 +1106,13 @@ msgstr ""
3187
3188 #. Type: error
3189 #. Description
3190-#: ../ubiquity.templates:149001
3191+#: ../ubiquity.templates:150001
3192 msgid "Error copying bluetooth configuration"
3193 msgstr "Fout met kopiëring van bluetooth-konfigurasie"
3194
3195 #. Type: error
3196 #. Description
3197-#: ../ubiquity.templates:149001
3198+#: ../ubiquity.templates:150001
3199 msgid ""
3200 "An error occurred while copying the bluetooth settings. The installation "
3201 "will continue, but the bluetooth configuration will have to be set up again "
3202@@ -1117,49 +1124,45 @@ msgstr ""
3203
3204 #. Type: error
3205 #. Description
3206-#: ../ubiquity.templates:150001
3207-msgid "Error restoring installed applications"
3208-msgstr "Fout met herstel van geïnstalleerde toepassings"
3209+#: ../ubiquity.templates:151001
3210+msgid "Error configuring connection to Active Directory"
3211+msgstr ""
3212
3213 #. Type: error
3214 #. Description
3215-#: ../ubiquity.templates:150001
3216+#: ../ubiquity.templates:151001
3217 msgid ""
3218-"An error occurred while restoring previously-installed applications. The "
3219-"installation will continue, but you may have to manually reinstall some "
3220-"applications after the computer reboots."
3221+"Sorry, Active Directory can't be set up at the moment. Once your system is "
3222+"up and running, visit help.ubuntu.com/activedirectory for help."
3223 msgstr ""
3224-"Fout het voorgekom tydens die herstel van voorheen geïnstalleerde "
3225-"toepassings. Die installasie sal voortgaan, maar jy sal moontlik sommige "
3226-"toepassings weer individueel moet installeer na die rekenaar herlaai het."
3227
3228 #. Type: text
3229 #. Description
3230-#: ../ubiquity.templates:154001
3231+#: ../ubiquity.templates:155001
3232 msgid "Calculating files to skip copying..."
3233 msgstr "Besig met berekening van lêers om oor te slaan..."
3234
3235 #. Type: title
3236 #. Description
3237-#: ../ubiquity.templates:155001
3238+#: ../ubiquity.templates:156001
3239 msgid "Installing language packs"
3240 msgstr "Installeer taalpakette"
3241
3242 #. Type: text
3243 #. Description
3244-#: ../ubiquity.templates:156001
3245+#: ../ubiquity.templates:157001
3246 msgid "Downloading language packs (${TIME} remaining)..."
3247 msgstr "Laai taalpaketlyste af (${TIME} bly nog oor)..."
3248
3249 #. Type: boolean
3250 #. Description
3251-#: ../ubiquity.templates:165001
3252+#: ../ubiquity.templates:166001
3253 msgid "Failed to unmount partitions"
3254 msgstr "Ontheg van partisies het gefaal"
3255
3256 #. Type: boolean
3257 #. Description
3258-#: ../ubiquity.templates:165001
3259+#: ../ubiquity.templates:166001
3260 msgid ""
3261 "The installer needs to commit changes to partition tables, but cannot do so "
3262 "because partitions on the following mount points could not be unmounted:"
3263@@ -1170,28 +1173,26 @@ msgstr ""
3264
3265 #. Type: boolean
3266 #. Description
3267-#: ../ubiquity.templates:165001
3268+#: ../ubiquity.templates:166001
3269 msgid "Please close any applications using these mount points."
3270 msgstr ""
3271 "Sluit asseblief alle toepassings af wat die volgende koppelpunte gebruik:"
3272
3273 #. Type: boolean
3274 #. Description
3275-#: ../ubiquity.templates:165001
3276-msgid ""
3277-"Would you like the installer to try to unmount these partitions again?"
3278-msgstr ""
3279-"Wil jy dat die installeerder poog om hierdie partisies weer te ontheg?"
3280+#: ../ubiquity.templates:166001
3281+msgid "Would you like the installer to try to unmount these partitions again?"
3282+msgstr "Wil jy dat die installeerder poog om hierdie partisies weer te ontheg?"
3283
3284 #. Type: boolean
3285 #. Description
3286-#: ../ubiquity.templates:171001
3287+#: ../ubiquity.templates:172001
3288 msgid "Do you want to return to the partitioner?"
3289 msgstr "Wil jy na die partisieprogram terugkeer?"
3290
3291 #. Type: boolean
3292 #. Description
3293-#: ../ubiquity.templates:171001
3294+#: ../ubiquity.templates:172001
3295 msgid ""
3296 "Some of the partitions you created are too small. Please make the following "
3297 "partitions at least this large:"
3298@@ -1201,7 +1202,7 @@ msgstr ""
3299
3300 #. Type: boolean
3301 #. Description
3302-#: ../ubiquity.templates:171001
3303+#: ../ubiquity.templates:172001
3304 msgid ""
3305 "If you do not go back to the partitioner and increase the size of these "
3306 "partitions, the installation may fail."
3307@@ -1211,7 +1212,7 @@ msgstr ""
3308
3309 #. Type: text
3310 #. Description
3311-#: ../ubiquity.templates:173001
3312+#: ../ubiquity.templates:174001
3313 msgid "System Configuration"
3314 msgstr "Stelselkonfigurasie"
3315
3316@@ -1219,25 +1220,25 @@ msgstr "Stelselkonfigurasie"
3317 #. Description
3318 #. Type: text
3319 #. Description
3320-#: ../ubiquity.templates:174001 ../ubiquity.templates:257001
3321+#: ../ubiquity.templates:175001 ../ubiquity.templates:258001
3322 msgid "Welcome"
3323 msgstr "Welkom"
3324
3325 #. Type: text
3326 #. Description
3327-#: ../ubiquity.templates:175001
3328+#: ../ubiquity.templates:176001
3329 msgid "Network configuration"
3330 msgstr "Netwerkkonfigurasie"
3331
3332 #. Type: text
3333 #. Description
3334-#: ../ubiquity.templates:176001
3335+#: ../ubiquity.templates:177001
3336 msgid "Software selection"
3337 msgstr "Sagtewarekeuse"
3338
3339 #. Type: text
3340 #. Description
3341-#: ../ubiquity.templates:177001
3342+#: ../ubiquity.templates:178001
3343 msgid "Language"
3344 msgstr "Taal"
3345
3346@@ -1245,111 +1246,111 @@ msgstr "Taal"
3347 #. Description
3348 #. Type: text
3349 #. Description
3350-#: ../ubiquity.templates:178001 ../ubiquity.templates:202001
3351+#: ../ubiquity.templates:179001 ../ubiquity.templates:203001
3352 msgid "Wireless"
3353 msgstr "Draadloosnetwerk"
3354
3355 #. Type: text
3356 #. Description
3357-#: ../ubiquity.templates:179001
3358+#: ../ubiquity.templates:180001
3359 msgid "Software"
3360 msgstr "Sagteware"
3361
3362 #. Type: text
3363 #. Description
3364-#: ../ubiquity.templates:180001
3365+#: ../ubiquity.templates:181001
3366 msgid "Timezone"
3367 msgstr "Tydsone"
3368
3369 #. Type: text
3370 #. Description
3371-#: ../ubiquity.templates:181001
3372+#: ../ubiquity.templates:182001
3373 msgid "Keyboard"
3374 msgstr "Sleutelbord"
3375
3376 #. Type: text
3377 #. Description
3378-#: ../ubiquity.templates:182001
3379+#: ../ubiquity.templates:183001
3380 msgid "Disk Setup"
3381 msgstr "Skyfopstelling"
3382
3383 #. Type: text
3384 #. Description
3385-#: ../ubiquity.templates:183001
3386+#: ../ubiquity.templates:184001
3387 msgid "User Info"
3388 msgstr "Gebruikerisnligting"
3389
3390 #. Type: text
3391 #. Description
3392-#: ../ubiquity.templates:185001
3393+#: ../ubiquity.templates:186001
3394 msgid "installation process"
3395 msgstr "installasieproses"
3396
3397 #. Type: text
3398 #. Description
3399-#: ../ubiquity.templates:187001
3400+#: ../ubiquity.templates:188001
3401 msgid "Checking for installer updates"
3402 msgstr "Besig met nagaan van installeerderbywerkings"
3403
3404 #. Type: text
3405 #. Description
3406-#: ../ubiquity.templates:188001
3407+#: ../ubiquity.templates:189001
3408 msgid "Reading package information"
3409 msgstr "Besig met lees van pakketinligting"
3410
3411 #. Type: text
3412 #. Description
3413-#: ../ubiquity.templates:189001
3414+#: ../ubiquity.templates:190001
3415 msgid "Updating package information"
3416 msgstr "Besig met bywerk van pakketinligting."
3417
3418 #. Type: text
3419 #. Description
3420-#: ../ubiquity.templates:190001
3421+#: ../ubiquity.templates:191001
3422 msgid "File ${INDEX} of ${TOTAL} at ${SPEED}/s"
3423 msgstr "Lêer ${INDEX} van ${TOTAL} teen ${SPEED}/s"
3424
3425 #. Type: text
3426 #. Description
3427-#: ../ubiquity.templates:191001
3428+#: ../ubiquity.templates:192001
3429 msgid "File ${INDEX} of ${TOTAL}"
3430 msgstr "Lêer ${INDEX} van ${TOTAL}"
3431
3432 #. Type: text
3433 #. Description
3434-#: ../ubiquity.templates:192001
3435+#: ../ubiquity.templates:193001
3436 msgid "Installing update"
3437 msgstr "Besing met installasie van bywerking"
3438
3439 #. Type: text
3440 #. Description
3441-#: ../ubiquity.templates:193001
3442+#: ../ubiquity.templates:194001
3443 msgid "Error updating installer"
3444 msgstr "Fout met bywerking van installeerder"
3445
3446 #. Type: text
3447 #. Description
3448-#: ../ubiquity.templates:193001
3449+#: ../ubiquity.templates:194001
3450 msgid "The installer encountered an error while trying to update itself:"
3451 msgstr "Fout met installeerder tydens bywerking van homself:"
3452
3453 #. Type: text
3454 #. Description
3455 #. Translated acronym for Universal Serial Bus.
3456-#: ../ubiquity.templates:194001
3457+#: ../ubiquity.templates:195001
3458 msgid "USB disk"
3459 msgstr "USB-skyf"
3460
3461 #. Type: text
3462 #. Description
3463 #. Translated acronym for Compact Disc.
3464-#: ../ubiquity.templates:195001
3465+#: ../ubiquity.templates:196001
3466 msgid "CD"
3467 msgstr "CD"
3468
3469 #. Type: text
3470 #. Description
3471-#: ../ubiquity.templates:196001
3472+#: ../ubiquity.templates:197001
3473 msgid ""
3474 "Please choose the language to use for the install process. This language "
3475 "will be the default language for this computer."
3476@@ -1359,7 +1360,7 @@ msgstr ""
3477
3478 #. Type: text
3479 #. Description
3480-#: ../ubiquity.templates:197001
3481+#: ../ubiquity.templates:198001
3482 msgid ""
3483 "Please choose the language used for the configuration process. This language "
3484 "will be the default language for this computer."
3485@@ -1371,13 +1372,13 @@ msgstr ""
3486 #. Description
3487 #. Type: text
3488 #. Description
3489-#: ../ubiquity.templates:198001 ../ubiquity.templates:199001
3490+#: ../ubiquity.templates:199001 ../ubiquity.templates:200001
3491 msgid "Installation failed"
3492 msgstr "Installasie het misluk"
3493
3494 #. Type: text
3495 #. Description
3496-#: ../ubiquity.templates:198001
3497+#: ../ubiquity.templates:199001
3498 msgid ""
3499 "The installer encountered an unrecoverable error. A desktop session will "
3500 "now be run so that you may investigate the problem or try installing again."
3501@@ -1388,20 +1389,20 @@ msgstr ""
3502
3503 #. Type: text
3504 #. Description
3505-#: ../ubiquity.templates:199001
3506+#: ../ubiquity.templates:200001
3507 msgid "The installer encountered an unrecoverable error and will now reboot."
3508 msgstr ""
3509 "'n Onherstelbare fout het die installeerder getref en hy sal nou herlaai."
3510
3511 #. Type: text
3512 #. Description
3513-#: ../ubiquity.templates:201001
3514+#: ../ubiquity.templates:202001
3515 msgid "Updates and other software"
3516 msgstr "Opgraderings en ander sagteware"
3517
3518 #. Type: text
3519 #. Description
3520-#: ../ubiquity.templates:203001
3521+#: ../ubiquity.templates:204001
3522 msgid ""
3523 "Connecting this computer to a wi-fi network allows you to install third-"
3524 "party software, download updates, automatically detect your timezone, and "
3525@@ -1413,50 +1414,51 @@ msgstr ""
3526
3527 #. Type: text
3528 #. Description
3529-#: ../ubiquity.templates:204001
3530+#. Type: text
3531+#. Description
3532+#: ../ubiquity.templates:205001 ../ubiquity.templates:327001
3533 msgid "Password:"
3534 msgstr "Wagwoord:"
3535
3536 #. Type: text
3537 #. Description
3538-#: ../ubiquity.templates:205001
3539+#: ../ubiquity.templates:206001
3540 msgid "Display password"
3541 msgstr "Vertoon wagwoord"
3542
3543 #. Type: text
3544 #. Description
3545-#: ../ubiquity.templates:206001
3546+#: ../ubiquity.templates:207001
3547 msgid "I don't want to connect to a wi-fi network right now"
3548 msgstr "Ek verkies om nie nou met 'n wi-fi-netwerk te verbind nie"
3549
3550 #. Type: text
3551 #. Description
3552-#: ../ubiquity.templates:207001
3553+#: ../ubiquity.templates:208001
3554 msgid "Connect to this network"
3555 msgstr "Verbind met hierdie netwerk"
3556
3557 #. Type: text
3558 #. Description
3559-#: ../ubiquity.templates:213001
3560+#: ../ubiquity.templates:214001
3561 msgid "Select drive:"
3562 msgstr "Kies skyf:"
3563
3564 #. Type: text
3565 #. Description
3566-#: ../ubiquity.templates:214001
3567+#: ../ubiquity.templates:215001
3568 msgid "Allocate drive space by dragging the divider below:"
3569-msgstr ""
3570-"Bewerkstellig harrdeskyfspasie deur die verdeler hieronder te sleep:"
3571+msgstr "Bewerkstellig harrdeskyfspasie deur die verdeler hieronder te sleep:"
3572
3573 #. Type: text
3574 #. Description
3575-#: ../ubiquity.templates:215001
3576+#: ../ubiquity.templates:216001
3577 msgid "The entire disk will be used:"
3578 msgstr "Die hele skyf sal benut word."
3579
3580 #. Type: text
3581 #. Description
3582-#: ../ubiquity.templates:216001
3583+#: ../ubiquity.templates:217001
3584 #, no-c-format
3585 msgid ""
3586 "<small>%d smaller partitions are hidden, use the <a href=\"\">advanced "
3587@@ -1467,7 +1469,7 @@ msgstr ""
3588
3589 #. Type: text
3590 #. Description
3591-#: ../ubiquity.templates:217001
3592+#: ../ubiquity.templates:218001
3593 msgid ""
3594 "<small>1 smaller partition is hidden, use the <a href=\"\">advanced "
3595 "partitioning tool</a> for more control</small>"
3596@@ -1477,7 +1479,7 @@ msgstr ""
3597
3598 #. Type: text
3599 #. Description
3600-#: ../ubiquity.templates:218001
3601+#: ../ubiquity.templates:219001
3602 #, no-c-format
3603 msgid ""
3604 "%d partitions will be deleted, use the <a href=\"\">advanced partitioning "
3605@@ -1488,7 +1490,7 @@ msgstr ""
3606
3607 #. Type: text
3608 #. Description
3609-#: ../ubiquity.templates:219001
3610+#: ../ubiquity.templates:220001
3611 msgid ""
3612 "1 partition will be deleted, use the <a href=\"\">advanced partitioning "
3613 "tool</a> for more control"
3614@@ -1498,68 +1500,68 @@ msgstr ""
3615
3616 #. Type: text
3617 #. Description
3618-#: ../ubiquity.templates:220001
3619+#: ../ubiquity.templates:221001
3620 msgid "Split Largest Partition"
3621 msgstr "Splits grootste partisie"
3622
3623 #. Type: text
3624 #. Description
3625-#: ../ubiquity.templates:222001
3626+#: ../ubiquity.templates:223001
3627 msgid "For best results, please ensure that this computer:"
3628 msgstr "Vir die beste resultate neem sorg dat die rekenaar:"
3629
3630 #. Type: text
3631 #. Description
3632-#: ../ubiquity.templates:223001
3633+#: ../ubiquity.templates:224001
3634 msgid "Sorry"
3635 msgstr "Jammer"
3636
3637 #. Type: text
3638 #. Description
3639 #. RST means "Rapid Storage Technology". Don't translate it.
3640-#: ../ubiquity.templates:224001
3641+#: ../ubiquity.templates:225001
3642 msgid "Turn off RST"
3643 msgstr "Draai af RST"
3644
3645 #. Type: text
3646 #. Description
3647-#: ../ubiquity.templates:225001
3648+#: ../ubiquity.templates:226001
3649 msgid ""
3650 "This computer uses Intel RST (Rapid Storage Technology). You need to turn "
3651 "off RST before installing Ubuntu. For instructions, open this page on a "
3652-"phone or other device: <a "
3653-"href=\"https://help.ubuntu.com/rst\">help.ubuntu.com/rst</a>"
3654+"phone or other device: <a href=\"https://help.ubuntu.com/rst\">help.ubuntu."
3655+"com/rst</a>"
3656 msgstr ""
3657 "Hierdie rekenaar gebruik Intel RST (Rapid Storage Technology). Jy moet RST "
3658 "af te skakel voor die installering van Ubuntu. Vir instruksies, open hierdie "
3659-"bladsy op 'n telefoon of ander toestel: <a "
3660-"href=\"https://help.ubuntu.com/rst\">help.ubuntu.com/rst</a>"
3661+"bladsy op 'n telefoon of ander toestel: <a href=\"https://help.ubuntu.com/rst"
3662+"\">help.ubuntu.com/rst</a>"
3663
3664 #. Type: text
3665 #. Description
3666-#: ../ubiquity.templates:226001
3667+#: ../ubiquity.templates:227001
3668 msgid "Turn off BitLocker"
3669 msgstr "Draai af BitLocker"
3670
3671 #. Type: text
3672 #. Description
3673-#: ../ubiquity.templates:227001
3674+#: ../ubiquity.templates:228001
3675 msgid ""
3676 "This computer uses Windows BitLocker encryption. You need to turn off "
3677 "BitLocker in Windows before installing Ubuntu. For instructions, open this "
3678-"page on a phone or other device: <a "
3679-"href=\"https://help.ubuntu.com/bitlocker\">help.ubuntu.com/bitlocker</a>"
3680+"page on a phone or other device: <a href=\"https://help.ubuntu.com/bitlocker"
3681+"\">help.ubuntu.com/bitlocker</a>"
3682 msgstr ""
3683 "Hierdie rekenaar gebruik Windows BitLocker enkripsie. Jy moet af BitLocker "
3684 "om te draai in Windows voor die installering van Ubuntu. Vir instruksies, "
3685-"open hierdie bladsy op 'n telefoon of ander toestel: <a "
3686-"href=\"https://help.ubuntu.com/bitlocker\">help.ubuntu.com/bitlocker</a>"
3687+"open hierdie bladsy op 'n telefoon of ander toestel: <a href=\"https://help."
3688+"ubuntu.com/bitlocker\">help.ubuntu.com/bitlocker</a>"
3689
3690 #. Type: text
3691 #. Description
3692 #. SIZE is a variable substituted into this string, and may be '3.7 GB'
3693 #. RELEASE is a variable substituted into this string, the Ubuntu flavor'
3694-#: ../ubiquity.templates:228001
3695+#: ../ubiquity.templates:229001
3696 msgid "You need at least ${SIZE} disk space to install ${RELEASE}."
3697 msgstr ""
3698 "Jy benodig ten minste ${SIZE} disketspasie om ${RELEASE} te installeer."
3699@@ -1567,25 +1569,25 @@ msgstr ""
3700 #. Type: text
3701 #. Description
3702 #. SIZE is a variable substituted into this string, and may be '3.7 GB'
3703-#: ../ubiquity.templates:229001
3704+#: ../ubiquity.templates:230001
3705 msgid "This computer has only ${SIZE}."
3706 msgstr "Hierdie rekenaar het slegs ${SIZE}."
3707
3708 #. Type: text
3709 #. Description
3710-#: ../ubiquity.templates:230001
3711+#: ../ubiquity.templates:231001
3712 msgid "is plugged in to a power source"
3713 msgstr "by 'n kragpunt ingeprop is"
3714
3715 #. Type: text
3716 #. Description
3717-#: ../ubiquity.templates:231001
3718+#: ../ubiquity.templates:232001
3719 msgid "is connected to the Internet"
3720 msgstr "verbind is aan die internet"
3721
3722 #. Type: text
3723 #. Description
3724-#: ../ubiquity.templates:232001
3725+#: ../ubiquity.templates:233001
3726 msgid ""
3727 "This software is subject to license terms included with its documentation. "
3728 "Some is proprietary."
3729@@ -1595,7 +1597,7 @@ msgstr ""
3730
3731 #. Type: text
3732 #. Description
3733-#: ../ubiquity.templates:233001
3734+#: ../ubiquity.templates:234001
3735 msgid ""
3736 "Install third-party software for graphics and Wi-Fi hardware and additional "
3737 "media formats"
3738@@ -1605,69 +1607,68 @@ msgstr ""
3739
3740 #. Type: text
3741 #. Description
3742-#: ../ubiquity.templates:234001
3743+#: ../ubiquity.templates:235001
3744 msgid "Download updates while installing ${RELEASE}"
3745 msgstr "Laai opdaterings af gedurende installasie ${RELEASE}"
3746
3747 #. Type: text
3748 #. Description
3749-#: ../ubiquity.templates:235001
3750+#: ../ubiquity.templates:236001
3751 msgid "This saves time after installation."
3752 msgstr "Hierdie bespaar tyd na installasie."
3753
3754 #. Type: text
3755 #. Description
3756-#: ../ubiquity.templates:236001
3757+#: ../ubiquity.templates:237001
3758 msgid "Not available because there is no Internet connection."
3759 msgstr "Nie beskikbaar aangesien daar geen internetverbinding is nie."
3760
3761 #. Type: text
3762 #. Description
3763-#: ../ubiquity.templates:237001
3764+#: ../ubiquity.templates:238001
3765 msgid "What apps would you like to install to start with?"
3766 msgstr ""
3767 "Watter sagteware programme wil jy graag eerste installeer om mee begin?"
3768
3769 #. Type: text
3770 #. Description
3771-#: ../ubiquity.templates:238001
3772+#: ../ubiquity.templates:239001
3773 msgid "Which applications would you like to start with?"
3774 msgstr "Watter sagteware programme wil jy graag mee begin?"
3775
3776 #. Type: text
3777 #. Description
3778-#: ../ubiquity.templates:239001
3779+#: ../ubiquity.templates:240001
3780 msgid "Minimal installation"
3781 msgstr "Minimale installasie"
3782
3783 #. Type: text
3784 #. Description
3785-#: ../ubiquity.templates:240001
3786+#: ../ubiquity.templates:241001
3787 msgid "Web browser and basic utilities."
3788 msgstr "Webleser en basiese nutsprogramme."
3789
3790 #. Type: text
3791 #. Description
3792-#: ../ubiquity.templates:241001
3793+#: ../ubiquity.templates:242001
3794 msgid "Web browser plus basic utilities and applications."
3795 msgstr "Webleser plus basiese nutsprogramme en toepassings."
3796
3797 #. Type: text
3798 #. Description
3799-#: ../ubiquity.templates:242001
3800+#: ../ubiquity.templates:243001
3801 msgid "Normal installation"
3802 msgstr "Normale installasie"
3803
3804 #. Type: text
3805 #. Description
3806-#: ../ubiquity.templates:243001
3807+#: ../ubiquity.templates:244001
3808 msgid "Web browser, utilities, office software, games, and media players."
3809-msgstr ""
3810-"Webleser, nut opsies, kantoor sagteware, speletjies en media spelers."
3811+msgstr "Webleser, nut opsies, kantoor sagteware, speletjies en media spelers."
3812
3813 #. Type: text
3814 #. Description
3815-#: ../ubiquity.templates:244001
3816+#: ../ubiquity.templates:245001
3817 msgid ""
3818 "Web browser, utilities, office software, plus additional internet "
3819 "applications and media players."
3820@@ -1677,13 +1678,13 @@ msgstr ""
3821
3822 #. Type: text
3823 #. Description
3824-#: ../ubiquity.templates:245001
3825+#: ../ubiquity.templates:246001
3826 msgid "Other options"
3827 msgstr "Ander verstellings"
3828
3829 #. Type: text
3830 #. Description
3831-#: ../ubiquity.templates:246001
3832+#: ../ubiquity.templates:247001
3833 msgid ""
3834 "Installing third-party drivers requires configuring Secure Boot. To do this, "
3835 "you need to choose a security key now, and enter it when the system restarts."
3836@@ -1694,25 +1695,25 @@ msgstr ""
3837
3838 #. Type: text
3839 #. Description
3840-#: ../ubiquity.templates:250001
3841+#: ../ubiquity.templates:251001
3842 msgid "Layout:"
3843 msgstr "Uitleg:"
3844
3845 #. Type: text
3846 #. Description
3847-#: ../ubiquity.templates:251001
3848+#: ../ubiquity.templates:252001
3849 msgid "Variant:"
3850 msgstr "Variant:"
3851
3852 #. Type: text
3853 #. Description
3854-#: ../ubiquity.templates:252001
3855+#: ../ubiquity.templates:253001
3856 msgid "Below is an image of your current layout:"
3857 msgstr "Onder is a prentjie van jou huidige uitleg:"
3858
3859 #. Type: text
3860 #. Description
3861-#: ../ubiquity.templates:253001
3862+#: ../ubiquity.templates:254001
3863 msgid ""
3864 "Select your location, so that the system can use appropriate display "
3865 "conventions for your country, fetch updates from sites close to you, and set "
3866@@ -1724,19 +1725,19 @@ msgstr ""
3867
3868 #. Type: text
3869 #. Description
3870-#: ../ubiquity.templates:254001
3871+#: ../ubiquity.templates:255001
3872 msgid "Time Zone:"
3873 msgstr "Tydsone:"
3874
3875 #. Type: text
3876 #. Description
3877-#: ../ubiquity.templates:255001
3878+#: ../ubiquity.templates:256001
3879 msgid "Region:"
3880 msgstr "Streek:"
3881
3882 #. Type: text
3883 #. Description
3884-#: ../ubiquity.templates:256001
3885+#: ../ubiquity.templates:257001
3886 msgid "[type here to change]"
3887 msgstr "[tik hier om te verander]"
3888
3889@@ -1744,14 +1745,14 @@ msgstr "[tik hier om te verander]"
3890 #. Description
3891 #. OS is a variable substituted into this string, and may be 'Windows 7'
3892 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
3893-#: ../ubiquity.templates:259001
3894+#: ../ubiquity.templates:260001
3895 msgid "Replace ${OS} with ${DISTRO}"
3896 msgstr "Vervang ${OS} met ${DISTRO}"
3897
3898 #. Type: text
3899 #. Description
3900 #. OS is a variable substituted into this string, and may be 'Windows 7'
3901-#: ../ubiquity.templates:259001
3902+#: ../ubiquity.templates:260001
3903 msgid ""
3904 "<span foreground=\"darkred\">Warning:</span> This will delete all of your "
3905 "${OS} programs, documents, photos, music, and any other files."
3906@@ -1763,7 +1764,7 @@ msgstr ""
3907 #. Description
3908 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
3909 #. OS is a variable substituted into this string, and may be 'Windows 7'
3910-#: ../ubiquity.templates:260001
3911+#: ../ubiquity.templates:261001
3912 msgid "Install ${DISTRO} alongside ${OS}"
3913 msgstr "Installeer ${DISTRO} naas ${OS}"
3914
3915@@ -1775,8 +1776,8 @@ msgstr "Installeer ${DISTRO} naas ${OS}"
3916 #. Description
3917 #. Type: text
3918 #. Description
3919-#: ../ubiquity.templates:260001 ../ubiquity.templates:261001
3920-#: ../ubiquity.templates:264001 ../ubiquity.templates:269001
3921+#: ../ubiquity.templates:261001 ../ubiquity.templates:262001
3922+#: ../ubiquity.templates:265001 ../ubiquity.templates:270001
3923 msgid ""
3924 "Documents, music, and other personal files will be kept. You can choose "
3925 "which operating system you want each time the computer starts up."
3926@@ -1788,20 +1789,20 @@ msgstr ""
3927 #. Description
3928 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
3929 #. OS is a variable substituted into this string, and may be 'Windows 7'
3930-#: ../ubiquity.templates:261001
3931+#: ../ubiquity.templates:262001
3932 msgid "Install ${DISTRO} inside ${OS}"
3933 msgstr "Installeer ${DISTRO} in ${OS}"
3934
3935 #. Type: text
3936 #. Description
3937-#: ../ubiquity.templates:262001
3938+#: ../ubiquity.templates:263001
3939 msgid "Something else"
3940 msgstr "Iets anders"
3941
3942 #. Type: text
3943 #. Description
3944 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
3945-#: ../ubiquity.templates:262001
3946+#: ../ubiquity.templates:263001
3947 msgid ""
3948 "You can create or resize partitions yourself, or choose multiple partitions "
3949 "for ${DISTRO}."
3950@@ -1812,14 +1813,14 @@ msgstr ""
3951 #. Type: text
3952 #. Description
3953 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
3954-#: ../ubiquity.templates:263001
3955+#: ../ubiquity.templates:264001
3956 msgid "Erase ${CURDISTRO} and reinstall"
3957 msgstr "Verwyder ${CURDISTRO} en herinstalleer"
3958
3959 #. Type: text
3960 #. Description
3961 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
3962-#: ../ubiquity.templates:263001
3963+#: ../ubiquity.templates:264001
3964 msgid ""
3965 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
3966 "${CURDISTRO} programs, documents, photos, music, and any other files."
3967@@ -1832,7 +1833,7 @@ msgstr ""
3968 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
3969 #. VER is a variable substituted into this string, and may be '11.04'
3970 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
3971-#: ../ubiquity.templates:264001
3972+#: ../ubiquity.templates:265001
3973 msgid "Install ${DISTRO} ${VER} alongside ${CURDISTRO}"
3974 msgstr "Installeer ${DISTRO} ${VER} naas ${CURDISTRO}"
3975
3976@@ -1842,13 +1843,13 @@ msgstr "Installeer ${DISTRO} ${VER} naas ${CURDISTRO}"
3977 #. Type: text
3978 #. Description
3979 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
3980-#: ../ubiquity.templates:265001 ../ubiquity.templates:268001
3981+#: ../ubiquity.templates:266001 ../ubiquity.templates:269001
3982 msgid "Erase disk and install ${DISTRO}"
3983 msgstr "Skrap skyf en installeer ${DISTRO}"
3984
3985 #. Type: text
3986 #. Description
3987-#: ../ubiquity.templates:265001
3988+#: ../ubiquity.templates:266001
3989 msgid ""
3990 "<span foreground=\"darkred\">Warning:</span> This will delete any files on "
3991 "the disk."
3992@@ -1858,7 +1859,7 @@ msgstr ""
3993
3994 #. Type: text
3995 #. Description
3996-#: ../ubiquity.templates:266001
3997+#: ../ubiquity.templates:267001
3998 msgid "Erase everything and reinstall"
3999 msgstr "Skrap alles en herinstalleer"
4000
4001@@ -1866,7 +1867,7 @@ msgstr "Skrap alles en herinstalleer"
4002 #. Description
4003 #. OS is a variable substituted into this string, and may be 'Windows 7'
4004 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
4005-#: ../ubiquity.templates:266001
4006+#: ../ubiquity.templates:267001
4007 msgid ""
4008 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
4009 "programs, documents, photos, music, and other files in both ${OS} and "
4010@@ -1879,16 +1880,21 @@ msgstr ""
4011 #. Type: text
4012 #. Description
4013 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
4014-#: ../ubiquity.templates:267001
4015+#: ../ubiquity.templates:268001
4016 msgid "Reinstall ${CURDISTRO}"
4017 msgstr "Herinstalleer ${CURDISTRO}"
4018
4019 #. Type: text
4020 #. Description
4021-#: ../ubiquity.templates:267001
4022+#: ../ubiquity.templates:268001
4023+#, fuzzy
4024+#| msgid ""
4025+#| "Documents, music, and other personal files will be kept. Installed "
4026+#| "software will be kept where possible. System-wide settings will be "
4027+#| "cleared."
4028 msgid ""
4029 "Documents, music, and other personal files will be kept. Installed software "
4030-"will be kept where possible. System-wide settings will be cleared."
4031+"and system-wide settings will be cleared."
4032 msgstr ""
4033 "Dokumente, musiek en ander persoonlike lêers sal behoue bly. Geïnstalleerde "
4034 "sagteware sal, waar moontlik, gehou word. Stelselwye instellings sal geskrap "
4035@@ -1896,7 +1902,7 @@ msgstr ""
4036
4037 #. Type: text
4038 #. Description
4039-#: ../ubiquity.templates:268001
4040+#: ../ubiquity.templates:269001
4041 msgid ""
4042 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
4043 "programs, documents, photos, music, and any other files in all operating "
4044@@ -1909,14 +1915,14 @@ msgstr ""
4045 #. Type: text
4046 #. Description
4047 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
4048-#: ../ubiquity.templates:269001
4049+#: ../ubiquity.templates:270001
4050 msgid "Install ${DISTRO} alongside them"
4051 msgstr "Installeer ${DISTRO} naas hulle"
4052
4053 #. Type: text
4054 #. Description
4055 #. OS is a variable substituted into this string, and may be 'Windows 7'
4056-#: ../ubiquity.templates:270001
4057+#: ../ubiquity.templates:271001
4058 msgid "This computer currently has ${OS} on it. What would you like to do?"
4059 msgstr "Die rekenaar het tans ${OS} geïnstalleer. Wat wil jy doen?"
4060
4061@@ -1924,16 +1930,15 @@ msgstr "Die rekenaar het tans ${OS} geïnstalleer. Wat wil jy doen?"
4062 #. Description
4063 #. OS1 is a variable substituted into this string, and may be 'Windows 7'
4064 #. OS2 is a variable substituted into this string, and may be 'Mac OS X'
4065-#: ../ubiquity.templates:271001
4066+#: ../ubiquity.templates:272001
4067 msgid ""
4068 "This computer currently has ${OS1} and ${OS2} on it. What would you like to "
4069 "do?"
4070-msgstr ""
4071-"Die rekenaar het tans ${OS1} en ${OS2} geïnstalleer. Wat wil jy doen?"
4072+msgstr "Die rekenaar het tans ${OS1} en ${OS2} geïnstalleer. Wat wil jy doen?"
4073
4074 #. Type: text
4075 #. Description
4076-#: ../ubiquity.templates:272001
4077+#: ../ubiquity.templates:273001
4078 msgid ""
4079 "This computer currently has multiple operating systems on it. What would you "
4080 "like to do?"
4081@@ -1942,7 +1947,7 @@ msgstr ""
4082
4083 #. Type: text
4084 #. Description
4085-#: ../ubiquity.templates:273001
4086+#: ../ubiquity.templates:274001
4087 msgid ""
4088 "This computer currently has no detected operating systems. What would you "
4089 "like to do?"
4090@@ -1952,37 +1957,37 @@ msgstr ""
4091
4092 #. Type: text
4093 #. Description
4094-#: ../ubiquity.templates:274001
4095+#: ../ubiquity.templates:275001
4096 msgid "Before:"
4097 msgstr "Voor:"
4098
4099 #. Type: text
4100 #. Description
4101-#: ../ubiquity.templates:275001
4102+#: ../ubiquity.templates:276001
4103 msgid "After:"
4104 msgstr "Na:"
4105
4106 #. Type: text
4107 #. Description
4108-#: ../ubiquity.templates:276001
4109+#: ../ubiquity.templates:277001
4110 msgid "Encrypt the new ${RELEASE} installation for security"
4111 msgstr "Enkripteer die nuwe ${RELEASE}-installasie vir veiligheid."
4112
4113 #. Type: text
4114 #. Description
4115-#: ../ubiquity.templates:277001
4116+#: ../ubiquity.templates:278001
4117 msgid "You will choose a security key in the next step."
4118 msgstr "Jy sal in die volgende stap 'n beveiligingsleutel kies."
4119
4120 #. Type: text
4121 #. Description
4122-#: ../ubiquity.templates:278001
4123+#: ../ubiquity.templates:279001
4124 msgid "Use LVM with the new ${RELEASE} installation"
4125 msgstr "Gebruik LVM saam met die nuwe ${RELEASE}-installasie."
4126
4127 #. Type: text
4128 #. Description
4129-#: ../ubiquity.templates:279001
4130+#: ../ubiquity.templates:280001
4131 msgid ""
4132 "This will set up Logical Volume Management. It allows taking snapshots and "
4133 "easier partition resizing."
4134@@ -1992,31 +1997,35 @@ msgstr ""
4135
4136 #. Type: text
4137 #. Description
4138-#: ../ubiquity.templates:280001
4139-msgid "EXPERIMENTAL: Erase disk and use ZFS"
4140+#: ../ubiquity.templates:281001
4141+#, fuzzy
4142+#| msgid "EXPERIMENTAL: Erase disk and use ZFS"
4143+msgid "Erase disk and use ZFS"
4144 msgstr "EKSPERIMENTELE: Vee skyf en gebruik ZFS"
4145
4146 #. Type: text
4147 #. Description
4148-#: ../ubiquity.templates:281001
4149+#: ../ubiquity.templates:282001
4150+#, fuzzy
4151+#| msgid ""
4152+#| "<span foreground=\"darkred\">Warning:</span> This will delete any files "
4153+#| "on the disk."
4154 msgid ""
4155 "<span foreground=\"darkred\">Warning:</span> This will delete all your files "
4156-"on all operating systems. This is experimental and may cause data loss. Do "
4157-"not use on production systems."
4158+"on all operating systems."
4159 msgstr ""
4160-"<span foreground = \"darkred\">Waarskuwing:</span> Dit sal al die lêers op "
4161-"alle bedryfstelsels verwyder. Hierdie is eksperimenteel en kan verlies van "
4162-"data veroorsaak. Moet nie op produksiestelsels gebruik nie."
4163+"<span foreground=\"darkred\">Waarskuwing:</span> hierdie aksie sal alle "
4164+"lêers op die skyf verwyder."
4165
4166 #. Type: text
4167 #. Description
4168-#: ../ubiquity.templates:283001
4169+#: ../ubiquity.templates:284001
4170 msgid "Advanced Features"
4171 msgstr "Gevorderde Funksies"
4172
4173 #. Type: text
4174 #. Description
4175-#: ../ubiquity.templates:284001
4176+#: ../ubiquity.templates:285001
4177 msgid "None"
4178 msgstr "Geeneen"
4179
4180@@ -2024,49 +2033,57 @@ msgstr "Geeneen"
4181 #. Description
4182 #. Type: text
4183 #. Description
4184-#: ../ubiquity.templates:285001 ../ubiquity.templates:287001
4185+#: ../ubiquity.templates:286001 ../ubiquity.templates:288001
4186 msgid "None selected"
4187 msgstr "Geeneen gekeur"
4188
4189 #. Type: text
4190 #. Description
4191-#: ../ubiquity.templates:286001
4192+#: ../ubiquity.templates:287001
4193 msgid "Advanced features..."
4194 msgstr "Gevorderde funksies..."
4195
4196 #. Type: text
4197 #. Description
4198-#: ../ubiquity.templates:288001
4199+#: ../ubiquity.templates:289001
4200 msgid "LVM selected"
4201 msgstr "LVM gekeur"
4202
4203 #. Type: text
4204 #. Description
4205-#: ../ubiquity.templates:289001
4206+#: ../ubiquity.templates:290001
4207 msgid "LVM and encryption selected"
4208 msgstr "LVM en enkripsie gekeur"
4209
4210 #. Type: text
4211 #. Description
4212-#: ../ubiquity.templates:290001
4213+#: ../ubiquity.templates:291001
4214 msgid "ZFS selected"
4215 msgstr "ZFS gekeur"
4216
4217 #. Type: text
4218 #. Description
4219-#: ../ubiquity.templates:291001
4220+#: ../ubiquity.templates:292001
4221+#, fuzzy
4222+#| msgid "LVM and encryption selected"
4223+msgid "ZFS and encryption selected"
4224+msgstr "LVM en enkripsie gekeur"
4225+
4226+#. Type: text
4227+#. Description
4228+#: ../ubiquity.templates:293001
4229 msgid "Confirm the security key:"
4230 msgstr "Bevestig die sekuriteitsleutel:"
4231
4232 #. Type: text
4233 #. Description
4234-#: ../ubiquity.templates:292001
4235+#: ../ubiquity.templates:294001
4236 msgid "Choose a security key:"
4237 msgstr "Kies 'n sekuriteitsleutel"
4238
4239 #. Type: text
4240 #. Description
4241-#: ../ubiquity.templates:293001
4242+#: ../ubiquity.templates:295001
4243 msgid ""
4244 "Disk encryption protects your files in case you lose your computer. It "
4245 "requires you to enter a security key each time the computer starts up."
4246@@ -2076,13 +2093,13 @@ msgstr ""
4247
4248 #. Type: text
4249 #. Description
4250-#: ../ubiquity.templates:294001
4251+#: ../ubiquity.templates:296001
4252 msgid "Any files outside of ${RELEASE} will not be encrypted."
4253 msgstr "Enige lêers buite ${RELEASE} sal nie geënkripteer word nie."
4254
4255 #. Type: text
4256 #. Description
4257-#: ../ubiquity.templates:295001
4258+#: ../ubiquity.templates:297001
4259 msgid ""
4260 "<span foreground=\"darkred\">Warning:</span> If you lose this security key, "
4261 "all data will be lost. If you need to, write down your key and keep it in a "
4262@@ -2094,61 +2111,61 @@ msgstr ""
4263
4264 #. Type: text
4265 #. Description
4266-#: ../ubiquity.templates:296001
4267+#: ../ubiquity.templates:298001
4268 msgid "For more security:"
4269 msgstr "Vir meer sekuriteit:"
4270
4271 #. Type: text
4272 #. Description
4273-#: ../ubiquity.templates:297001
4274+#: ../ubiquity.templates:299001
4275 msgid "Overwrite empty disk space"
4276 msgstr "Oorskryf leë skyfspasie"
4277
4278 #. Type: text
4279 #. Description
4280-#: ../ubiquity.templates:298001
4281+#: ../ubiquity.templates:300001
4282 msgid "The installation may take much longer."
4283 msgstr "Die installasie kan heelwat langer neem"
4284
4285 #. Type: text
4286 #. description
4287-#: ../ubiquity.templates:299001
4288+#: ../ubiquity.templates:301001
4289 msgid "LVM..."
4290 msgstr "LVM..."
4291
4292 #. Type: text
4293 #. Description
4294-#: ../ubiquity.templates:300001
4295+#: ../ubiquity.templates:302001
4296 msgid "Volume groups:"
4297 msgstr "Volumegroepe:"
4298
4299 #. Type: text
4300 #. Description
4301-#: ../ubiquity.templates:301001
4302+#: ../ubiquity.templates:303001
4303 msgid "Encryption Options"
4304 msgstr "Enkripsiekeuses"
4305
4306 #. Type: text
4307 #. Description
4308-#: ../ubiquity.templates:302001
4309+#: ../ubiquity.templates:304001
4310 msgid "Physical volumes:"
4311 msgstr "Fisiese volumes:"
4312
4313 #. Type: text
4314 #. Description
4315-#: ../ubiquity.templates:304001
4316+#: ../ubiquity.templates:306001
4317 msgid "Encrypt this partition (LUKS)"
4318 msgstr "Enkripteer hierdie partisie (LUKS)"
4319
4320 #. Type: text
4321 #. Description
4322-#: ../ubiquity.templates:305001
4323+#: ../ubiquity.templates:307001
4324 msgid "MB"
4325 msgstr "MG"
4326
4327 #. Type: text
4328 #. Description
4329-#: ../ubiquity.templates:306001
4330+#: ../ubiquity.templates:308001
4331 msgid ""
4332 "Logical Volume Management (LVM) lets ${RELEASE} treat multiple physical "
4333 "volumes as a single volume."
4334@@ -2158,25 +2175,25 @@ msgstr ""
4335
4336 #. Type: text
4337 #. Description
4338-#: ../ubiquity.templates:307001
4339+#: ../ubiquity.templates:309001
4340 msgid "Logical Volume Management"
4341 msgstr "Logiese volumebestuur (LVM)"
4342
4343 #. Type: text
4344 #. Description
4345-#: ../ubiquity.templates:308001
4346+#: ../ubiquity.templates:310001
4347 msgid "Encryption options..."
4348 msgstr "Enkripsiekeuses..."
4349
4350 #. Type: text
4351 #. Description
4352-#: ../ubiquity.templates:309001
4353+#: ../ubiquity.templates:311001
4354 msgid "UEFI Secure Boot"
4355 msgstr "UEFI Sekuur aanskakel"
4356
4357 #. Type: text
4358 #. Description
4359-#: ../ubiquity.templates:310001
4360+#: ../ubiquity.templates:312001
4361 msgid ""
4362 "You have chosen to enable third-party software as part of your install, "
4363 "which for this system includes hardware drivers for graphics and/or wi-fi "
4364@@ -2191,7 +2208,7 @@ msgstr ""
4365
4366 #. Type: text
4367 #. Description
4368-#: ../ubiquity.templates:310001
4369+#: ../ubiquity.templates:312001
4370 msgid ""
4371 "After installation completes, Ubuntu will assist you in configuring UEFI "
4372 "Secure Boot. To ensure that this change is being made by you as an "
4373@@ -2206,7 +2223,7 @@ msgstr ""
4374
4375 #. Type: text
4376 #. Description
4377-#: ../ubiquity.templates:310001
4378+#: ../ubiquity.templates:312001
4379 msgid ""
4380 "<span foreground=\"darkred\">Warning</span>: If you choose not to install "
4381 "these drivers, or if you proceed but do not confirm the password upon "
4382@@ -2220,17 +2237,115 @@ msgstr ""
4383
4384 #. Type: password
4385 #. Description
4386-#: ../ubiquity.templates:311001
4387+#: ../ubiquity.templates:313001
4388 msgid "SecureBoot key for MokPW"
4389 msgstr "SecureBoot sleutel vir MokPW"
4390
4391 #. Type: text
4392 #. Description
4393-#: ../ubiquity.templates:312001
4394+#: ../ubiquity.templates:314001
4395 #, no-c-format
4396 msgid "partition #%(partid)s as %(parttype)s used for %(partusage)s"
4397 msgstr "partisie #%(partid)s as %(parttype)s gebruik vir %(partusage)s"
4398
4399+#. Type: password
4400+#. Description
4401+#: ../ubiquity.templates:315001
4402+msgid "Key to secure the keystore on ZFS installations"
4403+msgstr ""
4404+
4405+#. Type: text
4406+#. Description
4407+#: ../ubiquity.templates:316001
4408+msgid "Authenticate against a directory"
4409+msgstr ""
4410+
4411+#. Type: text
4412+#. Description
4413+#: ../ubiquity.templates:317001
4414+msgid "Active Directory domain name"
4415+msgstr ""
4416+
4417+#. Type: text
4418+#. Description
4419+#: ../ubiquity.templates:318001
4420+msgid "Administrator to join the domain"
4421+msgstr ""
4422+
4423+#. Type: password
4424+#. Description
4425+#: ../ubiquity.templates:319001
4426+msgid "Administrator password to join the domain"
4427+msgstr ""
4428+
4429+#. Type: text
4430+#. Description
4431+#: ../ubiquity.templates:320001
4432+msgid "Use Active Directory"
4433+msgstr ""
4434+
4435+#. Type: text
4436+#. Description
4437+#: ../ubiquity.templates:321001
4438+#, fuzzy
4439+#| msgid "You will choose a security key in the next step."
4440+msgid " You'll enter domain and other details in the next step."
4441+msgstr "Jy sal in die volgende stap 'n beveiligingsleutel kies."
4442+
4443+#. Type: text
4444+#. Description
4445+#: ../ubiquity.templates:322001
4446+msgid "Domain:"
4447+msgstr ""
4448+
4449+#. Type: text
4450+#. Description
4451+#: ../ubiquity.templates:323001
4452+msgid "You must enter a domain name"
4453+msgstr ""
4454+
4455+#. Type: text
4456+#. Description
4457+#: ../ubiquity.templates:324001
4458+#, fuzzy
4459+#| msgid "Connecting..."
4460+msgid "Test Connection"
4461+msgstr "Verbind tans..."
4462+
4463+#. Type: text
4464+#. Description
4465+#: ../ubiquity.templates:325001
4466+msgid "Domain Administrator:"
4467+msgstr ""
4468+
4469+#. Type: text
4470+#. Description
4471+#: ../ubiquity.templates:326001
4472+#, fuzzy
4473+#| msgid "Your computer's name:"
4474+msgid "You must enter a user name"
4475+msgstr "Jou rekenaar se naam:"
4476+
4477+#. Type: text
4478+#. Description
4479+#: ../ubiquity.templates:328001
4480+msgid "Configure Active Directory"
4481+msgstr ""
4482+
4483+#. Type: text
4484+#. Description
4485+#: ../ubiquity.templates:329001
4486+msgid "That name already exists on the network."
4487+msgstr ""
4488+
4489+#. Type: text
4490+#. Description
4491+#: ../ubiquity.templates:330001
4492+#, fuzzy
4493+#| msgid "Failed to unmount partitions"
4494+msgid "Failed to connect to domain."
4495+msgstr "Ontheg van partisies het gefaal"
4496+
4497 #. Type: title
4498 #. Description
4499 #. Info message displayed when running in OEM mode
4500@@ -2295,6 +2410,27 @@ msgstr ""
4501 msgid "Removing packages"
4502 msgstr "Verwyder pakkette"
4503
4504+#~ msgid "Error restoring installed applications"
4505+#~ msgstr "Fout met herstel van geïnstalleerde toepassings"
4506+
4507+#~ msgid ""
4508+#~ "An error occurred while restoring previously-installed applications. The "
4509+#~ "installation will continue, but you may have to manually reinstall some "
4510+#~ "applications after the computer reboots."
4511+#~ msgstr ""
4512+#~ "Fout het voorgekom tydens die herstel van voorheen geïnstalleerde "
4513+#~ "toepassings. Die installasie sal voortgaan, maar jy sal moontlik sommige "
4514+#~ "toepassings weer individueel moet installeer na die rekenaar herlaai het."
4515+
4516+#~ msgid ""
4517+#~ "<span foreground=\"darkred\">Warning:</span> This will delete all your "
4518+#~ "files on all operating systems. This is experimental and may cause data "
4519+#~ "loss. Do not use on production systems."
4520+#~ msgstr ""
4521+#~ "<span foreground = \"darkred\">Waarskuwing:</span> Dit sal al die lêers "
4522+#~ "op alle bedryfstelsels verwyder. Hierdie is eksperimenteel en kan verlies "
4523+#~ "van data veroorsaak. Moet nie op produksiestelsels gebruik nie."
4524+
4525 #~ msgid ""
4526 #~ "Web browser, utilities, office software, KDE PIM suite plus additional "
4527 #~ "internet applications and media players."
4528diff --git a/debian/real-po/am.po b/debian/real-po/am.po
4529index e565350..2479750 100644
4530--- a/debian/real-po/am.po
4531+++ b/debian/real-po/am.po
4532@@ -6,16 +6,16 @@ msgid ""
4533 msgstr ""
4534 "Project-Id-Version: debian-installer\n"
4535 "Report-Msgid-Bugs-To: ubiquity@packages.debian.org\n"
4536-"POT-Creation-Date: 2020-04-08 09:24+0100\n"
4537+"POT-Creation-Date: 2020-10-01 17:47+0200\n"
4538 "PO-Revision-Date: 2019-11-21 05:24+0000\n"
4539 "Last-Translator: samson <Unknown>\n"
4540 "Language-Team: Amharic\n"
4541+"Language: \n"
4542 "MIME-Version: 1.0\n"
4543 "Content-Type: text/plain; charset=UTF-8\n"
4544 "Content-Transfer-Encoding: 8bit\n"
4545 "X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
4546 "X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
4547-"Language: \n"
4548
4549 #. Type: text
4550 #. Description
4551@@ -46,7 +46,7 @@ msgstr "ለመቀጠል እንደገና ያስጀምሩ"
4552 #. This is used as a window title.
4553 #. Type: text
4554 #. Description
4555-#: ../ubiquity.templates:7001 ../ubiquity.templates:184001
4556+#: ../ubiquity.templates:7001 ../ubiquity.templates:185001
4557 msgid "Install"
4558 msgstr "መግጠም"
4559
4560@@ -203,8 +203,7 @@ msgstr ""
4561 #. Type: text
4562 #. Description
4563 #: ../ubiquity.templates:29001
4564-msgid ""
4565-"May only contain lower-case letters, digits, hyphens, and underscores."
4566+msgid "May only contain lower-case letters, digits, hyphens, and underscores."
4567 msgstr ""
4568
4569 #. Type: text
4570@@ -550,7 +549,7 @@ msgstr "ማጥፋት"
4571 #. An action, displayed on a button or as a menu item.
4572 #. Type: text
4573 #. Description
4574-#: ../ubiquity.templates:84001 ../ubiquity.templates:303001
4575+#: ../ubiquity.templates:84001 ../ubiquity.templates:305001
4576 msgid "Revert"
4577 msgstr "ወደ ነበረበት መመለስ"
4578
4579@@ -915,78 +914,86 @@ msgstr "ቡትሎደርን ማዋቀር"
4580 #. Type: text
4581 #. Description
4582 #: ../ubiquity.templates:134001
4583+#, fuzzy
4584+#| msgid "Configuring time zone..."
4585+msgid "Configuring Active Directory..."
4586+msgstr "ቀን እና ሰዓትን ማዋቀር"
4587+
4588+#. Type: text
4589+#. Description
4590+#: ../ubiquity.templates:135001
4591 msgid "Saving installed packages..."
4592 msgstr "የተገጠሙትን ጥቅሎች በማስቀመጥ ላይ..."
4593
4594 #. Type: text
4595 #. Description
4596-#: ../ubiquity.templates:135001
4597+#: ../ubiquity.templates:136001
4598 msgid "Restoring previously installed packages..."
4599 msgstr ""
4600
4601 #. Type: text
4602 #. Description
4603-#: ../ubiquity.templates:136001
4604+#: ../ubiquity.templates:137001
4605 msgid "Installing additional packages..."
4606 msgstr "ተጨማሪ ጥቅሎችን መግጠም"
4607
4608 #. Type: text
4609 #. Description
4610-#: ../ubiquity.templates:137001
4611+#: ../ubiquity.templates:138001
4612 msgid "Checking for packages to install..."
4613 msgstr "ለመገጠም ጥቅሎቹን መመርመር"
4614
4615 #. Type: text
4616 #. Description
4617-#: ../ubiquity.templates:138001
4618+#: ../ubiquity.templates:139001
4619 msgid "Removing extra packages..."
4620 msgstr "ተጨማሪ ጥቅሎችን ማስወገድ"
4621
4622 #. Type: text
4623 #. Description
4624-#: ../ubiquity.templates:139001
4625+#: ../ubiquity.templates:140001
4626 msgid "Checking for packages to remove..."
4627 msgstr "ለማስወገድ ጥቅሎችን በመመርመር ላይ"
4628
4629 #. Type: text
4630 #. Description
4631-#: ../ubiquity.templates:140001
4632+#: ../ubiquity.templates:141001
4633 msgid "Downloading packages (${TIME} remaining)..."
4634 msgstr "የቀሩ ጥቅሎችን በማውረድ ላይ... የቀረው ጊዜ(${TIME} ..."
4635
4636 #. Type: text
4637 #. Description
4638-#: ../ubiquity.templates:141001
4639+#: ../ubiquity.templates:142001
4640 msgid "Downloading package lists..."
4641 msgstr "በማውረድ ላይ የጥቅሎችን ዝርዝር..."
4642
4643 #. Type: text
4644 #. Description
4645-#: ../ubiquity.templates:142001
4646+#: ../ubiquity.templates:143001
4647 msgid "Downloading package lists (${TIME} remaining)..."
4648 msgstr "የጥቅሎችን ዝርዝር በማውረድ ላይ... የቀረው ጊዜ(${TIME} ..."
4649
4650 #. Type: error
4651 #. Description
4652-#: ../ubiquity.templates:144001
4653+#: ../ubiquity.templates:145001
4654 msgid "Error installing ${PACKAGE}"
4655 msgstr "የመትከል ስህተት ${PACKAGE}"
4656
4657 #. Type: error
4658 #. Description
4659-#: ../ubiquity.templates:145001
4660+#: ../ubiquity.templates:146001
4661 msgid "Error removing ${PACKAGE}"
4662 msgstr "ስህተት በማስወገድ ላይ ${PACKAGE}"
4663
4664 #. Type: error
4665 #. Description
4666-#: ../ubiquity.templates:146001
4667+#: ../ubiquity.templates:147001
4668 msgid "Error while installing packages"
4669 msgstr "ስህተት ጥቅሎችን በመግጠም ላይ"
4670
4671 #. Type: error
4672 #. Description
4673-#: ../ubiquity.templates:146001
4674+#: ../ubiquity.templates:147001
4675 msgid "An error occurred while installing packages:"
4676 msgstr "ስህተት ተፈጥሯል ጥቅሎችን በመግጠም ላይ"
4677
4678@@ -994,7 +1001,7 @@ msgstr "ስህተት ተፈጥሯል ጥቅሎችን በመግጠም ላይ"
4679 #. Description
4680 #. Type: error
4681 #. Description
4682-#: ../ubiquity.templates:146001 ../ubiquity.templates:147001
4683+#: ../ubiquity.templates:147001 ../ubiquity.templates:148001
4684 msgid "The following packages are in a broken state:"
4685 msgstr "እነዚህ ጥቅሎች ሰባራ ናቸው"
4686
4687@@ -1002,38 +1009,38 @@ msgstr "እነዚህ ጥቅሎች ሰባራ ናቸው"
4688 #. Description
4689 #. Type: error
4690 #. Description
4691-#: ../ubiquity.templates:146001 ../ubiquity.templates:147001
4692+#: ../ubiquity.templates:147001 ../ubiquity.templates:148001
4693 msgid ""
4694 "This may be due to using an old installer image, or it may be due to a bug "
4695-"in some of the packages listed above. More details may be found in "
4696-"/var/log/syslog. The installer will try to continue anyway, but may fail at "
4697-"a later point, and will not be able to install or remove other packages "
4698-"(possibly including itself) from the installed system. You should first look "
4699-"for newer versions of your installer image, or failing that report the "
4700-"problem to your distributor."
4701+"in some of the packages listed above. More details may be found in /var/log/"
4702+"syslog. The installer will try to continue anyway, but may fail at a later "
4703+"point, and will not be able to install or remove other packages (possibly "
4704+"including itself) from the installed system. You should first look for newer "
4705+"versions of your installer image, or failing that report the problem to your "
4706+"distributor."
4707 msgstr ""
4708
4709 #. Type: error
4710 #. Description
4711-#: ../ubiquity.templates:147001
4712+#: ../ubiquity.templates:148001
4713 msgid "Error while removing packages"
4714 msgstr "ስህተት ጥቅሎችን በማስወገድ ላይ"
4715
4716 #. Type: error
4717 #. Description
4718-#: ../ubiquity.templates:147001
4719+#: ../ubiquity.templates:148001
4720 msgid "An error occurred while removing packages:"
4721 msgstr "ስህተት ተፈጥሯል ጥቅሎችን በማስወገድ ላይ"
4722
4723 #. Type: error
4724 #. Description
4725-#: ../ubiquity.templates:148001
4726+#: ../ubiquity.templates:149001
4727 msgid "Error copying network configuration"
4728 msgstr ""
4729
4730 #. Type: error
4731 #. Description
4732-#: ../ubiquity.templates:148001
4733+#: ../ubiquity.templates:149001
4734 msgid ""
4735 "An error occurred while copying the network settings. The installation will "
4736 "continue, but the network configuration will have to be set up again in the "
4737@@ -1042,13 +1049,13 @@ msgstr ""
4738
4739 #. Type: error
4740 #. Description
4741-#: ../ubiquity.templates:149001
4742+#: ../ubiquity.templates:150001
4743 msgid "Error copying bluetooth configuration"
4744 msgstr ""
4745
4746 #. Type: error
4747 #. Description
4748-#: ../ubiquity.templates:149001
4749+#: ../ubiquity.templates:150001
4750 msgid ""
4751 "An error occurred while copying the bluetooth settings. The installation "
4752 "will continue, but the bluetooth configuration will have to be set up again "
4753@@ -1057,46 +1064,45 @@ msgstr ""
4754
4755 #. Type: error
4756 #. Description
4757-#: ../ubiquity.templates:150001
4758-msgid "Error restoring installed applications"
4759-msgstr "ስህተት የተገጠሙ መተግበሪያዎችን በመመለስ ላይ"
4760+#: ../ubiquity.templates:151001
4761+msgid "Error configuring connection to Active Directory"
4762+msgstr ""
4763
4764 #. Type: error
4765 #. Description
4766-#: ../ubiquity.templates:150001
4767+#: ../ubiquity.templates:151001
4768 msgid ""
4769-"An error occurred while restoring previously-installed applications. The "
4770-"installation will continue, but you may have to manually reinstall some "
4771-"applications after the computer reboots."
4772+"Sorry, Active Directory can't be set up at the moment. Once your system is "
4773+"up and running, visit help.ubuntu.com/activedirectory for help."
4774 msgstr ""
4775
4776 #. Type: text
4777 #. Description
4778-#: ../ubiquity.templates:154001
4779+#: ../ubiquity.templates:155001
4780 msgid "Calculating files to skip copying..."
4781 msgstr "በማስላት ላይ የሚዘለሉ ፋይሎችን ለመገልበጥ..."
4782
4783 #. Type: title
4784 #. Description
4785-#: ../ubiquity.templates:155001
4786+#: ../ubiquity.templates:156001
4787 msgid "Installing language packs"
4788 msgstr "የቋንቋ ጥቅሎችን በመትከል ላይ"
4789
4790 #. Type: text
4791 #. Description
4792-#: ../ubiquity.templates:156001
4793+#: ../ubiquity.templates:157001
4794 msgid "Downloading language packs (${TIME} remaining)..."
4795 msgstr "የቋንቋ ጥቅሎችን በማውረድ ላይ... የቀረው ጊዜ(${TIME} ..."
4796
4797 #. Type: boolean
4798 #. Description
4799-#: ../ubiquity.templates:165001
4800+#: ../ubiquity.templates:166001
4801 msgid "Failed to unmount partitions"
4802 msgstr "ክፋዮችን ማውረድ አልተቻለም"
4803
4804 #. Type: boolean
4805 #. Description
4806-#: ../ubiquity.templates:165001
4807+#: ../ubiquity.templates:166001
4808 msgid ""
4809 "The installer needs to commit changes to partition tables, but cannot do so "
4810 "because partitions on the following mount points could not be unmounted:"
4811@@ -1104,26 +1110,25 @@ msgstr ""
4812
4813 #. Type: boolean
4814 #. Description
4815-#: ../ubiquity.templates:165001
4816+#: ../ubiquity.templates:166001
4817 msgid "Please close any applications using these mount points."
4818 msgstr ""
4819
4820 #. Type: boolean
4821 #. Description
4822-#: ../ubiquity.templates:165001
4823-msgid ""
4824-"Would you like the installer to try to unmount these partitions again?"
4825+#: ../ubiquity.templates:166001
4826+msgid "Would you like the installer to try to unmount these partitions again?"
4827 msgstr ""
4828
4829 #. Type: boolean
4830 #. Description
4831-#: ../ubiquity.templates:171001
4832+#: ../ubiquity.templates:172001
4833 msgid "Do you want to return to the partitioner?"
4834 msgstr "ወደ መከፋፈያው መመልስ ይፈልጋሉ?"
4835
4836 #. Type: boolean
4837 #. Description
4838-#: ../ubiquity.templates:171001
4839+#: ../ubiquity.templates:172001
4840 msgid ""
4841 "Some of the partitions you created are too small. Please make the following "
4842 "partitions at least this large:"
4843@@ -1131,7 +1136,7 @@ msgstr ""
4844
4845 #. Type: boolean
4846 #. Description
4847-#: ../ubiquity.templates:171001
4848+#: ../ubiquity.templates:172001
4849 msgid ""
4850 "If you do not go back to the partitioner and increase the size of these "
4851 "partitions, the installation may fail."
4852@@ -1139,7 +1144,7 @@ msgstr ""
4853
4854 #. Type: text
4855 #. Description
4856-#: ../ubiquity.templates:173001
4857+#: ../ubiquity.templates:174001
4858 msgid "System Configuration"
4859 msgstr "ሲስተሙን ማዋቀር"
4860
4861@@ -1147,25 +1152,25 @@ msgstr "ሲስተሙን ማዋቀር"
4862 #. Description
4863 #. Type: text
4864 #. Description
4865-#: ../ubiquity.templates:174001 ../ubiquity.templates:257001
4866+#: ../ubiquity.templates:175001 ../ubiquity.templates:258001
4867 msgid "Welcome"
4868 msgstr "እንኳን ደህና መጡ"
4869
4870 #. Type: text
4871 #. Description
4872-#: ../ubiquity.templates:175001
4873+#: ../ubiquity.templates:176001
4874 msgid "Network configuration"
4875 msgstr "ኔትዎርክን ማዋቀር"
4876
4877 #. Type: text
4878 #. Description
4879-#: ../ubiquity.templates:176001
4880+#: ../ubiquity.templates:177001
4881 msgid "Software selection"
4882 msgstr "የሶፍትዌር ምርጫ"
4883
4884 #. Type: text
4885 #. Description
4886-#: ../ubiquity.templates:177001
4887+#: ../ubiquity.templates:178001
4888 msgid "Language"
4889 msgstr "ቋንቋ"
4890
4891@@ -1173,111 +1178,111 @@ msgstr "ቋንቋ"
4892 #. Description
4893 #. Type: text
4894 #. Description
4895-#: ../ubiquity.templates:178001 ../ubiquity.templates:202001
4896+#: ../ubiquity.templates:179001 ../ubiquity.templates:203001
4897 msgid "Wireless"
4898 msgstr "ሽቦ አልባ"
4899
4900 #. Type: text
4901 #. Description
4902-#: ../ubiquity.templates:179001
4903+#: ../ubiquity.templates:180001
4904 msgid "Software"
4905 msgstr ""
4906
4907 #. Type: text
4908 #. Description
4909-#: ../ubiquity.templates:180001
4910+#: ../ubiquity.templates:181001
4911 msgid "Timezone"
4912 msgstr "የሰአት ክልል"
4913
4914 #. Type: text
4915 #. Description
4916-#: ../ubiquity.templates:181001
4917+#: ../ubiquity.templates:182001
4918 msgid "Keyboard"
4919 msgstr "የፊደል ገበታ"
4920
4921 #. Type: text
4922 #. Description
4923-#: ../ubiquity.templates:182001
4924+#: ../ubiquity.templates:183001
4925 msgid "Disk Setup"
4926 msgstr "ዲስክ ማሰናዳት"
4927
4928 #. Type: text
4929 #. Description
4930-#: ../ubiquity.templates:183001
4931+#: ../ubiquity.templates:184001
4932 msgid "User Info"
4933 msgstr "የተጠቃሚ መረጃ"
4934
4935 #. Type: text
4936 #. Description
4937-#: ../ubiquity.templates:185001
4938+#: ../ubiquity.templates:186001
4939 msgid "installation process"
4940 msgstr "የአገጣጠም ሂደት"
4941
4942 #. Type: text
4943 #. Description
4944-#: ../ubiquity.templates:187001
4945+#: ../ubiquity.templates:188001
4946 msgid "Checking for installer updates"
4947 msgstr "በመመርመር ላይ ማሻሻያዎችን ለመግጠም"
4948
4949 #. Type: text
4950 #. Description
4951-#: ../ubiquity.templates:188001
4952+#: ../ubiquity.templates:189001
4953 msgid "Reading package information"
4954 msgstr "የጥቅል መረጃን በማንበብ ላይ"
4955
4956 #. Type: text
4957 #. Description
4958-#: ../ubiquity.templates:189001
4959+#: ../ubiquity.templates:190001
4960 msgid "Updating package information"
4961 msgstr "የጥቅል መረጃን በማሻሻል ላይ"
4962
4963 #. Type: text
4964 #. Description
4965-#: ../ubiquity.templates:190001
4966+#: ../ubiquity.templates:191001
4967 msgid "File ${INDEX} of ${TOTAL} at ${SPEED}/s"
4968 msgstr "ፋይል ${INDEX} ከ ${TOTAL} በ ${SPEED}/ሰ"
4969
4970 #. Type: text
4971 #. Description
4972-#: ../ubiquity.templates:191001
4973+#: ../ubiquity.templates:192001
4974 msgid "File ${INDEX} of ${TOTAL}"
4975 msgstr "ፋይል ${INDEX} ከ ${TOTAL}"
4976
4977 #. Type: text
4978 #. Description
4979-#: ../ubiquity.templates:192001
4980+#: ../ubiquity.templates:193001
4981 msgid "Installing update"
4982 msgstr "ማሻሻያውን በመግጠም ላይ"
4983
4984 #. Type: text
4985 #. Description
4986-#: ../ubiquity.templates:193001
4987+#: ../ubiquity.templates:194001
4988 msgid "Error updating installer"
4989 msgstr "ማሻሻያውን በመግጠም ላይ ስህተት ተፈጥሯል"
4990
4991 #. Type: text
4992 #. Description
4993-#: ../ubiquity.templates:193001
4994+#: ../ubiquity.templates:194001
4995 msgid "The installer encountered an error while trying to update itself:"
4996 msgstr "መግጠሚያው ችግር ገጥሞታል ራሱን ማሻሻል ሲሞክር:"
4997
4998 #. Type: text
4999 #. Description
5000 #. Translated acronym for Universal Serial Bus.
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches