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