grub/patches/grub-2.00-confd.patch

diff -Naur grub-2.00/docs/grub.info grub-2.00-magellan/docs/grub.info
--- grub-2.00/docs/grub.info	2012-06-26 14:35:07.000000000 +0200
+++ grub-2.00-magellan/docs/grub.info	2012-07-17 16:37:33.754984174 +0200
@@ -1033,7 +1033,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
@@ -1041,7 +1041,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
@@ -1473,7 +1473,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):
 
@@ -2174,7 +2174,7 @@
 Some laptop vendors provide an additional power-on button which boots
 another OS.  GRUB supports such buttons with the `GRUB_TIMEOUT_BUTTON',
 `GRUB_DEFAULT_BUTTON', `GRUB_HIDDEN_TIMEOUT_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_DEFAULT_BUTTON' and
 `GRUB_HIDDEN_TIMEOUT_BUTTON' are used instead of the corresponding
 variables without the `_BUTTON' suffix when powered on using the special
diff -Naur grub-2.00/docs/grub.texi grub-2.00-magellan/docs/grub.texi
--- grub-2.00/docs/grub.texi	2012-06-23 10:54:24.000000000 +0200
+++ grub-2.00-magellan/docs/grub.texi	2012-07-17 16:38:22.523984607 +0200
@@ -1079,7 +1079,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
@@ -1089,7 +1089,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
@@ -1510,7 +1510,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):
 
@@ -2140,7 +2140,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_DEFAULT_BUTTON}, @samp{GRUB_HIDDEN_TIMEOUT_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_DEFAULT_BUTTON} and
 @samp{GRUB_HIDDEN_TIMEOUT_BUTTON} are used instead of the corresponding
 variables without the @samp{_BUTTON} suffix when powered on using the special
diff -Naur grub-2.00/po/ast.po grub-2.00-magellan/po/ast.po
--- grub-2.00/po/ast.po	2012-06-27 22:55:39.000000000 +0200
+++ grub-2.00-magellan/po/ast.po	2012-07-17 16:41:33.695982682 +0200
@@ -5765,7 +5765,7 @@
 #: util/grub-mkconfig.in:259
 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 ""
diff -Naur grub-2.00/po/ca.gmo grub-2.00-magellan/po/ca.gmo
--- grub-2.00/po/ca.gmo	2012-06-27 22:55:39.000000000 +0200
+++ grub-2.00-magellan/po/ca.gmo	2012-07-17 16:41:33.697982711 +0200
@@ -127,7 +127,7 @@
 Some Hurd stuff found, but not enough to boot.Sorry no parttool is available for %s
 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 PReP partition is not empty. If you are sure you want to use it, run dd to clear it:The chosen partition is not a PReP partition.The drive %s is defined multiple times in the device map %s\nThe files are identical.
@@ -262,7 +262,7 @@
 S'ha trobat alguna cosa del Hurd, però no és suficient per arrencar.Ho lamento, no hi ha cap parttool disponible per %s
 Especifica el nom del fitxer.Especifica el has que es fa servir.Especifiqueu un o més fitxers de fonts que vulgueu carregar.Especifica el nombre de fitxers d'entrada.Inicia l'estub GDB al port indicatAtura a l'estub GDBDesa el component coincident NÚMERO a NOMVARIABLE.ÈxitDiumengeSuprimeix la sortida normal (conserva els avisos).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 amb adjuntant el fitxer %s L'espai I/O del controlador de bus de gestió del sistema és a 0x%x
 OBJECTIUNo s'ha especificat el format de l'objectiu (feu servir la 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 el suport USB.Comprova el bit a BYTE:BIT a CMOS.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 La partició PReP no està buida. Si esteu segur que la voleu fer servir, executeu dd per esborrar-la:La partició escollida no és una partició PReP.La unitat %s està definida més d'un cop al mapa de dispositius %s\nEls fitxers són idèntics.
 L'entrada realçada s'executarà automàticament en %ds.Qualsevol usuari pot arrencar aquesta entrada.DijousEina per editar el bloc d'entorn.Mida total de la flash: %d B.
diff -Naur grub-2.00/po/ca.po grub-2.00-magellan/po/ca.po
--- grub-2.00/po/ca.po	2012-06-27 22:55:39.000000000 +0200
+++ grub-2.00-magellan/po/ca.po	2012-07-17 16:41:33.713982797 +0200
@@ -5681,13 +5681,13 @@
 #: util/grub-mkconfig.in:259
 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 amb adjuntant el fitxer %s "
 
 #: util/grub-mkconfig.in:269
diff -Naur grub-2.00/po/da.po grub-2.00-magellan/po/da.po
--- grub-2.00/po/da.po	2012-06-27 22:55:39.000000000 +0200
+++ grub-2.00-magellan/po/da.po	2012-07-17 16:41:33.729982797 +0200
@@ -5773,7 +5773,7 @@
 #: util/grub-mkconfig.in:259
 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 ""
diff -Naur grub-2.00/po/de_CH.gmo grub-2.00-magellan/po/de_CH.gmo
--- grub-2.00/po/de_CH.gmo	2012-06-28 02:08:12.000000000 +0200
+++ grub-2.00-magellan/po/de_CH.gmo	2012-07-17 16:41:33.731982797 +0200
@@ -120,7 +120,7 @@
 Some Hurd stuff found, but not enough to boot.Sorry no parttool is available for %s
 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 PReP partition is not empty. If you are sure you want to use it, run dd to clear it:The chosen partition is not a PReP partition.The drive %s is defined multiple times in the device map %s\nThe files are identical.
@@ -261,7 +261,7 @@
 Dateiname angeben.Zu verwendenden Hash angeben.Eine oder mehrere zu ladende Schriftdateien angeben.Die Anzahl der Eingabedateien angeben.GDB-Stub auf dem angegebenen Port startenGDB-Stub stoppenEntsprechende Komponenten-NUMMER in VARNAME speichern.ErfolgSonntagNormale Ausgaben unterdrücken (Warnungen verbleiben)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
 ZIELZielformat 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.Prüfen, ob REGEXP auf ZEICHENKETTE passt.Das Video-Subsystem im Modus BxH überprüfen.Das Video-Subsystem überprüfen.Nur TextDie PReP-Partition ist nicht leer. Falls Sie sicher sind, dass Sie sie verwenden wollen, führen Sie dd aus, um sie zu leeren:Die gewählte Partition ist keine PReP-Partition.Das Laufwerk %s wurde in der Gerätetabelle mehrfach %s definiert\nDie Dateien sind identisch.
 Der hervorgehobene Eintrag wird automatisch in %ds ausgeführt.Dieser Eintrag kann von jedem Benutzer gebootet werden.DonnerstagWerkzeug zum Bearbeiten einer Umgebungs-Blockdatei.Flash-Gesamtgrösse: %d B.
diff -Naur grub-2.00/po/de_CH.po grub-2.00-magellan/po/de_CH.po
--- grub-2.00/po/de_CH.po	2012-06-28 02:08:02.000000000 +0200
+++ grub-2.00-magellan/po/de_CH.po	2012-07-17 16:41:33.748982797 +0200
@@ -5688,13 +5688,13 @@
 #: util/grub-mkconfig.in:259
 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:269
diff -Naur grub-2.00/po/de.gmo grub-2.00-magellan/po/de.gmo
--- grub-2.00/po/de.gmo	2012-06-27 22:55:40.000000000 +0200
+++ grub-2.00-magellan/po/de.gmo	2012-07-17 16:41:33.750982797 +0200
@@ -123,7 +123,7 @@
 Some Hurd stuff found, but not enough to boot.Sorry no parttool is available for %s
 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 PReP partition is not empty. If you are sure you want to use it, run dd to clear it:The chosen partition is not a PReP partition.The drive %s is defined multiple times in the device map %s\nThe files are identical.
@@ -264,7 +264,7 @@
 Dateiname angeben.Zu verwendenden Hash angeben.Eine oder mehrere zu ladende Schriftdateien angeben.Die Anzahl der Eingabedateien angeben.GDB-Stub auf dem angegebenen Port startenGDB-Stub stoppenEntsprechende Komponenten-NUMMER in VARNAME speichern.ErfolgSonntagNormale Ausgaben unterdrücken (Warnungen verbleiben)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
 ZIELZielformat 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.Prüfen, ob REGEXP auf ZEICHENKETTE passt.Das Video-Subsystem im Modus BxH überprüfen.Das Video-Subsystem überprüfen.Nur TextDie PReP-Partition ist nicht leer. Falls Sie sicher sind, dass Sie sie verwenden wollen, führen Sie dd aus, um sie zu leeren:Die gewählte Partition ist keine PReP-Partition.Das Laufwerk %s wurde in der Gerätetabelle mehrfach %s definiert\nDie Dateien sind identisch.
 Der hervorgehobene Eintrag wird automatisch in %ds ausgeführt.Dieser Eintrag kann von jedem Benutzer gebootet werden.DonnerstagWerkzeug zum Bearbeiten einer Umgebungs-Blockdatei.Flash-Gesamtgröße: %d B.
diff -Naur grub-2.00/po/de@hebrew.gmo grub-2.00-magellan/po/de@hebrew.gmo
--- grub-2.00/po/de@hebrew.gmo	2012-06-28 02:08:12.000000000 +0200
+++ grub-2.00-magellan/po/de@hebrew.gmo	2012-07-17 16:41:33.751982797 +0200
@@ -121,7 +121,7 @@
 Some Hurd stuff found, but not enough to boot.Sorry no parttool is available for %s
 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 PReP partition is not empty. If you are sure you want to use it, run dd to clear it:The chosen partition is not a PReP partition.The drive %s is defined multiple times in the device map %s\nThe files are identical.
diff -Naur grub-2.00/po/de@hebrew.po grub-2.00-magellan/po/de@hebrew.po
--- grub-2.00/po/de@hebrew.po	2012-06-28 02:08:03.000000000 +0200
+++ grub-2.00-magellan/po/de@hebrew.po	2012-07-17 16:41:33.769982797 +0200
@@ -5683,7 +5683,7 @@
 #: util/grub-mkconfig.in:259
 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 ""
diff -Naur grub-2.00/po/de.po grub-2.00-magellan/po/de.po
--- grub-2.00/po/de.po	2012-06-27 22:55:40.000000000 +0200
+++ grub-2.00-magellan/po/de.po	2012-07-17 16:41:33.787982797 +0200
@@ -5688,13 +5688,13 @@
 #: util/grub-mkconfig.in:259
 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:269
diff -Naur grub-2.00/po/en@arabic.gmo grub-2.00-magellan/po/en@arabic.gmo
--- grub-2.00/po/en@arabic.gmo	2012-06-27 22:55:52.000000000 +0200
+++ grub-2.00-magellan/po/en@arabic.gmo	2012-07-17 16:41:33.788982797 +0200
@@ -127,7 +127,7 @@
 Some Hurd stuff found, but not enough to boot.Sorry no parttool is available for %s
 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 PReP partition is not empty. If you are sure you want to use it, run dd to clear it:The chosen partition is not a PReP partition.The drive %s is defined multiple times in the device map %s\nThe files are identical.
diff -Naur grub-2.00/po/en@arabic.po grub-2.00-magellan/po/en@arabic.po
--- grub-2.00/po/en@arabic.po	2012-06-27 22:55:52.000000000 +0200
+++ grub-2.00-magellan/po/en@arabic.po	2012-07-17 16:41:33.803982797 +0200
@@ -5626,7 +5626,7 @@
 #: util/grub-mkconfig.in:259
 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 ""
diff -Naur grub-2.00/po/en@cyrillic.gmo grub-2.00-magellan/po/en@cyrillic.gmo
--- grub-2.00/po/en@cyrillic.gmo	2012-06-27 22:55:55.000000000 +0200
+++ grub-2.00-magellan/po/en@cyrillic.gmo	2012-07-17 16:41:33.805982797 +0200
@@ -121,7 +121,7 @@
 Some Hurd stuff found, but not enough to boot.Sorry no parttool is available for %s
 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 PReP partition is not empty. If you are sure you want to use it, run dd to clear it:The chosen partition is not a PReP partition.The drive %s is defined multiple times in the device map %s\nThe files are identical.
diff -Naur grub-2.00/po/en@cyrillic.po grub-2.00-magellan/po/en@cyrillic.po
--- grub-2.00/po/en@cyrillic.po	2012-06-27 22:55:55.000000000 +0200
+++ grub-2.00-magellan/po/en@cyrillic.po	2012-07-17 16:41:33.820982797 +0200
@@ -5625,7 +5625,7 @@
 #: util/grub-mkconfig.in:259
 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 ""
diff -Naur grub-2.00/po/en@greek.gmo grub-2.00-magellan/po/en@greek.gmo
--- grub-2.00/po/en@greek.gmo	2012-06-27 22:55:59.000000000 +0200
+++ grub-2.00-magellan/po/en@greek.gmo	2012-07-17 16:41:33.821982797 +0200
@@ -120,7 +120,7 @@
 Some Hurd stuff found, but not enough to boot.Sorry no parttool is available for %s
 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 PReP partition is not empty. If you are sure you want to use it, run dd to clear it:The chosen partition is not a PReP partition.The drive %s is defined multiple times in the device map %s\nThe files are identical.
diff -Naur grub-2.00/po/en@greek.po grub-2.00-magellan/po/en@greek.po
--- grub-2.00/po/en@greek.po	2012-06-27 22:55:59.000000000 +0200
+++ grub-2.00-magellan/po/en@greek.po	2012-07-17 16:41:33.836982797 +0200
@@ -5625,7 +5625,7 @@
 #: util/grub-mkconfig.in:259
 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 ""
diff -Naur grub-2.00/po/en@hebrew.gmo grub-2.00-magellan/po/en@hebrew.gmo
--- grub-2.00/po/en@hebrew.gmo	2012-06-27 22:56:03.000000000 +0200
+++ grub-2.00-magellan/po/en@hebrew.gmo	2012-07-17 16:41:33.838982797 +0200
@@ -122,7 +122,7 @@
 Some Hurd stuff found, but not enough to boot.Sorry no parttool is available for %s
 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 PReP partition is not empty. If you are sure you want to use it, run dd to clear it:The chosen partition is not a PReP partition.The drive %s is defined multiple times in the device map %s\nThe files are identical.
diff -Naur grub-2.00/po/en@hebrew.po grub-2.00-magellan/po/en@hebrew.po
--- grub-2.00/po/en@hebrew.po	2012-06-27 22:56:03.000000000 +0200
+++ grub-2.00-magellan/po/en@hebrew.po	2012-07-17 16:41:33.853982797 +0200
@@ -5626,7 +5626,7 @@
 #: util/grub-mkconfig.in:259
 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 ""
diff -Naur grub-2.00/po/en@piglatin.gmo grub-2.00-magellan/po/en@piglatin.gmo
--- grub-2.00/po/en@piglatin.gmo	2012-06-27 22:56:06.000000000 +0200
+++ grub-2.00-magellan/po/en@piglatin.gmo	2012-07-17 16:41:33.855982797 +0200
@@ -120,7 +120,7 @@
 Some Hurd stuff found, but not enough to boot.Sorry no parttool is available for %s
 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 PReP partition is not empty. If you are sure you want to use it, run dd to clear it:The chosen partition is not a PReP partition.The drive %s is defined multiple times in the device map %s\nThe files are identical.
diff -Naur grub-2.00/po/en@piglatin.po grub-2.00-magellan/po/en@piglatin.po
--- grub-2.00/po/en@piglatin.po	2012-06-27 22:56:06.000000000 +0200
+++ grub-2.00-magellan/po/en@piglatin.po	2012-07-17 16:41:33.870982797 +0200
@@ -5732,7 +5732,7 @@
 #: util/grub-mkconfig.in:259
 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 ""
diff -Naur grub-2.00/po/en@quot.gmo grub-2.00-magellan/po/en@quot.gmo
--- grub-2.00/po/en@quot.gmo	2012-06-27 22:56:09.000000000 +0200
+++ grub-2.00-magellan/po/en@quot.gmo	2012-07-17 16:41:33.871982797 +0200
@@ -126,7 +126,7 @@
 Some Hurd stuff found, but not enough to boot.Sorry no parttool is available for %s
 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 PReP partition is not empty. If you are sure you want to use it, run dd to clear it:The chosen partition is not a PReP partition.The drive %s is defined multiple times in the device map %s\nThe files are identical.
@@ -261,7 +261,7 @@
 Some Hurd stuff found, but not enough to boot.Sorry no parttool is available for %s
 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 PReP partition is not empty. If you are sure you want to use it, run dd to clear it:The chosen partition is not a PReP partition.The drive %s is defined multiple times in the device map %s\nThe files are identical.
diff -Naur grub-2.00/po/en@quot.po grub-2.00-magellan/po/en@quot.po
--- grub-2.00/po/en@quot.po	2012-06-27 22:56:09.000000000 +0200
+++ grub-2.00-magellan/po/en@quot.po	2012-07-17 16:41:33.886982797 +0200
@@ -5647,12 +5647,12 @@
 #: util/grub-mkconfig.in:259
 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."
 
diff -Naur grub-2.00/po/eo.po grub-2.00-magellan/po/eo.po
--- grub-2.00/po/eo.po	2012-06-27 22:56:09.000000000 +0200
+++ grub-2.00-magellan/po/eo.po	2012-07-17 16:41:33.902982797 +0200
@@ -5564,7 +5564,7 @@
 #: util/grub-mkconfig.in:259
 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 ""
diff -Naur grub-2.00/po/fi.gmo grub-2.00-magellan/po/fi.gmo
--- grub-2.00/po/fi.gmo	2012-06-27 22:56:09.000000000 +0200
+++ grub-2.00-magellan/po/fi.gmo	2012-07-17 16:41:33.904982797 +0200
@@ -123,7 +123,7 @@
 Some Hurd stuff found, but not enough to boot.Sorry no parttool is available for %s
 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 PReP partition is not empty. If you are sure you want to use it, run dd to clear it:The chosen partition is not a PReP partition.The drive %s is defined multiple times in the device map %s\nThe files are identical.
@@ -258,7 +258,7 @@
 Löytyi jotain Hurd-materiaalia, mutta ei kylliksi alkulataukseen.Ositustyökalua ei ole käytettävissä levyosiolle %s
 Määrittele tiedostonimi.Määritä käytettävä hajakoodaus.Määritä yksi tai useampia kirjasintiedostoja ladattavaksi.Määritä syötetiedostojen lukumäärä.Käynnistä GDB-tynkä annetussa portissaPysäytä GDB-tynkäTallenna täsmäävä komponentti-NUMERO muuttujaan VARNAME.OnnistuiSunnuntaiVaienna normaalituloste (varoitukset jäävät).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
 KOHDEKohdemuotoa 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.Koesta, jos REGEXP-lauseke täsmää MERKKIJONOon.Koesta video-alijärjestelmä WxH-tilassa.Koesta video-alijärjestelmä.Vain teksti PReP-osiosi ei ole tyhjä. Jos olet varma, että haluat käyttää sitä, suorita dd-komento sen tyhjentämiseksi:Valittu osio ei ole PReP-osio.Levyasema %s on määritelty useita kertoja laitekuvauksessa %s\nTiedostot ovat identtiset.
diff -Naur grub-2.00/po/fi.po grub-2.00-magellan/po/fi.po
--- grub-2.00/po/fi.po	2012-06-27 22:56:09.000000000 +0200
+++ grub-2.00-magellan/po/fi.po	2012-07-17 16:41:33.919982797 +0200
@@ -5677,12 +5677,12 @@
 #: util/grub-mkconfig.in:259
 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ä."
 
diff -Naur grub-2.00/po/fr.gmo grub-2.00-magellan/po/fr.gmo
--- grub-2.00/po/fr.gmo	2012-06-27 22:56:10.000000000 +0200
+++ grub-2.00-magellan/po/fr.gmo	2012-07-17 16:41:33.920982797 +0200
@@ -115,7 +115,7 @@
 Some Hurd stuff found, but not enough to boot.Sorry no parttool is available for %s
 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 PReP partition is not empty. If you are sure you want to use it, run dd to clear it:The chosen partition is not a PReP partition.The drive %s is defined multiple times in the device map %s\nThe files are identical.
@@ -252,7 +252,7 @@
 Indiquer le nom de fichier.Indiquer le hachage à utiliser.Indiquer un ou plusieurs fichiers de police à charger.Indiquer le nombre de fichiers d'entrée.Démarrer la session GDB sur le port indiqué.Arrêter la session GDBSauver le composant NOMBRE correspondant dans NOM_VAR.RéussitedimancheSupprimer la sortie normale (les avertissements sont conservés).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
 CIBLEFormat 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 un bit à OCTET:BIT du CMOS.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 La partition PReP n'est pas vide. Si vous voulez vraiment l'utiliser, utilisez dd pour l'effacer :La partition choisie n'est pas une partition PReP.Le disque %s est défini plusieurs fois dans la carte de périphériques %s\nLes fichiers sont identiques.
 L'entrée sélectionnée sera exécutée automatiquement dans %d s.Cette entrée peut être démarrée par n'importe quel utilisateur.jeudiOutil pour éditer un bloc d'environnement.Taille flash totale : %d o.
diff -Naur grub-2.00/po/fr.po grub-2.00-magellan/po/fr.po
--- grub-2.00/po/fr.po	2012-06-27 22:56:10.000000000 +0200
+++ grub-2.00-magellan/po/fr.po	2012-07-17 16:41:33.935982797 +0200
@@ -5743,13 +5743,13 @@
 #: util/grub-mkconfig.in:259
 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:269
diff -Naur grub-2.00/po/grub.pot grub-2.00-magellan/po/grub.pot
--- grub-2.00/po/grub.pot	2012-06-27 22:55:38.000000000 +0200
+++ grub-2.00-magellan/po/grub.pot	2012-07-17 16:41:33.950982797 +0200
@@ -5483,7 +5483,7 @@
 #: util/grub-mkconfig.in:259
 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 ""
diff -Naur grub-2.00/po/hu.po grub-2.00-magellan/po/hu.po
--- grub-2.00/po/hu.po	2012-06-27 22:56:10.000000000 +0200
+++ grub-2.00-magellan/po/hu.po	2012-07-17 16:41:33.966982797 +0200
@@ -5729,7 +5729,7 @@
 #: util/grub-mkconfig.in:259
 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 ""
diff -Naur grub-2.00/po/id.po grub-2.00-magellan/po/id.po
--- grub-2.00/po/id.po	2012-06-27 22:56:11.000000000 +0200
+++ grub-2.00-magellan/po/id.po	2012-07-17 16:41:33.983982797 +0200
@@ -5754,7 +5754,7 @@
 #: util/grub-mkconfig.in:259
 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 ""
diff -Naur grub-2.00/po/it.po grub-2.00-magellan/po/it.po
--- grub-2.00/po/it.po	2012-06-27 22:56:11.000000000 +0200
+++ grub-2.00-magellan/po/it.po	2012-07-17 16:41:33.999982797 +0200
@@ -5657,7 +5657,7 @@
 #: util/grub-mkconfig.in:259
 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 ""
diff -Naur grub-2.00/po/ja.po grub-2.00-magellan/po/ja.po
--- grub-2.00/po/ja.po	2012-06-27 22:56:11.000000000 +0200
+++ grub-2.00-magellan/po/ja.po	2012-07-17 16:41:34.014982797 +0200
@@ -5621,7 +5621,7 @@
 #: util/grub-mkconfig.in:259
 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 ""
diff -Naur grub-2.00/po/nl.gmo grub-2.00-magellan/po/nl.gmo
--- grub-2.00/po/nl.gmo	2012-06-27 22:56:11.000000000 +0200
+++ grub-2.00-magellan/po/nl.gmo	2012-07-17 16:41:34.017982797 +0200
@@ -123,7 +123,7 @@
 Some Hurd stuff found, but not enough to boot.Sorry no parttool is available for %s
 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 PReP partition is not empty. If you are sure you want to use it, run dd to clear it:The chosen partition is not a PReP partition.The drive %s is defined multiple times in the device map %s\nThe files are identical.
@@ -262,7 +262,7 @@
 Enige Hurd-dingen zijn gevonden, maar niet genoeg om te kunnen starten.Sorry, 'parttool' werkt niet voor %s
 Bestandsnaam opgeven.Te gebruiken hash.Te laden lettertypebestanden.Te gebruiken aantal invoerbestanden.GDB-stub starten op de gegeven poortGDB-stub stoppenOvereenkomende component (met dit NUMMER) opslaan in VARNAAM.GeluktzondagGewone uitvoer onderdrukken (maar waarschuwingen niet).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
 DOELDoelindeling 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.Controleren of reguliere expressie REGEXP overeenkomt met TEKENREEKS.Video-subsysteem testen in modus BxH.Video-subsysteem testen.Alleen tekst De PReP-partitie is niet leeg.  Als u zeker weet dat u deze wilt gebruiken, wis deze dan met 'dd':De gekozen partitie is geen PReP-partitie.Schijf %s is meerdere keren gedefinieerd in apparaattoewijzingstabel %s\nDe bestanden zijn identiek.
diff -Naur grub-2.00/po/nl.po grub-2.00-magellan/po/nl.po
--- grub-2.00/po/nl.po	2012-06-27 22:56:11.000000000 +0200
+++ grub-2.00-magellan/po/nl.po	2012-07-17 16:41:34.033982797 +0200
@@ -5688,12 +5688,12 @@
 #: util/grub-mkconfig.in:259
 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."
 
diff -Naur grub-2.00/po/pa.po grub-2.00-magellan/po/pa.po
--- grub-2.00/po/pa.po	2012-06-27 22:56:12.000000000 +0200
+++ grub-2.00-magellan/po/pa.po	2012-07-17 16:41:34.049982797 +0200
@@ -5499,7 +5499,7 @@
 #: util/grub-mkconfig.in:259
 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 ""
diff -Naur grub-2.00/po/pl.gmo grub-2.00-magellan/po/pl.gmo
--- grub-2.00/po/pl.gmo	2012-06-27 22:56:12.000000000 +0200
+++ grub-2.00-magellan/po/pl.gmo	2012-07-17 16:41:34.050982797 +0200
@@ -129,7 +129,7 @@
 Some Hurd stuff found, but not enough to boot.Sorry no parttool is available for %s
 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 PReP partition is not empty. If you are sure you want to use it, run dd to clear it:The chosen partition is not a PReP partition.The drive %s is defined multiple times in the device map %s\nThe files are identical.
@@ -263,7 +263,7 @@
 Znaleziono elementy systemu Hurd, ale za mało do uruchomienia.Niestety parttool nie jest dostępny dla %s
 Podaje nazwę pliku.Podaje sumę do użycia.Podaje jeden lub więcej plików czcionek do wczytania.Podaje liczbę plików wejściowych.Uruchamia zaślepkę GDB na podanym porcieZatrzymuje zaślepkę GDBZapisuje NUMER dopasowanego elementu w ZMIENNEJ.SukcesNiedzielaOgranicza zwykłe wyjście (ostrzeżenia pozostają).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
 CELNie 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, czy WYRAŻENIE_REGULARNE pasuje do CIĄGU.Testuje podsystem obrazu w trybie SxW.Testuje podsystem obrazu.Tylko tekstPartycja PReP nie jest pusta. Jeżeli na pewno ma być użyta, proszę wyczyścić ją przy użyciu dd:Wybrana partycja nie jest partycją PReP.Urządzenie %s jest zdefiniowane wielokrotnie w mapie urządzeń %s\nPliki są identyczne.
 Wyróżniony wpis zostanie wykonany automatycznie za %ds.Ta pozycja może być uruchomiona przez dowolnego użytkownika.CzwartekNarzędzie do modyfikacji pliku blokowego środowiska.Całkowity rozmiar flasha: %d B.
diff -Naur grub-2.00/po/pl.po grub-2.00-magellan/po/pl.po
--- grub-2.00/po/pl.po	2012-06-27 22:56:12.000000000 +0200
+++ grub-2.00-magellan/po/pl.po	2012-07-17 16:41:34.065982797 +0200
@@ -5679,12 +5679,12 @@
 #: util/grub-mkconfig.in:259
 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:269
diff -Naur grub-2.00/po/ru.gmo grub-2.00-magellan/po/ru.gmo
--- grub-2.00/po/ru.gmo	2012-06-27 22:56:12.000000000 +0200
+++ grub-2.00-magellan/po/ru.gmo	2012-07-17 16:41:34.070982797 +0200
@@ -122,7 +122,7 @@
 Some Hurd stuff found, but not enough to boot.Sorry no parttool is available for %s
 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 PReP partition is not empty. If you are sure you want to use it, run dd to clear it:The chosen partition is not a PReP partition.The drive %s is defined multiple times in the device map %s\nThe files are identical.
@@ -258,7 +258,7 @@
 Найдены некоторые компоненты Hurd, но их недостаточно для загрузки системы.Команда parttool недоступна для %s
 Указать имя файла.Использовать указанный хэш.Указать один или несколько файлов шрифтов для загрузки.Задать количество входных файлов.Запустить заглушку GDB на указанном портуОстановить заглушку GDBСохранить совпавший компонент с НОМЕРОМ в ИМЯ_ПЕРЕМЕННОЙ.УспешноВоскресеньеНе показывать обычные сообщения (только предупреждения).Синтаксическая ошибка в строке %u
 В сгенерированном файле настроек GRUB обнаружены синтаксические ошибки.
-Убедитесь, что в файлах /etc/default/grub
+Убедитесь, что в файлах /etc/conf.d/grub
 и /etc/grub.d/* ошибки отсутствуют или пошлите сообщение об ошибке
 в прикреплённым файлом %s.Контроллер системной шины управления вводом-выводом находится по адресу 0x%x
 ЦЕЛЬЦелевой формат не указан (используйте параметр -O).Терминал имеет указанные размеры.Терминал только в ASCII [по умолчанию].Терминал в логически упорядоченной UTF-8.Терминал в визуально упорядоченной UTF-8.Протестировать поддержку USB.Проверить бит по адресу БАЙТ:БИТ в CMOS.Проверить, совпадает ли РЕГВЫР со СТРОКОЙ.Тест видеоподсистемы в режиме ШxВ.Тест видеоподсистемы.Только-текст Раздел PReP не пуст. Если вы уверены, что хотите использовать его, запустите dd для его очистки:Выбранный раздел не является разделом PReP.Привод %s объявлен несколько раз в карте устройств %s\nФайлы одинаковы.
diff -Naur grub-2.00/po/ru.po grub-2.00-magellan/po/ru.po
--- grub-2.00/po/ru.po	2012-06-27 22:56:12.000000000 +0200
+++ grub-2.00-magellan/po/ru.po	2012-07-17 16:41:34.087982797 +0200
@@ -5675,12 +5675,12 @@
 #: util/grub-mkconfig.in:259
 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."
 
diff -Naur grub-2.00/po/sv.po grub-2.00-magellan/po/sv.po
--- grub-2.00/po/sv.po	2012-06-27 22:56:12.000000000 +0200
+++ grub-2.00-magellan/po/sv.po	2012-07-17 16:41:34.104982797 +0200
@@ -5604,7 +5604,7 @@
 #: util/grub-mkconfig.in:259
 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 ""
diff -Naur grub-2.00/po/uk.gmo grub-2.00-magellan/po/uk.gmo
--- grub-2.00/po/uk.gmo	2012-06-27 22:56:13.000000000 +0200
+++ grub-2.00-magellan/po/uk.gmo	2012-07-17 16:41:34.105982797 +0200
@@ -123,7 +123,7 @@
 Some Hurd stuff found, but not enough to boot.Sorry no parttool is available for %s
 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 PReP partition is not empty. If you are sure you want to use it, run dd to clear it:The chosen partition is not a PReP partition.The drive %s is defined multiple times in the device map %s\nThe files are identical.
@@ -259,7 +259,7 @@
 Виявлено деякі частини Hurd, але їх недостатньо для завантаження.Вибачте, не виявлено parttool для %s
 Вказати назву файла.Вказати хеш для використання.Вказати один або декілька файлів для завантаження.Вказати кількість файлів вхідних даних.Запустити заглушку GDB на вказаному портіЗупинити роботу заглушки GDBЗберегти компонент з номером НОМЕР до змінної НАЗВА_ЗМІННОЇ.УспіхнеділяПридушити звичайні повідомлення (показувати лише попередження).Синтаксична помилку у рядку %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Ш.Перевірити відеопідсистему.Лише текст Розділ PReP не є порожнім. Якщо вам справді хочеться ним скористатися, віддайте команду dd, щоб спорожнити його:Вибраний розділ не є розділом PReP.Диск %s визначається декілька разів у карті пристроїв %s\nВміст файлів є тотожним.
diff -Naur grub-2.00/po/uk.po grub-2.00-magellan/po/uk.po
--- grub-2.00/po/uk.po	2012-06-27 22:56:13.000000000 +0200
+++ grub-2.00-magellan/po/uk.po	2012-07-17 16:41:34.122982797 +0200
@@ -5719,12 +5719,12 @@
 #: util/grub-mkconfig.in:259
 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."
 
diff -Naur grub-2.00/po/vi.po grub-2.00-magellan/po/vi.po
--- grub-2.00/po/vi.po	2012-06-27 22:56:13.000000000 +0200
+++ grub-2.00-magellan/po/vi.po	2012-07-17 16:41:34.137982797 +0200
@@ -5734,7 +5734,7 @@
 #: util/grub-mkconfig.in:259
 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 ""
diff -Naur grub-2.00/po/zh_CN.po grub-2.00-magellan/po/zh_CN.po
--- grub-2.00/po/zh_CN.po	2012-06-27 22:56:13.000000000 +0200
+++ grub-2.00-magellan/po/zh_CN.po	2012-07-17 16:41:34.154982797 +0200
@@ -5696,7 +5696,7 @@
 #: util/grub-mkconfig.in:259
 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 ""
diff -Naur grub-2.00/po/zh_TW.po grub-2.00-magellan/po/zh_TW.po
--- grub-2.00/po/zh_TW.po	2012-06-27 22:56:14.000000000 +0200
+++ grub-2.00-magellan/po/zh_TW.po	2012-07-17 16:41:34.169982797 +0200
@@ -5675,7 +5675,7 @@
 #: util/grub-mkconfig.in:259
 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 ""
diff -Naur grub-2.00/util/grub.d/README grub-2.00-magellan/util/grub.d/README
--- grub-2.00/util/grub.d/README	2010-12-01 15:45:43.000000000 +0100
+++ grub-2.00-magellan/util/grub.d/README	2012-07-17 16:38:51.266982538 +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.00/util/grub-install.in grub-2.00-magellan/util/grub-install.in
--- grub-2.00/util/grub-install.in	2012-06-26 23:31:03.000000000 +0200
+++ grub-2.00-magellan/util/grub-install.in	2012-07-17 16:39:27.907984319 +0200
@@ -65,8 +65,8 @@
 efi_quiet=
 
 # Get GRUB_DISTRIBUTOR.
-if test -f "${sysconfdir}/default/grub" ; then
-    . "${sysconfdir}/default/grub"
+if test -f "${sysconfdir}/conf.d/grub" ; then
+    . "${sysconfdir}/conf.d/grub"
 fi
 
 bootloader_id="$(echo "$GRUB_DISTRIBUTOR" | tr 'A-Z' 'a-z' | cut -d' ' -f1)"
diff -Naur grub-2.00/util/grub-mkconfig.in grub-2.00-magellan/util/grub-mkconfig.in
--- grub-2.00/util/grub-mkconfig.in	2012-04-05 19:41:07.000000000 +0200
+++ grub-2.00-magellan/util/grub-mkconfig.in	2012-07-17 16:40:10.092982722 +0200
@@ -140,8 +140,8 @@
 # choosing Hurd filesystem module.
 GRUB_FS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2> /dev/null || echo unknown`"
 
-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?
@@ -232,7 +232,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
 
@@ -257,7 +257,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
   else