[ros-diffs] [reactos] 01/01: [USETUP] Decouple bootloader install choice page from its actual installation (#5786)

[Hermès Bélusca-Maïto]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5c2ec83fa7658fb472313…

commit 5c2ec83fa7658fb472313e094f7a29a216fe16b1
Author:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Wed Oct 11 22:05:56 2023 +0200
Commit:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Sat Oct 14 16:29:43 2023 +0200

    [USETUP] Decouple bootloader install choice page from its actual installation
(#5786)
    
    This allows to move this choice sooner in the process, thus having all
    the user key presses at first, then all the actual installation going
    without any key presses needed anymore... (that is, unless you wanted
    to install the bootloader on a removable device. Then it will prompt
    you there!)
    
    - Additional "cosmetic"/future-proof changes: Rename all instances
      of "floppy" in the bootloader install variables to
"RemovableDisk"
      because it would be great to have this install choice later.
    
    - Layout adjustments in the translated bootloader pages.
    
    - Skip bootloader installation on upgrades. The idea here is that if
      we were able to find a ReactOS installation to upgrade, this means
      we were able to find a valid bootloader + boot entry.
      See also PR #5633.
    
      This logic may be slightly improved in the future to detect whether
      the underlying bootloader is FreeLdr and if so, only update its files.
      But this is for the future.
---
 base/setup/usetup/lang/bg-BG.h | 127 ++++++++++++++------------
 base/setup/usetup/lang/bn-BD.h | 170 +++++++++++++++++-----------------
 base/setup/usetup/lang/cs-CZ.h | 120 ++++++++++++------------
 base/setup/usetup/lang/da-DK.h | 127 ++++++++++++++------------
 base/setup/usetup/lang/de-DE.h | 127 ++++++++++++++------------
 base/setup/usetup/lang/el-GR.h | 127 ++++++++++++++------------
 base/setup/usetup/lang/en-US.h | 122 ++++++++++++-------------
 base/setup/usetup/lang/es-ES.h | 127 ++++++++++++++------------
 base/setup/usetup/lang/et-EE.h | 120 ++++++++++++------------
 base/setup/usetup/lang/eu-ES.h | 127 ++++++++++++++------------
 base/setup/usetup/lang/fr-FR.h | 122 ++++++++++++-------------
 base/setup/usetup/lang/he-IL.h | 120 ++++++++++++------------
 base/setup/usetup/lang/hr-HR.h | 141 ++++++++++++++--------------
 base/setup/usetup/lang/hu-HU.h | 127 ++++++++++++++------------
 base/setup/usetup/lang/id-ID.h | 127 ++++++++++++++------------
 base/setup/usetup/lang/it-IT.h | 175 ++++++++++++++++++-----------------
 base/setup/usetup/lang/ja-JP.h | 127 ++++++++++++++------------
 base/setup/usetup/lang/lt-LT.h | 122 ++++++++++++-------------
 base/setup/usetup/lang/ms-MY.h | 129 +++++++++++++-------------
 base/setup/usetup/lang/nl-NL.h | 127 ++++++++++++++------------
 base/setup/usetup/lang/pl-PL.h | 127 ++++++++++++++------------
 base/setup/usetup/lang/pt-BR.h | 127 ++++++++++++++------------
 base/setup/usetup/lang/pt-PT.h | 127 ++++++++++++++------------
 base/setup/usetup/lang/ro-RO.h | 127 ++++++++++++++------------
 base/setup/usetup/lang/ru-RU.h | 127 ++++++++++++++------------
 base/setup/usetup/lang/sk-SK.h | 127 ++++++++++++++------------
 base/setup/usetup/lang/sq-AL.h | 129 +++++++++++++-------------
 base/setup/usetup/lang/sv-SE.h | 120 ++++++++++++------------
 base/setup/usetup/lang/tr-TR.h | 113 ++++++++++++-----------
 base/setup/usetup/lang/uk-UA.h | 127 ++++++++++++++------------
 base/setup/usetup/usetup.c     | 202 +++++++++++++++++++++--------------------
 base/setup/usetup/usetup.h     |   6 +-
 32 files changed, 2113 insertions(+), 1957 deletions(-)

diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h
index 84e07910fa5..8537ccdf490 100644
--- a/base/setup/usetup/lang/bg-BG.h
+++ b/base/setup/usetup/lang/bg-BG.h
@@ -944,59 +944,6 @@ static MUI_ENTRY bgBGSuccessPageEntries[] =
     }
 };
 
-static MUI_ENTRY bgBGBootPageEntries[] =
-{
-    {
-        4,
-        3,
-        " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS "
KERNEL_VERSION_STR " .",
-        TEXT_STYLE_UNDERLINE,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        8,
-        "\210\255\341\342\240\253\250\340\240\255\245 \255\240
\247\240\340\245\246\244\240\351\240\342\240 \257\340\256\243\340\240\254\240 (bootloader)
\255\240 \244\250\341\252\240 \255\240 \252\256\254\257\356\342\352\340\240
\242\250",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        9,
-        "\241\245 \255\245\343\341\257\245\350\255\256.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        13,
-        "\221\253\256\246\245\342\245 \344\256\340\254\240\342\250\340\240\255\240
\244\250\341\252\245\342\240 \242 \343\341\342\340\256\251\341\342\242\256 A:",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        14,
-        "\250 \255\240\342\250\341\255\245\342\245 ENTER.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        "   ENTER = \217\340\256\244\352\253\246\250   F3 =
\210\247\345\256\244",
-        TEXT_TYPE_STATUS,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        NULL,
-        0
-    }
-
-};
-
 static MUI_ENTRY bgBGSelectPartitionEntries[] =
 {
     {
@@ -1481,7 +1428,7 @@ static MUI_ENTRY bgBGFileCopyEntries[] =
     }
 };
 
-static MUI_ENTRY bgBGBootLoaderEntries[] =
+static MUI_ENTRY bgBGBootLoaderSelectPageEntries[] =
 {
     {
         4,
@@ -1493,7 +1440,7 @@ static MUI_ENTRY bgBGBootLoaderEntries[] =
     {
         6,
         8,
-        "\217\340\256\342\250\347\240
\250\255\341\342\240\253\250\340\240\255\245\342\256 \255\240
\247\240\340\245\246\244\240\351\240\342\240 \257\340\256\243\340\240\254\240.",
+        "Please select where Setup should install the bootloader:",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1549,6 +1496,13 @@ static MUI_ENTRY bgBGBootLoaderInstallPageEntries[] =
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
+    {
+        6,
+        8,
+        "\217\340\256\342\250\347\240
\250\255\341\342\240\253\250\340\240\255\245\342\256 \255\240
\247\240\340\245\246\244\240\351\240\342\240 \257\340\256\243\340\240\254\240.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
     {
         0,
         0,
@@ -1564,6 +1518,59 @@ static MUI_ENTRY bgBGBootLoaderInstallPageEntries[] =
     }
 };
 
+static MUI_ENTRY bgBGBootLoaderRemovableDiskPageEntries[] =
+{
+    {
+        4,
+        3,
+        " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS "
KERNEL_VERSION_STR " .",
+        TEXT_STYLE_UNDERLINE,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        8,
+        "\210\255\341\342\240\253\250\340\240\255\245 \255\240
\247\240\340\245\246\244\240\351\240\342\240 \257\340\256\243\340\240\254\240 (bootloader)
\255\240 \244\250\341\252\240 \255\240 \252\256\254\257\356\342\352\340\240
\242\250",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        9,
+        "\241\245 \255\245\343\341\257\245\350\255\256.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        13,
+        "\221\253\256\246\245\342\245 \344\256\340\254\240\342\250\340\240\255\240
\244\250\341\252\245\342\240 \242 \343\341\342\340\256\251\341\342\242\256 A:",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        14,
+        "\250 \255\240\342\250\341\255\245\342\245 ENTER.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        "   ENTER = \217\340\256\244\352\253\246\250   F3 =
\210\247\345\256\244",
+        TEXT_TYPE_STATUS,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        NULL,
+        0
+    }
+
+};
+
 static MUI_ENTRY bgBGKeyboardSettingsEntries[] =
 {
     {
@@ -2198,8 +2205,8 @@ MUI_PAGE bgBGPages[] =
         bgBGKeyboardSettingsEntries
     },
     {
-        BOOT_LOADER_PAGE,
-        bgBGBootLoaderEntries
+        BOOTLOADER_SELECT_PAGE,
+        bgBGBootLoaderSelectPageEntries
     },
     {
         LAYOUT_SETTINGS_PAGE,
@@ -2214,12 +2221,12 @@ MUI_PAGE bgBGPages[] =
         bgBGSuccessPageEntries
     },
     {
-        BOOT_LOADER_INSTALLATION_PAGE,
+        BOOTLOADER_INSTALL_PAGE,
         bgBGBootLoaderInstallPageEntries
     },
     {
-        BOOT_LOADER_FLOPPY_PAGE,
-        bgBGBootPageEntries
+        BOOTLOADER_REMOVABLE_DISK_PAGE,
+        bgBGBootLoaderRemovableDiskPageEntries
     },
     {
         REGISTRY_PAGE,
diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h
index 8ecec83cd19..ba42c1a058f 100644
--- a/base/setup/usetup/lang/bn-BD.h
+++ b/base/setup/usetup/lang/bn-BD.h
@@ -928,83 +928,6 @@ static MUI_ENTRY bnBDSuccessPageEntries[] =
     }
 };
 
-static MUI_ENTRY bnBDBootPageEntries[] =
-{
-    {
-        4,
-        3,
-        " ReactOS " KERNEL_VERSION_STR " Setup ",
-        TEXT_STYLE_UNDERLINE,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        8,
-        "Setup cannot install the bootloader on your computers",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        9,
-        "hardisk",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        13,
-        "Please insert a formatted floppy disk in drive A: and",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        14,
-        "press ENTER.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        "ENTER = Continue   F3 = Quit",
-        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        NULL,
-        0
-    }
-
-};
-
-static MUI_ENTRY bnBDBootLoaderInstallPageEntries[] =
-{
-    {
-        4,
-        3,
-        " ReactOS " KERNEL_VERSION_STR " Setup ",
-        TEXT_STYLE_UNDERLINE,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        "Installing the bootloader onto the media, please wait...",
-        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        NULL,
-        0
-    }
-};
-
 static MUI_ENTRY bnBDSelectPartitionEntries[] =
 {
     {
@@ -1488,7 +1411,7 @@ static MUI_ENTRY bnBDFileCopyEntries[] =
     }
 };
 
-static MUI_ENTRY bnBDBootLoaderEntries[] =
+static MUI_ENTRY bnBDBootLoaderSelectPageEntries[] =
 {
     {
         4,
@@ -1500,7 +1423,7 @@ static MUI_ENTRY bnBDBootLoaderEntries[] =
     {
         6,
         8,
-        "Setup is installing the boot loader",
+        "Please select where Setup should install the bootloader:",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1528,7 +1451,7 @@ static MUI_ENTRY bnBDBootLoaderEntries[] =
     {
         8,
         15,
-        "Skip install bootloader.",
+        "Skip bootloader installation.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1547,6 +1470,83 @@ static MUI_ENTRY bnBDBootLoaderEntries[] =
     }
 };
 
+static MUI_ENTRY bnBDBootLoaderInstallPageEntries[] =
+{
+    {
+        4,
+        3,
+        " ReactOS " KERNEL_VERSION_STR " Setup ",
+        TEXT_STYLE_UNDERLINE,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        8,
+        "Setup is installing the bootloader.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        "Installing the bootloader onto the media, please wait...",
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        NULL,
+        0
+    }
+};
+
+static MUI_ENTRY bnBDBootLoaderRemovableDiskPageEntries[] =
+{
+    {
+        4,
+        3,
+        " ReactOS " KERNEL_VERSION_STR " Setup ",
+        TEXT_STYLE_UNDERLINE,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        8,
+        "Setup cannot install the bootloader on your computer's
harddisk.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        13,
+        "Please insert a formatted floppy disk in drive A:",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        14,
+        "and press ENTER.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        "ENTER = Continue   F3 = Quit",
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        NULL,
+        0
+    }
+
+};
+
 static MUI_ENTRY bnBDKeyboardSettingsEntries[] =
 {
     {
@@ -2180,8 +2180,8 @@ MUI_PAGE bnBDPages[] =
         bnBDKeyboardSettingsEntries
     },
     {
-        BOOT_LOADER_PAGE,
-        bnBDBootLoaderEntries
+        BOOTLOADER_SELECT_PAGE,
+        bnBDBootLoaderSelectPageEntries
     },
     {
         LAYOUT_SETTINGS_PAGE,
@@ -2196,12 +2196,12 @@ MUI_PAGE bnBDPages[] =
         bnBDSuccessPageEntries
     },
     {
-        BOOT_LOADER_INSTALLATION_PAGE,
+        BOOTLOADER_INSTALL_PAGE,
         bnBDBootLoaderInstallPageEntries
     },
     {
-        BOOT_LOADER_FLOPPY_PAGE,
-        bnBDBootPageEntries
+        BOOTLOADER_REMOVABLE_DISK_PAGE,
+        bnBDBootLoaderRemovableDiskPageEntries
     },
     {
         REGISTRY_PAGE,
diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h
index 7ee0878be8e..9b8092616c1 100644
--- a/base/setup/usetup/lang/cs-CZ.h
+++ b/base/setup/usetup/lang/cs-CZ.h
@@ -936,59 +936,6 @@ static MUI_ENTRY csCZSuccessPageEntries[] =
     }
 };
 
-static MUI_ENTRY csCZBootPageEntries[] =
-{
-    {
-        4,
-        3,
-        " Instalace ReactOS " KERNEL_VERSION_STR " ",
-        TEXT_STYLE_UNDERLINE,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        8,
-        "Instala\237n\241 aplikace nedok\240\247e nainstalovat zavad\330\237 na
tento",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        9,
-        "disk",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        13,
-        "Vlo\247te naform\240tovanou disketu do jednotky A:",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        14,
-        "a stiskn\330te ENTER.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        "ENTER = Pokra\237ovat   F3 = Ukon\237it",
-        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        NULL,
-        0
-    }
-
-};
-
 static MUI_ENTRY csCZSelectPartitionEntries[] =
 {
     {
@@ -1472,7 +1419,7 @@ static MUI_ENTRY csCZFileCopyEntries[] =
     }
 };
 
-static MUI_ENTRY csCZBootLoaderEntries[] =
+static MUI_ENTRY csCZBootLoaderSelectPageEntries[] =
 {
     {
         4,
@@ -1484,7 +1431,7 @@ static MUI_ENTRY csCZBootLoaderEntries[] =
     {
         6,
         8,
-        "Instalace nyn\241 nainstaluje zavad\330\237.",
+        "Please select where Setup should install the bootloader:",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1540,6 +1487,13 @@ static MUI_ENTRY csCZBootLoaderInstallPageEntries[] =
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
+    {
+        6,
+        8,
+        "Instalace nyn\241 nainstaluje zavad\330\237.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
     {
         0,
         0,
@@ -1555,6 +1509,52 @@ static MUI_ENTRY csCZBootLoaderInstallPageEntries[] =
     }
 };
 
+static MUI_ENTRY csCZBootLoaderRemovableDiskPageEntries[] =
+{
+    {
+        4,
+        3,
+        " Instalace ReactOS " KERNEL_VERSION_STR " ",
+        TEXT_STYLE_UNDERLINE,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        8,
+        "Instala\237n\241 aplikace nedok\240\247e nainstalovat zavad\330\237 na
tento disk.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        13,
+        "Vlo\247te naform\240tovanou disketu do jednotky A:",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        14,
+        "a stiskn\330te ENTER.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        "ENTER = Pokra\237ovat   F3 = Ukon\237it",
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        NULL,
+        0
+    }
+
+};
+
 static MUI_ENTRY csCZKeyboardSettingsEntries[] =
 {
     {
@@ -2188,8 +2188,8 @@ MUI_PAGE csCZPages[] =
         csCZKeyboardSettingsEntries
     },
     {
-        BOOT_LOADER_PAGE,
-        csCZBootLoaderEntries
+        BOOTLOADER_SELECT_PAGE,
+        csCZBootLoaderSelectPageEntries
     },
     {
         LAYOUT_SETTINGS_PAGE,
@@ -2204,12 +2204,12 @@ MUI_PAGE csCZPages[] =
         csCZSuccessPageEntries
     },
     {
-        BOOT_LOADER_INSTALLATION_PAGE,
+        BOOTLOADER_INSTALL_PAGE,
         csCZBootLoaderInstallPageEntries
     },
     {
-        BOOT_LOADER_FLOPPY_PAGE,
-        csCZBootPageEntries
+        BOOTLOADER_REMOVABLE_DISK_PAGE,
+        csCZBootLoaderRemovableDiskPageEntries
     },
     {
         REGISTRY_PAGE,
diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h
index d953f6c0d46..8485e176eb2 100644
--- a/base/setup/usetup/lang/da-DK.h
+++ b/base/setup/usetup/lang/da-DK.h
@@ -937,59 +937,6 @@ static MUI_ENTRY daDKSuccessPageEntries[] =
     }
 };
 
-static MUI_ENTRY daDKBootPageEntries[] =
-{
-    {
-        4,
-        3,
-        " ReactOS " KERNEL_VERSION_STR " installationen ",
-        TEXT_STYLE_UNDERLINE,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        8,
-        "Installationen kan ikke installere opstartsl\221seren p\206",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        9,
-        "din computers hardisk",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        13,
-        "S\221t en formateret diskette i drev A: og",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        14,
-        "tryk p\206 ENTER.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        "ENTER = Forts\221t   F3 = Afslut",
-        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        NULL,
-        0
-    }
-
-};
-
 static MUI_ENTRY daDKSelectPartitionEntries[] =
 {
     {
@@ -1466,7 +1413,7 @@ static MUI_ENTRY daDKFileCopyEntries[] =
     }
 };
 
-static MUI_ENTRY daDKBootLoaderEntries[] =
+static MUI_ENTRY daDKBootLoaderSelectPageEntries[] =
 {
     {
         4,
@@ -1478,7 +1425,7 @@ static MUI_ENTRY daDKBootLoaderEntries[] =
     {
         6,
         8,
-        "Installatione af opstartsl\221ser",
+        "Please select where Setup should install the bootloader:",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1534,6 +1481,13 @@ static MUI_ENTRY daDKBootLoaderInstallPageEntries[] =
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
+    {
+        6,
+        8,
+        "Installatione af opstartsl\221ser.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
     {
         0,
         0,
@@ -1549,6 +1503,59 @@ static MUI_ENTRY daDKBootLoaderInstallPageEntries[] =
     }
 };
 
+static MUI_ENTRY daDKBootLoaderRemovableDiskPageEntries[] =
+{
+    {
+        4,
+        3,
+        " ReactOS " KERNEL_VERSION_STR " installationen ",
+        TEXT_STYLE_UNDERLINE,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        8,
+        "Installationen kan ikke installere opstartsl\221seren p\206",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        9,
+        "din computers harddisk.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        13,
+        "S\221t en formateret diskette i drev A:",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        14,
+        "og tryk p\206 ENTER.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        "ENTER = Forts\221t   F3 = Afslut",
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        NULL,
+        0
+    }
+
+};
+
 static MUI_ENTRY daDKKeyboardSettingsEntries[] =
 {
     {
@@ -2183,8 +2190,8 @@ MUI_PAGE daDKPages[] =
         daDKKeyboardSettingsEntries
     },
     {
-        BOOT_LOADER_PAGE,
-        daDKBootLoaderEntries
+        BOOTLOADER_SELECT_PAGE,
+        daDKBootLoaderSelectPageEntries
     },
     {
         LAYOUT_SETTINGS_PAGE,
@@ -2199,12 +2206,12 @@ MUI_PAGE daDKPages[] =
         daDKSuccessPageEntries
     },
     {
-        BOOT_LOADER_INSTALLATION_PAGE,
+        BOOTLOADER_INSTALL_PAGE,
         daDKBootLoaderInstallPageEntries
     },
     {
-        BOOT_LOADER_FLOPPY_PAGE,
-        daDKBootPageEntries
+        BOOTLOADER_REMOVABLE_DISK_PAGE,
+        daDKBootLoaderRemovableDiskPageEntries
     },
     {
         REGISTRY_PAGE,
diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h
index 10d7c8610cc..0d095400c67 100644
--- a/base/setup/usetup/lang/de-DE.h
+++ b/base/setup/usetup/lang/de-DE.h
@@ -923,59 +923,6 @@ static MUI_ENTRY deDESuccessPageEntries[] =
     }
 };
 
-static MUI_ENTRY deDEBootPageEntries[] =
-{
-    {
-        4,
-        3,
-        " ReactOS " KERNEL_VERSION_STR " Setup ",
-        TEXT_STYLE_UNDERLINE,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        8,
-        "Der Bootsektor konnte nicht auf der",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        9,
-        "Festplatte Ihres Computers installiert werden.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        13,
-        "Bitte legen Sie eine formatierte Diskette in Laufwerk A: ein und",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        14,
-        "dr\201cken Sie ENTER.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        "ENTER = Fortsetzen   F3 = Installation abbrechen",
-        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        NULL,
-        0
-    }
-
-};
-
 static MUI_ENTRY deDESelectPartitionEntries[] =
 {
     {
@@ -1466,7 +1413,7 @@ static MUI_ENTRY deDEFileCopyEntries[] =
     }
 };
 
-static MUI_ENTRY deDEBootLoaderEntries[] =
+static MUI_ENTRY deDEBootLoaderSelectPageEntries[] =
 {
     {
         4,
@@ -1478,7 +1425,7 @@ static MUI_ENTRY deDEBootLoaderEntries[] =
     {
         6,
         8,
-        "Bestimmen Sie, wo der Bootloader installiert werden soll:",
+        "Bestimmen Sie, wo Setup den Bootloader installieren soll:",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1534,6 +1481,13 @@ static MUI_ENTRY deDEBootLoaderInstallPageEntries[] =
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
+    {
+        6,
+        8,
+        "Setup installiert den Bootloader.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
     {
         0,
         0,
@@ -1549,6 +1503,59 @@ static MUI_ENTRY deDEBootLoaderInstallPageEntries[] =
     }
 };
 
+static MUI_ENTRY deDEBootLoaderRemovableDiskPageEntries[] =
+{
+    {
+        4,
+        3,
+        " ReactOS " KERNEL_VERSION_STR " Setup ",
+        TEXT_STYLE_UNDERLINE,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        8,
+        "Der Bootsektor konnte nicht auf der Festplatte Ihres Computers",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        9,
+        "installiert werden.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        13,
+        "Bitte legen Sie eine formatierte Diskette in Laufwerk A: ein",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        14,
+        "und dr\201cken Sie ENTER.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        "ENTER = Fortsetzen   F3 = Installation abbrechen",
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        NULL,
+        0
+    }
+
+};
+
 static MUI_ENTRY deDEKeyboardSettingsEntries[] =
 {
     {
@@ -2185,8 +2192,8 @@ MUI_PAGE deDEPages[] =
         deDEKeyboardSettingsEntries
     },
     {
-        BOOT_LOADER_PAGE,
-        deDEBootLoaderEntries
+        BOOTLOADER_SELECT_PAGE,
+        deDEBootLoaderSelectPageEntries
     },
     {
         LAYOUT_SETTINGS_PAGE,
@@ -2201,12 +2208,12 @@ MUI_PAGE deDEPages[] =
         deDESuccessPageEntries
     },
     {
-        BOOT_LOADER_INSTALLATION_PAGE,
+        BOOTLOADER_INSTALL_PAGE,
         deDEBootLoaderInstallPageEntries
     },
     {
-        BOOT_LOADER_FLOPPY_PAGE,
-        deDEBootPageEntries
+        BOOTLOADER_REMOVABLE_DISK_PAGE,
+        deDEBootLoaderRemovableDiskPageEntries
     },
     {
         REGISTRY_PAGE,
diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h
index edb49657ef2..401f7ae16fc 100644
--- a/base/setup/usetup/lang/el-GR.h
+++ b/base/setup/usetup/lang/el-GR.h
@@ -944,59 +944,6 @@ static MUI_ENTRY elGRSuccessPageEntries[] =
     }
 };
 
-static MUI_ENTRY elGRBootPageEntries[] =
-{
-    {
-        4,
-        3,
-        " \204\232\241\230\253\341\251\253\230\251\236 \253\246\254 ReactOS "
KERNEL_VERSION_STR,
-        TEXT_STYLE_UNDERLINE,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        8,
-        "\206 \234\232\241\230\253\341\251\253\230\251\236 \233\234
\243\247\246\250\234\345 \244\230 \234\232\241\230\253\230\251\253\343\251\234\240
\253\246\244 bootloader",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        9,
-        "\251\253\246 \251\241\242\236\250\346 \233\345\251\241\246 \253\246\254
\254\247\246\242\246\232\240\251\253\343 \251\230\252",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        13,
-        "\217\230\250\230\241\230\242\351 \234\240\251\341\232\234\253\234
\243\240\230 \233\240\230\243\246\250\255\340\243\342\244\236 \233\240\251\241\342\253\230
\251\253\246 A: \241\230\240",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        14,
-        "\247\230\253\343\251\253\234 ENTER.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        "   ENTER = \221\254\244\342\256\234\240\230   F3 =
\200\247\246\256\351\250\236\251\236",
-        TEXT_TYPE_STATUS,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        NULL,
-        0
-    }
-
-};
-
 static MUI_ENTRY elGRSelectPartitionEntries[] =
 {
     {
@@ -1481,7 +1428,7 @@ static MUI_ENTRY elGRFileCopyEntries[] =
     }
 };
 
-static MUI_ENTRY elGRBootLoaderEntries[] =
+static MUI_ENTRY elGRBootLoaderSelectPageEntries[] =
 {
     {
         4,
@@ -1493,7 +1440,7 @@ static MUI_ENTRY elGRBootLoaderEntries[] =
     {
         6,
         8,
-        "\206 \234\232\241\230\253\341\251\253\230\251\236 \232\250\341\255\234\240
\253\246\244 boot loader",
+        "\206 \234\232\241\230\253\341\251\253\230\251\236 \232\250\341\255\234\240
\253\246\244 bootloader.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1549,6 +1496,13 @@ static MUI_ENTRY elGRBootLoaderInstallPageEntries[] =
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
+    {
+        6,
+        8,
+        "\206 \234\232\241\230\253\341\251\253\230\251\236 \232\250\341\255\234\240
\253\246\244 bootloader.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
     {
         0,
         0,
@@ -1564,6 +1518,59 @@ static MUI_ENTRY elGRBootLoaderInstallPageEntries[] =
     }
 };
 
+static MUI_ENTRY elGRBootLoaderRemovableDiskPageEntries[] =
+{
+    {
+        4,
+        3,
+        " \204\232\241\230\253\341\251\253\230\251\236 \253\246\254 ReactOS "
KERNEL_VERSION_STR,
+        TEXT_STYLE_UNDERLINE,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        8,
+        "\206 \234\232\241\230\253\341\251\253\230\251\236 \233\234
\243\247\246\250\234\345 \244\230 \234\232\241\230\253\230\251\253\343\251\234\240
\253\246\244 bootloader",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        9,
+        "\251\253\246 \251\241\242\236\250\346 \233\345\251\241\246 \253\246\254
\254\247\246\242\246\232\240\251\253\343 \251\230\252.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        13,
+        "\217\230\250\230\241\230\242\351 \234\240\251\341\232\234\253\234
\243\240\230 \233\240\230\243\246\250\255\340\243\342\244\236 \233\240\251\241\342\253\230
\251\253\246 A: \241\230\240",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        14,
+        "\247\230\253\343\251\253\234 ENTER.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        "   ENTER = \221\254\244\342\256\234\240\230   F3 =
\200\247\246\256\351\250\236\251\236",
+        TEXT_TYPE_STATUS,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        NULL,
+        0
+    }
+
+};
+
 static MUI_ENTRY elGRKeyboardSettingsEntries[] =
 {
     {
@@ -2196,8 +2203,8 @@ MUI_PAGE elGRPages[] =
         elGRKeyboardSettingsEntries
     },
     {
-        BOOT_LOADER_PAGE,
-        elGRBootLoaderEntries
+        BOOTLOADER_SELECT_PAGE,
+        elGRBootLoaderSelectPageEntries
     },
     {
         LAYOUT_SETTINGS_PAGE,
@@ -2212,12 +2219,12 @@ MUI_PAGE elGRPages[] =
         elGRSuccessPageEntries
     },
     {
-        BOOT_LOADER_INSTALLATION_PAGE,
+        BOOTLOADER_INSTALL_PAGE,
         elGRBootLoaderInstallPageEntries
     },
     {
-        BOOT_LOADER_FLOPPY_PAGE,
-        elGRBootPageEntries
+        BOOTLOADER_REMOVABLE_DISK_PAGE,
+        elGRBootLoaderRemovableDiskPageEntries
     },
     {
         REGISTRY_PAGE,
diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h
index 1c94ac657e4..3354212a0a2 100644
--- a/base/setup/usetup/lang/en-US.h
+++ b/base/setup/usetup/lang/en-US.h
@@ -928,59 +928,6 @@ static MUI_ENTRY enUSSuccessPageEntries[] =
     }
 };
 
-static MUI_ENTRY enUSBootPageEntries[] =
-{
-    {
-        4,
-        3,
-        " ReactOS " KERNEL_VERSION_STR " Setup ",
-        TEXT_STYLE_UNDERLINE,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        8,
-        "Setup cannot install the bootloader on your computers",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        9,
-        "hardisk",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        13,
-        "Please insert a formatted floppy disk in drive A: and",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        14,
-        "press ENTER.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        "ENTER = Continue   F3 = Quit",
-        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        NULL,
-        0
-    }
-
-};
-
 static MUI_ENTRY enUSSelectPartitionEntries[] =
 {
     {
@@ -1464,7 +1411,7 @@ static MUI_ENTRY enUSFileCopyEntries[] =
     }
 };
 
-static MUI_ENTRY enUSBootLoaderEntries[] =
+static MUI_ENTRY enUSBootLoaderSelectPageEntries[] =
 {
     {
         4,
@@ -1476,7 +1423,7 @@ static MUI_ENTRY enUSBootLoaderEntries[] =
     {
         6,
         8,
-        "Setup is installing the boot loader",
+        "Please select where Setup should install the bootloader:",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1504,7 +1451,7 @@ static MUI_ENTRY enUSBootLoaderEntries[] =
     {
         8,
         15,
-        "Skip install bootloader.",
+        "Skip bootloader installation.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1532,6 +1479,13 @@ static MUI_ENTRY enUSBootLoaderInstallPageEntries[] =
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
+    {
+        6,
+        8,
+        "Setup is installing the bootloader.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
     {
         0,
         0,
@@ -1547,6 +1501,52 @@ static MUI_ENTRY enUSBootLoaderInstallPageEntries[] =
     }
 };
 
+static MUI_ENTRY enUSBootLoaderRemovableDiskPageEntries[] =
+{
+    {
+        4,
+        3,
+        " ReactOS " KERNEL_VERSION_STR " Setup ",
+        TEXT_STYLE_UNDERLINE,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        8,
+        "Setup cannot install the bootloader on your computer's
harddisk.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        13,
+        "Please insert a formatted floppy disk in drive A:",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        14,
+        "and press ENTER.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        "ENTER = Continue   F3 = Quit",
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        NULL,
+        0
+    }
+
+};
+
 static MUI_ENTRY enUSKeyboardSettingsEntries[] =
 {
     {
@@ -2180,8 +2180,8 @@ MUI_PAGE enUSPages[] =
         enUSKeyboardSettingsEntries
     },
     {
-        BOOT_LOADER_PAGE,
-        enUSBootLoaderEntries
+        BOOTLOADER_SELECT_PAGE,
+        enUSBootLoaderSelectPageEntries
     },
     {
         LAYOUT_SETTINGS_PAGE,
@@ -2196,12 +2196,12 @@ MUI_PAGE enUSPages[] =
         enUSSuccessPageEntries
     },
     {
-        BOOT_LOADER_INSTALLATION_PAGE,
+        BOOTLOADER_INSTALL_PAGE,
         enUSBootLoaderInstallPageEntries
     },
     {
-        BOOT_LOADER_FLOPPY_PAGE,
-        enUSBootPageEntries
+        BOOTLOADER_REMOVABLE_DISK_PAGE,
+        enUSBootLoaderRemovableDiskPageEntries
     },
     {
         REGISTRY_PAGE,
diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h
index ba445ecfc0f..6f588779e21 100644
--- a/base/setup/usetup/lang/es-ES.h
+++ b/base/setup/usetup/lang/es-ES.h
@@ -933,59 +933,6 @@ static MUI_ENTRY esESSuccessPageEntries[] =
     }
 };
 
-static MUI_ENTRY esESBootPageEntries[] =
-{
-    {
-        4,
-        3,
-        " Instalaci\242n de ReactOS " KERNEL_VERSION_STR " ",
-        TEXT_STYLE_UNDERLINE,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        8,
-        "El instalador no pudo instalar el cargador de arranque en el disco",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        9,
-        "duro del equipo",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        13,
-        "Inserte un disquete formateado en la unidad A: y",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        14,
-        "Pulse INTRO.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        "   INTRO = Continuar   F3 = Salir",
-        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        NULL,
-        0
-    }
-
-};
-
 static MUI_ENTRY esESSelectPartitionEntries[] =
 {
     {
@@ -1470,7 +1417,7 @@ static MUI_ENTRY esESFileCopyEntries[] =
     }
 };
 
-static MUI_ENTRY esESBootLoaderEntries[] =
+static MUI_ENTRY esESBootLoaderSelectPageEntries[] =
 {
     {
         4,
@@ -1482,7 +1429,7 @@ static MUI_ENTRY esESBootLoaderEntries[] =
     {
         6,
         8,
-        "En este paso, el instalador crear\240 el cargador de arranque",
+        "Please select where Setup should install the bootloader:",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1538,6 +1485,13 @@ static MUI_ENTRY etESBootLoaderInstallPageEntries[] =
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
+    {
+        6,
+        8,
+        "En este paso, el instalador crear\240 el cargador de arranque.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
     {
         0,
         0,
@@ -1553,6 +1507,59 @@ static MUI_ENTRY etESBootLoaderInstallPageEntries[] =
     }
 };
 
+static MUI_ENTRY esESBootLoaderRemovableDiskPageEntries[] =
+{
+    {
+        4,
+        3,
+        " Instalaci\242n de ReactOS " KERNEL_VERSION_STR " ",
+        TEXT_STYLE_UNDERLINE,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        8,
+        "El instalador no pudo instalar el cargador de arranque en el disco",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        9,
+        "duro del equipo.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        13,
+        "Inserte un disquete formateado en la unidad A:",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        14,
+        "y pulse INTRO.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        "   INTRO = Continuar   F3 = Salir",
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        NULL,
+        0
+    }
+
+};
+
 static MUI_ENTRY esESKeyboardSettingsEntries[] =
 {
     {
@@ -2186,8 +2193,8 @@ MUI_PAGE esESPages[] =
         esESKeyboardSettingsEntries
     },
     {
-        BOOT_LOADER_PAGE,
-        esESBootLoaderEntries
+        BOOTLOADER_SELECT_PAGE,
+        esESBootLoaderSelectPageEntries
     },
     {
         LAYOUT_SETTINGS_PAGE,
@@ -2202,12 +2209,12 @@ MUI_PAGE esESPages[] =
         esESSuccessPageEntries
     },
     {
-        BOOT_LOADER_INSTALLATION_PAGE,
+        BOOTLOADER_INSTALL_PAGE,
         etESBootLoaderInstallPageEntries
     },
     {
-        BOOT_LOADER_FLOPPY_PAGE,
-        esESBootPageEntries
+        BOOTLOADER_REMOVABLE_DISK_PAGE,
+        esESBootLoaderRemovableDiskPageEntries
     },
     {
         REGISTRY_PAGE,
diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h
index c29a79ab4d1..881f99de721 100644
--- a/base/setup/usetup/lang/et-EE.h
+++ b/base/setup/usetup/lang/et-EE.h
@@ -930,59 +930,6 @@ static MUI_ENTRY etEESuccessPageEntries[] =
     }
 };
 
-static MUI_ENTRY etEEBootPageEntries[] =
-{
-    {
-        4,
-        3,
-        " ReactOS " KERNEL_VERSION_STR " paigaldus ",
-        TEXT_STYLE_UNDERLINE,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        8,
-        "Alglaadurit ei saanud kettale kirjutada.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        9,
-        "",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        13,
-        "Sisesta vormindatud flopiketas draivi A:",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        14,
-        "ja vajuta ENTER.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        "ENTER = J\204tka   F3 = V\204lju",
-        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        NULL,
-        0
-    }
-
-};
-
 static MUI_ENTRY etEESelectPartitionEntries[] =
 {
     {
@@ -1467,7 +1414,7 @@ static MUI_ENTRY etEEFileCopyEntries[] =
     }
 };
 
-static MUI_ENTRY etEEBootLoaderEntries[] =
+static MUI_ENTRY etEEBootLoaderSelectPageEntries[] =
 {
     {
         4,
@@ -1479,7 +1426,7 @@ static MUI_ENTRY etEEBootLoaderEntries[] =
     {
         6,
         8,
-        "Alglaaduri paigaldamine",
+        "Please select where Setup should install the bootloader:",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1535,6 +1482,13 @@ static MUI_ENTRY etEEBootLoaderInstallPageEntries[] =
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
+    {
+        6,
+        8,
+        "Alglaaduri paigaldamine.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
     {
         0,
         0,
@@ -1550,6 +1504,52 @@ static MUI_ENTRY etEEBootLoaderInstallPageEntries[] =
     }
 };
 
+static MUI_ENTRY etEEBootLoaderRemovableDiskPageEntries[] =
+{
+    {
+        4,
+        3,
+        " ReactOS " KERNEL_VERSION_STR " paigaldus ",
+        TEXT_STYLE_UNDERLINE,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        8,
+        "Alglaadurit ei saanud kettale kirjutada.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        13,
+        "Sisesta vormindatud flopiketas draivi A:",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        14,
+        "ja vajuta ENTER.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        "ENTER = J\204tka   F3 = V\204lju",
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        NULL,
+        0
+    }
+
+};
+
 static MUI_ENTRY etEEKeyboardSettingsEntries[] =
 {
     {
@@ -2181,8 +2181,8 @@ MUI_PAGE etEEPages[] =
         etEEKeyboardSettingsEntries
     },
     {
-        BOOT_LOADER_PAGE,
-        etEEBootLoaderEntries
+        BOOTLOADER_SELECT_PAGE,
+        etEEBootLoaderSelectPageEntries
     },
     {
         LAYOUT_SETTINGS_PAGE,
@@ -2197,12 +2197,12 @@ MUI_PAGE etEEPages[] =
         etEESuccessPageEntries
     },
     {
-        BOOT_LOADER_INSTALLATION_PAGE,
+        BOOTLOADER_INSTALL_PAGE,
         etEEBootLoaderInstallPageEntries
     },
     {
-        BOOT_LOADER_FLOPPY_PAGE,
-        etEEBootPageEntries
+        BOOTLOADER_REMOVABLE_DISK_PAGE,
+        etEEBootLoaderRemovableDiskPageEntries
     },
     {
         REGISTRY_PAGE,
diff --git a/base/setup/usetup/lang/eu-ES.h b/base/setup/usetup/lang/eu-ES.h
index c78fe8dd234..0c2688a9d8e 100644
--- a/base/setup/usetup/lang/eu-ES.h
+++ b/base/setup/usetup/lang/eu-ES.h
@@ -929,59 +929,6 @@ static MUI_ENTRY euESSuccessPageEntries[] =
     }
 };
 
-static MUI_ENTRY euESBootPageEntries[] =
-{
-    {
-        4,
-        3,
-        " ReactOS " KERNEL_VERSION_STR " Instalazioa ",
-        TEXT_STYLE_UNDERLINE,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        8,
-        "Instalazio ez du ahalmenik bootloader-a instalatu zure
ordenagailuaren",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        9,
-        "disko gogorra",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        13,
-        "Mesedez sartu diskete bat formateatuta A: unitaten barnean",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        14,
-        "eta sakatu SARTU.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        "SARTU = Jarraitu   F3 = Irten",
-        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        NULL,
-        0
-    }
-
-};
-
 static MUI_ENTRY euESSelectPartitionEntries[] =
 {
     {
@@ -1465,7 +1412,7 @@ static MUI_ENTRY euESFileCopyEntries[] =
     }
 };
 
-static MUI_ENTRY euESBootLoaderEntries[] =
+static MUI_ENTRY euESBootLoaderSelectPageEntries[] =
 {
     {
         4,
@@ -1477,7 +1424,7 @@ static MUI_ENTRY euESBootLoaderEntries[] =
     {
         6,
         8,
-        "Instalazioak bootloader-a sartzen ari du",
+        "Please select where Setup should install the bootloader:",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1533,6 +1480,13 @@ static MUI_ENTRY euESBootLoaderInstallPageEntries[] =
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
+    {
+        6,
+        8,
+        "Instalazioak bootloader-a sartzen ari du.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
     {
         0,
         0,
@@ -1548,6 +1502,59 @@ static MUI_ENTRY euESBootLoaderInstallPageEntries[] =
     }
 };
 
+static MUI_ENTRY euESBootLoaderRemovableDiskPageEntries[] =
+{
+    {
+        4,
+        3,
+        " ReactOS " KERNEL_VERSION_STR " Instalazioa ",
+        TEXT_STYLE_UNDERLINE,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        8,
+        "Instalazio ez du ahalmenik bootloader-a instalatu zure
ordenagailuaren",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        9,
+        "disko gogorra.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        13,
+        "Mesedez sartu diskete bat formateatuta A: unitaten barnean",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        14,
+        "eta sakatu SARTU.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        "SARTU = Jarraitu   F3 = Irten",
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        NULL,
+        0
+    }
+
+};
+
 static MUI_ENTRY euESKeyboardSettingsEntries[] =
 {
     {
@@ -2181,8 +2188,8 @@ MUI_PAGE euESPages[] =
         euESKeyboardSettingsEntries
     },
     {
-        BOOT_LOADER_PAGE,
-        euESBootLoaderEntries
+        BOOTLOADER_SELECT_PAGE,
+        euESBootLoaderSelectPageEntries
     },
     {
         LAYOUT_SETTINGS_PAGE,
@@ -2197,12 +2204,12 @@ MUI_PAGE euESPages[] =
         euESSuccessPageEntries
     },
     {
-        BOOT_LOADER_INSTALLATION_PAGE,
+        BOOTLOADER_INSTALL_PAGE,
         euESBootLoaderInstallPageEntries
     },
     {
-        BOOT_LOADER_FLOPPY_PAGE,
-        euESBootPageEntries
+        BOOTLOADER_REMOVABLE_DISK_PAGE,
+        euESBootLoaderRemovableDiskPageEntries
     },
     {
         REGISTRY_PAGE,
diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h
index b34852b57c1..4c8d04461f7 100644
--- a/base/setup/usetup/lang/fr-FR.h
+++ b/base/setup/usetup/lang/fr-FR.h
@@ -951,59 +951,6 @@ static MUI_ENTRY frFRSuccessPageEntries[] =
     }
 };
 
-static MUI_ENTRY frFRBootPageEntries[] =
-{
-    {
-        4,
-        3,
-        " Installation de ReactOS " KERNEL_VERSION_STR " ",
-        TEXT_STYLE_UNDERLINE,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        8,
-        "Setup ne peut installer le chargeur sur le disque dur",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        9,
-        "de votre ordinateur",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        13,
-        "Veuillez ins\202rer une disquette format\202e dans le lecteur A:
et",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        14,
-        "appuyer sur ENTR\220E.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        "ENTR\220E = Continuer   F3 = Quitter",
-        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        NULL,
-        0
-    }
-
-};
-
 static MUI_ENTRY frFRSelectPartitionEntries[] =
 {
     {
@@ -1416,7 +1363,7 @@ static MUI_ENTRY frFRInstallDirectoryEntries[] =
     {
         6,
         9,
-        "Choisissez un repertoire o\227 vous voulez que ReactOS soit install\202
:",
+        "Choisissez un r\202pertoire o\227 vous voulez que ReactOS soit install\202
:",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1501,7 +1448,7 @@ static MUI_ENTRY frFRFileCopyEntries[] =
     }
 };
 
-static MUI_ENTRY frFRBootLoaderEntries[] =
+static MUI_ENTRY frFRBootLoaderSelectPageEntries[] =
 {
     {
         4,
@@ -1513,7 +1460,7 @@ static MUI_ENTRY frFRBootLoaderEntries[] =
     {
         6,
         8,
-        "Setup installe le chargeur de d\202marrage",
+        "Veuillez choisir o\227 Setup doit installer le chargeur de d\202marrage
:",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1569,6 +1516,13 @@ static MUI_ENTRY frFRBootLoaderInstallPageEntries[] =
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
+    {
+        6,
+        8,
+        "Setup installe le chargeur de d\202marrage.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
     {
         0,
         0,
@@ -1584,6 +1538,52 @@ static MUI_ENTRY frFRBootLoaderInstallPageEntries[] =
     }
 };
 
+static MUI_ENTRY frFRBootLoaderRemovableDiskPageEntries[] =
+{
+    {
+        4,
+        3,
+        " Installation de ReactOS " KERNEL_VERSION_STR " ",
+        TEXT_STYLE_UNDERLINE,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        8,
+        "Setup ne peut installer le chargeur sur le disque dur de votre
ordinateur.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        13,
+        "Veuillez ins\202rer une disquette format\202e dans le lecteur A:",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        14,
+        "et appuyer sur ENTR\220E.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        "ENTR\220E = Continuer   F3 = Quitter",
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        NULL,
+        0
+    }
+
+};
+
 static MUI_ENTRY frFRKeyboardSettingsEntries[] =
 {
     {
@@ -2217,8 +2217,8 @@ MUI_PAGE frFRPages[] =
         frFRKeyboardSettingsEntries
     },
     {
-        BOOT_LOADER_PAGE,
-        frFRBootLoaderEntries
+        BOOTLOADER_SELECT_PAGE,
+        frFRBootLoaderSelectPageEntries
     },
     {
         LAYOUT_SETTINGS_PAGE,
@@ -2233,12 +2233,12 @@ MUI_PAGE frFRPages[] =
         frFRSuccessPageEntries
     },
     {
-        BOOT_LOADER_INSTALLATION_PAGE,
+        BOOTLOADER_INSTALL_PAGE,
         frFRBootLoaderInstallPageEntries
     },
     {
-        BOOT_LOADER_FLOPPY_PAGE,
-        frFRBootPageEntries
+        BOOTLOADER_REMOVABLE_DISK_PAGE,
+        frFRBootLoaderRemovableDiskPageEntries
     },
     {
         REGISTRY_PAGE,
diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h
index 85751ce77e6..d0b6b7a5fda 100644
--- a/base/setup/usetup/lang/he-IL.h
+++ b/base/setup/usetup/lang/he-IL.h
@@ -932,59 +932,6 @@ static MUI_ENTRY heILSuccessPageEntries[] =
     }
 };
 
-static MUI_ENTRY heILBootPageEntries[] =
-{
-    {
-        4,
-        3,
-        " ReactOS " KERNEL_VERSION_STR " \232\220\227\232\204 ",
-        TEXT_STYLE_UNDERLINE,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        8,
-        "\207\211\231\227\204 \217\220\205\213\204 \214\222 \214\205\207\232\200\204
\214\204\220\216 \232\200 \217\211\227\232\204\214 \204\214\205\213\211 \204\220\211\200
\204\220\227\232\204\204",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        9,
-        "\212\201\231\207\216\201",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        13,
-        ".ENTER \225\207\214\205 :A \217\220\205\213\214 \214\207\232\205\200\216
\217\205\210\211\214\227\232 \221\220\213\204 \204\231\227\201\201",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        14,
-        "",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        "\204\220\227\232\204 \214\205\210\211\201 = F3  \212\231\216\204 =
ENTER",
-        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        NULL,
-        0
-    }
-
-};
-
 static MUI_ENTRY heILSelectPartitionEntries[] =
 {
     {
@@ -1468,7 +1415,7 @@ static MUI_ENTRY heILFileCopyEntries[] =
     }
 };
 
-static MUI_ENTRY heILBootLoaderEntries[] =
+static MUI_ENTRY heILBootLoaderSelectPageEntries[] =
 {
     {
         4,
@@ -1480,7 +1427,7 @@ static MUI_ENTRY heILBootLoaderEntries[] =
     {
         6,
         8,
-        "\214\205\207\232\200\204 \214\204\220\216 \232\200 \232\222\213
\204\220\211\227\232\216 \204\220\227\232\204\204 \232\211\220\213\232",
+        "\214\205\207\232\200\204 \214\204\220\216 \232\200 \232\222\213
\204\220\211\227\232\216 \204\220\227\232\204\204 \232\211\220\213\232.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1536,6 +1483,13 @@ static MUI_ENTRY heILBootLoaderInstallPageEntries[] =
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
+    {
+        6,
+        8,
+        "\214\205\207\232\200\204 \214\204\220\216 \232\200 \232\222\213
\204\220\211\227\232\216 \204\220\227\232\204\204 \232\211\220\213\232.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
     {
         0,
         0,
@@ -1551,6 +1505,52 @@ static MUI_ENTRY heILBootLoaderInstallPageEntries[] =
     }
 };
 
+static MUI_ENTRY heILBootLoaderRemovableDiskPageEntries[] =
+{
+    {
+        4,
+        3,
+        " ReactOS " KERNEL_VERSION_STR " \232\220\227\232\204 ",
+        TEXT_STYLE_UNDERLINE,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        8,
+        "\207\211\231\227\204 \217\220\205\213\204 \214\222 \214\205\207\232\200\204
\214\204\220\216 \232\200 \217\211\227\232\204\214 \204\214\205\213\211 \204\220\211\200
\204\220\227\232\204\204",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        9,
+        "\212\201\231\207\216\201.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        13,
+        ".ENTER \225\207\214\205 :A \217\220\205\213\214 \214\207\232\205\200\216
\217\205\210\211\214\227\232 \221\220\213\204 \204\231\227\201\201",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        "\204\220\227\232\204 \214\205\210\211\201 = F3  \212\231\216\204 =
ENTER",
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        NULL,
+        0
+    }
+
+};
+
 static MUI_ENTRY heILKeyboardSettingsEntries[] =
 {
     {
@@ -2182,8 +2182,8 @@ MUI_PAGE heILPages[] =
         heILKeyboardSettingsEntries
     },
     {
-        BOOT_LOADER_PAGE,
-        heILBootLoaderEntries
+        BOOTLOADER_SELECT_PAGE,
+        heILBootLoaderSelectPageEntries
     },
     {
         LAYOUT_SETTINGS_PAGE,
@@ -2198,12 +2198,12 @@ MUI_PAGE heILPages[] =
         heILSuccessPageEntries
     },
     {
-        BOOT_LOADER_INSTALLATION_PAGE,
+        BOOTLOADER_INSTALL_PAGE,
         heILBootLoaderInstallPageEntries
     },
     {
-        BOOT_LOADER_FLOPPY_PAGE,
-        heILBootPageEntries
+        BOOTLOADER_REMOVABLE_DISK_PAGE,
+        heILBootLoaderRemovableDiskPageEntries
     },
     {
         REGISTRY_PAGE,
diff --git a/base/setup/usetup/lang/hr-HR.h b/base/setup/usetup/lang/hr-HR.h
index ba7d46d1226..798cd0738ee 100644
--- a/base/setup/usetup/lang/hr-HR.h
+++ b/base/setup/usetup/lang/hr-HR.h
@@ -938,59 +938,6 @@ static MUI_ENTRY hrHRSuccessPageEntries[] =
     }
 };
 
-static MUI_ENTRY hrHRBootPageEntries[] =
-{
-    {
-        4,
-        3,
-        " ReactOS " KERNEL_VERSION_STR " instalacija ",
-        TEXT_STYLE_UNDERLINE,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        8,
-        "Instalacijski program ne mo\247e instalirati bootloader (pokreta\237
operativnog sustava) na va\347",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        9,
-        "tvrdi disk u ra\237unalu",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        13,
-        "Ubacite formatiranu disketu u Disk A: i",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        14,
-        "pritisnite ENTER.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        "ENTER = Nastavi   F3 = Iza\320i",
-        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        NULL,
-        0
-    }
-
-};
-
 static MUI_ENTRY hrHRSelectPartitionEntries[] =
 {
     {
@@ -1481,7 +1428,7 @@ static MUI_ENTRY hrHRFileCopyEntries[] =
     }
 };
 
-static MUI_ENTRY hrHRBootLoaderEntries[] =
+static MUI_ENTRY hrHRBootLoaderSelectPageEntries[] =
 {
     {
         4,
@@ -1493,14 +1440,7 @@ static MUI_ENTRY hrHRBootLoaderEntries[] =
     {
         6,
         8,
-        "Instalacijski program instalirava bootloader",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        9,
-        "(pokreta\237a operativnog sustava)",
+        "Please select where Setup should install the bootloader:",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1556,6 +1496,20 @@ static MUI_ENTRY hrHRBootLoaderInstallPageEntries[] =
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
+    {
+        6,
+        8,
+        "Instalacijski program instalirava bootloader",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        9,
+        "(pokreta\237a operativnog sustava).",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
     {
         0,
         0,
@@ -1571,6 +1525,59 @@ static MUI_ENTRY hrHRBootLoaderInstallPageEntries[] =
     }
 };
 
+static MUI_ENTRY hrHRBootLoaderRemovableDiskPageEntries[] =
+{
+    {
+        4,
+        3,
+        " ReactOS " KERNEL_VERSION_STR " instalacija ",
+        TEXT_STYLE_UNDERLINE,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        8,
+        "Instalacijski program ne mo\247e instalirati bootloader (pokreta\237
operativnog sustava) na va\347",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        9,
+        "tvrdi disk u ra\237unalu.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        13,
+        "Ubacite formatiranu disketu u Disk A:",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        14,
+        "i pritisnite ENTER.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        "ENTER = Nastavi   F3 = Iza\320i",
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        NULL,
+        0
+    }
+
+};
+
 static MUI_ENTRY hrHRKeyboardSettingsEntries[] =
 {
     {
@@ -2204,8 +2211,8 @@ MUI_PAGE hrHRPages[] =
         hrHRKeyboardSettingsEntries
     },
     {
-        BOOT_LOADER_PAGE,
-        hrHRBootLoaderEntries
+        BOOTLOADER_SELECT_PAGE,
+        hrHRBootLoaderSelectPageEntries
     },
     {
         LAYOUT_SETTINGS_PAGE,
@@ -2220,12 +2227,12 @@ MUI_PAGE hrHRPages[] =
         hrHRSuccessPageEntries
     },
     {
-        BOOT_LOADER_INSTALLATION_PAGE,
+        BOOTLOADER_INSTALL_PAGE,
         hrHRBootLoaderInstallPageEntries
     },
     {
-        BOOT_LOADER_FLOPPY_PAGE,
-        hrHRBootPageEntries
+        BOOTLOADER_REMOVABLE_DISK_PAGE,
+        hrHRBootLoaderRemovableDiskPageEntries
     },
     {
         REGISTRY_PAGE,
diff --git a/base/setup/usetup/lang/hu-HU.h b/base/setup/usetup/lang/hu-HU.h
index 270cac926eb..84a5335e7d5 100644
--- a/base/setup/usetup/lang/hu-HU.h
+++ b/base/setup/usetup/lang/hu-HU.h
@@ -937,59 +937,6 @@ static MUI_ENTRY huHUSuccessPageEntries[] =
     }
 };
 
-static MUI_ENTRY huHUBootPageEntries[] =
-{
-    {
-        4,
-        3,
-        " ReactOS " KERNEL_VERSION_STR " telep\241t\213 ",
-        TEXT_STYLE_UNDERLINE,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        8,
-        "Nem siker\201lt telep\241teni a rendszerbet\224lt\213t",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        9,
-        "a sz\240m\241t\242g\202p merevlemez\202re.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        13,
-        "K\202rj\201k helyezzen be egy megform\240zott floppy lemezt",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        14,
-        "az A: meghajt\242ba, majd nyomjon ENTER-t.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        "ENTER = Folytat\240s   F3 = Kil\202p\202s",
-        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        NULL,
-        0
-    }
-
-};
-
 static MUI_ENTRY huHUSelectPartitionEntries[] =
 {
     {
@@ -1358,7 +1305,7 @@ static MUI_ENTRY huHUFileCopyEntries[] =
     }
 };
 
-static MUI_ENTRY huHUBootLoaderEntries[] =
+static MUI_ENTRY huHUBootLoaderSelectPageEntries[] =
 {
     {
         4,
@@ -1370,7 +1317,7 @@ static MUI_ENTRY huHUBootLoaderEntries[] =
     {
         6,
         8,
-        "Boot loader telep\241t\202se",
+        "Please select where Setup should install the bootloader:",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1426,6 +1373,13 @@ static MUI_ENTRY huHUBootLoaderInstallPageEntries[] =
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
+    {
+        6,
+        8,
+        "Bootloader telep\241t\202se.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
     {
         0,
         0,
@@ -1441,6 +1395,59 @@ static MUI_ENTRY huHUBootLoaderInstallPageEntries[] =
     }
 };
 
+static MUI_ENTRY huHUBootLoaderRemovableDiskPageEntries[] =
+{
+    {
+        4,
+        3,
+        " ReactOS " KERNEL_VERSION_STR " telep\241t\213 ",
+        TEXT_STYLE_UNDERLINE,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        8,
+        "Nem siker\201lt telep\241teni a rendszerbet\224lt\213t",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        9,
+        "a sz\240m\241t\242g\202p merevlemez\202re.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        13,
+        "K\202rj\201k helyezzen be egy megform\240zott floppy lemezt",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        14,
+        "az A: meghajt\242ba, majd nyomjon ENTER-t.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        "ENTER = Folytat\240s   F3 = Kil\202p\202s",
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        NULL,
+        0
+    }
+
+};
+
 static MUI_ENTRY huHUKeyboardSettingsEntries[] =
 {
     {
@@ -2071,8 +2078,8 @@ MUI_PAGE huHUPages[] =
         huHUKeyboardSettingsEntries
     },
     {
-        BOOT_LOADER_PAGE,
-        huHUBootLoaderEntries
+        BOOTLOADER_SELECT_PAGE,
+        huHUBootLoaderSelectPageEntries
     },
     {
         LAYOUT_SETTINGS_PAGE,
@@ -2087,12 +2094,12 @@ MUI_PAGE huHUPages[] =
         huHUSuccessPageEntries
     },
     {
-        BOOT_LOADER_INSTALLATION_PAGE,
+        BOOTLOADER_INSTALL_PAGE,
         huHUBootLoaderInstallPageEntries
     },
     {
-        BOOT_LOADER_FLOPPY_PAGE,
-        huHUBootPageEntries
+        BOOTLOADER_REMOVABLE_DISK_PAGE,
+        huHUBootLoaderRemovableDiskPageEntries
     },
     {
         REGISTRY_PAGE,
diff --git a/base/setup/usetup/lang/id-ID.h b/base/setup/usetup/lang/id-ID.h
index e43a768a2d8..676284f7f67 100644
--- a/base/setup/usetup/lang/id-ID.h
+++ b/base/setup/usetup/lang/id-ID.h
@@ -928,59 +928,6 @@ static MUI_ENTRY idIDSuccessPageEntries[] =
     }
 };
 
-static MUI_ENTRY idIDBootPageEntries[] =
-{
-    {
-        4,
-        3,
-        " Penyetelan ReactOS " KERNEL_VERSION_STR " ",
-        TEXT_STYLE_UNDERLINE,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        8,
-        "Penyetelan tidak dapat menasang bootloader pada komputer Anda",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        9,
-        "hardisk",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        13,
-        "Mohon masukkan cakram disket yang terformat di drive A:",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        14,
-        "dan tekan ENTER.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        "ENTER = Lanjut   F3 = Keluar",
-        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        NULL,
-        0
-    }
-
-};
-
 static MUI_ENTRY idIDSelectPartitionEntries[] =
 {
     {
@@ -1464,7 +1411,7 @@ static MUI_ENTRY idIDFileCopyEntries[] =
     }
 };
 
-static MUI_ENTRY idIDBootLoaderEntries[] =
+static MUI_ENTRY idIDBootLoaderSelectPageEntries[] =
 {
     {
         4,
@@ -1476,7 +1423,7 @@ static MUI_ENTRY idIDBootLoaderEntries[] =
     {
         6,
         8,
-        "Penyetelan sedang memasang the boot loader",
+        "Please select where Setup should install the bootloader:",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1532,6 +1479,13 @@ static MUI_ENTRY idIDBootLoaderInstallPageEntries[] =
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
+    {
+        6,
+        8,
+        "Penyetelan sedang memasang the bootloader.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
     {
         0,
         0,
@@ -1547,6 +1501,59 @@ static MUI_ENTRY idIDBootLoaderInstallPageEntries[] =
     }
 };
 
+static MUI_ENTRY idIDBootLoaderRemovableDiskPageEntries[] =
+{
+    {
+        4,
+        3,
+        " Penyetelan ReactOS " KERNEL_VERSION_STR " ",
+        TEXT_STYLE_UNDERLINE,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        8,
+        "Penyetelan tidak dapat menasang bootloader pada komputer Anda",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        9,
+        "harddisk.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        13,
+        "Mohon masukkan cakram disket yang terformat di drive A:",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        14,
+        "dan tekan ENTER.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        "ENTER = Lanjut   F3 = Keluar",
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        NULL,
+        0
+    }
+
+};
+
 static MUI_ENTRY idIDKeyboardSettingsEntries[] =
 {
     {
@@ -2180,8 +2187,8 @@ MUI_PAGE idIDPages[] =
         idIDKeyboardSettingsEntries
     },
     {
-        BOOT_LOADER_PAGE,
-        idIDBootLoaderEntries
+        BOOTLOADER_SELECT_PAGE,
+        idIDBootLoaderSelectPageEntries
     },
     {
         LAYOUT_SETTINGS_PAGE,
@@ -2196,12 +2203,12 @@ MUI_PAGE idIDPages[] =
         idIDSuccessPageEntries
     },
     {
-        BOOT_LOADER_INSTALLATION_PAGE,
+        BOOTLOADER_INSTALL_PAGE,
         idIDBootLoaderInstallPageEntries
     },
     {
-        BOOT_LOADER_FLOPPY_PAGE,
-        idIDBootPageEntries
+        BOOTLOADER_REMOVABLE_DISK_PAGE,
+        idIDBootLoaderRemovableDiskPageEntries
     },
     {
         REGISTRY_PAGE,
diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h
index e5a6b812a3f..8561f381f08 100644
--- a/base/setup/usetup/lang/it-IT.h
+++ b/base/setup/usetup/lang/it-IT.h
@@ -927,83 +927,6 @@ static MUI_ENTRY itITSuccessPageEntries[] =
     }
 };
 
-static MUI_ENTRY itITBootPageEntries[] =
-{
-    {
-        4,
-        3,
-        " Installazione di ReactOS " KERNEL_VERSION_STR " ",
-        TEXT_STYLE_UNDERLINE,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        8,
-        "Il Setup non ha potuto installare il bootloader nel disco",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        9,
-        "del vostro computer",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        13,
-        "Inserire un disco floppy formattato nell'unit\x85 A: e",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        14,
-        "premere INVIO.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        "   INVIO = Continua   F3 = Termina",
-        TEXT_TYPE_STATUS,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        NULL,
-        0
-    }
-
-};
-
-static MUI_ENTRY itITBootLoaderInstallPageEntries[] =
-{
-    {
-        4,
-        3,
-        " ReactOS " KERNEL_VERSION_STR " Setup ",
-        TEXT_STYLE_UNDERLINE,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        "Installing the bootloader onto the media, please wait...",
-        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        NULL,
-        0
-    }
-};
-
 static MUI_ENTRY itITSelectPartitionEntries[] =
 {
     {
@@ -1494,7 +1417,7 @@ static MUI_ENTRY itITFileCopyEntries[] =
     }
 };
 
-static MUI_ENTRY itITBootLoaderEntries[] =
+static MUI_ENTRY itITBootLoaderSelectPageEntries[] =
 {
     {
         4,
@@ -1506,7 +1429,7 @@ static MUI_ENTRY itITBootLoaderEntries[] =
     {
         6,
         8,
-        "Setup sta installando il bootloader",
+        "Please select where Setup should install the bootloader:",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1553,6 +1476,90 @@ static MUI_ENTRY itITBootLoaderEntries[] =
     }
 };
 
+static MUI_ENTRY itITBootLoaderInstallPageEntries[] =
+{
+    {
+        4,
+        3,
+        " ReactOS " KERNEL_VERSION_STR " Setup ",
+        TEXT_STYLE_UNDERLINE,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        8,
+        "Setup sta installando il bootloader.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        "Installing the bootloader onto the media, please wait...",
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        NULL,
+        0
+    }
+};
+
+static MUI_ENTRY itITBootLoaderRemovableDiskPageEntries[] =
+{
+    {
+        4,
+        3,
+        " Installazione di ReactOS " KERNEL_VERSION_STR " ",
+        TEXT_STYLE_UNDERLINE,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        8,
+        "Il Setup non ha potuto installare il bootloader nel disco",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        9,
+        "del vostro computer.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        13,
+        "Inserire un disco floppy formattato nell'unit\x85 A:",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        14,
+        "e premere INVIO.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        "   INVIO = Continua   F3 = Termina",
+        TEXT_TYPE_STATUS,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        NULL,
+        0
+    }
+
+};
+
 static MUI_ENTRY itITKeyboardSettingsEntries[] =
 {
     {
@@ -2186,8 +2193,8 @@ MUI_PAGE itITPages[] =
         itITKeyboardSettingsEntries
     },
     {
-        BOOT_LOADER_PAGE,
-        itITBootLoaderEntries
+        BOOTLOADER_SELECT_PAGE,
+        itITBootLoaderSelectPageEntries
     },
     {
         LAYOUT_SETTINGS_PAGE,
@@ -2202,12 +2209,12 @@ MUI_PAGE itITPages[] =
         itITSuccessPageEntries
     },
     {
-        BOOT_LOADER_INSTALLATION_PAGE,
+        BOOTLOADER_INSTALL_PAGE,
         itITBootLoaderInstallPageEntries
     },
     {
-        BOOT_LOADER_FLOPPY_PAGE,
-        itITBootPageEntries
+        BOOTLOADER_REMOVABLE_DISK_PAGE,
+        itITBootLoaderRemovableDiskPageEntries
     },
     {
         REGISTRY_PAGE,
diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h
index 461281ffa2a..86ba2f45f9b 100644
--- a/base/setup/usetup/lang/ja-JP.h
+++ b/base/setup/usetup/lang/ja-JP.h
@@ -930,59 +930,6 @@ static MUI_ENTRY jaJPSuccessPageEntries[] =
     }
 };
 
-static MUI_ENTRY jaJPBootPageEntries[] =
-{
-    {
-        4,
-        3,
-        " ReactOS " KERNEL_VERSION_STR " \276\257\304\261\257\314\337
",
-        TEXT_STYLE_UNDERLINE,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        8,
-        "\276\257\304\261\257\314\337\312 \314\336\260\304\333\260\300\336\246
\272\335\313\337\255\260\300\311 \312\260\304\336\303\336\250\275\270\274\336\256\263\306
\262\335\275\304\260\331",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        9,
-        "\303\336\267\317\276\335\303\336\274\300",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        13,
-        "\304\336\327\262\314\336 A: \306 \314\253\260\317\257\304 \273\332\300
\314\333\257\313\337\260 \303\336\250\275\270\246 \262\332\303\244",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        14,
-        "ENTER \267\260\246 \265\274\303 \270\300\336\273\262\241",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        "ENTER = \277\336\257\272\263   F3 = \301\255\263\274",
-        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        NULL,
-        0
-    }
-
-};
-
 static MUI_ENTRY jaJPSelectPartitionEntries[] =
 {
     {
@@ -1467,7 +1414,7 @@ static MUI_ENTRY jaJPFileCopyEntries[] =
     }
 };
 
-static MUI_ENTRY jaJPBootLoaderEntries[] =
+static MUI_ENTRY jaJPBootLoaderSelectPageEntries[] =
 {
     {
         4,
@@ -1479,7 +1426,7 @@ static MUI_ENTRY jaJPBootLoaderEntries[] =
     {
         6,
         8,
-        "\276\257\304\261\257\314\337\312 \314\336\260\304 \333\260\300\336\246
\262\335\275\304\260\331 \274\317\275",
+        "\276\257\304\261\257\314\337\312 \314\336\260\304 \333\260\300\336\246
\262\335\275\304\260\331 \274\317\275.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1535,6 +1482,13 @@ static MUI_ENTRY jaJPBootLoaderInstallPageEntries[] =
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
+    {
+        6,
+        8,
+        "\276\257\304\261\257\314\337\312 \314\336\260\304 \333\260\300\336\246
\262\335\275\304\260\331 \274\317\275.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
     {
         0,
         0,
@@ -1550,6 +1504,59 @@ static MUI_ENTRY jaJPBootLoaderInstallPageEntries[] =
     }
 };
 
+static MUI_ENTRY jaJPBootLoaderRemovableDiskPageEntries[] =
+{
+    {
+        4,
+        3,
+        " ReactOS " KERNEL_VERSION_STR " \276\257\304\261\257\314\337
",
+        TEXT_STYLE_UNDERLINE,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        8,
+        "\276\257\304\261\257\314\337\312 \314\336\260\304\333\260\300\336\246
\272\335\313\337\255\260\300\311 \312\260\304\336\303\336\250\275\270\274\336\256\263\306
\262\335\275\304\260\331",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        9,
+        "\303\336\267\317\276\335\303\336\274\300.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        13,
+        "\304\336\327\262\314\336 A: \306 \314\253\260\317\257\304 \273\332\300
\314\333\257\313\337\260 \303\336\250\275\270\246 \262\332\303\244",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        14,
+        "ENTER \267\260\246 \265\274\303 \270\300\336\273\262\241",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        "ENTER = \277\336\257\272\263   F3 = \301\255\263\274",
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        NULL,
+        0
+    }
+
+};
+
 static MUI_ENTRY jaJPKeyboardSettingsEntries[] =
 {
     {
@@ -2183,8 +2190,8 @@ MUI_PAGE jaJPPages[] =
         jaJPKeyboardSettingsEntries
     },
     {
-        BOOT_LOADER_PAGE,
-        jaJPBootLoaderEntries
+        BOOTLOADER_SELECT_PAGE,
+        jaJPBootLoaderSelectPageEntries
     },
     {
         LAYOUT_SETTINGS_PAGE,
@@ -2199,12 +2206,12 @@ MUI_PAGE jaJPPages[] =
         jaJPSuccessPageEntries
     },
     {
-        BOOT_LOADER_INSTALLATION_PAGE,
+        BOOTLOADER_INSTALL_PAGE,
         jaJPBootLoaderInstallPageEntries
     },
     {
-        BOOT_LOADER_FLOPPY_PAGE,
-        jaJPBootPageEntries
+        BOOTLOADER_REMOVABLE_DISK_PAGE,
+        jaJPBootLoaderRemovableDiskPageEntries
     },
     {
         REGISTRY_PAGE,
diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h
index 9c5942222eb..5e98513d4b8 100644
--- a/base/setup/usetup/lang/lt-LT.h
+++ b/base/setup/usetup/lang/lt-LT.h
@@ -939,59 +939,6 @@ static MUI_ENTRY ltLTSuccessPageEntries[] =
     }
 };
 
-static MUI_ENTRY ltLTBootPageEntries[] =
-{
-    {
-        4,
-        3,
-        " ReactOS " KERNEL_VERSION_STR " diegimo programa ",
-        TEXT_STYLE_UNDERLINE,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        8,
-        "Setup cannot install the bootloader on your computers",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        9,
-        "hardisk",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        13,
-        "Please insert a formatted floppy disk in drive A: and",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        14,
-        "press ENTER.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        "ENTER = T\322sti   F3 = Baigti",
-        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        NULL,
-        0
-    }
-
-};
-
 static MUI_ENTRY ltLTSelectPartitionEntries[] =
 {
     {
@@ -1475,7 +1422,7 @@ static MUI_ENTRY ltLTFileCopyEntries[] =
     }
 };
 
-static MUI_ENTRY ltLTBootLoaderEntries[] =
+static MUI_ENTRY ltLTBootLoaderSelectPageEntries[] =
 {
     {
         4,
@@ -1487,7 +1434,7 @@ static MUI_ENTRY ltLTBootLoaderEntries[] =
     {
         6,
         8,
-        "Setup is installing the boot loader",
+        "Please select where Setup should install the bootloader:",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1515,7 +1462,7 @@ static MUI_ENTRY ltLTBootLoaderEntries[] =
     {
         8,
         15,
-        "Skip install bootloader.",
+        "Skip bootloader installation.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1543,6 +1490,13 @@ static MUI_ENTRY ltLTBootLoaderInstallPageEntries[] =
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
+    {
+        6,
+        8,
+        "Setup is installing the bootloader.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
     {
         0,
         0,
@@ -1558,6 +1512,52 @@ static MUI_ENTRY ltLTBootLoaderInstallPageEntries[] =
     }
 };
 
+static MUI_ENTRY ltLTBootLoaderRemovableDiskPageEntries[] =
+{
+    {
+        4,
+        3,
+        " ReactOS " KERNEL_VERSION_STR " diegimo programa ",
+        TEXT_STYLE_UNDERLINE,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        8,
+        "Setup cannot install the bootloader on your computer's
harddisk.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        13,
+        "Please insert a formatted floppy disk in drive A:",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        14,
+        "and press ENTER.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        "ENTER = T\322sti   F3 = Baigti",
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        NULL,
+        0
+    }
+
+};
+
 static MUI_ENTRY ltLTKeyboardSettingsEntries[] =
 {
     {
@@ -2191,8 +2191,8 @@ MUI_PAGE ltLTPages[] =
         ltLTKeyboardSettingsEntries
     },
     {
-        BOOT_LOADER_PAGE,
-        ltLTBootLoaderEntries
+        BOOTLOADER_SELECT_PAGE,
+        ltLTBootLoaderSelectPageEntries
     },
     {
         LAYOUT_SETTINGS_PAGE,
@@ -2207,12 +2207,12 @@ MUI_PAGE ltLTPages[] =
         ltLTSuccessPageEntries
     },
     {
-        BOOT_LOADER_INSTALLATION_PAGE,
+        BOOTLOADER_INSTALL_PAGE,
         ltLTBootLoaderInstallPageEntries
     },
     {
-        BOOT_LOADER_FLOPPY_PAGE,
-        ltLTBootPageEntries
+        BOOTLOADER_REMOVABLE_DISK_PAGE,
+        ltLTBootLoaderRemovableDiskPageEntries
     },
     {
         REGISTRY_PAGE,
diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h
index 933e4795cd9..50b6aba84f5 100644
--- a/base/setup/usetup/lang/ms-MY.h
+++ b/base/setup/usetup/lang/ms-MY.h
@@ -927,59 +927,6 @@ static MUI_ENTRY msMYSuccessPageEntries[] =
     }
 };
 
-static MUI_ENTRY msMYBootPageEntries[] =
-{
-    {
-        4,
-        3,
-        " ReactOS " KERNEL_VERSION_STR " Persediaan ",
-        TEXT_STYLE_UNDERLINE,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        8,
-        "Persediaan tidak dapat memasang bootloader pada komputer",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        9,
-        "cakera keras anda",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        13,
-        "Sila sisipkan cakera liut diformatkan dalam pemacu A:",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        14,
-        "dan tekan ENTER.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        "ENTER = Teruskan   F3 = Keluar",
-        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        NULL,
-        0
-    }
-
-};
-
 static MUI_ENTRY msMYSelectPartitionEntries[] =
 {
     {
@@ -1456,7 +1403,7 @@ static MUI_ENTRY msMYFileCopyEntries[] =
     }
 };
 
-static MUI_ENTRY msMYBootLoaderEntries[] =
+static MUI_ENTRY msMYBootLoaderSelectPageEntries[] =
 {
     {
         4,
@@ -1468,7 +1415,7 @@ static MUI_ENTRY msMYBootLoaderEntries[] =
     {
         6,
         8,
-        "Persediaan sedang memasang boot loader",
+        "Please select where Setup should install the bootloader:",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1496,7 +1443,7 @@ static MUI_ENTRY msMYBootLoaderEntries[] =
     {
         8,
         15,
-        "Langkau memasang boot loader.",
+        "Langkau memasang bootloader.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1524,6 +1471,13 @@ static MUI_ENTRY msMYBootLoaderInstallPageEntries[] =
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
+    {
+        6,
+        8,
+        "Persediaan sedang memasang bootloader.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
     {
         0,
         0,
@@ -1539,6 +1493,59 @@ static MUI_ENTRY msMYBootLoaderInstallPageEntries[] =
     }
 };
 
+static MUI_ENTRY msMYBootLoaderRemovableDiskPageEntries[] =
+{
+    {
+        4,
+        3,
+        " ReactOS " KERNEL_VERSION_STR " Persediaan ",
+        TEXT_STYLE_UNDERLINE,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        8,
+        "Persediaan tidak dapat memasang bootloader pada komputer",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        9,
+        "cakera keras anda.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        13,
+        "Sila sisipkan cakera liut diformatkan dalam pemacu A:",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        14,
+        "dan tekan ENTER.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        "ENTER = Teruskan   F3 = Keluar",
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        NULL,
+        0
+    }
+
+};
+
 static MUI_ENTRY msMYKeyboardSettingsEntries[] =
 {
     {
@@ -2165,8 +2172,8 @@ MUI_PAGE msMYPages[] =
         msMYKeyboardSettingsEntries
     },
     {
-        BOOT_LOADER_PAGE,
-        msMYBootLoaderEntries
+        BOOTLOADER_SELECT_PAGE,
+        msMYBootLoaderSelectPageEntries
     },
     {
         LAYOUT_SETTINGS_PAGE,
@@ -2181,12 +2188,12 @@ MUI_PAGE msMYPages[] =
         msMYSuccessPageEntries
     },
     {
-        BOOT_LOADER_INSTALLATION_PAGE,
+        BOOTLOADER_INSTALL_PAGE,
         msMYBootLoaderInstallPageEntries
     },
     {
-        BOOT_LOADER_FLOPPY_PAGE,
-        msMYBootPageEntries
+        BOOTLOADER_REMOVABLE_DISK_PAGE,
+        msMYBootLoaderRemovableDiskPageEntries
     },
     {
         REGISTRY_PAGE,
diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h
index 3da7c994373..b007421627b 100644
--- a/base/setup/usetup/lang/nl-NL.h
+++ b/base/setup/usetup/lang/nl-NL.h
@@ -942,59 +942,6 @@ static MUI_ENTRY nlNLSuccessPageEntries[] =
     }
 };
 
-static MUI_ENTRY nlNLBootPageEntries[] =
-{
-    {
-        4,
-        3,
-        " ReactOS " KERNEL_VERSION_STR " Setup ",
-        TEXT_STYLE_UNDERLINE,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        8,
-        "Setup kan de bootloader niet op de vaste schijf van uw computer",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        9,
-        "installeren",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        13,
-        "Voer een geformatteerde diskette in station A: in en",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        14,
-        "druk op ENTER.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        "ENTER = Doorgaan   F3 = Afsluiten",
-        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        NULL,
-        0
-    }
-
-};
-
 static MUI_ENTRY nlNLSelectPartitionEntries[] =
 {
     {
@@ -1479,7 +1426,7 @@ static MUI_ENTRY nlNLFileCopyEntries[] =
     }
 };
 
-static MUI_ENTRY nlNLBootLoaderEntries[] =
+static MUI_ENTRY nlNLBootLoaderSelectPageEntries[] =
 {
     {
         4,
@@ -1491,7 +1438,7 @@ static MUI_ENTRY nlNLBootLoaderEntries[] =
     {
         6,
         8,
-        "Setup installeert de bootloader.",
+        "Please select where Setup should install the bootloader:",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1547,6 +1494,13 @@ static MUI_ENTRY nlNLBootLoaderInstallPageEntries[] =
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
+    {
+        6,
+        8,
+        "Setup installeert de bootloader.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
     {
         0,
         0,
@@ -1562,6 +1516,59 @@ static MUI_ENTRY nlNLBootLoaderInstallPageEntries[] =
     }
 };
 
+static MUI_ENTRY nlNLBootLoaderRemovableDiskPageEntries[] =
+{
+    {
+        4,
+        3,
+        " ReactOS " KERNEL_VERSION_STR " Setup ",
+        TEXT_STYLE_UNDERLINE,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        8,
+        "Setup kan de bootloader niet op de vaste schijf van uw computer",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        9,
+        "installeren.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        13,
+        "Voer een geformatteerde diskette in station A: in",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        14,
+        "en druk op ENTER.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        "ENTER = Doorgaan   F3 = Afsluiten",
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        NULL,
+        0
+    }
+
+};
+
 static MUI_ENTRY nlNLkeyboardSettingsEntries[] =
 {
     {
@@ -2205,8 +2212,8 @@ MUI_PAGE nlNLPages[] =
         nlNLkeyboardSettingsEntries
     },
     {
-        BOOT_LOADER_PAGE,
-        nlNLBootLoaderEntries
+        BOOTLOADER_SELECT_PAGE,
+        nlNLBootLoaderSelectPageEntries
     },
     {
         LAYOUT_SETTINGS_PAGE,
@@ -2221,12 +2228,12 @@ MUI_PAGE nlNLPages[] =
         nlNLSuccessPageEntries
     },
     {
-        BOOT_LOADER_INSTALLATION_PAGE,
+        BOOTLOADER_INSTALL_PAGE,
         nlNLBootLoaderInstallPageEntries
     },
     {
-        BOOT_LOADER_FLOPPY_PAGE,
-        nlNLBootPageEntries
+        BOOTLOADER_REMOVABLE_DISK_PAGE,
+        nlNLBootLoaderRemovableDiskPageEntries
     },
     {
         REGISTRY_PAGE,
diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h
index 7c735287b95..2c1407ec554 100644
--- a/base/setup/usetup/lang/pl-PL.h
+++ b/base/setup/usetup/lang/pl-PL.h
@@ -940,59 +940,6 @@ static MUI_ENTRY plPLSuccessPageEntries[] =
     }
 };
 
-static MUI_ENTRY plPLBootPageEntries[] =
-{
-    {
-        4,
-        3,
-        " Instalator ReactOS " KERNEL_VERSION_STR " ",
-        TEXT_STYLE_UNDERLINE,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        8,
-        "Instalator systemu ReactOS nie mo\276e zainstalowa\206",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        9,
-        "mened\276era rozruchu na dysku twardym",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        13,
-        "W\210\242\276 sformatowan\245 dyskietk\251 do nap\251du A:",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        14,
-        "i nacisnij klawisz ENTER.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        "ENTER = Kontynuacja   F3 = Wyj\230cie",
-        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        NULL,
-        0
-    }
-
-};
-
 static MUI_ENTRY plPLSelectPartitionEntries[] =
 {
     {
@@ -1476,7 +1423,7 @@ static MUI_ENTRY plPLFileCopyEntries[] =
     }
 };
 
-static MUI_ENTRY plPLBootLoaderEntries[] =
+static MUI_ENTRY plPLBootLoaderSelectPageEntries[] =
 {
     {
         4,
@@ -1488,7 +1435,7 @@ static MUI_ENTRY plPLBootLoaderEntries[] =
     {
         6,
         8,
-        "Instalator musi teraz zainstalowa\206 mened\276er rozruchu",
+        "Please select where Setup should install the bootloader:",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1544,6 +1491,13 @@ static MUI_ENTRY plPLBootLoaderInstallPageEntries[] =
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
+    {
+        6,
+        8,
+        "Instalator musi teraz zainstalowa\206 mened\276er rozruchu.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
     {
         0,
         0,
@@ -1559,6 +1513,59 @@ static MUI_ENTRY plPLBootLoaderInstallPageEntries[] =
     }
 };
 
+static MUI_ENTRY plPLBootLoaderRemovableDiskPageEntries[] =
+{
+    {
+        4,
+        3,
+        " Instalator ReactOS " KERNEL_VERSION_STR " ",
+        TEXT_STYLE_UNDERLINE,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        8,
+        "Instalator systemu ReactOS nie mo\276e zainstalowa\206",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        9,
+        "mened\276era rozruchu na dysku twardym.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        13,
+        "W\210\242\276 sformatowan\245 dyskietk\251 do nap\251du A:",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        14,
+        "i nacisnij klawisz ENTER.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        "ENTER = Kontynuacja   F3 = Wyj\230cie",
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        NULL,
+        0
+    }
+
+};
+
 static MUI_ENTRY plPLKeyboardSettingsEntries[] =
 {
     {
@@ -2192,8 +2199,8 @@ MUI_PAGE plPLPages[] =
         plPLKeyboardSettingsEntries
     },
     {
-        BOOT_LOADER_PAGE,
-        plPLBootLoaderEntries
+        BOOTLOADER_SELECT_PAGE,
+        plPLBootLoaderSelectPageEntries
     },
     {
         LAYOUT_SETTINGS_PAGE,
@@ -2208,12 +2215,12 @@ MUI_PAGE plPLPages[] =
         plPLSuccessPageEntries
     },
     {
-        BOOT_LOADER_INSTALLATION_PAGE,
+        BOOTLOADER_INSTALL_PAGE,
         plPLBootLoaderInstallPageEntries
     },
     {
-        BOOT_LOADER_FLOPPY_PAGE,
-        plPLBootPageEntries
+        BOOTLOADER_REMOVABLE_DISK_PAGE,
+        plPLBootLoaderRemovableDiskPageEntries
     },
     {
         REGISTRY_PAGE,
diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h
index e898699a295..b4d5b5a448b 100644
--- a/base/setup/usetup/lang/pt-BR.h
+++ b/base/setup/usetup/lang/pt-BR.h
@@ -937,59 +937,6 @@ static MUI_ENTRY ptBRSuccessPageEntries[] =
     }
 };
 
-static MUI_ENTRY ptBRBootPageEntries[] =
-{
-    {
-        4,
-        3,
-        " Instala\207\306o do ReactOS " KERNEL_VERSION_STR " ",
-        TEXT_STYLE_UNDERLINE,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        8,
-        "O instalador n\306o p\223de instalar o ger\210nciador de
inicializa\207\306o no disco",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        9,
-        "r\241gido do computador.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        13,
-        "Por favor insira um disquete formatado na unidade A: e",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        14,
-        "pressione ENTER.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        "ENTER=Continuar  F3=Sair",
-        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        NULL,
-        0
-    }
-
-};
-
 static MUI_ENTRY ptBRSelectPartitionEntries[] =
 {
     {
@@ -1481,7 +1428,7 @@ static MUI_ENTRY ptBRFileCopyEntries[] =
     }
 };
 
-static MUI_ENTRY ptBRBootLoaderEntries[] =
+static MUI_ENTRY ptBRBootLoaderSelectPageEntries[] =
 {
     {
         4,
@@ -1493,7 +1440,7 @@ static MUI_ENTRY ptBRBootLoaderEntries[] =
     {
         6,
         8,
-        "O instalador ir\240 configurar o ger\210nciador de
inicializa\207\306o",
+        "Please select where Setup should install the bootloader:",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1549,6 +1496,13 @@ static MUI_ENTRY ptBRBootLoaderInstallPageEntries[] =
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
+    {
+        6,
+        8,
+        "O instalador ir\240 configurar o ger\210nciador de
inicializa\207\306o.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
     {
         0,
         0,
@@ -1564,6 +1518,59 @@ static MUI_ENTRY ptBRBootLoaderInstallPageEntries[] =
     }
 };
 
+static MUI_ENTRY ptBRBootLoaderRemovableDiskPageEntries[] =
+{
+    {
+        4,
+        3,
+        " Instala\207\306o do ReactOS " KERNEL_VERSION_STR " ",
+        TEXT_STYLE_UNDERLINE,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        8,
+        "O instalador n\306o p\223de instalar o ger\210nciador de
inicializa\207\306o no disco",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        9,
+        "r\241gido do computador.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        13,
+        "Por favor insira um disquete formatado na unidade A:",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        14,
+        "e pressione ENTER.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        "ENTER=Continuar  F3=Sair",
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        NULL,
+        0
+    }
+
+};
+
 static MUI_ENTRY ptBRKeyboardSettingsEntries[] =
 {
     {
@@ -2218,8 +2225,8 @@ MUI_PAGE ptBRPages[] =
         ptBRKeyboardSettingsEntries
     },
     {
-        BOOT_LOADER_PAGE,
-        ptBRBootLoaderEntries
+        BOOTLOADER_SELECT_PAGE,
+        ptBRBootLoaderSelectPageEntries
     },
     {
         LAYOUT_SETTINGS_PAGE,
@@ -2234,12 +2241,12 @@ MUI_PAGE ptBRPages[] =
         ptBRSuccessPageEntries
     },
     {
-        BOOT_LOADER_INSTALLATION_PAGE,
+        BOOTLOADER_INSTALL_PAGE,
         ptBRBootLoaderInstallPageEntries
     },
     {
-        BOOT_LOADER_FLOPPY_PAGE,
-        ptBRBootPageEntries
+        BOOTLOADER_REMOVABLE_DISK_PAGE,
+        ptBRBootLoaderRemovableDiskPageEntries
     },
     {
         REGISTRY_PAGE,
diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/usetup/lang/pt-PT.h
index 6ee892d49ba..41cbb66cd13 100644
--- a/base/setup/usetup/lang/pt-PT.h
+++ b/base/setup/usetup/lang/pt-PT.h
@@ -937,59 +937,6 @@ static MUI_ENTRY ptPTSuccessPageEntries[] =
     }
 };
 
-static MUI_ENTRY ptPTBootPageEntries[] =
-{
-    {
-        4,
-        3,
-        " Instala\207\306o do ReactOS " KERNEL_VERSION_STR " ",
-        TEXT_STYLE_UNDERLINE,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        8,
-        "O instalador n\306o pode instalar o gestor de inicializa\207\306o no
disco",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        9,
-        "r\241gido do computador.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        13,
-        "Por favor insira uma disquete formatada na unidade A: e",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        14,
-        "pressione ENTER.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        "ENTER=Continuar  F3=Sair",
-        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        NULL,
-        0
-    }
-
-};
-
 static MUI_ENTRY ptPTSelectPartitionEntries[] =
 {
     {
@@ -1481,7 +1428,7 @@ static MUI_ENTRY ptPTFileCopyEntries[] =
     }
 };
 
-static MUI_ENTRY ptPTBootLoaderEntries[] =
+static MUI_ENTRY ptPTBootLoaderSelectPageEntries[] =
 {
     {
         4,
@@ -1493,7 +1440,7 @@ static MUI_ENTRY ptPTBootLoaderEntries[] =
     {
         6,
         8,
-        "O instalador ir\240 configurar o gestor de arranque.",
+        "Please select where Setup should install the bootloader:",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1549,6 +1496,13 @@ static MUI_ENTRY ptPTBootLoaderInstallPageEntries[] =
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
+    {
+        6,
+        8,
+        "O instalador ir\240 configurar o gestor de arranque.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
     {
         0,
         0,
@@ -1564,6 +1518,59 @@ static MUI_ENTRY ptPTBootLoaderInstallPageEntries[] =
     }
 };
 
+static MUI_ENTRY ptPTBootLoaderRemovableDiskPageEntries[] =
+{
+    {
+        4,
+        3,
+        " Instala\207\306o do ReactOS " KERNEL_VERSION_STR " ",
+        TEXT_STYLE_UNDERLINE,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        8,
+        "O instalador n\306o pode instalar o gestor de inicializa\207\306o no
disco",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        9,
+        "r\241gido do computador.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        13,
+        "Por favor insira uma disquete formatada na unidade A:",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        14,
+        "e pressione ENTER.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        "ENTER=Continuar  F3=Sair",
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        NULL,
+        0
+    }
+
+};
+
 static MUI_ENTRY ptPTKeyboardSettingsEntries[] =
 {
     {
@@ -2218,8 +2225,8 @@ MUI_PAGE ptPTPages[] =
         ptPTKeyboardSettingsEntries
     },
     {
-        BOOT_LOADER_PAGE,
-        ptPTBootLoaderEntries
+        BOOTLOADER_SELECT_PAGE,
+        ptPTBootLoaderSelectPageEntries
     },
     {
         LAYOUT_SETTINGS_PAGE,
@@ -2234,12 +2241,12 @@ MUI_PAGE ptPTPages[] =
         ptPTSuccessPageEntries
     },
     {
-        BOOT_LOADER_INSTALLATION_PAGE,
+        BOOTLOADER_INSTALL_PAGE,
         ptPTBootLoaderInstallPageEntries
     },
     {
-        BOOT_LOADER_FLOPPY_PAGE,
-        ptPTBootPageEntries
+        BOOTLOADER_REMOVABLE_DISK_PAGE,
+        ptPTBootLoaderRemovableDiskPageEntries
     },
     {
         REGISTRY_PAGE,
diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h
index 2cd6db98fc3..1a543ea2325 100644
--- a/base/setup/usetup/lang/ro-RO.h
+++ b/base/setup/usetup/lang/ro-RO.h
@@ -975,59 +975,6 @@ static MUI_ENTRY roROSuccessPageEntries[] =
     }
 };
 
-static MUI_ENTRY roROBootPageEntries[] =
-{
-    {
-        4,
-        3,
-        " Instalare ReactOS " KERNEL_VERSION_STR " ",
-        TEXT_STYLE_UNDERLINE,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        8,
-        "Programul de instalare nu poate instala modulul de",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        9,
-        "ini\376ializare a calculatorului pe discul local.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        13,
-        "Introduce\376i un disc flexibil formatat \356n",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        14,
-        "unitatea A: apoi s\343 ap\343sa\376i ENTER.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        "ENTER = Continuare   F3 = Ie\272ire",
-        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        NULL,
-        0
-    }
-
-};
-
 static MUI_ENTRY roROSelectPartitionEntries[] =
 {
     {
@@ -1497,7 +1444,7 @@ static MUI_ENTRY roROFileCopyEntries[] =
     }
 };
 
-static MUI_ENTRY roROBootLoaderEntries[] =
+static MUI_ENTRY roROBootLoaderSelectPageEntries[] =
 {
     {
         4,
@@ -1509,7 +1456,7 @@ static MUI_ENTRY roROBootLoaderEntries[] =
     {
         6,
         8,
-        "Instalare modul de ini\376ializare al calculatorului",
+        "Please select where Setup should install the bootloader:",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1565,6 +1512,13 @@ static MUI_ENTRY roROBootLoaderInstallPageEntries[] =
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
+    {
+        6,
+        8,
+        "Instalare modul de ini\376ializare al calculatorului.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
     {
         0,
         0,
@@ -1580,6 +1534,59 @@ static MUI_ENTRY roROBootLoaderInstallPageEntries[] =
     }
 };
 
+static MUI_ENTRY roROBootLoaderRemovableDiskPageEntries[] =
+{
+    {
+        4,
+        3,
+        " Instalare ReactOS " KERNEL_VERSION_STR " ",
+        TEXT_STYLE_UNDERLINE,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        8,
+        "Programul de instalare nu poate instala modulul de",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        9,
+        "ini\376ializare a calculatorului pe discul local.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        13,
+        "Introduce\376i un disc flexibil formatat \356n unitatea A:",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        14,
+        "apoi s\343 ap\343sa\376i ENTER.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        "ENTER = Continuare   F3 = Ie\272ire",
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        NULL,
+        0
+    }
+
+};
+
 static MUI_ENTRY roROKeyboardSettingsEntries[] =
 {
     {
@@ -2234,8 +2241,8 @@ MUI_PAGE roROPages[] =
         roROKeyboardSettingsEntries
     },
     {
-        BOOT_LOADER_PAGE,
-        roROBootLoaderEntries
+        BOOTLOADER_SELECT_PAGE,
+        roROBootLoaderSelectPageEntries
     },
     {
         LAYOUT_SETTINGS_PAGE,
@@ -2250,12 +2257,12 @@ MUI_PAGE roROPages[] =
         roROSuccessPageEntries
     },
     {
-        BOOT_LOADER_INSTALLATION_PAGE,
+        BOOTLOADER_INSTALL_PAGE,
         roROBootLoaderInstallPageEntries
     },
     {
-        BOOT_LOADER_FLOPPY_PAGE,
-        roROBootPageEntries
+        BOOTLOADER_REMOVABLE_DISK_PAGE,
+        roROBootLoaderRemovableDiskPageEntries
     },
     {
         REGISTRY_PAGE,
diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h
index aa4dd8cc8a3..a39c99c22f6 100644
--- a/base/setup/usetup/lang/ru-RU.h
+++ b/base/setup/usetup/lang/ru-RU.h
@@ -951,59 +951,6 @@ static MUI_ENTRY ruRUSuccessPageEntries[] =
     }
 };
 
-static MUI_ENTRY ruRUBootPageEntries[] =
-{
-    {
-        4,
-        3,
-        " \223\341\342\240\255\256\242\252\240 ReactOS " KERNEL_VERSION_STR,
-        TEXT_STYLE_UNDERLINE,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        8,
-        "\217\340\256\243\340\240\254\254\240 \343\341\342\240\255\256\242\252\250
\255\245 \341\254\256\243\253\240 \343\341\342\240\255\256\242\250\342\354
\247\240\243\340\343\247\347\250\252 \255\240",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        9,
-        "\246\245\341\342\252\250\251 \244\250\341\252 \242\240\350\245\243\256
\252\256\254\257\354\356\342\245\340\240.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        13,
-        "\217\256\246\240\253\343\251\341\342\240 \242\341\342\240\242\354\342\245
\256\342\344\256\340\254\240\342\250\340\256\242\240\255\255\353\251
\243\250\241\252\250\251 \244\250\341\252 \242 \244\250\341\252\256\242\256\244 A:
\250",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        14,
-        "\255\240\246\254\250\342\245 ENTER.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        "ENTER = \217\340\256\244\256\253\246\250\342\354   F3 =
\202\353\345\256\244",
-        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        NULL,
-        0
-    }
-
-};
-
 static MUI_ENTRY ruRUSelectPartitionEntries[] =
 {
     {
@@ -1487,7 +1434,7 @@ static MUI_ENTRY ruRUFileCopyEntries[] =
     }
 };
 
-static MUI_ENTRY ruRUBootLoaderEntries[] =
+static MUI_ENTRY ruRUBootLoaderSelectPageEntries[] =
 {
     {
         4,
@@ -1499,7 +1446,7 @@ static MUI_ENTRY ruRUBootLoaderEntries[] =
     {
         6,
         8,
-        "\223\341\342\240\255\256\242\252\240
\247\240\243\340\343\247\347\250\252\240 ReactOS:",
+        "Please select where Setup should install the bootloader:",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1555,6 +1502,13 @@ static MUI_ENTRY ruRUBootLoaderInstallPageEntries[] =
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
+    {
+        6,
+        8,
+        "\223\341\342\240\255\256\242\252\240
\247\240\243\340\343\247\347\250\252\240 ReactOS",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
     {
         0,
         0,
@@ -1570,6 +1524,59 @@ static MUI_ENTRY ruRUBootLoaderInstallPageEntries[] =
     }
 };
 
+static MUI_ENTRY ruRUBootLoaderRemovableDiskPageEntries[] =
+{
+    {
+        4,
+        3,
+        " \223\341\342\240\255\256\242\252\240 ReactOS " KERNEL_VERSION_STR,
+        TEXT_STYLE_UNDERLINE,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        8,
+        "\217\340\256\243\340\240\254\254\240 \343\341\342\240\255\256\242\252\250
\255\245 \341\254\256\243\253\240 \343\341\342\240\255\256\242\250\342\354
\247\240\243\340\343\247\347\250\252 \255\240",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        9,
+        "\246\245\341\342\252\250\251 \244\250\341\252 \242\240\350\245\243\256
\252\256\254\257\354\356\342\245\340\240.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        13,
+        "\217\256\246\240\253\343\251\341\342\240 \242\341\342\240\242\354\342\245
\256\342\344\256\340\254\240\342\250\340\256\242\240\255\255\353\251
\243\250\241\252\250\251 \244\250\341\252 \242 \244\250\341\252\256\242\256\244
A:",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        14,
+        "\250 \255\240\246\254\250\342\245 ENTER.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        "ENTER = \217\340\256\244\256\253\246\250\342\354   F3 =
\202\353\345\256\244",
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        NULL,
+        0
+    }
+
+};
+
 static MUI_ENTRY ruRUKeyboardSettingsEntries[] =
 {
     {
@@ -2203,8 +2210,8 @@ MUI_PAGE ruRUPages[] =
         ruRUKeyboardSettingsEntries
     },
     {
-        BOOT_LOADER_PAGE,
-        ruRUBootLoaderEntries
+        BOOTLOADER_SELECT_PAGE,
+        ruRUBootLoaderSelectPageEntries
     },
     {
         LAYOUT_SETTINGS_PAGE,
@@ -2219,12 +2226,12 @@ MUI_PAGE ruRUPages[] =
         ruRUSuccessPageEntries
     },
     {
-        BOOT_LOADER_INSTALLATION_PAGE,
+        BOOTLOADER_INSTALL_PAGE,
         ruRUBootLoaderInstallPageEntries
     },
     {
-        BOOT_LOADER_FLOPPY_PAGE,
-        ruRUBootPageEntries
+        BOOTLOADER_REMOVABLE_DISK_PAGE,
+        ruRUBootLoaderRemovableDiskPageEntries
     },
     {
         REGISTRY_PAGE,
diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h
index 5ec671ea635..b8af569276d 100644
--- a/base/setup/usetup/lang/sk-SK.h
+++ b/base/setup/usetup/lang/sk-SK.h
@@ -936,59 +936,6 @@ static MUI_ENTRY skSKSuccessPageEntries[] =
     }
 };
 
-static MUI_ENTRY skSKBootPageEntries[] =
-{
-    {
-        4,
-        3,
-        " In\347tal\240tor syst\202mu ReactOS " KERNEL_VERSION_STR "
",
-        TEXT_STYLE_UNDERLINE,
-        TEXT_ID_STATIC
-    },
-    {
-        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
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        9,
-        "po\237\241ta\237a",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        13,
-        "Vlo\247te pros\241m, naform\240tovan\243 disketu do mechaniky A:",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        14,
-        "a stla\237te ENTER.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        "ENTER = Pokra\237ova\234   F3 = Skon\237i\234",
-        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        NULL,
-        0
-    }
-
-};
-
 static MUI_ENTRY skSKSelectPartitionEntries[] =
 {
     {
@@ -1473,7 +1420,7 @@ static MUI_ENTRY skSKFileCopyEntries[] =
     }
 };
 
-static MUI_ENTRY skSKBootLoaderEntries[] =
+static MUI_ENTRY skSKBootLoaderSelectPageEntries[] =
 {
     {
         4,
@@ -1485,7 +1432,7 @@ static MUI_ENTRY skSKBootLoaderEntries[] =
     {
         6,
         8,
-        "In\347tal\240tor je pripraven\354 nain\347talova\234 zav\240dza\237
opera\237n\202ho syst\202mu",
+        "Please select where Setup should install the bootloader:",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1541,6 +1488,13 @@ static MUI_ENTRY skSKBootLoaderInstallPageEntries[] =
         TEXT_STYLE_UNDERLINE,
         TEXT_ID_STATIC
     },
+    {
+        6,
+        8,
+        "In\347tal\240tor je pripraven\354 nain\347talova\234 zav\240dza\237
opera\237n\202ho syst\202mu.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
     {
         0,
         0,
@@ -1556,6 +1510,59 @@ static MUI_ENTRY skSKBootLoaderInstallPageEntries[] =
     }
 };
 
+static MUI_ENTRY skSKBootLoaderRemovableDiskPageEntries[] =
+{
+    {
+        4,
+        3,
+        " In\347tal\240tor syst\202mu ReactOS " KERNEL_VERSION_STR "
",
+        TEXT_STYLE_UNDERLINE,
+        TEXT_ID_STATIC
+    },
+    {
+        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
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        9,
+        "po\237\241ta\237a.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        13,
+        "Vlo\247te pros\241m, naform\240tovan\243 disketu do mechaniky A:",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        6,
+        14,
+        "a stla\237te ENTER.",
+        TEXT_STYLE_NORMAL,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        "ENTER = Pokra\237ova\234   F3 = Skon\237i\234",
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
+        TEXT_ID_STATIC
+    },
+    {
+        0,
+        0,
+        NULL,
+        0
+    }
+
+};
+
 static MUI_ENTRY skSKKeyboardSettingsEntries[] =
 {
     {
@@ -2192,8 +2199,8 @@ MUI_PAGE skSKPages[] =
         skSKKeyboardSettingsEntries
     },
     {
-        BOOT_LOADER_PAGE,
-        skSKBootLoaderEntries
+        BOOTLOADER_SELECT_PAGE,
+        skSKBootLoaderSelectPageEntries
     },
     {
         LAYOUT_SETTINGS_PAGE,
@@ -2208,12 +2215,12 @@ MUI_PAGE skSKPages[] =
         skSKSuccessPageEntries
     },
     {
-        BOOT_LOADER_INSTALLATION_PAGE,
+        BOOTLOADER_INSTALL_PAGE,
         skSKBootLoaderInstallPageEntries
     },
     {
-        BOOT_LOADER_FLOPPY_PAGE,
-        skSKBootPageEntries
+        BOOTLOADER_REMOVABLE_DISK_PAGE,
+        skSKBootLoaderRemovableDiskPageEntries
     },
     {
         REGISTRY_PAGE,
diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h
index 584c30c278e..6322664d6a7 100644
--- a/base/setup/usetup/lang/sq-AL.h
+++ b/base/setup/usetup/lang/sq-AL.h
@@ -934,59 +934,6 @@ static MUI_ENTRY sqALSuccessPageEntries[] =
     }
 };
 
-static MUI_ENTRY sqALBootPageEntries[] =
-{
-    {
-        4,
-        3,
-        " Instalimi i ReactOS " KERNEL_VERSION_STR " ",
-        TEXT_STYLE_UNDERLINE,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        8,
-        "Instalimi nuk mund t\211 instaloj\211 programin e bootloaderit ne
kompjuterin tuaj",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        9,
-        "hardisku",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        13,
-        "Ju lutem fusni nje floppy disk t\211 formatuar n\211 drive A: dhe",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        6,
-        14,
-        "klikoni ENTER.",
-        TEXT_STYLE_NORMAL,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        "ENTER = Vazhdo   F3 = Dil",
-        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
-        TEXT_ID_STATIC
-    },
-    {
-        0,
-        0,
-        NULL,
-        0
-    }
-
-};
-
 static MUI_ENTRY sqALSelectPartitionEntries[] =
 {
     {
@@ -999,7 +946,7 @@ static MUI_ENTRY sqALSelectPartitionEntries[] =
     {
         6,
         8,
-        "Lista meposht tregon particionet dhe pjes\211n e paperdorur t\211 hard
diskut",
+        "Lista meposht tregon particionet dhe pjes\211n e paperdorur t\211
harddiskut",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },
@@ -1471,7 +1418,7 @@ static MUI_ENTRY sqALFileCopyEntries[] =
     }
 };
 
-static MUI_ENTRY sqALBootLoaderEntries[] =
+static MUI_ENTRY sqALBootLoaderSelectPageEntries[] =
 {
     {
         4,
@@ -1483,7 +1430,7 @@ static MUI_ENTRY sqALBootLoaderEntries[] =
     {
         6,
         8,
-        "Instalimi po instalon boot loaderin",
... 1012 lines suppressed ...