grub/patches/grub-2.02-confd-2.patch

diff -Naur grub-2.02~rc2/ChangeLog-2015 grub-2.02~rc2-confd/ChangeLog-2015
--- grub-2.02~rc2/ChangeLog-2015	2017-02-11 23:25:13.000000000 +0100
+++ grub-2.02~rc2-confd/ChangeLog-2015	2017-04-04 12:57:04.748016116 +0200
@@ -48591,7 +48591,7 @@
 
 	* util/grub.d/00_header.in: Set default gfxmode to `800x600x16'.
 
-	* util/update-grub.in: Add a reference to ${sysconfdir}/default/grub in
+	* util/update-grub.in: Add a reference to ${sysconfdir}/conf.d/grub in
 	the grub.cfg header message.
 
 2007-05-11  Robert Millan  <rmh@aybabtu.com>
diff -Naur grub-2.02~rc2/docs/grub.info grub-2.02~rc2-confd/docs/grub.info
--- grub-2.02~rc2/docs/grub.info	2017-03-14 01:02:27.000000000 +0100
+++ grub-2.02~rc2-confd/docs/grub.info	2017-04-04 12:57:04.758016008 +0200
@@ -1155,7 +1155,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
@@ -1163,7 +1163,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
@@ -1670,7 +1670,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):
 
@@ -2461,7 +2461,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.02~rc2/docs/grub.texi grub-2.02~rc2-confd/docs/grub.texi
--- grub-2.02~rc2/docs/grub.texi	2017-02-11 23:25:13.000000000 +0100
+++ grub-2.02~rc2-confd/docs/grub.texi	2017-04-04 12:57:04.766015922 +0200
@@ -1238,7 +1238,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
@@ -1248,7 +1248,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
@@ -1753,7 +1753,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):
 
@@ -2525,7 +2525,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.02~rc2/po/ast.po grub-2.02~rc2-confd/po/ast.po
--- grub-2.02~rc2/po/ast.po	2017-03-15 09:41:18.000000000 +0100
+++ grub-2.02~rc2-confd/po/ast.po	2017-04-04 12:57:04.794015621 +0200
@@ -6643,7 +6643,7 @@
 #: util/grub-mkconfig.in:271
 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 ""
@@ -6696,7 +6696,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.02~rc2/po/ca.gmo grub-2.02~rc2-confd/po/ca.gmo
--- grub-2.02~rc2/po/ca.gmo	2017-03-15 09:41:37.000000000 +0100
+++ grub-2.02~rc2-confd/po/ca.gmo	2017-04-04 12:57:04.875014748 +0200
@@ -151,12 +151,12 @@
 Specify filename.Specify hash to use.Specify one or more font files to load.Specify size for each read operationSpecify the number of input files.Speed: %s 
 Start GDB stub on given portStop GDB stubStorage information for `%s' does not include typeStorage information for `%s' indicates neither a plain partition nor a plain diskStore matched component NUMBER in VARNAME.SuccessSundaySuppress normal output (warnings remain).Switch to native disk drivers. If no modules are specified default set (pata,ahci,usbms,ohci,uhci,ehci) is usedSyntax error at line %u
 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.System management bus controller I/O space is at 0x%x
 TTARGETTHEMESTarget format not specified (use the -O option).Terminal has specified geometry.Terminal is ASCII-only [default].Terminal is logical-ordered UTF-8.Terminal is visually-ordered UTF-8.Test USB support.Test bit at BYTE:BIT in CMOS.Test file read speed.Test if REGEXP matches STRING.Test video subsystem in mode WxH.Test video subsystem.Text-only The files are identical.
 The highlighted entry will be executed automatically in %ds.This VDEV is a RAIDZ%llu
-This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/default/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
+This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
 Trailing backslashTransform 64-bit UUID to format suitable for XNU. If -l is given keep it lowercase as done by blkid.Transform a system filename into GRUB one.Transform syslinux config into GRUB one.Translate SET1 characters to SET2 in STRING.Translate to lower case.Translate to upper case.Translates the string with the current settings.Try '%s --help' or '%s --usage' for more information.
 TuesdayUSER PASSWORDUSER PBKDF2_PASSWORDUSERNAME[,USERNAME]UTF-8Unable to create pipe: %sUnable to determine your platform. Use --target.Unable to fork: %sUnable to open stream from %s: %sUnable to retrieve pool stateUncompress data.Uncompress file before checksumming.Unknown address type %d
 Unknown command `%s'.
@@ -304,11 +304,11 @@
 Especifica el nom del fitxer.Especifica el hash que cal utilitzar.Especifiqueu un o més fitxers de fonts que vulgueu carregar.Especifica la mida per cada operació de lecturaEspecifica el nombre de fitxers d'entrada.Velocitat: %s
 Inicia l'estub del GDB al port indicatAtura l'estub del GDBLa informació d'emmagatzemament de «%s» no inclou el tipusLa informació d'emmagatzemament de «%s» no indica ni una partició senzilla ni un disc senzillDesa el component coincident NÚMERO a NOMVARIABLE.ÈxitDiumengeSuprimeix la sortida normal (conserva els avisos).Canvia al controlador de discs nadiu. Si no s'especifica cap mòdul es fa servir el conjunt per defecte (pata,ahci,usbms,ohci,uhci,ehci)Hi ha un error de sintaxi a la línia %u
 S'han detectat errors de sintaxi al fitxer de configuració del GRUB generat.
-Assegureu-vos que no hi ha errors a /etc/default/grub o als fitxers
+Assegureu-vos que no hi ha errors a /etc/conf.d/grub o als fitxers
  /etc/grub.d/* o bé envieu un informe d'error adjuntant el fitxer %s L'espai I/O del controlador de bus de gestió del sistema és a 0x%x
 TOBJECTIUTHEMESNo s'ha especificat el format de l'objectiu (utilitzeu l'opció -O).El terminal té una geometria específica.El terminal és només ASCII [per defecte].El terminal està ordenat lògicament en UTF-8.El Terminal està ordenat visualment en UTF-8.Prova la compatibilitat amb USB.Comprova el bit a BYTE:BIT a CMOS.Prova la velocitat de lectura del fitxer.Comprova si l'EXPREG coincideix amb la CADENA.Prova els subsistema de vídeo en mode Ample x Alt.Prova el subsistema de vídeo.Només text Els fitxers són idèntics.
 L'entrada realçada s'executarà automàticament d'aquí %d s.Aquest VDEV és un RAIDZ%llu
-Aquest VDEV és un mirallQualsevol usuari pot arrencar aquesta entrada.Necessita configurar GRUB_DEFAULT=saved a %s/default/grub.\nDijousTiBTiB/sEina per editar el bloc d'entorn.Mida total de la flash: %d B.
+Aquest VDEV és un mirallQualsevol usuari pot arrencar aquesta entrada.Necessita configurar GRUB_DEFAULT=saved a %s/conf.d/grub.\nDijousTiBTiB/sEina per editar el bloc d'entorn.Mida total de la flash: %d B.
 Contrabarra finalTransforma un UUID de 64 bits a un format adient per XNU. Amb l'opció -l el manté en minúscules tal i com fa blkid.Transforma un nom de fitxer del sistema en un del GRUBTransforma la configuració de syslinux en una de GRUB.Tradueix els caràcters del GRUP1 en els del GRUP2 a la CADENA.Tradueix a minúscules.Tradueix a majúscules.Tradueix la cadena amb la configuració actual.Proveu «%s --help» o «%s --usage» per a obtenir més informació.
 DimartsCONTRASENYA D'USUARICONTRASENYA_PBKDF2 D'USUARINOMUSUARI[,NOMUSUARI]UTF-8No s'ha pogut crear el conducte: %sNo s'ha pogut determinar la vostra plataforma. Utilitzeu --target.No s'ha pogut bifurcar: %sNo es pot obrir el flux de dades de %s: %sNo es pot obtenir l'estat del conjuntDescomprimeix les dades.Descomprimeix el fitxer abans de fer la suma de verificacióel tipus d'adreça %d és desconegut
 L'ordre «%s» és desconeguda.
diff -Naur grub-2.02~rc2/po/ca.po grub-2.02~rc2-confd/po/ca.po
--- grub-2.02~rc2/po/ca.po	2017-03-15 09:41:18.000000000 +0100
+++ grub-2.02~rc2-confd/po/ca.po	2017-04-04 12:57:04.919014274 +0200
@@ -6620,13 +6620,13 @@
 #: util/grub-mkconfig.in:271
 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:283
@@ -6688,8 +6688,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.02~rc2/po/da.gmo grub-2.02~rc2-confd/po/da.gmo
--- grub-2.02~rc2/po/da.gmo	2017-03-15 09:41:37.000000000 +0100
+++ grub-2.02~rc2-confd/po/da.gmo	2017-04-04 12:57:04.767015911 +0200
@@ -139,12 +139,12 @@
 Specify filename.Specify hash to use.Specify one or more font files to load.Specify size for each read operationSpecify the number of input files.Speed: %s 
 Start GDB stub on given portStop GDB stubStorage information for `%s' does not include typeStorage information for `%s' indicates neither a plain partition nor a plain diskStore matched component NUMBER in VARNAME.SuccessSundaySuppress normal output (warnings remain).Switch to native disk drivers. If no modules are specified default set (pata,ahci,usbms,ohci,uhci,ehci) is usedSyntax error at line %u
 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.System management bus controller I/O space is at 0x%x
 TTARGETTHEMESTarget format not specified (use the -O option).Terminal has specified geometry.Terminal is ASCII-only [default].Terminal is logical-ordered UTF-8.Terminal is visually-ordered UTF-8.Test USB support.Test bit at BYTE:BIT in CMOS.Test file read speed.Test if REGEXP matches STRING.Test video subsystem in mode WxH.Test video subsystem.Text-only The files are identical.
 The highlighted entry will be executed automatically in %ds.This VDEV is a RAIDZ%llu
-This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/default/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
+This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
 Trailing backslashTransform 64-bit UUID to format suitable for XNU. If -l is given keep it lowercase as done by blkid.Transform a system filename into GRUB one.Transform syslinux config into GRUB one.Translate SET1 characters to SET2 in STRING.Translate to lower case.Translate to upper case.Translates the string with the current settings.Try '%s --help' or '%s --usage' for more information.
 TuesdayUSER PASSWORDUSER PBKDF2_PASSWORDUSERNAME[,USERNAME]UTF-8Unable to create pipe: %sUnable to determine your platform. Use --target.Unable to fork: %sUnable to open stream from %s: %sUnable to retrieve pool stateUncompress data.Uncompress file before checksumming.Unknown address type %d
 Unknown command `%s'.
@@ -293,11 +293,11 @@
 Start GDB-stub på den givne portStop GDB-stubLagerinformation for "%s" inkluderer ikke typeLageroplysninger for "%s" angiver hverken en simpel partition eller en simpel diskGem matchet komponent NUMMER i VARNAVN.SuccesSøndagUndertryk normal udskrift (advarsler vises stadig).Skift til platformsspecifikke diskdrivere. Hvis der ikke er angivet nogen moduler, bruges standardmodulerne (pata,ahci,usbms,ohci,uhci,ehci)Syntaksfejl på linje %u
 Der blev fundet syntaksfejl i den genererede GRUB-
 konfigurationsfil.  Sikr dig at der ikke er nogen fejl
-i filerne /etc/default/grub eller /etc/grub.d/*, eller
+i filerne /etc/conf.d/grub eller /etc/grub.d/*, eller
 indsend venligst en fejlrapport med filen %s vedhæftet.I/O-pladsen for controlleren til systemhåndteringsbussen er 0x%x
 TMÅLTEMAERMålformatet er ikke angivet (brug tilvalget -O).Terminal har angivet geometri.Terminal bruger kun ASCII [standard].Terminal bruger logisk ordnet UTF-8.Terminal bruger visuelt ordnet UTF-8.Test USB-understøttelse.Test bit ved BYTE:BIT i CMOS.Test fillæsehastighed.Tjek om REGUDTRYK matcher STRENG.Test videoundersystemet i tilstanden BxH.Test videoundersystem.Kun tekst Filerne er identiske.
 Det fremhævede punkt køres automatisk om %d s.Denne VDEV er en RAIDZ%llu
-Denne VDEV er et spejlDette punkt kan startes op af enhver bruger.Dette kræver at GRUB_DEFAULT=saved angives i %s/default/grub.\nTorsdagTiBTiB/sVærktøj til at redigere miljøblokken.Størrelse af flash i alt: %d B.
+Denne VDEV er et spejlDette punkt kan startes op af enhver bruger.Dette kræver at GRUB_DEFAULT=saved angives i %s/conf.d/grub.\nTorsdagTiBTiB/sVærktøj til at redigere miljøblokken.Størrelse af flash i alt: %d B.
 Afsluttende omvendt skråstregKonvertér 64-bit-UUID til format, der passer til XNU. Hvis -l er givet, så behold det i små bogstaver jævnfør blkid.Lav et systemfilnavn til et GRUB-filnavn.Transformér syslinux-konfiguration til GRUB-konfiguration.Erstat SÆT1-tegn med SÆT2-tegn i STRENG.Skift til små bogstaver.Skift til store bogstaver.Oversætter strengen med de nuværende indstillinger.Prøv "%s --help" eller "%s --usage" for at få yderligere information.
 TirsdagBRUGER ADGANGSKODEBRUGER PBKDF2-ADGANGSKODEBRUGERNAVN[,BRUGERNAVN]UTF-8Kan ikke oprette datakanal: %sKan ikke bestemme din platform. Brug --target.Kan ikke udføre fork: %sKan ikke åbne strøm fra %s: %sKan ikke hente pool-tilstandUdpak komprimerede data.Udpak fil før tjeksumsberegning.Ukendt adressetype %d
 Ukendt kommando "%s".
diff -Naur grub-2.02~rc2/po/da.po grub-2.02~rc2-confd/po/da.po
--- grub-2.02~rc2/po/da.po	2017-03-15 09:41:18.000000000 +0100
+++ grub-2.02~rc2-confd/po/da.po	2017-04-04 12:57:04.883014662 +0200
@@ -6588,13 +6588,13 @@
 #: util/grub-mkconfig.in:271
 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:283
@@ -6652,8 +6652,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.02~rc2/po/de_CH.gmo grub-2.02~rc2-confd/po/de_CH.gmo
--- grub-2.02~rc2/po/de_CH.gmo	2017-03-15 09:41:37.000000000 +0100
+++ grub-2.02~rc2-confd/po/de_CH.gmo	2017-04-04 12:57:04.986013553 +0200
@@ -133,12 +133,12 @@
 Specify filename.Specify hash to use.Specify one or more font files to load.Specify size for each read operationSpecify the number of input files.Speed: %s 
 Start GDB stub on given portStop GDB stubStorage information for `%s' does not include typeStorage information for `%s' indicates neither a plain partition nor a plain diskStore matched component NUMBER in VARNAME.SuccessSundaySuppress normal output (warnings remain).Switch to native disk drivers. If no modules are specified default set (pata,ahci,usbms,ohci,uhci,ehci) is usedSyntax error at line %u
 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.System management bus controller I/O space is at 0x%x
 TTARGETTHEMESTarget format not specified (use the -O option).Terminal has specified geometry.Terminal is ASCII-only [default].Terminal is logical-ordered UTF-8.Terminal is visually-ordered UTF-8.Test USB support.Test bit at BYTE:BIT in CMOS.Test file read speed.Test if REGEXP matches STRING.Test video subsystem in mode WxH.Test video subsystem.Text-only The files are identical.
 The highlighted entry will be executed automatically in %ds.This VDEV is a RAIDZ%llu
-This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/default/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
+This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
 Trailing backslashTransform 64-bit UUID to format suitable for XNU. If -l is given keep it lowercase as done by blkid.Transform a system filename into GRUB one.Transform syslinux config into GRUB one.Translate SET1 characters to SET2 in STRING.Translate to lower case.Translate to upper case.Translates the string with the current settings.Try '%s --help' or '%s --usage' for more information.
 TuesdayUSER PASSWORDUSER PBKDF2_PASSWORDUSERNAME[,USERNAME]UTF-8Unable to create pipe: %sUnable to determine your platform. Use --target.Unable to fork: %sUnable to open stream from %s: %sUnable to retrieve pool stateUncompress data.Uncompress file before checksumming.Unknown address type %d
 Unknown command `%s'.
@@ -286,11 +286,11 @@
 GDB-Stub auf dem angegebenen Port startenGDB-Stub stoppenSpeicherinfo für «%s» enthält keinen TypSpeicherinformation für «%s» weist weder auf eine Partition noch einen Datenträger hinEntsprechende Komponenten-NUMMER in VARNAME speichern.ErfolgSonntagNormale Ausgaben unterdrücken (Warnungen verbleiben)Zu nativen Festplattentreibern wechseln. Falls keine Module angegeben werden, wird die Vorgabe verwendet (pata,ahci,usbms,ohci,uhci,ehci).Syntaxfehler in Zeile %u
 In der erzeugten GRUB-Konfigurationsdatei wurden
 Syntaxfehler entdeckt. Stellen Sie sicher, das die Dateien
-/etc/default/grub und /etc/grub.d/* fehlerfrei sind oder
+/etc/conf.d/grub und /etc/grub.d/* fehlerfrei sind oder
 erstellen Sie einen Fehlerbericht mit %s als Anhang.Ein-/Ausgabebereich des Systemverwaltungsbus-Controllers ist bei 0x%x
 TZIELTHEMENZielformat wurde nicht angegeben (verwenden Sie die Option -0).Terminalgeometrie wurde festgelegt.Terminal ist nur ASCII [Vorgabe].Terminal ist logisches UTF-8.Terminal ist visuelles UTF-8.USB-Unterstützung überprüfen.Bit bei BYTE:BIT im CMOS testen.Dateilesegeschwindigkeit testen.Prüfen, ob REGEXP auf ZEICHENKETTE passt.Das Video-Subsystem im Modus BxH überprüfen.Das Video-Subsystem überprüfen.Nur TextDie Dateien sind identisch.
 Der hervorgehobene Eintrag wird automatisch in %ds ausgeführt.Dieses VDEV ist ein RAIDZ%llu
-Dieses VDEV ist ein SpiegelDieser Eintrag kann von jedem Benutzer gebootet werden.Dies erfordert die Einstellung GRUB_DEFAULT=saved in %s/default/grub.\nDonnerstagTiBTiB/sWerkzeug zum Bearbeiten einer Umgebungs-Blockdatei.Flash-Gesamtgrösse: %d B.
+Dieses VDEV ist ein SpiegelDieser Eintrag kann von jedem Benutzer gebootet werden.Dies erfordert die Einstellung GRUB_DEFAULT=saved in %s/conf.d/grub.\nDonnerstagTiBTiB/sWerkzeug zum Bearbeiten einer Umgebungs-Blockdatei.Flash-Gesamtgrösse: %d B.
 Angehängter Backslash64-bit-UUID in ein von XNU verarbeitbares Format umwandeln. Falls -l angegeben ist, bitte Kleinschreibung beibehalten (wie von blkid)Einen Systemdateinamen in einen für GRUB umwandeln.Syslinux-Konfigurationsdatei in eine für GRUB umwandeln.Zeichen der MENGE1 in Zeichen der MENGE2 in ZEICHENKETTE übersetzen.In Kleinschreibung umwandeln.In Grossschreibung umwandeln.Übersetzt die Zeichenkette anhand den aktuellen Einstellungen.Rufen Sie «%s --help» oder «%s --usage» auf, um weitere Informationen zu erhalten.
 DienstagBENUTZERPASSWORTBENUTZER PBKDF2_PASSWORTBENUTZERNAME[,BENUTZERNAME]UTF-8Weiterleitung konnte nicht angelegt werden: %sIhre Plattform konnte nicht erkannt werden. Verwenden Sie --target.Fork konnte nicht angelegt werden: %sDatenstrom von %s konnte nicht geöffnet werden: %sPool-Status konnte nicht ermittelt werdenDaten entpacken.Datei entpacken, bevor Prüfsumme ermittelt wird.Unbekannter Adresstyp %d
 Unbekannter Befehl «%s».
diff -Naur grub-2.02~rc2/po/de_CH.po grub-2.02~rc2-confd/po/de_CH.po
--- grub-2.02~rc2/po/de_CH.po	2017-03-15 09:41:18.000000000 +0100
+++ grub-2.02~rc2-confd/po/de_CH.po	2017-04-04 12:57:04.967013757 +0200
@@ -6599,13 +6599,13 @@
 #: util/grub-mkconfig.in:271
 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\n"
 "Syntaxfehler entdeckt. Stellen Sie sicher, das die Dateien\n"
-"/etc/default/grub und /etc/grub.d/* fehlerfrei sind oder\n"
+"/etc/conf.d/grub und /etc/grub.d/* fehlerfrei sind oder\n"
 "erstellen Sie einen Fehlerbericht mit %s als Anhang."
 
 #: util/grub-mkconfig.in:283
@@ -6656,9 +6656,9 @@
 msgstr "Den voreingestellten Booteintrag für GRUB festlegen."
 
 #: 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 ""
-"Dies erfordert die Einstellung GRUB_DEFAULT=saved in %s/default/grub.\\n"
+"Dies erfordert die Einstellung 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.02~rc2/po/de.gmo grub-2.02~rc2-confd/po/de.gmo
--- grub-2.02~rc2/po/de.gmo	2017-03-15 09:41:37.000000000 +0100
+++ grub-2.02~rc2-confd/po/de.gmo	2017-04-04 12:57:04.920014264 +0200
@@ -136,12 +136,12 @@
 Specify filename.Specify hash to use.Specify one or more font files to load.Specify size for each read operationSpecify the number of input files.Speed: %s 
 Start GDB stub on given portStop GDB stubStorage information for `%s' does not include typeStorage information for `%s' indicates neither a plain partition nor a plain diskStore matched component NUMBER in VARNAME.SuccessSundaySuppress normal output (warnings remain).Switch to native disk drivers. If no modules are specified default set (pata,ahci,usbms,ohci,uhci,ehci) is usedSyntax error at line %u
 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.System management bus controller I/O space is at 0x%x
 TTARGETTHEMESTarget format not specified (use the -O option).Terminal has specified geometry.Terminal is ASCII-only [default].Terminal is logical-ordered UTF-8.Terminal is visually-ordered UTF-8.Test USB support.Test bit at BYTE:BIT in CMOS.Test file read speed.Test if REGEXP matches STRING.Test video subsystem in mode WxH.Test video subsystem.Text-only The files are identical.
 The highlighted entry will be executed automatically in %ds.This VDEV is a RAIDZ%llu
-This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/default/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
+This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
 Trailing backslashTransform 64-bit UUID to format suitable for XNU. If -l is given keep it lowercase as done by blkid.Transform a system filename into GRUB one.Transform syslinux config into GRUB one.Translate SET1 characters to SET2 in STRING.Translate to lower case.Translate to upper case.Translates the string with the current settings.Try '%s --help' or '%s --usage' for more information.
 TuesdayUSER PASSWORDUSER PBKDF2_PASSWORDUSERNAME[,USERNAME]UTF-8Unable to create pipe: %sUnable to determine your platform. Use --target.Unable to fork: %sUnable to open stream from %s: %sUnable to retrieve pool stateUncompress data.Uncompress file before checksumming.Unknown address type %d
 Unknown command `%s'.
@@ -289,11 +289,11 @@
 GDB-Stub auf dem angegebenen Port startenGDB-Stub stoppenSpeicherinfo für »%s« enthält keinen TypSpeicherinformation für »%s« weist weder auf eine Partition noch einen Datenträger hinEntsprechende Komponenten-NUMMER in VARNAME speichern.ErfolgSonntagNormale Ausgaben unterdrücken (Warnungen verbleiben)Zu nativen Festplattentreibern wechseln. Falls keine Module angegeben werden, wird die Vorgabe verwendet (pata,ahci,usbms,ohci,uhci,ehci).Syntaxfehler in Zeile %u
 In der erzeugten GRUB-Konfigurationsdatei wurden
 Syntaxfehler entdeckt. Stellen Sie sicher, das die Dateien
-/etc/default/grub und /etc/grub.d/* fehlerfrei sind oder
+/etc/conf.d/grub und /etc/grub.d/* fehlerfrei sind oder
 erstellen Sie einen Fehlerbericht mit %s als Anhang.Ein-/Ausgabebereich des Systemverwaltungsbus-Controllers ist bei 0x%x
 TZIELTHEMENZielformat wurde nicht angegeben (verwenden Sie die Option -0).Terminalgeometrie wurde festgelegt.Terminal ist nur ASCII [Vorgabe].Terminal ist logisches UTF-8.Terminal ist visuelles UTF-8.USB-Unterstützung überprüfen.Bit bei BYTE:BIT im CMOS testen.Dateilesegeschwindigkeit testen.Prüfen, ob REGEXP auf ZEICHENKETTE passt.Das Video-Subsystem im Modus BxH überprüfen.Das Video-Subsystem überprüfen.Nur TextDie Dateien sind identisch.
 Der hervorgehobene Eintrag wird automatisch in %ds ausgeführt.Dieses VDEV ist ein RAIDZ%llu
-Dieses VDEV ist ein SpiegelDieser Eintrag kann von jedem Benutzer gebootet werden.Dies erfordert die Einstellung GRUB_DEFAULT=saved in %s/default/grub.\nDonnerstagTiBTiB/sWerkzeug zum Bearbeiten einer Umgebungs-Blockdatei.Flash-Gesamtgröße: %d B.
+Dieses VDEV ist ein SpiegelDieser Eintrag kann von jedem Benutzer gebootet werden.Dies erfordert die Einstellung GRUB_DEFAULT=saved in %s/conf.d/grub.\nDonnerstagTiBTiB/sWerkzeug zum Bearbeiten einer Umgebungs-Blockdatei.Flash-Gesamtgröße: %d B.
 Angehängter Backslash64-bit-UUID in ein von XNU verarbeitbares Format umwandeln. Falls -l angegeben ist, bitte Kleinschreibung beibehalten (wie von blkid)Einen Systemdateinamen in einen für GRUB umwandeln.Syslinux-Konfigurationsdatei in eine für GRUB umwandeln.Zeichen der MENGE1 in Zeichen der MENGE2 in ZEICHENKETTE übersetzen.In Kleinschreibung umwandeln.In Großschreibung umwandeln.Übersetzt die Zeichenkette anhand den aktuellen Einstellungen.Rufen Sie »%s --help« oder »%s --usage« auf, um weitere Informationen zu erhalten.
 DienstagBENUTZERPASSWORTBENUTZER PBKDF2_PASSWORTBENUTZERNAME[,BENUTZERNAME]UTF-8Weiterleitung konnte nicht angelegt werden: %sIhre Plattform konnte nicht erkannt werden. Verwenden Sie --target.Fork konnte nicht angelegt werden: %sDatenstrom von %s konnte nicht geöffnet werden: %sPool-Status konnte nicht ermittelt werdenDaten entpacken.Datei entpacken, bevor Prüfsumme ermittelt wird.Unbekannter Adresstyp %d
 Unbekannter Befehl »%s«.
diff -Naur grub-2.02~rc2/po/de@hebrew.gmo grub-2.02~rc2-confd/po/de@hebrew.gmo
--- grub-2.02~rc2/po/de@hebrew.gmo	2017-03-15 09:41:38.000000000 +0100
+++ grub-2.02~rc2-confd/po/de@hebrew.gmo	2017-04-04 12:57:04.872014781 +0200
@@ -136,12 +136,12 @@
 Specify filename.Specify hash to use.Specify one or more font files to load.Specify size for each read operationSpecify the number of input files.Speed: %s 
 Start GDB stub on given portStop GDB stubStorage information for `%s' does not include typeStorage information for `%s' indicates neither a plain partition nor a plain diskStore matched component NUMBER in VARNAME.SuccessSundaySuppress normal output (warnings remain).Switch to native disk drivers. If no modules are specified default set (pata,ahci,usbms,ohci,uhci,ehci) is usedSyntax error at line %u
 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.System management bus controller I/O space is at 0x%x
 TTARGETTHEMESTarget format not specified (use the -O option).Terminal has specified geometry.Terminal is ASCII-only [default].Terminal is logical-ordered UTF-8.Terminal is visually-ordered UTF-8.Test USB support.Test bit at BYTE:BIT in CMOS.Test file read speed.Test if REGEXP matches STRING.Test video subsystem in mode WxH.Test video subsystem.Text-only The files are identical.
 The highlighted entry will be executed automatically in %ds.This VDEV is a RAIDZ%llu
-This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/default/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
+This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
 Trailing backslashTransform 64-bit UUID to format suitable for XNU. If -l is given keep it lowercase as done by blkid.Transform a system filename into GRUB one.Transform syslinux config into GRUB one.Translate SET1 characters to SET2 in STRING.Translate to lower case.Translate to upper case.Translates the string with the current settings.Try '%s --help' or '%s --usage' for more information.
 TuesdayUSER PASSWORDUSER PBKDF2_PASSWORDUSERNAME[,USERNAME]UTF-8Unable to create pipe: %sUnable to determine your platform. Use --target.Unable to fork: %sUnable to open stream from %s: %sUnable to retrieve pool stateUncompress data.Uncompress file before checksumming.Unknown address type %d
 Unknown command `%s'.
diff -Naur grub-2.02~rc2/po/de@hebrew.po grub-2.02~rc2-confd/po/de@hebrew.po
--- grub-2.02~rc2/po/de@hebrew.po	2017-03-15 09:41:19.000000000 +0100
+++ grub-2.02~rc2-confd/po/de@hebrew.po	2017-04-04 12:57:04.871014791 +0200
@@ -6594,7 +6594,7 @@
 #: util/grub-mkconfig.in:271
 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 ""
@@ -6650,7 +6650,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/דעפֿאוּלת/גרוּבּ.\\נ"
 
diff -Naur grub-2.02~rc2/po/de.po grub-2.02~rc2-confd/po/de.po
--- grub-2.02~rc2/po/de.po	2017-03-15 09:41:18.000000000 +0100
+++ grub-2.02~rc2-confd/po/de.po	2017-04-04 12:57:04.802015534 +0200
@@ -6599,13 +6599,13 @@
 #: util/grub-mkconfig.in:271
 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\n"
 "Syntaxfehler entdeckt. Stellen Sie sicher, das die Dateien\n"
-"/etc/default/grub und /etc/grub.d/* fehlerfrei sind oder\n"
+"/etc/conf.d/grub und /etc/grub.d/* fehlerfrei sind oder\n"
 "erstellen Sie einen Fehlerbericht mit %s als Anhang."
 
 #: util/grub-mkconfig.in:283
@@ -6656,9 +6656,9 @@
 msgstr "Den voreingestellten Booteintrag für GRUB festlegen."
 
 #: 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 ""
-"Dies erfordert die Einstellung GRUB_DEFAULT=saved in %s/default/grub.\\n"
+"Dies erfordert die Einstellung 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.02~rc2/po/en@arabic.gmo grub-2.02~rc2-confd/po/en@arabic.gmo
--- grub-2.02~rc2/po/en@arabic.gmo	2017-03-15 09:41:38.000000000 +0100
+++ grub-2.02~rc2-confd/po/en@arabic.gmo	2017-04-04 12:57:04.884014651 +0200
@@ -146,12 +146,12 @@
 Specify filename.Specify hash to use.Specify one or more font files to load.Specify size for each read operationSpecify the number of input files.Speed: %s 
 Start GDB stub on given portStop GDB stubStorage information for `%s' does not include typeStorage information for `%s' indicates neither a plain partition nor a plain diskStore matched component NUMBER in VARNAME.SuccessSundaySuppress normal output (warnings remain).Switch to native disk drivers. If no modules are specified default set (pata,ahci,usbms,ohci,uhci,ehci) is usedSyntax error at line %u
 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.System management bus controller I/O space is at 0x%x
 TTARGETTHEMESTarget format not specified (use the -O option).Terminal has specified geometry.Terminal is ASCII-only [default].Terminal is logical-ordered UTF-8.Terminal is visually-ordered UTF-8.Test USB support.Test bit at BYTE:BIT in CMOS.Test file read speed.Test if REGEXP matches STRING.Test video subsystem in mode WxH.Test video subsystem.Text-only The files are identical.
 The highlighted entry will be executed automatically in %ds.This VDEV is a RAIDZ%llu
-This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/default/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
+This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
 Trailing backslashTransform 64-bit UUID to format suitable for XNU. If -l is given keep it lowercase as done by blkid.Transform a system filename into GRUB one.Transform syslinux config into GRUB one.Translate SET1 characters to SET2 in STRING.Translate to lower case.Translate to upper case.Translates the string with the current settings.Try '%s --help' or '%s --usage' for more information.
 TuesdayUSER PASSWORDUSER PBKDF2_PASSWORDUSERNAME[,USERNAME]UTF-8Unable to create pipe: %sUnable to determine your platform. Use --target.Unable to fork: %sUnable to open stream from %s: %sUnable to retrieve pool stateUncompress data.Uncompress file before checksumming.Unknown address type %d
 Unknown command `%s'.
diff -Naur grub-2.02~rc2/po/en@arabic.po grub-2.02~rc2-confd/po/en@arabic.po
--- grub-2.02~rc2/po/en@arabic.po	2017-03-15 09:41:19.000000000 +0100
+++ grub-2.02~rc2-confd/po/en@arabic.po	2017-04-04 12:57:04.956013876 +0200
@@ -6524,7 +6524,7 @@
 #: util/grub-mkconfig.in:271
 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 ""
@@ -6588,7 +6588,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.02~rc2/po/en@cyrillic.gmo grub-2.02~rc2-confd/po/en@cyrillic.gmo
--- grub-2.02~rc2/po/en@cyrillic.gmo	2017-03-15 09:41:38.000000000 +0100
+++ grub-2.02~rc2-confd/po/en@cyrillic.gmo	2017-04-04 12:57:04.855014963 +0200
@@ -145,12 +145,12 @@
 Specify filename.Specify hash to use.Specify one or more font files to load.Specify size for each read operationSpecify the number of input files.Speed: %s 
 Start GDB stub on given portStop GDB stubStorage information for `%s' does not include typeStorage information for `%s' indicates neither a plain partition nor a plain diskStore matched component NUMBER in VARNAME.SuccessSundaySuppress normal output (warnings remain).Switch to native disk drivers. If no modules are specified default set (pata,ahci,usbms,ohci,uhci,ehci) is usedSyntax error at line %u
 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.System management bus controller I/O space is at 0x%x
 TTARGETTHEMESTarget format not specified (use the -O option).Terminal has specified geometry.Terminal is ASCII-only [default].Terminal is logical-ordered UTF-8.Terminal is visually-ordered UTF-8.Test USB support.Test bit at BYTE:BIT in CMOS.Test file read speed.Test if REGEXP matches STRING.Test video subsystem in mode WxH.Test video subsystem.Text-only The files are identical.
 The highlighted entry will be executed automatically in %ds.This VDEV is a RAIDZ%llu
-This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/default/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
+This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
 Trailing backslashTransform 64-bit UUID to format suitable for XNU. If -l is given keep it lowercase as done by blkid.Transform a system filename into GRUB one.Transform syslinux config into GRUB one.Translate SET1 characters to SET2 in STRING.Translate to lower case.Translate to upper case.Translates the string with the current settings.Try '%s --help' or '%s --usage' for more information.
 TuesdayUSER PASSWORDUSER PBKDF2_PASSWORDUSERNAME[,USERNAME]UTF-8Unable to create pipe: %sUnable to determine your platform. Use --target.Unable to fork: %sUnable to open stream from %s: %sUnable to retrieve pool stateUncompress data.Uncompress file before checksumming.Unknown address type %d
 Unknown command `%s'.
diff -Naur grub-2.02~rc2/po/en@cyrillic.po grub-2.02~rc2-confd/po/en@cyrillic.po
--- grub-2.02~rc2/po/en@cyrillic.po	2017-03-15 09:41:19.000000000 +0100
+++ grub-2.02~rc2-confd/po/en@cyrillic.po	2017-04-04 12:57:05.105012271 +0200
@@ -6523,7 +6523,7 @@
 #: util/grub-mkconfig.in:271
 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 ""
@@ -6587,7 +6587,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.02~rc2/po/en@greek.gmo grub-2.02~rc2-confd/po/en@greek.gmo
--- grub-2.02~rc2/po/en@greek.gmo	2017-03-15 09:41:38.000000000 +0100
+++ grub-2.02~rc2-confd/po/en@greek.gmo	2017-04-04 12:57:04.844015082 +0200
@@ -149,12 +149,12 @@
 Specify filename.Specify hash to use.Specify one or more font files to load.Specify size for each read operationSpecify the number of input files.Speed: %s 
 Start GDB stub on given portStop GDB stubStorage information for `%s' does not include typeStorage information for `%s' indicates neither a plain partition nor a plain diskStore matched component NUMBER in VARNAME.SuccessSundaySuppress normal output (warnings remain).Switch to native disk drivers. If no modules are specified default set (pata,ahci,usbms,ohci,uhci,ehci) is usedSyntax error at line %u
 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.System management bus controller I/O space is at 0x%x
 TTARGETTHEMESTarget format not specified (use the -O option).Terminal has specified geometry.Terminal is ASCII-only [default].Terminal is logical-ordered UTF-8.Terminal is visually-ordered UTF-8.Test USB support.Test bit at BYTE:BIT in CMOS.Test file read speed.Test if REGEXP matches STRING.Test video subsystem in mode WxH.Test video subsystem.Text-only The files are identical.
 The highlighted entry will be executed automatically in %ds.This VDEV is a RAIDZ%llu
-This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/default/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
+This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
 Trailing backslashTransform 64-bit UUID to format suitable for XNU. If -l is given keep it lowercase as done by blkid.Transform a system filename into GRUB one.Transform syslinux config into GRUB one.Translate SET1 characters to SET2 in STRING.Translate to lower case.Translate to upper case.Translates the string with the current settings.Try '%s --help' or '%s --usage' for more information.
 TuesdayUSER PASSWORDUSER PBKDF2_PASSWORDUSERNAME[,USERNAME]UTF-8Unable to create pipe: %sUnable to determine your platform. Use --target.Unable to fork: %sUnable to open stream from %s: %sUnable to retrieve pool stateUncompress data.Uncompress file before checksumming.Unknown address type %d
 Unknown command `%s'.
diff -Naur grub-2.02~rc2/po/en@greek.po grub-2.02~rc2-confd/po/en@greek.po
--- grub-2.02~rc2/po/en@greek.po	2017-03-15 09:41:19.000000000 +0100
+++ grub-2.02~rc2-confd/po/en@greek.po	2017-04-04 12:57:05.021013176 +0200
@@ -6523,7 +6523,7 @@
 #: util/grub-mkconfig.in:271
 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 ""
@@ -6587,7 +6587,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.02~rc2/po/en@hebrew.gmo grub-2.02~rc2-confd/po/en@hebrew.gmo
--- grub-2.02~rc2/po/en@hebrew.gmo	2017-03-15 09:41:38.000000000 +0100
+++ grub-2.02~rc2-confd/po/en@hebrew.gmo	2017-04-04 12:57:05.012013273 +0200
@@ -149,12 +149,12 @@
 Specify filename.Specify hash to use.Specify one or more font files to load.Specify size for each read operationSpecify the number of input files.Speed: %s 
 Start GDB stub on given portStop GDB stubStorage information for `%s' does not include typeStorage information for `%s' indicates neither a plain partition nor a plain diskStore matched component NUMBER in VARNAME.SuccessSundaySuppress normal output (warnings remain).Switch to native disk drivers. If no modules are specified default set (pata,ahci,usbms,ohci,uhci,ehci) is usedSyntax error at line %u
 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.System management bus controller I/O space is at 0x%x
 TTARGETTHEMESTarget format not specified (use the -O option).Terminal has specified geometry.Terminal is ASCII-only [default].Terminal is logical-ordered UTF-8.Terminal is visually-ordered UTF-8.Test USB support.Test bit at BYTE:BIT in CMOS.Test file read speed.Test if REGEXP matches STRING.Test video subsystem in mode WxH.Test video subsystem.Text-only The files are identical.
 The highlighted entry will be executed automatically in %ds.This VDEV is a RAIDZ%llu
-This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/default/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
+This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
 Trailing backslashTransform 64-bit UUID to format suitable for XNU. If -l is given keep it lowercase as done by blkid.Transform a system filename into GRUB one.Transform syslinux config into GRUB one.Translate SET1 characters to SET2 in STRING.Translate to lower case.Translate to upper case.Translates the string with the current settings.Try '%s --help' or '%s --usage' for more information.
 TuesdayUSER PASSWORDUSER PBKDF2_PASSWORDUSERNAME[,USERNAME]UTF-8Unable to create pipe: %sUnable to determine your platform. Use --target.Unable to fork: %sUnable to open stream from %s: %sUnable to retrieve pool stateUncompress data.Uncompress file before checksumming.Unknown address type %d
 Unknown command `%s'.
diff -Naur grub-2.02~rc2/po/en@hebrew.po grub-2.02~rc2-confd/po/en@hebrew.po
--- grub-2.02~rc2/po/en@hebrew.po	2017-03-15 09:41:19.000000000 +0100
+++ grub-2.02~rc2-confd/po/en@hebrew.po	2017-04-04 12:57:04.785015717 +0200
@@ -6524,7 +6524,7 @@
 #: util/grub-mkconfig.in:271
 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 ""
@@ -6588,7 +6588,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.02~rc2/po/en@piglatin.gmo grub-2.02~rc2-confd/po/en@piglatin.gmo
--- grub-2.02~rc2/po/en@piglatin.gmo	2017-03-15 09:41:38.000000000 +0100
+++ grub-2.02~rc2-confd/po/en@piglatin.gmo	2017-04-04 12:57:04.811015437 +0200
@@ -153,12 +153,12 @@
 Specify filename.Specify hash to use.Specify one or more font files to load.Specify size for each read operationSpecify the number of input files.Speed: %s 
 Start GDB stub on given portStop GDB stubStorage information for `%s' does not include typeStorage information for `%s' indicates neither a plain partition nor a plain diskStore matched component NUMBER in VARNAME.SuccessSundaySuppress normal output (warnings remain).Switch to native disk drivers. If no modules are specified default set (pata,ahci,usbms,ohci,uhci,ehci) is usedSyntax error at line %u
 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.System management bus controller I/O space is at 0x%x
 TTARGETTHEMESTarget format not specified (use the -O option).Terminal has specified geometry.Terminal is ASCII-only [default].Terminal is logical-ordered UTF-8.Terminal is visually-ordered UTF-8.Test USB support.Test bit at BYTE:BIT in CMOS.Test file read speed.Test if REGEXP matches STRING.Test video subsystem in mode WxH.Test video subsystem.Text-only The files are identical.
 The highlighted entry will be executed automatically in %ds.This VDEV is a RAIDZ%llu
-This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/default/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
+This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
 Trailing backslashTransform 64-bit UUID to format suitable for XNU. If -l is given keep it lowercase as done by blkid.Transform a system filename into GRUB one.Transform syslinux config into GRUB one.Translate SET1 characters to SET2 in STRING.Translate to lower case.Translate to upper case.Translates the string with the current settings.Try '%s --help' or '%s --usage' for more information.
 TuesdayUSER PASSWORDUSER PBKDF2_PASSWORDUSERNAME[,USERNAME]UTF-8Unable to create pipe: %sUnable to determine your platform. Use --target.Unable to fork: %sUnable to open stream from %s: %sUnable to retrieve pool stateUncompress data.Uncompress file before checksumming.Unknown address type %d
 Unknown command `%s'.
diff -Naur grub-2.02~rc2/po/en@piglatin.po grub-2.02~rc2-confd/po/en@piglatin.po
--- grub-2.02~rc2/po/en@piglatin.po	2017-03-15 09:41:24.000000000 +0100
+++ grub-2.02~rc2-confd/po/en@piglatin.po	2017-04-04 12:57:04.833015201 +0200
@@ -6671,7 +6671,7 @@
 #: util/grub-mkconfig.in:271
 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 ""
@@ -6744,7 +6744,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.02~rc2/po/en@quot.gmo grub-2.02~rc2-confd/po/en@quot.gmo
--- grub-2.02~rc2/po/en@quot.gmo	2017-03-15 09:41:38.000000000 +0100
+++ grub-2.02~rc2-confd/po/en@quot.gmo	2017-04-04 12:57:04.812015427 +0200
@@ -146,12 +146,12 @@
 Specify filename.Specify hash to use.Specify one or more font files to load.Specify size for each read operationSpecify the number of input files.Speed: %s 
 Start GDB stub on given portStop GDB stubStorage information for `%s' does not include typeStorage information for `%s' indicates neither a plain partition nor a plain diskStore matched component NUMBER in VARNAME.SuccessSundaySuppress normal output (warnings remain).Switch to native disk drivers. If no modules are specified default set (pata,ahci,usbms,ohci,uhci,ehci) is usedSyntax error at line %u
 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.System management bus controller I/O space is at 0x%x
 TTARGETTHEMESTarget format not specified (use the -O option).Terminal has specified geometry.Terminal is ASCII-only [default].Terminal is logical-ordered UTF-8.Terminal is visually-ordered UTF-8.Test USB support.Test bit at BYTE:BIT in CMOS.Test file read speed.Test if REGEXP matches STRING.Test video subsystem in mode WxH.Test video subsystem.Text-only The files are identical.
 The highlighted entry will be executed automatically in %ds.This VDEV is a RAIDZ%llu
-This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/default/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
+This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
 Trailing backslashTransform 64-bit UUID to format suitable for XNU. If -l is given keep it lowercase as done by blkid.Transform a system filename into GRUB one.Transform syslinux config into GRUB one.Translate SET1 characters to SET2 in STRING.Translate to lower case.Translate to upper case.Translates the string with the current settings.Try '%s --help' or '%s --usage' for more information.
 TuesdayUSER PASSWORDUSER PBKDF2_PASSWORDUSERNAME[,USERNAME]UTF-8Unable to create pipe: %sUnable to determine your platform. Use --target.Unable to fork: %sUnable to open stream from %s: %sUnable to retrieve pool stateUncompress data.Uncompress file before checksumming.Unknown address type %d
 Unknown command `%s'.
@@ -297,12 +297,12 @@
 Specify filename.Specify hash to use.Specify one or more font files to load.Specify size for each read operationSpecify the number of input files.Speed: %s 
 Start GDB stub on given portStop GDB stubStorage information for ‘%s’ does not include typeStorage information for ‘%s’ indicates neither a plain partition nor a plain diskStore matched component NUMBER in VARNAME.SuccessSundaySuppress normal output (warnings remain).Switch to native disk drivers. If no modules are specified default set (pata,ahci,usbms,ohci,uhci,ehci) is usedSyntax error at line %u
 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.System management bus controller I/O space is at 0x%x
 TTARGETTHEMESTarget format not specified (use the -O option).Terminal has specified geometry.Terminal is ASCII-only [default].Terminal is logical-ordered UTF-8.Terminal is visually-ordered UTF-8.Test USB support.Test bit at BYTE:BIT in CMOS.Test file read speed.Test if REGEXP matches STRING.Test video subsystem in mode WxH.Test video subsystem.Text-only The files are identical.
 The highlighted entry will be executed automatically in %ds.This VDEV is a RAIDZ%llu
-This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/default/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
+This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
 Trailing backslashTransform 64-bit UUID to format suitable for XNU. If -l is given keep it lowercase as done by blkid.Transform a system filename into GRUB one.Transform syslinux config into GRUB one.Translate SET1 characters to SET2 in STRING.Translate to lower case.Translate to upper case.Translates the string with the current settings.Try ‘%s --help’ or ‘%s --usage’ for more information.
 TuesdayUSER PASSWORDUSER PBKDF2_PASSWORDUSERNAME[,USERNAME]UTF-8Unable to create pipe: %sUnable to determine your platform. Use --target.Unable to fork: %sUnable to open stream from %s: %sUnable to retrieve pool stateUncompress data.Uncompress file before checksumming.Unknown address type %d
 Unknown command ‘%s’.
diff -Naur grub-2.02~rc2/po/en@quot.po grub-2.02~rc2-confd/po/en@quot.po
--- grub-2.02~rc2/po/en@quot.po	2017-03-15 09:41:33.000000000 +0100
+++ grub-2.02~rc2-confd/po/en@quot.po	2017-04-04 12:57:04.863014877 +0200
@@ -6545,12 +6545,12 @@
 #: util/grub-mkconfig.in:271
 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."
 
@@ -6609,8 +6609,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.02~rc2/po/eo.po grub-2.02~rc2-confd/po/eo.po
--- grub-2.02~rc2/po/eo.po	2017-03-15 09:41:33.000000000 +0100
+++ grub-2.02~rc2-confd/po/eo.po	2017-04-04 12:57:04.777015804 +0200
@@ -6478,7 +6478,7 @@
 #: util/grub-mkconfig.in:271
 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 ""
@@ -6529,7 +6529,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.02~rc2/po/es.gmo grub-2.02~rc2-confd/po/es.gmo
--- grub-2.02~rc2/po/es.gmo	2017-03-15 09:41:38.000000000 +0100
+++ grub-2.02~rc2-confd/po/es.gmo	2017-04-04 12:57:04.957013865 +0200
@@ -142,12 +142,12 @@
 Specify filename.Specify hash to use.Specify one or more font files to load.Specify size for each read operationSpecify the number of input files.Speed: %s 
 Start GDB stub on given portStop GDB stubStorage information for `%s' does not include typeStorage information for `%s' indicates neither a plain partition nor a plain diskStore matched component NUMBER in VARNAME.SuccessSundaySuppress normal output (warnings remain).Switch to native disk drivers. If no modules are specified default set (pata,ahci,usbms,ohci,uhci,ehci) is usedSyntax error at line %u
 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.System management bus controller I/O space is at 0x%x
 TTARGETTHEMESTarget format not specified (use the -O option).Terminal has specified geometry.Terminal is ASCII-only [default].Terminal is logical-ordered UTF-8.Terminal is visually-ordered UTF-8.Test USB support.Test bit at BYTE:BIT in CMOS.Test file read speed.Test if REGEXP matches STRING.Test video subsystem in mode WxH.Test video subsystem.Text-only The files are identical.
 The highlighted entry will be executed automatically in %ds.This VDEV is a RAIDZ%llu
-This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/default/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
+This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
 Trailing backslashTransform 64-bit UUID to format suitable for XNU. If -l is given keep it lowercase as done by blkid.Transform a system filename into GRUB one.Transform syslinux config into GRUB one.Translate SET1 characters to SET2 in STRING.Translate to lower case.Translate to upper case.Translates the string with the current settings.Try '%s --help' or '%s --usage' for more information.
 TuesdayUSER PASSWORDUSER PBKDF2_PASSWORDUSERNAME[,USERNAME]UTF-8Unable to create pipe: %sUnable to determine your platform. Use --target.Unable to fork: %sUnable to open stream from %s: %sUnable to retrieve pool stateUncompress data.Uncompress file before checksumming.Unknown address type %d
 Unknown command `%s'.
@@ -299,12 +299,12 @@
 Inicia el soporte de GDB en el puerto proporcionadoPara el soporte de GFBLa información de almacenamiento para «%s» no incluye el tipoLa información de almacenamiento para «%s» no indica ni una partición ni un discoAlmacena la componente correspondiente NÚMERO en VARIABLE.ÉxitoDomingoSilencia la salida normal (los avisos permanecen).Utiliza los controladores de disco nativos. Si no se especifíca ningún módulo se utilizará el conjunto por defecto (pata, ahci, usbms, ohci, ehci)Error de sintaxis en la línea %u
 Se han detectado errores de sintaxis en el fichero de
 configuración de GRUB generado.
-Asegurese de que no hay errores en /etc/default/grub
+Asegurese de que no hay errores en /etc/conf.d/grub
 en los ficheros /etc/grub.d/* o, por favor, abra una
 notificación de errores con el fichero %s adjunto.El espacio del sistema de gestión de control del bus I/O está en 0x%x
 TOBJETIVOTEMASNo se ha especificado el formato objetivo (use la opción -O).El terminal ha especificado su geometría.El terminal es únicamente ASCII [predeterminado].El terminal es UTF-8 lógicamente ordenado.El terminal es UTF-8 visualmente ordenado.Comprueba el soporte USB.Comprueba el bit de la CMOS en BYTE:BIT.Prueba la velocidad de lectura de fichero.Comprueba si la EXPR_REGULAR acepta la CADENA.Prueba el subsistema de vídeo con modo ANCHOxALTOPrueba el subsistema de vídeo.Solo texto Los ficheros son idénticos.
 La entrada marcada se ejecutará automáticamente en %d s.Este VDEV es un RAIDZ%llu
-Este VDEV es un espejo.Esta entrada puede ser usada por cualquier usuario para arrancar.Esto requere establecer GRUB_DEFAULT=saved en %s/default/grub.\nJuevesTiBTiB/sHerramienta para editar bloques de entorno.Tamaño total de flash: %d B.
+Este VDEV es un espejo.Esta entrada puede ser usada por cualquier usuario para arrancar.Esto requere establecer GRUB_DEFAULT=saved en %s/conf.d/grub.\nJuevesTiBTiB/sHerramienta para editar bloques de entorno.Tamaño total de flash: %d B.
 Barra invertida extra al finalTransforma el UUID de 64 bits a un formato adecuado para XNU. Será en minúsculas si se proporciona -l como hace blkid.Transforma un nombre de fichero del sistema en uno de GRUB.Transforma configuración syslinux a GRUB.Transcribe los caracteres del CONJUNTO1 a los del CONJUNTO2 en la CADENA.Transcribe a minúsculas.Transcribe a mayúsculas.Traduce la cadena con las opciones actuales.Pruebe «%s --help» o «%s --usage» para más información.
 MartesUSUARIO CONTRASEÑAUSUARIO CONTRASEÑA_PBKDF2USUARIO[,USUARIO]UTF-8No se pudo crear una tubería (pipe): %sImposible determinar su plataforma. Use --target.No se pudo bifurcar (fork) el proceso: %sNo se pudo abrir el flujo de %s: %sImposible obtener el estado del "pool"Descomprime datos.Descomprime fichero antes de comprobarlo.Tipo de dirección %d desconocido
 Orden «%s» desconocida.
diff -Naur grub-2.02~rc2/po/es.po grub-2.02~rc2-confd/po/es.po
--- grub-2.02~rc2/po/es.po	2017-03-15 09:41:33.000000000 +0100
+++ grub-2.02~rc2-confd/po/es.po	2017-04-04 12:57:05.097012357 +0200
@@ -6721,13 +6721,13 @@
 #: util/grub-mkconfig.in:271
 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."
 
@@ -6789,8 +6789,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.02~rc2/po/fi.gmo grub-2.02~rc2-confd/po/fi.gmo
--- grub-2.02~rc2/po/fi.gmo	2017-03-15 09:41:38.000000000 +0100
+++ grub-2.02~rc2-confd/po/fi.gmo	2017-04-04 12:57:04.854014975 +0200
@@ -133,12 +133,12 @@
 Specify filename.Specify hash to use.Specify one or more font files to load.Specify size for each read operationSpecify the number of input files.Speed: %s 
 Start GDB stub on given portStop GDB stubStorage information for `%s' does not include typeStorage information for `%s' indicates neither a plain partition nor a plain diskStore matched component NUMBER in VARNAME.SuccessSundaySuppress normal output (warnings remain).Switch to native disk drivers. If no modules are specified default set (pata,ahci,usbms,ohci,uhci,ehci) is usedSyntax error at line %u
 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.System management bus controller I/O space is at 0x%x
 TTARGETTHEMESTarget format not specified (use the -O option).Terminal has specified geometry.Terminal is ASCII-only [default].Terminal is logical-ordered UTF-8.Terminal is visually-ordered UTF-8.Test USB support.Test bit at BYTE:BIT in CMOS.Test file read speed.Test if REGEXP matches STRING.Test video subsystem in mode WxH.Test video subsystem.Text-only The files are identical.
 The highlighted entry will be executed automatically in %ds.This VDEV is a RAIDZ%llu
-This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/default/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
+This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
 Trailing backslashTransform 64-bit UUID to format suitable for XNU. If -l is given keep it lowercase as done by blkid.Transform a system filename into GRUB one.Transform syslinux config into GRUB one.Translate SET1 characters to SET2 in STRING.Translate to lower case.Translate to upper case.Translates the string with the current settings.Try '%s --help' or '%s --usage' for more information.
 TuesdayUSER PASSWORDUSER PBKDF2_PASSWORDUSERNAME[,USERNAME]UTF-8Unable to create pipe: %sUnable to determine your platform. Use --target.Unable to fork: %sUnable to open stream from %s: %sUnable to retrieve pool stateUncompress data.Uncompress file before checksumming.Unknown address type %d
 Unknown command `%s'.
@@ -288,12 +288,12 @@
 Määrittele tiedostonimi.Määritä käytettävä hajakoodaus.Määritä yksi tai useampia kirjasintiedostoja ladattavaksi.Määritä koko jokaiselle lukutoiminnolleMääritä syötetiedostojen lukumäärä.Nopeus: %s 
 Käynnistä GDB-tynkä annetussa portissaPysäytä GDB-tynkäTallennusvälinetieto ”%s” ei sisällä tyyppiäVarastotieto kohteelle ”%s” ei osoita pelkkää osioita eikä pelkkää levyäTallenna täsmäävä komponentti-NUMERO muuttujaan VARNAME.OnnistuiSunnuntaiVaienna normaalituloste (varoitukset jäävät).Vaihda alkuperäisiin levyajureihin. Jos yhtään moduulia ei ole määritelty, käytetään oletusjoukkoa (pata,ahci,usbms,ohci,uhci,ehci)Syntaksivirhe rivillä %u
 Syntaksivirheita havaittu tuotettaessa GRUB-asetustiedostoa.
-Varmista, että tiedostoissa /etc/default/grub ja /etc/grub.d/*
+Varmista, että tiedostoissa /etc/conf.d/grub ja /etc/grub.d/*
 ei ole mitään virheitä tai tee vikailmoitus tiedosto %s
 liitteenä.Järjestelmähallintaväyläohjain siirräntätila on osoitteessa 0x%x
 TiKOHDETEEMATKohdemuotoa ei ole määritelty (käytä valitsinta -O).Päätteellä on määritelty geometria.Pääte on vain ASCII-pääte [oletus].Pääte on loogisesti järjestetty UTF-8.Pääte on visuaalisesti järjestetty UTF-8.Koesta USB-tuki.Testaa bitti BYTE:BIT CMOS-muistissa.Testaa tiedoston lukunopeusKoesta, jos REGEXP-lauseke täsmää MERKKIJONOon.Koesta video-alijärjestelmä WxH-tilassa.Koesta video-alijärjestelmä.Vain teksti Tiedostot ovat identtiset.
 Korostettu valikkorivi suoritetaan automaattisesti %d sekunnin kuluttua.Tämä VDEV on RAIDZ%llu
-Tämä VDEV on peili.Kuka tahansa käyttäjä voi käynnistää tämän kohteen.Tämä vaatii asetuksen GRUB_DEFAULT=saved tiedostossa %s/default/grub.\nTorstaitebitavuatebitavus/sTyökalu ympäristölohkon muokkaamiseen.Flash-muistin kokonaiskoko: %d tavua.
+Tämä VDEV on peili.Kuka tahansa käyttäjä voi käynnistää tämän kohteen.Tämä vaatii asetuksen GRUB_DEFAULT=saved tiedostossa %s/conf.d/grub.\nTorstaitebitavuatebitavus/sTyökalu ympäristölohkon muokkaamiseen.Flash-muistin kokonaiskoko: %d tavua.
 Jäljessä oleva kenoviivaMuunna 64-bittiset UUID:t XNU:lle sopivaan muotoon. Jos valitsin -l on annettu, pidä se pienenä kirjaimena kuten blkid tekee.Muunna järjestelmätiedostonimi GRUB-tiedostonimeksi.Muunna syslinux-asetustiedostonimi GRUB-tiedostonimeksi.Käännä JOUKKO1-merkit JOUKKO2-merkeiksi MERKKIJONOssaKäännä pieniksi kirjaimiksi.Käännä suuriksi kirjaimiksi.Käännä merkkijonot nykyisillä asetuksilla.Lisätietoja komennolla ’%s --help’ tai ’%s --usage’.
 TiistaiKÄYTTÄJÄ SALASANAKÄYTTÄJÄ PBKDF2_SALASANAKÄYTTÄJÄNIMI[,KÄYTTÄJÄNIMI]UTF-8Ei kyetä luomaan putkea: %sAlustasi määritteleminen epäonnistui. Käytä valitsinta --target.Ei kyetä fork-kutsumaan: %sEi kyetä avamaan virtaa kohteelta %s: %sEi kyetä noutamaan varantotilaaPura tiedoston tiivistys.Pura tiedoston tiivistys ennen tarkistussumman laskemista.Tuntematon osoitetyyppi %d
 Tuntematon komento ”%s”.
diff -Naur grub-2.02~rc2/po/fi.po grub-2.02~rc2-confd/po/fi.po
--- grub-2.02~rc2/po/fi.po	2017-03-15 09:41:33.000000000 +0100
+++ grub-2.02~rc2-confd/po/fi.po	2017-04-04 12:57:05.114012174 +0200
@@ -6619,12 +6619,12 @@
 #: util/grub-mkconfig.in:271
 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 ""
 "Syntaksivirheita havaittu tuotettaessa GRUB-asetustiedostoa.\n"
-"Varmista, että tiedostoissa /etc/default/grub ja /etc/grub.d/*\n"
+"Varmista, että tiedostoissa /etc/conf.d/grub ja /etc/grub.d/*\n"
 "ei ole mitään virheitä tai tee vikailmoitus tiedosto %s\n"
 "liitteenä."
 
@@ -6688,9 +6688,9 @@
 msgstr "Aseta käynnistyksen oletusvalikkorivi GRUB:lle"
 
 #: 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 tiedostossa %s/default/grub.\\n"
+"Tämä vaatii asetuksen GRUB_DEFAULT=saved tiedostossa %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.02~rc2/po/fr.gmo grub-2.02~rc2-confd/po/fr.gmo
--- grub-2.02~rc2/po/fr.gmo	2017-03-15 09:41:38.000000000 +0100
+++ grub-2.02~rc2-confd/po/fr.gmo	2017-04-04 12:57:04.824015297 +0200
@@ -144,12 +144,12 @@
 Specify filename.Specify hash to use.Specify one or more font files to load.Specify size for each read operationSpecify the number of input files.Speed: %s 
 Start GDB stub on given portStop GDB stubStorage information for `%s' does not include typeStorage information for `%s' indicates neither a plain partition nor a plain diskStore matched component NUMBER in VARNAME.SuccessSundaySuppress normal output (warnings remain).Switch to native disk drivers. If no modules are specified default set (pata,ahci,usbms,ohci,uhci,ehci) is usedSyntax error at line %u
 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.System management bus controller I/O space is at 0x%x
 TTARGETTHEMESTarget format not specified (use the -O option).Terminal has specified geometry.Terminal is ASCII-only [default].Terminal is logical-ordered UTF-8.Terminal is visually-ordered UTF-8.Test USB support.Test bit at BYTE:BIT in CMOS.Test file read speed.Test if REGEXP matches STRING.Test video subsystem in mode WxH.Test video subsystem.Text-only The files are identical.
 The highlighted entry will be executed automatically in %ds.This VDEV is a RAIDZ%llu
-This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/default/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
+This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
 Trailing backslashTransform 64-bit UUID to format suitable for XNU. If -l is given keep it lowercase as done by blkid.Transform a system filename into GRUB one.Transform syslinux config into GRUB one.Translate SET1 characters to SET2 in STRING.Translate to lower case.Translate to upper case.Translates the string with the current settings.Try '%s --help' or '%s --usage' for more information.
 TuesdayUSER PASSWORDUSER PBKDF2_PASSWORDUSERNAME[,USERNAME]UTF-8Unable to create pipe: %sUnable to determine your platform. Use --target.Unable to fork: %sUnable to open stream from %s: %sUnable to retrieve pool stateUncompress data.Uncompress file before checksumming.Unknown address type %d
 Unknown command `%s'.
@@ -298,11 +298,11 @@
 Démarrer la session GDB sur le port indiqué.Arrêter la session GDBLes renseignements de stockage pour « %s » ne contiennent pas le typeLes renseignements de stockage pour « %s » n’indiquent ni une simple partition, ni un simple disqueSauver le composant NOMBRE correspondant dans NOM_VAR.RéussitedimancheSupprimer la sortie normale (les avertissements sont conservés).Basculer vers les pilotes natifs de disque. Si aucun module n'est indiqué, l'ensemble par défaut (pata,ahci,usbms,ohci,uhci,ehci) est utiliséErreur de syntaxe à la ligne %u
 Des erreurs de syntaxe sont détectées dans le fichier de configuration
 de GRUB. Veuillez vérifier qu'il n'y a pas d'erreur dans les fichiers
-/etc/default/grub et /etc/grub.d/*. Sinon veuillez signaler un bogue
+/etc/conf.d/grub et /etc/grub.d/*. Sinon veuillez signaler un bogue
 en joignant le fichier %s.L'espace d'E/S du contrôleur de bus du système de gestion est à 0x%x
  TiCIBLETHÈMESFormat cible non indiqué (utiliser l'option -O).Le terminal a la géométrie indiquée.Le terminal est en ASCII seulement [par défaut].Le terminal est en UTF-8 ordonné logiquement.Le terminal est en UTF-8 ordonné visuellement.Tester la prise en charge de l'USB.Tester le bit à OCTET:BIT du CMOS.Tester la vitesse de lecture du fichier.Tester si l'expression rationnelle EXPR_RAT correspond à CHAÎNE.Tester le sous-système vidéo en mode LARG×HAUT.Tester le sous-système vidéo.Texte seul Les fichiers sont identiques.
 L'entrée sélectionnée sera exécutée automatiquement dans %d s.Ce VDEV est un RAIDZ%llu
-Ce VDEV est un miroirCette entrée peut être démarrée par n'importe quel utilisateur.Cela nécessite de configurer GRUB_DEFAULT=saved dans %s/default/grub.\njeudi Tio Tio/sOutil pour éditer un bloc d'environnement.Taille flash totale : %d o.
+Ce VDEV est un miroirCette entrée peut être démarrée par n'importe quel utilisateur.Cela nécessite de configurer GRUB_DEFAULT=saved dans %s/conf.d/grub.\njeudi Tio Tio/sOutil pour éditer un bloc d'environnement.Taille flash totale : %d o.
 Barre oblique finaleTransformer un UUID 64 bits au format convenable pour XNU. Si -l est donnée, le garder en minuscule comme avec blkid.Transformer un nom de fichier système vers le format GRUB.Transformer une configuration de syslinux vers le format GRUB.Convertir les caractères d’ENSEMBLE1 vers ENSEMBLE2 dans CHAÎNE.Convertir en minuscule.Convertir en majuscule.Traduit la chaîne en fonction de la configuration actuelle.Utilisez « %s --help » ou « %s --usage » pour obtenir de plus amples renseignements.
 mardiUTILISATEUR MOTDEPASSEUTILISATEUR MOTDEPASSE_PBKDF2UTILISATEUR[,UTILISATEUR]UTF-8Impossible de créer le tube : %sImpossible de déterminer la plate-forme. Utilisez --target.Impossible de bifurquer (« fork ») : %sImpossible d'ouvrir le flux de %s : %sImpossible de récupérer l'état du poolDécompresser les données.Décompresser le fichier avant de calculer la somme de contrôle.type %d d'adresse inconnu
 Commande « %s » inconnue.
diff -Naur grub-2.02~rc2/po/fr.po grub-2.02~rc2-confd/po/fr.po
--- grub-2.02~rc2/po/fr.po	2017-03-15 09:41:34.000000000 +0100
+++ grub-2.02~rc2-confd/po/fr.po	2017-04-04 12:57:04.984013574 +0200
@@ -6683,13 +6683,13 @@
 #: util/grub-mkconfig.in:271
 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:283
@@ -6752,9 +6752,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.02~rc2/po/gl.gmo grub-2.02~rc2-confd/po/gl.gmo
--- grub-2.02~rc2/po/gl.gmo	2017-03-15 09:41:38.000000000 +0100
+++ grub-2.02~rc2-confd/po/gl.gmo	2017-04-04 12:57:04.823015308 +0200
@@ -127,11 +127,11 @@
 Some Hurd stuff found, but not enough to boot.Specify filename.Specify hash to use.Specify one or more font files to load.Specify size for each read operationSpecify the number of input files.Speed: %s 
 Start GDB stub on given portStop GDB stubStore matched component NUMBER in VARNAME.SuccessSundaySuppress normal output (warnings remain).Switch to native disk drivers. If no modules are specified default set (pata,ahci,usbms,ohci,uhci,ehci) is usedSyntax error at line %u
 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.System management bus controller I/O space is at 0x%x
 TTARGETTarget format not specified (use the -O option).Terminal has specified geometry.Terminal is ASCII-only [default].Terminal is logical-ordered UTF-8.Terminal is visually-ordered UTF-8.Test USB support.Test bit at BYTE:BIT in CMOS.Test file read speed.Test if REGEXP matches STRING.Test video subsystem in mode WxH.Test video subsystem.Text-only The files are identical.
-The highlighted entry will be executed automatically in %ds.This entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/default/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
+The highlighted entry will be executed automatically in %ds.This entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
 Trailing backslashTransform 64-bit UUID to format suitable for XNU. If -l is given keep it lowercase as done by blkid.Transform a system filename into GRUB one.Translates the string with the current settings.Try '%s --help' or '%s --usage' for more information.
 TuesdayUSER PASSWORDUSER PBKDF2_PASSWORDUSERNAME[,USERNAME]UTF-8Unable to create pipe: %sUnable to determine your platform. Use --target.Unable to fork: %sUnable to open stream from %s: %sUnable to retrieve pool stateUncompress data.Uncompress file before checksumming.Unknown address type %d
 Unknown command `%s'.
@@ -260,11 +260,11 @@
 Atopouse algo máis de Hurd pero non chega para arrancar.Especifique o nome do ficheiro.Especificar o hash para usar.Especifique un ou máis ficheiros de tipos de letra para cargar.Especifica o tamaño de cada operación de lecturaEspecificar o número de ficheiros de entrada.Velocidade: %s 
 Arrancar o servizo GDB no porto dadoDeter o servizo GDBGardar o compoñente de NÚMERO EN NOMEVARIBEL.CorrectoDomingoSuprimir a saída normal (permanecen os avisos).Trocar para utilizar controladores de disco nativos. De non especificar módulos, utilizarase o conxunto predeterminado (pata, ahci, usbms, ohci, uhci, ehci)Erro sintáctico na liña %u
 Detectáronse erros sintácticos no ficheiro de configuración do GRUB xerado.
-Asegúrese de que non hai erros en /etc/default/grub
+Asegúrese de que non hai erros en /etc/conf.d/grub
 e nos ficheiros /etc/grub.d/* ou escriba un informe de erro co
 %s ficheiro anexado.O espazo do sistema de xestión do controlador de bus de E/S está en 0x%x
 TDESTINOFormato de destino non especificado (utilice a opción -O).O terminal especificou a xeometría.O terminal só é ASCII [predeterminado].O terminal é un UTF-8 ordenado loxicamente.O terminal é un UTF-8 visualmente ordenado.Comprobar se é compatíbel con USB.Probar bit en BYTE:BIT no CMOS.Velocidade de lectura do ficheiro de proba.Probar se REGEXP coincide con CADEA.Probar o subsistema de vídeo en modo LARGOxALTO.Comprobar o subsistema de vídeo.Só texto Os ficheiros son idénticos.
-A entrada realzada executarase automaticamente en %ds.Calquera usuario pode arrancar con esta entrada.Isto require a opción GRUB_PREDETERMINADO=gardada en %s/default/grub.\nXovesTiBTiB/sFerramenta para editar bloques de entorno.Tamaño total da flash: %d B.
+A entrada realzada executarase automaticamente en %ds.Calquera usuario pode arrancar con esta entrada.Isto require a opción GRUB_PREDETERMINADO=gardada en %s/conf.d/grub.\nXovesTiBTiB/sFerramenta para editar bloques de entorno.Tamaño total da flash: %d B.
 Barra invertida na fin de liñaTransformar o UUID de 64 bits a formato adecuado para XNU. No caso de dar -l mantelo en minúsculas como o dá blkid.Transformar un nome de ficheiro do sistema nun de GRUB.Traduza a cadea que contén a configuración actual.Probe '%s --help' ou '%s --usage' para máis información.
 MartesCONTRASINAL DE USUARIOUSUARIO CONTRASINAL_PBKDF2USUARIO[,USUARIO]UTF-8Non é posíbel crear a canalización: %sNon é posíbel determinar a súa plataforma. Utilice --target.Non é posíbel ramificar: %sNon é posíbel abrir o fluxo de %s: %sNon foi posíbel obter o estado do grupoDatos sen comprimir.Descomprimir o ficheiro antes da suma de comprobación.O tipo de enderezo %d é descoñecido
 Orde «%s» descoñecida.
diff -Naur grub-2.02~rc2/po/gl.po grub-2.02~rc2-confd/po/gl.po
--- grub-2.02~rc2/po/gl.po	2017-03-15 09:41:34.000000000 +0100
+++ grub-2.02~rc2-confd/po/gl.po	2017-04-04 12:57:04.901014468 +0200
@@ -6645,12 +6645,12 @@
 #: util/grub-mkconfig.in:271
 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."
 
@@ -6704,9 +6704,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.02~rc2/po/grub.pot grub-2.02~rc2-confd/po/grub.pot
--- grub-2.02~rc2/po/grub.pot	2017-03-15 09:41:18.000000000 +0100
+++ grub-2.02~rc2-confd/po/grub.pot	2017-04-04 12:57:04.938014070 +0200
@@ -6353,7 +6353,7 @@
 #: util/grub-mkconfig.in:271
 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 ""
@@ -6404,7 +6404,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.02~rc2/po/hu.gmo grub-2.02~rc2-confd/po/hu.gmo
--- grub-2.02~rc2/po/hu.gmo	2017-03-15 09:41:38.000000000 +0100
+++ grub-2.02~rc2-confd/po/hu.gmo	2017-04-04 12:57:04.768015901 +0200
@@ -146,12 +146,12 @@
 Specify filename.Specify hash to use.Specify one or more font files to load.Specify size for each read operationSpecify the number of input files.Speed: %s 
 Start GDB stub on given portStop GDB stubStorage information for `%s' does not include typeStorage information for `%s' indicates neither a plain partition nor a plain diskStore matched component NUMBER in VARNAME.SuccessSundaySuppress normal output (warnings remain).Switch to native disk drivers. If no modules are specified default set (pata,ahci,usbms,ohci,uhci,ehci) is usedSyntax error at line %u
 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.System management bus controller I/O space is at 0x%x
 TTARGETTHEMESTarget format not specified (use the -O option).Terminal has specified geometry.Terminal is ASCII-only [default].Terminal is logical-ordered UTF-8.Terminal is visually-ordered UTF-8.Test USB support.Test bit at BYTE:BIT in CMOS.Test file read speed.Test if REGEXP matches STRING.Test video subsystem in mode WxH.Test video subsystem.Text-only The files are identical.
 The highlighted entry will be executed automatically in %ds.This VDEV is a RAIDZ%llu
-This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/default/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
+This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
 Trailing backslashTransform 64-bit UUID to format suitable for XNU. If -l is given keep it lowercase as done by blkid.Transform a system filename into GRUB one.Transform syslinux config into GRUB one.Translate SET1 characters to SET2 in STRING.Translate to lower case.Translate to upper case.Translates the string with the current settings.Try '%s --help' or '%s --usage' for more information.
 TuesdayUSER PASSWORDUSER PBKDF2_PASSWORDUSERNAME[,USERNAME]UTF-8Unable to create pipe: %sUnable to determine your platform. Use --target.Unable to fork: %sUnable to open stream from %s: %sUnable to retrieve pool stateUncompress data.Uncompress file before checksumming.Unknown address type %d
 Unknown command `%s'.
@@ -294,12 +294,12 @@
 Fájlnév megadása.Használandó hash megadása.Adjon meg legalább egy betöltendő betűkészletfájlt.Méret meghatározása minden olvasási műveletnélA bemeneti fájlok számának megadása.Sebesség: %s 
 GDB csonk indítása a megadott portonGDB csonk leállításaA(z) „%s” tároló-információi nem tartalmaznak típustA(z) „%s” tároló-információi nem jeleznek sem egyszerű partíciót, sem egyszerű lemeztAz egyező komponens SZÁM tárolása a VÁLTOZÓNÉVBEN.SikerültVasárnapNormál kimenet elnyomása (a figyelmeztetések maradnak).Átváltás natív lemezmeghajtókra. Ha nincs modul megadva, az alapértelmezett beállítás (pata,ahci,usbms,ohci,uhci,ehci) lesz használvaSzintaktikai hiba a(z) %u. sorban
 Szintaktikai hibák találhatók az előállított GRUB beállítófájlban.
-Győződjön meg arról, hogy nincsenek hibák a /etc/default/grub
+Győződjön meg arról, hogy nincsenek hibák a /etc/conf.d/grub
 és a /etc/grub.d/* fájlokban, vagy küldjön egy hibajelentést a(z)
 %s fájllal mellékelve.Rendszerkezelő buszvezérlő I/O tér van itt: 0x%x
 TCÉLTÉMÁKA célformátum nincs megadva (használja a -O kapcsolót).A terminálnak adott geometriája van.A terminál csak ASCII [alapértelmezett].A terminál logikai sorrendű UTF-8.A terminál vizuális sorrendű UTF-8.USB-támogatás tesztelése.Bit tesztelése a CMOS BÁJT:BIT helyén.Fájl olvasási sebességének tesztelése.Annak tesztelése, hogy a REGKIF illeszkedik-e a SZÖVEGRE.Videoalrendszer tesztelése SzxM módban.Videoalrendszer tesztelése.Csak szöveg A fájlok teljesen egyformák.
 A kijelölt bejegyzés automatikusan elindul %d másodperc múlva.Ez a VDEV egy RAIDZ%llu
-Ez a VDEV egy tükörEzt a bejegyzést bármely felhasználó indíthatja.Ez a GRUB_DEFAULT=saved beállítást igényli a(z) %s/default/grub fájlban.\nCsütörtökTiBTiB/sKörnyezetblokk szerkesztésére szolgáló eszköz.Teljes flash méret: %d B.
+Ez a VDEV egy tükörEzt a bejegyzést bármely felhasználó indíthatja.Ez a GRUB_DEFAULT=saved beállítást igényli a(z) %s/conf.d/grub fájlban.\nCsütörtökTiBTiB/sKörnyezetblokk szerkesztésére szolgáló eszköz.Teljes flash méret: %d B.
 Záró visszaper64 bites UUID átalakítása XNU-hoz megfelelő formátumba. Ha a -l meg van adva, tartsa kisbetűsen, ahogy a blkid elkészítette.Egy rendszer fájlnév átalakítása GRUB fájlnévre.A syslinux beállítás átalakítása GRUB beállításra.A HALMAZ1 karakterek fordítása HALMAZ2-re a SZÖVEGBEN.Fordítás kisbetűsre.Fordítás nagybetűsre.Lefordítja a karakterláncot a jelenlegi beállításokkal.További információkért próbálja a(z) „%s --help” vagy „%s --usage” parancsot.
 KeddFELHASZNÁLÓ JELSZÓFELHASZNÁLÓ PBKDF2_JELSZÓFELHASZNÁLÓNÉV[,FELHASZNÁLÓNÉV]UTF-8Nem lehet csövet létrehozni: %sNem lehet meghatározni a platformot. Használja a --target kapcsolót.Nem lehet elágazni: %sNem lehet megnyitni a folyamot innen: %s: %sNem lehet lekérni a tárolóállapototAdatok kibontása.Fájl kibontása az ellenőrzőösszeg számolása előtt.Ismeretlen címtípus: %d
 Ismeretlen parancs: „%s”.
diff -Naur grub-2.02~rc2/po/hu.po grub-2.02~rc2-confd/po/hu.po
--- grub-2.02~rc2/po/hu.po	2017-03-15 09:41:34.000000000 +0100
+++ grub-2.02~rc2-confd/po/hu.po	2017-04-04 12:57:05.002013380 +0200
@@ -6599,12 +6599,12 @@
 #: util/grub-mkconfig.in:271
 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."
 
@@ -6664,9 +6664,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.02~rc2/po/id.po grub-2.02~rc2-confd/po/id.po
--- grub-2.02~rc2/po/id.po	2017-03-15 09:41:34.000000000 +0100
+++ grub-2.02~rc2-confd/po/id.po	2017-04-04 12:57:05.072012627 +0200
@@ -6638,7 +6638,7 @@
 #: util/grub-mkconfig.in:271
 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 ""
@@ -6690,7 +6690,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.02~rc2/po/it.gmo grub-2.02~rc2-confd/po/it.gmo
--- grub-2.02~rc2/po/it.gmo	2017-03-15 09:41:39.000000000 +0100
+++ grub-2.02~rc2-confd/po/it.gmo	2017-04-04 12:57:05.063012724 +0200
@@ -145,12 +145,12 @@
 Specify filename.Specify hash to use.Specify one or more font files to load.Specify size for each read operationSpecify the number of input files.Speed: %s 
 Start GDB stub on given portStop GDB stubStorage information for `%s' does not include typeStorage information for `%s' indicates neither a plain partition nor a plain diskStore matched component NUMBER in VARNAME.SuccessSundaySuppress normal output (warnings remain).Switch to native disk drivers. If no modules are specified default set (pata,ahci,usbms,ohci,uhci,ehci) is usedSyntax error at line %u
 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.System management bus controller I/O space is at 0x%x
 TTARGETTHEMESTarget format not specified (use the -O option).Terminal has specified geometry.Terminal is ASCII-only [default].Terminal is logical-ordered UTF-8.Terminal is visually-ordered UTF-8.Test USB support.Test bit at BYTE:BIT in CMOS.Test file read speed.Test if REGEXP matches STRING.Test video subsystem in mode WxH.Test video subsystem.Text-only The files are identical.
 The highlighted entry will be executed automatically in %ds.This VDEV is a RAIDZ%llu
-This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/default/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
+This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
 Trailing backslashTransform 64-bit UUID to format suitable for XNU. If -l is given keep it lowercase as done by blkid.Transform a system filename into GRUB one.Transform syslinux config into GRUB one.Translate SET1 characters to SET2 in STRING.Translate to lower case.Translate to upper case.Translates the string with the current settings.Try '%s --help' or '%s --usage' for more information.
 TuesdayUSER PASSWORDUSER PBKDF2_PASSWORDUSERNAME[,USERNAME]UTF-8Unable to create pipe: %sUnable to determine your platform. Use --target.Unable to fork: %sUnable to open stream from %s: %sUnable to retrieve pool stateUncompress data.Uncompress file before checksumming.Unknown address type %d
 Unknown command `%s'.
@@ -300,11 +300,11 @@
 Avvia stub GDB sulla porta fornitaFerma stub GDBLe informazioni di archiviazione per "%s" non comprendono il tipoLe informazioni di archiviazione per "%s" indicano una partizione o un disco normaleArchivia il corrispondente componente NUMERO in NOMEVARSuccessodomenicaElimina l'output normale (gli avvisi restano)Passa ai driver disco nativi; se nessun modulo è specificato viene usato l'insieme predefinito (pata,ahci,usbms,ohci,uhci,ehci)Errore di sintassi alla riga %u
 Errori di sintassi sono stati rilevati nel file di configurazione
 di GRUB generato. Assicurarsi che non vi siano errori in
-/etc/default/grub e /etc/grub.d/* o segnalare un bug allegando
+/etc/conf.d/grub e /etc/grub.d/* o segnalare un bug allegando
 il file %s.Lo spazio I/O del bus di controllo di sistema è a 0x%x
 TOBIETTIVOTEMIFormato dell'obiettivo non specificato (usare l'opzione -O).Il terminale ha la geometria specificataIl terminale è solamente ASCII [predefinito]Il terminale è UTF-8 in ordine logicoIl terminale è UTF-8 in ordine visualeVerifica il supporto USBVerifica il bit BYTE:BIT nel CMOSVerifica la velocità di lettura fileVerifica che REGEXP corrisponda a STRINGAVerifica il sottosistema video in modalità W×HVerifica il sottosistema videoSolo testoI file sono identici.
 La voce selezionata verrà avviata automaticamente in %ds.Questo VDEV è un RAIDZ%llu
-Questo VDEV è un mirrorQuesta voce può essere avviata da tutti gli utenti.Ciò necessita l'impostazione di GRUB_DEFAULT=saved in %s/default/grub.\ngiovedìTiBTiB/sStrumento per modificare il blocco dell'ambiente.Dimensione totale flash: %d B.
+Questo VDEV è un mirrorQuesta voce può essere avviata da tutti gli utenti.Ciò necessita l'impostazione di GRUB_DEFAULT=saved in %s/conf.d/grub.\ngiovedìTiBTiB/sStrumento per modificare il blocco dell'ambiente.Dimensione totale flash: %d B.
 Backslash finaleTrasforma UUID 64-bit in un formato adatto per XNU; se viene passato -l mantiene tutto minuscolo come fatto da blkidTrasforma il nome file di sistema in uno di GRUB.Trasforma la configurazione syslinux in una GRUB.Converte i caratteri in STRINGA da SET1 a SET2Converte tutto in minuscoloConverte tutto in maiuscoloTraduce la stringa con le impostazioni attualiProvare "%s --help" o "%s --usage" per ulteriori informazioni.
 martedìUTENTE PASSWORDUTENTE PASSWORD_PBKDF2NOMEUTENTE[,NOMEUTENTE]UTF-8Impossibile creare pipe: %sImpossibile determinare la piattaforma. Utilizzare --target.Impossibile eseguire fork: %sImpossibile aprire lo stream da %s: %sImpossibile recuperare lo stato del poolDecomprime i datiEstrae il file prima di calcolare il checksumTipo d'indirizzo %d sconosciuto
 Comando "%s" sconosciuto.
diff -Naur grub-2.02~rc2/po/it.po grub-2.02~rc2-confd/po/it.po
--- grub-2.02~rc2/po/it.po	2017-03-15 09:41:34.000000000 +0100
+++ grub-2.02~rc2-confd/po/it.po	2017-04-04 12:57:05.046012907 +0200
@@ -6626,13 +6626,13 @@
 #: util/grub-mkconfig.in:271
 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 ""
 "Errori di sintassi sono stati rilevati nel file di configurazione\n"
 "di GRUB generato. Assicurarsi che non vi siano errori in\n"
-"/etc/default/grub e /etc/grub.d/* o segnalare un bug allegando\n"
+"/etc/conf.d/grub e /etc/grub.d/* o segnalare un bug allegando\n"
 "il file %s."
 
 #: util/grub-mkconfig.in:283
@@ -6694,9 +6694,9 @@
 msgstr "Imposta la voce di menù d'avvio predefinita per 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 ""
-"Ciò necessita l'impostazione di GRUB_DEFAULT=saved in %s/default/grub.\\n"
+"Ciò necessita l'impostazione di 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.02~rc2/po/ja.po grub-2.02~rc2-confd/po/ja.po
--- grub-2.02~rc2/po/ja.po	2017-03-15 09:41:34.000000000 +0100
+++ grub-2.02~rc2-confd/po/ja.po	2017-04-04 12:57:04.841015114 +0200
@@ -6687,7 +6687,7 @@
 #: util/grub-mkconfig.in:271
 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 ""
@@ -6738,7 +6738,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.02~rc2/po/ko.po grub-2.02~rc2-confd/po/ko.po
--- grub-2.02~rc2/po/ko.po	2017-03-15 09:41:35.000000000 +0100
+++ grub-2.02~rc2-confd/po/ko.po	2017-04-04 12:57:05.062012734 +0200
@@ -6603,7 +6603,7 @@
 #: util/grub-mkconfig.in:271
 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.02~rc2/po/lt.gmo grub-2.02~rc2-confd/po/lt.gmo
--- grub-2.02~rc2/po/lt.gmo	2017-03-15 09:41:39.000000000 +0100
+++ grub-2.02~rc2-confd/po/lt.gmo	2017-04-04 12:57:04.814015405 +0200
@@ -125,12 +125,12 @@
 Specify filename.Specify hash to use.Specify one or more font files to load.Specify size for each read operationSpeed: %s 
 Storage information for `%s' does not include typeStorage information for `%s' indicates neither a plain partition nor a plain diskStore matched component NUMBER in VARNAME.SuccessSundaySuppress normal output (warnings remain).Switch to native disk drivers. If no modules are specified default set (pata,ahci,usbms,ohci,uhci,ehci) is usedSyntax error at line %u
 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.System management bus controller I/O space is at 0x%x
 TTHEMESTerminal is ASCII-only [default].Test USB support.Test bit at BYTE:BIT in CMOS.Test file read speed.Test if REGEXP matches STRING.Test video subsystem in mode WxH.Test video subsystem.Text-only The files are identical.
 The highlighted entry will be executed automatically in %ds.This VDEV is a RAIDZ%llu
-This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/default/grub.\nThursdayTiBTiB/sTransform 64-bit UUID to format suitable for XNU. If -l is given keep it lowercase as done by blkid.Transform a system filename into GRUB one.Transform syslinux config into GRUB one.Translate SET1 characters to SET2 in STRING.Translate to lower case.Translate to upper case.Translates the string with the current settings.Try '%s --help' or '%s --usage' for more information.
+This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\nThursdayTiBTiB/sTransform 64-bit UUID to format suitable for XNU. If -l is given keep it lowercase as done by blkid.Transform a system filename into GRUB one.Transform syslinux config into GRUB one.Translate SET1 characters to SET2 in STRING.Translate to lower case.Translate to upper case.Translates the string with the current settings.Try '%s --help' or '%s --usage' for more information.
 TuesdayUSER PASSWORDUSER PBKDF2_PASSWORDUSERNAME[,USERNAME]UTF-8Unable to open stream from %s: %sUnable to retrieve pool stateUncompress data.Uncompress file before checksumming.Unknown address type %d
 Unknown command `%s'.
 Unknown compression format %sUnknown encodingUnknown extra argument `%s'.Unknown platform `%s-%s'Unknown system errorUnknown video mode Unknown virtual device type: %s
@@ -255,12 +255,12 @@
 Nurodyti failo vardą.Nurodykite naudotiną maišą.Nurodyti vieną ar daugiau įkeltinų failų.Nurodyti kiekvienos skaitymo operacijos dydįGreitis: %s 
 Atminties įtaiso „%s“ informacijoje nepaminėtas tipasAtminties įtaiso „%s“ informacija nurodo, kad tai nei grynas skaidinys, nei grynas diskasĮrašyti atitikusį komponentą NUMERIS į KINTAMĄJĮ.PavykosekmadienisNerodyti įprasto išvedimo (rodyti tik įspėjimus).Naudoti paprastas disko įtaisų tvarkykles. Jei nenurodomi jokie moduliai, naudojamas numatytasis rinkinys (pata,ahci,usbms,ohci,uhci,ehci)Sintaksės klaida %u eilutėje
 Sukurtame GRUB konfigūracijos faile aptikta klaidų.
-Įsitikinkite, ar nėra klaidų /etc/default/grub
+Įsitikinkite, ar nėra klaidų /etc/conf.d/grub
 ir /etc/grub.d/* failuose arba praneškite apie klaidą
 prisegdami %s failą.Sistemos valdymo magistralės valdiklio įvesties/išvesties erdvė yra adresu 0x%x
 TAPIPAVIDALINIMAITerminalas yra grynai ASCII [numatytas].Išbandyti USB palaikymą.Patikrinti bito ties BAITAS:BITAS reikšmę CMOS'e.Patikrinti failo nuskaitymo greitį.Patikrinti, ar REG_IŠRAIŠKA atitinka EILUTĘ.Išbandyti vaizdo posistemę PLOTIS×AUKŠTIS veiksenoje.Išbandyti vaizdo posistemę.Tik tekstas Failai yra vienodi.
 Pasirinktasis elementas bus paleistas automatiškai po %d sek.Šis VIRTUALUS_ĮRENGINYS yra RAIDZ%llu
-Šis VIRTUALUS_ĮRENGINYS yra veidrodisŠį elementą gali iškviesti bet kuris naudotojas.Tam reikia įrašyti GRUB_DEFAULT=saved faile %s/default/grub.\nketvirtadienisTiBTiB/sTransformuoti 64 bitų UUID identifikatorių į XNU tinkamą formatą. Nurodžius „-l“ parametrą, grąžinamą reikšmę sudarys mažosios raidės, kaip „blkid“ atveju.Sistemos failo pavadinimą konvertuoti į GRUB.syslinux konfigūraciją transformuoti į GRUB.EILUTĖJE RINKINIO1 rašmenis išversti į RINKINIO2 rašmenis.Išversti į mažąsias raides.Išversti į didžiąsias raides.Išverčia eilutę pagal esamas nuostatas.Daugiau informacijos rasite įvykdę „%s --help“ arba „%s --usage“.
+Šis VIRTUALUS_ĮRENGINYS yra veidrodisŠį elementą gali iškviesti bet kuris naudotojas.Tam reikia įrašyti GRUB_DEFAULT=saved faile %s/conf.d/grub.\nketvirtadienisTiBTiB/sTransformuoti 64 bitų UUID identifikatorių į XNU tinkamą formatą. Nurodžius „-l“ parametrą, grąžinamą reikšmę sudarys mažosios raidės, kaip „blkid“ atveju.Sistemos failo pavadinimą konvertuoti į GRUB.syslinux konfigūraciją transformuoti į GRUB.EILUTĖJE RINKINIO1 rašmenis išversti į RINKINIO2 rašmenis.Išversti į mažąsias raides.Išversti į didžiąsias raides.Išverčia eilutę pagal esamas nuostatas.Daugiau informacijos rasite įvykdę „%s --help“ arba „%s --usage“.
 antradienisNAUDOTOJAS SLAPTAŽODISNAUDOTOJAS PBKDF2_SLAPTAŽODISNAUDOTOJAS[,NAUDOTOJAS]UTF-8Nepavyksta atverti srauto iš %s: %sNepavyko sužinoti tomų grupės būsenosIšpakuoti duomenis.Išskleisti failą prieš tikrinant maišą.Nežinomo adreso tipas %d
 Nežinoma komanda „%s“.
 Nežinomas glaudinimo formatas %sNežinoma koduotėNežinomas papildomas argumentas „%s“.nežinoma platforma „%s-%s“Nežinoma sistemos klaidaNežinoma vaizdo veiksena Nežinomas virtualaus įrenginio tipas: %s
diff -Naur grub-2.02~rc2/po/lt.po grub-2.02~rc2-confd/po/lt.po
--- grub-2.02~rc2/po/lt.po	2017-03-15 09:41:35.000000000 +0100
+++ grub-2.02~rc2-confd/po/lt.po	2017-04-04 12:57:05.080012540 +0200
@@ -6526,12 +6526,12 @@
 #: util/grub-mkconfig.in:271
 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ą."
 
@@ -6583,8 +6583,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.02~rc2/po/nb.gmo grub-2.02~rc2-confd/po/nb.gmo
--- grub-2.02~rc2/po/nb.gmo	2017-03-15 09:41:39.000000000 +0100
+++ grub-2.02~rc2-confd/po/nb.gmo	2017-04-04 12:57:04.948013962 +0200
@@ -146,12 +146,12 @@
 Specify filename.Specify hash to use.Specify one or more font files to load.Specify size for each read operationSpecify the number of input files.Speed: %s 
 Start GDB stub on given portStop GDB stubStorage information for `%s' does not include typeStorage information for `%s' indicates neither a plain partition nor a plain diskStore matched component NUMBER in VARNAME.SuccessSundaySuppress normal output (warnings remain).Switch to native disk drivers. If no modules are specified default set (pata,ahci,usbms,ohci,uhci,ehci) is usedSyntax error at line %u
 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.System management bus controller I/O space is at 0x%x
 TTARGETTHEMESTarget format not specified (use the -O option).Terminal has specified geometry.Terminal is ASCII-only [default].Terminal is logical-ordered UTF-8.Terminal is visually-ordered UTF-8.Test USB support.Test bit at BYTE:BIT in CMOS.Test file read speed.Test if REGEXP matches STRING.Test video subsystem in mode WxH.Test video subsystem.Text-only The files are identical.
 The highlighted entry will be executed automatically in %ds.This VDEV is a RAIDZ%llu
-This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/default/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
+This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
 Trailing backslashTransform 64-bit UUID to format suitable for XNU. If -l is given keep it lowercase as done by blkid.Transform a system filename into GRUB one.Transform syslinux config into GRUB one.Translate SET1 characters to SET2 in STRING.Translate to lower case.Translate to upper case.Translates the string with the current settings.Try '%s --help' or '%s --usage' for more information.
 TuesdayUSER PASSWORDUSER PBKDF2_PASSWORDUSERNAME[,USERNAME]UTF-8Unable to create pipe: %sUnable to determine your platform. Use --target.Unable to fork: %sUnable to open stream from %s: %sUnable to retrieve pool stateUncompress data.Uncompress file before checksumming.Unknown address type %d
 Unknown command `%s'.
@@ -299,12 +299,12 @@
 Velg filnavn.Velg hvilken nøkkel som skal brukes.Velg én eller flere skrifttype-filer som skal lastes inn.Velg hvor stor hver leseoperasjon skal væreVelg antall inndatafiler.Hastighet: %s 
 Start GDB-test på valgt portStans GDB-testingLagringsinformasjon for «%s» inneholder ikke typeLagringsinformasjon for «%s» tilsier hverken ren partisjon eller ren diskLagre samsvarende komponent-TALL i VARNAVN.VellykketsøndagIkke vis vanlig utskrift (advarsler skrives fremdeles ut).Bytt til innebygde diskdrivere. Hvis ingen moduler er valgt, brukes standardsett (pata,ahci,usbms,ohci,uhci,ehci)Syntaksfeil ved linje %u
 Generert GRUB-oppsettsfil inneholder syntaksfeil.
-Kontroller at grunnlaget i /etc/default/grub og /etc/grub.d/*
+Kontroller at grunnlaget i /etc/conf.d/grub og /etc/grub.d/*
 ikke innheholder feil, og send inn en feilrapport
 med %s vedlagt hvis du fremdeles har problemer.Inn-/utdataområde for kontrollenhet for systemhåndteringsbuss ligger ved 0x%x
 TMÅLTEMAERDu har ikke valgt målformat (bruk valget «-O»).Terminalen har spesifisert størrelse.Terminalen bruker kun ASCII [standard].Terminalen bruker logisk sortert UTF-8.Terminalen bruker visuelt sortert UTF-8.Test USB-støtte.Test bit ved BYTE:BIT i CMOS.Test lesehastighet på fil.Sjekk om REG_UTTR samsvarer med STRENG.Test video-undersystem i modus BreddexHøyde.Test video-undersystem.Bare tekstFilene er identiske.
 Valgt oppføring startes automatisk om %ds.Denne VDEV-en er en RAIDZ%llu
-Denne VDEV-en er et speilDenne oppføringa kan startes opp av alle brukere.Dette krever at du gir en verdi til «GRUB_DEFAULT=» i fila %s/default/grub.\ntorsdagTiBTiB/sVerktøy for å redigere miljøblokk.Total kortstørrelse: %d B.
+Denne VDEV-en er et speilDenne oppføringa kan startes opp av alle brukere.Dette krever at du gir en verdi til «GRUB_DEFAULT=» i fila %s/conf.d/grub.\ntorsdagTiBTiB/sVerktøy for å redigere miljøblokk.Total kortstørrelse: %d B.
 Avsluttende omvendt skråstrekGjør om 64-bit-UUID til et format som kan brukes med XNU. Resultatet skrives ut med små bokstaver - som med blkid - hvis «-l» er valgt.Konverter et system-filnavn til et GRUB-filnavn.Konverter syslinux-oppsett til GRUB-oppsett.Gjør om tegn i SETT1 til SETT2 i STRENG.Gjør alle bokstaver små.Gjør alle bokstaver store.OVersetter strengen med gjeldende oppsett.Prøv «%s --help» eller «%s --usage» for ytterligere informasjon.
 tirsdagBRUKER PASSORDBRUKER PBKDF2-PASSORDBRUKERNAVN[,BRUKERNAVN]UTF-8Klarte ikke å lage datarør: %sKlarte ikke å finne ut hvilken plattform du bruker. Bruk «--target».Klarte ikke å kopiere: %sKlarte ikke å åpne strøm fra %s. %sKlarte ikke å hente pool-statusPakk ut data.Pakk ut fila før sjekksummer kontrolleres.%d er en ukjent adressetype
 «%s» er en ukjent kommando.
diff -Naur grub-2.02~rc2/po/nb.po grub-2.02~rc2-confd/po/nb.po
--- grub-2.02~rc2/po/nb.po	2017-03-15 09:41:35.000000000 +0100
+++ grub-2.02~rc2-confd/po/nb.po	2017-04-04 12:57:04.810015448 +0200
@@ -6563,12 +6563,12 @@
 #: util/grub-mkconfig.in:271
 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."
 
@@ -6628,9 +6628,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.02~rc2/po/nl.gmo grub-2.02~rc2-confd/po/nl.gmo
--- grub-2.02~rc2/po/nl.gmo	2017-03-15 09:41:39.000000000 +0100
+++ grub-2.02~rc2-confd/po/nl.gmo	2017-04-04 12:57:04.922014242 +0200
@@ -144,12 +144,12 @@
 Specify filename.Specify hash to use.Specify one or more font files to load.Specify size for each read operationSpecify the number of input files.Speed: %s 
 Start GDB stub on given portStop GDB stubStorage information for `%s' does not include typeStorage information for `%s' indicates neither a plain partition nor a plain diskStore matched component NUMBER in VARNAME.SuccessSundaySuppress normal output (warnings remain).Switch to native disk drivers. If no modules are specified default set (pata,ahci,usbms,ohci,uhci,ehci) is usedSyntax error at line %u
 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.System management bus controller I/O space is at 0x%x
 TTARGETTHEMESTarget format not specified (use the -O option).Terminal has specified geometry.Terminal is ASCII-only [default].Terminal is logical-ordered UTF-8.Terminal is visually-ordered UTF-8.Test USB support.Test bit at BYTE:BIT in CMOS.Test file read speed.Test if REGEXP matches STRING.Test video subsystem in mode WxH.Test video subsystem.Text-only The files are identical.
 The highlighted entry will be executed automatically in %ds.This VDEV is a RAIDZ%llu
-This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/default/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
+This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
 Trailing backslashTransform 64-bit UUID to format suitable for XNU. If -l is given keep it lowercase as done by blkid.Transform a system filename into GRUB one.Transform syslinux config into GRUB one.Translate SET1 characters to SET2 in STRING.Translate to lower case.Translate to upper case.Translates the string with the current settings.Try '%s --help' or '%s --usage' for more information.
 TuesdayUSER PASSWORDUSER PBKDF2_PASSWORDUSERNAME[,USERNAME]UTF-8Unable to create pipe: %sUnable to determine your platform. Use --target.Unable to fork: %sUnable to open stream from %s: %sUnable to retrieve pool stateUncompress data.Uncompress file before checksumming.Unknown address type %d
 Unknown command `%s'.
@@ -306,12 +306,12 @@
 Bestandsnaam opgeven.Te gebruiken hash.Te laden lettertypebestanden.Grootte opgeven voor elke leesoperatieTe gebruiken aantal invoerbestanden.Snelheid: %s
 GDB-stub starten op de gegeven poortGDB-stub stoppenOpslaginformatie voor '%s' bevat niet het typeOpslaginformatie voor '%s' geeft noch een gewone partitie noch een gewone schijf aanOvereenkomende component (met dit NUMMER) opslaan in VARNAAM.GeluktzondagGewone uitvoer onderdrukken (maar waarschuwingen niet).Naar originele schijfstuurprogramma's overschakelen. Als er geen modules gegeven zijn, dan wordt de standaardset (pata,ahci,usbms,ohci,uhci,ehci) gebruikt.Syntaxfout in regelnummer %u
 Er zijn syntaxfouten gevonden in het aangemaakte GRUB-configuratiebestand.
-Verzeker u ervan dat er geen fouten zitten in het bestand /etc/default/grub
+Verzeker u ervan dat er geen fouten zitten in het bestand /etc/conf.d/grub
 noch in de bestanden in /etc/grub.d/.  Rapporteer anders een fout, met het
 bestand %s als bijlage.I/O-ruimte van SMBus-controller is op 0x%x
 TDOELTHEMA'SDoelindeling is niet gegeven (gebruik optie '-O').De terminal heeft de gegeven afmetingen.De terminal is alleen-ASCII  [standaard].De terminal is logisch-geordende UTF-8.De terminal is visueel-geordende UTF-8.USB-ondersteuning testen.Een bit testen op positie BYTE:BIT in CMOS.Leessnelheid van bestanden testen.Controleren of reguliere expressie REGEXP overeenkomt met TEKENREEKS.Video-subsysteem testen in modus BxH.Video-subsysteem testen.Alleen tekst De bestanden zijn identiek.
 Over %d seconden wordt het geselecteerde item automatisch gestart.Deze VDEV is een RAIDZ%llu
-Deze VDEV is een mirrorDit item kan gestart worden door elke gebruiker.Dit vereist het instellen van GRUB_DEFAULT=saved in %s/default/grub.\ndonderdagTiBTiB/sGereedschap om omgevingsblok mee te bewerken.Totale flash-grootte: %d B.
+Deze VDEV is een mirrorDit item kan gestart worden door elke gebruiker.Dit vereist het instellen van GRUB_DEFAULT=saved in %s/conf.d/grub.\ndonderdagTiBTiB/sGereedschap om omgevingsblok mee te bewerken.Totale flash-grootte: %d B.
 Backslash aan het eindEen 64-bit UUID geschikt maken voor XNU.  Als optie '-l' gegeven is, dan alleen in kleine letters zoals 'blkid' doet.Een bestandsnaam uit het systeem omzetten naar eentje voor GRUB.Een syslinux-configuratiebestand omzetten naar eentje voor GRUB.In TEKENREEKS de tekens in SET1 omzetten naar SET2.Omzetten naar kleine letters.Omzetten naar hoofdletters.Vertaalt de tekenreeks met de huidige instellingen.Typ '%s --help' of '%s --usage' voor meer informatie.
 dinsdagGEBRUIKERSNAAM WACHTWOORDGEBRUIKERSNAAM PBKDF2-WACHTWOORDGEBRUIKERSNAAM[,GEBRUIKERSNAAM...]UTF-8Kan geen pijp aanmaken: %sKan uw platform niet achterhalen.  Gebruik optie '--target'.Kan geen nieuw proces starten: %sKan gegevensstroom uit %s niet openen: %sKan pool-status niet verkrijgenGegevens decomprimeren.Bestand decomprimeren vóór berekenen van controlesom.Onbekend adrestype %d
 Opdracht '%s' is onbekend.
diff -Naur grub-2.02~rc2/po/nl.po grub-2.02~rc2-confd/po/nl.po
--- grub-2.02~rc2/po/nl.po	2017-03-15 09:41:35.000000000 +0100
+++ grub-2.02~rc2-confd/po/nl.po	2017-04-04 12:57:05.011013283 +0200
@@ -6628,12 +6628,12 @@
 #: util/grub-mkconfig.in:271
 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."
 
@@ -6692,9 +6692,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.02~rc2/po/pa.po grub-2.02~rc2-confd/po/pa.po
--- grub-2.02~rc2/po/pa.po	2017-03-15 09:41:35.000000000 +0100
+++ grub-2.02~rc2-confd/po/pa.po	2017-04-04 12:57:04.821015330 +0200
@@ -6415,7 +6415,7 @@
 #: util/grub-mkconfig.in:271
 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 ""
@@ -6466,7 +6466,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.02~rc2/po/pl.gmo grub-2.02~rc2-confd/po/pl.gmo
--- grub-2.02~rc2/po/pl.gmo	2017-03-15 09:41:39.000000000 +0100
+++ grub-2.02~rc2-confd/po/pl.gmo	2017-04-04 12:57:04.770015879 +0200
@@ -148,12 +148,12 @@
 Specify filename.Specify hash to use.Specify one or more font files to load.Specify size for each read operationSpecify the number of input files.Speed: %s 
 Start GDB stub on given portStop GDB stubStorage information for `%s' does not include typeStorage information for `%s' indicates neither a plain partition nor a plain diskStore matched component NUMBER in VARNAME.SuccessSundaySuppress normal output (warnings remain).Switch to native disk drivers. If no modules are specified default set (pata,ahci,usbms,ohci,uhci,ehci) is usedSyntax error at line %u
 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.System management bus controller I/O space is at 0x%x
 TTARGETTHEMESTarget format not specified (use the -O option).Terminal has specified geometry.Terminal is ASCII-only [default].Terminal is logical-ordered UTF-8.Terminal is visually-ordered UTF-8.Test USB support.Test bit at BYTE:BIT in CMOS.Test file read speed.Test if REGEXP matches STRING.Test video subsystem in mode WxH.Test video subsystem.Text-only The files are identical.
 The highlighted entry will be executed automatically in %ds.This VDEV is a RAIDZ%llu
-This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/default/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
+This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
 Trailing backslashTransform 64-bit UUID to format suitable for XNU. If -l is given keep it lowercase as done by blkid.Transform a system filename into GRUB one.Transform syslinux config into GRUB one.Translate SET1 characters to SET2 in STRING.Translate to lower case.Translate to upper case.Translates the string with the current settings.Try '%s --help' or '%s --usage' for more information.
 TuesdayUSER PASSWORDUSER PBKDF2_PASSWORDUSERNAME[,USERNAME]UTF-8Unable to create pipe: %sUnable to determine your platform. Use --target.Unable to fork: %sUnable to open stream from %s: %sUnable to retrieve pool stateUncompress data.Uncompress file before checksumming.Unknown address type %d
 Unknown command `%s'.
@@ -301,11 +301,11 @@
 Podaje nazwę pliku.Podaje sumę do użycia.Podaje jeden lub więcej plików czcionek do wczytania.Określa rozmiar dla każdej operacji odczytuPodaje liczbę plików wejściowych.Szybkość: %s 
 Uruchamia zaślepkę GDB na podanym porcieZatrzymuje zaślepkę GDBInformacje o przestrzeni danych dla "%s" nie zawierają typuInformacje o przestrzeni danych dla "%s" nie określają zwykłej partycji ani zwykłego dyskuZapisuje NUMER dopasowanego elementu w ZMIENNEJ.SukcesNiedzielaOgranicza zwykłe wyjście (ostrzeżenia pozostają).Przełącza na natywne sterowniki dysku. Jeśli nie podano modułów, używany jest zestaw domyślny (pata,ahci,usbms,ohci,uhci,ehci)Błąd składni w linii %u
 W wygenerowanym pliku konfiguracyjnym GRUB-a wykryto błędy składni.
-Proszę się upewnić, że w plikach /etc/default/grub oraz /etc/grub.d/*
+Proszę się upewnić, że w plikach /etc/conf.d/grub oraz /etc/grub.d/*
 nie ma błędów lub wypełnić raport o błędzie z załączonym plikiem %s.Przestrzeń we/wy kontrolera SM-bus jest pod 0x%x
 TCELMOTYWYNie określono formatu docelowego (opcji -O).Terminal posiada podane wymiary.Terminal obsługuje tylko ASCII [domyślne].Terminal obsługuje logicznie porządkowane UTF-8.Terminal obsługuje wizualnie porządkowane UTF-8.Testuje obsługę USB.Sprawdza bit BAJT:BIT w CMOS-ie.Testuje szybkość odczytu pliku.Testuje, czy WYRAŻENIE_REGULARNE pasuje do CIĄGU.Testuje podsystem obrazu w trybie SxW.Testuje podsystem obrazu.Tylko tekstPliki są identyczne.
 Wyróżniony wpis zostanie wykonany automatycznie za %ds.To VDEV to RAIDZ%llu
-To VDEV jest kopią lustrzanąTa pozycja może być uruchomiona przez dowolnego użytkownika.To wymaga ustawienia GRUB_DEFAULT=saved w %s/default/grub.\nCzwartekTiBTiB/sNarzędzie do modyfikacji pliku blokowego środowiska.Całkowity rozmiar flasha: %d B.
+To VDEV jest kopią lustrzanąTa pozycja może być uruchomiona przez dowolnego użytkownika.To wymaga ustawienia GRUB_DEFAULT=saved w %s/conf.d/grub.\nCzwartekTiBTiB/sNarzędzie do modyfikacji pliku blokowego środowiska.Całkowity rozmiar flasha: %d B.
 Kończący znak "\"Przekształca 64-bitowy UUID do formatu odpowiedniego dla XNU. Jeśli podano -l, zachowuje małe litery, jak blkid.Przekształca nazwę pliku w systemie na nazwę dla GRUB-a.Przekształca konfigurację syslinuksa na konfigurację GRUB-a.Tłumaczy znaki ZBIÓR1 na ZBIÓR2 w ŁAŃCUCHU.Tłumaczy na małe litery.Tłumaczy na wielkie litery.Tłumaczy ciąg za pomocą bieżących ustawień.Polecenie "%s --help" lub "%s --usage" pozwoli uzyskać więcej informacji.
 WtorekUŻYTKOWNIK HASŁOUŻYTKOWNIK HASŁO_PBKDF2UŻYTKOWNIK[,UŻYTKOWNIK]UTF-8Nie udało się utworzyć potoku: %sNie udało się określić platformy. Proszę użyć --target.Nie udało się utworzyć procesu: %sNie udało się otworzyć strumienia z polecenia %s: %sNie można pobrać stanu puliDekompresuje dane.Dekompresuje plik przed sprawdzeniem sum.Nieznany typ adresu %d
 Nieznane polecenie "%s".
diff -Naur grub-2.02~rc2/po/pl.po grub-2.02~rc2-confd/po/pl.po
--- grub-2.02~rc2/po/pl.po	2017-03-15 09:41:35.000000000 +0100
+++ grub-2.02~rc2-confd/po/pl.po	2017-04-04 12:57:04.852014996 +0200
@@ -6597,12 +6597,12 @@
 #: util/grub-mkconfig.in:271
 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 w plikach /etc/default/grub oraz /etc/grub.d/*\n"
+"Proszę się upewnić, że w plikach /etc/conf.d/grub oraz /etc/grub.d/*\n"
 "nie ma błędów lub wypełnić raport o błędzie z załączonym plikiem %s."
 
 #: util/grub-mkconfig.in:283
@@ -6662,8 +6662,8 @@
 msgstr "Ustawia domyślny wpis menu rozruchowego dla GRUB-a."
 
 #: util/grub-set-default.in:49
-msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
-msgstr "To wymaga ustawienia GRUB_DEFAULT=saved w %s/default/grub.\\n"
+msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
+msgstr "To wymaga 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.02~rc2/po/pt_BR.po grub-2.02~rc2-confd/po/pt_BR.po
--- grub-2.02~rc2/po/pt_BR.po	2017-03-15 09:41:36.000000000 +0100
+++ grub-2.02~rc2-confd/po/pt_BR.po	2017-04-04 12:57:04.911014361 +0200
@@ -6610,7 +6610,7 @@
 #: util/grub-mkconfig.in:271
 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 ""
@@ -6663,7 +6663,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.02~rc2/po/ru.gmo grub-2.02~rc2-confd/po/ru.gmo
--- grub-2.02~rc2/po/ru.gmo	2017-03-15 09:41:39.000000000 +0100
+++ grub-2.02~rc2-confd/po/ru.gmo	2017-04-04 12:57:04.958013854 +0200
@@ -146,12 +146,12 @@
 Specify filename.Specify hash to use.Specify one or more font files to load.Specify size for each read operationSpecify the number of input files.Speed: %s 
 Start GDB stub on given portStop GDB stubStorage information for `%s' does not include typeStorage information for `%s' indicates neither a plain partition nor a plain diskStore matched component NUMBER in VARNAME.SuccessSundaySuppress normal output (warnings remain).Switch to native disk drivers. If no modules are specified default set (pata,ahci,usbms,ohci,uhci,ehci) is usedSyntax error at line %u
 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.System management bus controller I/O space is at 0x%x
 TTARGETTHEMESTarget format not specified (use the -O option).Terminal has specified geometry.Terminal is ASCII-only [default].Terminal is logical-ordered UTF-8.Terminal is visually-ordered UTF-8.Test USB support.Test bit at BYTE:BIT in CMOS.Test file read speed.Test if REGEXP matches STRING.Test video subsystem in mode WxH.Test video subsystem.Text-only The files are identical.
 The highlighted entry will be executed automatically in %ds.This VDEV is a RAIDZ%llu
-This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/default/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
+This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
 Trailing backslashTransform 64-bit UUID to format suitable for XNU. If -l is given keep it lowercase as done by blkid.Transform a system filename into GRUB one.Transform syslinux config into GRUB one.Translate SET1 characters to SET2 in STRING.Translate to lower case.Translate to upper case.Translates the string with the current settings.Try '%s --help' or '%s --usage' for more information.
 TuesdayUSER PASSWORDUSER PBKDF2_PASSWORDUSERNAME[,USERNAME]UTF-8Unable to create pipe: %sUnable to determine your platform. Use --target.Unable to fork: %sUnable to open stream from %s: %sUnable to retrieve pool stateUncompress data.Uncompress file before checksumming.Unknown address type %d
 Unknown command `%s'.
@@ -302,12 +302,12 @@
 Указать имя файла.Использовать указанный хэш.Указать один или несколько файлов шрифтов для загрузки.Укажите объём данных каждой операции чтенияЗадать количество входных файлов.Скорость: %s 
 Запустить заглушку GDB на указанном портуОстановить заглушку GDBИнформация о хранилище «%s» не содержит типВ информации о хранилище для «%s» должен быть указан обычный раздел или обычный дискСохранить совпавший компонент с НОМЕРОМ в ИМЯ_ПЕРЕМЕННОЙ.УспешноВоскресеньеНе показывать обычные сообщения (только предупреждения).Перейти на родные дисковые драйверы. Если модули не указаны, то используется набор по умолчанию (pata,ahci,usbms,ohci,uhci,ehci)Синтаксическая ошибка в строке %u
 В сгенерированном файле настроек GRUB обнаружены синтаксические ошибки.
-Убедитесь, что в файлах /etc/default/grub
+Убедитесь, что в файлах /etc/conf.d/grub
 и /etc/grub.d/* ошибки отсутствуют или пошлите сообщение об ошибке
 в прикреплённым файлом %s.Контроллер системной шины управления вводом-выводом находится по адресу 0x%x
 ТЦЕЛЬТЕМЫЦелевой формат не указан (используйте параметр -O).Терминал имеет указанные размеры.Терминал только в ASCII [по умолчанию].Терминал в логически упорядоченной UTF-8.Терминал в визуально упорядоченной UTF-8.Протестировать поддержку USB.Проверить бит по адресу БАЙТ:БИТ в CMOS.Тест скорости чтения файла.Проверить, совпадает ли РЕГВЫР со СТРОКОЙ.Тест видеоподсистемы в режиме ШxВ.Тест видеоподсистемы.Только-текст Файлы одинаковы.
 Выделенный пункт будет выполнен автоматически через %dс.Данное VDEV является RAIDZ%llu
-Данное VDEV является зеркаломЭтот пункт может быть загружен любым пользователем.Для этого требуется строка GRUB_DEFAULT=saved в %s/default/grub.\nЧетвергТиБТиБ/сИнструмент редактирования блока окружения.Общий размер флэш: %d Б.
+Данное VDEV является зеркаломЭтот пункт может быть загружен любым пользователем.Для этого требуется строка GRUB_DEFAULT=saved в %s/conf.d/grub.\nЧетвергТиБТиБ/сИнструмент редактирования блока окружения.Общий размер флэш: %d Б.
 Обратная косая черта в концеПреобразовать 64-бит UUID в формат, пригодный для XNU. Если указан -l, то оставить в нижнем регистре, как это делает blkid.Преобразовать системное имя файла в имя файла GRUB.Преобразовать настройки syslinux в GRUB.Преобразовать символы в СТРОКЕ из НАБОРА1 в символы из НАБОРА2.Привести к нижнему регистру.Привести к верхнему регистру.Перевести строку с текущими настройками.Попробуйте «%s --help» или «%s --usage» для получения более подробного описания.
 ВторникПАРОЛЬ ПОЛЬЗОВАТЕЛЯПОЛЬЗОВАТЕЛЬ ПАРОЛЬ_PBKDF2ИМЯ_ПОЛЬЗОВАТЕЛЯ[,ИМЯ_ПОЛЬЗОВАТЕЛЯ]UTF-8Не удалось создать канал: %sНе удалось определить вашу платформу. Используйте --target.Не удалось выполнить fork: %sНе удалось открыть поток из %s: %sНе удалось получить состояние пулаРасжать данные.Расжать файл перед проверкой контрольной суммы.Неизвестный тип адреса %d
 Неизвестная команда «%s».
diff -Naur grub-2.02~rc2/po/ru.po grub-2.02~rc2-confd/po/ru.po
--- grub-2.02~rc2/po/ru.po	2017-03-15 09:41:36.000000000 +0100
+++ grub-2.02~rc2-confd/po/ru.po	2017-04-04 12:57:04.946013984 +0200
@@ -6591,12 +6591,12 @@
 #: util/grub-mkconfig.in:271
 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."
 
@@ -6655,8 +6655,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.02~rc2/po/sl.gmo grub-2.02~rc2-confd/po/sl.gmo
--- grub-2.02~rc2/po/sl.gmo	2017-03-15 09:41:39.000000000 +0100
+++ grub-2.02~rc2-confd/po/sl.gmo	2017-04-04 12:56:46.270215109 +0200
@@ -112,7 +112,7 @@
 Shift positional parameters.Show ACPI information.Show APM information.Show a help message.Show a long list with more detailed information.Show contents of FILE in hex.Show loaded modules.Show memory contents.Show raw contents of ATA IDENTIFY sector.Show raw contents of a file or memory.Show the contents of a file.Show the current mappings.Show this message.Show version 1 tables only.Show version 2 and version 3 tables only.Shutdown failedSimulate grub-legacy `initrd' commandSimulate grub-legacy `kernel' commandSimulate grub-legacy `modulenounzip' commandSimulate grub-legacy `password' commandSimulate grub-legacy `password' command in menu entry modeSkip N bytes from output file.Skip offset bytes from the beginning of file.Slot %d opened
 Some Hurd stuff found, but not enough to boot.Specify filename.Specify hash to use.Specify one or more font files to load.Specify the number of input files.Start GDB stub on given portStop GDB stubStore matched component NUMBER in VARNAME.SuccessSundaySuppress normal output (warnings remain).Syntax error at line %u
 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.System management bus controller I/O space is at 0x%x
 TARGETTarget format not specified (use the -O option).Terminal has specified geometry.Terminal is ASCII-only [default].Terminal is logical-ordered UTF-8.Terminal is visually-ordered UTF-8.Test USB support.Test bit at BYTE:BIT in CMOS.Test if REGEXP matches STRING.Test video subsystem in mode WxH.Test video subsystem.Text-only The files are identical.
@@ -238,7 +238,7 @@
 Zamakni parametre položajev ...Pokaži podrobnosti ACPI.Pokaži podrobnosti APM.Prikaži sporočilo pomoči.Prikaži dolg seznam s podrobnejšimi podatki.Pokaže vsebino DATOTEKE v šestnajstiškem zapisu.Pokaži naložene module.Pokaži vsebino pomnilnika.Pokaži surovo vsebino odseka ATA IDENTIFY.Pokaži surovo vsebino datoteke ali pomnilnika.Pokaži vsebino datoteke.Pokaži trenutne preslikave.Pokaži to sporočilo.Pokaži le preglednice različice 1.Pokaži le preglednice različic 2 in 3.Izklop je spodletelSimulira ukaz `initrd' grub-legacySimulira ukaz `kernel' grub-legacySimulira ukaz `modulenounzip' grub-legacySimulira ukaz `password' grub-legacySimulira ukaz `password' grub-legacy v načinu vnosa menijevPreskoči N bajtov iz izhodne datoteke.Preskoči bajte odmika na začetku datoteke.Mesto %d je odprto
 Najdenih je nekaj stvari Hurd, vendar ne dovolj za zagon.Navedite ime datoteke.Navedite razpršilo za uporabo.Navedite eno ali več datotek pisav za nalaganje.Določi število vhodnih datotek.Zaženi GDB na danih vratihZaustavi nastavek GDBShramba se ujema s sestavnim delom ŠTEVILO v IMENU_SPREMENLJIVKEUspešno zaključenonedeljaPrepreči običajen izpis (opozorila ostanejo).Napaka skladnje v vrstici %u
 V ustvarjeni nastavitveni datoteki GRUB so zaznane napake
- skladnje. Prepričajte se, da v datotekah /etc/default/grub in
+ skladnje. Prepričajte se, da v datotekah /etc/conf.d/grub in
 /etc/grub.d/* ni napak ali pa pošljite poročilo o hrošču s pripeto
 datoteko %s.Prostor V/I nadzornika upravljanja vodila je na 0x%x
 CILJCiljna oblika ni določena (uporabite možnost -O).Terminal ima določeno geometrijo.Terminal je le ASCII [privzeto].Terminal je logično urejen UTF-8.Terminal je vidno urejen UTF-8.Preizkusi podporo za USB.Preizkusi bit na BAJT:BIT v CMOS.Preizkusi, ali je REGEXP skladen z NIZEM.Preizkusi video podsistem v načinu WxH.Preizkusi video podsistem.Le besediloDatoteki sta enaki.
diff -Naur grub-2.02~rc2/po/sl.po grub-2.02~rc2-confd/po/sl.po
--- grub-2.02~rc2/po/sl.po	2017-03-15 09:41:36.000000000 +0100
+++ grub-2.02~rc2-confd/po/sl.po	2017-04-04 12:57:05.038012993 +0200
@@ -6607,12 +6607,12 @@
 #: util/grub-mkconfig.in:271
 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."
 
@@ -6662,7 +6662,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.02~rc2/po/sr.gmo grub-2.02~rc2-confd/po/sr.gmo
--- grub-2.02~rc2/po/sr.gmo	2017-03-15 09:41:39.000000000 +0100
+++ grub-2.02~rc2-confd/po/sr.gmo	2017-04-04 12:57:04.825015287 +0200
@@ -142,12 +142,12 @@
 Specify filename.Specify hash to use.Specify one or more font files to load.Specify size for each read operationSpecify the number of input files.Speed: %s 
 Start GDB stub on given portStop GDB stubStorage information for `%s' does not include typeStorage information for `%s' indicates neither a plain partition nor a plain diskStore matched component NUMBER in VARNAME.SuccessSundaySuppress normal output (warnings remain).Switch to native disk drivers. If no modules are specified default set (pata,ahci,usbms,ohci,uhci,ehci) is usedSyntax error at line %u
 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.System management bus controller I/O space is at 0x%x
 TTARGETTHEMESTarget format not specified (use the -O option).Terminal has specified geometry.Terminal is ASCII-only [default].Terminal is logical-ordered UTF-8.Terminal is visually-ordered UTF-8.Test USB support.Test bit at BYTE:BIT in CMOS.Test file read speed.Test if REGEXP matches STRING.Test video subsystem in mode WxH.Test video subsystem.Text-only The files are identical.
 The highlighted entry will be executed automatically in %ds.This VDEV is a RAIDZ%llu
-This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/default/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
+This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
 Trailing backslashTransform 64-bit UUID to format suitable for XNU. If -l is given keep it lowercase as done by blkid.Transform a system filename into GRUB one.Transform syslinux config into GRUB one.Translate SET1 characters to SET2 in STRING.Translate to lower case.Translate to upper case.Translates the string with the current settings.Try '%s --help' or '%s --usage' for more information.
 TuesdayUSER PASSWORDUSER PBKDF2_PASSWORDUSERNAME[,USERNAME]UTF-8Unable to create pipe: %sUnable to determine your platform. Use --target.Unable to fork: %sUnable to open stream from %s: %sUnable to retrieve pool stateUncompress data.Uncompress file before checksumming.Unknown address type %d
 Unknown command `%s'.
@@ -293,12 +293,12 @@
 Наводи назив датотеке.Наводи хеш за коришћење.Наводи једну или више датотека словних ликова за учитавање.Наводи величину за сваку радњу читањаНаводи број улазних датотека.Брзина: %s 
 Покреће ГДБ одсечак на датом прикључникуЗауставља ГДБ одсечакПодаци складиштења за „%s“ не садрже врстуПодаци складиштења за „%s“ не указују ни на обичну партицију ни на обичан дискСмешта поклопљену компоненту БРОЈ у ПРОМЕНЉИВОЈ_НАЗИВА.УспешноНедељаПотискује обичан излаз (упозорења остају).Пребацује се на изворне управљачке програме диска. Ако нису наведени модули користи се основни скуп (pata,ahci,usbms,ohci,uhci,ehci)Грешка синтаксе у %u. реду
 Откривене су грешке синтаксе у створеној датотеци подешавања ГРУБ-а.
-Проверите да ли има грешака у датотекама „/etc/default/grub“
+Проверите да ли има грешака у датотекама „/etc/conf.d/grub“
 и „/etc/grub.d/*“ или попуните извештај о грешкама
 и приложите датотеку „%s“.У/И простор контролера сабирнице управљања системом је на 0x%x
 TМЕТАТЕМЕЦиљни запис није наведен (користите опцију „-O“).Терминал има наведену геометрију.Терминал је само АСКРИ [основно].Терминал је логички-уређени УТФ-8.Терминал је визуелно-уређени УТФ-8.Испробава УСБ подршку.Проверава бит на БАЈТУ:БИТУ у ЦМОС-у.Проверава брзину читања датотеке.Проба да ли РЕГИЗРАЗ одговара НИСКИ.Испробава подсистем снимка у режиму ШxВ.Испробава подсистем снимка.Само текст Датотеке су истоветне.
 Истакнути унос биће самостално извршен за %dс.Овај ВУРЕЂАЈ је РАИДЗ%llu
-Овај ВУРЕЂАЈ је огледалоОвај унос може подићи било који корисник.Ово захтева подешавање „GRUB_DEFAULT=saved“ у „%s/default/grub“.\nЧетвртакTiBTiB/sАлат за уређивање блока окружења.Укупна величина флеша: %d B.
+Овај ВУРЕЂАЈ је огледалоОвај унос може подићи било који корисник.Ово захтева подешавање „GRUB_DEFAULT=saved“ у „%s/conf.d/grub“.\nЧетвртакTiBTiB/sАлат за уређивање блока окружења.Укупна величина флеша: %d B.
 Пратећа контра коса цртаПретвара 64-битни УУИБ у запис пригодан за ИксНУ. Ако је дато „-l“ држига малим словима као што је урађено блкид-ом.Претвара састемски назив датотеке у онај ГРУБ-ов.Претвара подешавања сислинукса у оно ГРУБ-ово.Преводи знакове СКУПА1 у СКУП2 у НИСКИ.Преводи на мала слова.Преводи на велика слова.Преводи ниску са текућим подешавањима.Пробајте „%s --help“ или „%s --usage“ за више података.
 УторакКОРИСНИК ЛОЗИНКАКОРИСНИК ПБКДФ2_ЛОЗИНКАКОРИСНИК[,КОРИСНИК]УТФ-8Не могу да направим спојку: %sНе могу да одредим вашу платформу. Користите „--target“.Не могу да исцепим: %sНе могу да отворим ток из „%s“: %sНе могу да довучем стање спремиштаРаспакује податке.Распакује датотеку пре провере суме.Непозната врста адресе „%d“
 Непозната наредба „%s“.
diff -Naur grub-2.02~rc2/po/sr.po grub-2.02~rc2-confd/po/sr.po
--- grub-2.02~rc2/po/sr.po	2017-03-15 09:41:36.000000000 +0100
+++ grub-2.02~rc2-confd/po/sr.po	2017-04-04 12:57:04.930014156 +0200
@@ -6577,12 +6577,12 @@
 #: util/grub-mkconfig.in:271
 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“."
 
@@ -6642,8 +6642,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.02~rc2/po/sv.gmo grub-2.02~rc2-confd/po/sv.gmo
--- grub-2.02~rc2/po/sv.gmo	2017-03-15 09:41:39.000000000 +0100
+++ grub-2.02~rc2-confd/po/sv.gmo	2017-04-04 12:57:04.874014759 +0200
@@ -137,12 +137,12 @@
 Specify filename.Specify hash to use.Specify one or more font files to load.Specify size for each read operationSpecify the number of input files.Speed: %s 
 Start GDB stub on given portStop GDB stubStorage information for `%s' does not include typeStorage information for `%s' indicates neither a plain partition nor a plain diskStore matched component NUMBER in VARNAME.SuccessSundaySuppress normal output (warnings remain).Switch to native disk drivers. If no modules are specified default set (pata,ahci,usbms,ohci,uhci,ehci) is usedSyntax error at line %u
 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.System management bus controller I/O space is at 0x%x
 TTARGETTHEMESTarget format not specified (use the -O option).Terminal has specified geometry.Terminal is ASCII-only [default].Terminal is logical-ordered UTF-8.Terminal is visually-ordered UTF-8.Test USB support.Test bit at BYTE:BIT in CMOS.Test file read speed.Test if REGEXP matches STRING.Test video subsystem in mode WxH.Test video subsystem.Text-only The files are identical.
 The highlighted entry will be executed automatically in %ds.This VDEV is a RAIDZ%llu
-This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/default/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
+This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
 Trailing backslashTransform 64-bit UUID to format suitable for XNU. If -l is given keep it lowercase as done by blkid.Transform a system filename into GRUB one.Transform syslinux config into GRUB one.Translate SET1 characters to SET2 in STRING.Translate to lower case.Translate to upper case.Translates the string with the current settings.Try '%s --help' or '%s --usage' for more information.
 TuesdayUSER PASSWORDUSER PBKDF2_PASSWORDUSERNAME[,USERNAME]UTF-8Unable to create pipe: %sUnable to determine your platform. Use --target.Unable to fork: %sUnable to open stream from %s: %sUnable to retrieve pool stateUncompress data.Uncompress file before checksumming.Unknown address type %d
 Unknown command `%s'.
@@ -292,12 +292,12 @@
 Ange filnamn.Ange hash att använda.Ange en eller flera typsnittsfiler att läsa in.Ange storlek för varje läsoperationSpecificera antalet inmatningsfiler.Hastighet: %s 
 Starta GDB-stubbe på angiven portStoppa GDB-stubbeLagringsinformation för ”%s” inkluderar inte typLagringsinformationen för ”%s” indikerar varken en vanlig partition eller en vanlig diskLagra matchande komponent NUMMER i VARNAMN.LyckadesSöndagUndertryck vanlig utmatning (varningar återstår).Växla till inbyggda diskdrivrutiner. Om inga moduler anges som används (pata,ahci,usbms,ohci,uhci,ehci) som standardSyntaxfel på rad %u
 Syntaxfel upptäcktes i den genererade GRUB-konfigurationsfilen.
-Kontrollera att det inte finns några fel i /etc/default/grub-
+Kontrollera att det inte finns några fel i /etc/conf.d/grub-
 och /etc/grub.d/*-filerna eller skicka in en felrapport med
 bifogad %s-fil.Systemhanteringsbusskontrollerns I/O-utrymme är på 0x%x
 TMÅLTEMANMålformat inte specificerat (använd 0-alternativet).Terminalen har specificerat geometri.Terminalen är endast ASCII [standard].Terminal är logical-ordered UTF-8.Terminalen är visually-ordered UTF-8.Testa USB-stöd.Testa bit i BYTE:BIT i CMOS.Testa läshastighet för fil.Testa om REGEXP matchar STRÄNG.Testa videodelsystemet i läge WxH.Testa videodelsystemet.Endast textFilerna är identiska.
 Markerat val kommer att startas upp automatiskt om %d sekunder.Denna VDEV är en RAIDZ%llu
-Denna VDEV är en spegelDenna post kan startas av alla användare.Detta kräver inställningen GRUB_DEFAULT=saved i %s/default/grub.\nTorsdagTiBTiB/sVerktyg för att redigera miljöblock.Total flash-storlek: %d B.
+Denna VDEV är en spegelDenna post kan startas av alla användare.Detta kräver inställningen GRUB_DEFAULT=saved i %s/conf.d/grub.\nTorsdagTiBTiB/sVerktyg för att redigera miljöblock.Total flash-storlek: %d B.
 Avslutande omvänt snedstreckTransformera 64-bitars UUID till ett passande format för XNU. Om -l ges, behåll det i gemener precis som blkid.Transformera ett systemfilnamn till ett GRUB-filnamn.Transformera syslinux-konfiguration till GRUB-konfiguration.Översätt SET1-tecken till SET2 i STRÄNG.Översätt till gemener.Översätt till versaler.Översätter strängen med aktuella inställningar.Prova ”%s --help” eller ”%s --usage” för mer information.
 TisdagANVÄNDARLÖSENORDANVÄNDARE PBKDF2_LÖSENORDANVÄNDARNAMN[,ANVÄNDARNAMN]UTF-8Kunde inte skapa rör: %sKunde inte fastställa din plattform. Använd --target.Kunde inte förgrena process: %sKunde inte öppna ström från %s: %sKunde inte hämta pooltillståndOkomprimerad data.Dekomprimera fil innan kontrollsumma.Okänd adresstyp %d
 Okänt kommando ”%s”.
diff -Naur grub-2.02~rc2/po/sv.po grub-2.02~rc2-confd/po/sv.po
--- grub-2.02~rc2/po/sv.po	2017-03-15 09:41:36.000000000 +0100
+++ grub-2.02~rc2-confd/po/sv.po	2017-04-04 12:57:05.054012821 +0200
@@ -6561,12 +6561,12 @@
 #: util/grub-mkconfig.in:271
 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."
 
@@ -6625,8 +6625,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.02~rc2/po/tr.po grub-2.02~rc2-confd/po/tr.po
--- grub-2.02~rc2/po/tr.po	2017-03-15 09:41:36.000000000 +0100
+++ grub-2.02~rc2-confd/po/tr.po	2017-04-04 12:57:05.088012454 +0200
@@ -6438,7 +6438,7 @@
 #: util/grub-mkconfig.in:271
 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 ""
@@ -6489,7 +6489,7 @@
 msgstr "GRUB için varsayılan önyükleme menü girdisini ayarla."
 
 #: 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.02~rc2/po/uk.gmo grub-2.02~rc2-confd/po/uk.gmo
--- grub-2.02~rc2/po/uk.gmo	2017-03-15 09:41:39.000000000 +0100
+++ grub-2.02~rc2-confd/po/uk.gmo	2017-04-04 12:57:04.843015093 +0200
@@ -147,12 +147,12 @@
 Specify filename.Specify hash to use.Specify one or more font files to load.Specify size for each read operationSpecify the number of input files.Speed: %s 
 Start GDB stub on given portStop GDB stubStorage information for `%s' does not include typeStorage information for `%s' indicates neither a plain partition nor a plain diskStore matched component NUMBER in VARNAME.SuccessSundaySuppress normal output (warnings remain).Switch to native disk drivers. If no modules are specified default set (pata,ahci,usbms,ohci,uhci,ehci) is usedSyntax error at line %u
 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.System management bus controller I/O space is at 0x%x
 TTARGETTHEMESTarget format not specified (use the -O option).Terminal has specified geometry.Terminal is ASCII-only [default].Terminal is logical-ordered UTF-8.Terminal is visually-ordered UTF-8.Test USB support.Test bit at BYTE:BIT in CMOS.Test file read speed.Test if REGEXP matches STRING.Test video subsystem in mode WxH.Test video subsystem.Text-only The files are identical.
 The highlighted entry will be executed automatically in %ds.This VDEV is a RAIDZ%llu
-This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/default/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
+This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
 Trailing backslashTransform 64-bit UUID to format suitable for XNU. If -l is given keep it lowercase as done by blkid.Transform a system filename into GRUB one.Transform syslinux config into GRUB one.Translate SET1 characters to SET2 in STRING.Translate to lower case.Translate to upper case.Translates the string with the current settings.Try '%s --help' or '%s --usage' for more information.
 TuesdayUSER PASSWORDUSER PBKDF2_PASSWORDUSERNAME[,USERNAME]UTF-8Unable to create pipe: %sUnable to determine your platform. Use --target.Unable to fork: %sUnable to open stream from %s: %sUnable to retrieve pool stateUncompress data.Uncompress file before checksumming.Unknown address type %d
 Unknown command `%s'.
@@ -301,12 +301,12 @@
 Вказати назву файла.Вказати хеш для використання.Вказати один або декілька файлів для завантаження.Вкажіть розмір для кожної з дій щодо читанняВказати кількість файлів вхідних даних.Швидкість: %s 
 Запустити заглушку GDB на вказаному портіЗупинити роботу заглушки GDBДані щодо сховища «%s» не містять типуДані щодо сховища «%s» не визначають ні даних щодо звичайного розділу, ні даних щодо звичайного дискаЗберегти компонент з номером НОМЕР до змінної НАЗВА_ЗМІННОЇ.УспіхнеділяПридушити звичайні повідомлення (показувати лише попередження).Перемкнутися на природні драйвери дисків. Якщо модулів не вказано, використовується типова послідовність (pata,ahci,usbms,ohci,uhci,ehci).Синтаксична помилку у рядку %u
 Виявлено синтаксичні помилки у файлі налаштувань GRUB.
-Переконайтеся, що у файлах /etc/default/grub і /etc/grub.d/*
+Переконайтеся, що у файлах /etc/conf.d/grub і /etc/grub.d/*
 немає помилок, будь ласка, створіть звіт щодо вади з
 долученням файла %s.Простір введення-виведення контролера каналу керування системою починається з 0x%x
 ТПРИЗНАЧЕННЯТЕМИФормат призначення не вказано (скористайтеся параметром -O).Термінал має відповідні геометричні параметри.У терміналі можна використовувати лише ASCII [типове значення].Термінал з логічним впорядкуванням UTF-8.Термінал з візуальним впорядкуванням UTF-8.Перевірка підтримки USB.Тестувати біт за адресою БАЙТ:БІТ у CMOS.Тестувати швидкість читання файла.Перевірити відповідність ФОРМАЛЬНОГО ВИРАЗУ РЯДКУ.Перевірити відеопідсистему у режимі ВxШ.Перевірити відеопідсистему.Лише текст Вміст файлів є тотожним.
 Обробку позначеного пункту буде автоматично виконано за %d с.Цей VDEV є RAIDZ%llu
-Цей VDEV є дзеркаломСистему цього пункту може завантажувати будь-який користувач.Потребує встановлення GRUB_DEFAULT=saved у %s/default/grub.\nчетверТіБТіБ/сІнструмент для редагування блоку середовища.Загальний об’єм запису: %d Б.
+Цей VDEV є дзеркаломСистему цього пункту може завантажувати будь-який користувач.Потребує встановлення GRUB_DEFAULT=saved у %s/conf.d/grub.\nчетверТіБТіБ/сІнструмент для редагування блоку середовища.Загальний об’єм запису: %d Б.
 Кінцевий символ похилої рискиПеретворити 64-бітове значення UUID у формат, що відповідає XNU. Якщо вказано -l, залишати літери малими, як у даних blkid.Перетворити назву файла у системі на назву у GRUB.Перетворити налаштування syslinux на налаштування GRUB.Виконати у РЯДКУ перетворення символів з НАБОРУ1 до НАБОРУ2.Перетворити на символи нижнього регістру.Перетворити на символи верхнього регістру.Перекладає рядок відповідно до поточних параметрів.Виконайте команду «%s --help» або «%s --usage», щоб дізнатися більше.
 вівторокПАРОЛЬ КОРИСТУВАЧАКОРИСТУВАЧ ПАРОЛЬ_PBKDF2КОРИСТУВАЧ[,КОРИСТУВАЧ]UTF-8Не вдалося створити канал передавання даних: %sНе вдалося визначити вашу платформу. Скористайтеся параметром --target.Не вдалося створити розгалуження: %sНе вдалося відкрити потік даних з %s: %sНе вдалося отримати дані щодо стану сховищаРозпакувати дані.Розпакувати файл до обчислення контрольної суми.Невідомий тип адреси, %d
 Невідома команда «%s».
diff -Naur grub-2.02~rc2/po/uk.po grub-2.02~rc2-confd/po/uk.po
--- grub-2.02~rc2/po/uk.po	2017-03-15 09:41:37.000000000 +0100
+++ grub-2.02~rc2-confd/po/uk.po	2017-04-04 12:57:04.893014555 +0200
@@ -6649,12 +6649,12 @@
 #: util/grub-mkconfig.in:271
 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."
 
@@ -6715,8 +6715,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.02~rc2/po/vi.gmo grub-2.02~rc2-confd/po/vi.gmo
--- grub-2.02~rc2/po/vi.gmo	2017-03-15 09:41:40.000000000 +0100
+++ grub-2.02~rc2-confd/po/vi.gmo	2017-04-04 12:57:04.903014447 +0200
@@ -149,12 +149,12 @@
 Specify filename.Specify hash to use.Specify one or more font files to load.Specify size for each read operationSpecify the number of input files.Speed: %s 
 Start GDB stub on given portStop GDB stubStorage information for `%s' does not include typeStorage information for `%s' indicates neither a plain partition nor a plain diskStore matched component NUMBER in VARNAME.SuccessSundaySuppress normal output (warnings remain).Switch to native disk drivers. If no modules are specified default set (pata,ahci,usbms,ohci,uhci,ehci) is usedSyntax error at line %u
 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.System management bus controller I/O space is at 0x%x
 TTARGETTHEMESTarget format not specified (use the -O option).Terminal has specified geometry.Terminal is ASCII-only [default].Terminal is logical-ordered UTF-8.Terminal is visually-ordered UTF-8.Test USB support.Test bit at BYTE:BIT in CMOS.Test file read speed.Test if REGEXP matches STRING.Test video subsystem in mode WxH.Test video subsystem.Text-only The files are identical.
 The highlighted entry will be executed automatically in %ds.This VDEV is a RAIDZ%llu
-This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/default/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
+This VDEV is a mirrorThis entry can be booted by any user.This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\nThursdayTiBTiB/sTool to edit environment block.Total flash size: %d B.
 Trailing backslashTransform 64-bit UUID to format suitable for XNU. If -l is given keep it lowercase as done by blkid.Transform a system filename into GRUB one.Transform syslinux config into GRUB one.Translate SET1 characters to SET2 in STRING.Translate to lower case.Translate to upper case.Translates the string with the current settings.Try '%s --help' or '%s --usage' for more information.
 TuesdayUSER PASSWORDUSER PBKDF2_PASSWORDUSERNAME[,USERNAME]UTF-8Unable to create pipe: %sUnable to determine your platform. Use --target.Unable to fork: %sUnable to open stream from %s: %sUnable to retrieve pool stateUncompress data.Uncompress file before checksumming.Unknown address type %d
 Unknown command `%s'.
@@ -309,12 +309,12 @@
 Ghi rõ tên tập tin.định rõ kiểu băm cần dùngChỉ định một hay nhiều phông chữ cần tải.Chỉ ra kích thước cho từ thao tác đọcGhi rõ số lượng tập tin đầu vào.Tốc độ: %s 
 Khởi chạy “GDB stub” trên cổng đã choDừng “GDB stub”Thông tin kho chứa cho “%s” không chứa kiểuThông tin cho kho chứa “%s” không chỉ ra rằng phân vùng không phải thường mà đĩa cũng không phải thườngLưu các thành phần so khớp SỐ trong TÊN_BIẾN.Thành côngChủ nhậtLoại bỏ kết xuất thông thường (để lại các thông tin cảnh báo).Chuyển sang các ổ đĩa thật. Nếu không chỉ ra MÔ_ĐUN nào thì tập hợp mặc định (pata,ahci,usbms,ohci,uhci,ehci) được dùngLỗi cú pháp trên dòng %u.
 Các lỗi cú pháp đã được phát hiện trong tập tin cấu hình GRUB đã tạo.
-Hãy chắc chắn rằng không có lỗi nào trong tập tin /etc/default/grub
+Hãy chắc chắn rằng không có lỗi nào trong tập tin /etc/conf.d/grub
 và /etc/grub.d/* hoặc báo cáo tập tin lỗi này bằng cách đính
 kèm tập tin %s.Bộ điều khiển truy xuất bus hệ thống thấy cổng V/R là tại 0x%x
 TĐÍCHCHỦ ĐỀĐịnh dạng đích chưa được chỉ ra (sử dụng tùy chọn -O).Thiết bị cuối có hình thái được chỉ ra.Thiết bị cuối ở dạng chỉ-ASCII [mặc định].Thiết bị cuối là kiểu UTF-8 thứ-tự-lôgícThiết bị cuối là kiểu UTF-8 thứ-tự-ảoThử khả năng hỗ trợ USB.Thử bít tại BYTE:BIT trong CMOS.Kiểm tra tốc độ đọc tập tin.Kiểm tra xem BTCQ có khớp với CHUỖI.Thử hệ thống video phụ ở chế độ WxH.Thử hệ thống phụ ảnh động.Chỉ-chứa-chữ Các tập tin là đồng nhất.
 Mục nhập được tô sáng sẽ được tự động thực hiện trong %d giây.VDEV này là RAIDZ%llu
-VDEV này là số nhỏMục này có thể khởi động được bởi bất kỳ người nào.Cái này yêu cầu cài đặt GRUB_DEFAULT=saved trong %s/default/grub.\nThứ nămTiBTiB/sCông cụ sửa khối biến môi trường.Kích thước tổng cộng bộ nhớ flash: %d B.
+VDEV này là số nhỏMục này có thể khởi động được bởi bất kỳ người nào.Cái này yêu cầu cài đặt GRUB_DEFAULT=saved trong %s/conf.d/grub.\nThứ nămTiBTiB/sCông cụ sửa khối biến môi trường.Kích thước tổng cộng bộ nhớ flash: %d B.
 Có dấu chéo ngược theo sauChuyển dạng UUID 64-bit sang một định dạng thích hợp với XNU. Nếu tùy chọn -l được đưa ra giữ nó ở chữ thường như được thực hiện bởi lệnh blkid.Chuyển đổi kiểu tên tập tin hệ thống thành kiểu GRUB.Chuyển đổi cấu hình từ kiểu syslinux sang thành kiểu GRUB.Chuyển dịch TẬP_HỢP_CHỮ_CÁI_1 sang TẬP_HỢP_CHỮ_CÁI_2 trong CHUỖIChuyển sang chữ thường.Chuyển sang chữ HOA.Dịch chuỗi với các cài đặt hiện tại.Hãy chạy lệnh “%s --help” (trợ giúp) hoặc “%s --usage” (cách dùng) để biết thêm thông tin.
 Thứ baTÀI_KHOẢN MẬT_KHẨUTÀI-KHOẢN MẬT-KHẨU-PBKDF2TÊN_NGƯỜI_DÙNG[,TÊN_TÀI_KHOẢN]UTF-8Không tạo được đường ống dẫn lệnh: %sKhông thể xác định được nền tảng của bạn. Sử dụng --target.Không thể rẽ nhánh tiến trình: %sKhông thể mở dòng dữ liệu từ %s: %sKhông thể lấy trạng thái kho ZFS nhận vềdữ liệu không nén.Giải nét tập tin trước khi tổng kiểm tra.Không hiểu kiểu địa chỉ %d
 Không hiểu lệnh “%s”.
diff -Naur grub-2.02~rc2/po/vi.po grub-2.02~rc2-confd/po/vi.po
--- grub-2.02~rc2/po/vi.po	2017-03-15 09:41:37.000000000 +0100
+++ grub-2.02~rc2-confd/po/vi.po	2017-04-04 12:57:04.994013467 +0200
@@ -6596,12 +6596,12 @@
 #: util/grub-mkconfig.in:271
 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."
 
@@ -6663,8 +6663,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.02~rc2/po/zh_CN.po grub-2.02~rc2-confd/po/zh_CN.po
--- grub-2.02~rc2/po/zh_CN.po	2017-03-15 09:41:37.000000000 +0100
+++ grub-2.02~rc2-confd/po/zh_CN.po	2017-04-04 12:57:04.976013660 +0200
@@ -6587,7 +6587,7 @@
 #: util/grub-mkconfig.in:271
 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 ""
@@ -6640,7 +6640,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.02~rc2/po/zh_TW.po grub-2.02~rc2-confd/po/zh_TW.po
--- grub-2.02~rc2/po/zh_TW.po	2017-03-15 09:41:37.000000000 +0100
+++ grub-2.02~rc2-confd/po/zh_TW.po	2017-04-04 12:57:05.029013090 +0200
@@ -6563,7 +6563,7 @@
 #: util/grub-mkconfig.in:271
 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 ""
@@ -6615,7 +6615,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.02~rc2/util/grub.d/README grub-2.02~rc2-confd/util/grub.d/README
--- grub-2.02~rc2/util/grub.d/README	2017-02-11 23:25:13.000000000 +0100
+++ grub-2.02~rc2-confd/util/grub.d/README	2017-04-04 12:56:46.281214990 +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.
diff -Naur grub-2.02~rc2/util/grub-mkconfig.in grub-2.02~rc2-confd/util/grub-mkconfig.in
--- grub-2.02~rc2/util/grub-mkconfig.in	2017-02-11 23:25:13.000000000 +0100
+++ grub-2.02~rc2-confd/util/grub-mkconfig.in	2017-04-04 12:57:05.116012153 +0200
@@ -147,8 +147,8 @@
     GRUB_FS="$(stat -f --printf=%T / || echo unknown)"
 fi
 
-if test -f ${sysconfdir}/default/grub ; then
-  . ${sysconfdir}/default/grub
+if test -f ${sysconfdir}/conf.d/grub ; then
+  . ${sysconfdir}/conf.d/grub
 fi
 
 # XXX: should this be deprecated at some point?
@@ -243,7 +243,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
 
@@ -269,7 +269,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.02~rc2/util/grub-set-default.in grub-2.02~rc2-confd/util/grub-set-default.in
--- grub-2.02~rc2/util/grub-set-default.in	2017-02-11 23:25:13.000000000 +0100
+++ grub-2.02~rc2-confd/util/grub-set-default.in	2017-04-04 12:57:05.114012174 +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")"