Annotation of /trunk/grub/patches/grub-2.12-confd.patch
Parent Directory | Revision Log
Revision 3803 -
(hide annotations)
(download)
Thu Dec 28 10:55:28 2023 UTC (5 months, 4 weeks ago) by niro
File size: 56795 byte(s)
Thu Dec 28 10:55:28 2023 UTC (5 months, 4 weeks ago) by niro
File size: 56795 byte(s)
-rediffed against 2.12
1 | niro | 3803 | diff -Naur grub-2.12/docs/grub.info-1 grub-2.12-confd/docs/grub.info-1 |
2 | --- grub-2.12/docs/grub.info-1 2023-12-20 17:03:44.000000000 +0100 | ||
3 | +++ grub-2.12-confd/docs/grub.info-1 2023-12-28 11:52:58.222190943 +0100 | ||
4 | @@ -1204,7 +1204,7 @@ | ||
5 | Booting::, and *note Shell-like scripting::), and to disable any system | ||
6 | provided by their distribution to automatically run 'grub-mkconfig'. | ||
7 | |||
8 | - The file '/etc/default/grub' controls the operation of | ||
9 | + The file '/etc/conf.d/grub' controls the operation of | ||
10 | 'grub-mkconfig'. It is sourced by a shell script, and so must be valid | ||
11 | POSIX shell input; normally, it will just be a sequence of 'KEY=value' | ||
12 | lines, but if the value contains spaces or other special characters then | ||
13 | @@ -1212,7 +1212,7 @@ | ||
14 | |||
15 | GRUB_TERMINAL_INPUT="console serial" | ||
16 | |||
17 | - Valid keys in '/etc/default/grub' are as follows: | ||
18 | + Valid keys in '/etc/conf.d/grub' are as follows: | ||
19 | |||
20 | 'GRUB_DEFAULT' | ||
21 | The default menu entry. This may be a number, in which case it | ||
22 | @@ -1841,7 +1841,7 @@ | ||
23 | |||
24 | 'GRUB_DISABLE_OS_PROBER=true' | ||
25 | |||
26 | - in /etc/default/grub | ||
27 | + in /etc/conf.d/grub | ||
28 | |||
29 | Then write a grub.cfg (/mnt/boot/grub/grub.cfg): | ||
30 | |||
31 | diff -Naur grub-2.12/docs/grub.texi grub-2.12-confd/docs/grub.texi | ||
32 | --- grub-2.12/docs/grub.texi 2023-12-05 15:25:33.000000000 +0100 | ||
33 | +++ grub-2.12-confd/docs/grub.texi 2023-12-28 11:52:53.575454416 +0100 | ||
34 | @@ -1284,7 +1284,7 @@ | ||
35 | (@pxref{Booting}, and @ref{Shell-like scripting}), and to disable any system | ||
36 | provided by their distribution to automatically run @command{grub-mkconfig}. | ||
37 | |||
38 | -The file @file{/etc/default/grub} controls the operation of | ||
39 | +The file @file{/etc/conf.d/grub} controls the operation of | ||
40 | @command{grub-mkconfig}. It is sourced by a shell script, and so must be | ||
41 | valid POSIX shell input; normally, it will just be a sequence of | ||
42 | @samp{KEY=value} lines, but if the value contains spaces or other special | ||
43 | @@ -1294,7 +1294,7 @@ | ||
44 | GRUB_TERMINAL_INPUT="console serial" | ||
45 | @end example | ||
46 | |||
47 | -Valid keys in @file{/etc/default/grub} are as follows: | ||
48 | +Valid keys in @file{/etc/conf.d/grub} are as follows: | ||
49 | |||
50 | @table @samp | ||
51 | @item GRUB_DEFAULT | ||
52 | @@ -1908,7 +1908,7 @@ | ||
53 | |||
54 | @code{GRUB_DISABLE_OS_PROBER=true} | ||
55 | |||
56 | -in /etc/default/grub | ||
57 | +in /etc/conf.d/grub | ||
58 | |||
59 | Then write a grub.cfg (/mnt/boot/grub/grub.cfg): | ||
60 | |||
61 | diff -Naur grub-2.12/po/ast.po grub-2.12-confd/po/ast.po | ||
62 | --- grub-2.12/po/ast.po 2023-12-20 17:09:18.000000000 +0100 | ||
63 | +++ grub-2.12-confd/po/ast.po 2023-12-28 11:51:44.424414775 +0100 | ||
64 | @@ -7428,13 +7428,13 @@ | ||
65 | #: util/grub-mkconfig.in:299 | ||
66 | msgid "" | ||
67 | "Syntax errors are detected in generated GRUB config file.\n" | ||
68 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
69 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
70 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
71 | "%s file attached." | ||
72 | msgstr "" | ||
73 | "Deteutáronse fallos de sintaxis nel ficheru xeneráu de la\n" | ||
74 | " configuración de GRUB. Asegúrate que nun heba fallos\n" | ||
75 | -" nos ficheros /etc/default/grub y /etc/grub.d/*, sinón\n" | ||
76 | +" nos ficheros /etc/conf.d/grub y /etc/grub.d/*, sinón\n" | ||
77 | " rellena un informe de fallos col ficheru de darréu axuntáu\n" | ||
78 | "%s ." | ||
79 | |||
80 | @@ -7511,8 +7511,8 @@ | ||
81 | msgstr "Afita la entrada predeterminada del menú d'arranque de GRUB." | ||
82 | |||
83 | #: util/grub-set-default.in:49 | ||
84 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
85 | -msgstr "Esto rique l'axuste GRUB_DEFAULT=saved en %s/default/grub.\\n" | ||
86 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
87 | +msgstr "Esto rique l'axuste GRUB_DEFAULT=saved en %s/conf.d/grub.\\n" | ||
88 | |||
89 | #: util/grub-set-default.in:56 | ||
90 | msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier." | ||
91 | diff -Naur grub-2.12/po/ca.po grub-2.12-confd/po/ca.po | ||
92 | --- grub-2.12/po/ca.po 2023-12-20 17:09:18.000000000 +0100 | ||
93 | +++ grub-2.12-confd/po/ca.po 2023-12-28 11:51:44.427748158 +0100 | ||
94 | @@ -7474,13 +7474,13 @@ | ||
95 | #: util/grub-mkconfig.in:299 | ||
96 | msgid "" | ||
97 | "Syntax errors are detected in generated GRUB config file.\n" | ||
98 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
99 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
100 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
101 | "%s file attached." | ||
102 | msgstr "" | ||
103 | "S'han detectat errors de sintaxi al fitxer de configuració del GRUB " | ||
104 | "generat.\n" | ||
105 | -"Assegureu-vos que no hi ha errors a /etc/default/grub o als fitxers\n" | ||
106 | +"Assegureu-vos que no hi ha errors a /etc/conf.d/grub o als fitxers\n" | ||
107 | " /etc/grub.d/* o bé envieu un informe d'error adjuntant el fitxer %s " | ||
108 | |||
109 | #: util/grub-mkconfig.in:315 | ||
110 | @@ -7553,8 +7553,8 @@ | ||
111 | msgstr "Estableix l'entrada del menú d'arrencada per defecte del GRUB." | ||
112 | |||
113 | #: util/grub-set-default.in:49 | ||
114 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
115 | -msgstr "Necessita configurar GRUB_DEFAULT=saved a %s/default/grub.\\n" | ||
116 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
117 | +msgstr "Necessita configurar GRUB_DEFAULT=saved a %s/conf.d/grub.\\n" | ||
118 | |||
119 | #: util/grub-set-default.in:56 | ||
120 | msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier." | ||
121 | diff -Naur grub-2.12/po/da.po grub-2.12-confd/po/da.po | ||
122 | --- grub-2.12/po/da.po 2023-12-20 17:09:18.000000000 +0100 | ||
123 | +++ grub-2.12-confd/po/da.po 2023-12-28 11:51:44.431081542 +0100 | ||
124 | @@ -7439,13 +7439,13 @@ | ||
125 | #: util/grub-mkconfig.in:299 | ||
126 | msgid "" | ||
127 | "Syntax errors are detected in generated GRUB config file.\n" | ||
128 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
129 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
130 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
131 | "%s file attached." | ||
132 | msgstr "" | ||
133 | "Der blev fundet syntaksfejl i den genererede GRUB-\n" | ||
134 | "konfigurationsfil. Sikr dig at der ikke er nogen fejl\n" | ||
135 | -"i filerne /etc/default/grub eller /etc/grub.d/*, eller\n" | ||
136 | +"i filerne /etc/conf.d/grub eller /etc/grub.d/*, eller\n" | ||
137 | "indsend venligst en fejlrapport med filen %s vedhæftet." | ||
138 | |||
139 | #: util/grub-mkconfig.in:315 | ||
140 | @@ -7514,8 +7514,8 @@ | ||
141 | msgstr "Sæt standardmenuindgangen for opstart i GRUB." | ||
142 | |||
143 | #: util/grub-set-default.in:49 | ||
144 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
145 | -msgstr "Dette kræver at GRUB_DEFAULT=saved angives i %s/default/grub.\\n" | ||
146 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
147 | +msgstr "Dette kræver at GRUB_DEFAULT=saved angives i %s/conf.d/grub.\\n" | ||
148 | |||
149 | #: util/grub-set-default.in:56 | ||
150 | msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier." | ||
151 | diff -Naur grub-2.12/po/de_CH.po grub-2.12-confd/po/de_CH.po | ||
152 | --- grub-2.12/po/de_CH.po 2023-12-20 17:09:18.000000000 +0100 | ||
153 | +++ grub-2.12-confd/po/de_CH.po 2023-12-28 11:51:44.431081542 +0100 | ||
154 | @@ -7433,12 +7433,12 @@ | ||
155 | #: util/grub-mkconfig.in:299 | ||
156 | msgid "" | ||
157 | "Syntax errors are detected in generated GRUB config file.\n" | ||
158 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
159 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
160 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
161 | "%s file attached." | ||
162 | msgstr "" | ||
163 | "In der erzeugten GRUB-Konfigurationsdatei wurden Syntaxfehler\n" | ||
164 | -"erkannt. Stellen Sie sicher, dass die Dateien etc/default/grub\n" | ||
165 | +"erkannt. Stellen Sie sicher, dass die Dateien etc/conf.d/grub\n" | ||
166 | "und /etc/grub.d/* fehlerfrei sind oder melden Sie einen Fehler\n" | ||
167 | "und hängen die Datei %s an." | ||
168 | |||
169 | @@ -7514,8 +7514,8 @@ | ||
170 | msgstr "Den Standardeintrag im GRUB-Bootmenü festlegen." | ||
171 | |||
172 | #: util/grub-set-default.in:49 | ||
173 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
174 | -msgstr "Dazu muss GRUB_DEFAULT=saved in %s/default/grub gesetzt werden.\\n" | ||
175 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
176 | +msgstr "Dazu muss GRUB_DEFAULT=saved in %s/conf.d/grub gesetzt werden.\\n" | ||
177 | |||
178 | #: util/grub-set-default.in:56 | ||
179 | msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier." | ||
180 | diff -Naur grub-2.12/po/de@hebrew.po grub-2.12-confd/po/de@hebrew.po | ||
181 | --- grub-2.12/po/de@hebrew.po 2023-12-20 17:09:18.000000000 +0100 | ||
182 | +++ grub-2.12-confd/po/de@hebrew.po 2023-12-28 11:51:44.434414925 +0100 | ||
183 | @@ -7426,7 +7426,7 @@ | ||
184 | #: util/grub-mkconfig.in:299 | ||
185 | msgid "" | ||
186 | "Syntax errors are detected in generated GRUB config file.\n" | ||
187 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
188 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
189 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
190 | "%s file attached." | ||
191 | msgstr "" | ||
192 | @@ -7507,7 +7507,7 @@ | ||
193 | msgstr "דענ שתאנדארדעִינתראג ִימ גרוּבּ-בּוֹוֹתמענֻ פֿעשתלעגענ." | ||
194 | |||
195 | #: util/grub-set-default.in:49 | ||
196 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
197 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
198 | msgstr "דאזוּ מוּשש גרוּבּ_דעפֿאוּלת=שאבֿעד ִינ %s/דעפֿאוּלת/גרוּבּ געשעתזת וערדענ.\\נ" | ||
199 | |||
200 | #: util/grub-set-default.in:56 | ||
201 | diff -Naur grub-2.12/po/de.po grub-2.12-confd/po/de.po | ||
202 | --- grub-2.12/po/de.po 2023-12-20 17:09:18.000000000 +0100 | ||
203 | +++ grub-2.12-confd/po/de.po 2023-12-28 11:51:44.437748308 +0100 | ||
204 | @@ -7432,12 +7432,12 @@ | ||
205 | #: util/grub-mkconfig.in:299 | ||
206 | msgid "" | ||
207 | "Syntax errors are detected in generated GRUB config file.\n" | ||
208 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
209 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
210 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
211 | "%s file attached." | ||
212 | msgstr "" | ||
213 | "In der erzeugten GRUB-Konfigurationsdatei wurden Syntaxfehler\n" | ||
214 | -"erkannt. Stellen Sie sicher, dass die Dateien etc/default/grub\n" | ||
215 | +"erkannt. Stellen Sie sicher, dass die Dateien etc/conf.d/grub\n" | ||
216 | "und /etc/grub.d/* fehlerfrei sind oder melden Sie einen Fehler\n" | ||
217 | "und hängen die Datei %s an." | ||
218 | |||
219 | @@ -7513,8 +7513,8 @@ | ||
220 | msgstr "Den Standardeintrag im GRUB-Bootmenü festlegen." | ||
221 | |||
222 | #: util/grub-set-default.in:49 | ||
223 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
224 | -msgstr "Dazu muss GRUB_DEFAULT=saved in %s/default/grub gesetzt werden.\\n" | ||
225 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
226 | +msgstr "Dazu muss GRUB_DEFAULT=saved in %s/conf.d/grub gesetzt werden.\\n" | ||
227 | |||
228 | #: util/grub-set-default.in:56 | ||
229 | msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier." | ||
230 | diff -Naur grub-2.12/po/en@arabic.po grub-2.12-confd/po/en@arabic.po | ||
231 | --- grub-2.12/po/en@arabic.po 2023-12-20 17:09:18.000000000 +0100 | ||
232 | +++ grub-2.12-confd/po/en@arabic.po 2023-12-28 11:51:44.437748308 +0100 | ||
233 | @@ -7336,7 +7336,7 @@ | ||
234 | #: util/grub-mkconfig.in:299 | ||
235 | msgid "" | ||
236 | "Syntax errors are detected in generated GRUB config file.\n" | ||
237 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
238 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
239 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
240 | "%s file attached." | ||
241 | msgstr "" | ||
242 | @@ -7414,7 +7414,7 @@ | ||
243 | msgstr "سعت تهع دعفاولت بووت معنو عنتري فور غروب." | ||
244 | |||
245 | #: util/grub-set-default.in:49 | ||
246 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
247 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
248 | msgstr "تهִيس رعقوִيرعس سعتتִينغ غروب_دعفاولت=ساوعد ִين %s/دعفاولت/غروب.\\ن" | ||
249 | |||
250 | #: util/grub-set-default.in:56 | ||
251 | diff -Naur grub-2.12/po/en@cyrillic.po grub-2.12-confd/po/en@cyrillic.po | ||
252 | --- grub-2.12/po/en@cyrillic.po 2023-12-20 17:09:18.000000000 +0100 | ||
253 | +++ grub-2.12-confd/po/en@cyrillic.po 2023-12-28 11:51:44.437748308 +0100 | ||
254 | @@ -7335,7 +7335,7 @@ | ||
255 | #: util/grub-mkconfig.in:299 | ||
256 | msgid "" | ||
257 | "Syntax errors are detected in generated GRUB config file.\n" | ||
258 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
259 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
260 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
261 | "%s file attached." | ||
262 | msgstr "" | ||
263 | @@ -7413,7 +7413,7 @@ | ||
264 | msgstr "Сет тхе дефаулт боот мену ентрѝ фор ГРУБ." | ||
265 | |||
266 | #: util/grub-set-default.in:49 | ||
267 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
268 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
269 | msgstr "Тхис реќуирес сеттинг ГРУБ_ДЕФАУЛТ=савед ин %s/дефаулт/груб.\\н" | ||
270 | |||
271 | #: util/grub-set-default.in:56 | ||
272 | diff -Naur grub-2.12/po/en@greek.po grub-2.12-confd/po/en@greek.po | ||
273 | --- grub-2.12/po/en@greek.po 2023-12-20 17:09:18.000000000 +0100 | ||
274 | +++ grub-2.12-confd/po/en@greek.po 2023-12-28 11:51:44.441081691 +0100 | ||
275 | @@ -7335,7 +7335,7 @@ | ||
276 | #: util/grub-mkconfig.in:299 | ||
277 | msgid "" | ||
278 | "Syntax errors are detected in generated GRUB config file.\n" | ||
279 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
280 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
281 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
282 | "%s file attached." | ||
283 | msgstr "" | ||
284 | @@ -7413,7 +7413,7 @@ | ||
285 | msgstr "Σετ τχε δεφαυλτ ϭοοτ μενυ εντρϋ φορ ΓΡΥϬ." | ||
286 | |||
287 | #: util/grub-set-default.in:49 | ||
288 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
289 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
290 | msgstr "Τχισ ρεϗυιρεσ σεττινγ ΓΡΥϬ_ΔΕΦΑΥΛΤ=σαβεδ ιν %s/δεφαυλτ/γρυϭ.\\ν" | ||
291 | |||
292 | #: util/grub-set-default.in:56 | ||
293 | diff -Naur grub-2.12/po/en@hebrew.po grub-2.12-confd/po/en@hebrew.po | ||
294 | --- grub-2.12/po/en@hebrew.po 2023-12-20 17:09:18.000000000 +0100 | ||
295 | +++ grub-2.12-confd/po/en@hebrew.po 2023-12-28 11:51:44.441081691 +0100 | ||
296 | @@ -7336,7 +7336,7 @@ | ||
297 | #: util/grub-mkconfig.in:299 | ||
298 | msgid "" | ||
299 | "Syntax errors are detected in generated GRUB config file.\n" | ||
300 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
301 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
302 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
303 | "%s file attached." | ||
304 | msgstr "" | ||
305 | @@ -7414,7 +7414,7 @@ | ||
306 | msgstr "שעת תהע דעפֿאוּלת בּוֹוֹת מענוּ ענתריִ פֿוֹר גרוּבּ." | ||
307 | |||
308 | #: util/grub-set-default.in:49 | ||
309 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
310 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
311 | msgstr "תהִיש רעקוִּירעש שעתתִינג גרוּבּ_דעפֿאוּלת=שאבֿעד ִינ %s/דעפֿאוּלת/גרוּבּ.\\נ" | ||
312 | |||
313 | #: util/grub-set-default.in:56 | ||
314 | diff -Naur grub-2.12/po/en@piglatin.po grub-2.12-confd/po/en@piglatin.po | ||
315 | --- grub-2.12/po/en@piglatin.po 2023-12-20 17:09:22.000000000 +0100 | ||
316 | +++ grub-2.12-confd/po/en@piglatin.po 2023-12-28 11:51:44.444415074 +0100 | ||
317 | @@ -7510,7 +7510,7 @@ | ||
318 | #: util/grub-mkconfig.in:299 | ||
319 | msgid "" | ||
320 | "Syntax errors are detected in generated GRUB config file.\n" | ||
321 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
322 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
323 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
324 | "%s file attached." | ||
325 | msgstr "" | ||
326 | @@ -7600,7 +7600,7 @@ | ||
327 | msgstr "etSay ethay efaultday ootbay enumay entryway orfay UBGRay." | ||
328 | |||
329 | #: util/grub-set-default.in:49 | ||
330 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
331 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
332 | msgstr "" | ||
333 | "isThay equiresray ettingsay UBGRay_EFAULTDay=avedsay inway %s/efaultday/" | ||
334 | "ubgray.\\n" | ||
335 | diff -Naur grub-2.12/po/en@quot.po grub-2.12-confd/po/en@quot.po | ||
336 | --- grub-2.12/po/en@quot.po 2023-12-20 17:09:21.000000000 +0100 | ||
337 | +++ grub-2.12-confd/po/en@quot.po 2023-12-28 11:51:44.444415074 +0100 | ||
338 | @@ -7357,12 +7357,12 @@ | ||
339 | #: util/grub-mkconfig.in:299 | ||
340 | msgid "" | ||
341 | "Syntax errors are detected in generated GRUB config file.\n" | ||
342 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
343 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
344 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
345 | "%s file attached." | ||
346 | msgstr "" | ||
347 | "Syntax errors are detected in generated GRUB config file.\n" | ||
348 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
349 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
350 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
351 | "%s file attached." | ||
352 | |||
353 | @@ -7435,8 +7435,8 @@ | ||
354 | msgstr "Set the default boot menu entry for GRUB." | ||
355 | |||
356 | #: util/grub-set-default.in:49 | ||
357 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
358 | -msgstr "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
359 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
360 | +msgstr "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
361 | |||
362 | #: util/grub-set-default.in:56 | ||
363 | msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier." | ||
364 | diff -Naur grub-2.12/po/eo.po grub-2.12-confd/po/eo.po | ||
365 | --- grub-2.12/po/eo.po 2023-12-20 17:09:18.000000000 +0100 | ||
366 | +++ grub-2.12-confd/po/eo.po 2023-12-28 11:51:44.444415074 +0100 | ||
367 | @@ -7304,7 +7304,7 @@ | ||
368 | #: util/grub-mkconfig.in:299 | ||
369 | msgid "" | ||
370 | "Syntax errors are detected in generated GRUB config file.\n" | ||
371 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
372 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
373 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
374 | "%s file attached." | ||
375 | msgstr "" | ||
376 | @@ -7366,7 +7366,7 @@ | ||
377 | msgstr "" | ||
378 | |||
379 | #: util/grub-set-default.in:49 | ||
380 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
381 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
382 | msgstr "" | ||
383 | |||
384 | #: util/grub-set-default.in:56 | ||
385 | diff -Naur grub-2.12/po/es.po grub-2.12-confd/po/es.po | ||
386 | --- grub-2.12/po/es.po 2023-12-20 17:09:18.000000000 +0100 | ||
387 | +++ grub-2.12-confd/po/es.po 2023-12-28 11:51:44.447748457 +0100 | ||
388 | @@ -7562,13 +7562,13 @@ | ||
389 | #: util/grub-mkconfig.in:299 | ||
390 | msgid "" | ||
391 | "Syntax errors are detected in generated GRUB config file.\n" | ||
392 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
393 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
394 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
395 | "%s file attached." | ||
396 | msgstr "" | ||
397 | "Se han detectado errores de sintaxis en el fichero de\n" | ||
398 | "configuración de GRUB generado.\n" | ||
399 | -"Asegurese de que no hay errores en /etc/default/grub\n" | ||
400 | +"Asegurese de que no hay errores en /etc/conf.d/grub\n" | ||
401 | "en los ficheros /etc/grub.d/* o, por favor, abra una\n" | ||
402 | "notificación de errores con el fichero %s adjunto." | ||
403 | |||
404 | @@ -7641,8 +7641,8 @@ | ||
405 | msgstr "Establece la entrada del menú predeterminada para GRUB." | ||
406 | |||
407 | #: util/grub-set-default.in:49 | ||
408 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
409 | -msgstr "Esto requere establecer GRUB_DEFAULT=saved en %s/default/grub.\\n" | ||
410 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
411 | +msgstr "Esto requere establecer GRUB_DEFAULT=saved en %s/conf.d/grub.\\n" | ||
412 | |||
413 | #: util/grub-set-default.in:56 | ||
414 | msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier." | ||
415 | diff -Naur grub-2.12/po/fi.po grub-2.12-confd/po/fi.po | ||
416 | --- grub-2.12/po/fi.po 2023-12-20 17:09:18.000000000 +0100 | ||
417 | +++ grub-2.12-confd/po/fi.po 2023-12-28 11:51:44.447748457 +0100 | ||
418 | @@ -7416,12 +7416,12 @@ | ||
419 | #: util/grub-mkconfig.in:299 | ||
420 | msgid "" | ||
421 | "Syntax errors are detected in generated GRUB config file.\n" | ||
422 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
423 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
424 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
425 | "%s file attached." | ||
426 | msgstr "" | ||
427 | "Syntaksivirheitä havaittu luodussa GRUB-määritystiedostossa.\n" | ||
428 | -"Varmista, että /etc/default/grub- ja /etc/grub.d/* -tiedostoi\n" | ||
429 | +"Varmista, että /etc/conf.d/grub- ja /etc/grub.d/* -tiedostoi\n" | ||
430 | "ei ole virheitä, tai tee vikailmoitus liittäen\n" | ||
431 | "%s mukaan ilmoitukseen." | ||
432 | |||
433 | @@ -7503,9 +7503,9 @@ | ||
434 | msgstr "Aseta GRUBin käynnistysvalikon oletuskohta." | ||
435 | |||
436 | #: util/grub-set-default.in:49 | ||
437 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
438 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
439 | msgstr "" | ||
440 | -"Tämä vaatii asetuksen GRUB_DEFAULT=saved tiedostoon %s/default/grub.\\n" | ||
441 | +"Tämä vaatii asetuksen GRUB_DEFAULT=saved tiedostoon %s/conf.d/grub.\\n" | ||
442 | |||
443 | #: util/grub-set-default.in:56 | ||
444 | msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier." | ||
445 | diff -Naur grub-2.12/po/fr.po grub-2.12-confd/po/fr.po | ||
446 | --- grub-2.12/po/fr.po 2023-12-20 17:09:18.000000000 +0100 | ||
447 | +++ grub-2.12-confd/po/fr.po 2023-12-28 11:51:44.447748457 +0100 | ||
448 | @@ -7516,13 +7516,13 @@ | ||
449 | #: util/grub-mkconfig.in:299 | ||
450 | msgid "" | ||
451 | "Syntax errors are detected in generated GRUB config file.\n" | ||
452 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
453 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
454 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
455 | "%s file attached." | ||
456 | msgstr "" | ||
457 | "Des erreurs de syntaxe sont détectées dans le fichier de configuration\n" | ||
458 | "de GRUB. Veuillez vérifier qu'il n'y a pas d'erreur dans les fichiers\n" | ||
459 | -"/etc/default/grub et /etc/grub.d/*. Sinon veuillez signaler un bogue\n" | ||
460 | +"/etc/conf.d/grub et /etc/grub.d/*. Sinon veuillez signaler un bogue\n" | ||
461 | "en joignant le fichier %s." | ||
462 | |||
463 | #: util/grub-mkconfig.in:315 | ||
464 | @@ -7602,9 +7602,9 @@ | ||
465 | msgstr "Configurer l'entrée de menu par défaut pour GRUB." | ||
466 | |||
467 | #: util/grub-set-default.in:49 | ||
468 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
469 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
470 | msgstr "" | ||
471 | -"Cela nécessite de configurer GRUB_DEFAULT=saved dans %s/default/grub.\\n" | ||
472 | +"Cela nécessite de configurer GRUB_DEFAULT=saved dans %s/conf.d/grub.\\n" | ||
473 | |||
474 | #: util/grub-set-default.in:56 | ||
475 | msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier." | ||
476 | diff -Naur grub-2.12/po/gl.po grub-2.12-confd/po/gl.po | ||
477 | --- grub-2.12/po/gl.po 2023-12-20 17:09:18.000000000 +0100 | ||
478 | +++ grub-2.12-confd/po/gl.po 2023-12-28 11:51:44.451081840 +0100 | ||
479 | @@ -7490,12 +7490,12 @@ | ||
480 | #: util/grub-mkconfig.in:299 | ||
481 | msgid "" | ||
482 | "Syntax errors are detected in generated GRUB config file.\n" | ||
483 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
484 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
485 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
486 | "%s file attached." | ||
487 | msgstr "" | ||
488 | "Detectáronse erros sintácticos no ficheiro de configuración do GRUB xerado.\n" | ||
489 | -"Asegúrese de que non hai erros en /etc/default/grub\n" | ||
490 | +"Asegúrese de que non hai erros en /etc/conf.d/grub\n" | ||
491 | "e nos ficheiros /etc/grub.d/* ou escriba un informe de erro co\n" | ||
492 | "%s ficheiro anexado." | ||
493 | |||
494 | @@ -7560,9 +7560,9 @@ | ||
495 | msgstr "Estabelecer a entrada predeterminada do menú de arranque no GRUB." | ||
496 | |||
497 | #: util/grub-set-default.in:49 | ||
498 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
499 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
500 | msgstr "" | ||
501 | -"Isto require a opción GRUB_PREDETERMINADO=gardada en %s/default/grub.\\n" | ||
502 | +"Isto require a opción GRUB_PREDETERMINADO=gardada en %s/conf.d/grub.\\n" | ||
503 | |||
504 | #: util/grub-set-default.in:56 | ||
505 | msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier." | ||
506 | diff -Naur grub-2.12/po/grub.pot grub-2.12-confd/po/grub.pot | ||
507 | --- grub-2.12/po/grub.pot 2023-12-20 17:09:18.000000000 +0100 | ||
508 | +++ grub-2.12-confd/po/grub.pot 2023-12-28 11:52:02.028012740 +0100 | ||
509 | @@ -7155,7 +7155,7 @@ | ||
510 | #: util/grub-mkconfig.in:299 | ||
511 | msgid "" | ||
512 | "Syntax errors are detected in generated GRUB config file.\n" | ||
513 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
514 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
515 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
516 | "%s file attached." | ||
517 | msgstr "" | ||
518 | @@ -7217,7 +7217,7 @@ | ||
519 | msgstr "" | ||
520 | |||
521 | #: util/grub-set-default.in:49 | ||
522 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
523 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
524 | msgstr "" | ||
525 | |||
526 | #: util/grub-set-default.in:56 | ||
527 | diff -Naur grub-2.12/po/he.po grub-2.12-confd/po/he.po | ||
528 | --- grub-2.12/po/he.po 2023-12-20 17:09:18.000000000 +0100 | ||
529 | +++ grub-2.12-confd/po/he.po 2023-12-28 11:51:44.451081840 +0100 | ||
530 | @@ -7193,7 +7193,7 @@ | ||
531 | #: util/grub-mkconfig.in:299 | ||
532 | msgid "" | ||
533 | "Syntax errors are detected in generated GRUB config file.\n" | ||
534 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
535 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
536 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
537 | "%s file attached." | ||
538 | msgstr "" | ||
539 | @@ -7255,8 +7255,8 @@ | ||
540 | msgstr "הגדרת רשומת ברירת המחדל בתפריט הטעינה ל־GRUB." | ||
541 | |||
542 | #: util/grub-set-default.in:49 | ||
543 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
544 | -msgstr "דורש את ההגדרה GRUB_DEFAULT=saved תחת %s/default/grub.\\n" | ||
545 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
546 | +msgstr "דורש את ההגדרה GRUB_DEFAULT=saved תחת %s/conf.d/grub.\\n" | ||
547 | |||
548 | #: util/grub-set-default.in:56 | ||
549 | msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier." | ||
550 | diff -Naur grub-2.12/po/hr.po grub-2.12-confd/po/hr.po | ||
551 | --- grub-2.12/po/hr.po 2023-12-20 17:09:18.000000000 +0100 | ||
552 | +++ grub-2.12-confd/po/hr.po 2023-12-28 11:51:44.454415223 +0100 | ||
553 | @@ -7397,12 +7397,12 @@ | ||
554 | #: util/grub-mkconfig.in:299 | ||
555 | msgid "" | ||
556 | "Syntax errors are detected in generated GRUB config file.\n" | ||
557 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
558 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
559 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
560 | "%s file attached." | ||
561 | msgstr "" | ||
562 | "Greške sintakse su otkrivene u stvorenoj GRUB datoteci podešavanja.\n" | ||
563 | -"Pobrinite se da ne postoje greške u /etc/default/grub\n" | ||
564 | +"Pobrinite se da ne postoje greške u /etc/conf.d/grub\n" | ||
565 | "i /etc/grub.d/* datotekama ili pošaljite izvješće greške s\n" | ||
566 | "%s priloženoj datoteci." | ||
567 | |||
568 | @@ -7475,8 +7475,8 @@ | ||
569 | msgstr "Postavi zadanu stavku izbornika pokretanja za GRUB." | ||
570 | |||
571 | #: util/grub-set-default.in:49 | ||
572 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
573 | -msgstr "Ovo zahtijeva postavku GRUB_DEFAULT=spremljenju u %s/default/grub.\\n" | ||
574 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
575 | +msgstr "Ovo zahtijeva postavku GRUB_DEFAULT=spremljenju u %s/conf.d/grub.\\n" | ||
576 | |||
577 | #: util/grub-set-default.in:56 | ||
578 | msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier." | ||
579 | diff -Naur grub-2.12/po/hu.po grub-2.12-confd/po/hu.po | ||
580 | --- grub-2.12/po/hu.po 2023-12-20 17:09:19.000000000 +0100 | ||
581 | +++ grub-2.12-confd/po/hu.po 2023-12-28 11:51:44.454415223 +0100 | ||
582 | @@ -7431,12 +7431,12 @@ | ||
583 | #: util/grub-mkconfig.in:299 | ||
584 | msgid "" | ||
585 | "Syntax errors are detected in generated GRUB config file.\n" | ||
586 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
587 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
588 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
589 | "%s file attached." | ||
590 | msgstr "" | ||
591 | "Szintaktikai hibák találhatók az előállított GRUB beállítófájlban.\n" | ||
592 | -"Győződjön meg arról, hogy nincsenek hibák a /etc/default/grub\n" | ||
593 | +"Győződjön meg arról, hogy nincsenek hibák a /etc/conf.d/grub\n" | ||
594 | "és a /etc/grub.d/* fájlokban, vagy küldjön egy hibajelentést a(z)\n" | ||
595 | "%s fájllal mellékelve." | ||
596 | |||
597 | @@ -7513,9 +7513,9 @@ | ||
598 | msgstr "A GRUB alapértelmezett rendszerindítási menübejegyzésének beállítása." | ||
599 | |||
600 | #: util/grub-set-default.in:49 | ||
601 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
602 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
603 | msgstr "" | ||
604 | -"Ez a GRUB_DEFAULT=saved beállítást igényli a(z) %s/default/grub fájlban.\\n" | ||
605 | +"Ez a GRUB_DEFAULT=saved beállítást igényli a(z) %s/conf.d/grub fájlban.\\n" | ||
606 | |||
607 | #: util/grub-set-default.in:56 | ||
608 | msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier." | ||
609 | diff -Naur grub-2.12/po/id.po grub-2.12-confd/po/id.po | ||
610 | --- grub-2.12/po/id.po 2023-12-20 17:09:19.000000000 +0100 | ||
611 | +++ grub-2.12-confd/po/id.po 2023-12-28 11:51:44.454415223 +0100 | ||
612 | @@ -7470,7 +7470,7 @@ | ||
613 | #: util/grub-mkconfig.in:299 | ||
614 | msgid "" | ||
615 | "Syntax errors are detected in generated GRUB config file.\n" | ||
616 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
617 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
618 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
619 | "%s file attached." | ||
620 | msgstr "" | ||
621 | @@ -7533,7 +7533,7 @@ | ||
622 | msgstr "" | ||
623 | |||
624 | #: util/grub-set-default.in:49 | ||
625 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
626 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
627 | msgstr "" | ||
628 | |||
629 | #: util/grub-set-default.in:56 | ||
630 | diff -Naur grub-2.12/po/it.po grub-2.12-confd/po/it.po | ||
631 | --- grub-2.12/po/it.po 2023-12-20 17:09:18.000000000 +0100 | ||
632 | +++ grub-2.12-confd/po/it.po 2023-12-28 11:51:44.457748606 +0100 | ||
633 | @@ -7482,7 +7482,7 @@ | ||
634 | #: util/grub-mkconfig.in:299 | ||
635 | msgid "" | ||
636 | "Syntax errors are detected in generated GRUB config file.\n" | ||
637 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
638 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
639 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
640 | "%s file attached." | ||
641 | msgstr "" | ||
642 | @@ -7548,7 +7548,7 @@ | ||
643 | msgstr "" | ||
644 | |||
645 | #: util/grub-set-default.in:49 | ||
646 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
647 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
648 | msgstr "" | ||
649 | |||
650 | #: util/grub-set-default.in:56 | ||
651 | diff -Naur grub-2.12/po/ja.po grub-2.12-confd/po/ja.po | ||
652 | --- grub-2.12/po/ja.po 2023-12-20 17:09:18.000000000 +0100 | ||
653 | +++ grub-2.12-confd/po/ja.po 2023-12-28 11:51:44.457748606 +0100 | ||
654 | @@ -7318,7 +7318,7 @@ | ||
655 | #: util/grub-mkconfig.in:299 | ||
656 | msgid "" | ||
657 | "Syntax errors are detected in generated GRUB config file.\n" | ||
658 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
659 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
660 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
661 | "%s file attached." | ||
662 | msgstr "" | ||
663 | @@ -7380,7 +7380,7 @@ | ||
664 | msgstr "" | ||
665 | |||
666 | #: util/grub-set-default.in:49 | ||
667 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
668 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
669 | msgstr "" | ||
670 | |||
671 | #: util/grub-set-default.in:56 | ||
672 | diff -Naur grub-2.12/po/ka.po grub-2.12-confd/po/ka.po | ||
673 | --- grub-2.12/po/ka.po 2023-12-20 17:09:19.000000000 +0100 | ||
674 | +++ grub-2.12-confd/po/ka.po 2023-12-28 11:51:44.464415373 +0100 | ||
675 | @@ -7215,7 +7215,7 @@ | ||
676 | #: util/grub-mkconfig.in:299 | ||
677 | msgid "" | ||
678 | "Syntax errors are detected in generated GRUB config file.\n" | ||
679 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
680 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
681 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
682 | "%s file attached." | ||
683 | msgstr "" | ||
684 | @@ -7277,7 +7277,7 @@ | ||
685 | msgstr "GRUB-ის მენიუს ნაგულისხმები პუნქტის დაყენება." | ||
686 | |||
687 | #: util/grub-set-default.in:49 | ||
688 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
689 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
690 | msgstr "" | ||
691 | |||
692 | #: util/grub-set-default.in:56 | ||
693 | diff -Naur grub-2.12/po/ko.po grub-2.12-confd/po/ko.po | ||
694 | --- grub-2.12/po/ko.po 2023-12-20 17:09:19.000000000 +0100 | ||
695 | +++ grub-2.12-confd/po/ko.po 2023-12-28 11:51:44.467748756 +0100 | ||
696 | @@ -7342,12 +7342,12 @@ | ||
697 | #: util/grub-mkconfig.in:299 | ||
698 | msgid "" | ||
699 | "Syntax errors are detected in generated GRUB config file.\n" | ||
700 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
701 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
702 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
703 | "%s file attached." | ||
704 | msgstr "" | ||
705 | "생성한 GRUB 설정 파일에 문법 오류가 있습니다.\n" | ||
706 | -"/etc/default/grub 파일과 and /etc/grub.d/* 파일에 오류가 없는지\n" | ||
707 | +"/etc/conf.d/grub 파일과 and /etc/grub.d/* 파일에 오류가 없는지\n" | ||
708 | "확인하시고 %s 파일을 첨부하여 버그 보고서를 제출하십시오." | ||
709 | |||
710 | #: util/grub-mkconfig.in:315 | ||
711 | @@ -7416,8 +7416,8 @@ | ||
712 | msgstr "GRUB 기본 부팅 메뉴 항목을 설정합니다." | ||
713 | |||
714 | #: util/grub-set-default.in:49 | ||
715 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
716 | -msgstr "%s/default/grub에 GRUB_DEFAULT=saved 값을 설정해야합니다.\\n" | ||
717 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
718 | +msgstr "%s/conf.d/grub에 GRUB_DEFAULT=saved 값을 설정해야합니다.\\n" | ||
719 | |||
720 | #: util/grub-set-default.in:56 | ||
721 | msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier." | ||
722 | diff -Naur grub-2.12/po/lg.po grub-2.12-confd/po/lg.po | ||
723 | --- grub-2.12/po/lg.po 2023-12-20 17:09:19.000000000 +0100 | ||
724 | +++ grub-2.12-confd/po/lg.po 2023-12-28 11:51:44.467748756 +0100 | ||
725 | @@ -7185,7 +7185,7 @@ | ||
726 | #: util/grub-mkconfig.in:299 | ||
727 | msgid "" | ||
728 | "Syntax errors are detected in generated GRUB config file.\n" | ||
729 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
730 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
731 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
732 | "%s file attached." | ||
733 | msgstr "" | ||
734 | @@ -7247,7 +7247,7 @@ | ||
735 | msgstr "" | ||
736 | |||
737 | #: util/grub-set-default.in:49 | ||
738 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
739 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
740 | msgstr "" | ||
741 | |||
742 | #: util/grub-set-default.in:56 | ||
743 | diff -Naur grub-2.12/po/lt.po grub-2.12-confd/po/lt.po | ||
744 | --- grub-2.12/po/lt.po 2023-12-20 17:09:19.000000000 +0100 | ||
745 | +++ grub-2.12-confd/po/lt.po 2023-12-28 11:51:44.471082139 +0100 | ||
746 | @@ -7365,12 +7365,12 @@ | ||
747 | #: util/grub-mkconfig.in:299 | ||
748 | msgid "" | ||
749 | "Syntax errors are detected in generated GRUB config file.\n" | ||
750 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
751 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
752 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
753 | "%s file attached." | ||
754 | msgstr "" | ||
755 | "Sukurtame GRUB konfigūracijos faile aptikta klaidų.\n" | ||
756 | -"Įsitikinkite, ar nėra klaidų /etc/default/grub\n" | ||
757 | +"Įsitikinkite, ar nėra klaidų /etc/conf.d/grub\n" | ||
758 | "ir /etc/grub.d/* failuose arba praneškite apie klaidą\n" | ||
759 | "prisegdami %s failą." | ||
760 | |||
761 | @@ -7433,8 +7433,8 @@ | ||
762 | msgstr "Nurodyti numatytąjį numatytąjį paleidimo GRUB meniu įrašą." | ||
763 | |||
764 | #: util/grub-set-default.in:49 | ||
765 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
766 | -msgstr "Tam reikia įrašyti GRUB_DEFAULT=saved faile %s/default/grub.\\n" | ||
767 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
768 | +msgstr "Tam reikia įrašyti GRUB_DEFAULT=saved faile %s/conf.d/grub.\\n" | ||
769 | |||
770 | #: util/grub-set-default.in:56 | ||
771 | msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier." | ||
772 | diff -Naur grub-2.12/po/nb.po grub-2.12-confd/po/nb.po | ||
773 | --- grub-2.12/po/nb.po 2023-12-20 17:09:19.000000000 +0100 | ||
774 | +++ grub-2.12-confd/po/nb.po 2023-12-28 11:51:44.474415523 +0100 | ||
775 | @@ -7399,12 +7399,12 @@ | ||
776 | #: util/grub-mkconfig.in:299 | ||
777 | msgid "" | ||
778 | "Syntax errors are detected in generated GRUB config file.\n" | ||
779 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
780 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
781 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
782 | "%s file attached." | ||
783 | msgstr "" | ||
784 | "Generert GRUB-oppsettsfil inneholder syntaksfeil.\n" | ||
785 | -"Kontroller at grunnlaget i /etc/default/grub og /etc/grub.d/*\n" | ||
786 | +"Kontroller at grunnlaget i /etc/conf.d/grub og /etc/grub.d/*\n" | ||
787 | "ikke innheholder feil, og send inn en feilrapport\n" | ||
788 | "med %s vedlagt hvis du fremdeles har problemer." | ||
789 | |||
790 | @@ -7479,9 +7479,9 @@ | ||
791 | msgstr "Velg standardoppføring på GRUB-oppstartsmenyen." | ||
792 | |||
793 | #: util/grub-set-default.in:49 | ||
794 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
795 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
796 | msgstr "" | ||
797 | -"Dette krever at du gir en verdi til «GRUB_DEFAULT=» i fila %s/default/grub." | ||
798 | +"Dette krever at du gir en verdi til «GRUB_DEFAULT=» i fila %s/conf.d/grub." | ||
799 | "\\n" | ||
800 | |||
801 | #: util/grub-set-default.in:56 | ||
802 | diff -Naur grub-2.12/po/nl.po grub-2.12-confd/po/nl.po | ||
803 | --- grub-2.12/po/nl.po 2023-12-20 17:09:19.000000000 +0100 | ||
804 | +++ grub-2.12-confd/po/nl.po 2023-12-28 11:51:44.477748905 +0100 | ||
805 | @@ -7458,12 +7458,12 @@ | ||
806 | #: util/grub-mkconfig.in:299 | ||
807 | msgid "" | ||
808 | "Syntax errors are detected in generated GRUB config file.\n" | ||
809 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
810 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
811 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
812 | "%s file attached." | ||
813 | msgstr "" | ||
814 | "Er zijn syntaxfouten gevonden in het aangemaakte GRUB-configuratiebestand.\n" | ||
815 | -"Verzeker u ervan dat er geen fouten zitten in het bestand /etc/default/grub\n" | ||
816 | +"Verzeker u ervan dat er geen fouten zitten in het bestand /etc/conf.d/grub\n" | ||
817 | "noch in de bestanden in /etc/grub.d/. Rapporteer anders een fout, met het\n" | ||
818 | "bestand %s als bijlage." | ||
819 | |||
820 | @@ -7533,9 +7533,9 @@ | ||
821 | msgstr "Het standaardmenu-item voor GRUB instellen." | ||
822 | |||
823 | #: util/grub-set-default.in:49 | ||
824 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
825 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
826 | msgstr "" | ||
827 | -"Dit vereist het instellen van GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
828 | +"Dit vereist het instellen van GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
829 | |||
830 | #: util/grub-set-default.in:56 | ||
831 | msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier." | ||
832 | diff -Naur grub-2.12/po/pa.po grub-2.12-confd/po/pa.po | ||
833 | --- grub-2.12/po/pa.po 2023-12-20 17:09:19.000000000 +0100 | ||
834 | +++ grub-2.12-confd/po/pa.po 2023-12-28 11:51:44.477748905 +0100 | ||
835 | @@ -7251,7 +7251,7 @@ | ||
836 | #: util/grub-mkconfig.in:299 | ||
837 | msgid "" | ||
838 | "Syntax errors are detected in generated GRUB config file.\n" | ||
839 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
840 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
841 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
842 | "%s file attached." | ||
843 | msgstr "" | ||
844 | @@ -7313,7 +7313,7 @@ | ||
845 | msgstr "ਗਰਬ ਲਈ ਮੂਲ ਬੂਟ ਮੇਨੂ ਐਂਟਰੀ ਸੈੱਟ ਕਰੋ।" | ||
846 | |||
847 | #: util/grub-set-default.in:49 | ||
848 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
849 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
850 | msgstr "" | ||
851 | |||
852 | #: util/grub-set-default.in:56 | ||
853 | diff -Naur grub-2.12/po/pl.po grub-2.12-confd/po/pl.po | ||
854 | --- grub-2.12/po/pl.po 2023-12-20 17:09:19.000000000 +0100 | ||
855 | +++ grub-2.12-confd/po/pl.po 2023-12-28 11:51:44.481082289 +0100 | ||
856 | @@ -7411,12 +7411,12 @@ | ||
857 | #: util/grub-mkconfig.in:299 | ||
858 | msgid "" | ||
859 | "Syntax errors are detected in generated GRUB config file.\n" | ||
860 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
861 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
862 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
863 | "%s file attached." | ||
864 | msgstr "" | ||
865 | "W wygenerowanym pliku konfiguracyjnym GRUB-a wykryto błędy składni.\n" | ||
866 | -"Proszę się upewnić, że nie ma błędów w plikach /etc/default/grub\n" | ||
867 | +"Proszę się upewnić, że nie ma błędów w plikach /etc/conf.d/grub\n" | ||
868 | "oraz /etc/grub.d/* albo wypełnić raport błędu z załączonym plikiem\n" | ||
869 | "%s." | ||
870 | |||
871 | @@ -7492,8 +7492,8 @@ | ||
872 | msgstr "Ustawia domyślny wpis menu dla GRUB-a." | ||
873 | |||
874 | #: util/grub-set-default.in:49 | ||
875 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
876 | -msgstr "Wymaga to ustawienia GRUB_DEFAULT=saved w %s/default/grub.\\n" | ||
877 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
878 | +msgstr "Wymaga to ustawienia GRUB_DEFAULT=saved w %s/conf.d/grub.\\n" | ||
879 | |||
880 | #: util/grub-set-default.in:56 | ||
881 | msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier." | ||
882 | diff -Naur grub-2.12/po/pt_BR.po grub-2.12-confd/po/pt_BR.po | ||
883 | --- grub-2.12/po/pt_BR.po 2023-12-20 17:09:19.000000000 +0100 | ||
884 | +++ grub-2.12-confd/po/pt_BR.po 2023-12-28 11:51:44.481082289 +0100 | ||
885 | @@ -7438,7 +7438,7 @@ | ||
886 | #: util/grub-mkconfig.in:299 | ||
887 | msgid "" | ||
888 | "Syntax errors are detected in generated GRUB config file.\n" | ||
889 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
890 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
891 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
892 | "%s file attached." | ||
893 | msgstr "" | ||
894 | @@ -7502,7 +7502,7 @@ | ||
895 | msgstr "Definir a entrada do menu padrão para o GRUB." | ||
896 | |||
897 | #: util/grub-set-default.in:49 | ||
898 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
899 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
900 | msgstr "" | ||
901 | |||
902 | #: util/grub-set-default.in:56 | ||
903 | diff -Naur grub-2.12/po/pt.po grub-2.12-confd/po/pt.po | ||
904 | --- grub-2.12/po/pt.po 2023-12-20 17:09:19.000000000 +0100 | ||
905 | +++ grub-2.12-confd/po/pt.po 2023-12-28 11:51:44.484415672 +0100 | ||
906 | @@ -7414,12 +7414,12 @@ | ||
907 | #: util/grub-mkconfig.in:299 | ||
908 | msgid "" | ||
909 | "Syntax errors are detected in generated GRUB config file.\n" | ||
910 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
911 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
912 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
913 | "%s file attached." | ||
914 | msgstr "" | ||
915 | "Erros de sintaxe são detectados no ficheiro de configuração GRUB.\n" | ||
916 | -"gerado. Assegure-se de que não há erros em /etc/default/grub\n" | ||
917 | +"gerado. Assegure-se de que não há erros em /etc/conf.d/grub\n" | ||
918 | "e /etc/grub.d/* files ou, por favor, envie um relatório com\n" | ||
919 | "o ficheiro %s anexado." | ||
920 | |||
921 | @@ -7493,8 +7493,8 @@ | ||
922 | msgstr "Predefinir a entrada GRUB de arranque." | ||
923 | |||
924 | #: util/grub-set-default.in:49 | ||
925 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
926 | -msgstr "Isto requer definir GRUB_DEFAULT= gravado em %s/default/grub.\\n" | ||
927 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
928 | +msgstr "Isto requer definir GRUB_DEFAULT= gravado em %s/conf.d/grub.\\n" | ||
929 | |||
930 | #: util/grub-set-default.in:56 | ||
931 | msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier." | ||
932 | diff -Naur grub-2.12/po/ro.po grub-2.12-confd/po/ro.po | ||
933 | --- grub-2.12/po/ro.po 2023-12-20 17:09:19.000000000 +0100 | ||
934 | +++ grub-2.12-confd/po/ro.po 2023-12-28 11:51:44.484415672 +0100 | ||
935 | @@ -7611,13 +7611,13 @@ | ||
936 | #: util/grub-mkconfig.in:299 | ||
937 | msgid "" | ||
938 | "Syntax errors are detected in generated GRUB config file.\n" | ||
939 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
940 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
941 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
942 | "%s file attached." | ||
943 | msgstr "" | ||
944 | "S-au detectat erori de sintaxă în fișierul de configurare\n" | ||
945 | "generat pentru GRUB.\n" | ||
946 | -"Asigurați-vă că nu există erori în fișierele „/etc/default/grub”\n" | ||
947 | +"Asigurați-vă că nu există erori în fișierele „/etc/conf.d/grub”\n" | ||
948 | "și „/etc/grub.d/*” sau trimiteți un raport de eroare cu fișierul\n" | ||
949 | "„%s” atașat." | ||
950 | |||
951 | @@ -7700,9 +7700,9 @@ | ||
952 | msgstr "Stabilește intrarea implicită din meniul de pornire pentru GRUB." | ||
953 | |||
954 | #: util/grub-set-default.in:49 | ||
955 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
956 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
957 | msgstr "" | ||
958 | -"Aceasta necesită configurarea «GRUB_DEFAULT=saved» în „%s/default/grub”.\\n" | ||
959 | +"Aceasta necesită configurarea «GRUB_DEFAULT=saved» în „%s/conf.d/grub”.\\n" | ||
960 | |||
961 | #: util/grub-set-default.in:56 | ||
962 | msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier." | ||
963 | diff -Naur grub-2.12/po/ru.po grub-2.12-confd/po/ru.po | ||
964 | --- grub-2.12/po/ru.po 2023-12-20 17:09:19.000000000 +0100 | ||
965 | +++ grub-2.12-confd/po/ru.po 2023-12-28 11:51:44.487749056 +0100 | ||
966 | @@ -7426,12 +7426,12 @@ | ||
967 | #: util/grub-mkconfig.in:299 | ||
968 | msgid "" | ||
969 | "Syntax errors are detected in generated GRUB config file.\n" | ||
970 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
971 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
972 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
973 | "%s file attached." | ||
974 | msgstr "" | ||
975 | "В сгенерированном файле настроек GRUB обнаружены синтаксические ошибки.\n" | ||
976 | -"Убедитесь, что в файлах /etc/default/grub\n" | ||
977 | +"Убедитесь, что в файлах /etc/conf.d/grub\n" | ||
978 | "и /etc/grub.d/* ошибки отсутствуют или пошлите сообщение об ошибке\n" | ||
979 | "в прикреплённым файлом %s." | ||
980 | |||
981 | @@ -7506,8 +7506,8 @@ | ||
982 | msgstr "Назначает пункт меню GRUB для загрузки по умолчанию." | ||
983 | |||
984 | #: util/grub-set-default.in:49 | ||
985 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
986 | -msgstr "Для этого требуется строка GRUB_DEFAULT=saved в %s/default/grub.\\n" | ||
987 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
988 | +msgstr "Для этого требуется строка GRUB_DEFAULT=saved в %s/conf.d/grub.\\n" | ||
989 | |||
990 | #: util/grub-set-default.in:56 | ||
991 | msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier." | ||
992 | diff -Naur grub-2.12/po/sl.po grub-2.12-confd/po/sl.po | ||
993 | --- grub-2.12/po/sl.po 2023-12-20 17:09:19.000000000 +0100 | ||
994 | +++ grub-2.12-confd/po/sl.po 2023-12-28 11:51:44.487749056 +0100 | ||
995 | @@ -7448,12 +7448,12 @@ | ||
996 | #: util/grub-mkconfig.in:299 | ||
997 | msgid "" | ||
998 | "Syntax errors are detected in generated GRUB config file.\n" | ||
999 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
1000 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
1001 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
1002 | "%s file attached." | ||
1003 | msgstr "" | ||
1004 | "V ustvarjeni nastavitveni datoteki GRUB so zaznane napake\n" | ||
1005 | -" skladnje. Prepričajte se, da v datotekah /etc/default/grub in\n" | ||
1006 | +" skladnje. Prepričajte se, da v datotekah /etc/conf.d/grub in\n" | ||
1007 | "/etc/grub.d/* ni napak ali pa pošljite poročilo o hrošču s pripeto\n" | ||
1008 | "datoteko %s." | ||
1009 | |||
1010 | @@ -7514,7 +7514,7 @@ | ||
1011 | msgstr "Nastavi privzeti vnos menija zagona za GRUB." | ||
1012 | |||
1013 | #: util/grub-set-default.in:49 | ||
1014 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
1015 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
1016 | msgstr "" | ||
1017 | |||
1018 | #: util/grub-set-default.in:56 | ||
1019 | diff -Naur grub-2.12/po/sr.po grub-2.12-confd/po/sr.po | ||
1020 | --- grub-2.12/po/sr.po 2023-12-20 17:09:19.000000000 +0100 | ||
1021 | +++ grub-2.12-confd/po/sr.po 2023-12-28 11:51:44.487749056 +0100 | ||
1022 | @@ -7386,12 +7386,12 @@ | ||
1023 | #: util/grub-mkconfig.in:299 | ||
1024 | msgid "" | ||
1025 | "Syntax errors are detected in generated GRUB config file.\n" | ||
1026 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
1027 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
1028 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
1029 | "%s file attached." | ||
1030 | msgstr "" | ||
1031 | "Откривене су грешке синтаксе у створеној датотеци подешавања ГРУБ-а.\n" | ||
1032 | -"Проверите да ли има грешака у датотекама „/etc/default/grub“\n" | ||
1033 | +"Проверите да ли има грешака у датотекама „/etc/conf.d/grub“\n" | ||
1034 | "и „/etc/grub.d/*“ или попуните извештај о грешкама\n" | ||
1035 | "и приложите датотеку „%s“." | ||
1036 | |||
1037 | @@ -7468,8 +7468,8 @@ | ||
1038 | msgstr "Подешава основни унос изборника подизања за ГРУБ." | ||
1039 | |||
1040 | #: util/grub-set-default.in:49 | ||
1041 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
1042 | -msgstr "Ово захтева подешавање „GRUB_DEFAULT=saved“ у „%s/default/grub“.\\n" | ||
1043 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
1044 | +msgstr "Ово захтева подешавање „GRUB_DEFAULT=saved“ у „%s/conf.d/grub“.\\n" | ||
1045 | |||
1046 | #: util/grub-set-default.in:56 | ||
1047 | msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier." | ||
1048 | diff -Naur grub-2.12/po/sv.po grub-2.12-confd/po/sv.po | ||
1049 | --- grub-2.12/po/sv.po 2023-12-20 17:09:19.000000000 +0100 | ||
1050 | +++ grub-2.12-confd/po/sv.po 2023-12-28 11:51:44.491082440 +0100 | ||
1051 | @@ -7391,12 +7391,12 @@ | ||
1052 | #: util/grub-mkconfig.in:299 | ||
1053 | msgid "" | ||
1054 | "Syntax errors are detected in generated GRUB config file.\n" | ||
1055 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
1056 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
1057 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
1058 | "%s file attached." | ||
1059 | msgstr "" | ||
1060 | "Syntaxfel upptäcktes i den genererade GRUB-konfigurationsfilen.\n" | ||
1061 | -"Kontrollera att det inte finns några fel i /etc/default/grub-\n" | ||
1062 | +"Kontrollera att det inte finns några fel i /etc/conf.d/grub-\n" | ||
1063 | "och /etc/grub.d/*-filerna eller skicka in en felrapport med\n" | ||
1064 | "bifogad %s-fil." | ||
1065 | |||
1066 | @@ -7469,8 +7469,8 @@ | ||
1067 | msgstr "Ange standardpost för GRUBs startmeny." | ||
1068 | |||
1069 | #: util/grub-set-default.in:49 | ||
1070 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
1071 | -msgstr "Detta kräver inställningen GRUB_DEFAULT=saved i %s/default/grub.\\n" | ||
1072 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
1073 | +msgstr "Detta kräver inställningen GRUB_DEFAULT=saved i %s/conf.d/grub.\\n" | ||
1074 | |||
1075 | #: util/grub-set-default.in:56 | ||
1076 | msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier." | ||
1077 | diff -Naur grub-2.12/po/tr.po grub-2.12-confd/po/tr.po | ||
1078 | --- grub-2.12/po/tr.po 2023-12-20 17:09:19.000000000 +0100 | ||
1079 | +++ grub-2.12-confd/po/tr.po 2023-12-28 11:51:44.491082440 +0100 | ||
1080 | @@ -7299,7 +7299,7 @@ | ||
1081 | #: util/grub-mkconfig.in:299 | ||
1082 | msgid "" | ||
1083 | "Syntax errors are detected in generated GRUB config file.\n" | ||
1084 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
1085 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
1086 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
1087 | "%s file attached." | ||
1088 | msgstr "" | ||
1089 | @@ -7363,8 +7363,8 @@ | ||
1090 | msgstr "GRUB için öntanımlı önyükleme menü girdisini ayarla." | ||
1091 | |||
1092 | #: util/grub-set-default.in:49 | ||
1093 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
1094 | -msgstr "Bu, %s/default/grub içinde GRUB_DEFAULT=saved olmasını gerektirir.\\n" | ||
1095 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
1096 | +msgstr "Bu, %s/conf.d/grub içinde GRUB_DEFAULT=saved olmasını gerektirir.\\n" | ||
1097 | |||
1098 | #: util/grub-set-default.in:56 | ||
1099 | msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier." | ||
1100 | diff -Naur grub-2.12/po/uk.po grub-2.12-confd/po/uk.po | ||
1101 | --- grub-2.12/po/uk.po 2023-12-20 17:09:19.000000000 +0100 | ||
1102 | +++ grub-2.12-confd/po/uk.po 2023-12-28 11:51:44.494415823 +0100 | ||
1103 | @@ -7469,12 +7469,12 @@ | ||
1104 | #: util/grub-mkconfig.in:299 | ||
1105 | msgid "" | ||
1106 | "Syntax errors are detected in generated GRUB config file.\n" | ||
1107 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
1108 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
1109 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
1110 | "%s file attached." | ||
1111 | msgstr "" | ||
1112 | "Виявлено синтаксичні помилки у файлі налаштувань GRUB.\n" | ||
1113 | -"Переконайтеся, що у файлах /etc/default/grub і /etc/grub.d/*\n" | ||
1114 | +"Переконайтеся, що у файлах /etc/conf.d/grub і /etc/grub.d/*\n" | ||
1115 | "немає помилок, будь ласка, створіть звіт щодо вади з\n" | ||
1116 | "долученням файла %s." | ||
1117 | |||
1118 | @@ -7552,8 +7552,8 @@ | ||
1119 | msgstr "Встановити типовий пункт меню завантаження для GRUB." | ||
1120 | |||
1121 | #: util/grub-set-default.in:49 | ||
1122 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
1123 | -msgstr "Потребує встановлення GRUB_DEFAULT=saved у %s/default/grub.\\n" | ||
1124 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
1125 | +msgstr "Потребує встановлення GRUB_DEFAULT=saved у %s/conf.d/grub.\\n" | ||
1126 | |||
1127 | #: util/grub-set-default.in:56 | ||
1128 | msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier." | ||
1129 | diff -Naur grub-2.12/po/vi.po grub-2.12-confd/po/vi.po | ||
1130 | --- grub-2.12/po/vi.po 2023-12-20 17:09:19.000000000 +0100 | ||
1131 | +++ grub-2.12-confd/po/vi.po 2023-12-28 11:51:44.494415823 +0100 | ||
1132 | @@ -7399,12 +7399,12 @@ | ||
1133 | #: util/grub-mkconfig.in:299 | ||
1134 | msgid "" | ||
1135 | "Syntax errors are detected in generated GRUB config file.\n" | ||
1136 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
1137 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
1138 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
1139 | "%s file attached." | ||
1140 | msgstr "" | ||
1141 | "Các lỗi cú pháp đã được phát hiện trong tập tin cấu hình GRUB đã tạo.\n" | ||
1142 | -"Hãy chắc chắn rằng không có lỗi nào trong tập tin /etc/default/grub\n" | ||
1143 | +"Hãy chắc chắn rằng không có lỗi nào trong tập tin /etc/conf.d/grub\n" | ||
1144 | "và /etc/grub.d/* hoặc báo cáo tập tin lỗi này bằng cách đính\n" | ||
1145 | "kèm tập tin %s." | ||
1146 | |||
1147 | @@ -7481,8 +7481,8 @@ | ||
1148 | msgstr "Đặt mục menu khởi động mặc định cho GRUB." | ||
1149 | |||
1150 | #: util/grub-set-default.in:49 | ||
1151 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
1152 | -msgstr "Cái này yêu cầu cài đặt GRUB_DEFAULT=saved trong %s/default/grub.\\n" | ||
1153 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
1154 | +msgstr "Cái này yêu cầu cài đặt GRUB_DEFAULT=saved trong %s/conf.d/grub.\\n" | ||
1155 | |||
1156 | #: util/grub-set-default.in:56 | ||
1157 | msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier." | ||
1158 | diff -Naur grub-2.12/po/zh_CN.po grub-2.12-confd/po/zh_CN.po | ||
1159 | --- grub-2.12/po/zh_CN.po 2023-12-20 17:09:19.000000000 +0100 | ||
1160 | +++ grub-2.12-confd/po/zh_CN.po 2023-12-28 11:51:44.494415823 +0100 | ||
1161 | @@ -7273,12 +7273,12 @@ | ||
1162 | #: util/grub-mkconfig.in:299 | ||
1163 | msgid "" | ||
1164 | "Syntax errors are detected in generated GRUB config file.\n" | ||
1165 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
1166 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
1167 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
1168 | "%s file attached." | ||
1169 | msgstr "" | ||
1170 | "生成的 GRUB 配置文件中检测到了语法错误。\n" | ||
1171 | -"请确保 /etc/default/grub 和 /etc/grub/*\n" | ||
1172 | +"请确保 /etc/conf.d/grub 和 /etc/grub/*\n" | ||
1173 | "文件中没有错误,或者请提交一个缺陷报告并\n" | ||
1174 | "将 %s 文件作为附件。" | ||
1175 | |||
1176 | @@ -7348,8 +7348,8 @@ | ||
1177 | msgstr "设置 GRUB 默认引导菜单项。" | ||
1178 | |||
1179 | #: util/grub-set-default.in:49 | ||
1180 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
1181 | -msgstr "这需要在 %s/default/grub 中设置 GRUB_DEFAULT=saved 才能实现。\\n" | ||
1182 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
1183 | +msgstr "这需要在 %s/conf.d/grub 中设置 GRUB_DEFAULT=saved 才能实现。\\n" | ||
1184 | |||
1185 | #: util/grub-set-default.in:56 | ||
1186 | msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier." | ||
1187 | diff -Naur grub-2.12/po/zh_TW.po grub-2.12-confd/po/zh_TW.po | ||
1188 | --- grub-2.12/po/zh_TW.po 2023-12-20 17:09:19.000000000 +0100 | ||
1189 | +++ grub-2.12-confd/po/zh_TW.po 2023-12-28 11:51:44.497749207 +0100 | ||
1190 | @@ -7383,7 +7383,7 @@ | ||
1191 | #: util/grub-mkconfig.in:299 | ||
1192 | msgid "" | ||
1193 | "Syntax errors are detected in generated GRUB config file.\n" | ||
1194 | -"Ensure that there are no errors in /etc/default/grub\n" | ||
1195 | +"Ensure that there are no errors in /etc/conf.d/grub\n" | ||
1196 | "and /etc/grub.d/* files or please file a bug report with\n" | ||
1197 | "%s file attached." | ||
1198 | msgstr "" | ||
1199 | @@ -7446,7 +7446,7 @@ | ||
1200 | msgstr "" | ||
1201 | |||
1202 | #: util/grub-set-default.in:49 | ||
1203 | -msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n" | ||
1204 | +msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n" | ||
1205 | msgstr "" | ||
1206 | |||
1207 | #: util/grub-set-default.in:56 | ||
1208 | diff -Naur grub-2.12/util/grub.d/README grub-2.12-confd/util/grub.d/README | ||
1209 | --- grub-2.12/util/grub.d/README 2018-11-24 18:13:02.000000000 +0100 | ||
1210 | +++ grub-2.12-confd/util/grub.d/README 2023-12-28 11:53:42.776194219 +0100 | ||
1211 | @@ -8,4 +8,4 @@ | ||
1212 | The number namespace in-between is configurable by system installer and/or | ||
1213 | administrator. For example, you can add an entry to boot another OS as | ||
1214 | 01_otheros, 11_otheros, etc, depending on the position you want it to occupy in | ||
1215 | -the menu; and then adjust the default setting via /etc/default/grub. | ||
1216 | +the menu; and then adjust the default setting via /etc/conf.d/grub. | ||
1217 | diff -Naur grub-2.12/util/grub-mkconfig.in grub-2.12-confd/util/grub-mkconfig.in | ||
1218 | --- grub-2.12/util/grub-mkconfig.in 2022-11-14 16:52:54.000000000 +0100 | ||
1219 | +++ grub-2.12-confd/util/grub-mkconfig.in 2023-12-28 11:53:51.132986557 +0100 | ||
1220 | @@ -157,8 +157,8 @@ | ||
1221 | GRUB_EARLY_INITRD_LINUX_STOCK="intel-uc.img intel-ucode.img amd-uc.img amd-ucode.img early_ucode.cpio microcode.cpio" | ||
1222 | fi | ||
1223 | |||
1224 | -if test -f ${sysconfdir}/default/grub ; then | ||
1225 | - . ${sysconfdir}/default/grub | ||
1226 | +if test -f ${sysconfdir}/conf.d/grub ; then | ||
1227 | + . ${sysconfdir}/conf.d/grub | ||
1228 | fi | ||
1229 | |||
1230 | if [ "x${GRUB_DISABLE_UUID}" = "xtrue" ]; then | ||
1231 | @@ -271,7 +271,7 @@ | ||
1232 | # DO NOT EDIT THIS FILE | ||
1233 | # | ||
1234 | # It is automatically generated by $self using templates | ||
1235 | -# from ${grub_mkconfig_dir} and settings from ${sysconfdir}/default/grub | ||
1236 | +# from ${grub_mkconfig_dir} and settings from ${sysconfdir}/conf.d/grub | ||
1237 | # | ||
1238 | EOF | ||
1239 | |||
1240 | @@ -297,7 +297,7 @@ | ||
1241 | if ! ${grub_script_check} ${grub_cfg}.new; then | ||
1242 | # TRANSLATORS: %s is replaced by filename | ||
1243 | gettext_printf "Syntax errors are detected in generated GRUB config file. | ||
1244 | -Ensure that there are no errors in /etc/default/grub | ||
1245 | +Ensure that there are no errors in /etc/conf.d/grub | ||
1246 | and /etc/grub.d/* files or please file a bug report with | ||
1247 | %s file attached." "${grub_cfg}.new" >&2 | ||
1248 | echo >&2 | ||
1249 | diff -Naur grub-2.12/util/grub-set-default.in grub-2.12-confd/util/grub-set-default.in | ||
1250 | --- grub-2.12/util/grub-set-default.in 2018-11-24 18:13:02.000000000 +0100 | ||
1251 | +++ grub-2.12-confd/util/grub-set-default.in 2023-12-28 11:53:56.543067907 +0100 | ||
1252 | @@ -46,7 +46,7 @@ | ||
1253 | usage () { | ||
1254 | gettext_printf "Usage: %s [OPTION] MENU_ENTRY\n" "$self" | ||
1255 | gettext "Set the default boot menu entry for GRUB."; echo | ||
1256 | - gettext_printf "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\n" "$sysconfdir" | ||
1257 | + gettext_printf "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\n" "$sysconfdir" | ||
1258 | echo | ||
1259 | print_option_help "-h, --help" "$(gettext "print this message and exit")" | ||
1260 | print_option_help "-V, --version" "$(gettext "print the version information and exit")" |