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

commit c9c6902f082f928fc105ee98d7c478ac0b31f143
Author:     Hermès Bélusca-Maïto <hermes.belusca-ma...@reactos.org>
AuthorDate: Fri Oct 27 17:08:36 2023 +0200
Commit:     Hermès Bélusca-Maïto <hermes.belusca-ma...@reactos.org>
CommitDate: Sat Oct 28 17:08:42 2023 +0200

    [USETUP] Further simplify partition creation UI code (#5837)
    
    - Use the same keypress 'C' to create either primary or logical partitions.
      Their type is automatically determined, whether they are created in
      general unpartitioned space, or space within an extended partition.
    
    - Extensively adapt the translations to reflect these changes.
---
 base/setup/usetup/lang/bg-BG.h | 72 +++++++++++++++++++-----------------------
 base/setup/usetup/lang/bn-BD.h | 13 ++------
 base/setup/usetup/lang/cs-CZ.h | 13 ++------
 base/setup/usetup/lang/da-DK.h | 13 ++------
 base/setup/usetup/lang/de-DE.h | 15 +++------
 base/setup/usetup/lang/el-GR.h | 15 ++-------
 base/setup/usetup/lang/en-US.h | 13 ++------
 base/setup/usetup/lang/es-ES.h | 11 ++-----
 base/setup/usetup/lang/et-EE.h | 13 ++------
 base/setup/usetup/lang/eu-ES.h | 13 ++------
 base/setup/usetup/lang/fr-FR.h | 13 ++------
 base/setup/usetup/lang/he-IL.h | 13 ++------
 base/setup/usetup/lang/hr-HR.h | 15 +++------
 base/setup/usetup/lang/hu-HU.h | 13 ++------
 base/setup/usetup/lang/id-ID.h | 13 ++------
 base/setup/usetup/lang/it-IT.h | 14 +++-----
 base/setup/usetup/lang/ja-JP.h | 14 ++------
 base/setup/usetup/lang/lt-LT.h | 13 ++------
 base/setup/usetup/lang/ms-MY.h |  8 ++---
 base/setup/usetup/lang/nl-NL.h | 19 ++++-------
 base/setup/usetup/lang/pl-PL.h | 13 ++------
 base/setup/usetup/lang/pt-BR.h | 22 ++++---------
 base/setup/usetup/lang/pt-PT.h | 18 +++--------
 base/setup/usetup/lang/ro-RO.h | 13 ++------
 base/setup/usetup/lang/ru-RU.h | 13 ++------
 base/setup/usetup/lang/sk-SK.h | 27 ++++++----------
 base/setup/usetup/lang/sq-AL.h | 16 +++-------
 base/setup/usetup/lang/sv-SE.h | 20 ++++--------
 base/setup/usetup/lang/tr-TR.h | 15 +++------
 base/setup/usetup/lang/uk-UA.h | 16 +++-------
 base/setup/usetup/usetup.c     | 38 ++++++----------------
 31 files changed, 152 insertions(+), 385 deletions(-)

diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h
index d2da19acb5d..8760d607926 100644
--- a/base/setup/usetup/lang/bg-BG.h
+++ b/base/setup/usetup/lang/bg-BG.h
@@ -8,7 +8,7 @@ static MUI_ENTRY bgBGSetupInitPageEntries[] =
     {
         4,
         3,
-        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " .",
+        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " ",
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
@@ -46,7 +46,7 @@ static MUI_ENTRY bgBGLanguagePageEntries[] =
     {
         4,
         3,
-        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " .",
+        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " ",
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
@@ -98,7 +98,7 @@ static MUI_ENTRY bgBGWelcomePageEntries[] =
     {
         4,
         3,
-        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " .",
+        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " ",
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
@@ -192,7 +192,7 @@ static MUI_ENTRY bgBGIntroPageEntries[] =
     {
         4,
         3,
-        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " .",
+        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " ",
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
@@ -279,7 +279,7 @@ static MUI_ENTRY bgBGLicensePageEntries[] =
     {
         4,
         3,
-        " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " 
KERNEL_VERSION_STR " .",
+        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " ",
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
@@ -422,7 +422,7 @@ static MUI_ENTRY bgBGDevicePageEntries[] =
     {
         4,
         3,
-        " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " 
KERNEL_VERSION_STR " .",
+        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " ",
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
@@ -529,7 +529,7 @@ static MUI_ENTRY bgBGRepairPageEntries[] =
     {
         4,
         3,
-        " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " 
KERNEL_VERSION_STR " .",
+        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " ",
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
@@ -602,7 +602,7 @@ static MUI_ENTRY bgBGUpgradePageEntries[] =
     {
         4,
         3,
-        " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " 
KERNEL_VERSION_STR " .",
+        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " ",
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
@@ -682,7 +682,7 @@ static MUI_ENTRY bgBGComputerPageEntries[] =
     {
         4,
         3,
-        " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " 
KERNEL_VERSION_STR " .",
+        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " ",
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
@@ -741,7 +741,7 @@ static MUI_ENTRY bgBGFlushPageEntries[] =
     {
         4,
         3,
-        " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " 
KERNEL_VERSION_STR " .",
+        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " ",
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
@@ -786,7 +786,7 @@ static MUI_ENTRY bgBGQuitPageEntries[] =
     {
         4,
         3,
-        " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " 
KERNEL_VERSION_STR " .",
+        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " ",
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
@@ -838,7 +838,7 @@ static MUI_ENTRY bgBGDisplayPageEntries[] =
     {
         4,
         3,
-        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " .",
+        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " ",
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
@@ -897,7 +897,7 @@ static MUI_ENTRY bgBGSuccessPageEntries[] =
     {
         4,
         3,
-        " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " 
KERNEL_VERSION_STR " .",
+        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " ",
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
@@ -949,7 +949,7 @@ static MUI_ENTRY bgBGSelectPartitionEntries[] =
     {
         4,
         3,
-        " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " 
KERNEL_VERSION_STR " .",
+        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " ",
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
@@ -984,28 +984,20 @@ static MUI_ENTRY bgBGSelectPartitionEntries[] =
     {
         8,
         15,
-        "\x07  \215\240\342\250\341\255\245\342\245 P \247\240 
\341\352\247\244\240\242\240\255\245 \255\240 \243\253\240\242\245\255 
\244\357\253.",
-//        "\x07  ���᭥� C �� �ꧤ����� �� ��� ��.",
+        "\x07  \215\240\342\250\341\255\245\342\245 C \247\240 
\341\352\247\244\240\242\240\255\245 \255\240 
\243\253\240\242\245\255/\253\256\243\250\347\245\341\252\250 \244\357\253.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
     {
         8,
         17,
-        "\x07  \215\240\342\250\341\255\245\342\245 E \247\240 \244\240 
\341\352\247\244\240\244\245\342\245 \244\340\343\243 \244\357\253.",
+        "\x07  \215\240\342\250\341\255\245\342\245 E \247\240 
\341\352\247\244\240\242\240\255\245 \255\240 \340\240\247\350\250\340\245\255 
\244\357\253.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
     {
         8,
         19,
-        "\x07  \215\240\342\250\341\255\245\342\245 L \247\240 \244\240 
\341\352\247\244\240\244\245\342\245 \253\256\243\250\347\245\341\252\250 
\244\357\253.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        8,
-        21,
         "\x07  \215\240\342\250\341\255\245\342\245 D \247\240 
\250\247\342\340\250\242\240\255\245 \255\240 
\341\352\351\245\341\342\242\343\242\240\351 \244\357\253.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -1152,7 +1144,7 @@ static MUI_ENTRY 
bgBGConfirmDeleteSystemPartitionEntries[] =
     {
         4,
         3,
-        " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " 
KERNEL_VERSION_STR " .",
+        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " ",
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
@@ -1260,7 +1252,7 @@ static MUI_ENTRY bgBGFormatPartitionEntries[] =
     {
         4,
         3,
-        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " .",
+        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " ",
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
@@ -1297,7 +1289,8 @@ static MUI_ENTRY bgBGCheckFSEntries[] =
 {
     {
         4,
-        3, " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " 
KERNEL_VERSION_STR " .",
+        3,
+        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " ",
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
@@ -1328,7 +1321,7 @@ static MUI_ENTRY bgBGInstallDirectoryEntries[] =
     {
         4,
         3,
-        " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " 
KERNEL_VERSION_STR " .",
+        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " ",
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
@@ -1387,7 +1380,7 @@ static MUI_ENTRY bgBGFileCopyEntries[] =
     {
         4,
         3,
-        " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " 
KERNEL_VERSION_STR " .",
+        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " ",
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
@@ -1433,7 +1426,7 @@ static MUI_ENTRY bgBGBootLoaderSelectPageEntries[] =
     {
         4,
         3,
-        " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " 
KERNEL_VERSION_STR " .",
+        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " ",
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
@@ -1523,7 +1516,7 @@ static MUI_ENTRY bgBGBootLoaderRemovableDiskPageEntries[] 
=
     {
         4,
         3,
-        " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " 
KERNEL_VERSION_STR " .",
+        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " ",
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
@@ -1576,7 +1569,7 @@ static MUI_ENTRY bgBGKeyboardSettingsEntries[] =
     {
         4,
         3,
-        " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " 
KERNEL_VERSION_STR " .",
+        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " ",
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
@@ -1635,7 +1628,7 @@ static MUI_ENTRY bgBGLayoutSettingsEntries[] =
     {
         4,
         3,
-        " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " 
KERNEL_VERSION_STR " .",
+        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " ",
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
@@ -1695,7 +1688,7 @@ static MUI_ENTRY bgBGPrepareCopyEntries[] =
     {
         4,
         3,
-        " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " 
KERNEL_VERSION_STR " .",
+        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " ",
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
@@ -1727,7 +1720,7 @@ static MUI_ENTRY bgBGSelectFSEntries[] =
     {
         4,
         3,
-        " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " 
KERNEL_VERSION_STR " .",
+        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " ",
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
@@ -1775,7 +1768,7 @@ static MUI_ENTRY bgBGDeletePartitionEntries[] =
     {
         4,
         3,
-        " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " 
KERNEL_VERSION_STR " .",
+        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " ",
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
@@ -1827,7 +1820,7 @@ static MUI_ENTRY bgBGRegistryEntries[] =
     {
         4,
         3,
-        " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " 
KERNEL_VERSION_STR " .",
+        " \210\255\341\342\240\253\250\340\240\255\245 \255\240 ReactOS " 
KERNEL_VERSION_STR " ",
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
@@ -2243,10 +2236,9 @@ MUI_STRING bgBGStrings[] =
     {STRING_PLEASEWAIT,
      "   \214\256\253\357 \250\247\347\240\252\240\251\342\245..."},
     {STRING_INSTALLCREATEPARTITION,
-     "   ENTER = \210\255\341\342\240\253\250\340\240\251   P = 
\221\352\247\244\240\251\342\245 \257\352\340\242\250\347\245\255   E = 
\221\352\247\244\240\251\342\245 \340\240\247\350\250\340\245\255   F3 = 
\210\247\345\256\244"},
-//     "   ENTER = �������   C = �ꧤ����� �� ��   F3 = ��室"},
+     "   ENTER = \210\255\341\342\240\253\250\340\240\251   C = 
\221\352\247\244\240\251\342\245 \257\352\340\242\250\347\245\255   E = 
\221\352\247\244\240\251\342\245 \340\240\247\350\250\340\245\255   F3 = 
\210\247\345\256\244"},
     {STRING_INSTALLCREATELOGICAL,
-     "   ENTER = \210\255\341\342\240\253\250\340\240\251   L = 
\221\352\247\244\240\251 \253\256\243\250\347\245\341\252\250 
\257\240\340\342\250\350\352\255   F3 = \210\247\345\256\244"},
+     "   ENTER = \210\255\341\342\240\253\250\340\240\251   C = 
\221\352\247\244\240\251 \253\256\243\250\347\245\341\252\250 
\257\240\340\342\250\350\352\255   F3 = \210\247\345\256\244"},
     {STRING_INSTALLDELETEPARTITION,
      "   ENTER = \210\255\341\342\240\253\250\340\240\251   D = 
\210\247\342\340\250\242\240\255\245 \255\240 \244\357\253   F3 = 
\210\247\345\256\244"},
     {STRING_DELETEPARTITION,
diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h
index 1be6aaa9384..cae01ab8627 100644
--- a/base/setup/usetup/lang/bn-BD.h
+++ b/base/setup/usetup/lang/bn-BD.h
@@ -968,7 +968,7 @@ static MUI_ENTRY bnBDSelectPartitionEntries[] =
     {
         8,
         15,
-        "\x07  Press P to create a primary partition.",
+        "\x07  Press C to create a primary/logical partition.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -982,13 +982,6 @@ static MUI_ENTRY bnBDSelectPartitionEntries[] =
     {
         8,
         19,
-        "\x07  Press L to create a logical partition.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        8,
-        21,
         "\x07  Press D to delete an existing partition.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -2218,9 +2211,9 @@ MUI_STRING bnBDStrings[] =
     {STRING_PLEASEWAIT,
      "   Please wait..."},
     {STRING_INSTALLCREATEPARTITION,
-     "   ENTER = Install   P = Create Primary   E = Create Extended   F3 = 
Quit"},
+     "   ENTER = Install   C = Create Primary   E = Create Extended   F3 = 
Quit"},
     {STRING_INSTALLCREATELOGICAL,
-     "   ENTER = Install   L = Create Logical Partition   F3 = Quit"},
+     "   ENTER = Install   C = Create Logical Partition   F3 = Quit"},
     {STRING_INSTALLDELETEPARTITION,
      "   ENTER = Install   D = Delete Partition   F3 = Quit"},
     {STRING_DELETEPARTITION,
diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h
index 74ebdc9ebf8..dc39496c539 100644
--- a/base/setup/usetup/lang/cs-CZ.h
+++ b/base/setup/usetup/lang/cs-CZ.h
@@ -976,7 +976,7 @@ static MUI_ENTRY csCZSelectPartitionEntries[] =
     {
         8,
         15,
-        "\x07  Stistknut\241m P vytvo\375\241te prim\240rn\241 odd\241l.",
+        "\x07  Stistknut\241m C vytvo\375\241te prim\240rn\241/logick\354 
odd\241l.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -990,13 +990,6 @@ static MUI_ENTRY csCZSelectPartitionEntries[] =
     {
         8,
         19,
-        "\x07  Press L to create a logical partition.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        8,
-        21,
         "\x07  Stisknut\241m D umo\247n\241te smaz\240n\241 existuj\241c\241ho 
odd\241lu.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -2226,9 +2219,9 @@ MUI_STRING csCZStrings[] =
     {STRING_PLEASEWAIT,
      "   \254ekejte, pros\241m..."},
     {STRING_INSTALLCREATEPARTITION,
-     "   ENTER = Instalovat   P = Nov\354 prim\240rn\241   E = Nov\354 
roz\347\241\375en\354   F3 = Ukon\237it"},
+     "   ENTER = Instalovat   C = Nov\354 prim\240rn\241   E = Nov\354 
roz\347\241\375en\354   F3 = Ukon\237it"},
     {STRING_INSTALLCREATELOGICAL,
-     "   ENTER = Instalovat   L = Vytvo\375it logick\354 odd\241l   F3 = 
Ukon\237it"},
+     "   ENTER = Instalovat   C = Vytvo\375it logick\354 odd\241l   F3 = 
Ukon\237it"},
     {STRING_INSTALLDELETEPARTITION,
      "   ENTER = Instalovat   D = Odstranit odd\241l   F3 = Ukon\237it"},
     {STRING_DELETEPARTITION,
diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h
index d388585ff82..b840c30ed36 100644
--- a/base/setup/usetup/lang/da-DK.h
+++ b/base/setup/usetup/lang/da-DK.h
@@ -977,7 +977,7 @@ static MUI_ENTRY daDKSelectPartitionEntries[] =
     {
         8,
         15,
-        "\x07  Tryk p\206 P for at lave en ny prim\221r partition.",
+        "\x07  Tryk p\206 C for at lave en ny prim\221r/logisk partition.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -991,13 +991,6 @@ static MUI_ENTRY daDKSelectPartitionEntries[] =
     {
         8,
         19,
-        "\x07  Tryk p\206 L for at lave en ny logisk partition.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        8,
-        21,
         "\x07  Tryk p\206 D for at slette en eksisterende partition.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -2228,9 +2221,9 @@ MUI_STRING daDKStrings[] =
     {STRING_PLEASEWAIT,
      "   Vent..."},
     {STRING_INSTALLCREATEPARTITION,
-     "   ENTER = installer   P = Lav prim\221r   E = Lav udviddet   F3 = 
Afslut"},
+     "   ENTER = installer   C = Lav prim\221r   E = Lav udviddet   F3 = 
Afslut"},
     {STRING_INSTALLCREATELOGICAL,
-     "   ENTER = installer   L = Lav logisk partition   F3 = Afslut"},
+     "   ENTER = installer   C = Lav logisk partition   F3 = Afslut"},
     {STRING_INSTALLDELETEPARTITION,
      "   ENTER = installer   D = Slet partition   F3 = Afslut"},
     {STRING_DELETEPARTITION,
diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h
index 16529f96707..01915b9d493 100644
--- a/base/setup/usetup/lang/de-DE.h
+++ b/base/setup/usetup/lang/de-DE.h
@@ -963,7 +963,7 @@ static MUI_ENTRY deDESelectPartitionEntries[] =
     {
         8,
         15,
-        "\x07  P erstellt eine prim\204re Partition.",
+        "\x07  C erstellt eine prim\204re/logische Partition.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -977,13 +977,6 @@ static MUI_ENTRY deDESelectPartitionEntries[] =
     {
         8,
         19,
-        "\x07  L erstellt eine logische Partition.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        8,
-        21,
         "\x07  D l\224scht eine vorhandene Partition.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -2230,9 +2223,9 @@ MUI_STRING deDEStrings[] =
     {STRING_PLEASEWAIT,
      "   Bitte warten..."},
     {STRING_INSTALLCREATEPARTITION,
-     "  ENTER = Installieren   P = Prim\204re   E = Erweiterte   F3 = 
Installation abbr."},
+     "  ENTER = Installieren   C = Prim\204re   E = Erweiterte   F3 = 
Installation abbr."},
     {STRING_INSTALLCREATELOGICAL,
-     "  ENTER = Installieren   L = Logisches Laufwerk   F3 = Installation 
abbrechen"},
+     "  ENTER = Installieren   C = Logische Partition   F3 = Installation 
abbrechen"},
     {STRING_INSTALLDELETEPARTITION,
      "  ENTER = Installieren   D = Partition l\224schen   F3 = Installation 
abbrechen"},
     {STRING_DELETEPARTITION,
@@ -2244,7 +2237,7 @@ MUI_STRING deDEStrings[] =
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
      "Eine erweiterte Partition soll hier erstellt werden:"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
-     "Ein logisches Laufwerk soll hier erstellt werden:"},
+     "Eine logische Partition soll hier erstellt werden:"},
     {STRING_HDPARTSIZE,
     "Bitte geben Sie die Gr\224\341e der neuen Partition in Megabyte ein."},
     {STRING_CREATEPARTITION,
diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h
index 2a71f69195f..f8fa94c0bda 100644
--- a/base/setup/usetup/lang/el-GR.h
+++ b/base/setup/usetup/lang/el-GR.h
@@ -984,8 +984,7 @@ static MUI_ENTRY elGRSelectPartitionEntries[] =
     {
         8,
         15,
-        "\x07  Press P to create a primary partition.",
-//        "\x07  ���㩫� C ��� �� ��������㩜�� ⤘ �� ����⨠���.",
+        "\x07  Press C to create a primary/logical partition.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -999,13 +998,6 @@ static MUI_ENTRY elGRSelectPartitionEntries[] =
     {
         8,
         19,
-        "\x07  Press L to create a logical partition.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        8,
-        21,
         "\x07  \217\230\253\343\251\253\234 D \232\240\230 \244\230 
\233\240\230\232\250\341\257\234\253\234 \342\244\230 
\254\247\341\250\256\246\244 \233\240\230\243\342\250\240\251\243\230.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -2241,10 +2233,9 @@ MUI_STRING elGRStrings[] =
     {STRING_PLEASEWAIT,
      "   \217\230\250\230\241\230\242\351 
\247\234\250\240\243\342\244\234\253\234..."},
     {STRING_INSTALLCREATEPARTITION,
-     "   ENTER = Install   P = Create Primary   E = Create Extended   F3 = 
Quit"},
-//     "   ENTER = �����ᩫ���   C = ��������� Partition   F3 = ����騞��"},
+     "   ENTER = Install   C = Create Primary   E = Create Extended   F3 = 
Quit"},
     {STRING_INSTALLCREATELOGICAL,
-     "   ENTER = Install   L = Create Logical Partition   F3 = Quit"},
+     "   ENTER = Install   C = Create Logical Partition   F3 = Quit"},
     {STRING_INSTALLDELETEPARTITION,
      "   ENTER = \204\232\241\230\253\341\251\253\230\251\236   D = 
\203\240\230\232\250\230\255\343 Partition   F3 = 
\200\247\246\256\351\250\236\251\236"},
     {STRING_DELETEPARTITION,
diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h
index 12c893d6d94..78434f0f542 100644
--- a/base/setup/usetup/lang/en-US.h
+++ b/base/setup/usetup/lang/en-US.h
@@ -968,7 +968,7 @@ static MUI_ENTRY enUSSelectPartitionEntries[] =
     {
         8,
         15,
-        "\x07  Press P to create a primary partition.",
+        "\x07  Press C to create a primary/logical partition.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -982,13 +982,6 @@ static MUI_ENTRY enUSSelectPartitionEntries[] =
     {
         8,
         19,
-        "\x07  Press L to create a logical partition.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        8,
-        21,
         "\x07  Press D to delete an existing partition.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -2218,9 +2211,9 @@ MUI_STRING enUSStrings[] =
     {STRING_PLEASEWAIT,
      "   Please wait..."},
     {STRING_INSTALLCREATEPARTITION,
-     "   ENTER = Install   P = Create Primary   E = Create Extended   F3 = 
Quit"},
+     "   ENTER = Install   C = Create Primary   E = Create Extended   F3 = 
Quit"},
     {STRING_INSTALLCREATELOGICAL,
-     "   ENTER = Install   L = Create Logical Partition   F3 = Quit"},
+     "   ENTER = Install   C = Create Logical Partition   F3 = Quit"},
     {STRING_INSTALLDELETEPARTITION,
      "   ENTER = Install   D = Delete Partition   F3 = Quit"},
     {STRING_DELETEPARTITION,
diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h
index 374182c5c30..a85a8b73992 100644
--- a/base/setup/usetup/lang/es-ES.h
+++ b/base/setup/usetup/lang/es-ES.h
@@ -973,7 +973,7 @@ static MUI_ENTRY esESSelectPartitionEntries[] =
     {
         8,
         15,
-        "\x07  Pulse P para crear una Partici\242n Primaria.",
+        "\x07  Pulse C para crear una Partici\242n Primaria/L\242gica.",
 //        "\x07  Pulse C para crear una Nueva Partici\242n.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -988,13 +988,6 @@ static MUI_ENTRY esESSelectPartitionEntries[] =
     {
         8,
         19,
-        "\x07  Pulse L para crear una Partici\242n L\242gica.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        8,
-        21,
         "\x07  Pulse D para eliminar una Partici\242n existente.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -2231,7 +2224,7 @@ MUI_STRING esESStrings[] =
     {STRING_PLEASEWAIT,
      "   Espere un momento..."},
     {STRING_INSTALLCREATEPARTITION,
-     "   INTRO = Instalar  P = Crear Primaria   E = Crear Extendida   F3 = 
Salir"},
+     "   INTRO = Instalar  C = Crear Primaria   E = Crear Extendida   F3 = 
Salir"},
     {STRING_INSTALLCREATELOGICAL,
      "   INTRO = Instalar  C = Crear Partici\242n L\242gica   F3 = Salir"},
     {STRING_DELETEPARTITION,
diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h
index 8daf974411c..b851eec9780 100644
--- a/base/setup/usetup/lang/et-EE.h
+++ b/base/setup/usetup/lang/et-EE.h
@@ -970,7 +970,7 @@ static MUI_ENTRY etEESelectPartitionEntries[] =
     {
         8,
         15,
-        "\x07  Vajuta P uue primaarse partitsiooni loomiseks.",
+        "\x07  Vajuta C uue primaarse/loogilise partitsiooni loomiseks.",
 //        "\x07  Vajuta C, et teha uus partitsioon.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -985,13 +985,6 @@ static MUI_ENTRY etEESelectPartitionEntries[] =
     {
         8,
         19,
-        "\x07  Vajuta L uue loogilise partitsiooni loomiiseks.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        8,
-        21,
         "\x07  Vajuta D olemasoleva partitsiooni kustutamiseks.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -2219,9 +2212,9 @@ MUI_STRING etEEStrings[] =
     {STRING_PLEASEWAIT,
      "   Palun oota..."},
     {STRING_INSTALLCREATEPARTITION,
-     "   ENTER = Paigalda   P = Loo primaarne   E = Loo laiendatud   F3 = 
V\204lju"},
+     "   ENTER = Paigalda   C = Loo primaarne   E = Loo laiendatud   F3 = 
V\204lju"},
     {STRING_INSTALLCREATELOGICAL,
-     "   ENTER = Paigalda   L = Loo loogiline partitsioon   F3 = V\204lju"},
+     "   ENTER = Paigalda   C = Loo loogiline partitsioon   F3 = V\204lju"},
     {STRING_INSTALLDELETEPARTITION,
      "   ENTER = Paigalda  D = Kustuta partitsioon  F3 = V\204lju"},
     {STRING_DELETEPARTITION,
diff --git a/base/setup/usetup/lang/eu-ES.h b/base/setup/usetup/lang/eu-ES.h
index 715e941dc7f..346356dfdbf 100644
--- a/base/setup/usetup/lang/eu-ES.h
+++ b/base/setup/usetup/lang/eu-ES.h
@@ -969,7 +969,7 @@ static MUI_ENTRY euESSelectPartitionEntries[] =
     {
         8,
         15,
-        "\x07  Sakatu P partizio nagusi bat sortzeko.",
+        "\x07  Sakatu C partizio nagusi/logika bat sortzeko.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -983,13 +983,6 @@ static MUI_ENTRY euESSelectPartitionEntries[] =
     {
         8,
         19,
-        "\x07  Sakatu L partizio logika bat sortzeko.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        8,
-        21,
         "\x07  Sakatu D dagoen partizio kentzeko.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -2226,9 +2219,9 @@ MUI_STRING euESStrings[] =
     {STRING_PLEASEWAIT,
      "   Itxaron mesedez..."},
     {STRING_INSTALLCREATEPARTITION,
-     "   SARTU = Instalatu   P = Sortu Nagusia   E = Sortu Luzatuta   F3 = 
Irten"},
+     "   SARTU = Instalatu   C = Sortu Nagusia   E = Sortu Luzatuta   F3 = 
Irten"},
     {STRING_INSTALLCREATELOGICAL,
-     "   SARTU = Instalatu   L = Sortu Partizio Logika   F3 = Irten"},
+     "   SARTU = Instalatu   C = Sortu Partizio Logika   F3 = Irten"},
     {STRING_INSTALLDELETEPARTITION,
      "   SARTU = Instalatu   D = Ezabatu Partitioa   F3 = Irten"},
     {STRING_DELETEPARTITION,
diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h
index a566b159c46..0550291c440 100644
--- a/base/setup/usetup/lang/fr-FR.h
+++ b/base/setup/usetup/lang/fr-FR.h
@@ -991,7 +991,7 @@ static MUI_ENTRY frFRSelectPartitionEntries[] =
     {
         8,
         15,
-        "\x07  Appuyer sur P pour cr\202er une partition primaire.",
+        "\x07  Appuyer sur C pour cr\202er une partition primaire/logique.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1005,13 +1005,6 @@ static MUI_ENTRY frFRSelectPartitionEntries[] =
     {
         8,
         19,
-        "\x07  Appuyer sur L pour cr\202er une partition logique.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        8,
-        21,
         "\x07  Appuyer sur D pour effacer une partition.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -2255,9 +2248,9 @@ MUI_STRING frFRStrings[] =
     {STRING_PLEASEWAIT,
      "   Veuillez patienter..."},
     {STRING_INSTALLCREATEPARTITION,
-     "   ENTR\220E = Installer   P/E = Cr\202er partition Primaire/\220tendue  
 F3 = Quitter"},
+     "   ENTR\220E = Installer   C/E = Cr\202er partition Primaire/\220tendue  
 F3 = Quitter"},
     {STRING_INSTALLCREATELOGICAL,
-     "   ENTR\220E = Installer   L = Cr\202er partition Logique   F3 = 
Quitter"},
+     "   ENTR\220E = Installer   C = Cr\202er partition Logique   F3 = 
Quitter"},
     {STRING_INSTALLDELETEPARTITION,
      "   ENTR\220E = Installer   D = Supprimer partition   F3 = Quitter"},
     {STRING_DELETEPARTITION,
diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h
index 7a149ee68cb..bc689e1d187 100644
--- a/base/setup/usetup/lang/he-IL.h
+++ b/base/setup/usetup/lang/he-IL.h
@@ -972,7 +972,7 @@ static MUI_ENTRY heILSelectPartitionEntries[] =
     {
         8,
         15,
-        "\x07  .\232\211\231\200\230 \204\226\211\207\216 \230\205\226\211\214 
\211\203\213 P \225\207\214",
+        "\x07  .\232\211\202\205\214/\232\211\231\200\230 \204\226\211\207\216 
\230\205\226\211\214 \211\203\213 C \225\207\214",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -986,13 +986,6 @@ static MUI_ENTRY heILSelectPartitionEntries[] =
     {
         8,
         19,
-        "\x07  .\232\211\202\205\214 \204\226\211\207\216 \230\205\226\211\214 
\211\203\213 L \225\207\214",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        8,
-        21,
         "\x07  .\232\216\211\211\227 \204\226\211\207\216 \227\205\207\216\214 
\211\203\213 D \225\207\214",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -2220,9 +2213,9 @@ MUI_STRING heILStrings[] =
     {STRING_PLEASEWAIT,
      "   ...\217\211\232\216\204\214 \200\220"},
     {STRING_INSTALLCREATEPARTITION,
-     "   \204\220\227\232\204 \214\205\210\211\201 = F3  
\232\201\207\230\205\216 \230\205\226 = E  \232\211\231\200\230 \230\205\226 = 
P  \217\227\232\204 = ENTER"},
+     "   \204\220\227\232\204 \214\205\210\211\201 = F3  
\232\201\207\230\205\216 \230\205\226 = E  \232\211\231\200\230 \230\205\226 = 
C  \217\227\232\204 = ENTER"},
     {STRING_INSTALLCREATELOGICAL,
-     "   \204\220\227\232\204 \214\205\210\211\201 = F3  \232\211\202\205\214 
\204\226\211\207\216 \230\205\226 = L  \217\227\232\204 = ENTER"},
+     "   \204\220\227\232\204 \214\205\210\211\201 = F3  \232\211\202\205\214 
\204\226\211\207\216 \230\205\226 = C  \217\227\232\204 = ENTER"},
     {STRING_INSTALLDELETEPARTITION,
      "   \204\220\227\232\204 \214\205\210\211\201 = F3  \204\226\211\207\216 
\227\207\216 = D  \217\227\232\204 = ENTER"},
     {STRING_DELETEPARTITION,
diff --git a/base/setup/usetup/lang/hr-HR.h b/base/setup/usetup/lang/hr-HR.h
index a7625d5559b..d03214c678d 100644
--- a/base/setup/usetup/lang/hr-HR.h
+++ b/base/setup/usetup/lang/hr-HR.h
@@ -978,27 +978,20 @@ static MUI_ENTRY hrHRSelectPartitionEntries[] =
     {
         8,
         15,
-        "\x07  Pritisnite P da biste stvorili primarnu particiju.",
+        "\x07  Pritisnite C da biste stvorili primarnu/logi\237ku particiju.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
     {
         8,
         17,
-        "\x07  Pritisnite P da biste stvorili pro\347irenu particiju.",
+        "\x07  Pritisnite E da biste stvorili pro\347irenu particiju.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
     {
         8,
         19,
-        "\x07  Pritisnite P da biste stvorili logi\237ku particiju.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        8,
-        21,
         "\x07  Pritisnite D da biste izbrisali postoje\206u particiju.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -2249,9 +2242,9 @@ MUI_STRING hrHRStrings[] =
     {STRING_PLEASEWAIT,
      "   Molimo pri\237ekajte..."},
     {STRING_INSTALLCREATEPARTITION,
-     "   ENTER = Instaliraj   P = Stvori Primarnu   E = Stvori Pro\347irenu   
F3 = Iza\320i"},
+     "   ENTER = Instaliraj   C = Stvori Primarnu   E = Stvori Pro\347irenu   
F3 = Iza\320i"},
     {STRING_INSTALLCREATELOGICAL,
-     "   ENTER = Instaliraj   L = Stvori Logi\237ku particiju  F3 = Iza\320i"},
+     "   ENTER = Instaliraj   C = Stvori Logi\237ku particiju  F3 = Iza\320i"},
     {STRING_INSTALLDELETEPARTITION,
      "   ENTER = Instaliraj   D = Izbri\347i particiju   F3 = Iza\320i"},
     {STRING_DELETEPARTITION,
diff --git a/base/setup/usetup/lang/hu-HU.h b/base/setup/usetup/lang/hu-HU.h
index 80c46b1d244..94d08dd0d9e 100644
--- a/base/setup/usetup/lang/hu-HU.h
+++ b/base/setup/usetup/lang/hu-HU.h
@@ -977,7 +977,7 @@ static MUI_ENTRY huHUSelectPartitionEntries[] =
     {
         8,
         15,
-        "\x07  Nyomjon P-t egy els\213dleges part\241ci\242 
l\202trehoz\240s\240hoz.",
+        "\x07  Nyomjon C-t egy els\213dleges/logikai part\241ci\242 
l\202trehoz\240s\240hoz.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -991,13 +991,6 @@ static MUI_ENTRY huHUSelectPartitionEntries[] =
     {
         8,
         19,
-        "\x07  Nyomjon L-t egy logikai part\241ci\242 
l\202trehoz\240s\240hoz.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        8,
-        21,
         "\x07  Nyomjon D-t egy megl\202v\213 part\241ci\242 
t\224rl\202s\202hez.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -2116,9 +2109,9 @@ MUI_STRING huHUStrings[] =
     {STRING_PLEASEWAIT,
      "   K\202rem v\240rjon..."},
     {STRING_INSTALLCREATEPARTITION,
-     "   ENTER = Telep\241t\202s   P = \351j els\213dleges   E = \351j 
kiterjesztett   F3 = Kil\202p\202s"},
+     "   ENTER = Telep\241t\202s   C = \351j els\213dleges   E = \351j 
kiterjesztett   F3 = Kil\202p\202s"},
     {STRING_INSTALLCREATELOGICAL,
-     "   ENTER = Telep\241t\202s   L = Logikai part\241ci\242 
l\202trehoz\240sa   F3 = Kil\202p\202s"},
+     "   ENTER = Telep\241t\202s   C = Logikai part\241ci\242 
l\202trehoz\240sa   F3 = Kil\202p\202s"},
     {STRING_INSTALLDELETEPARTITION,
      "   ENTER = Telep\241t\202s   D = Part\241ci\242 t\224rl\202se   F3 = 
Kil\202p\202s"},
     {STRING_DELETEPARTITION,
diff --git a/base/setup/usetup/lang/id-ID.h b/base/setup/usetup/lang/id-ID.h
index abe1bcb28b3..30e6c219288 100644
--- a/base/setup/usetup/lang/id-ID.h
+++ b/base/setup/usetup/lang/id-ID.h
@@ -968,7 +968,7 @@ static MUI_ENTRY idIDSelectPartitionEntries[] =
     {
         8,
         15,
-        "\x07  Tekan P untuk membuat partisi primary.",
+        "\x07  Tekan C untuk membuat partisi primary/logical.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -982,13 +982,6 @@ static MUI_ENTRY idIDSelectPartitionEntries[] =
     {
         8,
         19,
-        "\x07  Tekan L untuk membuat partisi logical.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        8,
-        21,
         "\x07  Tekan D untuk menghapus partisi yang tersedia.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -2225,9 +2218,9 @@ MUI_STRING idIDStrings[] =
     {STRING_PLEASEWAIT,
      "   Mohon tunggu..."},
     {STRING_INSTALLCREATEPARTITION,
-     "   ENTER = Pasang   P = Buat Primary   E = Buat Extended   F3 = Keluar"},
+     "   ENTER = Pasang   C = Buat Primary   E = Buat Extended   F3 = Keluar"},
     {STRING_INSTALLCREATELOGICAL,
-     "   ENTER = Pasang   L = Buat Partisi Logical   F3 = Keluar"},
+     "   ENTER = Pasang   C = Buat Partisi Logical   F3 = Keluar"},
     {STRING_INSTALLDELETEPARTITION,
      "   ENTER = Pasang   D = Hapus Partisi   F3 = Keluar"},
     {STRING_DELETEPARTITION,
diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h
index 8d49eb82e9f..0ea6e6f42e9 100644
--- a/base/setup/usetup/lang/it-IT.h
+++ b/base/setup/usetup/lang/it-IT.h
@@ -967,7 +967,8 @@ static MUI_ENTRY itITSelectPartitionEntries[] =
     {
         8,
         15,
-        "\x07  Premere P per creare una nuova partizione.",
+        "\x07  Premere C per creare una partizione primaria/logica.",
+//        "\x07  Premere C per creare una nuova partizione.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -981,13 +982,6 @@ static MUI_ENTRY itITSelectPartitionEntries[] =
     {
         8,
         19,
-        "\x07  Premere L per creare una partizione logica.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        8,
-        21,
         "\x07  Premere D per cancellare una partizione esistente.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -2231,9 +2225,9 @@ MUI_STRING itITStrings[] =
     {STRING_PLEASEWAIT,
      "   Attendere..."},
     {STRING_INSTALLCREATEPARTITION,
-     "   INVIO = Installa   P = Crea Partizione   E = Crea Partizione Estesa   
F3 = Esci"},
+     "   INVIO = Installa   C = Crea Partizione   E = Crea Partizione Estesa   
F3 = Esci"},
     {STRING_INSTALLCREATELOGICAL,
-     "   INVIO = Installa   L = Crea Partizione Lgica  F3 = Esci"},
+     "   INVIO = Installa   C = Crea Partizione Lgica  F3 = Esci"},
     {STRING_INSTALLDELETEPARTITION,
      "   INVIO = Installa   D = Rimuovi Partizione   F3 = Esci"},
     {STRING_DELETEPARTITION,
diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h
index 7d4153bdbab..5723d27af75 100644
--- a/base/setup/usetup/lang/ja-JP.h
+++ b/base/setup/usetup/lang/ja-JP.h
@@ -970,7 +970,7 @@ static MUI_ENTRY jaJPSelectPartitionEntries[] =
     {
         8,
         15,
-        "\x07  P \246 \265\276\312\336 \314\337\327\262\317\330\260 
\312\337\260\303\250\274\256\335 \246 \273\270\276\262 \274\317\275\241",
+        "\x07  C \246 \265\276\312\336 
\314\337\327\262\317\330\260/\333\335\330 \312\337\260\303\250\274\256\335 \246 
\273\270\276\262 \274\317\275\241",
 //        "\x07  ��׼� �߰è��� � ���� ���� C ��� ��� ��޻��",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -985,13 +985,6 @@ static MUI_ENTRY jaJPSelectPartitionEntries[] =
     {
         8,
         19,
-        "\x07  L \246 \265\276\312\336 \333\335\330 
\312\337\260\303\250\274\256\335 \246 \273\270\276\262 \274\317\275\241",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        8,
-        21,
         "\x07  \267\277\335\311 \312\337\260\303\250\274\256\335\246 
\273\270\274\336\256 \275\331\306\312 D \267\260\246 \265\274\303 
\270\300\336\273\262\241",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -2228,10 +2221,9 @@ MUI_STRING jaJPStrings[] =
     {STRING_PLEASEWAIT,
      "   \265\317\301 \270\300\336\273\262..."},
     {STRING_INSTALLCREATEPARTITION,
-     "   ENTER = \262\335\275\304\260\331   P = \314\337\327\262\317\330 
\312\337\260\303\250\274\256\335 \273\270\276\262   F3 = \301\255\263\274"},
-//     "   ENTER = �ݽİ�   C = �߰è��� ����   F3 = ����"},
+     "   ENTER = \262\335\275\304\260\331   C = \314\337\327\262\317\330 
\312\337\260\303\250\274\256\335 \273\270\276\262   F3 = \301\255\263\274"},
     {STRING_INSTALLCREATELOGICAL,
-     "   ENTER = \262\335\275\304\260\331   L = \333\335\330 
\312\337\260\303\250\274\256\335 \273\270\276\262   F3 = \301\255\263\274"},
+     "   ENTER = \262\335\275\304\260\331   C = \333\335\330 
\312\337\260\303\250\274\256\335 \273\270\276\262   F3 = \301\255\263\274"},
     {STRING_INSTALLDELETEPARTITION,
      "   ENTER = \262\335\275\304\260\331   D = 
\312\337\260\303\250\274\256\335 \273\270\274\336\256   F3 = \301\255\263\274"},
     {STRING_DELETEPARTITION,
diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h
index 050b9ddcbe7..29afade72a2 100644
--- a/base/setup/usetup/lang/lt-LT.h
+++ b/base/setup/usetup/lang/lt-LT.h
@@ -979,7 +979,7 @@ static MUI_ENTRY ltLTSelectPartitionEntries[] =
     {
         8,
         15,
-        "\x07  Press P to create a primary partition.",
+        "\x07  Press C to create a primary/logical partition.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -993,13 +993,6 @@ static MUI_ENTRY ltLTSelectPartitionEntries[] =
     {
         8,
         19,
-        "\x07  Press L to create a logical partition.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        8,
-        21,
         "\x07  Press D to delete an existing partition.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -2229,9 +2222,9 @@ MUI_STRING ltLTStrings[] =
     {STRING_PLEASEWAIT,
      "   Please wait..."},
     {STRING_INSTALLCREATEPARTITION,
-     "   ENTER = Install   P = Create Primary   E = Create Extended   F3 = 
Quit"},
+     "   ENTER = Install   C = Create Primary   E = Create Extended   F3 = 
Quit"},
     {STRING_INSTALLCREATELOGICAL,
-     "   ENTER = Install   L = Create Logical Partition   F3 = Quit"},
+     "   ENTER = Install   C = Create Logical Partition   F3 = Quit"},
     {STRING_INSTALLDELETEPARTITION,
      "   ENTER = Install   D = Delete Partition   F3 = Quit"},
     {STRING_DELETEPARTITION,
diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h
index 69b3a2ccfd9..a128c3d7352 100644
--- a/base/setup/usetup/lang/ms-MY.h
+++ b/base/setup/usetup/lang/ms-MY.h
@@ -967,14 +967,14 @@ static MUI_ENTRY msMYSelectPartitionEntries[] =
     {
         8,
         15,
-        "\x07  Tekan P untuk mencipta partition yang utama.",
+        "\x07  Tekan C untuk mencipta partition yang utama/logik.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
     {
         8,
         17,
-        "\x07  Tekan E untuk mencipta partition yang berpanjangan.",
+        "\x07  Tekan E untuk mencipta partition yang lanjutan.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -2210,9 +2210,9 @@ MUI_STRING msMYStrings[] =
     {STRING_PLEASEWAIT,
      "   Sila tunggu..."},
     {STRING_INSTALLCREATEPARTITION,
-     "   ENTER = Pasang   P = Mencipta Utama   E = Mencipta Dilanjutkan   F3 = 
Keluar"},
+     "   ENTER = Pasang   C = Mencipta Utama   E = Mencipta Dilanjutkan   F3 = 
Keluar"},
     {STRING_INSTALLCREATELOGICAL,
-     "   ENTER = Pasang   L = Mencipta Partition Logik   F3 = Keluar"},
+     "   ENTER = Pasang   C = Mencipta Partition Logik   F3 = Keluar"},
     {STRING_INSTALLDELETEPARTITION,
      "   ENTER = Pasang   D = Menghapuskan Partition   F3 = Keluar"},
     {STRING_DELETEPARTITION,
diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h
index 950432ee883..7b2c8605af2 100644
--- a/base/setup/usetup/lang/nl-NL.h
+++ b/base/setup/usetup/lang/nl-NL.h
@@ -260,7 +260,7 @@ static MUI_ENTRY nlNLIntroPageEntries[] =
     {
         0,
         0,
-        "ENTER = Continue   F3 = Quit",
+        "ENTER = Doorgaan   F3 = Afsluiten",
         TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
         TEXT_ID_STATIC
     },
@@ -982,7 +982,7 @@ static MUI_ENTRY nlNLSelectPartitionEntries[] =
     {
         8,
         15,
-        "\x07  Press P to create a primary partition.",
+        "\x07  Druk op C om een primaire/logische partitie aan te maken.",
 //        "\x07  Druk op C om een nieuwe partitie aan te maken.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -990,20 +990,13 @@ static MUI_ENTRY nlNLSelectPartitionEntries[] =
     {
         8,
         17,
-        "\x07  Press E to create an extended partition.",
+        "\x07  Druk op E om een uitgebreide partitie aan te maken.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
     {
         8,
         19,
-        "\x07  Press L to create a logical partition.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        8,
-        21,
         "\x07  Druk op D om een bestaande partitie te verwijderen.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -2250,14 +2243,14 @@ MUI_STRING nlNLStrings[] =
     {STRING_PLEASEWAIT,
      "   Een ogenblik geduld..."},
     {STRING_INSTALLCREATEPARTITION,
-     "   ENTER = Install   P = Create Primary   E = Create Extended   F3 = 
Quit"},
+     "   ENTER = Installeren   C = Primaire aanmaken   E = Uitgebreide 
aanmaken   F3 = Afsluiten"},
 //     "   ENTER = Installeren   C = Partitie aanmaken   F3 = Afsluiten"},
     {STRING_INSTALLCREATELOGICAL,
-     "   ENTER = Install   L = Create Logical Partition   F3 = Quit"},
+     "   ENTER = Installeren   C = Logische Partitie aanmaken   F3 = 
Afsluiten"},
     {STRING_INSTALLDELETEPARTITION,
      "   ENTER = Installeren   D = Partitie verwijderen   F3 = Afsluiten"},
     {STRING_DELETEPARTITION,
-     "   D = Delete Partition   F3 = Quit"},
+     "   D = Delete Partition   F3 = Afsluiten"},
     {STRING_PARTITIONSIZE,
      "Grootte nieuwe partitie:"},
     {STRING_CHOOSE_NEW_PARTITION,
diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h
index 69df8c5de9b..1fed490bba7 100644
--- a/base/setup/usetup/lang/pl-PL.h
+++ b/base/setup/usetup/lang/pl-PL.h
@@ -980,7 +980,7 @@ static MUI_ENTRY plPLSelectPartitionEntries[] =
     {
         8,
         15,
-        "\x07  Naci\230nij P, by utworzy\206 partycj\251 podstawow\245.",
+        "\x07  Naci\230nij C, by utworzy\206 partycj\251 
podstawow\245/logiczn\245.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -994,13 +994,6 @@ static MUI_ENTRY plPLSelectPartitionEntries[] =
     {
         8,
         19,
-        "\x07  Naci\230nij L, by utworzy\206 partycj\251 logiczn\245.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        8,
-        21,
         "\x07  Naci\230nij D, by usun\245\206 istniej\245c\245 partycj\251.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -2237,9 +2230,9 @@ MUI_STRING plPLStrings[] =
     {STRING_PLEASEWAIT,
      "   Prosz\251 czeka\206..."},
     {STRING_INSTALLCREATEPARTITION,
-     "  ENTER = Instalacja   P = Partycja podstawowa   E = Rozszerzona   F3 = 
Wyj\230cie"},
+     "  ENTER = Instalacja   C = Partycja podstawowa   E = Rozszerzona   F3 = 
Wyj\230cie"},
     {STRING_INSTALLCREATELOGICAL,
-     "   ENTER = Instalacja   L = Utworzenie partycji logicznej   F3 = 
Wyj\230cie"},
+     "   ENTER = Instalacja   C = Utworzenie partycji logicznej   F3 = 
Wyj\230cie"},
     {STRING_INSTALLDELETEPARTITION,
      "   ENTER = Instalacja   D = Usuni\251cie partycji   F3 = Wyj\230cie"},
     {STRING_DELETEPARTITION,
diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h
index 9e1cfc1f03a..c0f2eef479e 100644
--- a/base/setup/usetup/lang/pt-BR.h
+++ b/base/setup/usetup/lang/pt-BR.h
@@ -984,28 +984,20 @@ static MUI_ENTRY ptBRSelectPartitionEntries[] =
     {
         8,
         15,
-        "\x07  Press P to create a primary partition.",
-//        "\x07  Para criar uma parti��o no espa�o n�o particionado, pressione 
C.",
+        "\x07  Para criar uma parti\207\306o prim\240ria/l\242gica, pressione 
C.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
     {
         8,
         17,
-        "\x07  Press E to create an extended partition.",
+        "\x07  Para criar uma parti\207\306o estendida, pressione E.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
     {
         8,
         19,
-        "\x07  Press L to create a logical partition.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        8,
-        21,
         "\x07  Para excluir a parti\207\306o selecionada, pressione D.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -2263,19 +2255,17 @@ MUI_STRING ptBRStrings[] =
     {STRING_PLEASEWAIT,
     "   Por favor, aguarde..."},
     {STRING_INSTALLCREATEPARTITION,
-     "   ENTER = Install   P = Create Primary   E = Create Extended   F3 = 
Quit"},
-//    "   ENTER=Instalar  C=Criar parti��o  F3=Sair"},
+     "   ENTER = Instalar  C = Criar Prim\240ria  E = Criar Estendida  F3 = 
Sair"},
     {STRING_INSTALLCREATELOGICAL,
-     "   ENTER = Install   L = Create Logical Partition   F3 = Quit"},
+     "   ENTER = Instalar  C = Criar parti\207\306o L\242gica  F3 = Sair"},
     {STRING_INSTALLDELETEPARTITION,
-    "   ENTER=Instalar  D=Apagar parti\207\306o  F3=Sair"},
+    "   ENTER = Instalar  D = Apagar parti\207\306o  F3 = Sair"},
     {STRING_DELETEPARTITION,
-     "   D = Delete Partition   F3 = Quit"},
+     "   D = Apagar parti\207\306o   F3 = Quit"},
     {STRING_PARTITIONSIZE,
     "Tamanho da nova parti\207\306o:"},
     {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,
diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/usetup/lang/pt-PT.h
index ab19b6d38b1..62deb60c0fe 100644
--- a/base/setup/usetup/lang/pt-PT.h
+++ b/base/setup/usetup/lang/pt-PT.h
@@ -984,8 +984,7 @@ static MUI_ENTRY ptPTSelectPartitionEntries[] =
     {
         8,
         15,
-        "\x07  Para criar uma  parti\207\306o prim\240ria, pressione P.",
-//        "\x07  Para criar uma parti\207\306o no espa\207o n\306o 
particionado, pressione C.",
+        "\x07  Para criar uma parti\207\306o prim\240ria/l\242gica, pressione 
C.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -999,13 +998,6 @@ static MUI_ENTRY ptPTSelectPartitionEntries[] =
     {
         8,
         19,
-        "\x07  Para criar uma parti\207\3060 l\242gica, pressione L.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        8,
-        21,
         "\x07  Para excluir a parti\207\306o seleccionada, pressione D.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -2263,13 +2255,13 @@ MUI_STRING ptPTStrings[] =
     {STRING_PLEASEWAIT,
     "   Por favor, aguarde..."},
     {STRING_INSTALLCREATEPARTITION,
-    "   ENTER=Instalar  P=Criar Part. Prim\240ria E=Criar Part. Estendida  
F3=Sair"},
+    "   ENTER = Instalar  C = Criar Prim\240ria  E = Criar Estendida  F3 = 
Sair"},
     {STRING_INSTALLCREATELOGICAL,
-    "   ENTER = Instalar   L = Criar Parti\207\306o L\242gica   F3 = Sair"},
+    "   ENTER = Instalar  C = Criar parti\207\306o L\242gica  F3 = Sair"},
     {STRING_INSTALLDELETEPARTITION,
-    "   ENTER=Instalar  D=Apagar parti\207\306o  F3 = Sair"},
+    "   ENTER = Instalar  D = Apagar parti\207\306o  F3 = Sair"},
     {STRING_DELETEPARTITION,
-     "   D = Apagar Parti\207\306o   F3 = Sair"},
+     "   D = Apagar parti\207\306o   F3 = Sair"},
     {STRING_PARTITIONSIZE,
     "Tamanho da nova parti\207\306o:"},
     {STRING_CHOOSE_NEW_PARTITION,
diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h
index 762cd357331..508a242e0d7 100644
--- a/base/setup/usetup/lang/ro-RO.h
+++ b/base/setup/usetup/lang/ro-RO.h
@@ -1015,7 +1015,7 @@ static MUI_ENTRY roROSelectPartitionEntries[] =
     {
         8,
         15,
-        "\x07  Tasta\376i P pentru a crea o parti\376ie primar\343.",
+        "\x07  Tasta\376i C pentru a crea o parti\376ie primar\343/logic\343.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1029,13 +1029,6 @@ static MUI_ENTRY roROSelectPartitionEntries[] =
     {
         8,
         19,
-        "\x07  Tasta\376i L pentru a crea o parti\376ie logic\343.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        8,
-        21,
         "\x07  Tasta\376i D pentru a \272terge o parti\376ie existent\343.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -2286,9 +2279,9 @@ MUI_STRING roROStrings[] =
     {STRING_PLEASEWAIT,
      "   A\272tepta\376i..."},
     {STRING_INSTALLCREATEPARTITION,
-     "   ENTER = Instalare   P/E = Creare parti\376ie Primar\343/Extins\343   
F3 = Ie\272ire"},
+     "   ENTER = Instalare   C/E = Creare parti\376ie Primar\343/Extins\343   
F3 = Ie\272ire"},
     {STRING_INSTALLCREATELOGICAL,
-     "   ENTER = Instalare   L = Creare parti\376ie Logic\343   F3 = 
Ie\272ire"},
+     "   ENTER = Instalare   C = Creare parti\376ie Logic\343   F3 = 
Ie\272ire"},
     {STRING_INSTALLDELETEPARTITION,
      "   ENTER = Instalare   D = \252tergere parti\376ie   F3 = Ie\272ire"},
     {STRING_DELETEPARTITION,
diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h
index 92f04640bc9..22f673024ab 100644
--- a/base/setup/usetup/lang/ru-RU.h
+++ b/base/setup/usetup/lang/ru-RU.h
@@ -991,7 +991,7 @@ static MUI_ENTRY ruRUSelectPartitionEntries[] =
     {
         8,
         15,
-        "\x07  \215\240\246\254\250\342\245 P \244\253\357 
\341\256\247\244\240\255\250\357 \257\245\340\242\250\347\255\256\243\256 
\340\240\247\244\245\253\240.",
+        "\x07  \215\240\246\254\250\342\245 C \244\253\357 
\341\256\247\244\240\255\250\357 
\257\245\340\242\250\347\255\256\243\256/\253\256\243\250\347\245\341\252\256\243\256
 \340\240\247\244\245\253\240.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1005,13 +1005,6 @@ static MUI_ENTRY ruRUSelectPartitionEntries[] =
     {
         8,
         19,
-        "\x07  \215\240\246\254\250\342\245 L \244\253\357 
\341\256\247\244\240\255\250\357 \253\256\243\250\347\245\341\252\256\243\256 
\340\240\247\244\245\253\240.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        8,
-        21,
         "\x07  \215\240\246\254\250\342\245 D \244\253\357 
\343\244\240\253\245\255\250\357 
\341\343\351\245\341\342\242\343\356\351\245\243\256 
\340\240\247\244\245\253\240.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -2248,9 +2241,9 @@ MUI_STRING ruRUStrings[] =
     {STRING_PLEASEWAIT,
      "   \217\256\246\240\253\343\251\341\342\240, 
\257\256\244\256\246\244\250\342\245..."},
     {STRING_INSTALLCREATEPARTITION,
-     "   ENTER = \223\341\342\240\255\256\242\250\342\354   P = 
\217\245\340\242\250\347\255\353\251 \340\240\247\244\245\253   E = 
\220\240\341\350\250\340\245\255\255\353\251   F3 = \202\353\345\256\244"},
+     "   ENTER = \223\341\342\240\255\256\242\250\342\354   C = 
\217\245\340\242\250\347\255\353\251 \340\240\247\244\245\253   E = 
\220\240\341\350\250\340\245\255\255\353\251   F3 = \202\353\345\256\244"},
     {STRING_INSTALLCREATELOGICAL,
-     "   ENTER = \223\341\342\240\255\256\242\250\342\354   L = 
\221\256\247\244\240\342\354 \253\256\243\250\347\245\341\252\250\251 
\340\240\247\244\245\253   F3 = \202\353\345\256\244"},
+     "   ENTER = \223\341\342\240\255\256\242\250\342\354   C = 
\221\256\247\244\240\342\354 \253\256\243\250\347\245\341\252\250\251 
\340\240\247\244\245\253   F3 = \202\353\345\256\244"},
     {STRING_INSTALLDELETEPARTITION,
      "   ENTER = \223\341\342\240\255\256\242\250\342\354   D = 
\223\244\240\253\250\342\354 \340\240\247\244\245\253   F3 = 
\202\353\345\256\244"},
     {STRING_DELETEPARTITION,
diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h
index 74e50708d2e..95db6e8c74f 100644
--- a/base/setup/usetup/lang/sk-SK.h
+++ b/base/setup/usetup/lang/sk-SK.h
@@ -1,7 +1,7 @@
 // This file is converted by code7bit.
 // code7bit: https://github.com/katahiromz/code7bit
 // To revert conversion, please execute "code7bit -r <file>".
-/* TRANSLATOR:  M�rio Ka�m�r /Mario Kacmar/ aka Kario (ka...@szm.sk)
+/* TRANSLATOR:  Mario Kacmar /Mario Kacmar/ aka Kario (ka...@szm.sk)
  * DATE OF TR:  22-01-2008
  * Encoding  :  Latin II (852)
  * LastChange:  22-05-2011
@@ -976,8 +976,8 @@ static MUI_ENTRY skSKSelectPartitionEntries[] =
     {
         8,
         15,
-        "\x07  Press P to create a primary partition.",
-//        "\x07  Stla�te C pre vytvorenie novej oblasti.",
+        "\x07  Press C to create a primary/logical partition.",
+//        "\x07  Stla\237te C pre vytvorenie novej oblasti.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -991,13 +991,6 @@ static MUI_ENTRY skSKSelectPartitionEntries[] =
     {
         8,
         19,
-        "\x07  Press L to create a logical partition.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        8,
-        21,
         "\x07  Stla\237te D pre vymazanie existuj\243cej oblasti.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -1522,7 +1515,7 @@ static MUI_ENTRY skSKBootLoaderRemovableDiskPageEntries[] 
=
     {
         6,
         8,
-        "In\347tal\240tor nem\223\247e nain\347talova\234 zav\240dza\237 
syst\202mu na pevn\354 disk V\240\347ho", //bootloader = zav�dza� syst�mu
+        "In\347tal\240tor nem\223\247e nain\347talova\234 zav\240dza\237 
syst\202mu na pevn\354 disk V\240\347ho", //bootloader = zav�dza\237 syst�mu
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1899,7 +1892,7 @@ MUI_ERROR skSKErrorEntries[] =
     },
     {
         // ERROR_SIGNATURE_TXTSETUPSIF,
-        "Setup found an invalid signature in TXTSETUP.SIF.\n", //chybn� 
(neplatn�) podpis (znak, zna�ka, �ifra)
+        "Setup found an invalid signature in TXTSETUP.SIF.\n", //chybn� 
(neplatn�) podpis (znak, zna\237ka, \347ifra)
         "ENTER = Re\347tart po\237\241ta\237a"
     },
     {
@@ -1935,7 +1928,7 @@ MUI_ERROR skSKErrorEntries[] =
     },
     {
         // ERROR_WARN_PARTITION,
-//          "In�tal�tor zistil, �e najmenej jeden pevn� disk obsahuje 
nekompatibiln�\n"
+//          "In\347tal�tor zistil, �e najmenej jeden pevn� disk obsahuje 
nekompatibiln�\n"
           "In\347tal\240tor na\347iel najmenej na jednom pevnom disku 
nekompatibiln\243\n"
           "tabu\226ku oblast\241, s ktorou sa ned\240 spr\240vne 
zaobch\240dza\234!\n"
           "\n"
@@ -2237,14 +2230,14 @@ MUI_STRING skSKStrings[] =
     {STRING_PLEASEWAIT,
      "   Po\237kajte, pros\241m ..."},
     {STRING_INSTALLCREATEPARTITION,
-     "   ENTER = Install   P = Create Primary   E = Create Extended   F3 = 
Quit"},
-//     "   ENTER = In�talova�   C = Vytvori� oblas�   F3 = Skon�i�"},
+     "   ENTER = In\347talova\234   C = Create Primary   E = Create Extended   
F3 = Skon\237i\234"},
+//     "   ENTER = In\347talova\234   C = Vytvori\234 oblas\234   F3 = 
Skon\237i\234"},
     {STRING_INSTALLCREATELOGICAL,
-     "   ENTER = Install   L = Create Logical Partition   F3 = Quit"},
+     "   ENTER = In\347talova\234   C = Create Logical Partition   F3 = 
Skon\237i\234"},
     {STRING_INSTALLDELETEPARTITION,
      "   ENTER = In\347talova\234   D = Odstr\240ni\234 oblas\234   F3 = 
Skon\237i\234"},
     {STRING_DELETEPARTITION,
-     "   D = Delete Partition   F3 = Quit"},
+     "   D = Odstr\240ni\234 oblas\234   F3 = Skon\237i\234"},
     {STRING_PARTITIONSIZE,
      "Ve\226kos\234 novej oblasti:"},
     {STRING_CHOOSE_NEW_PARTITION,
diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h
index 265fb11d62a..c8a59e862d6 100644
--- a/base/setup/usetup/lang/sq-AL.h
+++ b/base/setup/usetup/lang/sq-AL.h
@@ -974,8 +974,7 @@ static MUI_ENTRY sqALSelectPartitionEntries[] =
     {
         8,
         15,
-        "\x07  Press P to create a primary partition.",
-//        "\x07  Kiko C p�r t� krijuar nj� particion t� ri.",
+        "\x07  Press C to create a primary/logical partition.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -989,13 +988,6 @@ static MUI_ENTRY sqALSelectPartitionEntries[] =
     {
         8,
         19,
-        "\x07  Press L to create a logical partition.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        8,
-        21,
         "\x07  Kliko D p\211r t\211 fshir\211 nj\211 particion ekzistues.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -2238,14 +2230,14 @@ MUI_STRING sqALStrings[] =
     {STRING_PLEASEWAIT,
      "   Ju lutem prisni..."},
     {STRING_INSTALLCREATEPARTITION,
-     "   ENTER = Install   P = Create Primary   E = Create Extended   F3 = 
Quit"},
+     "   ENTER = Instalo   C = Create Primary   E = Create Extended   F3 = 
Dil"},
 //     "   ENTER = Instalo   C = Krijo Particion   F3 = Dil"},
     {STRING_INSTALLCREATELOGICAL,
-     "   ENTER = Install   L = Create Logical Partition   F3 = Quit"},
+     "   ENTER = Instalo   C = Create Logical Partition   F3 = Dil"},
     {STRING_INSTALLDELETEPARTITION,
      "   ENTER = Instalo   D = Fshi Particion   F3 = Dil"},
     {STRING_DELETEPARTITION,
-     "   D = Delete Partition   F3 = Quit"},
+     "   D = Fshi Particion   F3 = Dil"},
     {STRING_PARTITIONSIZE,
      "Madh\211sia e particionit t\211 ri:"},
     {STRING_CHOOSE_NEW_PARTITION,
diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h
index 28463ed63ee..74a371aaa5a 100644
--- a/base/setup/usetup/lang/sv-SE.h
+++ b/base/setup/usetup/lang/sv-SE.h
@@ -976,28 +976,21 @@ static MUI_ENTRY svSESelectPartitionEntries[] =
     {
         8,
         15,
-        "\x07  Press P to create a primary partition.",
-//        "\x07  Tryck C f�r att skapa en ny partition.",
+        "\x07  Tryck C f\224r att skapa en prim�r/logisk partition.",
+//        "\x07  Tryck C f\224r att skapa en ny partition.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
     {
         8,
         17,
-        "\x07  Press E to create an extended partition.",
+        "\x07  Tryck E f\224r att skapa en ut\224kad partition.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
     {
         8,
         19,
-        "\x07  Press L to create a logical partition.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        8,
-        21,
         "\x07  Tryck D f\224r att ta bort en befintlig partititon.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -2227,14 +2220,13 @@ MUI_STRING svSEStrings[] =
     {STRING_PLEASEWAIT,
      "   Var v\204nlig v\204nta..."},
     {STRING_INSTALLCREATEPARTITION,
-     "   ENTER = Install   P = Create Primary   E = Create Extended   F3 = 
Quit"},
-//     "   ENTER = Installera   C = Skapa Partition   F3 = Avsluta"},
+     "   ENTER = Installera   C = Skapa Prim�r Partition   E = Skapa Ut\224kad 
Partition   F3 = Avsluta"},
     {STRING_INSTALLCREATELOGICAL,
-     "   ENTER = Install   L = Create Logical Partition   F3 = Quit"},
+     "   ENTER = Installera   C = Skapa Logisk Partition   F3 = Avsluta"},
     {STRING_INSTALLDELETEPARTITION,
      "   ENTER = Installera   D = Ta bort Partition   F3 = Avsluta"},
     {STRING_DELETEPARTITION,
-     "   D = Delete Partition   F3 = Quit"},
+     "   D = Ta bort Partition   F3 = Avsluta"},
     {STRING_PARTITIONSIZE,
      "Storlek p\206 den nya partitionen:"},
     {STRING_CHOOSE_NEW_PARTITION,
diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h
index 5c79d50ce18..2508f957a2e 100644
--- a/base/setup/usetup/lang/tr-TR.h
+++ b/base/setup/usetup/lang/tr-TR.h
@@ -966,27 +966,20 @@ static MUI_ENTRY trTRSelectPartitionEntries[] =
     {
         8,
         15,
-        "\x07  Bir ana b\224l\201m olu\237turmak i\207in P'ye bas\215n\215z.",
+        "\x07  Press C to create a primary/logical partition.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
     {
         8,
         17,
-        "\x07  Bir geni\237letilmi\237 b\224l\201m olu\237turmak i\207in E'ye 
bas\215n\215z.",
+        "\x07  Press E to create an extended partition.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
     {
         8,
         19,
-        "\x07  Mant\215ksal bir b\224l\201m olu\237turmak i\207in L'ye 
bas\215n\215z.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        8,
-        21,
         "\x07  Var olan bir b\224l\201m\224 silmek i\207in D'ye 
bas\215n\215z.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -2202,9 +2195,9 @@ MUI_STRING trTRStrings[] =
     {STRING_PLEASEWAIT,
     "   L\201tfen bekleyiniz..."},
     {STRING_INSTALLCREATEPARTITION,
-    "   ENTER = Kur  P = Ana B\224l\201m Olu\237tur  E = Geni\237letilmi\237 
B\224l\201m Olu\237tur  F3 = \200\215k"},
+    "   ENTER = Kur  C = Ana B\224l\201m Olu\237tur  E = Geni\237letilmi\237 
B\224l\201m Olu\237tur  F3 = \200\215k"},
     {STRING_INSTALLCREATELOGICAL,
-    "   ENTER = Kur   L = Mant\215ksal B\224l\201m Olu\237tur   F3 = 
\200\215k"},
+    "   ENTER = Kur   C = Mant\215ksal B\224l\201m Olu\237tur   F3 = 
\200\215k"},
     {STRING_INSTALLDELETEPARTITION,
     "   ENTER = Kur   D = B\224l\201m\201 Sil   F3 = \200\215k"},
     {STRING_DELETEPARTITION,
diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h
index 8100b86f660..c615c0b2ed3 100644
--- a/base/setup/usetup/lang/uk-UA.h
+++ b/base/setup/usetup/lang/uk-UA.h
@@ -975,7 +975,7 @@ static MUI_ENTRY ukUASelectPartitionEntries[] =
     {
         8,
         15,
-        "\x07  \215\240\342\250\341\255i\342\354 P \351\256\241 
\341\342\242\256\340\250\342\250 \257\245\340\242\250\255\255\250\251 
\340\256\247\244i\253.",
+        "\x07  \215\240\342\250\341\255i\342\354 C \351\256\241 
\341\342\242\256\340\250\342\250 
\257\245\340\242\250\255\255\250\251/\253\256\243i\347\255\250\251 
\340\256\247\244i\253.",
 //        "\x07  ����i�� C 鮡 �⢮�� ����� ஧�i�.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -983,20 +983,13 @@ static MUI_ENTRY ukUASelectPartitionEntries[] =
     {
         8,
         17,
-        "\x07  \215\240\342\250\341\255i\342\354 E \351\256\241 
\341\342\256\242\340\250\342\250 \340\256\247\350\250\340\245\255\250\251 
\340\256\247\244i\253.",
+        "\x07  \215\240\342\250\341\255i\342\354 E \351\256\241 
\341\342\242\256\340\250\342\250 \340\256\247\350\250\340\245\255\250\251 
\340\256\247\244i\253.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
     {
         8,
         19,
-        "\x07  \215\240\342\250\341\255i\342\354 L \351\256\241 
\341\342\242\256\340\250\342\250 \253\256\243i\347\255\250\251 
\340\256\247\244i\253.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        8,
-        21,
         "\x07  \215\240\342\250\341\255i\342\354 D \351\256\241 
\242\250\244\240\253\250\342\250 i\341\255\343\356\347\250\251 
\340\256\247\244i\253.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
@@ -2234,10 +2227,9 @@ MUI_STRING ukUAStrings[] =
     {STRING_PLEASEWAIT,
      "   \201\343\244\354-\253\240\341\252\240, 
\247\240\347\245\252\240\251\342\245..."},
     {STRING_INSTALLCREATEPARTITION,
-     "   ENTER = \202\341\342\240\255\256\242\250\342\250   P = 
\217\245\340\242\250\255\255\250\251 \340\256\247\244i\253   E = 
\220\256\247\350\250\340\245\255\250\251   F3 = \202\250\251\342\250"},
-//     "   ENTER = ��⠭����   C = �⢮�� ����i�   F3 = ����"},
+     "   ENTER = \202\341\342\240\255\256\242\250\342\250   C = 
\217\245\340\242\250\255\255\250\251 \340\256\247\244i\253   E = 
\220\256\247\350\250\340\245\255\250\251   F3 = \202\250\251\342\250"},
     {STRING_INSTALLCREATELOGICAL,
-     "   ENTER = \202\341\342\240\255\256\242\250\342\250   L = 
\221\342\242\256\340\250\342\250 \253\256\243i\347\255\250\251 
\340\256\247\244i\253   F3 = \202\250\251\342\250"},
+     "   ENTER = \202\341\342\240\255\256\242\250\342\250   C = 
\221\342\242\256\340\250\342\250 \253\256\243i\347\255\250\251 
\340\256\247\244i\253   F3 = \202\250\251\342\250"},
     {STRING_INSTALLDELETEPARTITION,
      "   ENTER = \202\341\342\240\255\256\242\250\342\250   D = 
\202\250\244\240\253\250\342\250 \340\256\247\244i\253   F3 = 
\202\250\251\342\250"},
     {STRING_DELETEPARTITION,
diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c
index 6cb6cfa720d..47d24464977 100644
--- a/base/setup/usetup/usetup.c
+++ b/base/setup/usetup/usetup.c
@@ -1586,7 +1586,7 @@ SelectPartitionPage(PINPUT_RECORD Ir)
 
     InitPartitionListUi(&ListUi, PartitionList,
                         CurrentPartition,
-                        2, 23,
+                        2, 21,
                         xScreen - 3,
                         yScreen - 3);
     DrawPartitionList(&ListUi);
@@ -1751,22 +1751,19 @@ SelectPartitionPage(PINPUT_RECORD Ir)
             InstallPartition = CurrentPartition;
             return SELECT_FILE_SYSTEM_PAGE;
         }
-        else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'P')  /* P */
+        else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'C')  /* C */
         {
             ASSERT(CurrentPartition != NULL);
 
-            if (CurrentPartition->LogicalPartition == FALSE)
+            Error = PartitionCreationChecks(CurrentPartition);
+            if (Error != NOT_AN_ERROR)
             {
-                Error = PartitionCreationChecks(CurrentPartition);
-                if (Error != NOT_AN_ERROR)
-                {
-                    MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY);
-                    return SELECT_PARTITION_PAGE;
-                }
-
-                PartCreateType = PartTypeData;
-                return CREATE_PARTITION_PAGE;
+                MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY);
+                return SELECT_PARTITION_PAGE;
             }
+
+            PartCreateType = PartTypeData;
+            return CREATE_PARTITION_PAGE;
         }
         else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'E')  /* E */
         {
@@ -1785,23 +1782,6 @@ SelectPartitionPage(PINPUT_RECORD Ir)
                 return CREATE_PARTITION_PAGE;
             }
         }
-        else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'L')  /* L */
-        {
-            ASSERT(CurrentPartition != NULL);
-
-            if (CurrentPartition->LogicalPartition)
-            {
-                Error = PartitionCreationChecks(CurrentPartition);
-                if (Error != NOT_AN_ERROR)
-                {
-                    MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY);
-                    return SELECT_PARTITION_PAGE;
-                }
-
-                PartCreateType = PartTypeData;
-                return CREATE_PARTITION_PAGE;
-            }
-        }
         else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'D')  /* D */
         {
             UNICODE_STRING CurrentPartitionU;

Reply via email to