https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d4f001084a8ef4dda4d644736105bb9d679b74d

commit 3d4f001084a8ef4dda4d644736105bb9d679b74d
Author:     Hermès Bélusca-Maïto <hermes.belusca-ma...@reactos.org>
AuthorDate: Tue Oct 24 16:22:10 2023 +0200
Commit:     Hermès Bélusca-Maïto <hermes.belusca-ma...@reactos.org>
CommitDate: Sat Oct 28 17:08:38 2023 +0200

    [USETUP] Rename some MUI string identifiers (#5837)
    
    STRING_CHOOSENEWPARTITION --> STRING_CHOOSE_NEW_PARTITION
    STRING_FORMATTINGDISK     --> STRING_FORMATTINGPART
    STRING_HDDSIZE            --> STRING_HDPARTSIZE
    STRING_HDINFOPARTCREATE_1 --> STRING_HDDISK1
    STRING_HDINFOPARTDELETE_1 --> STRING_HDDISK2
    STRING_HDDINFO_{1,2}      --> STRING_HDDINFO{1,2}
    
    Move STRING_NEWPARTITION just before STRING_PARTFORMAT
    and renumber the STRING_* identifiers.
---
 base/setup/usetup/format.c     |   2 +-
 base/setup/usetup/lang/bg-BG.h |  18 +++----
 base/setup/usetup/lang/bn-BD.h |  18 +++----
 base/setup/usetup/lang/cs-CZ.h |  18 +++----
 base/setup/usetup/lang/da-DK.h |  18 +++----
 base/setup/usetup/lang/de-DE.h |  18 +++----
 base/setup/usetup/lang/el-GR.h |  18 +++----
 base/setup/usetup/lang/en-US.h |  18 +++----
 base/setup/usetup/lang/es-ES.h |  18 +++----
 base/setup/usetup/lang/et-EE.h |  18 +++----
 base/setup/usetup/lang/eu-ES.h |  18 +++----
 base/setup/usetup/lang/fr-FR.h |  18 +++----
 base/setup/usetup/lang/he-IL.h |  18 +++----
 base/setup/usetup/lang/hr-HR.h |  18 +++----
 base/setup/usetup/lang/hu-HU.h |  18 +++----
 base/setup/usetup/lang/id-ID.h |  18 +++----
 base/setup/usetup/lang/it-IT.h |  18 +++----
 base/setup/usetup/lang/ja-JP.h |  18 +++----
 base/setup/usetup/lang/lt-LT.h |  18 +++----
 base/setup/usetup/lang/ms-MY.h |  18 +++----
 base/setup/usetup/lang/nl-NL.h |  18 +++----
 base/setup/usetup/lang/pl-PL.h |  18 +++----
 base/setup/usetup/lang/pt-BR.h |  18 +++----
 base/setup/usetup/lang/pt-PT.h |  18 +++----
 base/setup/usetup/lang/ro-RO.h |  18 +++----
 base/setup/usetup/lang/ru-RU.h |  18 +++----
 base/setup/usetup/lang/sk-SK.h |  18 +++----
 base/setup/usetup/lang/sq-AL.h |  18 +++----
 base/setup/usetup/lang/sv-SE.h |  18 +++----
 base/setup/usetup/lang/tr-TR.h |  18 +++----
 base/setup/usetup/lang/uk-UA.h |  18 +++----
 base/setup/usetup/mui.h        | 114 ++++++++++++++++++++---------------------
 base/setup/usetup/partlist.c   |   4 +-
 base/setup/usetup/usetup.c     |  24 ++++-----
 34 files changed, 342 insertions(+), 342 deletions(-)

diff --git a/base/setup/usetup/format.c b/base/setup/usetup/format.c
index cc0603ed07b..21d4d1f87d5 100644
--- a/base/setup/usetup/format.c
+++ b/base/setup/usetup/format.c
@@ -103,7 +103,7 @@ DoFormat(
                                           10,
                                           24,
                                           TRUE,
-                                          MUIGetString(STRING_FORMATTINGDISK));
+                                          MUIGetString(STRING_FORMATTINGPART));
 
     ProgressSetStepCount(FormatProgressBar, 100);
 
diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h
index 8537ccdf490..f7150ddcaa9 100644
--- a/base/setup/usetup/lang/bg-BG.h
+++ b/base/setup/usetup/lang/bg-BG.h
@@ -2253,16 +2253,18 @@ MUI_STRING bgBGStrings[] =
      "   D = \210\247\342\340\250\251 \244\357\253   F3 = 
\210\247\345\256\244"},
     {STRING_PARTITIONSIZE,
      "\220\240\247\254\245\340 \255\240 \255\256\242\250\357 \244\357\253:"},
-    {STRING_CHOOSENEWPARTITION,
+    {STRING_CHOOSE_NEW_PARTITION,
      "\210\247\241\340\240\253\250 \341\342\245 \244\240 
\341\352\247\244\240\244\245\342\245 \255\256\242 
\257\352\340\342\250\350\245\255 \244\357\253 \255\240"},
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
      "\210\247\241\340\240\253\250 \341\342\245 \244\240 
\341\352\247\244\240\244\245\342\245 
\340\240\247\350\250\340\250\342\245\253\245\255 \244\357\253 \255\240"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
      "\210\247\241\340\240\253\250 \341\342\245 \244\240 
\341\352\247\244\240\244\245\342\245 \253\256\243\250\347\245\341\252\250 
\244\357\253 \255\240"},
-    {STRING_HDDSIZE,
+    {STRING_HDPARTSIZE,
     "\202\352\242\245\244\245\342\245 \340\240\247\254\245\340\240 \255\240 
\255\256\242\250\357 \244\357\253 (\242 
\254\245\243\240\241\240\251\342\250)."},
     {STRING_CREATEPARTITION,
      "   ENTER = \221\352\247\244\240\242\240\255\245 \255\240 \244\357\253   
ESC = \216\342\252\240\247   F3 = \210\247\345\256\244"},
+    {STRING_NEWPARTITION,
+    "\201\245 \341\352\247\244\240\244\245\255 \255\256\242 \244\357\253 
\255\240"},
     {STRING_PARTFORMAT,
     "\217\340\245\244\341\342\256\250 
\344\256\340\254\240\342\250\340\240\255\245 \255\240 \244\357\253\240."},
     {STRING_NONFORMATTEDPART,
@@ -2313,7 +2315,7 @@ MUI_STRING bgBGStrings[] =
     "\222\256\242\240 \341\245 \341\253\343\347\242\240 \255\240\251- 
\347\245\341\342\256 \257\340\250 \343\257\256\342\340\245\241\240 \255\240 USB 
\252\253\240\242\250\240\342\343\340\240\r\n"},
     {STRING_CONSOLEFAIL3,
     "\217\256\244\244\340\352\246\252\240\342\240 \255\240 USB \245 
\242\341\245 \256\351\245 \255\245\257\352\253\255\240\r\n"},
-    {STRING_FORMATTINGDISK,
+    {STRING_FORMATTINGPART,
     "\224\256\340\254\240\342\250\340\240\255\245 \255\240 
\244\250\341\252\240"},
     {STRING_CHECKINGDISK,
     "\217\340\256\242\245\340\252\240 \255\240 \244\250\341\252\240"},
@@ -2323,20 +2325,18 @@ MUI_STRING bgBGStrings[] =
     " \224\256\340\254\240\342\250\340\240\255\245 \255\240 \244\357\253\240 
\252\240\342\256 %S \344\240\251\253\256\242\240 \341\250\341\342\245\254\240 
"},
     {STRING_KEEPFORMAT,
     " \207\240\257\240\247\242\240\255\245 \255\240 
\344\240\251\253\256\242\240\342\240 \341\250\341\342\245\254\240 (\241\245\247 
\257\340\256\254\245\255\250) "},
-    {STRING_HDINFOPARTCREATE_1,
+    {STRING_HDDISK1,
     "%s."},
-    {STRING_HDINFOPARTDELETE_1,
+    {STRING_HDDISK2,
     "\255\240: %s."},
     {STRING_PARTTYPE,
     "\242\250\244 0x%02x"},
-    {STRING_HDDINFO_1,
+    {STRING_HDDINFO1,
     // "\342\242\352\340\244 \244\250\341\252 %lu (%I64u %s), 
\210\247\242\256\244=%hu, \230\250\255\240=%hu, \216\223=%hu (%wZ) [%s]"
     "%I64u %s \342\242\352\340\244 \244\250\341\252 %lu 
(\210\247\242\256\244=%hu, \230\250\255\240=%hu, \216\223=%hu) \255\240 %wZ 
[%s]"},
-    {STRING_HDDINFO_2,
+    {STRING_HDDINFO2,
     // "\342\242\352\340\244 \244\250\341\252 %lu (%I64u %s), 
\210\247\242\256\244=%hu, \230\250\255\240=%hu, \216\223=%hu [%s]"
     "%I64u %s \342\242\352\340\244 \244\250\341\252 %lu 
(\210\247\242\256\244=%hu, \230\250\255\240=%hu, \216\223=%hu) [%s]"},
-    {STRING_NEWPARTITION,
-    "\201\245 \341\352\247\244\240\244\245\255 \255\256\242 \244\357\253 
\255\240"},
     {STRING_UNPSPACE,
     "\215\245\247\240\244\245\253\245\255\256 
\257\340\256\341\342\340\240\255\341\342\242\256"},
     {STRING_MAXSIZE,
diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h
index ba42c1a058f..a8ece049194 100644
--- a/base/setup/usetup/lang/bn-BD.h
+++ b/base/setup/usetup/lang/bn-BD.h
@@ -2227,16 +2227,18 @@ MUI_STRING bnBDStrings[] =
      "   D = Delete Partition   F3 = Quit"},
     {STRING_PARTITIONSIZE,
      "Size of new partition:"},
-    {STRING_CHOOSENEWPARTITION,
+    {STRING_CHOOSE_NEW_PARTITION,
      "You have chosen to create a primary partition on"},
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
      "You have chosen to create an extended partition on"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
      "You have chosen to create a logical partition on"},
-    {STRING_HDDSIZE,
+    {STRING_HDPARTSIZE,
     "Please enter the size of the new partition in megabytes."},
     {STRING_CREATEPARTITION,
      "   ENTER = Create Partition   ESC = Cancel   F3 = Quit"},
+    {STRING_NEWPARTITION,
+    "Setup created a new partition on"},
     {STRING_PARTFORMAT,
     "This Partition will be formatted next."},
     {STRING_NONFORMATTEDPART,
@@ -2287,7 +2289,7 @@ MUI_STRING bnBDStrings[] =
     "The most common cause of this is using an USB keyboard\r\n"},
     {STRING_CONSOLEFAIL3,
     "USB keyboards are not fully supported yet\r\n"},
-    {STRING_FORMATTINGDISK,
+    {STRING_FORMATTINGPART,
     "Setup is formatting your disk"},
     {STRING_CHECKINGDISK,
     "Setup is checking your disk"},
@@ -2297,20 +2299,18 @@ MUI_STRING bnBDStrings[] =
     " Format partition as %S file system "},
     {STRING_KEEPFORMAT,
     " Keep current file system (no changes) "},
-    {STRING_HDINFOPARTCREATE_1,
+    {STRING_HDDISK1,
     "%s."},
-    {STRING_HDINFOPARTDELETE_1,
+    {STRING_HDDISK2,
     "on %s."},
     {STRING_PARTTYPE,
     "Type 0x%02x"},
-    {STRING_HDDINFO_1,
+    {STRING_HDDINFO1,
     // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
     "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"},
-    {STRING_HDDINFO_2,
+    {STRING_HDDINFO2,
     // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
     "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
-    {STRING_NEWPARTITION,
-    "Setup created a new partition on"},
     {STRING_UNPSPACE,
     "Unpartitioned space"},
     {STRING_MAXSIZE,
diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h
index 9b8092616c1..e185fa42208 100644
--- a/base/setup/usetup/lang/cs-CZ.h
+++ b/base/setup/usetup/lang/cs-CZ.h
@@ -2235,16 +2235,18 @@ MUI_STRING csCZStrings[] =
      "   D = Odstranit odd\241l   F3 = Ukon\237it"},
     {STRING_PARTITIONSIZE,
      "Velikost nov\202ho odd\241lu:"},
-    {STRING_CHOOSENEWPARTITION,
+    {STRING_CHOOSE_NEW_PARTITION,
      "Zvolili jste vytvo\375en\241 nov\202ho prim\240rn\241ho odd\241lu na"},
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
      "Zvolili jste vytvo\375en\241 nov\202ho roz\347\241\375en\202ho odd\241lu 
na"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
      "Zvolili jste vytvo\375en\241 nov\202ho logick\202ho odd\241lu na"},
-    {STRING_HDDSIZE,
+    {STRING_HDPARTSIZE,
     "Zadejte velikost nov\202ho odd\241lu v megabajtech."},
     {STRING_CREATEPARTITION,
      "   ENTER = Vytvo\375it odd\241l   ESC = Zru\347it   F3 = Ukon\237it"},
+    {STRING_NEWPARTITION,
+    "Instalace vytvo\375ila nov\354 odd\241l na"},
     {STRING_PARTFORMAT,
     "Tento odd\241l bude zform\240tov\240n."},
     {STRING_NONFORMATTEDPART,
@@ -2295,7 +2297,7 @@ MUI_STRING csCZStrings[] =
     "Nejb\330\247n\330j\347\241 p\375\241\237inou je pou\247\241v\240n\241 USB 
kl\240vesnice\r\n"},
     {STRING_CONSOLEFAIL3,
     "USB kl\240vesnice zat\241m nejsou pln\330 podporov\240ny\r\n"},
-    {STRING_FORMATTINGDISK,
+    {STRING_FORMATTINGPART,
     "Instalace form\240tuje disk"},
     {STRING_CHECKINGDISK,
     "Instalace kontroluje disk"},
@@ -2305,20 +2307,18 @@ MUI_STRING csCZStrings[] =
     " Zform\240tovat odd\241l na souborov\354 syst\202m %S "},
     {STRING_KEEPFORMAT,
     " Ponechat sou\237asn\354 souborov\354 syst\202m (bez zm\330ny) "},
-    {STRING_HDINFOPARTCREATE_1,
+    {STRING_HDDISK1,
     "%s."},
-    {STRING_HDINFOPARTDELETE_1,
+    {STRING_HDDISK2,
     "na: %s."},
     {STRING_PARTTYPE,
     "Typ 0x%02x"},
-    {STRING_HDDINFO_1,
+    {STRING_HDDINFO1,
     // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
     "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) na %wZ [%s]"},
-    {STRING_HDDINFO_2,
+    {STRING_HDDINFO2,
     // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
     "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
-    {STRING_NEWPARTITION,
-    "Instalace vytvo\375ila nov\354 odd\241l na"},
     {STRING_UNPSPACE,
     "M\241sto bez odd\241l\205"},
     {STRING_MAXSIZE,
diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h
index 8485e176eb2..ab95b478df8 100644
--- a/base/setup/usetup/lang/da-DK.h
+++ b/base/setup/usetup/lang/da-DK.h
@@ -2237,16 +2237,18 @@ MUI_STRING daDKStrings[] =
      "   D = Slet partition   F3 = Afslut"},
     {STRING_PARTITIONSIZE,
      "St\233rrelse p\206 den nye partition:"},
-    {STRING_CHOOSENEWPARTITION,
+    {STRING_CHOOSE_NEW_PARTITION,
      "Du har valge at lave en ny prim\221r partition p\206"},
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
      "Du har valgt at lave en ny udviddet partition p\206"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
      "Du har valge at lave en ny logisk partition p\206"},
-    {STRING_HDDSIZE,
+    {STRING_HDPARTSIZE,
     "Indtast st\233rrelsen p\206 den nye partition i megabytes."},
     {STRING_CREATEPARTITION,
      "   ENTER = Lav partition   ESC = Annuller   F3 = Afslut"},
+    {STRING_NEWPARTITION,
+    "Installationen har lavet en ny partition p\206"},
     {STRING_PARTFORMAT,
     "Denne partition vil blive formateret som det n\221ste."},
     {STRING_NONFORMATTEDPART,
@@ -2297,7 +2299,7 @@ MUI_STRING daDKStrings[] =
     "Dette skykdes ofte at du bruger et USB-tastatur\r\n"},
     {STRING_CONSOLEFAIL3,
     "USB-tastatuere er endnu ikke fuldt underst\233ttet\r\n"},
-    {STRING_FORMATTINGDISK,
+    {STRING_FORMATTINGPART,
     "Installationen formatere din disk"},
     {STRING_CHECKINGDISK,
     "Installationen tjekker din disk"},
@@ -2307,20 +2309,18 @@ MUI_STRING daDKStrings[] =
     " Formater partitionen som %S-filesystemet "},
     {STRING_KEEPFORMAT,
     " Behold nuv\221rende filsystem (ingen \221ndringer) "},
-    {STRING_HDINFOPARTCREATE_1,
+    {STRING_HDDISK1,
     "%s."},
-    {STRING_HDINFOPARTDELETE_1,
+    {STRING_HDDISK2,
     "p\206 %s."},
     {STRING_PARTTYPE,
     "Type 0x%02x"},
-    {STRING_HDDINFO_1,
+    {STRING_HDDINFO1,
     // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
     "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p\206 %wZ [%s]"},
-    {STRING_HDDINFO_2,
+    {STRING_HDDINFO2,
     // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
     "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
-    {STRING_NEWPARTITION,
-    "Installationen har lavet en ny partition p\206"},
     {STRING_UNPSPACE,
     "Upartitioneret plads"},
     {STRING_MAXSIZE,
diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h
index 0d095400c67..3834815ea04 100644
--- a/base/setup/usetup/lang/de-DE.h
+++ b/base/setup/usetup/lang/de-DE.h
@@ -2239,16 +2239,18 @@ MUI_STRING deDEStrings[] =
      "   D = Partition l\224schen   F3 = Installation abbrechen"},
     {STRING_PARTITIONSIZE,
      "Gr\224\341e der neuen Partition:"},
-    {STRING_CHOOSENEWPARTITION,
+    {STRING_CHOOSE_NEW_PARTITION,
      "Eine prim\204re Partition soll hier erstellt werden:"},
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
      "Eine erweiterte Partition soll hier erstellt werden:"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
      "Ein logisches Laufwerk soll hier erstellt werden:"},
-    {STRING_HDDSIZE,
+    {STRING_HDPARTSIZE,
     "Bitte geben Sie die Gr\224\341e der neuen Partition in Megabyte ein."},
     {STRING_CREATEPARTITION,
      "  ENTER = Partition erstellen   ESC = Abbrechen   F3 = Installation 
abbrechen"},
+    {STRING_NEWPARTITION,
+    "Setup erstellte eine neue Partition auf"},
     {STRING_PARTFORMAT,
     "Diese Partition wird als n\204chstes formatiert."},
     {STRING_NONFORMATTEDPART,
@@ -2299,7 +2301,7 @@ MUI_STRING deDEStrings[] =
     "Der h\204ufigste Grund hierf\201r ist die Verwendung einer 
USB-Tastatur\r\n"},
     {STRING_CONSOLEFAIL3,
     "USB-Tastaturen werden noch nicht vollst\204ndig unterst\201tzt\r\n"},
-    {STRING_FORMATTINGDISK,
+    {STRING_FORMATTINGPART,
     "Ihre Festplatte wird formatiert"},
     {STRING_CHECKINGDISK,
     "Ihre Festplatte wird \201berpr\201ft"},
@@ -2309,20 +2311,18 @@ MUI_STRING deDEStrings[] =
     " Partition mit dem %S-Dateisystem formatieren "},
     {STRING_KEEPFORMAT,
     " Dateisystem beibehalten (Keine Ver\204nderungen) "},
-    {STRING_HDINFOPARTCREATE_1,
+    {STRING_HDDISK1,
     "%s."},
-    {STRING_HDINFOPARTDELETE_1,
+    {STRING_HDDISK2,
     "auf %s."},
     {STRING_PARTTYPE,
     "Typ 0x%02x"},
-    {STRING_HDDINFO_1,
+    {STRING_HDDINFO1,
     // "Festplatte %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
     "%I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %wZ [%s]"},
-    {STRING_HDDINFO_2,
+    {STRING_HDDINFO2,
     // "Festplatte %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
     "%I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
-    {STRING_NEWPARTITION,
-    "Setup erstellte eine neue Partition auf"},
     {STRING_UNPSPACE,
     "Unpartitionierter Speicher"},
     {STRING_MAXSIZE,
diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h
index 401f7ae16fc..6e092a920c7 100644
--- a/base/setup/usetup/lang/el-GR.h
+++ b/base/setup/usetup/lang/el-GR.h
@@ -2251,17 +2251,19 @@ MUI_STRING elGRStrings[] =
      "   D = Delete Partition   F3 = Quit"},
     {STRING_PARTITIONSIZE,
      "\213\342\232\234\237\246\252 \253\246\254 \244\342\246\254 partition:"},
-    {STRING_CHOOSENEWPARTITION,
+    {STRING_CHOOSE_NEW_PARTITION,
      "You have chosen to create a primary partition on"},
 //     "����⥘�� �� ��������㩜�� ⤘ �� partition on"},
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
      "You have chosen to create an extended partition on"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
      "You have chosen to create a logical partition on"},
-    {STRING_HDDSIZE,
+    {STRING_HDPARTSIZE,
     "\217\230\250\230\241\230\242\351 \233\351\251\253\234 \253\246 
\243\342\232\234\237\246\252 \253\246\254 partition \251\234 megabytes."},
     {STRING_CREATEPARTITION,
      "   ENTER = \203\236\243\240\246\254\250\232\345\230 Partition   ESC = 
\200\241\347\250\340\251\236   F3 = \200\247\246\256\351\250\236\251\236"},
+    {STRING_NEWPARTITION,
+    "\206 \234\232\241\230\253\341\251\253\230\251\236 
\233\236\243\240\246\347\250\232\236\251\234 \342\244\230 \244\342\246 
partition \251\253\246"},
     {STRING_PARTFORMAT,
     "\200\254\253\346 \253\246 Partition \237\230 
\233\240\230\243\246\250\255\340\237\234\345 \243\234\253\341."},
     {STRING_NONFORMATTEDPART,
@@ -2312,7 +2314,7 @@ MUI_STRING elGRStrings[] =
     "The most common cause of this is using an USB keyboard\r\n"},
     {STRING_CONSOLEFAIL3,
     "\222\230 USB \247\242\236\241\253\250\246\242\346\232\240\230 
\233\234\244 \234\345\244\230\240 \247\242\343\250\340\252 
\254\247\246\251\253\236\250\240\235\346\243\234\244\230 
\230\241\346\243\230\r\n"},
-    {STRING_FORMATTINGDISK,
+    {STRING_FORMATTINGPART,
     "\206 \234\232\241\230\253\341\251\253\230\251\236 
\233\240\230\243\246\250\255\351\244\234\240 \253\246 \233\345\251\241\246 
\251\230\252"},
     {STRING_CHECKINGDISK,
     "\206 \234\232\241\230\253\341\251\253\230\251\236 
\234\242\342\232\256\234\240 \253\246 \233\345\251\241\246 \251\230\252"},
@@ -2322,20 +2324,18 @@ MUI_STRING elGRStrings[] =
     " \203\240\230\243\346\250\255\340\251\236 \253\246\254 partition \340\252 
%S \251\347\251\253\236\243\230 \230\250\256\234\345\340\244 "},
     {STRING_KEEPFORMAT,
     " \214\230 \247\230\250\230\243\234\345\244\234\240 \253\246 
\251\347\251\253\236\243\230 \230\250\256\234\345\340\244 \340\252 
\342\256\234\240 (\241\230\243\345\230 \230\242\242\230\232\343) "},
-    {STRING_HDINFOPARTCREATE_1,
+    {STRING_HDDISK1,
     "%s."},
-    {STRING_HDINFOPARTDELETE_1,
+    {STRING_HDDISK2,
     "\251\253\246: %s."},
     {STRING_PARTTYPE,
     "Type 0x%02x"},
-    {STRING_HDDINFO_1,
+    {STRING_HDDINFO1,
     // "\221\241\242\236\250\346\252 \233\345\251\241\246\252 %lu (%I64u %s), 
Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
     "%I64u %s \221\241\242\236\250\346\252 \233\345\251\241\246\252 %lu 
(Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"},
-    {STRING_HDDINFO_2,
+    {STRING_HDDINFO2,
     // "\221\241\242\236\250\346\252 \233\345\251\241\246\252 %lu (%I64u %s), 
Port=%hu, Bus=%hu, Id=%hu [%s]"
     "%I64u %s \221\241\242\236\250\346\252 \233\345\251\241\246\252 %lu 
(Port=%hu, Bus=%hu, Id=%hu) [%s]"},
-    {STRING_NEWPARTITION,
-    "\206 \234\232\241\230\253\341\251\253\230\251\236 
\233\236\243\240\246\347\250\232\236\251\234 \342\244\230 \244\342\246 
partition \251\253\246"},
     {STRING_UNPSPACE,
     "Unpartitioned space"},
     {STRING_MAXSIZE,
diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h
index 3354212a0a2..ae23370e7fa 100644
--- a/base/setup/usetup/lang/en-US.h
+++ b/base/setup/usetup/lang/en-US.h
@@ -2227,16 +2227,18 @@ MUI_STRING enUSStrings[] =
      "   D = Delete Partition   F3 = Quit"},
     {STRING_PARTITIONSIZE,
      "Size of new partition:"},
-    {STRING_CHOOSENEWPARTITION,
+    {STRING_CHOOSE_NEW_PARTITION,
      "You have chosen to create a primary partition on"},
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
      "You have chosen to create an extended partition on"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
      "You have chosen to create a logical partition on"},
-    {STRING_HDDSIZE,
+    {STRING_HDPARTSIZE,
     "Please enter the size of the new partition in megabytes."},
     {STRING_CREATEPARTITION,
      "   ENTER = Create Partition   ESC = Cancel   F3 = Quit"},
+    {STRING_NEWPARTITION,
+    "Setup created a new partition on"},
     {STRING_PARTFORMAT,
     "This Partition will be formatted next."},
     {STRING_NONFORMATTEDPART,
@@ -2287,7 +2289,7 @@ MUI_STRING enUSStrings[] =
     "The most common cause of this is using an USB keyboard\r\n"},
     {STRING_CONSOLEFAIL3,
     "USB keyboards are not fully supported yet\r\n"},
-    {STRING_FORMATTINGDISK,
+    {STRING_FORMATTINGPART,
     "Setup is formatting your disk"},
     {STRING_CHECKINGDISK,
     "Setup is checking your disk"},
@@ -2297,20 +2299,18 @@ MUI_STRING enUSStrings[] =
     " Format partition as %S file system "},
     {STRING_KEEPFORMAT,
     " Keep current file system (no changes) "},
-    {STRING_HDINFOPARTCREATE_1,
+    {STRING_HDDISK1,
     "%s."},
-    {STRING_HDINFOPARTDELETE_1,
+    {STRING_HDDISK2,
     "on %s."},
     {STRING_PARTTYPE,
     "Type 0x%02x"},
-    {STRING_HDDINFO_1,
+    {STRING_HDDINFO1,
     // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
     "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"},
-    {STRING_HDDINFO_2,
+    {STRING_HDDINFO2,
     // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
     "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
-    {STRING_NEWPARTITION,
-    "Setup created a new partition on"},
     {STRING_UNPSPACE,
     "Unpartitioned space"},
     {STRING_MAXSIZE,
diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h
index 6f588779e21..77e54c61860 100644
--- a/base/setup/usetup/lang/es-ES.h
+++ b/base/setup/usetup/lang/es-ES.h
@@ -2240,16 +2240,18 @@ MUI_STRING esESStrings[] =
      "   INTRO = Instalar   D = Eliminar partici\242n   F3 = Salir"},
     {STRING_PARTITIONSIZE,
      "Tama\244o de la nueva Partici\242n:"},
-    {STRING_CHOOSENEWPARTITION,
+    {STRING_CHOOSE_NEW_PARTITION,
      "Ha elegido crear una nueva Partici\242n Primaria en"},
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
      "Ha elegido crear una nueva Partici\242n Extendida en"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
      "Ha elegido crear una nueva Partici\242n L\242gica en"},
-    {STRING_HDDSIZE,
+    {STRING_HDPARTSIZE,
     "Escriba el tama\244o de la nueva Partici\242n en megabytes."},
     {STRING_CREATEPARTITION,
      "   INTRO = Crear Partici\242n   ESC = Cancelar   F3 = Salir"},
+    {STRING_NEWPARTITION,
+    "El instalador ha creado una nueva Partici\242n en"},
     {STRING_PARTFORMAT,
     "A continuaci\242n se formatear\240 esta partici\242n."},
     {STRING_NONFORMATTEDPART,
@@ -2300,7 +2302,7 @@ MUI_STRING esESStrings[] =
     "La causa m\240s com\243n es la utilizaci\242n de un teclado USB\r\n"},
     {STRING_CONSOLEFAIL3,
     "Todav\241a no hay soporte del todo para los teclados USB\r\n"},
-    {STRING_FORMATTINGDISK,
+    {STRING_FORMATTINGPART,
     "El instalador est\240 formateando el disco"},
     {STRING_CHECKINGDISK,
     "El instalador est\240 verificando el disco"},
@@ -2310,20 +2312,18 @@ MUI_STRING esESStrings[] =
     " Formatear la partici\242n con sistema de archivos %S "},
     {STRING_KEEPFORMAT,
     " Mantener el sistema de archivos actual (sin cambios) "},
-    {STRING_HDINFOPARTCREATE_1,
+    {STRING_HDDISK1,
     "%s."},
-    {STRING_HDINFOPARTDELETE_1,
+    {STRING_HDDISK2,
     "en %s."},
     {STRING_PARTTYPE,
     "Tipo 0x%02x"},
-    {STRING_HDDINFO_1,
+    {STRING_HDDINFO1,
     // "Disco duro %lu (%I64u %s), Puerto=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
     "%I64u %s Disco duro %lu (Puerto=%hu, Bus=%hu, Id=%hu) en %wZ [%s]"},
-    {STRING_HDDINFO_2,
+    {STRING_HDDINFO2,
     // "Disco duro %lu (%I64u %s), Puerto=%hu, Bus=%hu, Id=%hu [%s]"
     "%I64u %s Disco duro %lu (Puerto=%hu, Bus=%hu, Id=%hu) [%s]"},
-    {STRING_NEWPARTITION,
-    "El instalador ha creado una nueva Partici\242n en"},
     {STRING_UNPSPACE,
     "Espacio sin particionar"},
     {STRING_MAXSIZE,
diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h
index 881f99de721..9e78d2b53c1 100644
--- a/base/setup/usetup/lang/et-EE.h
+++ b/base/setup/usetup/lang/et-EE.h
@@ -2228,17 +2228,19 @@ MUI_STRING etEEStrings[] =
      "   D = Kustuta partitsioon   F3 = V\204lju"},
     {STRING_PARTITIONSIZE,
      "Uue partitsiooni suurus:"},
-    {STRING_CHOOSENEWPARTITION,
+    {STRING_CHOOSE_NEW_PARTITION,
      "You have chosen to create a primary partition on"},
 //     "Oled valinud kettale uue partitsiooni loomise"},
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
      "You have chosen to create an extended partition on"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
      "You have chosen to create a logical partition on"},
-    {STRING_HDDSIZE,
+    {STRING_HDPARTSIZE,
     "Sisesta uue partitsiooni suurus megabaitides."},
     {STRING_CREATEPARTITION,
      "   ENTER = Loo partitsioon   ESC = Katkesta   F3 = V\204lju"},
+    {STRING_NEWPARTITION,
+    "Loodi uus partitsioon"},
     {STRING_PARTFORMAT,
     "J\204rgmisena vormindatakse seda partitsiooni."},
     {STRING_NONFORMATTEDPART,
@@ -2289,7 +2291,7 @@ MUI_STRING etEEStrings[] =
     "T\344en\204oliselt on probleem USB klaviatuuri kasutamises\r\n"},
     {STRING_CONSOLEFAIL3,
     "USB klaviatuurid ei ole veel toetatud\r\n"},
-    {STRING_FORMATTINGDISK,
+    {STRING_FORMATTINGPART,
     "K\344vaketta vormindamine"},
     {STRING_CHECKINGDISK,
     "K\344vaketta kontrollimine"},
@@ -2299,20 +2301,18 @@ MUI_STRING etEEStrings[] =
     " Vorminda partitsioon %S failis\201steemiga "},
     {STRING_KEEPFORMAT,
     " \216ra muuda praegust failis\201steemi "},
-    {STRING_HDINFOPARTCREATE_1,
+    {STRING_HDDISK1,
     "%s."},
-    {STRING_HDINFOPARTDELETE_1,
+    {STRING_HDDISK2,
     "%s."},
     {STRING_PARTTYPE,
     "Type 0x%02x"},
-    {STRING_HDDINFO_1,
+    {STRING_HDDINFO1,
     // "K\344vaketas %lu (%I64u %s), Port=%hu, Siin=%hu, Id=%hu (%wZ) [%s]"
     "%I64u %s K\344vaketas %lu (Port=%hu, Siin=%hu, Id=%hu) - %wZ [%s]"},
-    {STRING_HDDINFO_2,
+    {STRING_HDDINFO2,
     // "K\344vaketas %lu (%I64u %s), Port=%hu, Siin=%hu, Id=%hu [%s]"
     "%I64u %s K\344vaketas %lu (Port=%hu, Siin=%hu, Id=%hu) [%s]"},
-    {STRING_NEWPARTITION,
-    "Loodi uus partitsioon"},
     {STRING_UNPSPACE,
     "Kasutamata kettaruum"},
     {STRING_MAXSIZE,
diff --git a/base/setup/usetup/lang/eu-ES.h b/base/setup/usetup/lang/eu-ES.h
index 0c2688a9d8e..b225211ebcf 100644
--- a/base/setup/usetup/lang/eu-ES.h
+++ b/base/setup/usetup/lang/eu-ES.h
@@ -2235,16 +2235,18 @@ MUI_STRING euESStrings[] =
      "   D = Ezabatu Partitioa   F3 = Irten"},
     {STRING_PARTITIONSIZE,
      "Partizio berriaren tamainu:"},
-    {STRING_CHOOSENEWPARTITION,
+    {STRING_CHOOSE_NEW_PARTITION,
      "Zu aukeratu duzu partizio nagusia sortu barruan"},
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
      "Zu aukeratu duzu partizio luzatuta sortu barruan"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
      "Zu aukeratu duzu partizio logika sortu barruan"},
-    {STRING_HDDSIZE,
+    {STRING_HDPARTSIZE,
     "Mezedez osatu tamainua megabytes-en."},
     {STRING_CREATEPARTITION,
      "   SARTU = Sortu Partizioa   ESC = Utzi   F3 = Irten"},
+    {STRING_NEWPARTITION,
+    "Instalazioa sortu du partizio berria barruan"},
     {STRING_PARTFORMAT,
     "Partizio hau izango da formatuta gero."},
     {STRING_NONFORMATTEDPART,
@@ -2295,7 +2297,7 @@ MUI_STRING euESStrings[] =
     "Kausa arruntak da USB teklatua erabili\r\n"},
     {STRING_CONSOLEFAIL3,
     "USB teklatua ez dago oraindik osoan euskarri\r\n"},
-    {STRING_FORMATTINGDISK,
+    {STRING_FORMATTINGPART,
     "Instalazioa zure disko formateatzen ari da"},
     {STRING_CHECKINGDISK,
     "Instalazioa zure disko ikusten ari da"},
@@ -2305,20 +2307,18 @@ MUI_STRING euESStrings[] =
     " Formatu partizioa %S sistemaren fitxategia "},
     {STRING_KEEPFORMAT,
     " Mantendu sistemaren fitxategia (aldaketarik ez) "},
-    {STRING_HDINFOPARTCREATE_1,
+    {STRING_HDDISK1,
     "%s."},
-    {STRING_HDINFOPARTDELETE_1,
+    {STRING_HDDISK2,
     "%s."},
     {STRING_PARTTYPE,
     "Mota 0x%02x"},
-    {STRING_HDDINFO_1,
+    {STRING_HDDINFO1,
     // "Disko gogor %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
     "%I64u %s Disko gogor %lu (Port=%hu, Bus=%hu, Id=%hu) %wZn [%s]"},
-    {STRING_HDDINFO_2,
+    {STRING_HDDINFO2,
     // "Disko gogor %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
     "%I64u %s Disko gogor %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
-    {STRING_NEWPARTITION,
-    "Instalazioa sortu du partizio berria barruan"},
     {STRING_UNPSPACE,
     "Ezpartizionatu espazio"},
     {STRING_MAXSIZE,
diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h
index 4c8d04461f7..77c51003330 100644
--- a/base/setup/usetup/lang/fr-FR.h
+++ b/base/setup/usetup/lang/fr-FR.h
@@ -2264,16 +2264,18 @@ MUI_STRING frFRStrings[] =
      "   D = Supprimer partition   F3 = Quitter"},
     {STRING_PARTITIONSIZE,
      "Taille de la nouvelle partition :"},
-    {STRING_CHOOSENEWPARTITION,
+    {STRING_CHOOSE_NEW_PARTITION,
      "Vous avez choisi de cr\202er une partition primaire sur"},
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
      "Vous avez choisi de cr\202er une partition \202tendue sur"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
      "Vous avez choisi de cr\202er une partition logique sur"},
-    {STRING_HDDSIZE,
+    {STRING_HDPARTSIZE,
     "Veuillez entrer la taille de la nouvelle partition en m\202gaoctets."},
     {STRING_CREATEPARTITION,
      "   ENTR\220E = Cr\202er partition   \220CHAP = Annuler   F3 = Quitter"},
+    {STRING_NEWPARTITION,
+    "Setup a cr\202\202 une nouvelle partition sur"},
     {STRING_PARTFORMAT,
     "Cette partition sera ensuite format\202e."},
     {STRING_NONFORMATTEDPART,
@@ -2324,7 +2326,7 @@ MUI_STRING frFRStrings[] =
     "La cause probable est l'utilisation d'un clavier USB\r\n"},
     {STRING_CONSOLEFAIL3,
     "Les claviers USB ne sont pas compl\212tement support\202s 
actuellement\r\n"},
-    {STRING_FORMATTINGDISK,
+    {STRING_FORMATTINGPART,
     "Setup formate votre disque"},
     {STRING_CHECKINGDISK,
     "Setup v\202rifie votre disque"},
@@ -2334,20 +2336,18 @@ MUI_STRING frFRStrings[] =
     " Formater la partition comme syst\212me de fichiers %S "},
     {STRING_KEEPFORMAT,
     " Garder le syst\212me de fichiers courant (pas de changements) "},
-    {STRING_HDINFOPARTCREATE_1,
+    {STRING_HDDISK1,
     "%s."},
-    {STRING_HDINFOPARTDELETE_1,
+    {STRING_HDDISK2,
     "sur le %s."},
     {STRING_PARTTYPE,
     "Type 0x%02x"},
-    {STRING_HDDINFO_1,
+    {STRING_HDDINFO1,
     // "Disque dur %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
     "%I64u %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) sur %wZ [%s]"},
-    {STRING_HDDINFO_2,
+    {STRING_HDDINFO2,
     // "Disque dur %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
     "%I64u %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
-    {STRING_NEWPARTITION,
-    "Setup a cr\202\202 une nouvelle partition sur"},
     {STRING_UNPSPACE,
     "Espace non partitionn\202"},
     {STRING_MAXSIZE,
diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h
index d0b6b7a5fda..6b644999fc8 100644
--- a/base/setup/usetup/lang/he-IL.h
+++ b/base/setup/usetup/lang/he-IL.h
@@ -2229,16 +2229,18 @@ MUI_STRING heILStrings[] =
      "   \204\220\227\232\204 \214\205\210\211\201 = F3  \204\226\211\207\216 
\227\207\216 = D"},
     {STRING_PARTITIONSIZE,
      ":\204\231\203\207 \204\226\211\207\216 \214\231 \214\203\205\202"},
-    {STRING_CHOOSENEWPARTITION,
+    {STRING_CHOOSE_NEW_PARTITION,
      "\214\222 \232\211\230\227\211\222 \204\226\211\207\216 
\230\205\226\211\214 \232\230\207\201"},
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
      "\214\222 \232\201\207\230\205\216 \204\226\211\207\216 
\230\205\226\211\214 \232\230\207\201"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
      "\214\222 \232\211\202\205\214 \204\226\211\207\216 \230\205\226\211\214 
\232\230\207\201"},
-    {STRING_HDDSIZE,
+    {STRING_HDPARTSIZE,
     ".\215\211\232\201-\204\202\216\201 \204\231\203\207\204 
\204\226\211\207\216\204 \214\231 \214\203\205\202\204 \232\200 
\203\214\227\204 \204\231\227\201\201"},
     {STRING_CREATEPARTITION,
      "   \204\220\227\232\204 \214\205\210\211\201 = F3  \214\205\210\211\201 
= ESC  \204\226\211\207\216 \230\205\226 = ENTER"},
+    {STRING_NEWPARTITION,
+    "\214\222 \204\231\203\207 \204\226\211\207\216 \204\230\226\211 
\204\220\227\232\204\204 \232\211\220\213\232"},
     {STRING_PARTFORMAT,
     ".\212\231\216\204\201 \214\207\232\205\200\232 \232\200\206\204 
\204\226\211\207\216\204"},
     {STRING_NONFORMATTEDPART,
@@ -2289,7 +2291,7 @@ MUI_STRING heILStrings[] =
     "USB \232\203\214\227\216\201 \231\205\216\211\231 \200\205\204 \204\206 
\214\231 \204\226\205\224\220 \211\213\204 \204\201\211\221\204\r\n"},
     {STRING_CONSOLEFAIL3,
     "\200\214\216 \217\224\205\200\201 \232\205\213\216\232\220 \200\214 
\217\211\211\203\222 USB \232\205\203\214\227\216\r\n"},
-    {STRING_FORMATTINGDISK,
+    {STRING_FORMATTINGPART,
     "\217\220\205\213\204 \232\200 \232\214\207\232\200\216 
\204\220\227\232\204\204 \232\211\220\213\232"},
     {STRING_CHECKINGDISK,
     "\217\220\205\213\204 \232\200 \232\227\203\205\201 
\204\220\227\232\204\204 \232\211\220\213\232"},
@@ -2299,20 +2301,18 @@ MUI_STRING heILStrings[] =
     " %S \215\211\226\201\227 \232\213\230\222\216 \215\222 
\204\226\211\207\216 \214\205\207\232\200 "},
     {STRING_KEEPFORMAT,
     " (\211\205\220\211\231 \200\214\214( \232\211\207\213\205\220 
\215\211\226\201\227 \232\213\230\222\216 \232\230\200\231\204 "},
-    {STRING_HDINFOPARTCREATE_1,
+    {STRING_HDDISK1,
     "%s."},
-    {STRING_HDINFOPARTDELETE_1,
+    {STRING_HDDISK2,
     "on %s."},
     {STRING_PARTTYPE,
     "Type 0x%02x"},
-    {STRING_HDDINFO_1,
+    {STRING_HDDINFO1,
     // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
     "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"},
-    {STRING_HDDINFO_2,
+    {STRING_HDDINFO2,
     // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
     "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
-    {STRING_NEWPARTITION,
-    "\214\222 \204\231\203\207 \204\226\211\207\216 \204\230\226\211 
\204\220\227\232\204\204 \232\211\220\213\232"},
     {STRING_UNPSPACE,
     "Unpartitioned space"},
     {STRING_MAXSIZE,
diff --git a/base/setup/usetup/lang/hr-HR.h b/base/setup/usetup/lang/hr-HR.h
index 798cd0738ee..9f0c2bd47d8 100644
--- a/base/setup/usetup/lang/hr-HR.h
+++ b/base/setup/usetup/lang/hr-HR.h
@@ -2258,16 +2258,18 @@ MUI_STRING hrHRStrings[] =
      "   D = Izbri\347i particiju   F3 = Iza\320i"},
     {STRING_PARTITIONSIZE,
      "Veli\237ina nove particije:"},
-    {STRING_CHOOSENEWPARTITION,
+    {STRING_CHOOSE_NEW_PARTITION,
      "Odabrali ste stvoriti primarnu particiju na"},
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
      "Odabrali ste stvoriti pro\347irenu particiju na"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
      "Odabrali ste stvoriti logi\237ku particiju na"},
-    {STRING_HDDSIZE,
+    {STRING_HDPARTSIZE,
     "Molimo da unesite veli\237inu nove particije u MB."},
     {STRING_CREATEPARTITION,
      "   ENTER = Stvori particiju   ESC = Odustani   F3 = Iza\320i"},
+    {STRING_NEWPARTITION,
+    "Instalacijski program je stvorio novu particiju na"},
     {STRING_PARTFORMAT,
     "Ova \206e particija biti sljede\206a formatirana."},
     {STRING_NONFORMATTEDPART,
@@ -2318,7 +2320,7 @@ MUI_STRING hrHRStrings[] =
     "Naj\237e\347\206i uzrok tome je kori\347tenje USB tipkovnice\r\n"},
     {STRING_CONSOLEFAIL3,
     "USB tipkovnice nisu jo\347 potupuno podr\247ane\r\n"},
-    {STRING_FORMATTINGDISK,
+    {STRING_FORMATTINGPART,
     "Instalacijski program formatira va\347 disk"},
     {STRING_CHECKINGDISK,
     "Instalacijski sustav provjerava va\347 disk"},
@@ -2328,20 +2330,18 @@ MUI_STRING hrHRStrings[] =
     " Formatiraj particiju kao %S sustav datoteka "},
     {STRING_KEEPFORMAT,
     " \254uvaj trenutni sustav datoteka (bez promjene) "},
-    {STRING_HDINFOPARTCREATE_1,
+    {STRING_HDDISK1,
     "%s."},
-    {STRING_HDINFOPARTDELETE_1,
+    {STRING_HDDISK2,
     "na %s."},
     {STRING_PARTTYPE,
     "Vrsta 0x%02x"},
-    {STRING_HDDINFO_1,
+    {STRING_HDDINFO1,
     // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
     "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"},
-    {STRING_HDDINFO_2,
+    {STRING_HDDINFO2,
     // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
     "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
-    {STRING_NEWPARTITION,
-    "Instalacijski program je stvorio novu particiju na"},
     {STRING_UNPSPACE,
     "neparticiranom prostoru"},
     {STRING_MAXSIZE,
diff --git a/base/setup/usetup/lang/hu-HU.h b/base/setup/usetup/lang/hu-HU.h
index 84a5335e7d5..cb913f4b792 100644
--- a/base/setup/usetup/lang/hu-HU.h
+++ b/base/setup/usetup/lang/hu-HU.h
@@ -2125,16 +2125,18 @@ MUI_STRING huHUStrings[] =
      "   D = Part\241ci\242 t\224rl\202se   F3 = Kil\202p\202s"},
     {STRING_PARTITIONSIZE,
      "Az \243j part\241ci\242 m\202rete:"},
-    {STRING_CHOOSENEWPARTITION,
+    {STRING_CHOOSE_NEW_PARTITION,
      "Egy els\213dleges part\241ci\242 l\202trehoz\240s\240t v\240lasztotta 
itt:"},
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
      "Egy kiterjesztett part\241ci\242 l\202trehoz\240s\240t v\240lasztotta 
itt:"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
      "Egy logikai part\241ci\242 l\202trehoz\240s\240t v\240lasztotta itt:"},
-    {STRING_HDDSIZE,
+    {STRING_HDPARTSIZE,
     "K\202rem \241rja be az \243j part\241ci\242 m\202ret\202t 
megab\240jtban."},
     {STRING_CREATEPARTITION,
      "   ENTER = Part\241ci\242 l\202trehoz\240sa   ESC = M\202gse   F3 = 
Kil\202p\202s"},
+    {STRING_NEWPARTITION,
+    "A telep\241t\213 egy \243j part\241ci\242t hozott l\202tre itt:"},
     {STRING_PARTFORMAT,
     "K\224vetkez\213 l\202p\202sk\202nt ez a part\241ci\242 form\240zva 
lesz."},
     {STRING_NONFORMATTEDPART,
@@ -2185,7 +2187,7 @@ MUI_STRING huHUStrings[] =
     "Ennek leggyakoribb oka az USB-s billenty\373zet haszn\240lata\r\n"},
     {STRING_CONSOLEFAIL3,
     "Az USB-s billenty\373zetek m\202g nincsenek teljesen t\240mogatva\r\n"},
-    {STRING_FORMATTINGDISK,
+    {STRING_FORMATTINGPART,
     "A telep\241t\213 form\240zza a merevlemezt"},
     {STRING_CHECKINGDISK,
     "A telep\241t\213 ellen\213rzi a merevlemezt"},
@@ -2195,20 +2197,18 @@ MUI_STRING huHUStrings[] =
     " Part\241ci\242 form\240z\240sa %S f\240jlrendszerrel "},
     {STRING_KEEPFORMAT,
     " Jelenlegi f\240jlrendszer megtart\240sa (nincs v\240ltoztat\240s) "},
-    {STRING_HDINFOPARTCREATE_1,
+    {STRING_HDDISK1,
     "%s."},
-    {STRING_HDINFOPARTDELETE_1,
+    {STRING_HDDISK2,
     "itt: %s."},
     {STRING_PARTTYPE,
     "T\241pus 0x%02x"},
-    {STRING_HDDINFO_1,
+    {STRING_HDDINFO1,
     // "%lu. merevlemez (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
     "%I64u %s %lu. merevlemez (Port=%hu, Bus=%hu, Id=%hu) itt: %wZ [%s]"},
-    {STRING_HDDINFO_2,
+    {STRING_HDDINFO2,
     // "%lu. merevlemez (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
     "%I64u %s %lu. merevlemez (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
-    {STRING_NEWPARTITION,
-    "A telep\241t\213 egy \243j part\241ci\242t hozott l\202tre itt:"},
     {STRING_UNPSPACE,
     "Nem particion\240lt ter\201let"},
     {STRING_MAXSIZE,
diff --git a/base/setup/usetup/lang/id-ID.h b/base/setup/usetup/lang/id-ID.h
index 676284f7f67..1bd19e8a23e 100644
--- a/base/setup/usetup/lang/id-ID.h
+++ b/base/setup/usetup/lang/id-ID.h
@@ -2234,16 +2234,18 @@ MUI_STRING idIDStrings[] =
      "   D = Hapus Partisi   F3 = Keluar"},
     {STRING_PARTITIONSIZE,
      "Ukuran partisi baru:"},
-    {STRING_CHOOSENEWPARTITION,
+    {STRING_CHOOSE_NEW_PARTITION,
      "Anda telah memilih untuk membuat partisi primary pada"},
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
      "Anda telah memilih untuk membuat partisi extended pada"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
      "Anda telah memilih untuk membuat partisi logical pada"},
-    {STRING_HDDSIZE,
+    {STRING_HDPARTSIZE,
     "Mohon masukkan ukuran pada partisi baru dalam bentuk megabyte."},
     {STRING_CREATEPARTITION,
      "   ENTER = Buat Partisi   ESC = Batal   F3 = Keluar"},
+    {STRING_NEWPARTITION,
+    "Penyetelan membuat partisi baru pada"},
     {STRING_PARTFORMAT,
     "Partisi ini selanjutnya akan diformat."},
     {STRING_NONFORMATTEDPART,
@@ -2294,7 +2296,7 @@ MUI_STRING idIDStrings[] =
     "Secara umum penyebab dari ini adalah menggunakan papan ketik USB\r\n"},
     {STRING_CONSOLEFAIL3,
     "Papan ketik USB belum didukung sepenuhnya\r\n"},
-    {STRING_FORMATTINGDISK,
+    {STRING_FORMATTINGPART,
     "Penyetelan sedang memformat cakram anda"},
     {STRING_CHECKINGDISK,
     "Penyetelan sedang memeriksa cakram anda"},
@@ -2304,20 +2306,18 @@ MUI_STRING idIDStrings[] =
     " Format partisi sebagai sistem berkas %S  "},
     {STRING_KEEPFORMAT,
     " Tetapkan sistem berkas seperti ini (tanpa perubahan) "},
-    {STRING_HDINFOPARTCREATE_1,
+    {STRING_HDDISK1,
     "%s."},
-    {STRING_HDINFOPARTDELETE_1,
+    {STRING_HDDISK2,
     "pada %s."},
     {STRING_PARTTYPE,
     "Jenis 0x%02x"},
-    {STRING_HDDINFO_1,
+    {STRING_HDDINFO1,
     // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
     "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) pada %wZ [%s]"},
-    {STRING_HDDINFO_2,
+    {STRING_HDDINFO2,
     // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
     "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
-    {STRING_NEWPARTITION,
-    "Penyetelan membuat partisi baru pada"},
     {STRING_UNPSPACE,
     "Ukuran yang belum dipartisi"},
     {STRING_MAXSIZE,
diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h
index 8561f381f08..de6aa5c6533 100644
--- a/base/setup/usetup/lang/it-IT.h
+++ b/base/setup/usetup/lang/it-IT.h
@@ -2240,16 +2240,18 @@ MUI_STRING itITStrings[] =
      "   D = Elimina Partizione   F3 = Esci"},
     {STRING_PARTITIONSIZE,
      "Dimensione nuova partizione:"},
-    {STRING_CHOOSENEWPARTITION,
+    {STRING_CHOOSE_NEW_PARTITION,
      "Si \x8A scelto di creare una nuova partizione primaria su"},
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
      "Si \x8A scelto di creare una nuova partizione estesa su"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
      "Si \x8A scelto di creare una nuova partizione logica su"},
-    {STRING_HDDSIZE,
+    {STRING_HDPARTSIZE,
     "Indicare la dimensione della nuova partizione in megabyte."},
     {STRING_CREATEPARTITION,
      "   INVIO = Creare la partizione   ESC = Annulla   F3 = Esci"},
+    {STRING_NEWPARTITION,
+    "Setup ha creato una nuova partizione su"},
     {STRING_PARTFORMAT,
     "Questa partizione sar\x85 formattata successivamente."},
     {STRING_NONFORMATTEDPART,
@@ -2300,7 +2302,7 @@ MUI_STRING itITStrings[] =
     "La causa pi\x97 frequente di questo \x8A l'uso di una tastiera USB\r\n"},
     {STRING_CONSOLEFAIL3,
     "le tastiere USB non sono ancora completamente supportate\r\n"},
-    {STRING_FORMATTINGDISK,
+    {STRING_FORMATTINGPART,
     "Setup sta formattando il disco"},
     {STRING_CHECKINGDISK,
     "Setup sta controllando il disco"},
@@ -2310,20 +2312,18 @@ MUI_STRING itITStrings[] =
     " Formatta la partizione con file system %S "},
     {STRING_KEEPFORMAT,
     " Mantieni il file system attuale (nessuna modifica) "},
-    {STRING_HDINFOPARTCREATE_1,
+    {STRING_HDDISK1,
     "%s."},
-    {STRING_HDINFOPARTDELETE_1,
+    {STRING_HDDISK2,
     "su %s."},
     {STRING_PARTTYPE,
     "Tipo 0x%02x"},
-    {STRING_HDDINFO_1,
+    {STRING_HDDINFO1,
     // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
     "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) su %wZ [%s]"},
-    {STRING_HDDINFO_2,
+    {STRING_HDDINFO2,
     // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
     "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
-    {STRING_NEWPARTITION,
-    "Setup ha creato una nuova partizione su"},
     {STRING_UNPSPACE,
     "Spazio non partizionato"},
     {STRING_MAXSIZE,
diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h
index 86ba2f45f9b..7c07986a819 100644
--- a/base/setup/usetup/lang/ja-JP.h
+++ b/base/setup/usetup/lang/ja-JP.h
@@ -2238,17 +2238,19 @@ MUI_STRING jaJPStrings[] =
      "   D = \312\337\260\303\250\274\256\335 \273\270\274\336\256   F3 = 
\301\255\263\274"},
     {STRING_PARTITIONSIZE,
      "\261\300\327\274\262 \312\337\260\303\250\274\256\335\311 
\273\262\275\336:"},
-    {STRING_CHOOSENEWPARTITION,
+    {STRING_CHOOSE_NEW_PARTITION,
      "\314\337\327\262\317\330\260 \312\337\260\303\250\274\256\335 \311 
\273\270\276\262 \246 \264\327\313\336 \317\274\300"},
 //     "��׼� �߰è��ݦ ·�� ������ �Ķ� ���� ��ϼ�:"},
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
      "\266\270\301\256\263 \312\337\260\303\250\274\256\335 \311 
\273\270\276\262 \246 \264\327\313\336 \317\274\300"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
      "\333\335\330 \312\337\260\303\250\274\256\335 \311 \273\270\276\262 \246 
\264\327\313\336 \317\274\300"},
-    {STRING_HDDSIZE,
+    {STRING_HDPARTSIZE,
     "\261\300\327\274\262 \312\337\260\303\250\274\256\335\311 
\273\262\275\336\246 \322\266\336\312\336\262\304 \300\335\262\303\336 
\306\255\263\330\256\270 \274\303\270\300\336\273\262\241"},
     {STRING_CREATEPARTITION,
      "   ENTER = \312\337\260\303\250\274\256\335 \273\270\276\262   ESC = 
\267\254\335\276\331   F3 = \301\255\263\274"},
+    {STRING_NEWPARTITION,
+    "\276\257\304\261\257\314\337\312 \261\300\327\274\262 
\312\337\260\303\250\274\256\335\246 \302\267\336\306 
\273\270\276\262\274\317\274\300:"},
     {STRING_PARTFORMAT,
     "\272\311 \312\337\260\303\250\274\256\335\312 \302\267\336\311 
\303\274\336\255\335\303\336 \314\253\260\317\257\304 \273\332\317\275\241"},
     {STRING_NONFORMATTEDPART,
@@ -2299,7 +2301,7 @@ MUI_STRING jaJPStrings[] =
     "\262\257\312\337\335\303\267\305 \271\336\335\262\335 \304\274\303 USB 
\267\260\316\336\260\304\336 \246 \302\266\257\303 \262\331\272\304\266\336 
\266\335\266\336\264\327\332 \317\275\r\n"},
     {STRING_CONSOLEFAIL3,
     "USB \267\260\316\336\260\304\336 \312 \317\300\336 
\266\335\276\336\335\306 \273\316\337\260\304 \273\332\303 
\262\317\276\335\r\n"},
-    {STRING_FORMATTINGDISK,
+    {STRING_FORMATTINGPART,
     "\276\257\304\261\257\314\337\312 \303\336\250\275\270\246 
\314\253\260\317\257\304 \274\303\262\317\275"},
     {STRING_CHECKINGDISK,
     "\276\257\304\261\257\314\337\312 \303\336\250\275\270\246 \271\335\273 
\274\303\262\317\275\241"},
@@ -2309,20 +2311,18 @@ MUI_STRING jaJPStrings[] =
     " \312\337\260\303\250\274\256\335\246 %S \314\247\262\331 
\274\275\303\321 \303\336\314\253\260\317\257\304 "},
     {STRING_KEEPFORMAT,
     " \271\336\335\273\336\262\311 \314\247\262\331 \274\275\303\321\311 
\317\317 (\315\335\272\263 \274\305\262) "},
-    {STRING_HDINFOPARTCREATE_1,
+    {STRING_HDDISK1,
     "%s."},
-    {STRING_HDINFOPARTDELETE_1,
+    {STRING_HDDISK2,
     "on %s."},
     {STRING_PARTTYPE,
     "\274\255\331\262 0x%02x"},
-    {STRING_HDDINFO_1,
+    {STRING_HDDINFO1,
     // "\312\260\304\336\303\336\250\275\270 %lu (%I64u %s), 
\316\337\260\304=%hu, \312\336\275=%hu, Id=%hu (%wZ) [%s]"
     "%I64u %s \312\260\304\336\303\336\250\275\270 %lu (\316\337\260\304=%hu, 
\312\336\275=%hu, Id=%hu) on %wZ [%s]"},
-    {STRING_HDDINFO_2,
+    {STRING_HDDINFO2,
     // "\312\260\304\336\303\336\250\275\270 %lu (%I64u %s), 
\316\337\260\304=%hu, \312\336\275=%hu, Id=%hu [%s]"
     "%I64u %s \312\260\304\336\303\336\250\275\270 %lu (\316\337\260\304=%hu, 
\312\336\275=%hu, Id=%hu) [%s]"},
-    {STRING_NEWPARTITION,
-    "\276\257\304\261\257\314\337\312 \261\300\327\274\262 
\312\337\260\303\250\274\256\335\246 \302\267\336\306 
\273\270\276\262\274\317\274\300:"},
     {STRING_UNPSPACE,
     "\320\314\336\335\266\302\311 \275\315\337\260\275"},
     {STRING_MAXSIZE,
diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h
index 5e98513d4b8..345c60d450c 100644
--- a/base/setup/usetup/lang/lt-LT.h
+++ b/base/setup/usetup/lang/lt-LT.h
@@ -2238,16 +2238,18 @@ MUI_STRING ltLTStrings[] =
      "   D = Delete Partition   F3 = Quit"},
     {STRING_PARTITIONSIZE,
      "Size of new partition:"},
-    {STRING_CHOOSENEWPARTITION,
+    {STRING_CHOOSE_NEW_PARTITION,
      "You have chosen to create a primary partition on"},
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
      "You have chosen to create an extended partition on"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
      "You have chosen to create a logical partition on"},
-    {STRING_HDDSIZE,
+    {STRING_HDPARTSIZE,
     "Please enter the size of the new partition in megabytes."},
     {STRING_CREATEPARTITION,
      "   ENTER = Create Partition   ESC = Cancel   F3 = Quit"},
+    {STRING_NEWPARTITION,
+    "Setup created a new partition on"},
     {STRING_PARTFORMAT,
     "This Partition will be formatted next."},
     {STRING_NONFORMATTEDPART,
@@ -2298,7 +2300,7 @@ MUI_STRING ltLTStrings[] =
     "The most common cause of this is using an USB keyboard\r\n"},
     {STRING_CONSOLEFAIL3,
     "USB keyboards are not fully supported yet\r\n"},
-    {STRING_FORMATTINGDISK,
+    {STRING_FORMATTINGPART,
     "Setup is formatting your disk"},
     {STRING_CHECKINGDISK,
     "Setup is checking your disk"},
@@ -2308,20 +2310,18 @@ MUI_STRING ltLTStrings[] =
     " Format partition as %S file system "},
     {STRING_KEEPFORMAT,
     " Keep current file system (no changes) "},
-    {STRING_HDINFOPARTCREATE_1,
+    {STRING_HDDISK1,
     "%s."},
-    {STRING_HDINFOPARTDELETE_1,
+    {STRING_HDDISK2,
     "on %s."},
     {STRING_PARTTYPE,
     "Type 0x%02x"},
-    {STRING_HDDINFO_1,
+    {STRING_HDDINFO1,
     // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
     "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"},
-    {STRING_HDDINFO_2,
+    {STRING_HDDINFO2,
     // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
     "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
-    {STRING_NEWPARTITION,
-    "Setup created a new partition on"},
     {STRING_UNPSPACE,
     "Unpartitioned space"},
     {STRING_MAXSIZE,
diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h
index 50b6aba84f5..0384a3fc4ef 100644
--- a/base/setup/usetup/lang/ms-MY.h
+++ b/base/setup/usetup/lang/ms-MY.h
@@ -2219,16 +2219,18 @@ MUI_STRING msMYStrings[] =
      "   D = Menghapuskan Partition   F3 = Keluar"},
     {STRING_PARTITIONSIZE,
      "Saiz partition yang baru:"},
-    {STRING_CHOOSENEWPARTITION,
+    {STRING_CHOOSE_NEW_PARTITION,
      "Anda telah memilih untuk mencipta partition yang utama padanya"},
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
      "Anda telah memilih untuk mencipta partition yang lanjut padanya"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
      "Anda telah memilih untuk mencipta partition yang logik padanya"},
-    {STRING_HDDSIZE,
+    {STRING_HDPARTSIZE,
     "Sila masukkan saiz partition yang baru dalam megabait."},
     {STRING_CREATEPARTITION,
      "   ENTER = Mencipta Partition   ESC = Batalkan   F3 = Keluar"},
+    {STRING_NEWPARTITION,
+    "Persediaan yang dicipta partition yang baru di"},
     {STRING_PARTFORMAT,
     "Partition ini akan diformat seterusnya."},
     {STRING_NONFORMATTEDPART,
@@ -2279,7 +2281,7 @@ MUI_STRING msMYStrings[] =
     "Punca paling biasa ini menggunakan papan kekunci yang USB\r\n"},
     {STRING_CONSOLEFAIL3,
     "Papan kekunci USB tidak disokong sepenuhnya lagi\r\n"},
-    {STRING_FORMATTINGDISK,
+    {STRING_FORMATTINGPART,
     "Persediaan sedang format cakera"},
     {STRING_CHECKINGDISK,
     "Persediaan sedang menyemak cakera"},
@@ -2289,20 +2291,18 @@ MUI_STRING msMYStrings[] =
     " Format partition seperti sistem fail %S "},
     {STRING_KEEPFORMAT,
     " Memastikan sistem fail semasa (tiada perubahan) "},
-    {STRING_HDINFOPARTCREATE_1,
+    {STRING_HDDISK1,
     "%s."},
-    {STRING_HDINFOPARTDELETE_1,
+    {STRING_HDDISK2,
     "on %s."},
     {STRING_PARTTYPE,
     "Type 0x%02x"},
-    {STRING_HDDINFO_1,
+    {STRING_HDDINFO1,
     // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
     "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"},
-    {STRING_HDDINFO_2,
+    {STRING_HDDINFO2,
     // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
     "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
-    {STRING_NEWPARTITION,
-    "Persediaan yang dicipta partition yang baru di"},
     {STRING_UNPSPACE,
     "Ruang unpartitioned"},
     {STRING_MAXSIZE,
diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h
index b007421627b..c2f994ac24b 100644
--- a/base/setup/usetup/lang/nl-NL.h
+++ b/base/setup/usetup/lang/nl-NL.h
@@ -2260,17 +2260,19 @@ MUI_STRING nlNLStrings[] =
      "   D = Delete Partition   F3 = Quit"},
     {STRING_PARTITIONSIZE,
      "Grootte nieuwe partitie:"},
-    {STRING_CHOOSENEWPARTITION,
+    {STRING_CHOOSE_NEW_PARTITION,
      "You have chosen to create a primary partition on"},
 //     "U wilt een nieuwe partitie aanmaken op"},
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
      "You have chosen to create an extended partition on"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
      "You have chosen to create a logical partition on"},
-    {STRING_HDDSIZE,
+    {STRING_HDPARTSIZE,
     "Voert u de grootte van de nieuwe partitie in in megabytes."},
     {STRING_CREATEPARTITION,
      "   ENTER = Partitie Aanmaken   ESC = Annuleren   F3 = Afsluiten"},
+    {STRING_NEWPARTITION,
+    "Setup heeft een nieuwe partitie aangemaakt op"},
     {STRING_PARTFORMAT,
     "Deze partitie zal vervolgens geformatteerd worden."},
     {STRING_NONFORMATTEDPART,
@@ -2321,7 +2323,7 @@ MUI_STRING nlNLStrings[] =
     "De meest voorkomende oorzaak is het gebruik van een USB 
toetsenbord.\r\n"},
     {STRING_CONSOLEFAIL3,
     "USB toetsenborden worden nog niet volledig ondersteund.\r\n"},
-    {STRING_FORMATTINGDISK,
+    {STRING_FORMATTINGPART,
     "Setup is de vaste schijf aan het formatteren."},
     {STRING_CHECKINGDISK,
     "Setup is de vaste schijf aan het controleren."},
@@ -2331,20 +2333,18 @@ MUI_STRING nlNLStrings[] =
     " Formatteer partitie als %S bestandssysteem "},
     {STRING_KEEPFORMAT,
     " Behoud huidig bestandssysteem (geen wijzigingen) "},
-    {STRING_HDINFOPARTCREATE_1,
+    {STRING_HDDISK1,
     "%s."},
-    {STRING_HDINFOPARTDELETE_1,
+    {STRING_HDDISK2,
     "op %s."},
     {STRING_PARTTYPE,
     "Type 0x%02x"},
-    {STRING_HDDINFO_1,
+    {STRING_HDDINFO1,
     // "Schijf %lu (%I64u %s), Poort=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
     "%I64u %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) op %wZ [%s]"},
-    {STRING_HDDINFO_2,
+    {STRING_HDDINFO2,
     // "Schijf %lu (%I64u %s), Poort=%hu, Bus=%hu, Id=%hu [%s]"
     "%I64u %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) [%s]"},
-    {STRING_NEWPARTITION,
-    "Setup heeft een nieuwe partitie aangemaakt op"},
     {STRING_UNPSPACE,
     "Niet gepartitioneerde ruimte"},
     {STRING_MAXSIZE,
diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h
index 2c1407ec554..2c616e1bc59 100644
--- a/base/setup/usetup/lang/pl-PL.h
+++ b/base/setup/usetup/lang/pl-PL.h
@@ -2246,16 +2246,18 @@ MUI_STRING plPLStrings[] =
      "   D = Usuni\251cie partycji   F3 = Wyj\230cie"},
     {STRING_PARTITIONSIZE,
      "Rozmiar nowej partycji:"},
-    {STRING_CHOOSENEWPARTITION,
+    {STRING_CHOOSE_NEW_PARTITION,
      "Wybrane: utworzenie nowej partycji podstawowej na"},
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
      "Wybrane: utworzenie nowej partycji rozszerzonej na"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
      "Wybrane: utworzenie nowej partycji logicznej na"},
-    {STRING_HDDSIZE,
+    {STRING_HDPARTSIZE,
     "Prosz\251 wprowadzi\206 rozmiar nowej partycji w megabajtach."},
     {STRING_CREATEPARTITION,
      "   ENTER = Utworzenie partycji   ESC = Anulowanie   F3 = Wyj\230cie"},
+    {STRING_NEWPARTITION,
+    "Instalator utworzy\210 now\245 partycj\251"},
     {STRING_PARTFORMAT,
     "Nast\251puj\245ca partycja zostanie sformatowana."},
     {STRING_NONFORMATTEDPART,
@@ -2306,7 +2308,7 @@ MUI_STRING plPLStrings[] =
     "Najcz\251stsz\245 tego przyczyn\245 jest u\276ycie klawiatury USB.\r\n"},
     {STRING_CONSOLEFAIL3,
     "Nie s\245 obecnie w pe\210ni obs\210ugiwane.\r\n"},
-    {STRING_FORMATTINGDISK,
+    {STRING_FORMATTINGPART,
     "Instalator formatuje tw\242j dysk"},
     {STRING_CHECKINGDISK,
     "Instalator sprawdza tw\242j dysk"},
@@ -2316,20 +2318,18 @@ MUI_STRING plPLStrings[] =
     " Formatuj partycj\251 w systemie plik\242w %S "},
     {STRING_KEEPFORMAT,
     " Zachowaj obecny system plik\242w (bez zmian) "},
-    {STRING_HDINFOPARTCREATE_1,
+    {STRING_HDDISK1,
     "%s."},
-    {STRING_HDINFOPARTDELETE_1,
+    {STRING_HDDISK2,
     "na: %s."},
     {STRING_PARTTYPE,
     "Typ 0x%02x"},
-    {STRING_HDDINFO_1,
+    {STRING_HDDINFO1,
     // "Dysk twardy %lu (%I64u %s), Port=%hu, Szyna=%hu, Id=%hu (%wZ) [%s]"
     "%I64u %s Dysk twardy %lu (Port=%hu, Szyna=%hu, Id=%hu) na %wZ [%s]"},
-    {STRING_HDDINFO_2,
+    {STRING_HDDINFO2,
     // "Dysk twardy %lu (%I64u %s), Port=%hu, Szyna=%hu, Id=%hu [%s]"
     "%I64u %s Dysk twardy %lu (Port=%hu, Szyna=%hu, Id=%hu) [%s]"},
-    {STRING_NEWPARTITION,
-    "Instalator utworzy\210 now\245 partycj\251"},
     {STRING_UNPSPACE,
     "Miejsce poza partycjami"},
     {STRING_MAXSIZE,
diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h
index b4d5b5a448b..bc897c1d224 100644
--- a/base/setup/usetup/lang/pt-BR.h
+++ b/base/setup/usetup/lang/pt-BR.h
@@ -2273,17 +2273,19 @@ MUI_STRING ptBRStrings[] =
      "   D = Delete Partition   F3 = Quit"},
     {STRING_PARTITIONSIZE,
     "Tamanho da nova parti\207\306o:"},
-    {STRING_CHOOSENEWPARTITION,
+    {STRING_CHOOSE_NEW_PARTITION,
      "You have chosen to create a primary partition on"},
 //    "Voc� solicitou a cria��o de uma nova parti��o em"},
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
      "You have chosen to create an extended partition on"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
      "You have chosen to create a logical partition on"},
-    {STRING_HDDSIZE,
+    {STRING_HDPARTSIZE,
     "Por favor, insira o tamanho da nova parti\207\306o em megabytes (MB)."},
     {STRING_CREATEPARTITION,
     "   ENTER=Criar parti\207\306o  ESC=Cancelar  F3=Sair"},
+    {STRING_NEWPARTITION,
+    "O instalador criou uma nova parti\207\306o em"},
     {STRING_PARTFORMAT,
     "Esta parti\207\306o ser\240 formatada logo em seguida."},
     {STRING_NONFORMATTEDPART,
@@ -2334,7 +2336,7 @@ MUI_STRING ptBRStrings[] =
     "A causa mais com\243m \202 a utiliza\207\306o de um teclado USB\r\n"},
     {STRING_CONSOLEFAIL3,
     "Os teclados USB ainda n\306o s\306o completamente suportados\r\n"},
-    {STRING_FORMATTINGDISK,
+    {STRING_FORMATTINGPART,
     "O instalador est\240 formatando o disco"},
     {STRING_CHECKINGDISK,
     "O instalador est\240 verificando o disco"},
@@ -2344,20 +2346,18 @@ MUI_STRING ptBRStrings[] =
     " Formatar a parti\207\306o utilizando o sistema de arquivos %S "},
     {STRING_KEEPFORMAT,
     " Manter o sistema de arquivos atual (sem altera\207\344es) "},
-    {STRING_HDINFOPARTCREATE_1,
+    {STRING_HDDISK1,
     "%s."},
-    {STRING_HDINFOPARTDELETE_1,
+    {STRING_HDDISK2,
     "em %s."},
     {STRING_PARTTYPE,
     "Tipo 0x%02x"},
-    {STRING_HDDINFO_1,
+    {STRING_HDDINFO1,
     // "Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu (%wZ) [%s]"
     "%I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) em %wZ [%s]"},
-    {STRING_HDDINFO_2,
+    {STRING_HDDINFO2,
     // "Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu [%s]"
     "%I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) [%s]"},
-    {STRING_NEWPARTITION,
-    "O instalador criou uma nova parti\207\306o em"},
     {STRING_UNPSPACE,
     "Espa\207o n\306o particionado"},
     {STRING_MAXSIZE,
diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/usetup/lang/pt-PT.h
index 41cbb66cd13..f383dbfae68 100644
--- a/base/setup/usetup/lang/pt-PT.h
+++ b/base/setup/usetup/lang/pt-PT.h
@@ -2272,17 +2272,19 @@ MUI_STRING ptPTStrings[] =
      "   D = Apagar Parti\207\306o   F3 = Sair"},
     {STRING_PARTITIONSIZE,
     "Tamanho da nova parti\207\306o:"},
-    {STRING_CHOOSENEWPARTITION,
+    {STRING_CHOOSE_NEW_PARTITION,
      "Seleccionou criar uma parti\207\306o prim\240ria"},
 //    "Voc\210 solicitou a cria\207\306o de uma nova parti\207\306o em"},
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
      "Seleccionou criar uma parti\207\306o estendida"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
      "Seleccionou criar uma parti\207\306o l\242gica"},
-    {STRING_HDDSIZE,
+    {STRING_HDPARTSIZE,
     "Por favor, insira o tamanho da nova parti\207\306o em megabytes (MB)."},
     {STRING_CREATEPARTITION,
     "   ENTER=Criar parti\207\306o  ESC=Cancelar  F3=Sair"},
+    {STRING_NEWPARTITION,
+    "O instalador criou uma nova parti\207\306o em"},
     {STRING_PARTFORMAT,
     "Esta parti\207\306o ser\240 formatada logo em seguida."},
     {STRING_NONFORMATTEDPART,
@@ -2333,7 +2335,7 @@ MUI_STRING ptPTStrings[] =
     "A causa mais com\243m \202 a utiliza\207\306o de um teclado USB\r\n"},
     {STRING_CONSOLEFAIL3,
     "Os teclados USB ainda n\306o s\306o completamente suportados\r\n"},
-    {STRING_FORMATTINGDISK,
+    {STRING_FORMATTINGPART,
     "O instalador est\240 a formatar o disco"},
     {STRING_CHECKINGDISK,
     "O instalador est\240 a verificar o disco"},
@@ -2343,20 +2345,18 @@ MUI_STRING ptPTStrings[] =
     " Formatar a parti\207\306o utilizando o sistema de arquivos %S "},
     {STRING_KEEPFORMAT,
     " Manter o sistema de arquivos actual (sem altera\207\344es) "},
-    {STRING_HDINFOPARTCREATE_1,
+    {STRING_HDDISK1,
     "%s."},
-    {STRING_HDINFOPARTDELETE_1,
+    {STRING_HDDISK2,
     "em %s."},
     {STRING_PARTTYPE,
     "Tipo 0x%02x"},
-    {STRING_HDDINFO_1,
+    {STRING_HDDINFO1,
     // "Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu (%wZ) [%s]"
     "%I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) em %wZ [%s]"},
-    {STRING_HDDINFO_2,
+    {STRING_HDDINFO2,
     // "Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu [%s]"
     "%I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) [%s]"},
-    {STRING_NEWPARTITION,
-    "O instalador criou uma nova parti\207\306o em"},
     {STRING_UNPSPACE,
     "Espa\207o n\306o particionado"},
     {STRING_MAXSIZE,
diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h
index 1a543ea2325..7cabee005a3 100644
--- a/base/setup/usetup/lang/ro-RO.h
+++ b/base/setup/usetup/lang/ro-RO.h
@@ -2288,16 +2288,18 @@ MUI_STRING roROStrings[] =
      "   D = \252tergere parti\376ie   F3 = Ie\272ire"},
     {STRING_PARTITIONSIZE,
      "M\343rimea noii parti\376ii:"},
-    {STRING_CHOOSENEWPARTITION,
+    {STRING_CHOOSE_NEW_PARTITION,
      "A\376i ales crearea unei parti\376ii primare pe"},
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
      "A\376i ales crearea unei parti\376ii extinse pe"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
      "A\376i ales crearea unei parti\376ii logice pe"},
-    {STRING_HDDSIZE,
+    {STRING_HDPARTSIZE,
     "Introduce\376i m\343rimea noii parti\376ii \356n megaocte\376i."},
     {STRING_CREATEPARTITION,
      "   ENTER = Creare parti\376ie   ESC = Anulare   F3 = Ie\272ire"},
+    {STRING_NEWPARTITION,
+    "O nou\343 parti\376ie a fost creat\343 \356n"},
     {STRING_PARTFORMAT,
     "Aceast\343 parti\376ie urmeaz\343 s\343 fie formatat\343."},
     {STRING_NONFORMATTEDPART,
@@ -2348,7 +2350,7 @@ MUI_STRING roROStrings[] =
     "Cea mai frecvent\343 cauz\343 pentru asta este utilizarea unei tastaturi 
USB\r\n"},
     {STRING_CONSOLEFAIL3,
     "Tastaturile USB nu sunt \356nc\343 toate acceptate\r\n"},
-    {STRING_FORMATTINGDISK,
+    {STRING_FORMATTINGPART,
     "Disc \356n curs de formatare..."},
     {STRING_CHECKINGDISK,
     "Disc \356n curs de verificare..."},
@@ -2358,20 +2360,18 @@ MUI_STRING roROStrings[] =
     " Formateaz\343 parti\376ia ca sistem de fi\272iere %S "},
     {STRING_KEEPFORMAT,
     " P\343streaz\343 sistemul de fi\272iere actual (f\343r\343 schimb\343ri) 
"},
-    {STRING_HDINFOPARTCREATE_1,
+    {STRING_HDDISK1,
     "%s."},
-    {STRING_HDINFOPARTDELETE_1,
+    {STRING_HDDISK2,
     "de pe %s."},
     {STRING_PARTTYPE,
     "Tip 0x%02x"},
-    {STRING_HDDINFO_1,
+    {STRING_HDDINFO1,
     // "Discul %lu (%I64u %s), Port=%hu, Magistrala=%hu, Id=%hu (%wZ) [%s]"
     "%I64u %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) de tip %wZ [%s]"},
-    {STRING_HDDINFO_2,
+    {STRING_HDDINFO2,
     // "Discul %lu (%I64u %s), Port=%hu, Magistrala=%hu, Id=%hu [%s]"
     "%I64u %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) [%s]"},
-    {STRING_NEWPARTITION,
-    "O nou\343 parti\376ie a fost creat\343 \356n"},
     {STRING_UNPSPACE,
     "Spa\376iu neparti\376ionat"},
     {STRING_MAXSIZE,
diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h
index a39c99c22f6..683b130eb15 100644
--- a/base/setup/usetup/lang/ru-RU.h
+++ b/base/setup/usetup/lang/ru-RU.h
@@ -2257,16 +2257,18 @@ MUI_STRING ruRUStrings[] =
      "   D = \223\244\240\253\250\342\354 \340\240\247\244\245\253   F3 = 
\202\353\345\256\244"},
     {STRING_PARTITIONSIZE,
      "\220\240\247\254\245\340 \255\256\242\256\243\256 
\340\240\247\244\245\253\240:"},
-    {STRING_CHOOSENEWPARTITION,
+    {STRING_CHOOSE_NEW_PARTITION,
      "\202\353 \345\256\342\250\342\245 \341\256\247\244\240\342\354 
\257\245\340\242\250\347\255\353\251 \340\240\247\244\245\253 \255\240"},
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
      "\202\353 \345\256\342\250\342\245 \341\256\247\244\240\342\354 
\340\240\341\350\250\340\245\255\255\353\251 \340\240\247\244\245\253 
\255\240"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
      "\202\353 \345\256\342\250\342\245 \341\256\247\244\240\342\354 
\253\256\243\250\347\245\341\252\250\251 \340\240\247\244\245\253 \255\240"},
-    {STRING_HDDSIZE,
+    {STRING_HDPARTSIZE,
     "\217\256\246\240\253\343\251\341\342\240, \242\242\245\244\250\342\245 
\340\240\247\254\245\340 \255\256\242\256\243\256 \340\240\247\244\245\253\240 
\242 \254\245\243\240\241\240\251\342\240\345."},
     {STRING_CREATEPARTITION,
      "   ENTER = \221\256\247\244\240\342\354 \340\240\247\244\245\253   ESC = 
\216\342\254\245\255\240   F3 = \202\353\345\256\244"},
+    {STRING_NEWPARTITION,
+    "\217\340\256\243\340\240\254\254\240 \343\341\342\240\255\256\242\252\250 
\341\256\247\244\240\253\240 \255\256\242\353\251 \340\240\247\244\245\253 
\255\240:"},
     {STRING_PARTFORMAT,
     "\235\342\256\342 \340\240\247\244\245\253 \241\343\244\245\342 
\256\342\344\256\340\254\240\342\250\340\256\242\240\255 
\244\240\253\245\245."},
     {STRING_NONFORMATTEDPART,
@@ -2317,7 +2319,7 @@ MUI_STRING ruRUStrings[] =
     "\215\240\250\241\256\253\245\245 \242\245\340\256\357\342\255\240\357 
\257\340\250\347\250\255\240 \355\342\256\243\256 - 
\250\341\257\256\253\354\247\256\242\240\255\250\245 
USB-\252\253\240\242\250\240\342\343\340\353\r\n"},
     {STRING_CONSOLEFAIL3,
     "USB \252\253\240\242\250\240\342\343\340\353 \341\245\251\347\240\341 
\257\256\244\244\245\340\246\250\242\240\356\342\341\357 \255\245 
\257\256\253\255\256\341\342\354\356\r\n"},
-    {STRING_FORMATTINGDISK,
+    {STRING_FORMATTINGPART,
     "\217\340\256\243\340\240\254\254\240 \343\341\342\240\255\256\242\252\250 
\344\256\340\254\240\342\250\340\343\245\342 \242\240\350 \244\250\341\252"},
     {STRING_CHECKINGDISK,
     "\217\340\256\243\340\240\254\254\240 \343\341\342\240\255\256\242\252\250 
\257\340\256\242\245\340\357\245\342 \242\240\350 \244\250\341\252"},
@@ -2327,20 +2329,18 @@ MUI_STRING ruRUStrings[] =
     " \224\256\340\254\240\342\250\340\256\242\240\255\250\245 
\340\240\247\244\245\253\240 \242 \344\240\251\253\256\242\256\251 
\341\250\341\342\245\254\245 %S "},
     {STRING_KEEPFORMAT,
     " \216\341\342\240\242\250\342\354 
\341\343\351\245\341\342\242\343\356\351\343\356 
\344\240\251\253\256\242\343\356 \341\250\341\342\245\254\343 (\241\245\247 
\250\247\254\245\255\245\255\250\251) "},
-    {STRING_HDINFOPARTCREATE_1,
+    {STRING_HDDISK1,
     "%s."},
-    {STRING_HDINFOPARTDELETE_1,
+    {STRING_HDDISK2,
     "\255\240: %s."},
     {STRING_PARTTYPE,
     "\207\240\257\250\341\354 0x%02x"},
-    {STRING_HDDINFO_1,
+    {STRING_HDDINFO1,
     // "\206\245\341\342\252\250\251 \244\250\341\252 %lu (%I64u %s), 
\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu (%wZ) [%s]"
     "%I64u %s \206\245\341\342\252\250\251 \244\250\341\252 %lu 
(\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu) \255\240 %wZ [%s]"},
-    {STRING_HDDINFO_2,
+    {STRING_HDDINFO2,
     // "\206\245\341\342\252\250\251 \244\250\341\252 %lu (%I64u %s), 
\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu [%s]"
     "%I64u %s \206\245\341\342\252\250\251 \244\250\341\252 %lu 
(\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu) [%s]"},
-    {STRING_NEWPARTITION,
-    "\217\340\256\243\340\240\254\254\240 \343\341\342\240\255\256\242\252\250 
\341\256\247\244\240\253\240 \255\256\242\353\251 \340\240\247\244\245\253 
\255\240:"},
     {STRING_UNPSPACE,
     "\215\245\340\240\247\254\245\347\245\255\255\256\245 
\257\340\256\341\342\340\240\255\341\342\242\256"},
     {STRING_MAXSIZE,
diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h
index b8af569276d..37c06321f56 100644
--- a/base/setup/usetup/lang/sk-SK.h
+++ b/base/setup/usetup/lang/sk-SK.h
@@ -2247,17 +2247,19 @@ MUI_STRING skSKStrings[] =
      "   D = Delete Partition   F3 = Quit"},
     {STRING_PARTITIONSIZE,
      "Ve\226kos\234 novej oblasti:"},
-    {STRING_CHOOSENEWPARTITION,
+    {STRING_CHOOSE_NEW_PARTITION,
      "You have chosen to create a primary partition on"},
 //     "Zvolili ste vytvorenie novej oblasti na"},
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
      "You have chosen to create an extended partition on"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
      "You have chosen to create a logical partition on"},
-    {STRING_HDDSIZE,
+    {STRING_HDPARTSIZE,
     "Zadajte, pros\241m, ve\226kos\234 novej oblasti v megabajtoch."},
     {STRING_CREATEPARTITION,
      "   ENTER = Vytvori\234 oblas\234   ESC = Zru\347i\234   F3 = 
Skon\237i\234"},
+    {STRING_NEWPARTITION,
+    "In\347tal\240tor vytvoril nov\243 oblas\234 na"},
     {STRING_PARTFORMAT,
     "T\240to oblas\234 sa bude form\240tova\234 ako \324al\347ia."},
     {STRING_NONFORMATTEDPART,
@@ -2308,7 +2310,7 @@ MUI_STRING skSKStrings[] =
     "Najbe\247nej\347ou pr\241\237inou tohto je pou\247itie USB 
kl\240vesnice\r\n"},
     {STRING_CONSOLEFAIL3,
     "USB kl\240vesnica e\347te nie je plne podporovan\240\r\n"},
-    {STRING_FORMATTINGDISK,
+    {STRING_FORMATTINGPART,
     "In\347tal\240tor form\240tuje V\240\347 disk"},
     {STRING_CHECKINGDISK,
     "In\347tal\240tor kontroluje V\240\347 disk"},
@@ -2318,20 +2320,18 @@ MUI_STRING skSKStrings[] =
     " Naform\240tova\234 oblas\234 ako syst\202m s\243borov %S "},
     {STRING_KEEPFORMAT,
     " Ponecha\234 s\243\237asn\354 syst\202m s\243borov (bez zmeny) "},
-    {STRING_HDINFOPARTCREATE_1,
+    {STRING_HDDISK1,
     "%s."},
-    {STRING_HDINFOPARTDELETE_1,
+    {STRING_HDDISK2,
     "na: %s."},
     {STRING_PARTTYPE,
     "Typ 0x%02x"},
-    {STRING_HDDINFO_1,
+    {STRING_HDDINFO1,
     // "pevn\354 disk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
     "%I64u %s pevn\354 disk %lu (Port=%hu, Bus=%hu, Id=%hu) na %wZ [%s]"},
-    {STRING_HDDINFO_2,
+    {STRING_HDDINFO2,
     // "pevn\354 disk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
     "%I64u %s pevn\354 disk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
-    {STRING_NEWPARTITION,
-    "In\347tal\240tor vytvoril nov\243 oblas\234 na"},
     {STRING_UNPSPACE,
     "Miesto bez oblast\241"},
     {STRING_MAXSIZE,
diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h
index 6322664d6a7..f5849cade32 100644
--- a/base/setup/usetup/lang/sq-AL.h
+++ b/base/setup/usetup/lang/sq-AL.h
@@ -2248,17 +2248,19 @@ MUI_STRING sqALStrings[] =
      "   D = Delete Partition   F3 = Quit"},
     {STRING_PARTITIONSIZE,
      "Madh\211sia e particionit t\211 ri:"},
-    {STRING_CHOOSENEWPARTITION,
+    {STRING_CHOOSE_NEW_PARTITION,
 //     "You have chosen to create a primary partition on"},
      "Ju keni zgjedhur p\211r t\211 krijuar nj\211 ndarje t\211 re n\211"},
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
      "You have chosen to create an extended partition on"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
      "You have chosen to create a logical partition on"},
-    {STRING_HDDSIZE,
+    {STRING_HDPARTSIZE,
     "Ju lutem, jepini madh\211sin\211 e particionit t\211 ri n\211 megabajt."},
     {STRING_CREATEPARTITION,
      "   ENTER = Krijo Particion   ESC = Anulo   F3 = Dil"},
+    {STRING_NEWPARTITION,
+    "Instalimi krijoj nj\211 particion t\211 ri n\211"},
     {STRING_PARTFORMAT,
     "Ky particion do t\211 formatohet tani."},
     {STRING_NONFORMATTEDPART,
@@ -2309,7 +2311,7 @@ MUI_STRING sqALStrings[] =
     "Shkaku m\211 i zakonsh\211m i k\211saj \211sht\211 arsyea e perdorimit 
t\211 nj\211 tastiere USB\r\n"},
     {STRING_CONSOLEFAIL3,
     "Tastierat USB nuk jan\211 t\211 mb\211shtetura ende plot\211sisht\r\n"},
-    {STRING_FORMATTINGDISK,
+    {STRING_FORMATTINGPART,
     "Instalimi po formaton diskun tuaj"},
     {STRING_CHECKINGDISK,
     "Instalimi \211sht\211 duke kontrolluar diskun tuaj"},
@@ -2319,20 +2321,18 @@ MUI_STRING sqALStrings[] =
     " Formato particionin si %S dokumentat e sistemit"},
     {STRING_KEEPFORMAT,
     " Mbaj dokumentat e sistemit siq jan\211 (pa ndryshime) "},
-    {STRING_HDINFOPARTCREATE_1,
+    {STRING_HDDISK1,
     "%s."},
-    {STRING_HDINFOPARTDELETE_1,
+    {STRING_HDDISK2,
     "on %s."},
     {STRING_PARTTYPE,
     "Tipi 0x%02x"},
-    {STRING_HDDINFO_1,
+    {STRING_HDDINFO1,
     // "Harddisku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
     "%I64u %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"},
-    {STRING_HDDINFO_2,
+    {STRING_HDDINFO2,
     // "Harddisku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
     "%I64u %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
-    {STRING_NEWPARTITION,
-    "Instalimi krijoj nj\211 particion t\211 ri n\211"},
     {STRING_UNPSPACE,
     "Hap\211sire e papjesesezuar"},
     {STRING_MAXSIZE,
diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h
index f070d312bd9..95664b2d55a 100644
--- a/base/setup/usetup/lang/sv-SE.h
+++ b/base/setup/usetup/lang/sv-SE.h
@@ -2237,17 +2237,19 @@ MUI_STRING svSEStrings[] =
      "   D = Delete Partition   F3 = Quit"},
     {STRING_PARTITIONSIZE,
      "Storlek p\206 den nya partitionen:"},
-    {STRING_CHOOSENEWPARTITION,
+    {STRING_CHOOSE_NEW_PARTITION,
      "You have chosen to create a primary partition on"},
 //     "Du har valt att skapa en ny partition p�"},
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
      "You have chosen to create an extended partition on"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
      "You have chosen to create a logical partition on"},
-    {STRING_HDDSIZE,
+    {STRING_HDPARTSIZE,
     "V\204nligen skriv in storleken av den nya partitionen i megabytes."},
     {STRING_CREATEPARTITION,
      "   ENTER = Skapa Partition   ESC = Avbryt   F3 = Avsluta"},
+    {STRING_NEWPARTITION,
+    "Setup skapade en ny partition p\206"},
     {STRING_PARTFORMAT,
     "Denna Partition kommer att bli formaterad h\204rn\204st."},
     {STRING_NONFORMATTEDPART,
@@ -2298,7 +2300,7 @@ MUI_STRING svSEStrings[] =
     "Den vanligaste orsaken till detta \204r att ett USB tangentbord 
anv\204nds\r\n"},
     {STRING_CONSOLEFAIL3,
     "USB tangentbord \204r itne helt st\224tt \204n\r\n"},
-    {STRING_FORMATTINGDISK,
+    {STRING_FORMATTINGPART,
     "Setup formaterar din disk"},
     {STRING_CHECKINGDISK,
     "Setup under\224ker din disk"},
@@ -2308,20 +2310,18 @@ MUI_STRING svSEStrings[] =
     " Formaterar partition som %S filsystem "},
     {STRING_KEEPFORMAT,
     " Beh\206ll nuvarande filsystem (inga f\224r\204ndringar) "},
-    {STRING_HDINFOPARTCREATE_1,
+    {STRING_HDDISK1,
     "%s."},
-    {STRING_HDINFOPARTDELETE_1,
+    {STRING_HDDISK2,
     "p\206 %s."},
     {STRING_PARTTYPE,
     "Typ 0x%02x"},
-    {STRING_HDDINFO_1,
+    {STRING_HDDINFO1,
     // "H\206rddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
     "%I64u %s H\206rddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p\206 %wZ [%s]"},
-    {STRING_HDDINFO_2,
+    {STRING_HDDINFO2,
     // "H\206rddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
     "%I64u %s H\206rddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
-    {STRING_NEWPARTITION,
-    "Setup skapade en ny partition p\206"},
     {STRING_UNPSPACE,
     "Opartitionerat utrymme"},
     {STRING_MAXSIZE,
diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h
index 3b4a571c66c..59210fc1a56 100644
--- a/base/setup/usetup/lang/tr-TR.h
+++ b/base/setup/usetup/lang/tr-TR.h
@@ -2211,16 +2211,18 @@ MUI_STRING trTRStrings[] =
     "   D = B\224l\201m\201 Sil   F3 = \200\215k"},
     {STRING_PARTITIONSIZE,
     "Yeni b\224l\201m\201n b\201y\201kl\201\247\201:"},
-    {STRING_CHOOSENEWPARTITION,
+    {STRING_CHOOSE_NEW_PARTITION,
     "\232zerinde bir ana b\224l\201m olu\237turmay\215 se\207tiniz:"},
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
     "\232zerinde bir geni\237letilmi\237 b\224l\201m olu\237turmay\215 
se\207tiniz:"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
     "\232zerinde bir mant\215ksal b\224l\201m olu\237turmay\215 se\207tiniz:"},
-    {STRING_HDDSIZE,
+    {STRING_HDPARTSIZE,
     "L\201tfen yeni b\224l\201m\201n b\201y\201kl\201\247\201n\201 megabayt 
olarak giriniz."},
     {STRING_CREATEPARTITION,
     "   ENTER = B\224l\201m Olu\237tur   ESC = \230ptal   F3 = \200\215k"},
+    {STRING_NEWPARTITION,
+    "Kur, \201zerinde bir yeni b\224l\201m olu\237turdu:"},
     {STRING_PARTFORMAT,
     "Bu b\224l\201m ileride bi\207imlendirilecektir."},
     {STRING_NONFORMATTEDPART,
@@ -2271,7 +2273,7 @@ MUI_STRING trTRStrings[] =
     "Bunun en bilinen nedeni, bir USB klavye kullan\215lmas\215d\215r.\r\n"},
     {STRING_CONSOLEFAIL3,
     "USB klavye daha t\201m\201yle desteklenmemektedir.\r\n"},
-    {STRING_FORMATTINGDISK,
+    {STRING_FORMATTINGPART,
     "Kur, diskinizi bi\207imlendiriyor."},
     {STRING_CHECKINGDISK,
     "Kur, diskinizi g\224zden ge\207iriyor."},
@@ -2281,20 +2283,18 @@ MUI_STRING trTRStrings[] =
     " B\224l\201m\201 %S dosya sistemiyle bi\207imlendir. "},
     {STRING_KEEPFORMAT,
     " \236imdiki dosya sistemini koru. (De\247i\237iklik yok.) "},
-    {STRING_HDINFOPARTCREATE_1,
+    {STRING_HDDISK1,
     "%s."},
-    {STRING_HDINFOPARTDELETE_1,
+    {STRING_HDDISK2,
     "\232zerinde: %s."},
     {STRING_PARTTYPE,
     "T\201r 0x%02x"},
-    {STRING_HDDINFO_1,
+    {STRING_HDDINFO1,
     // "Sabit Disk %lu (%I64u %s), Giri\237=%hu, Veriyolu=%hu, Kimlik=%hu 
(%wZ) [%s]"
     "%I64u %s Disk %lu (Giri\237=%hu, VYolu=%hu, Kimlik=%hu), (%wZ) [%s]"},
-    {STRING_HDDINFO_2,
+    {STRING_HDDINFO2,
     // "Sabit Disk %lu (%I64u %s), Giri\237=%hu, Veriyolu=%hu, Kimlik=%hu [%s]"
     "%I64u %s Disk %lu (Giri\237=%hu, VYolu=%hu, Kimlik=%hu) [%s]"},
-    {STRING_NEWPARTITION,
-    "Kur, \201zerinde bir yeni b\224l\201m olu\237turdu:"},
     {STRING_UNPSPACE,
     "Kullan\215lmayan Alan"},
     {STRING_MAXSIZE,
diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h
index 2e7ecf94c5f..1d65687b697 100644
--- a/base/setup/usetup/lang/uk-UA.h
+++ b/base/setup/usetup/lang/uk-UA.h
@@ -2244,17 +2244,19 @@ MUI_STRING ukUAStrings[] =
      "   D = \202\250\244\240\253\250\342\250 \340\256\247\244i\253   F3 = 
\202\250\251\342\250"},
     {STRING_PARTITIONSIZE,
      "\220\256\247\254i\340 \255\256\242\256\243\256 
\340\256\247\244i\253\343:"},
-    {STRING_CHOOSENEWPARTITION,
+    {STRING_CHOOSE_NEW_PARTITION,
      "\202\250 \345\256\347\245\342\245 \341\342\242\256\340\250\342\250 
\257\245\340\242\250\255\255\250\251 \340\256\247\244i\253 \255\240"},
 //     "�� ��� �⢮�� ����� ஧�i� ��"},
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
      "\202\250 \345\256\347\245\342\245 \341\342\242\256\340\250\342\250 
\340\256\247\350\250\340\245\255\250\251 \340\256\247\244i\253 \255\240"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
      "\202\250 \345\256\347\245\342\245 \341\342\242\256\340\250\342\250 
\253\256\243i\347\255\250\251 \340\256\247\244i\253 \255\240"},
-    {STRING_HDDSIZE,
+    {STRING_HDPARTSIZE,
     "\201\343\244\354-\253\240\341\252\240, \242\242\245\244i\342\354 
\340\256\247\254i\340 \255\256\242\256\243\256 \340\256\247\244i\253\343 \242 
\254\245\243\240\241\240\251\342\240\345."},
     {STRING_CREATEPARTITION,
      "   ENTER = \221\342\242\256\340\250\342\250 \340\256\247\244i\253   ESC 
= \221\252\240\341\343\242\240\342\250   F3 = \202\250\251\342\250"},
+    {STRING_NEWPARTITION,
+    "\202\341\342\240\255\256\242\253\356\242\240\347 
\341\342\242\256\340\250\242 \255\256\242\250\251 \340\256\247\244i\253 
\255\240"},
     {STRING_PARTFORMAT,
     "\226\245\251 \340\256\247\244i\253 \241\343\244\245 
\242i\244\344\256\340\254\240\342\256\242\240\255\256."},
     {STRING_NONFORMATTEDPART,
@@ -2305,7 +2307,7 @@ MUI_STRING ukUAStrings[] =
     "\215\240\251\241i\253\354\350 \251\254\256\242i\340\255\240 
\257\340\250\347\250\255\240 \346\354\256\243\256 -  
\242\250\252\256\340\250\341\342\240\255\255\357 USB 
\252\253\240\242i\240\342\343\340\250\r\n"},
     {STRING_CONSOLEFAIL3,
     "USB \252\253\240\242i\240\342\343\340\250 \351\245 \255\245 
\257i\244\342\340\250\254\343\356\342\354\341\357 
\257\256\242\255i\341\342\356\r\n"},
-    {STRING_FORMATTINGDISK,
+    {STRING_FORMATTINGPART,
     "\202\341\342\240\255\256\242\253\356\242\240\347 
\344\256\340\254\240\342\343\363 \242\240\350 \244\250\341\252"},
     {STRING_CHECKINGDISK,
     "\202\341\342\240\255\256\242\253\356\242\240\347 
\257\245\340\245\242i\340\357\363 \242\240\350 \244\250\341\252"},
@@ -2315,20 +2317,18 @@ MUI_STRING ukUAStrings[] =
     " \224\256\340\254\240\342\343\242\240\342\250 \340\256\247\244i\253 \242 
\344\240\251\253\256\242i\251 \341\250\341\342\245\254i %S  "},
     {STRING_KEEPFORMAT,
     " \207\240\253\250\350\250\342\250 i\341\255\343\356\347\343 
\344\240\251\253\256\242\343 \341\250\341\342\245\254\343 (\241\245\247 
\247\254i\255) "},
-    {STRING_HDINFOPARTCREATE_1,
+    {STRING_HDDISK1,
     "%s."},
-    {STRING_HDINFOPARTDELETE_1,
+    {STRING_HDDISK2,
     "\255\240: %s."},
     {STRING_PARTTYPE,
     "Type 0x%02x"},
-    {STRING_HDDINFO_1,
+    {STRING_HDDINFO1,
     // "\206\256\340\341\342\252\250\251 \244\250\341\252 %lu (%I64u %s), 
\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu (%wZ) [%s]"
     "%I64u %s \206\256\340\341\342\252\250\251 \244\250\341\252 %lu 
(\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu) \255\240 %wZ [%s]"},
-    {STRING_HDDINFO_2,
+    {STRING_HDDINFO2,
     // "\206\256\340\341\342\252\250\251 \244\250\341\252 %lu (%I64u %s), 
\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu [%s]"
     "%I64u %s \206\256\340\341\342\252\250\251 \244\250\341\252 %lu 
(\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu) [%s]"},
-    {STRING_NEWPARTITION,
-    "\202\341\342\240\255\256\242\253\356\242\240\347 
\341\342\242\256\340\250\242 \255\256\242\250\251 \340\256\247\244i\253 
\255\240"},
     {STRING_UNPSPACE,
     "\215\245\340\256\247\254i\347\245\255\240 \256\241\253\240\341\342\354"},
     {STRING_MAXSIZE,
diff --git a/base/setup/usetup/mui.h b/base/setup/usetup/mui.h
index 224a679f34c..b2b2dc179a4 100644
--- a/base/setup/usetup/mui.h
+++ b/base/setup/usetup/mui.h
@@ -129,60 +129,60 @@ extern CHAR CharDoubleLowerRightCorner;
 #define TEXT_ID_FORMAT_PROMPT 1
 
 /* MUI Strings */
-#define STRING_PLEASEWAIT                1
-#define STRING_INSTALLCREATEPARTITION    2
-#define STRING_INSTALLCREATELOGICAL      60
-#define STRING_INSTALLDELETEPARTITION    3
-#define STRING_DELETEPARTITION           59
-#define STRING_PARTITIONSIZE             4
-#define STRING_CHOOSENEWPARTITION        5
-#define STRING_CHOOSE_NEW_EXTENDED_PARTITION  57
-#define STRING_CHOOSE_NEW_LOGICAL_PARTITION   61
-#define STRING_HDDSIZE                   6
-#define STRING_CREATEPARTITION           7
-#define STRING_PARTFORMAT                8
-#define STRING_NONFORMATTEDPART          9
-#define STRING_NONFORMATTEDSYSTEMPART    62
-#define STRING_NONFORMATTEDOTHERPART     63
-#define STRING_INSTALLONPART             10
-#define STRING_CONTINUE                  12
-#define STRING_QUITCONTINUE              13
-#define STRING_REBOOTCOMPUTER            14
-#define STRING_DELETING                  15
-#define STRING_MOVING                    16
-#define STRING_RENAMING                  17
-#define STRING_COPYING                   18
-#define STRING_SETUPCOPYINGFILES         19
-#define STRING_REGHIVEUPDATE             20
-#define STRING_IMPORTFILE                21
-#define STRING_DISPLAYSETTINGSUPDATE     22
-#define STRING_LOCALESETTINGSUPDATE      23
-#define STRING_KEYBOARDSETTINGSUPDATE    24
-#define STRING_CODEPAGEINFOUPDATE        25
-#define STRING_DONE                      26
-#define STRING_REBOOTCOMPUTER2           27
-#define STRING_CONSOLEFAIL1              28
-#define STRING_CONSOLEFAIL2              29
-#define STRING_CONSOLEFAIL3              30
-#define STRING_FORMATTINGDISK            31
-#define STRING_CHECKINGDISK              32
-#define STRING_FORMATDISK1               33
-#define STRING_FORMATDISK2               34
-#define STRING_KEEPFORMAT                35
-#define STRING_HDINFOPARTCREATE_1        36
-#define STRING_HDINFOPARTDELETE_1        39
-#define STRING_PARTTYPE                  42
-#define STRING_HDDINFO_1                 45
-#define STRING_HDDINFO_2                 46
-#define STRING_NEWPARTITION              47
-#define STRING_UNPSPACE                  48
-#define STRING_MAXSIZE                   49
-#define STRING_UNFORMATTED               50
-#define STRING_EXTENDED_PARTITION        58
-#define STRING_FORMATUNUSED              51
-#define STRING_FORMATUNKNOWN             52
-#define STRING_KB                        53
-#define STRING_MB                        54
-#define STRING_GB                        55
-#define STRING_ADDKBLAYOUTS              56
-#define STRING_REBOOTPROGRESSBAR         64
+#define STRING_PLEASEWAIT                   1
+#define STRING_INSTALLCREATEPARTITION       2
+#define STRING_INSTALLCREATELOGICAL         3
+#define STRING_INSTALLDELETEPARTITION       4
+#define STRING_DELETEPARTITION              5
+#define STRING_PARTITIONSIZE                6
+#define STRING_CHOOSE_NEW_PARTITION           7
+#define STRING_CHOOSE_NEW_EXTENDED_PARTITION  8
+#define STRING_CHOOSE_NEW_LOGICAL_PARTITION   9
+#define STRING_HDPARTSIZE                   10
+#define STRING_CREATEPARTITION              11
+#define STRING_NEWPARTITION                 12
+#define STRING_PARTFORMAT                   13
+#define STRING_NONFORMATTEDPART             14
+#define STRING_NONFORMATTEDSYSTEMPART       15
+#define STRING_NONFORMATTEDOTHERPART        16
+#define STRING_INSTALLONPART                17
+#define STRING_CONTINUE                     18
+#define STRING_QUITCONTINUE                 19
+#define STRING_REBOOTCOMPUTER               20
+#define STRING_DELETING                     21
+#define STRING_MOVING                       22
+#define STRING_RENAMING                     23
+#define STRING_COPYING                      24
+#define STRING_SETUPCOPYINGFILES            25
+#define STRING_REGHIVEUPDATE                26
+#define STRING_IMPORTFILE                   27
+#define STRING_DISPLAYSETTINGSUPDATE        28
+#define STRING_LOCALESETTINGSUPDATE         29
+#define STRING_KEYBOARDSETTINGSUPDATE       30
+#define STRING_CODEPAGEINFOUPDATE           31
+#define STRING_DONE                         32
+#define STRING_REBOOTCOMPUTER2              33
+#define STRING_CONSOLEFAIL1                 34
+#define STRING_CONSOLEFAIL2                 35
+#define STRING_CONSOLEFAIL3                 36
+#define STRING_FORMATTINGPART               37
+#define STRING_CHECKINGDISK                 38
+#define STRING_FORMATDISK1                  39
+#define STRING_FORMATDISK2                  40
+#define STRING_KEEPFORMAT                   41
+#define STRING_HDDISK1                      42
+#define STRING_HDDISK2                      43
+#define STRING_PARTTYPE                     44
+#define STRING_HDDINFO1                     45
+#define STRING_HDDINFO2                     46
+#define STRING_UNPSPACE                     47
+#define STRING_MAXSIZE                      48
+#define STRING_UNFORMATTED                  49
+#define STRING_EXTENDED_PARTITION           50
+#define STRING_FORMATUNUSED                 51
+#define STRING_FORMATUNKNOWN                52
+#define STRING_KB                           53
+#define STRING_MB                           54
+#define STRING_GB                           55
+#define STRING_ADDKBLAYOUTS                 56
+#define STRING_REBOOTPROGRESSBAR            57
diff --git a/base/setup/usetup/partlist.c b/base/setup/usetup/partlist.c
index d6c934bc47a..5feaf446529 100644
--- a/base/setup/usetup/partlist.c
+++ b/base/setup/usetup/partlist.c
@@ -316,7 +316,7 @@ DiskDescription(
     if (DiskEntry->DriverName.Length > 0)
     {
         RtlStringCchPrintfA(strBuffer, cchBuffer,
-                            MUIGetString(STRING_HDDINFO_1),
+                            MUIGetString(STRING_HDDINFO1),
                             DiskSize,
                             Unit,
                             DiskEntry->DiskNumber,
@@ -331,7 +331,7 @@ DiskDescription(
     else
     {
         RtlStringCchPrintfA(strBuffer, cchBuffer,
-                            MUIGetString(STRING_HDDINFO_2),
+                            MUIGetString(STRING_HDDINFO2),
                             DiskSize,
                             Unit,
                             DiskEntry->DiskNumber,
diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c
index 2cc425e9ba1..f0243187454 100644
--- a/base/setup/usetup/usetup.c
+++ b/base/setup/usetup/usetup.c
@@ -2100,13 +2100,13 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir)
 
     CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT));
 
-    CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHOOSENEWPARTITION));
+    CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHOOSE_NEW_PARTITION));
 
     DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer));
-    CONSOLE_PrintTextXY(6, 10, MUIGetString(STRING_HDINFOPARTCREATE_1),
+    CONSOLE_PrintTextXY(6, 10, MUIGetString(STRING_HDDISK1),
                         LineBuffer);
 
-    CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE));
+    CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDPARTSIZE));
 
 #if 0
     CONSOLE_PrintTextXY(8, 10, "Maximum size of the new partition is %I64u MB",
@@ -2221,10 +2221,10 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir)
     CONSOLE_SetTextXY(6, 8, 
MUIGetString(STRING_CHOOSE_NEW_EXTENDED_PARTITION));
 
     DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer));
-    CONSOLE_PrintTextXY(6, 10, MUIGetString(STRING_HDINFOPARTCREATE_1),
+    CONSOLE_PrintTextXY(6, 10, MUIGetString(STRING_HDDISK1),
                         LineBuffer);
 
-    CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE));
+    CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDPARTSIZE));
 
 #if 0
     CONSOLE_PrintTextXY(8, 10, "Maximum size of the new partition is %I64u MB",
@@ -2338,10 +2338,10 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir)
     CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHOOSE_NEW_LOGICAL_PARTITION));
 
     DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer));
-    CONSOLE_PrintTextXY(6, 10, MUIGetString(STRING_HDINFOPARTCREATE_1),
+    CONSOLE_PrintTextXY(6, 10, MUIGetString(STRING_HDDISK1),
                         LineBuffer);
 
-    CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE));
+    CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDPARTSIZE));
 
 #if 0
     CONSOLE_PrintTextXY(8, 10, "Maximum size of the new partition is %I64u MB",
@@ -2492,7 +2492,7 @@ DeletePartitionPage(PINPUT_RECORD Ir)
     CONSOLE_PrintTextXY(6, 10, "   %s", LineBuffer);
 
     DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer));
-    CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDINFOPARTDELETE_1),
+    CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDDISK2),
                         LineBuffer);
 
     while (TRUE)
@@ -2603,7 +2603,7 @@ SelectFileSystemPage(PINPUT_RECORD Ir)
                 CONSOLE_SetTextXY(8, 10, LineBuffer);
 
                 DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer));
-                CONSOLE_PrintTextXY(8, 14, 
MUIGetString(STRING_HDINFOPARTCREATE_1),
+                CONSOLE_PrintTextXY(8, 14, MUIGetString(STRING_HDDISK1),
                                     LineBuffer);
 
 
@@ -2830,7 +2830,7 @@ SelectFileSystemPage(PINPUT_RECORD Ir)
 #endif
 
         DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer));
-        CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDINFOPARTCREATE_1),
+        CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDDISK1),
                             LineBuffer);
 
         CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_PARTFORMAT));
@@ -2859,7 +2859,7 @@ SelectFileSystemPage(PINPUT_RECORD Ir)
         }
 
         DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer));
-        CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDINFOPARTCREATE_1),
+        CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDDISK1),
                             LineBuffer);
 
         CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_PARTFORMAT));
@@ -2872,7 +2872,7 @@ SelectFileSystemPage(PINPUT_RECORD Ir)
         CONSOLE_SetTextXY(8, 10, LineBuffer);
 
         DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer));
-        CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDINFOPARTDELETE_1),
+        CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDDISK2),
                             LineBuffer);
     }
 

Reply via email to