[USETUP] Display the chosen filesystem name in case of bootcode installation failure.

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...
2025-04-05 13:11:22 +00:00 · 2018-11-08 00:54:59 +01:00 · 2018-11-08 00:54:59 +01:00 · 073c09e491
commit 073c09e491
parent 4c6370de16
26 changed files with 57 additions and 53 deletions
--- 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,
-        "<EFBFBD>¥γα―¥θ® α« £ ¥   ®§ η Ά θ § ―¨α (bootcode) §  FAT Ά α¨αβ¥¬¨ο ¤ο«.",
+        "<EFBFBD>¥γα―¥θ® α« £ ¥   ®§ η Ά θ § ―¨α (bootcode) §  %S Ά α¨αβ¥¬¨ο ¤ο«.",
        "ENTER = <20>à¥§ ¯ãáª ¥   ª®¬¯îâêà "
    },
    {
@ -1531,7 +1531,7 @@ MUI_ERROR bgBGErrorEntries[] =
    {
        // ERROR_INSTALL_BOOTCODE,
        //"Setup failed to install the FAT bootcode on the system partition.",
-        "<EFBFBD>¥γα―¥θ® α« £ ¥   ®΅γΆ ι¨ο <20>®¤ §  FAT   α¨αβ¥¬¨ο ¤ο«.",
+        "<EFBFBD>¥γα―¥θ® α« £ ¥   ®΅γΆ ι¨ο <20>®¤ §  %S   α¨αβ¥¬¨ο ¤ο«.",
        "ENTER = <20>à¥§ ¯ãáª ¥   ª®¬¯îâêà "
    },
    {
--- 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"
    },
    {
--- 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,
-        "Nepodaýilo se nainstalovat FAT zavadŘź na syst‚mově oddˇl.",
+        "Nepodaýilo se nainstalovat %S zavadŘź na syst‚mově oddˇl.",
        "ENTER = Restartovat poŸ¡taŸ"
    },
    {
@ -1528,7 +1528,7 @@ MUI_ERROR csCZErrorEntries[] =
    },
    {
        // ERROR_INSTALL_BOOTCODE,
-        "Nepodaýilo se nainstalovat FAT zavadŘź na syst‚mově oddˇl.",
+        "Nepodaýilo se nainstalovat %S zavadŘź na syst‚mově oddˇl.",
        "ENTER = Restartovat poŸ¡taŸ"
    },
    {
--- 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"
    },
    {
--- 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"
    },
    {
--- 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 = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã"
    },
    {
--- 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"
    },
    {
--- 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 c¢digo de inicio FAT en la partici¢n del sistema.",
+        "El instalador fall¢ al instalar el c¢digo de inicio %S en la partici¢n del sistema.",
        "INTRO = Reiniciar el equipo"
    },
    {
@ -1525,7 +1525,7 @@ MUI_ERROR esESErrorEntries[] =
    },
    {
        // ERROR_INSTALL_BOOTCODE,
-        "El instalador fall¢ al instalar el c¢digo de inicio FAT en la partici¢n del sistema.",
+        "El instalador fall¢ al instalar el c¢digo de inicio %S en la partici¢n del sistema.",
        "INTRO = Reiniciar el equipo"
    },
    {
--- 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,
-        "S<EFBFBD>steemikettale ei ännestunud kirjutada FAT alglaadimiskoodi.",
+        "S<EFBFBD>steemikettale ei ännestunud kirjutada %S alglaadimiskoodi.",
        "ENTER = Taask„ivita arvuti"
    },
    {
@ -1523,7 +1523,7 @@ MUI_ERROR etEEErrorEntries[] =
    },
    {
        // ERROR_INSTALL_BOOTCODE,
-        "S<EFBFBD>steemikettale ei ännestunud paigaldada FAT alglaadimiskoodi.",
+        "S<EFBFBD>steemikettale ei ännestunud paigaldada %S alglaadimiskoodi.",
        "ENTER = Taask„ivita arvuti"
    },
    {
--- 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 d‚marrage FAT sur la partition systŠme.",
+        "Echec de l'installation du code de d‚marrage %S sur la partition systŠme.",
        "ENTR<EFBFBD>E = Red‚marrer l'ordinateur"
    },
    {
@ -1540,7 +1540,7 @@ MUI_ERROR frFRErrorEntries[] =
    },
    {
        // ERROR_INSTALL_BOOTCODE,
-        "Echec de l'installation du code de d‚marrage FAT sur la partition systŠme.",
+        "Echec de l'installation du code de d‚marrage %S sur la partition systŠme.",
        "ENTR<EFBFBD>E = Red‚marrer l'ordinateur"
    },
    {
--- 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"
    },
    {
--- 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"
    },
    {
--- 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 = ºÝËß°ÀÉ »²·ÄÞ³"
    },
    {
--- 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"
    },
    {
--- 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"
    },
    {
--- 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"
    },
    {
--- 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"
    },
    {
--- 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 c¢digo de inicializa‡Æo na parti‡Æo do sistema.\n",
+        "Erro ao escrever o c¢digo de inicializa‡Æo %S na parti‡Æo do sistema.\n",
        "ENTER=Reiniciar"
    },
    {
@ -1553,7 +1553,7 @@ MUI_ERROR ptBRErrorEntries[] =
    },
    {
        // ERROR_INSTALL_BOOTCODE,
-        "Erro ao instalar o c¢digo de inicializa‡Æo na parti‡Æo do sistema.",
+        "Erro ao instalar o c¢digo de inicializa‡Æo %S na parti‡Æo do sistema.",
        "ENTER=Reiniciar"
    },
    {
--- 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,
-        "Eşec la instalarea codului FAT de iniţializare\n"
+        "Eşec la instalarea codului %S de iniţializare\n"
        "pe partiþia de sistem.",
        "ENTER = Repornire calculator"
    },
@ -1562,7 +1562,7 @@ MUI_ERROR roROErrorEntries[] =
    },
    {
        // ERROR_INSTALL_BOOTCODE,
-        "Eşec la instalarea codului FAT de iniţializare\n"
+        "Eşec la instalarea codului %S de iniţializare\n"
        "pe partiþia de sistem.",
        "ENTER = Repornire calculator"
    },
--- 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,
-        "<EFBFBD>¥ γ¤ «®αμ γαβ ®Ά¨βμ § £ΰγ§η¨<CEB7> FAT   α¨αβ¥¬λ© ΰ §¤¥«.",
+        "<EFBFBD>¥ γ¤ «®αμ γαβ ®Ά¨βμ § £ΰγ§η¨<CEB7> %S   α¨αβ¥¬λ© ΰ §¤¥«.",
        "ENTER = <20>ェ<EFBFBD><E382A7>礑<EFBFBD><E7A491>"
    },
    {
@ -1522,7 +1522,7 @@ MUI_ERROR ruRUErrorEntries[] =
    },
    {
        // ERROR_INSTALL_BOOTCODE,
-        "<EFBFBD>¥ γ¤ «®αμ γαβ ®Ά¨βμ § £ΰγ§η¨<CEB7> FAT   α¨αβ¥¬λ© ΰ §¤¥«.",
+        "<EFBFBD>¥ γ¤ «®αμ γαβ ®Ά¨βμ § £ΰγ§η¨<CEB7> %S   α¨αβ¥¬λ© ΰ §¤¥«.",
        "ENTER = <20>ェ<EFBFBD><E382A7>礑<EFBFBD><E7A491>"
    },
    {
--- 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,
-        "Inçtal toru sa nepodarilo nainçtalovaś zav dzacˇ k˘d sŁborov‚ho\n"
+        "Inçtal toru sa nepodarilo nainçtalovaś %S zav dzacˇ k˘d sŁborov‚ho\n"
        "syst‚mu FAT na syst‚mov£ part¡ciu.",
        "ENTER = Reçtart poŸ¡taŸa"
    },
@ -1531,7 +1531,7 @@ MUI_ERROR skSKErrorEntries[] =
    },
    {
        // ERROR_INSTALL_BOOTCODE,
-        "Inçtal toru sa nepodarilo nainçtalovaś zav dzacˇ k˘d sŁborov‚ho\n"
+        "Inçtal toru sa nepodarilo nainçtalovaś %S zav dzacˇ k˘d sŁborov‚ho\n"
        "syst‚mu FAT na syst‚mov£ part¡ciu.",
        "ENTER = Reçtart poŸ¡taŸa"
    },
--- 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 d‰shtoj n‰ instalimin e FAT bootcode n‰ particionin e sistemit.",
+        "Instalimi d‰shtoj n‰ instalimin e %S bootcode n‰ particionin e sistemit.",
        "ENTER = Ristarto kompjuterin"
    },
    {
--- 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"
    },
    {
--- 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 b”l<E2809D>m<EFBFBD>ne FAT ”n y<>kleme kodunu kuramad<61>.",
+        "Kur, dizge b”l<E2809D>m<EFBFBD>ne %S ”n y<>kleme kodunu kuramad<61>.",
        "GiriŸ = Bilgisayar<61> Yeniden BaŸlat"
    },
    {
@ -1501,7 +1501,7 @@ MUI_ERROR trTRErrorEntries[] =
    },
    {
        // ERROR_INSTALL_BOOTCODE,
-        "Kur, dizge b”l<E2809D>m<EFBFBD> <20>zerinde FAT ”n y<>kleme kodunu kurmada baŸar<61>s<EFBFBD>z oldu.",
+        "Kur, dizge b”l<E2809D>m<EFBFBD> <20>zerinde %S ”n y<>kleme kodunu kurmada baŸar<61>s<EFBFBD>z oldu.",
        "GiriŸ = Bilgisayar<61> Yeniden BaŸlat"
    },
    {
--- 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,
-        "<EFBFBD>¥ ¢¤ «®áì ¢áâ ®¢¨â¨ § ¢ â ¦ã¢ «ì¨© ª®¤ FAT   á¨â¥¬¨© à®§¤i«.",
+        "<EFBFBD>¥ ¢¤ «®áì ¢áâ ®¢¨â¨ § ¢ â ¦ã¢ «ì¨© ª®¤ %S   á¨â¥¬¨© à®§¤i«.",
        "ENTER = <20>¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à"
    },
    {
@ -1529,7 +1529,7 @@ MUI_ERROR ukUAErrorEntries[] =
    },
    {
        // ERROR_INSTALL_BOOTCODE,
-        "<EFBFBD>¥ ¢¤ «®áì ¢áâ ®¢¨â¨ § ¢ â ¦ã¢ «ì¨© ª®¤ FAT   á¨â¥¬¨© à®§¤i«.",
+        "<EFBFBD>¥ ¢¤ «®áì ¢áâ ®¢¨â¨ § ¢ â ¦ã¢ «ì¨© ª®¤ %S   á¨â¥¬¨© à®§¤i«.",
        "ENTER = <20>¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à"
    },
    {
--- 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;
    }