From 073c09e491f1003b07c10abfb5e209f0c5e122f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Thu, 8 Nov 2018 00:54:59 +0100 Subject: [PATCH] [USETUP] Display the chosen filesystem name in case of bootcode installation failure. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Simplified implementation of the proposed solution by George Bișoc and revised by Victor Perevertkin from PR #952. NOTE: For whatever reason ERROR_INSTALL_BOOTCODE and ERROR_WRITE_BOOT seem to be redundant with each other. To be investigated... --- base/setup/usetup/lang/bg-BG.h | 4 ++-- base/setup/usetup/lang/bn-BD.h | 4 ++-- base/setup/usetup/lang/cs-CZ.h | 4 ++-- base/setup/usetup/lang/da-DK.h | 4 ++-- base/setup/usetup/lang/de-DE.h | 4 ++-- base/setup/usetup/lang/el-GR.h | 4 ++-- base/setup/usetup/lang/en-US.h | 4 ++-- base/setup/usetup/lang/es-ES.h | 4 ++-- base/setup/usetup/lang/et-EE.h | 4 ++-- base/setup/usetup/lang/fr-FR.h | 4 ++-- base/setup/usetup/lang/he-IL.h | 4 ++-- base/setup/usetup/lang/it-IT.h | 4 ++-- base/setup/usetup/lang/ja-JP.h | 4 ++-- base/setup/usetup/lang/lt-LT.h | 4 ++-- base/setup/usetup/lang/ms-MY.h | 4 ++-- base/setup/usetup/lang/nl-NL.h | 4 ++-- base/setup/usetup/lang/pl-PL.h | 4 ++-- base/setup/usetup/lang/pt-BR.h | 4 ++-- base/setup/usetup/lang/ro-RO.h | 4 ++-- base/setup/usetup/lang/ru-RU.h | 4 ++-- base/setup/usetup/lang/sk-SK.h | 4 ++-- base/setup/usetup/lang/sq-AL.h | 4 ++-- base/setup/usetup/lang/sv-SE.h | 4 ++-- base/setup/usetup/lang/tr-TR.h | 4 ++-- base/setup/usetup/lang/uk-UA.h | 4 ++-- base/setup/usetup/usetup.c | 10 +++++++--- 26 files changed, 57 insertions(+), 53 deletions(-) diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index 4a762492421..5c3fe25fa84 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -1479,7 +1479,7 @@ MUI_ERROR bgBGErrorEntries[] = }, { // ERROR_WRITE_BOOT, - "ᯥ譮 ᫠ 砢 (bootcode) FAT ⥬ .", + "ᯥ譮 ᫠ 砢 (bootcode) %S ⥬ .", "ENTER = १᪠ " }, { @@ -1531,7 +1531,7 @@ MUI_ERROR bgBGErrorEntries[] = { // ERROR_INSTALL_BOOTCODE, //"Setup failed to install the FAT bootcode on the system partition.", - "ᯥ譮 ᫠ 㢠 FAT ⥬ .", + "ᯥ譮 ᫠ 㢠 %S ⥬ .", "ENTER = १᪠ " }, { diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index d0aed0dc7a8..352aeb1453e 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -1471,7 +1471,7 @@ MUI_ERROR bnBDErrorEntries[] = }, { // ERROR_WRITE_BOOT, - "Setup failed to install FAT bootcode on the system partition.", + "Setup failed to install %S bootcode on the system partition.", "ENTER = Reboot computer" }, { @@ -1522,7 +1522,7 @@ MUI_ERROR bnBDErrorEntries[] = }, { // ERROR_INSTALL_BOOTCODE, - "Setup failed to install the FAT bootcode on the system partition.", + "Setup failed to install the %S bootcode on the system partition.", "ENTER = Reboot computer" }, { diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index c331544aba6..7f5ac870f27 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -1477,7 +1477,7 @@ MUI_ERROR csCZErrorEntries[] = }, { // ERROR_WRITE_BOOT, - "Nepodailo se nainstalovat FAT zavad؟ na systmov oddl.", + "Nepodailo se nainstalovat %S zavad؟ na systmov oddl.", "ENTER = Restartovat pota" }, { @@ -1528,7 +1528,7 @@ MUI_ERROR csCZErrorEntries[] = }, { // ERROR_INSTALL_BOOTCODE, - "Nepodailo se nainstalovat FAT zavad؟ na systmov oddl.", + "Nepodailo se nainstalovat %S zavad؟ na systmov oddl.", "ENTER = Restartovat pota" }, { diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index e891c4652ff..1aaf8b0afa0 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -1484,7 +1484,7 @@ MUI_ERROR daDKErrorEntries[] = }, { // ERROR_WRITE_BOOT, - "Installationen kunne ikke installere FAT-startkode p systempartitionen.", + "Installationen kunne ikke installere %S-startkode p systempartitionen.", "ENTER = Genstart" }, { @@ -1535,7 +1535,7 @@ MUI_ERROR daDKErrorEntries[] = }, { // ERROR_INSTALL_BOOTCODE, - "Installationen kunne ikke installere FAT-startkode p systempartitionen.", + "Installationen kunne ikke installere %S-startkode p systempartitionen.", "ENTER = Genstart" }, { diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index baeae441fca..0bd8f3cee9f 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -1471,7 +1471,7 @@ MUI_ERROR deDEErrorEntries[] = }, { // ERROR_WRITE_BOOT, - "Der FAT-Bootcode konnte nicht auf der Partition installiert werden.", + "Der %S-Bootcode konnte nicht auf der Partition installiert werden.", "EINGABETASTE = Computer neu starten" }, { @@ -1522,7 +1522,7 @@ MUI_ERROR deDEErrorEntries[] = }, { // ERROR_INSTALL_BOOTCODE, - "Der FAT-Bootcode konnte nicht auf der Partition installiert werden.", + "Der %S-Bootcode konnte nicht auf der Partition installiert werden.", "EINGABETASTE = Computer neu starten" }, { diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index b01a3e07a15..0d431354a0f 100644 --- a/base/setup/usetup/lang/el-GR.h +++ b/base/setup/usetup/lang/el-GR.h @@ -1495,7 +1495,7 @@ MUI_ERROR elGRErrorEntries[] = }, { // ERROR_WRITE_BOOT, - "Setup failed to install FAT bootcode on the system partition.", + "Setup failed to install %S bootcode on the system partition.", "ENTER = 夞 " }, { @@ -1546,7 +1546,7 @@ MUI_ERROR elGRErrorEntries[] = }, { // ERROR_INSTALL_BOOTCODE, - "Setup failed to install the FAT bootcode on the system partition.", + "Setup failed to install the %S bootcode on the system partition.", "ENTER = 夞 " }, { diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index a2671e3b759..1f90eb26dad 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -1472,7 +1472,7 @@ MUI_ERROR enUSErrorEntries[] = }, { // ERROR_WRITE_BOOT, - "Setup failed to install FAT bootcode on the system partition.", + "Setup failed to install %S bootcode on the system partition.", "ENTER = Reboot computer" }, { @@ -1523,7 +1523,7 @@ MUI_ERROR enUSErrorEntries[] = }, { // ERROR_INSTALL_BOOTCODE, - "Setup failed to install the FAT bootcode on the system partition.", + "Setup failed to install the %S bootcode on the system partition.", "ENTER = Reboot computer" }, { diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index 050fd076446..3e54da4fda1 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -1474,7 +1474,7 @@ MUI_ERROR esESErrorEntries[] = }, { // ERROR_WRITE_BOOT, - "El instalador fall al instalar el cdigo de inicio FAT en la particin del sistema.", + "El instalador fall al instalar el cdigo de inicio %S en la particin del sistema.", "INTRO = Reiniciar el equipo" }, { @@ -1525,7 +1525,7 @@ MUI_ERROR esESErrorEntries[] = }, { // ERROR_INSTALL_BOOTCODE, - "El instalador fall al instalar el cdigo de inicio FAT en la particin del sistema.", + "El instalador fall al instalar el cdigo de inicio %S en la particin del sistema.", "INTRO = Reiniciar el equipo" }, { diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index 954ab947516..39fe9f8fad3 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -1472,7 +1472,7 @@ MUI_ERROR etEEErrorEntries[] = }, { // ERROR_WRITE_BOOT, - "Ssteemikettale ei nnestunud kirjutada FAT alglaadimiskoodi.", + "Ssteemikettale ei nnestunud kirjutada %S alglaadimiskoodi.", "ENTER = Taaskivita arvuti" }, { @@ -1523,7 +1523,7 @@ MUI_ERROR etEEErrorEntries[] = }, { // ERROR_INSTALL_BOOTCODE, - "Ssteemikettale ei nnestunud paigaldada FAT alglaadimiskoodi.", + "Ssteemikettale ei nnestunud paigaldada %S alglaadimiskoodi.", "ENTER = Taaskivita arvuti" }, { diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index 0bae4fdd952..2f7fb18ed37 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -1489,7 +1489,7 @@ MUI_ERROR frFRErrorEntries[] = }, { // ERROR_WRITE_BOOT, - "Echec de l'installation du code de dmarrage FAT sur la partition systme.", + "Echec de l'installation du code de dmarrage %S sur la partition systme.", "ENTRE = Redmarrer l'ordinateur" }, { @@ -1540,7 +1540,7 @@ MUI_ERROR frFRErrorEntries[] = }, { // ERROR_INSTALL_BOOTCODE, - "Echec de l'installation du code de dmarrage FAT sur la partition systme.", + "Echec de l'installation du code de dmarrage %S sur la partition systme.", "ENTRE = Redmarrer l'ordinateur" }, { diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index 7a5e583a2fe..68d91a72c5e 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -1471,7 +1471,7 @@ MUI_ERROR heILErrorEntries[] = }, { // ERROR_WRITE_BOOT, - "Setup failed to install FAT bootcode on the system partition.", + "Setup failed to install %S bootcode on the system partition.", "ENTER = Reboot computer" }, { @@ -1522,7 +1522,7 @@ MUI_ERROR heILErrorEntries[] = }, { // ERROR_INSTALL_BOOTCODE, - "Setup failed to install the FAT bootcode on the system partition.", + "Setup failed to install the %S bootcode on the system partition.", "ENTER = Reboot computer" }, { diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index 0a98d31cb3a..c5784b9cbc6 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -1477,7 +1477,7 @@ MUI_ERROR itITErrorEntries[] = }, { // ERROR_WRITE_BOOT, - "Impossibile installare il bootcode FAT nella partizione di sistema.", + "Impossibile installare il bootcode %S nella partizione di sistema.", "INVIO = Riavviare il computer" }, { @@ -1528,7 +1528,7 @@ MUI_ERROR itITErrorEntries[] = }, { // ERROR_INSTALL_BOOTCODE, - "Impossibile installare il bootcode FAT nella partizione di sistema.", + "Impossibile installare il bootcode %S nella partizione di sistema.", "INVIO = Riavviare il computer" }, { diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index 94809539b38..39e417155e5 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -1472,7 +1472,7 @@ MUI_ERROR jaJPErrorEntries[] = }, { // ERROR_WRITE_BOOT, - "ı ߰è ޮ FAT ްĺ ݽİ ߲ ϼ", + "ı ߰è ޮ %S ްĺ ݽİ ߲ ϼ", "ENTER = ߭ ޳" }, { @@ -1523,7 +1523,7 @@ MUI_ERROR jaJPErrorEntries[] = }, { // ERROR_INSTALL_BOOTCODE, - "ı ߰è ޮ FAT ް ں ݽİ ߲ ϼ", + "ı ߰è ޮ %S ް ں ݽİ ߲ ϼ", "ENTER = ߭ ޳" }, { diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index d1128d9f721..c9ce1a5d1d8 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -1480,7 +1480,7 @@ MUI_ERROR ltLTErrorEntries[] = }, { // ERROR_WRITE_BOOT, - "Setup failed to install FAT bootcode on the system partition.", + "Setup failed to install %S bootcode on the system partition.", "ENTER = Reboot computer" }, { @@ -1531,7 +1531,7 @@ MUI_ERROR ltLTErrorEntries[] = }, { // ERROR_INSTALL_BOOTCODE, - "Setup failed to install the FAT bootcode on the system partition.", + "Setup failed to install the %S bootcode on the system partition.", "ENTER = Reboot computer" }, { diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index 88abb235e6e..426769f0f74 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -1371,7 +1371,7 @@ MUI_ERROR msMYErrorEntries[] = }, { // ERROR_WRITE_BOOT, - "Persediaan gagal memasang bootcode FAT pada partition sistem.", + "Persediaan gagal memasang bootcode %S pada partition sistem.", "ENTER = Memulakan semula komputer" }, { @@ -1422,7 +1422,7 @@ MUI_ERROR msMYErrorEntries[] = }, { // ERROR_INSTALL_BOOTCODE, - "Persediaan gagal memasang bootcode FAT pada partition sistem.", + "Persediaan gagal memasang bootcode %S pada partition sistem.", "ENTER = Memulakan semula komputer" }, { diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index 2a836cc042d..7cee9425bd2 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -1493,7 +1493,7 @@ MUI_ERROR nlNLErrorEntries[] = }, { // ERROR_WRITE_BOOT, - "Setup kan de FAT bootcode op de systeempartitie niet installeren.", + "Setup kan de %S bootcode op de systeempartitie niet installeren.", "ENTER = Computer opnieuw opstarten" }, { @@ -1545,7 +1545,7 @@ MUI_ERROR nlNLErrorEntries[] = }, { // ERROR_INSTALL_BOOTCODE, - "Setup kan de FAT bootcode op de systeempartitie niet installeren.", + "Setup kan de %S bootcode op de systeempartitie niet installeren.", "ENTER = Computer opnieuw opstarten" }, { diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index 3a86222683e..99a9e051d2b 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -1480,7 +1480,7 @@ MUI_ERROR plPLErrorEntries[] = }, { // ERROR_WRITE_BOOT, - "Nieudane zapisanie FAT bootcode na partycji systemowej.", + "Nieudane zapisanie %S bootcode na partycji systemowej.", "ENTER = Restart komputera" }, { @@ -1531,7 +1531,7 @@ MUI_ERROR plPLErrorEntries[] = }, { // ERROR_INSTALL_BOOTCODE, - "Nieudana instalacja FAT bootcode na partycji systemowej.", + "Nieudana instalacja %S bootcode na partycji systemowej.", "ENTER = Restart komputera" }, { diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index 69f5b4ff46e..e24869d71a5 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -1502,7 +1502,7 @@ MUI_ERROR ptBRErrorEntries[] = }, { // ERROR_WRITE_BOOT, - "Erro ao escrever o cdigo de inicializao na partio do sistema.\n", + "Erro ao escrever o cdigo de inicializao %S na partio do sistema.\n", "ENTER=Reiniciar" }, { @@ -1553,7 +1553,7 @@ MUI_ERROR ptBRErrorEntries[] = }, { // ERROR_INSTALL_BOOTCODE, - "Erro ao instalar o cdigo de inicializao na partio do sistema.", + "Erro ao instalar o cdigo de inicializao %S na partio do sistema.", "ENTER=Reiniciar" }, { diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index 398a307c7a1..dafe4a2da54 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -1504,7 +1504,7 @@ MUI_ERROR roROErrorEntries[] = }, { // ERROR_WRITE_BOOT, - "Eec la instalarea codului FAT de iniializare\n" + "Eec la instalarea codului %S de iniializare\n" "pe partiia de sistem.", "ENTER = Repornire calculator" }, @@ -1562,7 +1562,7 @@ MUI_ERROR roROErrorEntries[] = }, { // ERROR_INSTALL_BOOTCODE, - "Eec la instalarea codului FAT de iniializare\n" + "Eec la instalarea codului %S de iniializare\n" "pe partiia de sistem.", "ENTER = Repornire calculator" }, diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index f779c897ca8..ca472f84a11 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -1471,7 +1471,7 @@ MUI_ERROR ruRUErrorEntries[] = }, { // ERROR_WRITE_BOOT, - " 㤠 ⠭ 稪 FAT ⥬ ࠧ.", + " 㤠 ⠭ 稪 %S ⥬ ࠧ.", "ENTER = १㧪" }, { @@ -1522,7 +1522,7 @@ MUI_ERROR ruRUErrorEntries[] = }, { // ERROR_INSTALL_BOOTCODE, - " 㤠 ⠭ 稪 FAT ⥬ ࠧ.", + " 㤠 ⠭ 稪 %S ⥬ ࠧ.", "ENTER = १㧪" }, { diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h index 54d1ac70086..02266fa61b9 100644 --- a/base/setup/usetup/lang/sk-SK.h +++ b/base/setup/usetup/lang/sk-SK.h @@ -1478,7 +1478,7 @@ MUI_ERROR skSKErrorEntries[] = }, { // ERROR_WRITE_BOOT, - "Intaltoru sa nepodarilo naintalova zavdzac kd sborovho\n" + "Intaltoru sa nepodarilo naintalova %S zavdzac kd sborovho\n" "systmu FAT na systmov partciu.", "ENTER = Retart potaa" }, @@ -1531,7 +1531,7 @@ MUI_ERROR skSKErrorEntries[] = }, { // ERROR_INSTALL_BOOTCODE, - "Intaltoru sa nepodarilo naintalova zavdzac kd sborovho\n" + "Intaltoru sa nepodarilo naintalova %S zavdzac kd sborovho\n" "systmu FAT na systmov partciu.", "ENTER = Retart potaa" }, diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index 9dcc7ef2420..23dc0a94c4d 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -1476,7 +1476,7 @@ MUI_ERROR sqALErrorEntries[] = }, { // ERROR_WRITE_BOOT, - "Instalimi deshtoj n instalimin e FAT bootcode n particionin e sistemit.", + "Instalimi deshtoj n instalimin e %S bootcode n particionin e sistemit.", "ENTER = Ristarto kompjuterin" }, { @@ -1527,7 +1527,7 @@ MUI_ERROR sqALErrorEntries[] = }, { // ERROR_INSTALL_BOOTCODE, - "Instalimi dshtoj n instalimin e FAT bootcode n particionin e sistemit.", + "Instalimi dshtoj n instalimin e %S bootcode n particionin e sistemit.", "ENTER = Ristarto kompjuterin" }, { diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index dbb6d40ef98..f477fca2dcd 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -1478,7 +1478,7 @@ MUI_ERROR svSEErrorEntries[] = }, { // ERROR_WRITE_BOOT, - "Setup misslyckades installera FAT bootkod p systempartitionen.", + "Setup misslyckades installera %S bootkod p systempartitionen.", "ENTER = Starta om datorn" }, { @@ -1529,7 +1529,7 @@ MUI_ERROR svSEErrorEntries[] = }, { // ERROR_INSTALL_BOOTCODE, - "Setup misslyckades att installera FAT bootkoden p systempartitionen.", + "Setup misslyckades att installera %S bootkoden p systempartitionen.", "ENTER = Starta om datorn" }, { diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index 01ff1d037b9..b502e76f297 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -1450,7 +1450,7 @@ MUI_ERROR trTRErrorEntries[] = }, { // ERROR_WRITE_BOOT, - "Kur, dizge blmne FAT n ykleme kodunu kuramad.", + "Kur, dizge blmne %S n ykleme kodunu kuramad.", "Giri = Bilgisayar Yeniden Balat" }, { @@ -1501,7 +1501,7 @@ MUI_ERROR trTRErrorEntries[] = }, { // ERROR_INSTALL_BOOTCODE, - "Kur, dizge blm zerinde FAT n ykleme kodunu kurmada baarsz oldu.", + "Kur, dizge blm zerinde %S n ykleme kodunu kurmada baarsz oldu.", "Giri = Bilgisayar Yeniden Balat" }, { diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index 6a539921821..04dbf9ef8dc 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -1478,7 +1478,7 @@ MUI_ERROR ukUAErrorEntries[] = }, { // ERROR_WRITE_BOOT, - " ⠭ ⠦㢠쭨 FAT ⥬ ஧i.", + " ⠭ ⠦㢠쭨 %S ⥬ ஧i.", "ENTER = १⠦ '" }, { @@ -1529,7 +1529,7 @@ MUI_ERROR ukUAErrorEntries[] = }, { // ERROR_INSTALL_BOOTCODE, - " ⠭ ⠦㢠쭨 FAT ⥬ ஧i.", + " ⠭ ⠦㢠쭨 %S ⥬ ஧i.", "ENTER = १⠦ '" }, { diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index ae5b86be94e..f16d6512b73 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -4105,13 +4105,15 @@ BootLoaderHarddiskVbrPage(PINPUT_RECORD Ir) { NTSTATUS Status; + // FIXME! We must not use the partition type, but instead use the partition FileSystem!! Status = InstallVBRToPartition(&USetupData.SystemRootPath, &USetupData.SourceRootPath, &USetupData.DestinationArcPath, PartitionList->SystemPartition->PartitionType); if (!NT_SUCCESS(Status)) { - MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER, + PartitionList->SystemPartition->FileSystem->FileSystemName); return QUIT_PAGE; } @@ -4140,13 +4142,15 @@ BootLoaderHarddiskMbrPage(PINPUT_RECORD Ir) WCHAR DestinationDevicePathBuffer[MAX_PATH]; /* Step 1: Write the VBR */ + // FIXME! We must not use the partition type, but instead use the partition FileSystem!! Status = InstallVBRToPartition(&USetupData.SystemRootPath, &USetupData.SourceRootPath, &USetupData.DestinationArcPath, PartitionList->SystemPartition->PartitionType); if (!NT_SUCCESS(Status)) { - MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER, + PartitionList->SystemPartition->FileSystem->FileSystemName); return QUIT_PAGE; } @@ -4160,7 +4164,7 @@ BootLoaderHarddiskMbrPage(PINPUT_RECORD Ir) if (!NT_SUCCESS(Status)) { DPRINT1("InstallMbrBootCodeToDisk() failed (Status %lx)\n", Status); - MUIDisplayError(ERROR_INSTALL_BOOTCODE, Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_INSTALL_BOOTCODE, Ir, POPUP_WAIT_ENTER, L"MBR"); return QUIT_PAGE; }