[USETUP] Localize the rest of the hardcoded error message strings

diff --git a/base/setup/lib/errorcode.h b/base/setup/lib/errorcode.h
index a7fd84e..48f9acb 100644 (file)
--- a/base/setup/lib/errorcode.h
+++ b/base/setup/lib/errorcode.h
@@ -16,6 +16,9 @@ typedef enum _ERROR_NUMBER
 {
     NOT_AN_ERROR = 0,   // ERROR_SUCCESS,
     ERROR_NOT_INSTALLED,
 {
     NOT_AN_ERROR = 0,   // ERROR_SUCCESS,
     ERROR_NOT_INSTALLED,

+    ERROR_NO_BUILD_PATH,
+    ERROR_SOURCE_PATH,
+    ERROR_SOURCE_DIR,

     ERROR_NO_HDD,
     ERROR_NO_SOURCE_DRIVE,
     ERROR_LOAD_TXTSETUPSIF,
     ERROR_NO_HDD,
     ERROR_NO_SOURCE_DRIVE,
     ERROR_LOAD_TXTSETUPSIF,

diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h
index 7c44315..244d2d3 100644 (file)
--- a/base/setup/usetup/lang/bg-BG.h
+++ b/base/setup/usetup/lang/bg-BG.h
@@ -1484,6 +1484,21 @@ MUI_ERROR bgBGErrorEntries[] =
         "  \x07  \207\240 \250\247\345\256\244 \255\240\342\250\341\255\245\342\245 F3.",
         "F3 = \210\247\345\256\244 ENTER = \217\340\256\244\352\253\246\240\242\240\255\245"
     },
         "  \x07  \207\240 \250\247\345\256\244 \255\240\342\250\341\255\245\342\245 F3.",
         "F3 = \210\247\345\256\244 ENTER = \217\340\256\244\352\253\246\240\242\240\255\245"
     },

+    {
+        // ERROR_NO_BUILD_PATH
+        "Failed to build the installation paths for the ReactOS installation directory!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_PATH
+        "You cannot delete the partition containing the installation source!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_DIR
+        "You cannot install ReactOS within the installation source directory!\n"
+        "ENTER = Reboot computer"
+    },

     {
         // ERROR_NO_HDD
         "\215\240\341\342\340\256\251\242\240\347\352\342 \255\245 \255\240\254\245\340\250 \342\242\352\340\244 \244\250\341\252.\n",
     {
         // ERROR_NO_HDD
         "\215\240\341\342\340\256\251\242\240\347\352\342 \255\245 \255\240\254\245\340\250 \342\242\352\340\244 \244\250\341\252.\n",

diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h
index 8bb8b75..03746a6 100644 (file)
--- a/base/setup/usetup/lang/bn-BD.h
+++ b/base/setup/usetup/lang/bn-BD.h
@@ -1473,6 +1473,21 @@ MUI_ERROR bnBDErrorEntries[] =
         "  \x07  Press F3 to quit Setup.",
         "F3 = Quit  ENTER = Continue"
     },
         "  \x07  Press F3 to quit Setup.",
         "F3 = Quit  ENTER = Continue"
     },

+    {
+        // ERROR_NO_BUILD_PATH
+        "Failed to build the installation paths for the ReactOS installation directory!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_PATH
+        "You cannot delete the partition containing the installation source!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_DIR
+        "You cannot install ReactOS within the installation source directory!\n"
+        "ENTER = Reboot computer"
+    },

     {
         // ERROR_NO_HDD
         "Setup could not find a harddisk.\n",
     {
         // ERROR_NO_HDD
         "Setup could not find a harddisk.\n",

diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h
index 4c8e661..4d3a719 100644 (file)
--- a/base/setup/usetup/lang/cs-CZ.h
+++ b/base/setup/usetup/lang/cs-CZ.h
@@ -1482,6 +1482,21 @@ MUI_ERROR csCZErrorEntries[] =
         "  \x07  Stisknut\241m F3 ukon\237\241te instalaci.",
         "F3 = Ukon\237it  ENTER = Pokra\237ovat"
     },
         "  \x07  Stisknut\241m F3 ukon\237\241te instalaci.",
         "F3 = Ukon\237it  ENTER = Pokra\237ovat"
     },

+    {
+        // ERROR_NO_BUILD_PATH
+        "Failed to build the installation paths for the ReactOS installation directory!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_PATH
+        "You cannot delete the partition containing the installation source!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_DIR
+        "You cannot install ReactOS within the installation source directory!\n"
+        "ENTER = Reboot computer"
+    },

     {
         // ERROR_NO_HDD
         "Instalace nedok\240zala naj\241t harddisk.\n",
     {
         // ERROR_NO_HDD
         "Instalace nedok\240zala naj\241t harddisk.\n",

diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h
index 3aee65b..e33dad8 100644 (file)
--- a/base/setup/usetup/lang/da-DK.h
+++ b/base/setup/usetup/lang/da-DK.h
@@ -1489,6 +1489,21 @@ MUI_ERROR daDKErrorEntries[] =
         "  \x07  Tryk p\206 F3 afslutte installationen.",
         "F3 = Afslut  ENTER = Forts\221t"
     },
         "  \x07  Tryk p\206 F3 afslutte installationen.",
         "F3 = Afslut  ENTER = Forts\221t"
     },

+    {
+        // ERROR_NO_BUILD_PATH
+        "Failed to build the installation paths for the ReactOS installation directory!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_PATH
+        "You cannot delete the partition containing the installation source!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_DIR
+        "You cannot install ReactOS within the installation source directory!\n"
+        "ENTER = Reboot computer"
+    },

     {
         // ERROR_NO_HDD
         "Installationen kunne ikke finde en harddisk.\n",
     {
         // ERROR_NO_HDD
         "Installationen kunne ikke finde en harddisk.\n",

diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h
index eab9c9b..08f8a3d 100644 (file)
--- a/base/setup/usetup/lang/de-DE.h
+++ b/base/setup/usetup/lang/de-DE.h
@@ -1476,6 +1476,21 @@ MUI_ERROR deDEErrorEntries[] =
         "  \x07  Dr\201cken Sie F3, um die Installation zu beenden.",
         "F3 = Beenden  EINGABETASTE = Fortsetzen"
     },
         "  \x07  Dr\201cken Sie F3, um die Installation zu beenden.",
         "F3 = Beenden  EINGABETASTE = Fortsetzen"
     },

+    {
+        // ERROR_NO_BUILD_PATH
+        "Failed to build the installation paths for the ReactOS installation directory!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_PATH
+        "You cannot delete the partition containing the installation source!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_DIR
+        "You cannot install ReactOS within the installation source directory!\n"
+        "ENTER = Reboot computer"
+    },

     {
         // ERROR_NO_HDD
         "Es konnte keine Festplatte gefunden werden.\n",
     {
         // ERROR_NO_HDD
         "Es konnte keine Festplatte gefunden werden.\n",

diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h
index fc2d6d6..69e5baa 100644 (file)
--- a/base/setup/usetup/lang/el-GR.h
+++ b/base/setup/usetup/lang/el-GR.h
@@ -1500,6 +1500,21 @@ MUI_ERROR elGRErrorEntries[] =
         "  \x07  \217\230\253\343\251\253\234 F3 \232\240\230 \244\230 \230\247\246\256\340\250\343\251\234\253\234 \230\247\346 \253\236\244 \204\232\241\230\253\341\251\253\230\251\236.",
         "F3 = \200\247\246\256\351\250\236\251\236  ENTER = \221\254\244\342\256\234\240\230"
     },
         "  \x07  \217\230\253\343\251\253\234 F3 \232\240\230 \244\230 \230\247\246\256\340\250\343\251\234\253\234 \230\247\346 \253\236\244 \204\232\241\230\253\341\251\253\230\251\236.",
         "F3 = \200\247\246\256\351\250\236\251\236  ENTER = \221\254\244\342\256\234\240\230"
     },

+    {
+        // ERROR_NO_BUILD_PATH
+        "Failed to build the installation paths for the ReactOS installation directory!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_PATH
+        "You cannot delete the partition containing the installation source!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_DIR
+        "You cannot install ReactOS within the installation source directory!\n"
+        "ENTER = Reboot computer"
+    },

     {
         // ERROR_NO_HDD
         "\206 \234\232\241\230\253\341\251\253\230\251\236 \233\234 \243\247\346\250\234\251\234 \244\230 \231\250\234\240 \241\341\247\246\240\246\244 \251\241\242\236\250\346 \233\345\251\241\246.\n",
     {
         // ERROR_NO_HDD
         "\206 \234\232\241\230\253\341\251\253\230\251\236 \233\234 \243\247\346\250\234\251\234 \244\230 \231\250\234\240 \241\341\247\246\240\246\244 \251\241\242\236\250\346 \233\345\251\241\246.\n",

diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h
index 63faa0f..1ddbbad 100644 (file)
--- a/base/setup/usetup/lang/en-US.h
+++ b/base/setup/usetup/lang/en-US.h
@@ -1474,6 +1474,21 @@ MUI_ERROR enUSErrorEntries[] =
         "  \x07  Press F3 to quit Setup.",
         "F3 = Quit  ENTER = Continue"
     },
         "  \x07  Press F3 to quit Setup.",
         "F3 = Quit  ENTER = Continue"
     },

+    {
+        // ERROR_NO_BUILD_PATH
+        "Failed to build the installation paths for the ReactOS installation directory!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_PATH
+        "You cannot delete the partition containing the installation source!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_DIR
+        "You cannot install ReactOS within the installation source directory!\n"
+        "ENTER = Reboot computer"
+    },

     {
         // ERROR_NO_HDD
         "Setup could not find a harddisk.\n",
     {
         // ERROR_NO_HDD
         "Setup could not find a harddisk.\n",

diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h
index 7ab27f9..57cb10c 100644 (file)
--- a/base/setup/usetup/lang/es-ES.h
+++ b/base/setup/usetup/lang/es-ES.h
@@ -1479,6 +1479,21 @@ MUI_ERROR esESErrorEntries[] =
         "  \x07  Presione F3 para abandonar el instalador.",
         "F3 = Salir  INTRO = Continuar"
     },
         "  \x07  Presione F3 para abandonar el instalador.",
         "F3 = Salir  INTRO = Continuar"
     },

+    {
+        // ERROR_NO_BUILD_PATH
+        "Failed to build the installation paths for the ReactOS installation directory!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_PATH
+        "You cannot delete the partition containing the installation source!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_DIR
+        "You cannot install ReactOS within the installation source directory!\n"
+        "ENTER = Reboot computer"
+    },

     {
         // ERROR_NO_HDD
         "El instalador no pudo encontrar un disco duro.\n",
     {
         // ERROR_NO_HDD
         "El instalador no pudo encontrar un disco duro.\n",

diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h
index b0ef95d..9173c6a 100644 (file)
--- a/base/setup/usetup/lang/et-EE.h
+++ b/base/setup/usetup/lang/et-EE.h
@@ -1477,6 +1477,21 @@ MUI_ERROR etEEErrorEntries[] =
         "  \x07  Vajuta F3 paigalduse seiskamiseks.",
         "F3 = V\204lju  ENTER = J\204tka"
     },
         "  \x07  Vajuta F3 paigalduse seiskamiseks.",
         "F3 = V\204lju  ENTER = J\204tka"
     },

+    {
+        // ERROR_NO_BUILD_PATH
+        "Failed to build the installation paths for the ReactOS installation directory!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_PATH
+        "You cannot delete the partition containing the installation source!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_DIR
+        "You cannot install ReactOS within the installation source directory!\n"
+        "ENTER = Reboot computer"
+    },

     {
         // ERROR_NO_HDD
         "K\344vaketast ei leitud.\n",
     {
         // ERROR_NO_HDD
         "K\344vaketast ei leitud.\n",

diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h
index 9eea852..3c5b2bf 100644 (file)
--- a/base/setup/usetup/lang/fr-FR.h
+++ b/base/setup/usetup/lang/fr-FR.h
@@ -1494,6 +1494,21 @@ MUI_ERROR frFRErrorEntries[] =
         "  \x07  Appuyer sur F3 pour quitter Setup.",
         "F3 = Quitter  ENTR\220E = Continuer"
     },
         "  \x07  Appuyer sur F3 pour quitter Setup.",
         "F3 = Quitter  ENTR\220E = Continuer"
     },

+    {
+        // ERROR_NO_BUILD_PATH
+        "Failed to build the installation paths for the ReactOS installation directory!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_PATH
+        "You cannot delete the partition containing the installation source!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_DIR
+        "You cannot install ReactOS within the installation source directory!\n"
+        "ENTER = Reboot computer"
+    },

     {
         // ERROR_NO_HDD
         "Setup n'a pu trouver un disque dur.\n",
     {
         // ERROR_NO_HDD
         "Setup n'a pu trouver un disque dur.\n",

diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h
index 3bf458b..a655070 100644 (file)
--- a/base/setup/usetup/lang/he-IL.h
+++ b/base/setup/usetup/lang/he-IL.h
@@ -1478,6 +1478,21 @@ MUI_ERROR heILErrorEntries[] =
         "  \x07  .\204\220\227\232\204\204\216 \232\200\226\214 \211\203\213 F3 \225\207\214",
         "\204\220\227\232\204 \214\205\210\211\201 = F3  \212\231\216\204 = ENTER"
     },
         "  \x07  .\204\220\227\232\204\204\216 \232\200\226\214 \211\203\213 F3 \225\207\214",
         "\204\220\227\232\204 \214\205\210\211\201 = F3  \212\231\216\204 = ENTER"
     },

+    {
+        // ERROR_NO_BUILD_PATH
+        "Failed to build the installation paths for the ReactOS installation directory!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_PATH
+        "You cannot delete the partition containing the installation source!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_DIR
+        "You cannot install ReactOS within the installation source directory!\n"
+        "ENTER = Reboot computer"
+    },

     {
         // ERROR_NO_HDD
         ".\207\211\231\227 \217\220\205\213 \204\200\226\216 \200\214 \204\220\227\232\204\204 \232\211\220\213\232\n",
     {
         // ERROR_NO_HDD
         ".\207\211\231\227 \217\220\205\213 \204\200\226\216 \200\214 \204\220\227\232\204\204 \232\211\220\213\232\n",

diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h
index 171089c..15e3699 100644 (file)
--- a/base/setup/usetup/lang/it-IT.h
+++ b/base/setup/usetup/lang/it-IT.h
@@ -1479,6 +1479,21 @@ MUI_ERROR itITErrorEntries[] =
         "  \x07  Premere F3 per uscire.",
         "F3 = Uscire INVIO = Continuare"
     },
         "  \x07  Premere F3 per uscire.",
         "F3 = Uscire INVIO = Continuare"
     },

+    {
+        // ERROR_NO_BUILD_PATH
+        "Failed to build the installation paths for the ReactOS installation directory!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_PATH
+        "You cannot delete the partition containing the installation source!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_DIR
+        "You cannot install ReactOS within the installation source directory!\n"
+        "ENTER = Reboot computer"
+    },

     {
         // ERROR_NO_HDD
         "Setup non ha trovato un disco fisso.\n",
     {
         // ERROR_NO_HDD
         "Setup non ha trovato un disco fisso.\n",

diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h
index 58c254f..c1408ad 100644 (file)
--- a/base/setup/usetup/lang/ja-JP.h
+++ b/base/setup/usetup/lang/ja-JP.h
@@ -1477,6 +1477,21 @@ MUI_ERROR jaJPErrorEntries[] =
         "  \x07  \276\257\304\261\257\314\337\246 \301\255\263\274 \275\331\306\312 F3 \267\260\246 \265\274\303 \270\300\336\273\262\241",
         "F3 = \301\255\263\274  ENTER = \277\336\257\272\263"
     },
         "  \x07  \276\257\304\261\257\314\337\246 \301\255\263\274 \275\331\306\312 F3 \267\260\246 \265\274\303 \270\300\336\273\262\241",
         "F3 = \301\255\263\274  ENTER = \277\336\257\272\263"
     },

+    {
+        // ERROR_NO_BUILD_PATH
+        "Failed to build the installation paths for the ReactOS installation directory!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_PATH
+        "You cannot delete the partition containing the installation source!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_DIR
+        "You cannot install ReactOS within the installation source directory!\n"
+        "ENTER = Reboot computer"
+    },

     {
         // ERROR_NO_HDD
         "\276\257\304\261\257\314\337\312 \312\260\304\336\303\336\250\275\270\246 \271\335\274\255\302 \303\336\267\317\276\335 \303\336\274\300\241\n",
     {
         // ERROR_NO_HDD
         "\276\257\304\261\257\314\337\312 \312\260\304\336\303\336\250\275\270\246 \271\335\274\255\302 \303\336\267\317\276\335 \303\336\274\300\241\n",

diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h
index e1ebf82..f3c3bdf 100644 (file)
--- a/base/setup/usetup/lang/lt-LT.h
+++ b/base/setup/usetup/lang/lt-LT.h
@@ -1485,6 +1485,21 @@ MUI_ERROR ltLTErrorEntries[] =
         "  \x07  Press F3 to quit Setup.",
         "F3 = Quit  ENTER = Continue"
     },
         "  \x07  Press F3 to quit Setup.",
         "F3 = Quit  ENTER = Continue"
     },

+    {
+        // ERROR_NO_BUILD_PATH
+        "Failed to build the installation paths for the ReactOS installation directory!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_PATH
+        "You cannot delete the partition containing the installation source!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_DIR
+        "You cannot install ReactOS within the installation source directory!\n"
+        "ENTER = Reboot computer"
+    },

     {
         // ERROR_NO_HDD
         "Setup could not find a harddisk.\n",
     {
         // ERROR_NO_HDD
         "Setup could not find a harddisk.\n",

diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h
index 32d7628..67ac883 100644 (file)
--- a/base/setup/usetup/lang/ms-MY.h
+++ b/base/setup/usetup/lang/ms-MY.h
@@ -1373,6 +1373,21 @@ MUI_ERROR msMYErrorEntries[] =
         "  \x07  Tekan F3 untuk keluar persediaan.",
         "F3 = Keluar  ENTER = Teruskan"
     },
         "  \x07  Tekan F3 untuk keluar persediaan.",
         "F3 = Keluar  ENTER = Teruskan"
     },

+    {
+        // ERROR_NO_BUILD_PATH
+        "Failed to build the installation paths for the ReactOS installation directory!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_PATH
+        "You cannot delete the partition containing the installation source!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_DIR
+        "You cannot install ReactOS within the installation source directory!\n"
+        "ENTER = Reboot computer"
+    },

     {
         // ERROR_NO_HDD
         "Persediaan tidak dapat mencari cakera keras.\n",
     {
         // ERROR_NO_HDD
         "Persediaan tidak dapat mencari cakera keras.\n",

diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h
index a868590..076240d 100644 (file)
--- a/base/setup/usetup/lang/nl-NL.h
+++ b/base/setup/usetup/lang/nl-NL.h
@@ -1495,6 +1495,21 @@ MUI_ERROR nlNLErrorEntries[] =
         "  \x07  Druk op F3 om Setup af te sluiten.",
         "F3 = Afsluiten   ENTER = Doorgaan"
     },
         "  \x07  Druk op F3 om Setup af te sluiten.",
         "F3 = Afsluiten   ENTER = Doorgaan"
     },

+    {
+        // ERROR_NO_BUILD_PATH
+        "Failed to build the installation paths for the ReactOS installation directory!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_PATH
+        "You cannot delete the partition containing the installation source!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_DIR
+        "You cannot install ReactOS within the installation source directory!\n"
+        "ENTER = Reboot computer"
+    },

     {
         // ERROR_NO_HDD
         "Setup kan geen vaste schijf vinden.\n",
     {
         // ERROR_NO_HDD
         "Setup kan geen vaste schijf vinden.\n",

diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h
index 87c93c7..d4d7748 100644 (file)
--- a/base/setup/usetup/lang/pl-PL.h
+++ b/base/setup/usetup/lang/pl-PL.h
@@ -1485,6 +1485,21 @@ MUI_ERROR plPLErrorEntries[] =
         "  \x07  Naci\230nij F3, aby wyj\230\206 z instalatora.",
         "F3 = Wyj\230cie  ENTER = Kontynuacja"
     },
         "  \x07  Naci\230nij F3, aby wyj\230\206 z instalatora.",
         "F3 = Wyj\230cie  ENTER = Kontynuacja"
     },

+    {
+        // ERROR_NO_BUILD_PATH
+        "Failed to build the installation paths for the ReactOS installation directory!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_PATH
+        "You cannot delete the partition containing the installation source!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_DIR
+        "You cannot install ReactOS within the installation source directory!\n"
+        "ENTER = Reboot computer"
+    },

     {
         // ERROR_NO_HDD
         "Instalator nie wykry\210 \276adnego dysku twardego.\n",
     {
         // ERROR_NO_HDD
         "Instalator nie wykry\210 \276adnego dysku twardego.\n",

diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h
index 1c5b97d..d19033f 100644 (file)
--- a/base/setup/usetup/lang/pt-BR.h
+++ b/base/setup/usetup/lang/pt-BR.h
@@ -1507,6 +1507,21 @@ MUI_ERROR ptBRErrorEntries[] =
         "  \x07  Para sair da instala\207\306o, pressione F3.",
         "F3=Sair  ENTER=Continuar"
     },
         "  \x07  Para sair da instala\207\306o, pressione F3.",
         "F3=Sair  ENTER=Continuar"
     },

+    {
+        // ERROR_NO_BUILD_PATH
+        "Failed to build the installation paths for the ReactOS installation directory!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_PATH
+        "You cannot delete the partition containing the installation source!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_DIR
+        "You cannot install ReactOS within the installation source directory!\n"
+        "ENTER = Reboot computer"
+    },

     {
         // ERROR_NO_HDD
         "N\306o foi poss\241vel localizar um disco r\241digo.\n",
     {
         // ERROR_NO_HDD
         "N\306o foi poss\241vel localizar um disco r\241digo.\n",

diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h
index 92fa85b..8a1c5f2 100644 (file)
--- a/base/setup/usetup/lang/ro-RO.h
+++ b/base/setup/usetup/lang/ro-RO.h
@@ -1508,6 +1508,21 @@ MUI_ERROR roROErrorEntries[] =
         "  \x07  Tasta\376i F3 pentru a abandona instalarea.",
         "F3 = Ie\272ire  ENTER = Continuare"
     },
         "  \x07  Tasta\376i F3 pentru a abandona instalarea.",
         "F3 = Ie\272ire  ENTER = Continuare"
     },

+    {
+        // ERROR_NO_BUILD_PATH
+        "Failed to build the installation paths for the ReactOS installation directory!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_PATH
+        "You cannot delete the partition containing the installation source!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_DIR
+        "You cannot install ReactOS within the installation source directory!\n"
+        "ENTER = Reboot computer"
+    },

     {
         // ERROR_NO_HDD
         "E\272ec la identificarea unit\343\376ilor interne de stocare.",
     {
         // ERROR_NO_HDD
         "E\272ec la identificarea unit\343\376ilor interne de stocare.",

diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h
index d820c80..75e9f1e 100644 (file)
--- a/base/setup/usetup/lang/ru-RU.h
+++ b/base/setup/usetup/lang/ru-RU.h
@@ -1494,6 +1494,21 @@ MUI_ERROR ruRUErrorEntries[] =
         "  \x07  \215\240\246\254\250\342\245 F3 \242\353\345\256\244\240 \250\247 \343\341\342\240\255\256\242\252\250.",
         "F3 = \202\353\345\256\244  ENTER = \217\340\256\244\256\253\246\250\342\354"
     },
         "  \x07  \215\240\246\254\250\342\245 F3 \242\353\345\256\244\240 \250\247 \343\341\342\240\255\256\242\252\250.",
         "F3 = \202\353\345\256\244  ENTER = \217\340\256\244\256\253\246\250\342\354"
     },

+    {
+        // ERROR_NO_BUILD_PATH
+        "Failed to build the installation paths for the ReactOS installation directory!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_PATH
+        "You cannot delete the partition containing the installation source!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_DIR
+        "You cannot install ReactOS within the installation source directory!\n"
+        "ENTER = Reboot computer"
+    },

     {
         // ERROR_NO_HDD
         "\215\245 \343\244\240\253\256\341\354 \255\240\251\342\250 \246\245\341\342\252\250\251 \244\250\341\252.\n",
     {
         // ERROR_NO_HDD
         "\215\245 \343\244\240\253\256\341\354 \255\240\251\342\250 \246\245\341\342\252\250\251 \244\250\341\252.\n",

diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h
index 8adac0c..1462032 100644 (file)
--- a/base/setup/usetup/lang/sk-SK.h
+++ b/base/setup/usetup/lang/sk-SK.h
@@ -1483,6 +1483,21 @@ MUI_ERROR skSKErrorEntries[] =
         "  \x07  Stla\237te F3 pre skon\237enie in\347tal\240cie.",
         "F3 = Skon\237i\234  ENTER = Pokra\237ova\234"
     },
         "  \x07  Stla\237te F3 pre skon\237enie in\347tal\240cie.",
         "F3 = Skon\237i\234  ENTER = Pokra\237ova\234"
     },

+    {
+        // ERROR_NO_BUILD_PATH
+        "Failed to build the installation paths for the ReactOS installation directory!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_PATH
+        "You cannot delete the partition containing the installation source!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_DIR
+        "You cannot install ReactOS within the installation source directory!\n"
+        "ENTER = Reboot computer"
+    },

     {
         // ERROR_NO_HDD
         "In\347tal\240toru sa nepodarilo n\240js\234 pevn\354 disk.\n",
     {
         // ERROR_NO_HDD
         "In\347tal\240toru sa nepodarilo n\240js\234 pevn\354 disk.\n",

diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h
index d2e1f92..98bd309 100644 (file)
--- a/base/setup/usetup/lang/sq-AL.h
+++ b/base/setup/usetup/lang/sq-AL.h
@@ -1481,6 +1481,21 @@ MUI_ERROR sqALErrorEntries[] =
         "  \x07  Kliko F3 t\211 dal\211sh nga instalimi.",
         "F3 = Dil  ENTER = Vazhdo"
     },
         "  \x07  Kliko F3 t\211 dal\211sh nga instalimi.",
         "F3 = Dil  ENTER = Vazhdo"
     },

+    {
+        // ERROR_NO_BUILD_PATH
+        "Failed to build the installation paths for the ReactOS installation directory!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_PATH
+        "You cannot delete the partition containing the installation source!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_DIR
+        "You cannot install ReactOS within the installation source directory!\n"
+        "ENTER = Reboot computer"
+    },

     {
         // ERROR_NO_HDD
         "Instalimi nuk mund t\211 gjej nj\211 harddisk.\n",
     {
         // ERROR_NO_HDD
         "Instalimi nuk mund t\211 gjej nj\211 harddisk.\n",

diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h
index 9e6ece2..0b39255 100644 (file)
--- a/base/setup/usetup/lang/sv-SE.h
+++ b/base/setup/usetup/lang/sv-SE.h
@@ -1483,6 +1483,21 @@ MUI_ERROR svSEErrorEntries[] =
         "  \x07  Tryck F3 f\224r att avsluta Setup.",
         "F3 = Avsluta  ENTER = Forts\204tta"
     },
         "  \x07  Tryck F3 f\224r att avsluta Setup.",
         "F3 = Avsluta  ENTER = Forts\204tta"
     },

+    {
+        // ERROR_NO_BUILD_PATH
+        "Failed to build the installation paths for the ReactOS installation directory!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_PATH
+        "You cannot delete the partition containing the installation source!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_DIR
+        "You cannot install ReactOS within the installation source directory!\n"
+        "ENTER = Reboot computer"
+    },

     {
         // ERROR_NO_HDD
         "Setup kunde inte hitta n\206gon h\206rddisk.\n",
     {
         // ERROR_NO_HDD
         "Setup kunde inte hitta n\206gon h\206rddisk.\n",

diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h
index 8019675..5fad467 100644 (file)
--- a/base/setup/usetup/lang/tr-TR.h
+++ b/base/setup/usetup/lang/tr-TR.h
@@ -1455,6 +1455,21 @@ MUI_ERROR trTRErrorEntries[] =
         "  \x07  Kur'dan \207\215kmak i\207in F3'e bas\215n\215z.",
         "F3 = \200\215k  ENTER = S\201rd\201r"
     },
         "  \x07  Kur'dan \207\215kmak i\207in F3'e bas\215n\215z.",
         "F3 = \200\215k  ENTER = S\201rd\201r"
     },

+    {
+        // ERROR_NO_BUILD_PATH
+        "Failed to build the installation paths for the ReactOS installation directory!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_PATH
+        "You cannot delete the partition containing the installation source!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_DIR
+        "You cannot install ReactOS within the installation source directory!\n"
+        "ENTER = Reboot computer"
+    },

     {
         // ERROR_NO_HDD
         "Kur, bir sabit disk bulamad\215.\n",
     {
         // ERROR_NO_HDD
         "Kur, bir sabit disk bulamad\215.\n",

diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h
index 5f6258c..4d12092 100644 (file)
--- a/base/setup/usetup/lang/uk-UA.h
+++ b/base/setup/usetup/lang/uk-UA.h
@@ -1483,6 +1483,21 @@ MUI_ERROR ukUAErrorEntries[] =
         "  \x07  \215\240\342\250\341\255i\342\354 F3 \244\253\357 \242\250\345\256\244\343 \247 \242\341\342\240\255\256\242\253\356\242\240\347\240.",
         "F3 = \202\250\251\342\250  ENTER = \217\340\256\244\256\242\246\250\342\250"
     },
         "  \x07  \215\240\342\250\341\255i\342\354 F3 \244\253\357 \242\250\345\256\244\343 \247 \242\341\342\240\255\256\242\253\356\242\240\347\240.",
         "F3 = \202\250\251\342\250  ENTER = \217\340\256\244\256\242\246\250\342\250"
     },

+    {
+        // ERROR_NO_BUILD_PATH
+        "Failed to build the installation paths for the ReactOS installation directory!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_PATH
+        "You cannot delete the partition containing the installation source!\n"
+        "ENTER = Reboot computer"
+    },
+    {
+        // ERROR_SOURCE_DIR
+        "You cannot install ReactOS within the installation source directory!\n"
+        "ENTER = Reboot computer"
+    },

     {
         // ERROR_NO_HDD
         "\215\245 \242\244\240\253\256\341\354 \247\255\240\251\342\250 \246\256\340\341\342\252\250\251 \244\250\341\252.\n",
     {
         // ERROR_NO_HDD
         "\215\245 \242\244\240\253\256\341\354 \247\255\240\251\342\250 \246\256\340\341\342\252\250\251 \244\250\341\252.\n",

diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c
index 63c13c5..8aaf3cc 100644 (file)
--- a/base/setup/usetup/usetup.c
+++ b/base/setup/usetup/usetup.c
@@ -1777,9 +1777,7 @@ SelectPartitionPage(PINPUT_RECORD Ir)
                 // &USetupData.SourceRootPath
                 if (RtlPrefixUnicodeString(&CurrentPartitionU, &USetupData.SourcePath, TRUE))
                 {
                 // &USetupData.SourceRootPath
                 if (RtlPrefixUnicodeString(&CurrentPartitionU, &USetupData.SourcePath, TRUE))
                 {

-                    PopupError("You cannot delete the partition containing the installation source!",
-                               MUIGetString(STRING_CONTINUE),
-                               Ir, POPUP_WAIT_ENTER);
+                    MUIDisplayError(ERROR_SOURCE_PATH, Ir, POPUP_WAIT_ENTER);

                     return SELECT_PARTITION_PAGE;
                 }
             }
                     return SELECT_PARTITION_PAGE;
                 }
             }


@@ -3569,9 +3567,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir)
         if (!NT_SUCCESS(Status))
         {
             DPRINT1("BuildInstallPaths() failed. Status code: 0x%lx", Status);
         if (!NT_SUCCESS(Status))
         {
             DPRINT1("BuildInstallPaths() failed. Status code: 0x%lx", Status);

-            PopupError("Failed to build the installation paths for the ReactOS installation directory!",
-                       MUIGetString(STRING_CONTINUE),
-                       Ir, POPUP_WAIT_ENTER);
+            MUIDisplayError(ERROR_NO_BUILD_PATH, Ir, POPUP_WAIT_ENTER);

             return QUIT_PAGE;
         }
 
             return QUIT_PAGE;
         }
 


@@ -3582,9 +3578,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir)
          */
         if (RtlPrefixUnicodeString(&USetupData.SourcePath, &USetupData.DestinationPath, TRUE))
         {
          */
         if (RtlPrefixUnicodeString(&USetupData.SourcePath, &USetupData.DestinationPath, TRUE))
         {

-            PopupError("You cannot install ReactOS within the installation source directory!",
-                       MUIGetString(STRING_CONTINUE),
-                       Ir, POPUP_WAIT_ENTER);
+            MUIDisplayError(ERROR_SOURCE_DIR, Ir, POPUP_WAIT_ENTER);

             return INSTALL_DIRECTORY_PAGE;
         }
 
             return INSTALL_DIRECTORY_PAGE;
         }
 


@@ -3677,9 +3671,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir)
             if (!NT_SUCCESS(Status))
             {
                 DPRINT1("BuildInstallPaths() failed. Status code: 0x%lx", Status);
             if (!NT_SUCCESS(Status))
             {
                 DPRINT1("BuildInstallPaths() failed. Status code: 0x%lx", Status);

-                PopupError("Failed to build the installation paths for the ReactOS installation directory!",
-                           MUIGetString(STRING_CONTINUE),
-                           Ir, POPUP_WAIT_ENTER);
+                MUIDisplayError(ERROR_NO_BUILD_PATH, Ir, POPUP_WAIT_ENTER);

                 return QUIT_PAGE;
             }
 
                 return QUIT_PAGE;
             }
 


@@ -3690,9 +3682,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir)
              */
             if (RtlPrefixUnicodeString(&USetupData.SourcePath, &USetupData.DestinationPath, TRUE))
             {
              */
             if (RtlPrefixUnicodeString(&USetupData.SourcePath, &USetupData.DestinationPath, TRUE))
             {

-                PopupError("You cannot install ReactOS within the installation source directory!",
-                           MUIGetString(STRING_CONTINUE),
-                           Ir, POPUP_WAIT_ENTER);
+                MUIDisplayError(ERROR_SOURCE_DIR, Ir, POPUP_WAIT_ENTER);

                 return INSTALL_DIRECTORY_PAGE;
             }
 
                 return INSTALL_DIRECTORY_PAGE;
             }