Write a smarter parser for bcdedit.exe output. This fixes bootmgr hooking for non-English versions of Vista.

r48415

17 files changed, 161 insertions, 96 deletions

diff --git a/l10n/po/bg.po b/l10n/po/bg.po
index a090d39..c00fab1 100644
--- a/l10n/po/bg.po
+++ b/l10n/po/bg.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian Installer for Win32 ALL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-15 12:26+0200\n"
+"POT-Creation-Date: 2007-07-17 17:28+0200\n"
 "PO-Revision-Date: 2007-02-19 02:46+0100\n"
 "Last-Translator: Pavel Bliznakov <pavel@pavel-bliznakov.com>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -179,6 +179,10 @@ msgid "Error: unable to run @DOLLAR@0."
 msgstr ""
 
 #: win32-loader.sh:88
+msgid "Error: failed to parse bcdedit.exe output."
+msgstr ""
+
+#: win32-loader.sh:89
 #, fuzzy
 msgid ""
 "Error: @DOLLAR@boot_ini not found.  Is this really Windows "
@@ -187,7 +191,7 @@ msgstr ""
 "Грешка: @DOLLAR@boot_ini не беше намерен.  Версията Ви на Уиндоус може да е "
 "прекалено стара или повредена."
 
-#: win32-loader.sh:89
+#: win32-loader.sh:90
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr ""
 
@@ -195,14 +199,14 @@ msgstr ""
 #. translate: will display one or the other depending on version of Windows.
 #. translate: Take into account that either option has to make sense in our
 #. translate: current context (i.e. be careful when using pronouns, etc).
-#: win32-loader.sh:94
+#: win32-loader.sh:95
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
 "automaticaly load Debian Installer.\\n\\n"
 msgstr ""
 
-#: win32-loader.sh:95
+#: win32-loader.sh:96
 msgid ""
 "You need to reboot in order to proceed with your Debian install.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -210,7 +214,7 @@ msgid ""
 "process.\\n\\n"
 msgstr ""
 
-#: win32-loader.sh:96
+#: win32-loader.sh:97
 #, fuzzy
 msgid ""
 "During the install process, you will be offered the possibility of either "
@@ -235,6 +239,6 @@ msgstr ""
 "деинсталирате програмата за зареждане на Дебиан инсталатора в Уиндоус от Add/"
 "Remove Programs в Control Panel."
 
-#: win32-loader.sh:97
+#: win32-loader.sh:98
 msgid "Do you want to reboot now?"
 msgstr "Искате ли да рестартирате сега?"
diff --git a/l10n/po/cs.po b/l10n/po/cs.po
index 9924b5a..63e11a6 100644
--- a/l10n/po/cs.po
+++ b/l10n/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-15 12:26+0200\n"
+"POT-Creation-Date: 2007-07-17 17:28+0200\n"
 "PO-Revision-Date: 2007-03-31 14:40+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -174,6 +174,10 @@ msgid "Error: unable to run @DOLLAR@0."
 msgstr "Chyba: napodařilo se spustit @DOLLAR@0."
 
 #: win32-loader.sh:88
+msgid "Error: failed to parse bcdedit.exe output."
+msgstr ""
+
+#: win32-loader.sh:89
 msgid ""
 "Error: @DOLLAR@boot_ini not found.  Is this really Windows "
 "@DOLLAR@windows_version?"
@@ -181,7 +185,7 @@ msgstr ""
 "Chyba: @DOLLAR@boot_ini nebyl nalezen. Je toto opravdu Windows  "
 "@DOLLAR@windows_version?"
 
-#: win32-loader.sh:89
+#: win32-loader.sh:90
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "DŮLEŽITÁ POZNÁMKA:\\n\\n"
 
@@ -189,7 +193,7 @@ msgstr "DŮLEŽITÁ POZNÁMKA:\\n\\n"
 #. translate: will display one or the other depending on version of Windows.
 #. translate: Take into account that either option has to make sense in our
 #. translate: current context (i.e. be careful when using pronouns, etc).
-#: win32-loader.sh:94
+#: win32-loader.sh:95
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -198,7 +202,7 @@ msgstr ""
 "Nyní se spustí druhá část instalace. Po potvrzení se Windows restartují do "
 "DOSu a automaticky spustí instalaci Debianu."
 
-#: win32-loader.sh:95
+#: win32-loader.sh:96
 msgid ""
 "You need to reboot in order to proceed with your Debian install.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -210,7 +214,7 @@ msgstr ""
 "instalaci Debianu. Pro pokračování v instalaci zvolte z nabídky instalaci "
 "Debianu.\\n\\n"
 
-#: win32-loader.sh:96
+#: win32-loader.sh:97
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition to install Debian or completely replacing "
@@ -230,6 +234,6 @@ msgstr ""
 "zavaděč instalace Debianu pomocí dialogu Přidat nebo odebrat programy v "
 "Ovládacích panelech."
 
-#: win32-loader.sh:97
+#: win32-loader.sh:98
 msgid "Do you want to reboot now?"
 msgstr "Chcete nyní restartovat?"
diff --git a/l10n/po/de.po b/l10n/po/de.po
index b4a2994..f8821ab 100644
--- a/l10n/po/de.po
+++ b/l10n/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-15 12:26+0200\n"
+"POT-Creation-Date: 2007-07-17 17:28+0200\n"
 "PO-Revision-Date: 2007-04-01 20:52+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <de@li.org>\n"
@@ -176,6 +176,10 @@ msgid "Error: unable to run @DOLLAR@0."
 msgstr "Fehler: kann @DOLLAR@0 nicht ausführen."
 
 #: win32-loader.sh:88
+msgid "Error: failed to parse bcdedit.exe output."
+msgstr ""
+
+#: win32-loader.sh:89
 msgid ""
 "Error: @DOLLAR@boot_ini not found.  Is this really Windows "
 "@DOLLAR@windows_version?"
@@ -183,7 +187,7 @@ msgstr ""
 "Fehler: @DOLLAR@boot_ini wurde nicht gefunden.  Ist das wirklich Windows "
 "@DOLLAR@windows_version?"
 
-#: win32-loader.sh:89
+#: win32-loader.sh:90
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "WICHTIGER HINWEIS:\\n\\n"
 
@@ -191,7 +195,7 @@ msgstr "WICHTIGER HINWEIS:\\n\\n"
 #. translate: will display one or the other depending on version of Windows.
 #. translate: Take into account that either option has to make sense in our
 #. translate: current context (i.e. be careful when using pronouns, etc).
-#: win32-loader.sh:94
+#: win32-loader.sh:95
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -201,7 +205,7 @@ msgstr ""
 "Bestätigung wird dieses Programm Windows im DOS-Modus neustarten und den "
 "Debian installer automatisch laden.\\n\\n"
 
-#: win32-loader.sh:95
+#: win32-loader.sh:96
 msgid ""
 "You need to reboot in order to proceed with your Debian install.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -213,7 +217,7 @@ msgstr ""
 "oder den Debianinstaller starten wollen.  Wählen Sie den Debianinstaller, um "
 "den Installationsprozeß fortzusetzen.\\n\\n"
 
-#: win32-loader.sh:96
+#: win32-loader.sh:97
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition to install Debian or completely replacing "
@@ -233,6 +237,6 @@ msgstr ""
 "Festplatte behalten haben), können Sie dieses Ladeprogramm mit dem'Programme "
 "Ändern/Entfernen Dialog in der Windows Systemsteuerung deinstallieren."
 
-#: win32-loader.sh:97
+#: win32-loader.sh:98
 msgid "Do you want to reboot now?"
 msgstr "Wollen Sie den Rechner jetzt neustarten?"
diff --git a/l10n/po/es.po b/l10n/po/es.po
index 9146afc..253e1b0 100644
--- a/l10n/po/es.po
+++ b/l10n/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-15 12:26+0200\n"
+"POT-Creation-Date: 2007-07-17 17:28+0200\n"
 "PO-Revision-Date: 2007-03-06 08:38+0100\n"
 "Last-Translator: César Gómez Martín <cesar.gomez@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -175,6 +175,10 @@ msgid "Error: unable to run @DOLLAR@0."
 msgstr ""
 
 #: win32-loader.sh:88
+msgid "Error: failed to parse bcdedit.exe output."
+msgstr ""
+
+#: win32-loader.sh:89
 #, fuzzy
 msgid ""
 "Error: @DOLLAR@boot_ini not found.  Is this really Windows "
@@ -183,7 +187,7 @@ msgstr ""
 "Error: no se ha encontrado @DOLLAR@boot_ini. Su versión de Windows puede que "
 "sea demasiado vieja o que esté dañada."
 
-#: win32-loader.sh:89
+#: win32-loader.sh:90
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr ""
 
@@ -191,14 +195,14 @@ msgstr ""
 #. translate: will display one or the other depending on version of Windows.
 #. translate: Take into account that either option has to make sense in our
 #. translate: current context (i.e. be careful when using pronouns, etc).
-#: win32-loader.sh:94
+#: win32-loader.sh:95
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
 "automaticaly load Debian Installer.\\n\\n"
 msgstr ""
 
-#: win32-loader.sh:95
+#: win32-loader.sh:96
 msgid ""
 "You need to reboot in order to proceed with your Debian install.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -206,7 +210,7 @@ msgid ""
 "process.\\n\\n"
 msgstr ""
 
-#: win32-loader.sh:96
+#: win32-loader.sh:97
 #, fuzzy
 msgid ""
 "During the install process, you will be offered the possibility of either "
@@ -232,6 +236,6 @@ msgstr ""
 "de Debian a través del diálogo de Añadir/Quitar Programas del Panel de "
 "Control de Windows."
 
-#: win32-loader.sh:97
+#: win32-loader.sh:98
 msgid "Do you want to reboot now?"
 msgstr "¿Desea reiniciar ahora?"
diff --git a/l10n/po/fi.po b/l10n/po/fi.po
index 64940ce..1d4818a 100644
--- a/l10n/po/fi.po
+++ b/l10n/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-15 12:26+0200\n"
+"POT-Creation-Date: 2007-07-17 17:28+0200\n"
 "PO-Revision-Date: 2007-02-14 11:39+0200\n"
 "Last-Translator: Tommi Vainikainen <thv@iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -174,6 +174,10 @@ msgid "Error: unable to run @DOLLAR@0."
 msgstr ""
 
 #: win32-loader.sh:88
+msgid "Error: failed to parse bcdedit.exe output."
+msgstr ""
+
+#: win32-loader.sh:89
 #, fuzzy
 msgid ""
 "Error: @DOLLAR@boot_ini not found.  Is this really Windows "
@@ -182,7 +186,7 @@ msgstr ""
 "Virhe: @DOLLAR@boot_ini ei löydy. Windows-versiosi saattaa olla liian vanha "
 "taikka vahingoittunut."
 
-#: win32-loader.sh:89
+#: win32-loader.sh:90
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr ""
 
@@ -190,14 +194,14 @@ msgstr ""
 #. translate: will display one or the other depending on version of Windows.
 #. translate: Take into account that either option has to make sense in our
 #. translate: current context (i.e. be careful when using pronouns, etc).
-#: win32-loader.sh:94
+#: win32-loader.sh:95
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
 "automaticaly load Debian Installer.\\n\\n"
 msgstr ""
 
-#: win32-loader.sh:95
+#: win32-loader.sh:96
 msgid ""
 "You need to reboot in order to proceed with your Debian install.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -205,7 +209,7 @@ msgid ""
 "process.\\n\\n"
 msgstr ""
 
-#: win32-loader.sh:96
+#: win32-loader.sh:97
 #, fuzzy
 msgid ""
 "During the install process, you will be offered the possibility of either "
@@ -230,6 +234,6 @@ msgstr ""
 "lataimen Windowsissa Ohjauspaneelin (Control Panel) kohdasta Lisää tai "
 "poista sovelluksia (Add/Remove Programs)."
 
-#: win32-loader.sh:97
+#: win32-loader.sh:98
 msgid "Do you want to reboot now?"
 msgstr "Haluatko uudelleenkäynnistää nyt?"
diff --git a/l10n/po/fr.po b/l10n/po/fr.po
index 7b6e91a..69ec280 100644
--- a/l10n/po/fr.po
+++ b/l10n/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-15 12:26+0200\n"
+"POT-Creation-Date: 2007-07-17 17:28+0200\n"
 "PO-Revision-Date: 2007-03-31 17:25+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -178,6 +178,10 @@ msgid "Error: unable to run @DOLLAR@0."
 msgstr "Erreur : impossible d'exécuter @DOLLAR@0."
 
 #: win32-loader.sh:88
+msgid "Error: failed to parse bcdedit.exe output."
+msgstr ""
+
+#: win32-loader.sh:89
 msgid ""
 "Error: @DOLLAR@boot_ini not found.  Is this really Windows "
 "@DOLLAR@windows_version?"
@@ -185,7 +189,7 @@ msgstr ""
 "Erreur: @DOLLAR@boot_ini n'existe pas. Ce système est-il vraiment Windows "
 "@DOLLARwindows_version ?"
 
-#: win32-loader.sh:89
+#: win32-loader.sh:90
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "Note très importante :\\n\\n"
 
@@ -193,7 +197,7 @@ msgstr "Note très importante :\\n\\n"
 #. translate: will display one or the other depending on version of Windows.
 #. translate: Take into account that either option has to make sense in our
 #. translate: current context (i.e. be careful when using pronouns, etc).
-#: win32-loader.sh:94
+#: win32-loader.sh:95
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -203,7 +207,7 @@ msgstr ""
 "Après confirmation, ce programme va redémarrer Windows en mode DOS et "
 "charger automatiquement l'installateur de Debian.\\n\\n"
 
-#: win32-loader.sh:95
+#: win32-loader.sh:96
 msgid ""
 "You need to reboot in order to proceed with your Debian install.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -215,7 +219,7 @@ msgstr ""
 "Debian. Vous devez choisir cette dernière option pour continuer le processus "
 "d'installation.\\n\\n"
 
-#: win32-loader.sh:96
+#: win32-loader.sh:97
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition to install Debian or completely replacing "
@@ -236,6 +240,6 @@ msgstr ""
 "le chargeur de l'installateur Debian en utilisant « Ajout/suppression de "
 "programmes » du Panneau de Configuration."
 
-#: win32-loader.sh:97
+#: win32-loader.sh:98
 msgid "Do you want to reboot now?"
 msgstr "Voulez-vous redémarrer maintenant ?"
diff --git a/l10n/po/he.po b/l10n/po/he.po
index 0bd5057..ed9571c 100644
--- a/l10n/po/he.po
+++ b/l10n/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-15 12:26+0200\n"
+"POT-Creation-Date: 2007-07-17 17:28+0200\n"
 "PO-Revision-Date: 2007-02-18 22:52+0100\n"
 "Last-Translator: Lior Kaplan <kaplan@debian.org>\n"
 "Language-Team: Hebrew <debian-hebrew-common@lists.alioth.debian.org>\n"
@@ -172,13 +172,17 @@ msgid "Error: unable to run @DOLLAR@0."
 msgstr ""
 
 #: win32-loader.sh:88
+msgid "Error: failed to parse bcdedit.exe output."
+msgstr ""
+
+#: win32-loader.sh:89
 #, fuzzy
 msgid ""
 "Error: @DOLLAR@boot_ini not found.  Is this really Windows "
 "@DOLLAR@windows_version?"
 msgstr "שגיאה: @DOLLAR@boot_ini לא נמצא. הגרסה של חלונות ישנה מידי או פגומה."
 
-#: win32-loader.sh:89
+#: win32-loader.sh:90
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr ""
 
@@ -186,14 +190,14 @@ msgstr ""
 #. translate: will display one or the other depending on version of Windows.
 #. translate: Take into account that either option has to make sense in our
 #. translate: current context (i.e. be careful when using pronouns, etc).
-#: win32-loader.sh:94
+#: win32-loader.sh:95
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
 "automaticaly load Debian Installer.\\n\\n"
 msgstr ""
 
-#: win32-loader.sh:95
+#: win32-loader.sh:96
 msgid ""
 "You need to reboot in order to proceed with your Debian install.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -201,7 +205,7 @@ msgid ""
 "process.\\n\\n"
 msgstr ""
 
-#: win32-loader.sh:96
+#: win32-loader.sh:97
 #, fuzzy
 msgid ""
 "During the install process, you will be offered the possibility of either "
@@ -222,6 +226,6 @@ msgstr ""
 "להשאיר את חלונות), תוכל להסיר את תוכנית זאת בעזרה ממשק ניהול התוכנות של "
 "חלונות בלוח הבקרה.'"
 
-#: win32-loader.sh:97
+#: win32-loader.sh:98
 msgid "Do you want to reboot now?"
 msgstr "לאתחל את המחשב עכשיו?"
diff --git a/l10n/po/it.po b/l10n/po/it.po
index 1e7de21..4ae29ba 100644
--- a/l10n/po/it.po
+++ b/l10n/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-15 12:26+0200\n"
+"POT-Creation-Date: 2007-07-17 17:28+0200\n"
 "PO-Revision-Date: 2007-02-25 08:45+0100\n"
 "Last-Translator: Stefano Canepa <sc@linux.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -174,6 +174,10 @@ msgid "Error: unable to run @DOLLAR@0."
 msgstr ""
 
 #: win32-loader.sh:88
+msgid "Error: failed to parse bcdedit.exe output."
+msgstr ""
+
+#: win32-loader.sh:89
 #, fuzzy
 msgid ""
 "Error: @DOLLAR@boot_ini not found.  Is this really Windows "
@@ -182,7 +186,7 @@ msgstr ""
 "Errore: @DOLLAR@boot_ini non trovato. La versione di Windows potrebbe essere "
 "troppo vecchia o danneggiata."
 
-#: win32-loader.sh:89
+#: win32-loader.sh:90
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr ""
 
@@ -190,14 +194,14 @@ msgstr ""
 #. translate: will display one or the other depending on version of Windows.
 #. translate: Take into account that either option has to make sense in our
 #. translate: current context (i.e. be careful when using pronouns, etc).
-#: win32-loader.sh:94
+#: win32-loader.sh:95
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
 "automaticaly load Debian Installer.\\n\\n"
 msgstr ""
 
-#: win32-loader.sh:95
+#: win32-loader.sh:96
 msgid ""
 "You need to reboot in order to proceed with your Debian install.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -205,7 +209,7 @@ msgid ""
 "process.\\n\\n"
 msgstr ""
 
-#: win32-loader.sh:96
+#: win32-loader.sh:97
 #, fuzzy
 msgid ""
 "During the install process, you will be offered the possibility of either "
@@ -230,6 +234,6 @@ msgstr ""
 "Debian-Installer Loader usando Aggiungi/Rimuovi programmi dal Pannello di "
 "Controllo di Windows."
 
-#: win32-loader.sh:97
+#: win32-loader.sh:98
 msgid "Do you want to reboot now?"
 msgstr "Riavviare ora?"
diff --git a/l10n/po/ja.po b/l10n/po/ja.po
index 745b85f..5704cb4 100644
--- a/l10n/po/ja.po
+++ b/l10n/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-15 12:26+0200\n"
+"POT-Creation-Date: 2007-07-17 17:28+0200\n"
 "PO-Revision-Date: 2007-03-25 19:19+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -176,6 +176,10 @@ msgid "Error: unable to run @DOLLAR@0."
 msgstr "エラー: @DOLLAR@0 を実行できませんでした。"
 
 #: win32-loader.sh:88
+msgid "Error: failed to parse bcdedit.exe output."
+msgstr ""
+
+#: win32-loader.sh:89
 msgid ""
 "Error: @DOLLAR@boot_ini not found.  Is this really Windows "
 "@DOLLAR@windows_version?"
@@ -183,7 +187,7 @@ msgstr ""
 "エラー: @DOLLAR@boot_ini が見つかりません。本当に Windows "
 "@DOLLAR@windows_version を利用していますか?"
 
-#: win32-loader.sh:89
+#: win32-loader.sh:90
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "とても重要なお知らせ:\\n\\n"
 
@@ -191,7 +195,7 @@ msgstr "とても重要なお知らせ:\\n\\n"
 #. translate: will display one or the other depending on version of Windows.
 #. translate: Take into account that either option has to make sense in our
 #. translate: current context (i.e. be careful when using pronouns, etc).
-#: win32-loader.sh:94
+#: win32-loader.sh:95
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -200,7 +204,7 @@ msgstr ""
 "インストール作業を次の段階に進めます。確認後、このプログラムは Windows を "
 "DOS モードで再起動して自動的に Debian インストーラを起動します。\\n\\n"
 
-#: win32-loader.sh:95
+#: win32-loader.sh:96
 msgid ""
 "You need to reboot in order to proceed with your Debian install.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -211,7 +215,7 @@ msgstr ""
 "Windows を起動するか Debian インストーラを起動するかを尋ねられます。インス"
 "トール作業を続けるためには Debian インストーラを選択してください。\\n\\n"
 
-#: win32-loader.sh:96
+#: win32-loader.sh:97
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition to install Debian or completely replacing "
@@ -231,6 +235,6 @@ msgstr ""
 "ルはコントロールパネルの「プログラムの追加と削除」画面からアンインストールで"
 "きます。"
 
-#: win32-loader.sh:97
+#: win32-loader.sh:98
 msgid "Do you want to reboot now?"
 msgstr "今すぐ再起動しますか?"
diff --git a/l10n/po/messages.pot b/l10n/po/messages.pot
index fb1c3b7..80b3a88 100644
--- a/l10n/po/messages.pot
+++ b/l10n/po/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-15 12:26+0200\n"
+"POT-Creation-Date: 2007-07-17 17:28+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -166,12 +166,16 @@ msgid "Error: unable to run @DOLLAR@0."
 msgstr ""
 
 #: win32-loader.sh:88
+msgid "Error: failed to parse bcdedit.exe output."
+msgstr ""
+
+#: win32-loader.sh:89
 msgid ""
 "Error: @DOLLAR@boot_ini not found.  Is this really Windows "
 "@DOLLAR@windows_version?"
 msgstr ""
 
-#: win32-loader.sh:89
+#: win32-loader.sh:90
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr ""
 
@@ -179,14 +183,14 @@ msgstr ""
 #. translate: will display one or the other depending on version of Windows.
 #. translate: Take into account that either option has to make sense in our
 #. translate: current context (i.e. be careful when using pronouns, etc).
-#: win32-loader.sh:94
+#: win32-loader.sh:95
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
 "automaticaly load Debian Installer.\\n\\n"
 msgstr ""
 
-#: win32-loader.sh:95
+#: win32-loader.sh:96
 msgid ""
 "You need to reboot in order to proceed with your Debian install.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -194,7 +198,7 @@ msgid ""
 "process.\\n\\n"
 msgstr ""
 
-#: win32-loader.sh:96
+#: win32-loader.sh:97
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition to install Debian or completely replacing "
@@ -206,6 +210,6 @@ msgid ""
 "Windows Add/Remove Programs dialog in Control Panel."
 msgstr ""
 
-#: win32-loader.sh:97
+#: win32-loader.sh:98
 msgid "Do you want to reboot now?"
 msgstr ""
diff --git a/l10n/po/nl.po b/l10n/po/nl.po
index a18a03a..a66d7d4 100644
--- a/l10n/po/nl.po
+++ b/l10n/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-15 12:26+0200\n"
+"POT-Creation-Date: 2007-07-17 17:28+0200\n"
 "PO-Revision-Date: 2007-03-31 14:30+0200\n"
 "Last-Translator: Frans Pop <elendil@planet.nl>\n"
 "Language-Team: Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -177,6 +177,10 @@ msgid "Error: unable to run @DOLLAR@0."
 msgstr "Fout: kan @DOLLAR@0 niet uitvoeren."
 
 #: win32-loader.sh:88
+msgid "Error: failed to parse bcdedit.exe output."
+msgstr ""
+
+#: win32-loader.sh:89
 msgid ""
 "Error: @DOLLAR@boot_ini not found.  Is this really Windows "
 "@DOLLAR@windows_version?"
@@ -184,7 +188,7 @@ msgstr ""
 "Fout: @DOLLAR@boot_ini niet gevonden. Is dit echt Windows "
 "@DOLLAR@windows_version?"
 
-#: win32-loader.sh:89
+#: win32-loader.sh:90
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "ZEER BELANGRIJKE MELDING:\\n\\n"
 
@@ -192,7 +196,7 @@ msgstr "ZEER BELANGRIJKE MELDING:\\n\\n"
 #. translate: will display one or the other depending on version of Windows.
 #. translate: Take into account that either option has to make sense in our
 #. translate: current context (i.e. be careful when using pronouns, etc).
-#: win32-loader.sh:94
+#: win32-loader.sh:95
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -202,7 +206,7 @@ msgstr ""
 "dialoog bevestigt, zal Windows opnieuw worden opgestart in DOS-modus en zal "
 "vervolgens automatisch het Debian Installatiesysteem worden geladen.\\n\\n"
 
-#: win32-loader.sh:95
+#: win32-loader.sh:96
 msgid ""
 "You need to reboot in order to proceed with your Debian install.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -214,7 +218,7 @@ msgstr ""
 "Debian Installer wilt starten. Kies Debian Installer om het "
 "installatieproces te vervolgen.\\n\\n"
 
-#: win32-loader.sh:96
+#: win32-loader.sh:97
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition to install Debian or completely replacing "
@@ -235,6 +239,6 @@ msgstr ""
 "Installatiesysteem verwijderen via de optie 'Software' in het "
 "Configuratiescherm."
 
-#: win32-loader.sh:97
+#: win32-loader.sh:98
 msgid "Do you want to reboot now?"
 msgstr "Wilt u uw systeem nu herstarten?"
diff --git a/l10n/po/pt.po b/l10n/po/pt.po
index 1ede9d9..8c9923e 100644
--- a/l10n/po/pt.po
+++ b/l10n/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-15 12:26+0200\n"
+"POT-Creation-Date: 2007-07-17 17:28+0200\n"
 "PO-Revision-Date: 2007-02-13 22:18+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -175,6 +175,10 @@ msgid "Error: unable to run @DOLLAR@0."
 msgstr ""
 
 #: win32-loader.sh:88
+msgid "Error: failed to parse bcdedit.exe output."
+msgstr ""
+
+#: win32-loader.sh:89
 #, fuzzy
 msgid ""
 "Error: @DOLLAR@boot_ini not found.  Is this really Windows "
@@ -183,7 +187,7 @@ msgstr ""
 "Erro: @DOLLAR@boot_ini não encontrado.  A sua versão do Windows pode ser "
 "demasiado antiga, ou estar danificada."
 
-#: win32-loader.sh:89
+#: win32-loader.sh:90
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr ""
 
@@ -191,14 +195,14 @@ msgstr ""
 #. translate: will display one or the other depending on version of Windows.
 #. translate: Take into account that either option has to make sense in our
 #. translate: current context (i.e. be careful when using pronouns, etc).
-#: win32-loader.sh:94
+#: win32-loader.sh:95
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
 "automaticaly load Debian Installer.\\n\\n"
 msgstr ""
 
-#: win32-loader.sh:95
+#: win32-loader.sh:96
 msgid ""
 "You need to reboot in order to proceed with your Debian install.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -206,7 +210,7 @@ msgid ""
 "process.\\n\\n"
 msgstr ""
 
-#: win32-loader.sh:96
+#: win32-loader.sh:97
 #, fuzzy
 msgid ""
 "During the install process, you will be offered the possibility of either "
@@ -232,6 +236,6 @@ msgstr ""
 "através da caixa de diálogo Adicionar/Remover Programas no Painel de "
 "Controlo."
 
-#: win32-loader.sh:97
+#: win32-loader.sh:98
 msgid "Do you want to reboot now?"
 msgstr "Deseja reiniciar agora?"
diff --git a/l10n/po/ru.po b/l10n/po/ru.po
index de63f5f..9c675cd 100644
--- a/l10n/po/ru.po
+++ b/l10n/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-15 12:26+0200\n"
+"POT-Creation-Date: 2007-07-17 17:28+0200\n"
 "PO-Revision-Date: 2006-02-21 20:00+MSK\n"
 "Last-Translator: Evgeny Burzak <moongod@yandex.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -176,6 +176,10 @@ msgid "Error: unable to run @DOLLAR@0."
 msgstr ""
 
 #: win32-loader.sh:88
+msgid "Error: failed to parse bcdedit.exe output."
+msgstr ""
+
+#: win32-loader.sh:89
 #, fuzzy
 msgid ""
 "Error: @DOLLAR@boot_ini not found.  Is this really Windows "
@@ -184,7 +188,7 @@ msgstr ""
 "Ошибка: @DOLLAR@boot_ini не найден.  Ваша версия Windows может быть очень "
 "старой или поврежденной."
 
-#: win32-loader.sh:89
+#: win32-loader.sh:90
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr ""
 
@@ -192,14 +196,14 @@ msgstr ""
 #. translate: will display one or the other depending on version of Windows.
 #. translate: Take into account that either option has to make sense in our
 #. translate: current context (i.e. be careful when using pronouns, etc).
-#: win32-loader.sh:94
+#: win32-loader.sh:95
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
 "automaticaly load Debian Installer.\\n\\n"
 msgstr ""
 
-#: win32-loader.sh:95
+#: win32-loader.sh:96
 msgid ""
 "You need to reboot in order to proceed with your Debian install.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -207,7 +211,7 @@ msgid ""
 "process.\\n\\n"
 msgstr ""
 
-#: win32-loader.sh:96
+#: win32-loader.sh:97
 #, fuzzy
 msgid ""
 "During the install process, you will be offered the possibility of either "
@@ -231,6 +235,6 @@ msgstr ""
 "диске), вы можете удалить Загрузчик Установщика Debian через диалог Windows "
 "'Установка и удаление программ' в 'Панели управления'."
 
-#: win32-loader.sh:97
+#: win32-loader.sh:98
 msgid "Do you want to reboot now?"
 msgstr "Перезагрузить компьютер сейчас?"
diff --git a/l10n/po/sk.po b/l10n/po/sk.po
index 32fc41e..696a26a 100644
--- a/l10n/po/sk.po
+++ b/l10n/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-15 12:26+0200\n"
+"POT-Creation-Date: 2007-07-17 17:28+0200\n"
 "PO-Revision-Date: 2007-03-30 06:43+0200\n"
 "Last-Translator: Peter Mann <Peter.Mann@tuke.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -174,6 +174,10 @@ msgid "Error: unable to run @DOLLAR@0."
 msgstr ""
 
 #: win32-loader.sh:88
+msgid "Error: failed to parse bcdedit.exe output."
+msgstr ""
+
+#: win32-loader.sh:89
 #, fuzzy
 msgid ""
 "Error: @DOLLAR@boot_ini not found.  Is this really Windows "
@@ -182,7 +186,7 @@ msgstr ""
 "Chyba: súbor @DOLLAR@boot_ini sa nenašiel.  Vaša verzia Windows je možno "
 "veľmi stará alebo poškodená."
 
-#: win32-loader.sh:89
+#: win32-loader.sh:90
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr ""
 
@@ -190,14 +194,14 @@ msgstr ""
 #. translate: will display one or the other depending on version of Windows.
 #. translate: Take into account that either option has to make sense in our
 #. translate: current context (i.e. be careful when using pronouns, etc).
-#: win32-loader.sh:94
+#: win32-loader.sh:95
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
 "automaticaly load Debian Installer.\\n\\n"
 msgstr ""
 
-#: win32-loader.sh:95
+#: win32-loader.sh:96
 msgid ""
 "You need to reboot in order to proceed with your Debian install.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -205,7 +209,7 @@ msgid ""
 "process.\\n\\n"
 msgstr ""
 
-#: win32-loader.sh:96
+#: win32-loader.sh:97
 #, fuzzy
 msgid ""
 "During the install process, you will be offered the possibility of either "
@@ -229,6 +233,6 @@ msgstr ""
 "Windows aj Debian, môžete po ukončení inštalácie odstrániť tento zavádzač "
 "pomocou dialógu Pridať/Odobrať programy v Ovládacom paneli."
 
-#: win32-loader.sh:97
+#: win32-loader.sh:98
 msgid "Do you want to reboot now?"
 msgstr "Chcete teraz reštartovať počítač?"
diff --git a/l10n/po/sv.po b/l10n/po/sv.po
index 99f5ae3..abe45da 100644
--- a/l10n/po/sv.po
+++ b/l10n/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-15 12:26+0200\n"
+"POT-Creation-Date: 2007-07-17 17:28+0200\n"
 "PO-Revision-Date: 2007-04-02 07:49+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -176,6 +176,10 @@ msgid "Error: unable to run @DOLLAR@0."
 msgstr "Fel: kunde inte köra @DOLLAR@0."
 
 #: win32-loader.sh:88
+msgid "Error: failed to parse bcdedit.exe output."
+msgstr ""
+
+#: win32-loader.sh:89
 msgid ""
 "Error: @DOLLAR@boot_ini not found.  Is this really Windows "
 "@DOLLAR@windows_version?"
@@ -183,7 +187,7 @@ msgstr ""
 "Fel: @DOLLAR@boot_ini hittades inte.  Är det här verkligen Windows "
 "@DOLLAR@windows_version?"
 
-#: win32-loader.sh:89
+#: win32-loader.sh:90
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "MYCKET VIKTIG NOTERING:\\n\\n"
 
@@ -191,7 +195,7 @@ msgstr "MYCKET VIKTIG NOTERING:\\n\\n"
 #. translate: will display one or the other depending on version of Windows.
 #. translate: Take into account that either option has to make sense in our
 #. translate: current context (i.e. be careful when using pronouns, etc).
-#: win32-loader.sh:94
+#: win32-loader.sh:95
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -201,7 +205,7 @@ msgstr ""
 "Efter att du har bekräftat kommer det här programmet att starta om Windows "
 "till DOS-läget och automatiskt läsa in Debian Installer.\\n\\n"
 
-#: win32-loader.sh:95
+#: win32-loader.sh:96
 msgid ""
 "You need to reboot in order to proceed with your Debian install.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -213,7 +217,7 @@ msgstr ""
 "Windows eller Debian Installer.  Välj Debian Installer för att fortsätta med "
 "installationsprocessen.\\n\\n"
 
-#: win32-loader.sh:96
+#: win32-loader.sh:97
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition to install Debian or completely replacing "
@@ -233,6 +237,6 @@ msgstr ""
 "disk) kan du avinstallera Inläsare för Debian-installerare genom Windows-"
 "dialogrutan Lägg till/Ta bort program under Kontrollpanelen."
 
-#: win32-loader.sh:97
+#: win32-loader.sh:98
 msgid "Do you want to reboot now?"
 msgstr "Vill du starta om nu?"
diff --git a/l10n/po/tr.po b/l10n/po/tr.po
index 5ad6103..7dc129a 100644
--- a/l10n/po/tr.po
+++ b/l10n/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian-Installer Loader\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-15 12:26+0200\n"
+"POT-Creation-Date: 2007-07-17 17:28+0200\n"
 "PO-Revision-Date: 2007-04-15 20:42+0300\n"
 "Last-Translator: Recai Oktaş <roktas@debian.org>\n"
 "Language-Team: Debian L10n Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -178,6 +178,10 @@ msgid "Error: unable to run @DOLLAR@0."
 msgstr "Hata: @DOLLAR@0 çalıştırılamadı."
 
 #: win32-loader.sh:88
+msgid "Error: failed to parse bcdedit.exe output."
+msgstr ""
+
+#: win32-loader.sh:89
 msgid ""
 "Error: @DOLLAR@boot_ini not found.  Is this really Windows "
 "@DOLLAR@windows_version?"
@@ -185,7 +189,7 @@ msgstr ""
 "Hata: @DOLLAR@boot_ini bulunamadı.  Bu gerçekten bir Windows "
 "@DOLLAR@windows_version sürümü mü?"
 
-#: win32-loader.sh:89
+#: win32-loader.sh:90
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "ÇOK ÖNEMLİ UYARI:\\n\\n"
 
@@ -193,7 +197,7 @@ msgstr "ÇOK ÖNEMLİ UYARI:\\n\\n"
 #. translate: will display one or the other depending on version of Windows.
 #. translate: Take into account that either option has to make sense in our
 #. translate: current context (i.e. be careful when using pronouns, etc).
-#: win32-loader.sh:94
+#: win32-loader.sh:95
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -203,7 +207,7 @@ msgstr ""
 "sonra, program Windows'u DOS kipinde başlatacak ve Debian Kurulum Programını "
 "otomatik olarak yükleyecek.\\n\\n"
 
-#: win32-loader.sh:95
+#: win32-loader.sh:96
 msgid ""
 "You need to reboot in order to proceed with your Debian install.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -215,7 +219,7 @@ msgstr ""
 "başlatmak istediğiniz size sorulacak.  Kurulum işlemiyle devam etmek için "
 "Debian Kurulum Programını seçin.\\n\\n"
 
-#: win32-loader.sh:96
+#: win32-loader.sh:97
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition to install Debian or completely replacing "
@@ -235,6 +239,6 @@ msgstr ""
 "seçmişseniz), Debian-Kur Yükleyiciyi Windows Denetim Masasından Program Ekle/"
 "Kaldır ile kaldırabilirsiniz."
 
-#: win32-loader.sh:97
+#: win32-loader.sh:98
 msgid "Do you want to reboot now?"
 msgstr "Sistemi şimdi yeniden başlatmak ister misiniz?"
diff --git a/l10n/win32-loader.sh b/l10n/win32-loader.sh
index 9def89f..11946a0 100755
--- a/l10n/win32-loader.sh
+++ b/l10n/win32-loader.sh
@@ -85,6 +85,7 @@ LangString nsisdl8 \${$nsis_lang} "`gettext " (%d %s%s remaining)"`"
 LangString error \${$nsis_lang} "`gettext "Error"`"
 LangString error_copyfiles \${$nsis_lang} "`gettext "Error: failed to copy @DOLLAR@0 to @DOLLAR@1."`"
 LangString error_exec \${$nsis_lang} "`gettext "Error: unable to run @DOLLAR@0."`"
+LangString error_bcdedit_extract_id \${$nsis_lang} "`gettext "Error: failed to parse bcdedit.exe output."`"
 LangString boot_ini_not_found \${$nsis_lang} "`gettext "Error: @DOLLAR@boot_ini not found.  Is this really Windows @DOLLAR@windows_version?"`"
 LangString warning1 \${$nsis_lang} "`gettext "VERY IMPORTANT NOTICE:\n\n"`"
 # translate: The following two strings are mutualy exclussive.  win32-loader