[ros-diffs] [reactos] 06/07: [SETUP:REACTOS] Redesign the "Advanced Installation Options" dialog (#7162) CORE-13525

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

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

commit a6c69abafd643968ce0044f92a14bfcd33eb52a6
Author:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Thu Nov 2 19:38:03 2023 +0100
Commit:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Mon Aug 12 12:17:29 2024 +0200

    [SETUP:REACTOS] Redesign the "Advanced Installation Options" dialog
(#7162)
    CORE-13525
    
    In particular, use now a dynamic combo-box for listing the possible
    locations where the bootloader can be installed.
---
 base/setup/reactos/drivepage.c   | 79 +++++++++++++++++++++++++++++++++-------
 base/setup/reactos/lang/bg-BG.rc | 28 +++++++++-----
 base/setup/reactos/lang/cs-CZ.rc | 28 +++++++++-----
 base/setup/reactos/lang/de-DE.rc | 28 +++++++++-----
 base/setup/reactos/lang/el-GR.rc | 32 ++++++++++------
 base/setup/reactos/lang/en-US.rc | 32 ++++++++++------
 base/setup/reactos/lang/es-ES.rc | 28 +++++++++-----
 base/setup/reactos/lang/et-EE.rc | 28 +++++++++-----
 base/setup/reactos/lang/eu-ES.rc | 28 +++++++++-----
 base/setup/reactos/lang/fi-FI.rc | 32 ++++++++++------
 base/setup/reactos/lang/fr-FR.rc | 28 +++++++++-----
 base/setup/reactos/lang/he-IL.rc | 32 ++++++++++------
 base/setup/reactos/lang/hi-IN.rc | 28 +++++++++-----
 base/setup/reactos/lang/hu-HU.rc | 32 ++++++++++------
 base/setup/reactos/lang/id-ID.rc | 28 +++++++++-----
 base/setup/reactos/lang/it-IT.rc | 32 ++++++++++------
 base/setup/reactos/lang/ja-JP.rc | 28 +++++++++-----
 base/setup/reactos/lang/ms-MY.rc | 32 ++++++++++------
 base/setup/reactos/lang/no-NO.rc | 28 +++++++++-----
 base/setup/reactos/lang/pl-PL.rc | 28 +++++++++-----
 base/setup/reactos/lang/pt-BR.rc | 32 ++++++++++------
 base/setup/reactos/lang/pt-PT.rc | 32 ++++++++++------
 base/setup/reactos/lang/ro-RO.rc | 28 +++++++++-----
 base/setup/reactos/lang/ru-RU.rc | 28 +++++++++-----
 base/setup/reactos/lang/sk-SK.rc | 32 ++++++++++------
 base/setup/reactos/lang/sq-AL.rc | 32 ++++++++++------
 base/setup/reactos/lang/tr-TR.rc | 28 +++++++++-----
 base/setup/reactos/lang/uk-UA.rc | 28 +++++++++-----
 base/setup/reactos/lang/vi-VN.rc | 32 ++++++++++------
 base/setup/reactos/lang/zh-CN.rc | 28 +++++++++-----
 base/setup/reactos/lang/zh-HK.rc | 28 +++++++++-----
 base/setup/reactos/lang/zh-TW.rc | 28 +++++++++-----
 base/setup/reactos/resource.h    | 11 ++++--
 33 files changed, 656 insertions(+), 350 deletions(-)

diff --git a/base/setup/reactos/drivepage.c b/base/setup/reactos/drivepage.c
index dd14e330779..ce038f5887d 100644
--- a/base/setup/reactos/drivepage.c
+++ b/base/setup/reactos/drivepage.c
@@ -48,28 +48,67 @@ static const INT  column_alignment[MAX_LIST_COLUMNS] = {LVCFMT_LEFT,
LVCFMT_LEFT
 
 /* FUNCTIONS ****************************************************************/
 
-static INT_PTR CALLBACK
-MoreOptDlgProc(HWND hwndDlg,
-               UINT uMsg,
-               WPARAM wParam,
-               LPARAM lParam)
+static INT_PTR
+CALLBACK
+MoreOptDlgProc(
+    _In_ HWND hDlg,
+    _In_ UINT uMsg,
+    _In_ WPARAM wParam,
+    _In_ LPARAM lParam)
 {
     PSETUPDATA pSetupData;
 
     /* Retrieve pointer to the global setup data */
-    pSetupData = (PSETUPDATA)GetWindowLongPtrW(hwndDlg, GWLP_USERDATA);
+    pSetupData = (PSETUPDATA)GetWindowLongPtrW(hDlg, GWLP_USERDATA);
 
     switch (uMsg)
     {
         case WM_INITDIALOG:
         {
+            BOOL bIsBIOS;
+            UINT uID;
+            INT iItem, iCurrent = CB_ERR, iDefault = 0;
+            WCHAR szText[50];
+
             /* Save pointer to the global setup data */
             pSetupData = (PSETUPDATA)lParam;
-            SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pSetupData);
+            SetWindowLongPtrW(hDlg, GWLP_USERDATA, (LONG_PTR)pSetupData);
 
-            CheckDlgButton(hwndDlg, IDC_INSTFREELDR, BST_CHECKED);
-            SetDlgItemTextW(hwndDlg, IDC_PATH,
+            SetDlgItemTextW(hDlg, IDC_PATH,
                             pSetupData->USetupData.InstallationDirectory);
+
+
+            /* Initialize the list of available bootloader locations */
+            bIsBIOS = ((pSetupData->USetupData.ArchType == ARCH_PcAT) ||
+                       (pSetupData->USetupData.ArchType == ARCH_NEC98x86));
+            for (uID = IDS_BOOTLOADER_NOINST; uID <= IDS_BOOTLOADER_VBRONLY; ++uID)
+            {
+                if ( ( bIsBIOS && (uID == IDS_BOOTLOADER_SYSTEM)) ||
+                     (!bIsBIOS && (uID == IDS_BOOTLOADER_MBRVBR || uID ==
IDS_BOOTLOADER_VBRONLY)) )
+                {
+                    continue; // Skip this choice.
+                }
+
+                LoadStringW(pSetupData->hInstance, uID, szText, ARRAYSIZE(szText));
+                iItem = SendDlgItemMessageW(hDlg, IDC_INSTFREELDR, CB_ADDSTRING, 0,
(LPARAM)szText);
+                if (iItem != CB_ERR && iItem != CB_ERRSPACE)
+                {
+                    UINT uBldrLoc = uID - IDS_BOOTLOADER_NOINST
+                                        - (bIsBIOS && (uID >=
IDS_BOOTLOADER_SYSTEM) ? 1 : 0);
+                    SendDlgItemMessageW(hDlg, IDC_INSTFREELDR, CB_SETITEMDATA, iItem,
uBldrLoc);
+
+                    /* Find the index of the current and default locations */
+                    if (uBldrLoc == pSetupData->USetupData.BootLoaderLocation)
+                        iCurrent = iItem;
+                    if (uBldrLoc == (IDS_BOOTLOADER_SYSTEM - IDS_BOOTLOADER_NOINST))
+                        iDefault = iItem;
+                }
+            }
+            /* Select the current location or fall back to the default one */
+            if (iCurrent == CB_ERR)
+                iCurrent = iDefault;
+            SendDlgItemMessageW(hDlg, IDC_INSTFREELDR, CB_SETCURSEL, iCurrent, 0);
+
             break;
         }
 
@@ -78,15 +117,29 @@ MoreOptDlgProc(HWND hwndDlg,
             {
                 case IDOK:
                 {
-                    GetDlgItemTextW(hwndDlg, IDC_PATH,
+                    INT iItem;
+                    UINT uBldrLoc = CB_ERR;
+
+                    /* Retrieve the installation path */
+                    GetDlgItemTextW(hDlg, IDC_PATH,
                                     pSetupData->USetupData.InstallationDirectory,
                                    
ARRAYSIZE(pSetupData->USetupData.InstallationDirectory));
-                    EndDialog(hwndDlg, IDOK);
+
+                    /* Retrieve the bootloader location */
+                    iItem = SendDlgItemMessageW(hDlg, IDC_INSTFREELDR, CB_GETCURSEL, 0,
0);
+                    if (iItem != CB_ERR)
+                        uBldrLoc = SendDlgItemMessageW(hDlg, IDC_INSTFREELDR,
CB_GETITEMDATA, iItem, 0);
+                    if (uBldrLoc == CB_ERR) // Default location: System partition / MBR
& VBR
+                        uBldrLoc = (IDS_BOOTLOADER_SYSTEM - IDS_BOOTLOADER_NOINST);
+                    uBldrLoc = min(max(uBldrLoc, 0), 3);
+                    pSetupData->USetupData.BootLoaderLocation = uBldrLoc;
+
+                    EndDialog(hDlg, IDOK);
                     return TRUE;
                 }
 
                 case IDCANCEL:
-                    EndDialog(hwndDlg, IDCANCEL);
+                    EndDialog(hDlg, IDCANCEL);
                     return TRUE;
             }
             break;
@@ -682,7 +735,7 @@ DriveDlgProc(
             {
                 case IDC_PARTMOREOPTS:
                     DialogBoxParamW(pSetupData->hInstance,
-                                    MAKEINTRESOURCEW(IDD_BOOTOPTIONS),
+                                    MAKEINTRESOURCEW(IDD_ADVINSTOPTS),
                                     hwndDlg,
                                     MoreOptDlgProc,
                                     (LPARAM)pSetupData);
diff --git a/base/setup/reactos/lang/bg-BG.rc b/base/setup/reactos/lang/bg-BG.rc
index 0e50934d1ba..fe86ea0ae03 100644
--- a/base/setup/reactos/lang/bg-BG.rc
+++ b/base/setup/reactos/lang/bg-BG.rc
@@ -76,19 +76,18 @@ BEGIN
     PUSHBUTTON "&Отказ", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Разширени дялови настройски"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Папка за слагане", IDC_STATIC, "Button", BS_GROUPBOX, 4,
1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Слагане на зареждач", IDC_STATIC, "Button", BS_GROUPBOX,
4, 36, 298, 52
-    CONTROL "Слагане на начален зареждач (MBR и VBR) на твърдия диск",
IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Слагане на начален зареждач (само VBR) на твърдия диск",
IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Без слагане на начален зареждач", IDC_NOINSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&Добре", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Отказ", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP |
WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:",
IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be
installed.\n\nBy default, it is installed on the system partition of the boot disk (and
either in the Master or the Volume Boot Record for BIOS-based computers).",
IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST
+    PUSHBUTTON "Добре", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Отказ", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -173,3 +172,12 @@ BEGIN
     IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM "System partition (Default)"
+    IDS_BOOTLOADER_MBRVBR "MBR и VBR (Default)"
+    IDS_BOOTLOADER_VBRONLY "Само VBR"
+END
diff --git a/base/setup/reactos/lang/cs-CZ.rc b/base/setup/reactos/lang/cs-CZ.rc
index 501d81ca87a..d66d5577122 100644
--- a/base/setup/reactos/lang/cs-CZ.rc
+++ b/base/setup/reactos/lang/cs-CZ.rc
@@ -82,19 +82,18 @@ BEGIN
     PUSHBUTTON "&Storno", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Pokročilá nastavení oddílu"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Instalační složka", IDC_STATIC, "Button", BS_GROUPBOX,
4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Instalace zavaděče", IDC_STATIC, "Button", BS_GROUPBOX,
4, 36, 298, 52
-    CONTROL "Nainstalovat zavaděč na pevný disk (MBR a VBR)", IDC_INSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Nainstalovat zavaděč na pevný disk (jen VBR)", IDC_INSTVBRONLY,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Zavaděč neinstalovat", IDC_NOINSTFREELDR, "Button",
BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Storno", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP |
WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:",
IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be
installed.\n\nBy default, it is installed on the system partition of the boot disk (and
either in the Master or the Volume Boot Record for BIOS-based computers).",
IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST
+    PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Storno", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -179,3 +178,12 @@ BEGIN
     IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM "System partition (Default)"
+    IDS_BOOTLOADER_MBRVBR "MBR a VBR (Default)"
+    IDS_BOOTLOADER_VBRONLY "Jen VBR"
+END
diff --git a/base/setup/reactos/lang/de-DE.rc b/base/setup/reactos/lang/de-DE.rc
index 6c3d1415f33..a32b0f4f1c8 100644
--- a/base/setup/reactos/lang/de-DE.rc
+++ b/base/setup/reactos/lang/de-DE.rc
@@ -76,19 +76,18 @@ BEGIN
     PUSHBUTTON "&Abbrechen", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Erweiterte Partitionseinstellungen"
+CAPTION "Erweiterte Installationseinstellungen"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Installationsverzeichnis", IDC_STATIC, "Button",
BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Bootloader-Installation", IDC_STATIC, "Button",
BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Installiere Bootloader auf Festplatte (MBR und VBR)",
IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Installiere Bootloader auf Festplatte (nur VBR)", IDC_INSTVBRONLY,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Keine Bootloader-Installation", IDC_NOINSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Abbrechen", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP |
WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:",
IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be
installed.\n\nBy default, it is installed on the system partition of the boot disk (and
either in the Master or the Volume Boot Record for BIOS-based computers).",
IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST
+    PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Abbrechen", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP |
WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -173,3 +172,12 @@ BEGIN
     IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST "Keine Installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM "System partition (Default)"
+    IDS_BOOTLOADER_MBRVBR "MBR und VBR (Default)"
+    IDS_BOOTLOADER_VBRONLY "Nur VBR"
+END
diff --git a/base/setup/reactos/lang/el-GR.rc b/base/setup/reactos/lang/el-GR.rc
index 097de2895cf..f6141126f83 100644
--- a/base/setup/reactos/lang/el-GR.rc
+++ b/base/setup/reactos/lang/el-GR.rc
@@ -76,19 +76,18 @@ BEGIN
     PUSHBUTTON "&Άκυρο", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Ρυθμίσεις Partition για προχωρημένους"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Φάκελος εγκατάστασης", IDC_STATIC, "Button",
BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Εγκατάσταση Boot loader", IDC_STATIC, "Button",
BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Εγκατάσταση boot loader στο σκληρό δίσκο (MBR and VBR)",
IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Εγκατάσταση boot loader στο σκληρό δίσκο (VBR only)",
IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Να μη γίνει εγκατάσταση του bootloader", IDC_NOINSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Άκυρο", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP |
WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:",
IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be
installed.\n\nBy default, it is installed on the system partition of the boot disk (and
either in the Master or the Volume Boot Record for BIOS-based computers).",
IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST
+    PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Άκυρο", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -146,9 +145,9 @@ BEGIN
     IDS_DEVICETITLE "Setup the basic devices"
     IDS_DEVICESUBTITLE "Ορισμός ρυθμίσεων για εμφάνιση και πληκτρολόγιο."
     IDS_DRIVETITLE "Ρύθμιση του partition εγκατάστασης και του φακέλου
συστήματος"
-    IDS_DRIVESUBTITLE "Προετοιμασία του partition εγκατάστασης, φακέλου συστήματος
και boot loader."
+    IDS_DRIVESUBTITLE "Προετοιμασία του partition εγκατάστασης, φακέλου συστήματος
και bootloader."
     IDS_PROCESSTITLE "Prepare partition, copy files and setup system"
-    IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup
boot loader"
+    IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup
bootloader"
     IDS_RESTARTTITLE "Το πρώτο στάδιο της εγκατάστασης ολοκληρώθηκε"
     IDS_RESTARTSUBTITLE "Το πρώτο στάδιο της εγκατάστασης ολοκληρώθηκε, κάντε
επανεκκίνηση για να συνεχίσετε με το δεύτερο στάδιο."
     IDS_SUMMARYTITLE "Installation Summary"
@@ -173,3 +172,12 @@ BEGIN
     IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM "System partition (Default)"
+    IDS_BOOTLOADER_MBRVBR "MBR and VBR (Default)"
+    IDS_BOOTLOADER_VBRONLY "VBR only"
+END
diff --git a/base/setup/reactos/lang/en-US.rc b/base/setup/reactos/lang/en-US.rc
index b5df44b2e01..0dc8e4daf55 100644
--- a/base/setup/reactos/lang/en-US.rc
+++ b/base/setup/reactos/lang/en-US.rc
@@ -76,19 +76,18 @@ BEGIN
     PUSHBUTTON "&Cancel", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Advanced Partition Settings"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX,
4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Boot loader installation", IDC_STATIC, "Button",
BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Install boot loader on the hard disk (MBR and VBR)",
IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Install boot loader on the hard disk (VBR only)", IDC_INSTVBRONLY,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "No installation of bootloader", IDC_NOINSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Cancel", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP |
WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:",
IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be
installed.\n\nBy default, it is installed on the system partition of the boot disk (and
either in the Master or the Volume Boot Record for BIOS-based computers).",
IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST
+    PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Cancel", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -146,9 +145,9 @@ BEGIN
     IDS_DEVICETITLE "Setup the basic devices"
     IDS_DEVICESUBTITLE "Set the settings of display and keyboard."
     IDS_DRIVETITLE "Setup the installation partition and system folder"
-    IDS_DRIVESUBTITLE "Prepare installation partition, system folder and boot
loader."
+    IDS_DRIVESUBTITLE "Prepare installation partition, system folder and
bootloader."
     IDS_PROCESSTITLE "Setup partition, copy files and setup system"
-    IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup
boot loader"
+    IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup
bootloader"
     IDS_RESTARTTITLE "First stage of setup finished"
     IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to
continue with second stage"
     IDS_SUMMARYTITLE "Installation Summary"
@@ -173,3 +172,12 @@ BEGIN
     IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM "System partition (Default)"
+    IDS_BOOTLOADER_MBRVBR "MBR and VBR (Default)"
+    IDS_BOOTLOADER_VBRONLY "VBR only"
+END
diff --git a/base/setup/reactos/lang/es-ES.rc b/base/setup/reactos/lang/es-ES.rc
index 5e71a78118e..bda7084c568 100644
--- a/base/setup/reactos/lang/es-ES.rc
+++ b/base/setup/reactos/lang/es-ES.rc
@@ -85,19 +85,18 @@ BEGIN
     PUSHBUTTON "&Cancelar", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Ajustes avanzados de la partición"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Carpeta de instalación", IDC_STATIC, "Button",
BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Instalación del cargador de arranque", IDC_STATIC,
"Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Instalar el cargador de arranque en el disco duro (MBR y VBR)",
IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Instalar el cargador de arranque en el disco duro (solo VBR)",
IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "No instalar el cargador de arranque", IDC_NOINSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&Aceptar", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Cancelar", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP |
WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:",
IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Cargador de arranque", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be
installed.\n\nBy default, it is installed on the system partition of the boot disk (and
either in the Master or the Volume Boot Record for BIOS-based computers).",
IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST
+    PUSHBUTTON "Aceptar", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Cancelar", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP |
WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -182,3 +181,12 @@ BEGIN
     IDS_PARTITION_SIZE "Tamaño"
     IDS_PARTITION_STATUS "Estado"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST "No instalar"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM "System partition (Default)"
+    IDS_BOOTLOADER_MBRVBR "MBR y VBR (Default)"
+    IDS_BOOTLOADER_VBRONLY "Solo VBR"
+END
diff --git a/base/setup/reactos/lang/et-EE.rc b/base/setup/reactos/lang/et-EE.rc
index ae936d14da9..e00f6578256 100644
--- a/base/setup/reactos/lang/et-EE.rc
+++ b/base/setup/reactos/lang/et-EE.rc
@@ -76,19 +76,18 @@ BEGIN
     PUSHBUTTON "&Tühista", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Täpsemad vormindamise seaded"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Paigaldamise kaust", IDC_STATIC, "Button", BS_GROUPBOX,
4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Alglaaduri paigaldamine", IDC_STATIC, "Button",
BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Paigalda alglaadur kõvakettale (MBR ja VBR)", IDC_INSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Paigalda alglaadur kõvakettale (ainult VBR)", IDC_INSTVBRONLY,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Ära paigalda alglaadurit", IDC_NOINSTFREELDR, "Button",
BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&Olgu", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Tühista", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP |
WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:",
IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be
installed.\n\nBy default, it is installed on the system partition of the boot disk (and
either in the Master or the Volume Boot Record for BIOS-based computers).",
IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST
+    PUSHBUTTON "Olgu", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Tühista", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -173,3 +172,12 @@ BEGIN
     IDS_PARTITION_SIZE "Suurus"
     IDS_PARTITION_STATUS "Olek"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM "System partition (Default)"
+    IDS_BOOTLOADER_MBRVBR "MBR ja VBR (Default)"
+    IDS_BOOTLOADER_VBRONLY "Ainult VBR"
+END
diff --git a/base/setup/reactos/lang/eu-ES.rc b/base/setup/reactos/lang/eu-ES.rc
index 827298f5198..e5cdc518447 100644
--- a/base/setup/reactos/lang/eu-ES.rc
+++ b/base/setup/reactos/lang/eu-ES.rc
@@ -83,19 +83,18 @@ BEGIN
     PUSHBUTTON "&Cancelar", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Ajustes avanzados de la partición"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Carpeta de instalación", IDC_STATIC, "Button",
BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Instalación del cargador de arranque", IDC_STATIC,
"Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Instalar el cargador de arranque en el disco duro (MBR y VBR)",
IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Instalar el cargador de arranque en el disco duro (solo VBR)",
IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "No instalar el cargador de arranque", IDC_NOINSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&Aceptar", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Cancelar", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP |
WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:",
IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Cargador de arranque", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be
installed.\n\nBy default, it is installed on the system partition of the boot disk (and
either in the Master or the Volume Boot Record for BIOS-based computers).",
IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST
+    PUSHBUTTON "Aceptar", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Cancelar", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP |
WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -180,3 +179,12 @@ BEGIN
     IDS_PARTITION_SIZE "Tamaño"
     IDS_PARTITION_STATUS "Estado"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST "No instalar"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM "System partition (Default)"
+    IDS_BOOTLOADER_MBRVBR "MBR y VBR (Default)"
+    IDS_BOOTLOADER_VBRONLY "Solo VBR"
+END
diff --git a/base/setup/reactos/lang/fi-FI.rc b/base/setup/reactos/lang/fi-FI.rc
index 737be4048ff..2e609008b04 100644
--- a/base/setup/reactos/lang/fi-FI.rc
+++ b/base/setup/reactos/lang/fi-FI.rc
@@ -76,19 +76,18 @@ BEGIN
     PUSHBUTTON "&Cancel", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Advanced Partition Settings"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX,
4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Boot loader installation", IDC_STATIC, "Button",
BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Install boot loader on the hard disk (MBR and VBR)",
IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Install boot loader on the hard disk (VBR only)", IDC_INSTVBRONLY,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "No installation of bootloader", IDC_NOINSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Cancel", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP |
WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:",
IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be
installed.\n\nBy default, it is installed on the system partition of the boot disk (and
either in the Master or the Volume Boot Record for BIOS-based computers).",
IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST
+    PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Cancel", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -146,9 +145,9 @@ BEGIN
     IDS_DEVICETITLE "Setup the basic devices"
     IDS_DEVICESUBTITLE "Set the settings of display and keyboard."
     IDS_DRIVETITLE "Setup the installation partition and system folder"
-    IDS_DRIVESUBTITLE "Prepare installation partition, system folder and boot
loader."
+    IDS_DRIVESUBTITLE "Prepare installation partition, system folder and
bootloader."
     IDS_PROCESSTITLE "Setup partition, copy files and setup system"
-    IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup
boot loader"
+    IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup
bootloader"
     IDS_RESTARTTITLE "First stage of setup finished"
     IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to
continue with second stage"
     IDS_SUMMARYTITLE "Installation Summary"
@@ -173,3 +172,12 @@ BEGIN
     IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM "System partition (Default)"
+    IDS_BOOTLOADER_MBRVBR "MBR and VBR (Default)"
+    IDS_BOOTLOADER_VBRONLY "VBR only"
+END
diff --git a/base/setup/reactos/lang/fr-FR.rc b/base/setup/reactos/lang/fr-FR.rc
index d08f495e85c..9e5f79d46d3 100644
--- a/base/setup/reactos/lang/fr-FR.rc
+++ b/base/setup/reactos/lang/fr-FR.rc
@@ -76,19 +76,18 @@ BEGIN
     PUSHBUTTON "&Annuler", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Paramètres de partition avancés"
+CAPTION "Paramètres d'installation avancés"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Dossier d'installation", IDC_STATIC, "Button",
BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Installation du chargeur de démarrage", IDC_STATIC,
"Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Installer le chargeur de démarrage sur le disque dur (MBR et
VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46,
278, 11
-    CONTROL "Installer le chargeur de démarrage sur le disque dur (VBR
uniquement)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP,
10, 57, 278, 11
-    CONTROL "Ne pas installer le chargeur de démarrage", IDC_NOINSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Annuler", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP |
WS_VISIBLE
+    LTEXT "Choisissez un &répertoire où vous voulez installer ReactOS :",
IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Chargeur de démarrage", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Sélectionnez l'endroit où le chargeur de\ndémarrage FreeLoader doit
être installé.\n\nPar défaut, il est installé sur la partition système du disque de
démarrage (et sur le Master ou le Volume Boot Record pour les ordinateurs basés sur le
BIOS).", IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST
+    PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Annuler", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -173,3 +172,12 @@ BEGIN
     IDS_PARTITION_SIZE "Taille"
     IDS_PARTITION_STATUS "Statut"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST "Ne pas installer"
+    IDS_BOOTLOADER_REMOVABLE "Média amovible"
+    IDS_BOOTLOADER_SYSTEM "Partition système (par défaut)"
+    IDS_BOOTLOADER_MBRVBR "MBR et VBR (par défaut)"
+    IDS_BOOTLOADER_VBRONLY "VBR seulement"
+END
diff --git a/base/setup/reactos/lang/he-IL.rc b/base/setup/reactos/lang/he-IL.rc
index fa669eb0e05..58c7163ef60 100644
--- a/base/setup/reactos/lang/he-IL.rc
+++ b/base/setup/reactos/lang/he-IL.rc
@@ -78,19 +78,18 @@ BEGIN
     PUSHBUTTON "ביטול", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "הגדרות מחיצה מתקדמות"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "תיקיית התקנה", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1,
298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Boot loader installation", IDC_STATIC, "Button",
BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Install boot loader on the hard disk (MBR and VBR)",
IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Install boot loader on the hard disk (VBR only)", IDC_INSTVBRONLY,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "No installation of bootloader", IDC_NOINSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "אישור", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "ביטול", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:",
IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be
installed.\n\nBy default, it is installed on the system partition of the boot disk (and
either in the Master or the Volume Boot Record for BIOS-based computers).",
IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST
+    PUSHBUTTON "אישור", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "ביטול", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -148,9 +147,9 @@ BEGIN
     IDS_DEVICETITLE "Setup the basic devices"
     IDS_DEVICESUBTITLE "Set the settings of display and keyboard."
     IDS_DRIVETITLE "Setup the installation partition and system folder"
-    IDS_DRIVESUBTITLE "Prepare installation partition, system folder and boot
loader."
+    IDS_DRIVESUBTITLE "Prepare installation partition, system folder and
bootloader."
     IDS_PROCESSTITLE "Setup partition, copy files and setup system"
-    IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup
boot loader"
+    IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup
bootloader"
     IDS_RESTARTTITLE "First stage of setup finished"
     IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to
continue with second stage"
     IDS_SUMMARYTITLE "סיכום ההתקנה"
@@ -175,3 +174,12 @@ BEGIN
     IDS_PARTITION_SIZE "גודל"
     IDS_PARTITION_STATUS "מצב"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM "System partition (Default)"
+    IDS_BOOTLOADER_MBRVBR "MBR and VBR (Default)"
+    IDS_BOOTLOADER_VBRONLY "VBR only"
+END
diff --git a/base/setup/reactos/lang/hi-IN.rc b/base/setup/reactos/lang/hi-IN.rc
index e32cdf3ef35..a56e99168e7 100644
--- a/base/setup/reactos/lang/hi-IN.rc
+++ b/base/setup/reactos/lang/hi-IN.rc
@@ -72,19 +72,18 @@ BEGIN
     PUSHBUTTON "&रद्द करे", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "उन्नत विभाजन सेटिंग्स"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "इन्स्टलेशन फ़ोल्डर", IDC_STATIC, "Button", BS_GROUPBOX,
4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "बूट लोडर इन्स्टलेशन", IDC_STATIC, "Button", BS_GROUPBOX,
4, 36, 298, 52
-    CONTROL "हार्ड डिस्क पर बूट लोडर इंस्टॉल करें (MBR और VBR)",
IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "हार्ड डिस्क पर बूट लोडर इंस्टॉल करें (केवल VBR)", IDC_INSTVBRONLY,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "बूटलोडर की कोई इन्स्टलेशन नहीं", IDC_NOINSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&ओके", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&रद्द करे", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP |
WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:",
IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be
installed.\n\nBy default, it is installed on the system partition of the boot disk (and
either in the Master or the Volume Boot Record for BIOS-based computers).",
IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST
+    PUSHBUTTON "ओके", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "रद्द करे", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP |
WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -143,3 +142,12 @@ BEGIN
     IDS_PARTITION_SIZE "साइज़"
     IDS_PARTITION_TYPE "प्रकार"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM "System partition (Default)"
+    IDS_BOOTLOADER_MBRVBR "MBR और VBR (Default)"
+    IDS_BOOTLOADER_VBRONLY "केवल VBR"
+END
diff --git a/base/setup/reactos/lang/hu-HU.rc b/base/setup/reactos/lang/hu-HU.rc
index 1d9edc48a84..11f8196ad90 100644
--- a/base/setup/reactos/lang/hu-HU.rc
+++ b/base/setup/reactos/lang/hu-HU.rc
@@ -78,19 +78,18 @@ BEGIN
     PUSHBUTTON "&Cancel", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Advanced Partition Settings"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX,
4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Boot loader installation", IDC_STATIC, "Button",
BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Install boot loader on the hard disk (MBR and VBR)",
IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Install boot loader on the hard disk (VBR only)", IDC_INSTVBRONLY,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "No installation of bootloader", IDC_NOINSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Cancel", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP |
WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:",
IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be
installed.\n\nBy default, it is installed on the system partition of the boot disk (and
either in the Master or the Volume Boot Record for BIOS-based computers).",
IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST
+    PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Cancel", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -148,9 +147,9 @@ BEGIN
     IDS_DEVICETITLE "Setup the basic devices"
     IDS_DEVICESUBTITLE "Set the settings of display and keyboard."
     IDS_DRIVETITLE "Setup the installation partition and system folder"
-    IDS_DRIVESUBTITLE "Prepare installation partition, system folder and boot
loader."
+    IDS_DRIVESUBTITLE "Prepare installation partition, system folder and
bootloader."
     IDS_PROCESSTITLE "Setup partition, copy files and setup system"
-    IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup
boot loader"
+    IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup
bootloader"
     IDS_RESTARTTITLE "First stage of setup finished"
     IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to
continue with second stage"
     IDS_SUMMARYTITLE "Installation Summary"
@@ -175,3 +174,12 @@ BEGIN
     IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM "System partition (Default)"
+    IDS_BOOTLOADER_MBRVBR "MBR and VBR (Default)"
+    IDS_BOOTLOADER_VBRONLY "VBR only"
+END
diff --git a/base/setup/reactos/lang/id-ID.rc b/base/setup/reactos/lang/id-ID.rc
index 6a5c1165a31..6cf0daafc68 100644
--- a/base/setup/reactos/lang/id-ID.rc
+++ b/base/setup/reactos/lang/id-ID.rc
@@ -76,19 +76,18 @@ BEGIN
     PUSHBUTTON "&Batal", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Pengaturan Partisi Tingkat Lanjut"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Folder pemasangan", IDC_STATIC, "Button", BS_GROUPBOX,
4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Pemasangan bootloader", IDC_STATIC, "Button",
BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Pasang bootloader pada hard disk (MBR dan VBR)", IDC_INSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Pasang bootloader pada hard disk (hanya VBR)", IDC_INSTVBRONLY,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Tidak ada pemasangan bootloader", IDC_NOINSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Batal", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP |
WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:",
IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be
installed.\n\nBy default, it is installed on the system partition of the boot disk (and
either in the Master or the Volume Boot Record for BIOS-based computers).",
IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST
+    PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Batal", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -173,3 +172,12 @@ BEGIN
     IDS_PARTITION_SIZE "Ukuran"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM "System partition (Default)"
+    IDS_BOOTLOADER_MBRVBR "MBR dan VBR (Default)"
+    IDS_BOOTLOADER_VBRONLY "Hanya VBR"
+END
diff --git a/base/setup/reactos/lang/it-IT.rc b/base/setup/reactos/lang/it-IT.rc
index 23e48251893..c31d0adbbe8 100644
--- a/base/setup/reactos/lang/it-IT.rc
+++ b/base/setup/reactos/lang/it-IT.rc
@@ -76,19 +76,18 @@ BEGIN
     PUSHBUTTON "&Annulla", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Impostazioni avanzate delle partizioni"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Cartella di installazione", IDC_STATIC, "Button",
BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Installazione del Boot loader", IDC_STATIC, "Button",
BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Installazione del Boot loader sul disco fisso (MBR e VBR)",
IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Installazione del Boot loader sul disco fisso (solo VBR)",
IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Non installare il Boot loader", IDC_NOINSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Annulla", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP |
WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:",
IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be
installed.\n\nBy default, it is installed on the system partition of the boot disk (and
either in the Master or the Volume Boot Record for BIOS-based computers).",
IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST
+    PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Annulla", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -146,9 +145,9 @@ BEGIN
     IDS_DEVICETITLE "Impostazione dei dispositivi di base"
     IDS_DEVICESUBTITLE "Impostazione di monitor e tastiera."
     IDS_DRIVETITLE "Impostazione della partizione e della cartella per la
installazione"
-    IDS_DRIVESUBTITLE "Preparazione di partizione, cartella di sistema e Boot
loader."
+    IDS_DRIVESUBTITLE "Preparazione di partizione, cartella di sistema e
Bootloader."
     IDS_PROCESSTITLE "Preparazione della partizione, copia dei file e configurazione
del sistema"
-    IDS_PROCESSSUBTITLE "Creazione e formattazione della partizione, copia dei file,
installazione del Boot loader"
+    IDS_PROCESSSUBTITLE "Creazione e formattazione della partizione, copia dei file,
installazione del Bootloader"
     IDS_RESTARTTITLE "Prima fase della installazione completata"
     IDS_RESTARTSUBTITLE "La prima fase della installazione è stata completata,
riavviare il computer per procedere alla seconda fase"
     IDS_SUMMARYTITLE "Sintesi della installazione"
@@ -173,3 +172,12 @@ BEGIN
     IDS_PARTITION_SIZE "Dimensione"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST "Non installare"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM "System partition (Default)"
+    IDS_BOOTLOADER_MBRVBR "MBR e VBR (Default)"
+    IDS_BOOTLOADER_VBRONLY "Solo VBR"
+END
diff --git a/base/setup/reactos/lang/ja-JP.rc b/base/setup/reactos/lang/ja-JP.rc
index 6d3ce4402dd..cde8c5caea0 100644
--- a/base/setup/reactos/lang/ja-JP.rc
+++ b/base/setup/reactos/lang/ja-JP.rc
@@ -76,19 +76,18 @@ BEGIN
     PUSHBUTTON "キャンセル(&C)", IDCANCEL, 89, 68, 55, 15, WS_VISIBLE |
WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "上級者向けパーティション設定"
+CAPTION "Advanced Installation Options"
 FONT 9, "MS UI Gothic"
 BEGIN
-    CONTROL "インストール先フォルダ", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1,
298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "ブートローダのインストール", IDC_STATIC, "Button", BS_GROUPBOX, 4,
36, 298, 52
-    CONTROL "ハードディスクにブートローダをインストールする (MBRとVBR)", IDC_INSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "ハードディスクにブートローダをインストールする (VBRのみ)", IDC_INSTVBRONLY,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "ブートローダをインストールしない", IDC_NOINSTFREELDR, "Button",
BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "キャンセル(&C)", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP |
WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:",
IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be
installed.\n\nBy default, it is installed on the system partition of the boot disk (and
either in the Master or the Volume Boot Record for BIOS-based computers).",
IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST
+    PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "キャンセル", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -173,3 +172,12 @@ BEGIN
     IDS_PARTITION_SIZE "サイズ"
     IDS_PARTITION_STATUS "状態"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM "System partition (Default)"
+    IDS_BOOTLOADER_MBRVBR "MBRとVBR (Default)"
+    IDS_BOOTLOADER_VBRONLY "VBRのみ"
+END
diff --git a/base/setup/reactos/lang/ms-MY.rc b/base/setup/reactos/lang/ms-MY.rc
index e9033b4f4ef..657ca65a88f 100644
--- a/base/setup/reactos/lang/ms-MY.rc
+++ b/base/setup/reactos/lang/ms-MY.rc
@@ -78,19 +78,18 @@ BEGIN
     PUSHBUTTON "Batal(&C)", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Seting lanjutan Partition"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Folder pemasangan", IDC_STATIC, "Button", BS_GROUPBOX,
4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Boot loader pemasangan", IDC_STATIC, "Button",
BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Memasang boot loader pada cakera keras (MBR dan VBR)",
IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Memasang boot loader pada cakera keras (VBR sahaja)",
IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Tiada pemasangan boot loader", IDC_NOINSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "Batal(&C)", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP |
WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:",
IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be
installed.\n\nBy default, it is installed on the system partition of the boot disk (and
either in the Master or the Volume Boot Record for BIOS-based computers).",
IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST
+    PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Batal", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -148,9 +147,9 @@ BEGIN
     IDS_DEVICETITLE "Sediakan peranti asas"
     IDS_DEVICESUBTITLE "Setkan seting paparan dan papan kekunci."
     IDS_DRIVETITLE "Sediakan folder pemasangan partition dan sistem"
-    IDS_DRIVESUBTITLE "Menyediakan pemasangan partition, folder sistem dan boot
loader."
+    IDS_DRIVESUBTITLE "Menyediakan pemasangan partition, folder sistem dan
bootloader."
     IDS_PROCESSTITLE "Persediaan partition, salinan fail dan sistem
persediaan"
-    IDS_PROCESSSUBTITLE "Cipta dan format partition, menyalin fail, memasang dan
sediakan boot loader"
+    IDS_PROCESSSUBTITLE "Cipta dan format partition, menyalin fail, memasang dan
sediakan bootloader"
     IDS_RESTARTTITLE "Tahap pertama Persediaan selesai"
     IDS_RESTARTSUBTITLE "Tahap pertama persediaan telah selesai, mula semula untuk
meneruskan peringkat kedua"
     IDS_SUMMARYTITLE "Ringkasan pemasangan"
@@ -175,3 +174,12 @@ BEGIN
     IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST "Tiada pemasangan"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM "System partition (Default)"
+    IDS_BOOTLOADER_MBRVBR "MBR dan VBR (Default)"
+    IDS_BOOTLOADER_VBRONLY "VBR sahaja"
+END
diff --git a/base/setup/reactos/lang/no-NO.rc b/base/setup/reactos/lang/no-NO.rc
index 699e0d55396..81ecddef3e1 100644
--- a/base/setup/reactos/lang/no-NO.rc
+++ b/base/setup/reactos/lang/no-NO.rc
@@ -76,19 +76,18 @@ BEGIN
     PUSHBUTTON "&Avbryt", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Avansert partisjon innstillinger"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Installasjon mappe", IDC_STATIC, "Button", BS_GROUPBOX,
4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Oppstartslaster installasjon", IDC_STATIC, "Button",
BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Installer oppstartslaster på harddiskens (MBR og VBR)",
IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Installer oppstartslaster på harddiskens (bare VBR)",
IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Ikke installer oppstartslaster", IDC_NOINSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Avbryt", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP |
WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:",
IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Oppstartslaster", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be
installed.\n\nBy default, it is installed on the system partition of the boot disk (and
either in the Master or the Volume Boot Record for BIOS-based computers).",
IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST
+    PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Avbryt", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -173,3 +172,12 @@ BEGIN
     IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM "System partition (Default)"
+    IDS_BOOTLOADER_MBRVBR "MBR og VBR (Default)"
+    IDS_BOOTLOADER_VBRONLY "Bare VBR"
+END
diff --git a/base/setup/reactos/lang/pl-PL.rc b/base/setup/reactos/lang/pl-PL.rc
index f5649f40523..a533c9f4a16 100644
--- a/base/setup/reactos/lang/pl-PL.rc
+++ b/base/setup/reactos/lang/pl-PL.rc
@@ -87,19 +87,18 @@ BEGIN
     PUSHBUTTON "&Anuluj", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Zaawansowane ustawienia partycji"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Folder instalacji", IDC_STATIC, "Button", BS_GROUPBOX,
4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Instalacja menedżera rozruchu", IDC_STATIC, "Button",
BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Instaluj menedżer rozruchu na dysku twardym (MBR i VBR)",
IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Instaluj menedżer rozruchu na dysku twardym (tylko VBR)",
IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Pomiń instalację menedżera rozruchu", IDC_NOINSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Anuluj", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP |
WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:",
IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be
installed.\n\nBy default, it is installed on the system partition of the boot disk (and
either in the Master or the Volume Boot Record for BIOS-based computers).",
IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST
+    PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Anuluj", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -184,3 +183,12 @@ BEGIN
     IDS_PARTITION_SIZE "Rozmiar"
     IDS_PARTITION_STATUS "Stan"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST "Pomiń instalację"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM "System partition (Default)"
+    IDS_BOOTLOADER_MBRVBR "MBR i VBR (Default)"
+    IDS_BOOTLOADER_VBRONLY "Tylko VBR"
+END
diff --git a/base/setup/reactos/lang/pt-BR.rc b/base/setup/reactos/lang/pt-BR.rc
index 79a1d6d711a..ca70662eb17 100644
--- a/base/setup/reactos/lang/pt-BR.rc
+++ b/base/setup/reactos/lang/pt-BR.rc
@@ -76,19 +76,18 @@ BEGIN
     PUSHBUTTON "&Cancelar", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Configurações Avançadas de Particionamento"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Pasta de instalação", IDC_STATIC, "Button", BS_GROUPBOX,
4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Instalação do boot loader", IDC_STATIC, "Button",
BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Instalar boot loader no disco rígido (MBR e VBR)",
IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Instalar boot loader no disco rígido (apenas VBR)",
IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Não instalar boot loader", IDC_NOINSTFREELDR, "Button",
BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Cancelar", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP |
WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:",
IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be
installed.\n\nBy default, it is installed on the system partition of the boot disk (and
either in the Master or the Volume Boot Record for BIOS-based computers).",
IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST
+    PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Cancelar", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP |
WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -146,9 +145,9 @@ BEGIN
     IDS_DEVICETITLE "Instalar dispositivos básicos"
     IDS_DEVICESUBTITLE "Definir as configurações de monitor e teclado."
     IDS_DRIVETITLE "Configurar a partição de instalação e pasta do sistema"
-    IDS_DRIVESUBTITLE "Preparando partição de instalação, pasta do sistema e boot
loader."
+    IDS_DRIVESUBTITLE "Preparando partição de instalação, pasta do sistema e
bootloader."
     IDS_PROCESSTITLE "Preparar partição, copiar arquivos e configurar
sistema"
-    IDS_PROCESSSUBTITLE "Criar e formatar partição, copiar arquivos, instalar e
configurar boot loader"
+    IDS_PROCESSSUBTITLE "Criar e formatar partição, copiar arquivos, instalar e
configurar bootloader"
     IDS_RESTARTTITLE "Primeira etapa de instalação finalizada"
     IDS_RESTARTSUBTITLE "A primeira etapada da instalação foi completada, reinicie o
computador para prosseguir com a segunda estapa"
     IDS_SUMMARYTITLE "Sumário de Instalação"
@@ -173,3 +172,12 @@ BEGIN
     IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST "Não instalar"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM "System partition (Default)"
+    IDS_BOOTLOADER_MBRVBR "MBR e VBR (Default)"
+    IDS_BOOTLOADER_VBRONLY "Apenas VBR"
+END
diff --git a/base/setup/reactos/lang/pt-PT.rc b/base/setup/reactos/lang/pt-PT.rc
index 1b9c0069e90..d780714347c 100644
--- a/base/setup/reactos/lang/pt-PT.rc
+++ b/base/setup/reactos/lang/pt-PT.rc
@@ -76,19 +76,18 @@ BEGIN
     PUSHBUTTON "&Cancelar", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Configurações Avançadas de Particionamento"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Pasta de instalação", IDC_STATIC, "Button", BS_GROUPBOX,
4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Instalação do boot loader", IDC_STATIC, "Button",
BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Instalar boot loader no disco rígido (MBR e VBR)",
IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Instalar boot loader no disco rígido (apenas VBR)",
IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Não instalar boot loader", IDC_NOINSTFREELDR, "Button",
BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Cancelar", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP |
WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:",
IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be
installed.\n\nBy default, it is installed on the system partition of the boot disk (and
either in the Master or the Volume Boot Record for BIOS-based computers).",
IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST
+    PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Cancelar", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP |
WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -146,9 +145,9 @@ BEGIN
     IDS_DEVICETITLE "Instalar dispositivos básicos"
     IDS_DEVICESUBTITLE "Definir as configurações de monitor e teclado."
     IDS_DRIVETITLE "Configurar a partição de instalação e pasta do sistema"
-    IDS_DRIVESUBTITLE "A preparar a partição de instalação, pasta do sistema e boot
loader."
+    IDS_DRIVESUBTITLE "A preparar a partição de instalação, pasta do sistema e
bootloader."
     IDS_PROCESSTITLE "Preparar partição, copiar arquivos e configurar
sistema"
-    IDS_PROCESSSUBTITLE "Criar e formatar partição, copiar arquivos, instalar e
configurar boot loader"
+    IDS_PROCESSSUBTITLE "Criar e formatar partição, copiar arquivos, instalar e
configurar bootloader"
     IDS_RESTARTTITLE "Primeira etapa de instalação finalizada"
     IDS_RESTARTSUBTITLE "A primeira etapada da instalação foi completada, reinicie o
computador para prosseguir com a segunda estapa"
     IDS_SUMMARYTITLE "Sumário de Instalação"
@@ -173,3 +172,12 @@ BEGIN
     IDS_PARTITION_SIZE "Tamanho"
     IDS_PARTITION_STATUS "Estado"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST "Não instalar"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM "System partition (Default)"
+    IDS_BOOTLOADER_MBRVBR "MBR e VBR (Default)"
+    IDS_BOOTLOADER_VBRONLY "Apenas VBR"
+END
diff --git a/base/setup/reactos/lang/ro-RO.rc b/base/setup/reactos/lang/ro-RO.rc
index 26333fc82ef..3ccc473806f 100644
--- a/base/setup/reactos/lang/ro-RO.rc
+++ b/base/setup/reactos/lang/ro-RO.rc
@@ -85,19 +85,18 @@ BEGIN
     PUSHBUTTON "&Revocare", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Opțiuni avansate partiție"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Folderul de instalare", IDC_STATIC, "Button",
BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Instalare secvență de inițializare", IDC_STATIC,
"Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Instalează inițializatorul pe hard disc (MBR și VBR)",
IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Instalează inițializatorul pe hard disc (numai VBR)",
IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Omite instalarea inițializatorului", IDC_NOINSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Revocare", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP |
WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:",
IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be
installed.\n\nBy default, it is installed on the system partition of the boot disk (and
either in the Master or the Volume Boot Record for BIOS-based computers).",
IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST
+    PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Revocare", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP |
WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -182,3 +181,12 @@ BEGIN
     IDS_PARTITION_SIZE "Dimensiune"
     IDS_PARTITION_STATUS "Stare"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM "System partition (Default)"
+    IDS_BOOTLOADER_MBRVBR "MBR și VBR (Default)"
+    IDS_BOOTLOADER_VBRONLY "Numai VBR"
+END
diff --git a/base/setup/reactos/lang/ru-RU.rc b/base/setup/reactos/lang/ru-RU.rc
index bc010049b0b..f2b7d48f67b 100644
--- a/base/setup/reactos/lang/ru-RU.rc
+++ b/base/setup/reactos/lang/ru-RU.rc
@@ -76,19 +76,18 @@ BEGIN
     PUSHBUTTON "&Отставить", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Дополнительные параметры установки"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Основной каталог", IDC_STATIC, "Button", BS_GROUPBOX, 4,
1, 298, 30
-    EDITTEXT IDC_PATH, 10, 12, 283, 14, WS_VISIBLE
-    CONTROL "Установка загрузчика", IDC_STATIC, "Button",
BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Установить загрузчик на диск (MBR и VBR)", IDC_INSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 49, 278, 11
-    CONTROL "Установить загрузчик на диск (только VBR)", IDC_INSTVBRONLY,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 59, 278, 11
-    CONTROL "Не устанавливать загрузчик", IDC_NOINSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 69, 278, 11
-    PUSHBUTTON "&OK", IDOK, 184, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Отмена", IDCANCEL, 244, 94, 50, 15, WS_TABSTOP |
WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:",
IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Загрузчик", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be
installed.\n\nBy default, it is installed on the system partition of the boot disk (and
either in the Master or the Volume Boot Record for BIOS-based computers).",
IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST
+    PUSHBUTTON "ОК", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Отмена", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -173,3 +172,12 @@ BEGIN
     IDS_PARTITION_SIZE "Размер"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST "Не устанавливать"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM "System partition (Default)"
+    IDS_BOOTLOADER_MBRVBR "MBR и VBR (Default)"
+    IDS_BOOTLOADER_VBRONLY "Только VBR"
+END
diff --git a/base/setup/reactos/lang/sk-SK.rc b/base/setup/reactos/lang/sk-SK.rc
index a85503aef94..c6f9489e2da 100644
--- a/base/setup/reactos/lang/sk-SK.rc
+++ b/base/setup/reactos/lang/sk-SK.rc
@@ -81,19 +81,18 @@ BEGIN
     PUSHBUTTON "&Zrušiť", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Rozšírené nastavenia partície"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Inštalačný priečinok", IDC_STATIC, "Button",
BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Inštalácia zavádzača systému", IDC_STATIC, "Button",
BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Nainštalovať zavádzač systému na pevný disk (MBR a VBR)",
IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Nainštalovať zavádzač systému na pevný disk (iba VBR)",
IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Nenainštalovať zavádzač systému", IDC_NOINSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Zrušiť", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP |
WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:",
IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Zavádzač systému", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be
installed.\n\nBy default, it is installed on the system partition of the boot disk (and
either in the Master or the Volume Boot Record for BIOS-based computers).",
IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST
+    PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Zrušiť", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -151,9 +150,9 @@ BEGIN
     IDS_DEVICETITLE "Setup the basic devices"
     IDS_DEVICESUBTITLE "Set the settings of display and keyboard."
     IDS_DRIVETITLE "Setup the installation partition and system folder"
-    IDS_DRIVESUBTITLE "Prepare installation partition, system folder and boot
loader."
+    IDS_DRIVESUBTITLE "Prepare installation partition, system folder and
bootloader."
     IDS_PROCESSTITLE "Prepare partition, copy files and setup system"
-    IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup
boot loader"
+    IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup
bootloader"
     IDS_RESTARTTITLE "First stage of setup finished"
     IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to
continue with second stage"
     IDS_SUMMARYTITLE "Zhrnutie inštalácie"
@@ -178,3 +177,12 @@ BEGIN
     IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM "System partition (Default)"
+    IDS_BOOTLOADER_MBRVBR "MBR a VBR (Default)"
+    IDS_BOOTLOADER_VBRONLY "Iba VBR"
+END
diff --git a/base/setup/reactos/lang/sq-AL.rc b/base/setup/reactos/lang/sq-AL.rc
index c204b6609b3..4ab67eaa818 100644
--- a/base/setup/reactos/lang/sq-AL.rc
+++ b/base/setup/reactos/lang/sq-AL.rc
@@ -78,19 +78,18 @@ BEGIN
     PUSHBUTTON "&Anulo", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Krijimi i Avancuar i Particioneve"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Skeda e Instalimit", IDC_STATIC, "Button", BS_GROUPBOX,
4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Instalimi i Boot loaderit", IDC_STATIC, "Button",
BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Instalo boot loaderin në hard disk (MBR dhe VBR)",
IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Instalo boot loaderin në hard disk (VBR veq)", IDC_INSTVBRONLY,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Mos instalo bootloader", IDC_NOINSTFREELDR, "Button",
BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&Dakord", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Anulo", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP |
WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:",
IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be
installed.\n\nBy default, it is installed on the system partition of the boot disk (and
either in the Master or the Volume Boot Record for BIOS-based computers).",
IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST
+    PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Anulo", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -148,9 +147,9 @@ BEGIN
     IDS_DEVICETITLE "Instaloni pajisjet themelore"
     IDS_DEVICESUBTITLE "Vendos parametrat e ekranit dhe tastieres."
     IDS_DRIVETITLE "Konfiguro particionet për instalim dhe dosjet e sistemit"
-    IDS_DRIVESUBTITLE "Pergatit particionet për instalim, dosjet e sistemit dhe boot
loaderin."
+    IDS_DRIVESUBTITLE "Pergatit particionet për instalim, dosjet e sistemit dhe
bootloaderin."
     IDS_PROCESSTITLE "Konfiguro particionet, kopjo dokumentat dhe konfiguro
sistemin"
-    IDS_PROCESSSUBTITLE "Krijo dhe formato particionet, kopjo dokumentat, insalo dhe
konfiguro book loaderin"
+    IDS_PROCESSSUBTITLE "Krijo dhe formato particionet, kopjo dokumentat, insalo dhe
konfiguro bootloaderin"
     IDS_RESTARTTITLE "Faza e pare e instalimit ka perfunduar"
     IDS_RESTARTSUBTITLE "Faza e pare e instalimit ka perfunduar, rinisni për të
vazhduar me fazen e dytë"
     IDS_SUMMARYTITLE "Përmbajtja e instalimit"
@@ -175,3 +174,12 @@ BEGIN
     IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST "Mos instalo"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM "System partition (Default)"
+    IDS_BOOTLOADER_MBRVBR "MBR dhe VBR (Default)"
+    IDS_BOOTLOADER_VBRONLY "VBR veq"
+END
diff --git a/base/setup/reactos/lang/tr-TR.rc b/base/setup/reactos/lang/tr-TR.rc
index 1443a70524c..24e7ea6be9c 100644
--- a/base/setup/reactos/lang/tr-TR.rc
+++ b/base/setup/reactos/lang/tr-TR.rc
@@ -83,19 +83,18 @@ BEGIN
     PUSHBUTTON "İptal", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Gelişmiş Bölümlendirme Seçenekleri"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Kurulum Dizini", IDC_STATIC, "Button", BS_GROUPBOX, 4,
1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Önyükleyici Kurulumu", IDC_STATIC, "Button",
BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Önyükleyiciyi sabit diskin üzerine kur. (MBR ve VBR)",
IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Önyükleyiciyi sabit diskin üzerine kur. (Yalnızca VBR)",
IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Önyükleyici kurulumunu atla.", IDC_NOINSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "Tamam", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "İptal", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:",
IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be
installed.\n\nBy default, it is installed on the system partition of the boot disk (and
either in the Master or the Volume Boot Record for BIOS-based computers).",
IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST
+    PUSHBUTTON "Tamam", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "İptal", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -180,3 +179,12 @@ BEGIN
     IDS_PARTITION_SIZE "Boyut"
     IDS_PARTITION_STATUS "Durum"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM "System partition (Default)"
+    IDS_BOOTLOADER_MBRVBR "MBR ve VBR (Default)"
+    IDS_BOOTLOADER_VBRONLY "Yalnızca VBR"
+END
diff --git a/base/setup/reactos/lang/uk-UA.rc b/base/setup/reactos/lang/uk-UA.rc
index fefc19c1db6..9bcb3709db9 100644
--- a/base/setup/reactos/lang/uk-UA.rc
+++ b/base/setup/reactos/lang/uk-UA.rc
@@ -84,19 +84,18 @@ BEGIN
     PUSHBUTTON "&Скасувати", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Розширені параметри розділу"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Тека встановлення", IDC_STATIC, "Button", BS_GROUPBOX,
4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Встановлення завантажувача", IDC_STATIC, "Button",
BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Встановити завантажувач на жосткий диск (MBR та VBR)",
IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Встановити завантажувач на жосткий диск (лише VBR)",
IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Не встановлювати завантажувач", IDC_NOINSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Скасувати", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP |
WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:",
IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Завантажувач", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be
installed.\n\nBy default, it is installed on the system partition of the boot disk (and
either in the Master or the Volume Boot Record for BIOS-based computers).",
IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST
+    PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Скасувати", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP |
WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -181,3 +180,12 @@ BEGIN
     IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST "Не встановлювати"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM "System partition (Default)"
+    IDS_BOOTLOADER_MBRVBR "MBR та VBR (Default)"
+    IDS_BOOTLOADER_VBRONLY "Лише VBR"
+END
diff --git a/base/setup/reactos/lang/vi-VN.rc b/base/setup/reactos/lang/vi-VN.rc
index 0d67ca9f335..478268f2286 100644
--- a/base/setup/reactos/lang/vi-VN.rc
+++ b/base/setup/reactos/lang/vi-VN.rc
@@ -76,19 +76,18 @@ BEGIN
     PUSHBUTTON "&Hủy", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Tùy chọn phân chia ổ đĩa nâng cao"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Thư mục cài đặt", IDC_STATIC, "Button", BS_GROUPBOX, 4,
1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Cài đặt Boot loader", IDC_STATIC, "Button", BS_GROUPBOX,
4, 36, 298, 52
-    CONTROL "Cài boot loader trên ổ cứng  (MBR-MasterBootRecord- và
VBR-VolumeBootRecord)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON |
WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Cài boot loader  (chỉ VBR)", IDC_INSTVBRONLY, "Button",
BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Không cài bootloader", IDC_NOINSTFREELDR, "Button",
BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&Đồng ý", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Hủy", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:",
IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be
installed.\n\nBy default, it is installed on the system partition of the boot disk (and
either in the Master or the Volume Boot Record for BIOS-based computers).",
IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST
+    PUSHBUTTON "Đồng ý", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Hủy", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -146,9 +145,9 @@ BEGIN
     IDS_DEVICETITLE "Thiết lập các thiết bị cơ bản"
     IDS_DEVICESUBTITLE "Chọn những cài đặt cho màn hình và bàn phím."
     IDS_DRIVETITLE "Thiết lập phần ổ cứng để cài đặt và thư mục hệ thống"
-    IDS_DRIVESUBTITLE "Chuẩn bị phần ổ cứng, thư mục hệ thống và boot
loader."
+    IDS_DRIVESUBTITLE "Chuẩn bị phần ổ cứng, thư mục hệ thống và bootloader."
     IDS_PROCESSTITLE "Thiết lập phần ổ cứng, sao chép tập tin và thiết lập hệ
thống"
-    IDS_PROCESSSUBTITLE "Tạo và định dạng phần ổ đĩa, sao chép thư  mục, cài đặt và
thiết lập boot loader"
+    IDS_PROCESSSUBTITLE "Tạo và định dạng phần ổ đĩa, sao chép thư  mục, cài đặt và
thiết lập bootloader"
     IDS_RESTARTTITLE "Giai đoạn đầu của việc thiết lập đã hoàn tất"
     IDS_RESTARTSUBTITLE "Giai đoạn đầu của việc thiết lập đã được hoàn thành, khởi
động lại máy tính để tiếp tuc với giai đoạn hai"
     IDS_SUMMARYTITLE "Tóm lược quá trình cài đặt"
@@ -173,3 +172,12 @@ BEGIN
     IDS_PARTITION_SIZE "Kích cỡ"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM "System partition (Default)"
+    IDS_BOOTLOADER_MBRVBR "MBR và VBR (Default)"
+    IDS_BOOTLOADER_VBRONLY "Chỉ VBR"
+END
diff --git a/base/setup/reactos/lang/zh-CN.rc b/base/setup/reactos/lang/zh-CN.rc
index 03b0a20ec5e..72de7f21c9b 100644
--- a/base/setup/reactos/lang/zh-CN.rc
+++ b/base/setup/reactos/lang/zh-CN.rc
@@ -76,19 +76,18 @@ BEGIN
     PUSHBUTTON "取消(&C)", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "高级分区设置"
+CAPTION "Advanced Installation Options"
 FONT 9, "宋体"
 BEGIN
-    CONTROL "安装文件夹", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298,
30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "引导程序安装", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298,
52
-    CONTROL "安装引导程序到硬盘 (MBR 和 VBR)", IDC_INSTFREELDR, "Button",
BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "安装引导程序到硬盘 (仅 VBR)", IDC_INSTVBRONLY, "Button",
BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "不安装引导程序", IDC_NOINSTFREELDR, "Button",
BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "确定(&O)", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "取消(&C)", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP |
WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:",
IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be
installed.\n\nBy default, it is installed on the system partition of the boot disk (and
either in the Master or the Volume Boot Record for BIOS-based computers).",
IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST
+    PUSHBUTTON "确定", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "取消", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -173,3 +172,12 @@ BEGIN
     IDS_PARTITION_SIZE "大小"
     IDS_PARTITION_STATUS "状态"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM "System partition (Default)"
+    IDS_BOOTLOADER_MBRVBR "MBR 和 VBR (Default)"
+    IDS_BOOTLOADER_VBRONLY "仅 VBR"
+END
diff --git a/base/setup/reactos/lang/zh-HK.rc b/base/setup/reactos/lang/zh-HK.rc
index 7e7ec6d7420..4d73e0b1510 100644
--- a/base/setup/reactos/lang/zh-HK.rc
+++ b/base/setup/reactos/lang/zh-HK.rc
@@ -84,19 +84,18 @@ BEGIN
     PUSHBUTTON "取消(&C)", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "進階磁碟區設定"
+CAPTION "Advanced Installation Options"
 FONT 9, "新細明體"
 BEGIN
-    CONTROL "安裝資料夾", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298,
30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "安裝啟動程式", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298,
52
-    CONTROL "安裝啟動程式到硬碟（MBR 和 VBR）", IDC_INSTFREELDR, "Button",
BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "安裝啟動程式到硬碟（僅 VBR）", IDC_INSTVBRONLY, "Button",
BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "不安裝啟動程式", IDC_NOINSTFREELDR, "Button",
BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "確定(&O)", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "取消(&C)", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP |
WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:",
IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be
installed.\n\nBy default, it is installed on the system partition of the boot disk (and
either in the Master or the Volume Boot Record for BIOS-based computers).",
IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST
+    PUSHBUTTON "確定", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "取消", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -181,3 +180,12 @@ BEGIN
     IDS_PARTITION_SIZE "大小"
     IDS_PARTITION_STATUS "狀態"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM "System partition (Default)"
+    IDS_BOOTLOADER_MBRVBR "MBR 和 VBR (Default)"
+    IDS_BOOTLOADER_VBRONLY "僅 VBR"
+END
diff --git a/base/setup/reactos/lang/zh-TW.rc b/base/setup/reactos/lang/zh-TW.rc
index baa23c4dd9c..4124c4a2035 100644
--- a/base/setup/reactos/lang/zh-TW.rc
+++ b/base/setup/reactos/lang/zh-TW.rc
@@ -85,19 +85,18 @@ BEGIN
     PUSHBUTTON "取消(&C)", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "進階磁碟區設定"
+CAPTION "Advanced Installation Options"
 FONT 9, "新細明體"
 BEGIN
-    CONTROL "安裝資料夾", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298,
30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "安裝啟動程式", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298,
52
-    CONTROL "安裝啟動程式到硬碟（MBR 和 VBR）", IDC_INSTFREELDR, "Button",
BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "安裝啟動程式到硬碟（僅 VBR）", IDC_INSTVBRONLY, "Button",
BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "不安裝啟動程式", IDC_NOINSTFREELDR, "Button",
BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "確定(&O)", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "取消(&C)", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP |
WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:",
IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be
installed.\n\nBy default, it is installed on the system partition of the boot disk (and
either in the Master or the Volume Boot Record for BIOS-based computers).",
IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST
+    PUSHBUTTON "確定", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "取消", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -182,3 +181,12 @@ BEGIN
     IDS_PARTITION_SIZE "大小"
     IDS_PARTITION_STATUS "狀態"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM "System partition (Default)"
+    IDS_BOOTLOADER_MBRVBR "MBR 和 VBR (Default)"
+    IDS_BOOTLOADER_VBRONLY "僅 VBR"
+END
diff --git a/base/setup/reactos/resource.h b/base/setup/reactos/resource.h
index 11d855ce49d..427410ff334 100644
--- a/base/setup/reactos/resource.h
+++ b/base/setup/reactos/resource.h
@@ -61,11 +61,9 @@
 #define IDC_RESTART_PROGRESS 2072
 #define IDC_PARTMOREOPTS     2073
 
-#define IDD_BOOTOPTIONS      2080
+#define IDD_ADVINSTOPTS      2080
 #define IDC_PATH             2081
 #define IDC_INSTFREELDR      2082
-#define IDC_INSTVBRONLY      2083
-#define IDC_NOINSTFREELDR    2084
 
 #define IDD_PARTITION        2090
 #define IDC_UPDOWN1          2091
@@ -100,3 +98,10 @@
 #define IDS_PARTITION_TYPE   5201
 #define IDS_PARTITION_SIZE   5202
 #define IDS_PARTITION_STATUS 5203
+
+// WARNING: These IDs *MUST* stay in increasing order!
+#define IDS_BOOTLOADER_NOINST       5300
+#define IDS_BOOTLOADER_REMOVABLE    5301
+#define IDS_BOOTLOADER_SYSTEM       5302    // For non-MBR disks
+#define IDS_BOOTLOADER_MBRVBR       5303    // For MBR disks only
+#define IDS_BOOTLOADER_VBRONLY      5304    // ""