diff -Naur grub-2.06/docs/grub.info-1 grub-2.06-confd/docs/grub.info-1
--- grub-2.06/docs/grub.info-1	2021-06-08 16:44:01.000000000 +0200
+++ grub-2.06-confd/docs/grub.info-1	2023-07-28 13:37:02.423251458 +0200
@@ -1191,7 +1191,7 @@
 Booting::, and *note Shell-like scripting::), and to disable any system
 provided by their distribution to automatically run 'grub-mkconfig'.
 
-   The file '/etc/default/grub' controls the operation of
+   The file '/etc/conf.d/grub' controls the operation of
 'grub-mkconfig'.  It is sourced by a shell script, and so must be valid
 POSIX shell input; normally, it will just be a sequence of 'KEY=value'
 lines, but if the value contains spaces or other special characters then
@@ -1199,7 +1199,7 @@
 
      GRUB_TERMINAL_INPUT="console serial"
 
-   Valid keys in '/etc/default/grub' are as follows:
+   Valid keys in '/etc/conf.d/grub' are as follows:
 
 'GRUB_DEFAULT'
      The default menu entry.  This may be a number, in which case it
@@ -1804,7 +1804,7 @@
 
    'GRUB_DISABLE_OS_PROBER=true'
 
-   in /etc/default/grub
+   in /etc/conf.d/grub
 
    Then write a grub.cfg (/mnt/boot/grub/grub.cfg):
 
@@ -2634,7 +2634,7 @@
 Some laptop vendors provide an additional power-on button which boots
 another OS. GRUB supports such buttons with the 'GRUB_TIMEOUT_BUTTON',
 'GRUB_TIMEOUT_STYLE_BUTTON', 'GRUB_DEFAULT_BUTTON', and
-'GRUB_BUTTON_CMOS_ADDRESS' variables in default/grub (*note Simple
+'GRUB_BUTTON_CMOS_ADDRESS' variables in conf.d/grub (*note Simple
 configuration::).  'GRUB_TIMEOUT_BUTTON', 'GRUB_TIMEOUT_STYLE_BUTTON',
 and 'GRUB_DEFAULT_BUTTON' are used instead of the corresponding
 variables without the '_BUTTON' suffix when powered on using the special
diff -Naur grub-2.06/docs/grub.texi grub-2.06-confd/docs/grub.texi
--- grub-2.06/docs/grub.texi	2021-05-10 15:08:36.000000000 +0200
+++ grub-2.06-confd/docs/grub.texi	2023-07-28 13:37:18.553535784 +0200
@@ -1269,7 +1269,7 @@
 (@pxref{Booting}, and @ref{Shell-like scripting}), and to disable any system
 provided by their distribution to automatically run @command{grub-mkconfig}.
 
-The file @file{/etc/default/grub} controls the operation of
+The file @file{/etc/conf.d/grub} controls the operation of
 @command{grub-mkconfig}.  It is sourced by a shell script, and so must be
 valid POSIX shell input; normally, it will just be a sequence of
 @samp{KEY=value} lines, but if the value contains spaces or other special
@@ -1279,7 +1279,7 @@
 GRUB_TERMINAL_INPUT="console serial"
 @end example
 
-Valid keys in @file{/etc/default/grub} are as follows:
+Valid keys in @file{/etc/conf.d/grub} are as follows:
 
 @table @samp
 @item GRUB_DEFAULT
@@ -1872,7 +1872,7 @@
 
 @code{GRUB_DISABLE_OS_PROBER=true}
 
-in /etc/default/grub
+in /etc/conf.d/grub
 
 Then write a grub.cfg (/mnt/boot/grub/grub.cfg):
 
@@ -2695,7 +2695,7 @@
 Some laptop vendors provide an additional power-on button which boots
 another OS.  GRUB supports such buttons with the @samp{GRUB_TIMEOUT_BUTTON},
 @samp{GRUB_TIMEOUT_STYLE_BUTTON}, @samp{GRUB_DEFAULT_BUTTON}, and
-@samp{GRUB_BUTTON_CMOS_ADDRESS} variables in default/grub (@pxref{Simple
+@samp{GRUB_BUTTON_CMOS_ADDRESS} variables in conf.d/grub (@pxref{Simple
 configuration}).  @samp{GRUB_TIMEOUT_BUTTON},
 @samp{GRUB_TIMEOUT_STYLE_BUTTON}, and @samp{GRUB_DEFAULT_BUTTON} are used
 instead of the corresponding variables without the @samp{_BUTTON} suffix
diff -Naur grub-2.06/po/ast.po grub-2.06-confd/po/ast.po
--- grub-2.06/po/ast.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/ast.po	2023-07-28 12:22:10.069781865 +0200
@@ -6725,13 +6725,13 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
 "Deteutáronse fallos de sintaxis nel ficheru xeneráu de la\n"
 " configuración de GRUB. Asegúrate que nun heba fallos\n"
-" nos ficheros /etc/default/grub y /etc/grub.d/*, sinón\n"
+" nos ficheros /etc/conf.d/grub y /etc/grub.d/*, sinón\n"
 " rellena un informe de fallos col ficheru de darréu axuntáu\n"
 "%s ."
 
@@ -6808,8 +6808,8 @@
 msgstr "Afita la entrada predeterminada del menú d'arranque de GRUB."
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
-msgstr "Esto rique l'axuste GRUB_DEFAULT=saved en %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
+msgstr "Esto rique l'axuste GRUB_DEFAULT=saved en %s/conf.d/grub.\\n"
 
 #: util/grub-set-default.in:56
 msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
diff -Naur grub-2.06/po/ca.po grub-2.06-confd/po/ca.po
--- grub-2.06/po/ca.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/ca.po	2023-07-28 12:22:10.069781865 +0200
@@ -6775,13 +6775,13 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
 "S'han detectat errors de sintaxi al fitxer de configuració del GRUB "
 "generat.\n"
-"Assegureu-vos que no hi ha errors a /etc/default/grub o als fitxers\n"
+"Assegureu-vos que no hi ha errors a /etc/conf.d/grub o als fitxers\n"
 " /etc/grub.d/* o bé envieu un informe d'error adjuntant el fitxer %s "
 
 #: util/grub-mkconfig.in:308
@@ -6854,8 +6854,8 @@
 msgstr "Estableix l'entrada del menú d'arrencada per defecte del GRUB."
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
-msgstr "Necessita configurar GRUB_DEFAULT=saved a %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
+msgstr "Necessita configurar GRUB_DEFAULT=saved a %s/conf.d/grub.\\n"
 
 #: util/grub-set-default.in:56
 msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
diff -Naur grub-2.06/po/da.po grub-2.06-confd/po/da.po
--- grub-2.06/po/da.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/da.po	2023-07-28 12:22:10.073115256 +0200
@@ -6741,13 +6741,13 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
 "Der blev fundet syntaksfejl i den genererede GRUB-\n"
 "konfigurationsfil.  Sikr dig at der ikke er nogen fejl\n"
-"i filerne /etc/default/grub eller /etc/grub.d/*, eller\n"
+"i filerne /etc/conf.d/grub eller /etc/grub.d/*, eller\n"
 "indsend venligst en fejlrapport med filen %s vedhæftet."
 
 #: util/grub-mkconfig.in:308
@@ -6816,8 +6816,8 @@
 msgstr "Sæt standardmenuindgangen for opstart i GRUB."
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
-msgstr "Dette kræver at GRUB_DEFAULT=saved angives i %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
+msgstr "Dette kræver at GRUB_DEFAULT=saved angives i %s/conf.d/grub.\\n"
 
 #: util/grub-set-default.in:56
 msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
diff -Naur grub-2.06/po/de.po grub-2.06-confd/po/de.po
--- grub-2.06/po/de.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/de.po	2023-07-28 12:23:25.397756465 +0200
@@ -6729,12 +6729,12 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
 "In der erzeugten GRUB-Konfigurationsdatei wurden Syntaxfehler\n"
-"erkannt. Stellen Sie sicher, dass die Dateien etc/default/grub\n"
+"erkannt. Stellen Sie sicher, dass die Dateien etc/conf.d/grub\n"
 "und /etc/grub.d/* fehlerfrei sind oder melden Sie einen Fehler\n"
 "und hängen die Datei %s an."
 
@@ -6801,8 +6801,8 @@
 msgstr "Den Standardeintrag im GRUB-Bootmenü festlegen."
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
-msgstr "Dazu muss GRUB_DEFAULT=saved in %s/default/grub gesetzt werden.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
+msgstr "Dazu muss GRUB_DEFAULT=saved in %s/conf.d/grub gesetzt werden.\\n"
 
 #: util/grub-set-default.in:56
 msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
diff -Naur grub-2.06/po/de@hebrew.po grub-2.06-confd/po/de@hebrew.po
--- grub-2.06/po/de@hebrew.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/de@hebrew.po	2023-07-28 12:22:10.076448647 +0200
@@ -6723,7 +6723,7 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
@@ -6795,7 +6795,7 @@
 msgstr "דענ שתאנדארדעִינתראג ִימ גרוּבּ-בּוֹוֹתמענֻ פֿעשתלעגענ."
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 msgstr "דאזוּ מוּשש גרוּבּ_דעפֿאוּלת=שאבֿעד ִינ %s/דעפֿאוּלת/גרוּבּ געשעתזת וערדענ.\\נ"
 
 #: util/grub-set-default.in:56
diff -Naur grub-2.06/po/de_CH.po grub-2.06-confd/po/de_CH.po
--- grub-2.06/po/de_CH.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/de_CH.po	2023-07-28 12:22:10.079782039 +0200
@@ -6669,7 +6669,7 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
@@ -6733,7 +6733,7 @@
 msgstr ""
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 msgstr ""
 
 #: util/grub-set-default.in:56
diff -Naur grub-2.06/po/en@arabic.po grub-2.06-confd/po/en@arabic.po
--- grub-2.06/po/en@arabic.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/en@arabic.po	2023-07-28 12:22:10.079782039 +0200
@@ -6651,7 +6651,7 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
@@ -6729,7 +6729,7 @@
 msgstr "سعت تهع دعفاولت بووت معنو عنتري فور غروب."
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 msgstr "تهִيس رعقوִيرعس سعتتִينغ غروب_دعفاولت=ساوعد ִين %s/دعفاولت/غروب.\\ن"
 
 #: util/grub-set-default.in:56
diff -Naur grub-2.06/po/en@cyrillic.po grub-2.06-confd/po/en@cyrillic.po
--- grub-2.06/po/en@cyrillic.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/en@cyrillic.po	2023-07-28 12:22:10.079782039 +0200
@@ -6650,7 +6650,7 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
@@ -6728,7 +6728,7 @@
 msgstr "Сет тхе дефаулт боот мену ентрѝ фор ГРУБ."
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 msgstr "Тхис реќуирес сеттинг ГРУБ_ДЕФАУЛТ=савед ин %s/дефаулт/груб.\\н"
 
 #: util/grub-set-default.in:56
diff -Naur grub-2.06/po/en@greek.po grub-2.06-confd/po/en@greek.po
--- grub-2.06/po/en@greek.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/en@greek.po	2023-07-28 12:22:10.083115430 +0200
@@ -6650,7 +6650,7 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
@@ -6728,7 +6728,7 @@
 msgstr "Σετ τχε δεφαυλτ ϭοοτ μενυ εντρϋ φορ ΓΡΥϬ."
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 msgstr "Τχισ ρεϗυιρεσ σεττινγ ΓΡΥϬ_ΔΕΦΑΥΛΤ=σαβεδ ιν %s/δεφαυλτ/γρυϭ.\\ν"
 
 #: util/grub-set-default.in:56
diff -Naur grub-2.06/po/en@hebrew.po grub-2.06-confd/po/en@hebrew.po
--- grub-2.06/po/en@hebrew.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/en@hebrew.po	2023-07-28 12:22:10.083115430 +0200
@@ -6651,7 +6651,7 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
@@ -6729,7 +6729,7 @@
 msgstr "שעת תהע דעפֿאוּלת בּוֹוֹת מענוּ ענתריִ פֿוֹר גרוּבּ."
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 msgstr "תהִיש רעקוִּירעש שעתתִינג גרוּבּ_דעפֿאוּלת=שאבֿעד ִינ %s/דעפֿאוּלת/גרוּבּ.\\נ"
 
 #: util/grub-set-default.in:56
diff -Naur grub-2.06/po/en@piglatin.po grub-2.06-confd/po/en@piglatin.po
--- grub-2.06/po/en@piglatin.po	2021-06-08 16:49:39.000000000 +0200
+++ grub-2.06-confd/po/en@piglatin.po	2023-07-28 12:22:10.086448821 +0200
@@ -6801,7 +6801,7 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
@@ -6891,7 +6891,7 @@
 msgstr "etSay ethay efaultday ootbay enumay entryway orfay UBGRay."
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 msgstr ""
 "isThay equiresray ettingsay UBGRay_EFAULTDay=avedsay inway %s/efaultday/"
 "ubgray.\\n"
diff -Naur grub-2.06/po/en@quot.po grub-2.06-confd/po/en@quot.po
--- grub-2.06/po/en@quot.po	2021-06-08 16:49:38.000000000 +0200
+++ grub-2.06-confd/po/en@quot.po	2023-07-28 12:22:10.086448821 +0200
@@ -6672,12 +6672,12 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 
@@ -6750,8 +6750,8 @@
 msgstr "Set the default boot menu entry for GRUB."
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
-msgstr "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
+msgstr "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 
 #: util/grub-set-default.in:56
 msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
diff -Naur grub-2.06/po/eo.po grub-2.06-confd/po/eo.po
--- grub-2.06/po/eo.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/eo.po	2023-07-28 12:22:10.089782213 +0200
@@ -6620,7 +6620,7 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
@@ -6682,7 +6682,7 @@
 msgstr ""
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 msgstr ""
 
 #: util/grub-set-default.in:56
diff -Naur grub-2.06/po/es.po grub-2.06-confd/po/es.po
--- grub-2.06/po/es.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/es.po	2023-07-28 12:22:10.089782213 +0200
@@ -6860,13 +6860,13 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
 "Se han detectado errores de sintaxis en el fichero de\n"
 "configuración de GRUB generado.\n"
-"Asegurese de que no hay errores en /etc/default/grub\n"
+"Asegurese de que no hay errores en /etc/conf.d/grub\n"
 "en los ficheros /etc/grub.d/* o, por favor, abra una\n"
 "notificación de errores con el fichero %s adjunto."
 
@@ -6939,8 +6939,8 @@
 msgstr "Establece la entrada del menú predeterminada para GRUB."
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
-msgstr "Esto requere establecer GRUB_DEFAULT=saved en %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
+msgstr "Esto requere establecer GRUB_DEFAULT=saved en %s/conf.d/grub.\\n"
 
 #: util/grub-set-default.in:56
 msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
diff -Naur grub-2.06/po/fi.po grub-2.06-confd/po/fi.po
--- grub-2.06/po/fi.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/fi.po	2023-07-28 12:22:10.093115603 +0200
@@ -6709,12 +6709,12 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
 "Syntaksivirheitä havaittu luodussa GRUB-määritystiedostossa.\n"
-"Varmista, että /etc/default/grub- ja /etc/grub.d/* -tiedostoi\n"
+"Varmista, että /etc/conf.d/grub- ja /etc/grub.d/* -tiedostoi\n"
 "ei ole virheitä, tai tee vikailmoitus liittäen\n"
 "%s mukaan ilmoitukseen."
 
@@ -6796,9 +6796,9 @@
 msgstr "Aseta GRUBin käynnistysvalikon oletuskohta."
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 msgstr ""
-"Tämä vaatii asetuksen GRUB_DEFAULT=saved tiedostoon %s/default/grub.\\n"
+"Tämä vaatii asetuksen GRUB_DEFAULT=saved tiedostoon %s/conf.d/grub.\\n"
 
 #: util/grub-set-default.in:56
 msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
diff -Naur grub-2.06/po/fr.po grub-2.06-confd/po/fr.po
--- grub-2.06/po/fr.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/fr.po	2023-07-28 12:22:10.093115603 +0200
@@ -6803,13 +6803,13 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
 "Des erreurs de syntaxe sont détectées dans le fichier de configuration\n"
 "de GRUB. Veuillez vérifier qu'il n'y a pas d'erreur dans les fichiers\n"
-"/etc/default/grub et /etc/grub.d/*. Sinon veuillez signaler un bogue\n"
+"/etc/conf.d/grub et /etc/grub.d/*. Sinon veuillez signaler un bogue\n"
 "en joignant le fichier %s."
 
 #: util/grub-mkconfig.in:308
@@ -6889,9 +6889,9 @@
 msgstr "Configurer l'entrée de menu par défaut pour GRUB."
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 msgstr ""
-"Cela nécessite de configurer GRUB_DEFAULT=saved dans %s/default/grub.\\n"
+"Cela nécessite de configurer GRUB_DEFAULT=saved dans %s/conf.d/grub.\\n"
 
 #: util/grub-set-default.in:56
 msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
diff -Naur grub-2.06/po/gl.po grub-2.06-confd/po/gl.po
--- grub-2.06/po/gl.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/gl.po	2023-07-28 12:22:10.093115603 +0200
@@ -6796,12 +6796,12 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
 "Detectáronse erros sintácticos no ficheiro de configuración do GRUB xerado.\n"
-"Asegúrese de que non hai erros en /etc/default/grub\n"
+"Asegúrese de que non hai erros en /etc/conf.d/grub\n"
 "e nos ficheiros /etc/grub.d/* ou escriba un informe de erro co\n"
 "%s ficheiro anexado."
 
@@ -6866,9 +6866,9 @@
 msgstr "Estabelecer a entrada predeterminada do menú de arranque no GRUB."
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 msgstr ""
-"Isto require a opción GRUB_PREDETERMINADO=gardada en %s/default/grub.\\n"
+"Isto require a opción GRUB_PREDETERMINADO=gardada en %s/conf.d/grub.\\n"
 
 #: util/grub-set-default.in:56
 msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
diff -Naur grub-2.06/po/grub.pot grub-2.06-confd/po/grub.pot
--- grub-2.06/po/grub.pot	2021-06-08 16:49:35.000000000 +0200
+++ grub-2.06-confd/po/grub.pot	2023-07-28 12:22:42.247007447 +0200
@@ -6481,7 +6481,7 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
@@ -6543,7 +6543,7 @@
 msgstr ""
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 msgstr ""
 
 #: util/grub-set-default.in:56
diff -Naur grub-2.06/po/hr.po grub-2.06-confd/po/hr.po
--- grub-2.06/po/hr.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/hr.po	2023-07-28 12:22:10.096448995 +0200
@@ -6692,12 +6692,12 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
 "Greške sintakse su otkrivene u stvorenoj GRUB datoteci podešavanja.\n"
-"Pobrinite se da ne postoje greške u /etc/default/grub\n"
+"Pobrinite se da ne postoje greške u /etc/conf.d/grub\n"
 "i /etc/grub.d/* datotekama ili pošaljite izvješće greške s\n"
 "%s priloženoj datoteci."
 
@@ -6770,8 +6770,8 @@
 msgstr "Postavi zadanu stavku izbornika pokretanja za GRUB."
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
-msgstr "Ovo zahtijeva postavku GRUB_DEFAULT=spremljenju u %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
+msgstr "Ovo zahtijeva postavku GRUB_DEFAULT=spremljenju u %s/conf.d/grub.\\n"
 
 #: util/grub-set-default.in:56
 msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
diff -Naur grub-2.06/po/hu.po grub-2.06-confd/po/hu.po
--- grub-2.06/po/hu.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/hu.po	2023-07-28 12:22:10.096448995 +0200
@@ -6735,12 +6735,12 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
 "Szintaktikai hibák találhatók az előállított GRUB beállítófájlban.\n"
-"Győződjön meg arról, hogy nincsenek hibák a /etc/default/grub\n"
+"Győződjön meg arról, hogy nincsenek hibák a /etc/conf.d/grub\n"
 "és a /etc/grub.d/* fájlokban, vagy küldjön egy hibajelentést a(z)\n"
 "%s fájllal mellékelve."
 
@@ -6811,9 +6811,9 @@
 msgstr "A GRUB alapértelmezett rendszerindítási menübejegyzésének beállítása."
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 msgstr ""
-"Ez a GRUB_DEFAULT=saved beállítást igényli a(z) %s/default/grub fájlban.\\n"
+"Ez a GRUB_DEFAULT=saved beállítást igényli a(z) %s/conf.d/grub fájlban.\\n"
 
 #: util/grub-set-default.in:56
 msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
diff -Naur grub-2.06/po/id.po grub-2.06-confd/po/id.po
--- grub-2.06/po/id.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/id.po	2023-07-28 12:22:10.099782386 +0200
@@ -6777,7 +6777,7 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
@@ -6840,7 +6840,7 @@
 msgstr ""
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 msgstr ""
 
 #: util/grub-set-default.in:56
diff -Naur grub-2.06/po/it.po grub-2.06-confd/po/it.po
--- grub-2.06/po/it.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/it.po	2023-07-28 12:22:10.099782386 +0200
@@ -6779,7 +6779,7 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
@@ -6845,7 +6845,7 @@
 msgstr ""
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 msgstr ""
 
 #: util/grub-set-default.in:56
diff -Naur grub-2.06/po/ja.po grub-2.06-confd/po/ja.po
--- grub-2.06/po/ja.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/ja.po	2023-07-28 12:22:10.099782386 +0200
@@ -6622,7 +6622,7 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
@@ -6684,7 +6684,7 @@
 msgstr ""
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 msgstr ""
 
 #: util/grub-set-default.in:56
diff -Naur grub-2.06/po/ko.po grub-2.06-confd/po/ko.po
--- grub-2.06/po/ko.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/ko.po	2023-07-28 12:22:10.103115777 +0200
@@ -6604,7 +6604,7 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
@@ -6668,7 +6668,7 @@
 msgstr ""
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 msgstr ""
 
 #: util/grub-set-default.in:56
diff -Naur grub-2.06/po/lg.po grub-2.06-confd/po/lg.po
--- grub-2.06/po/lg.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/lg.po	2023-07-28 12:22:10.103115777 +0200
@@ -6509,7 +6509,7 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
@@ -6571,7 +6571,7 @@
 msgstr ""
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 msgstr ""
 
 #: util/grub-set-default.in:56
diff -Naur grub-2.06/po/lt.po grub-2.06-confd/po/lt.po
--- grub-2.06/po/lt.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/lt.po	2023-07-28 12:22:10.103115777 +0200
@@ -6670,12 +6670,12 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
 "Sukurtame GRUB konfigūracijos faile aptikta klaidų.\n"
-"Įsitikinkite, ar nėra klaidų /etc/default/grub\n"
+"Įsitikinkite, ar nėra klaidų /etc/conf.d/grub\n"
 "ir /etc/grub.d/* failuose arba praneškite apie klaidą\n"
 "prisegdami %s failą."
 
@@ -6738,8 +6738,8 @@
 msgstr "Nurodyti numatytąjį numatytąjį paleidimo GRUB meniu įrašą."
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
-msgstr "Tam reikia įrašyti GRUB_DEFAULT=saved faile %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
+msgstr "Tam reikia įrašyti GRUB_DEFAULT=saved faile %s/conf.d/grub.\\n"
 
 #: util/grub-set-default.in:56
 msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
diff -Naur grub-2.06/po/nb.po grub-2.06-confd/po/nb.po
--- grub-2.06/po/nb.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/nb.po	2023-07-28 12:22:10.106449169 +0200
@@ -6701,12 +6701,12 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
 "Generert GRUB-oppsettsfil inneholder syntaksfeil.\n"
-"Kontroller at grunnlaget i /etc/default/grub og /etc/grub.d/*\n"
+"Kontroller at grunnlaget i /etc/conf.d/grub og /etc/grub.d/*\n"
 "ikke innheholder feil, og send inn en feilrapport\n"
 "med %s vedlagt hvis du fremdeles har problemer."
 
@@ -6777,9 +6777,9 @@
 msgstr "Velg standardoppføring på GRUB-oppstartsmenyen."
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 msgstr ""
-"Dette krever at du gir en verdi til «GRUB_DEFAULT=» i fila %s/default/grub."
+"Dette krever at du gir en verdi til «GRUB_DEFAULT=» i fila %s/conf.d/grub."
 "\\n"
 
 #: util/grub-set-default.in:56
diff -Naur grub-2.06/po/nl.po grub-2.06-confd/po/nl.po
--- grub-2.06/po/nl.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/nl.po	2023-07-28 12:22:10.106449169 +0200
@@ -6751,12 +6751,12 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
 "Er zijn syntaxfouten gevonden in het aangemaakte GRUB-configuratiebestand.\n"
-"Verzeker u ervan dat er geen fouten zitten in het bestand /etc/default/grub\n"
+"Verzeker u ervan dat er geen fouten zitten in het bestand /etc/conf.d/grub\n"
 "noch in de bestanden in /etc/grub.d/.  Rapporteer anders een fout, met het\n"
 "bestand %s als bijlage."
 
@@ -6826,9 +6826,9 @@
 msgstr "Het standaardmenu-item voor GRUB instellen."
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 msgstr ""
-"Dit vereist het instellen van GRUB_DEFAULT=saved in %s/default/grub.\\n"
+"Dit vereist het instellen van GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 
 #: util/grub-set-default.in:56
 msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
diff -Naur grub-2.06/po/pa.po grub-2.06-confd/po/pa.po
--- grub-2.06/po/pa.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/pa.po	2023-07-28 12:22:10.109782560 +0200
@@ -6562,7 +6562,7 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
@@ -6624,7 +6624,7 @@
 msgstr "ਗਰਬ ਲਈ ਮੂਲ ਬੂਟ ਮੇਨੂ ਐਂਟਰੀ ਸੈੱਟ ਕਰੋ।"
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 msgstr ""
 
 #: util/grub-set-default.in:56
diff -Naur grub-2.06/po/pl.po grub-2.06-confd/po/pl.po
--- grub-2.06/po/pl.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/pl.po	2023-07-28 12:22:10.109782560 +0200
@@ -6723,12 +6723,12 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
 "W wygenerowanym pliku konfiguracyjnym GRUB-a wykryto błędy składni.\n"
-"Proszę się upewnić, że nie ma błędów w plikach /etc/default/grub\n"
+"Proszę się upewnić, że nie ma błędów w plikach /etc/conf.d/grub\n"
 "oraz /etc/grub.d/* albo wypełnić raport błędu z załączonym plikiem\n"
 "%s."
 
@@ -6804,8 +6804,8 @@
 msgstr "Ustawia domyślny wpis menu dla GRUB-a."
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
-msgstr "Wymaga to ustawienia GRUB_DEFAULT=saved w %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
+msgstr "Wymaga to ustawienia GRUB_DEFAULT=saved w %s/conf.d/grub.\\n"
 
 #: util/grub-set-default.in:56
 msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
diff -Naur grub-2.06/po/pt.po grub-2.06-confd/po/pt.po
--- grub-2.06/po/pt.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/pt.po	2023-07-28 12:22:10.109782560 +0200
@@ -6709,12 +6709,12 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
 "Erros de sintaxe são detectados no ficheiro de configuração GRUB.\n"
-"gerado. Assegure-se de que não há erros em /etc/default/grub\n"
+"gerado. Assegure-se de que não há erros em /etc/conf.d/grub\n"
 "e /etc/grub.d/* files ou, por favor, envie um relatório com\n"
 "o ficheiro %s anexado."
 
@@ -6788,8 +6788,8 @@
 msgstr "Predefinir a entrada GRUB de arranque."
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
-msgstr "Isto requer definir GRUB_DEFAULT= gravado em %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
+msgstr "Isto requer definir GRUB_DEFAULT= gravado em %s/conf.d/grub.\\n"
 
 #: util/grub-set-default.in:56
 msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
diff -Naur grub-2.06/po/pt_BR.po grub-2.06-confd/po/pt_BR.po
--- grub-2.06/po/pt_BR.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/pt_BR.po	2023-07-28 12:22:10.113115952 +0200
@@ -6763,7 +6763,7 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
@@ -6827,7 +6827,7 @@
 msgstr "Definir a entrada do menu padrão para o GRUB."
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 msgstr ""
 
 #: util/grub-set-default.in:56
diff -Naur grub-2.06/po/ro.po grub-2.06-confd/po/ro.po
--- grub-2.06/po/ro.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/ro.po	2023-07-28 12:22:10.113115952 +0200
@@ -6590,7 +6590,7 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
@@ -6654,7 +6654,7 @@
 msgstr ""
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 msgstr ""
 
 #: util/grub-set-default.in:56
diff -Naur grub-2.06/po/ru.po grub-2.06-confd/po/ru.po
--- grub-2.06/po/ru.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/ru.po	2023-07-28 12:22:10.116449342 +0200
@@ -6718,12 +6718,12 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
 "В сгенерированном файле настроек GRUB обнаружены синтаксические ошибки.\n"
-"Убедитесь, что в файлах /etc/default/grub\n"
+"Убедитесь, что в файлах /etc/conf.d/grub\n"
 "и /etc/grub.d/* ошибки отсутствуют или пошлите сообщение об ошибке\n"
 "в прикреплённым файлом %s."
 
@@ -6798,8 +6798,8 @@
 msgstr "Назначает пункт меню GRUB для загрузки по умолчанию."
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
-msgstr "Для этого требуется строка GRUB_DEFAULT=saved в %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
+msgstr "Для этого требуется строка GRUB_DEFAULT=saved в %s/conf.d/grub.\\n"
 
 #: util/grub-set-default.in:56
 msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
diff -Naur grub-2.06/po/sl.po grub-2.06-confd/po/sl.po
--- grub-2.06/po/sl.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/sl.po	2023-07-28 12:22:10.116449342 +0200
@@ -6756,12 +6756,12 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
 "V ustvarjeni nastavitveni datoteki GRUB so zaznane napake\n"
-" skladnje. Prepričajte se, da v datotekah /etc/default/grub in\n"
+" skladnje. Prepričajte se, da v datotekah /etc/conf.d/grub in\n"
 "/etc/grub.d/* ni napak ali pa pošljite poročilo o hrošču s pripeto\n"
 "datoteko %s."
 
@@ -6822,7 +6822,7 @@
 msgstr "Nastavi privzeti vnos menija zagona za GRUB."
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 msgstr ""
 
 #: util/grub-set-default.in:56
diff -Naur grub-2.06/po/sr.po grub-2.06-confd/po/sr.po
--- grub-2.06/po/sr.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/sr.po	2023-07-28 12:22:10.119782734 +0200
@@ -6696,12 +6696,12 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
 "Откривене су грешке синтаксе у створеној датотеци подешавања ГРУБ-а.\n"
-"Проверите да ли има грешака у датотекама „/etc/default/grub“\n"
+"Проверите да ли има грешака у датотекама „/etc/conf.d/grub“\n"
 "и „/etc/grub.d/*“ или попуните извештај о грешкама\n"
 "и приложите датотеку „%s“."
 
@@ -6777,8 +6777,8 @@
 msgstr "Подешава основни унос изборника подизања за ГРУБ."
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
-msgstr "Ово захтева подешавање „GRUB_DEFAULT=saved“ у „%s/default/grub“.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
+msgstr "Ово захтева подешавање „GRUB_DEFAULT=saved“ у „%s/conf.d/grub“.\\n"
 
 #: util/grub-set-default.in:56
 msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
diff -Naur grub-2.06/po/sv.po grub-2.06-confd/po/sv.po
--- grub-2.06/po/sv.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/sv.po	2023-07-28 12:22:10.119782734 +0200
@@ -6688,12 +6688,12 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
 "Syntaxfel upptäcktes i den genererade GRUB-konfigurationsfilen.\n"
-"Kontrollera att det inte finns några fel i /etc/default/grub-\n"
+"Kontrollera att det inte finns några fel i /etc/conf.d/grub-\n"
 "och /etc/grub.d/*-filerna eller skicka in en felrapport med\n"
 "bifogad %s-fil."
 
@@ -6766,8 +6766,8 @@
 msgstr "Ange standardpost för GRUBs startmeny."
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
-msgstr "Detta kräver inställningen GRUB_DEFAULT=saved i %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
+msgstr "Detta kräver inställningen GRUB_DEFAULT=saved i %s/conf.d/grub.\\n"
 
 #: util/grub-set-default.in:56
 msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
diff -Naur grub-2.06/po/tr.po grub-2.06-confd/po/tr.po
--- grub-2.06/po/tr.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/tr.po	2023-07-28 12:22:10.123116125 +0200
@@ -6601,7 +6601,7 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
@@ -6665,8 +6665,8 @@
 msgstr "GRUB için öntanımlı önyükleme menü girdisini ayarla."
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
-msgstr "Bu, %s/default/grub içinde GRUB_DEFAULT=saved olmasını gerektirir.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
+msgstr "Bu, %s/conf.d/grub içinde GRUB_DEFAULT=saved olmasını gerektirir.\\n"
 
 #: util/grub-set-default.in:56
 msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
diff -Naur grub-2.06/po/uk.po grub-2.06-confd/po/uk.po
--- grub-2.06/po/uk.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/uk.po	2023-07-28 12:22:10.123116125 +0200
@@ -6778,12 +6778,12 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
 "Виявлено синтаксичні помилки у файлі налаштувань GRUB.\n"
-"Переконайтеся, що у файлах /etc/default/grub і /etc/grub.d/*\n"
+"Переконайтеся, що у файлах /etc/conf.d/grub і /etc/grub.d/*\n"
 "немає помилок, будь ласка, створіть звіт щодо вади з\n"
 "долученням файла %s."
 
@@ -6861,8 +6861,8 @@
 msgstr "Встановити типовий пункт меню завантаження для GRUB."
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
-msgstr "Потребує встановлення GRUB_DEFAULT=saved у %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
+msgstr "Потребує встановлення GRUB_DEFAULT=saved у %s/conf.d/grub.\\n"
 
 #: util/grub-set-default.in:56
 msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
diff -Naur grub-2.06/po/vi.po grub-2.06-confd/po/vi.po
--- grub-2.06/po/vi.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/vi.po	2023-07-28 12:22:10.126449516 +0200
@@ -6745,12 +6745,12 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
 "Các lỗi cú pháp đã được phát hiện trong tập tin cấu hình GRUB đã tạo.\n"
-"Hãy chắc chắn rằng không có lỗi nào trong tập tin /etc/default/grub\n"
+"Hãy chắc chắn rằng không có lỗi nào trong tập tin /etc/conf.d/grub\n"
 "và /etc/grub.d/* hoặc báo cáo tập tin lỗi này bằng cách đính\n"
 "kèm tập tin %s."
 
@@ -6823,8 +6823,8 @@
 msgstr "Đặt mục menu khởi động mặc định cho GRUB."
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
-msgstr "Cái này yêu cầu cài đặt GRUB_DEFAULT=saved trong %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
+msgstr "Cái này yêu cầu cài đặt GRUB_DEFAULT=saved trong %s/conf.d/grub.\\n"
 
 #: util/grub-set-default.in:56
 msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
diff -Naur grub-2.06/po/zh_CN.po grub-2.06-confd/po/zh_CN.po
--- grub-2.06/po/zh_CN.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/zh_CN.po	2023-07-28 12:22:10.126449516 +0200
@@ -6600,12 +6600,12 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
 "生成的 GRUB 配置文件中探测到了语法错误。\n"
-"请确保 /etc/default/grub 和 /etc/grub/*\n"
+"请确保 /etc/conf.d/grub 和 /etc/grub/*\n"
 "文件中没有错误，或者请提交一个错误报告并\n"
 "附加 %s 文件。"
 
@@ -6668,7 +6668,7 @@
 msgstr "设置 GRUB 默认引导菜单项。"
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 msgstr ""
 
 #: util/grub-set-default.in:56
diff -Naur grub-2.06/po/zh_TW.po grub-2.06-confd/po/zh_TW.po
--- grub-2.06/po/zh_TW.po	2021-06-08 16:49:36.000000000 +0200
+++ grub-2.06-confd/po/zh_TW.po	2023-07-28 12:22:10.126449516 +0200
@@ -6699,7 +6699,7 @@
 #: util/grub-mkconfig.in:295
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
-"Ensure that there are no errors in /etc/default/grub\n"
+"Ensure that there are no errors in /etc/conf.d/grub\n"
 "and /etc/grub.d/* files or please file a bug report with\n"
 "%s file attached."
 msgstr ""
@@ -6762,7 +6762,7 @@
 msgstr ""
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 msgstr ""
 
 #: util/grub-set-default.in:56
diff -Naur grub-2.06/util/grub-mkconfig.in grub-2.06-confd/util/grub-mkconfig.in
--- grub-2.06/util/grub-mkconfig.in	2021-03-10 14:42:22.000000000 +0100
+++ grub-2.06-confd/util/grub-mkconfig.in	2023-07-28 13:35:48.848621018 +0200
@@ -157,8 +157,8 @@
 	GRUB_EARLY_INITRD_LINUX_STOCK="intel-uc.img intel-ucode.img amd-uc.img amd-ucode.img early_ucode.cpio microcode.cpio"
 fi
 
-if test -f ${sysconfdir}/default/grub ; then
-  . ${sysconfdir}/default/grub
+if test -f ${sysconfdir}/conf.d/grub ; then
+  . ${sysconfdir}/conf.d/grub
 fi
 
 if [ "x${GRUB_DISABLE_UUID}" = "xtrue" ]; then
@@ -267,7 +267,7 @@
 # DO NOT EDIT THIS FILE
 #
 # It is automatically generated by $self using templates
-# from ${grub_mkconfig_dir} and settings from ${sysconfdir}/default/grub
+# from ${grub_mkconfig_dir} and settings from ${sysconfdir}/conf.d/grub
 #
 EOF
 
@@ -293,7 +293,7 @@
   if ! ${grub_script_check} ${grub_cfg}.new; then
     # TRANSLATORS: %s is replaced by filename
     gettext_printf "Syntax errors are detected in generated GRUB config file.
-Ensure that there are no errors in /etc/default/grub
+Ensure that there are no errors in /etc/conf.d/grub
 and /etc/grub.d/* files or please file a bug report with
 %s file attached." "${grub_cfg}.new" >&2
     echo >&2
diff -Naur grub-2.06/util/grub-set-default.in grub-2.06-confd/util/grub-set-default.in
--- grub-2.06/util/grub-set-default.in	2018-11-24 18:13:02.000000000 +0100
+++ grub-2.06-confd/util/grub-set-default.in	2023-07-28 13:34:52.027618960 +0200
@@ -46,7 +46,7 @@
 usage () {
     gettext_printf "Usage: %s [OPTION] MENU_ENTRY\n" "$self"
     gettext "Set the default boot menu entry for GRUB."; echo
-    gettext_printf "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\n" "$sysconfdir"
+    gettext_printf "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\n" "$sysconfdir"
     echo
     print_option_help "-h, --help" "$(gettext "print this message and exit")"
     print_option_help "-V, --version" "$(gettext "print the version information and exit")"
diff -Naur grub-2.06/util/grub.d/README grub-2.06-confd/util/grub.d/README
--- grub-2.06/util/grub.d/README	2018-11-24 18:13:02.000000000 +0100
+++ grub-2.06-confd/util/grub.d/README	2023-07-28 13:36:06.882272317 +0200
@@ -8,4 +8,4 @@
 The number namespace in-between is configurable by system installer and/or
 administrator.  For example, you can add an entry to boot another OS as
 01_otheros, 11_otheros, etc, depending on the position you want it to occupy in
-the menu; and then adjust the default setting via /etc/default/grub.
+the menu; and then adjust the default setting via /etc/conf.d/grub.