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,
-        "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Ÿ"
     },
     {
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 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"
     },
     {
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,
-        "S�steemikettale ei ännestunud kirjutada FAT alglaadimiskoodi.",
+        "S�steemikettale ei ännestunud kirjutada %S alglaadimiskoodi.",
         "ENTER = Taask„ivita arvuti"
     },
     {
@@ -1523,7 +1523,7 @@ MUI_ERROR etEEErrorEntries[] =
     },
     {
         // ERROR_INSTALL_BOOTCODE,
-        "S�steemikettale ei ännestunud paigaldada FAT alglaadimiskoodi.",
+        "S�steemikettale ei ännestunud paigaldada %S alglaadimiskoodi.",
         "ENTER = Taask„ivita 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 d‚marrage FAT sur la partition systŠme.",
+        "Echec de l'installation du code de d‚marrage %S sur la partition systŠme.",
         "ENTR�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�E = Red‚marrer 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 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"
     },
     {
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,
-        "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"
     },
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,
-        "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"
     },
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 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"
     },
     {
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 b”l�m�ne FAT ”n y�kleme kodunu kuramad�.",
+        "Kur, dizge b”l�m�ne %S ”n y�kleme kodunu kuramad�.",
         "GiriŸ = Bilgisayar� Yeniden BaŸlat"
     },
     {
@@ -1501,7 +1501,7 @@ MUI_ERROR trTRErrorEntries[] =
     },
     {
         // ERROR_INSTALL_BOOTCODE,
-        "Kur, dizge b”l�m� �zerinde FAT ”n y�kleme kodunu kurmada baŸar�s�z oldu.",
+        "Kur, dizge b”l�m� �zerinde %S ”n y�kleme kodunu kurmada baŸar�s�z oldu.",
         "GiriŸ = Bilgisayar� Yeniden BaŸlat"
     },
     {
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;
     }