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