[SETUP:REACTOS] Add partitioning and formatting support (#7159)

CORE-13525

- Newly-created partitions and unpartitioned space ar reinserted
  or updated in correct order in the tree-list. Volume-creation
  information data associated with the tree items is persisted
  across operations.

- Reliably delete data associated to tree-list items via the
  TVN_DELETEITEM notification.
  This allows simplifying the cleanup function; keeping simple
  the code that deletes items when deleting partitions, etc.

- Make the PrintPartitionData() function call itself recursively on
  extended partitions to display the sub-list of logical partitions.

- Handle the new partition size in MB the same way as in USETUP.

- Allow existing partitions/volumes to be re-formatted, using
  common code with the partition creation dialog.

- Allow selecting unpartitioned space or non-formatted partitions
  for installing ReactOS: unused space will automatically be
  partitioned and non-formatted partitions formatted (the user
  is prompted for choosing the file system).

- Correctly zero the progress-bar position when starting file copy.
- Add missing file copy error handler in FileCopyCallback:
  just copying what USETUP does.

base/setup/lib/utils/partlist.c

@@ -2720,7 +2720,6 @@ UpdateDiskLayout(
  *
  * @return  The adjacent unpartitioned region, if it exists, or NULL.
  **/
-static
 PPARTENTRY
 GetAdjUnpartitionedEntry(
     _In_ PPARTENTRY PartEntry,

base/setup/lib/utils/partlist.h

@@ -316,6 +316,11 @@ GetPrevPartition(
     IN PPARTLIST List,
     IN PPARTENTRY CurrentPart OPTIONAL);
 
+PPARTENTRY
+GetAdjUnpartitionedEntry(
+    _In_ PPARTENTRY PartEntry,
+    _In_ BOOLEAN Direction);
+
 ERROR_NUMBER
 PartitionCreationChecks(
     _In_ PPARTENTRY PartEntry);

base/setup/reactos/lang/bg-BG.rc

@@ -55,27 +55,43 @@ CAPTION "Настройка на РеактОС"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
-    PUSHBUTTON "&Създаване", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "Из&триване", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "&Създаване", IDC_PARTCREATE, 7, 122, 50, 14
-    PUSHBUTTON "Драйвер", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "Раз&ширани възможности...", IDC_PARTMOREOPTS, 230, 122, 80, 15
+    PUSHBUTTON "Из&триване", IDC_PARTDELETE, 63, 122, 50, 14
-    // LTEXT "Натиснете „Напред“, за да започне слагането.", IDC_STATIC, 10, 180, 277, 20
+    PUSHBUTTON "Драйвер", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "Раз&ширани възможности...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+    // LTEXT "Натиснете „Напред“, за да започне слагането.", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Създаване на дял"
+CAPTION "Създаване и форматиране на дял"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
+    LTEXT "&Размер:", IDC_STATIC, 7, 9, 70, 9
-    CONTROL "Създаване и форматиране на дял", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
+    EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
-    LTEXT "Размер:", IDC_STATIC, 13, 24, 27, 9
+    CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-    EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
-    LTEXT "ГБ", IDC_UNIT, 117, 24, 14, 9
+    LTEXT "Мб", IDC_UNIT, 134, 9, 14, 9
-    LTEXT "Файлова система:", IDC_STATIC, 13, 46, 42, 9
+    AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50
+    LTEXT "&Файлова система:", IDC_FS_STATIC, 7, 46, 70, 9
-    PUSHBUTTON "&Добре", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON "&Отказ", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "Добре", IDOK, 88, 98, 50, 14
+    PUSHBUTTON "Отказ", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Форматиране на дял"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Файлова система:", IDC_FS_STATIC, 7, 9, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+    PUSHBUTTON "Добре", IDOK, 88, 61, 50, 14
+    PUSHBUTTON "Отказ", IDCANCEL, 143, 61, 50, 14
 END
 
 IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -84,12 +100,12 @@ CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
     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
+    EDITTEXT IDC_PATH, 7, 23, 291, 13
     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
+    DEFPUSHBUTTON "Добре", IDOK, 193, 113, 50, 14
-    PUSHBUTTON "Отказ", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Отказ", IDCANCEL, 248, 113, 50, 14
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -160,6 +176,7 @@ BEGIN
     IDS_ABORTSETUP2 "Прекъсване на слагането?"
     IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue."
     IDS_CAPTION "Настройка на РеактОС"
+    IDS_VOLUME_NOFORMAT "Not formatted"
 END
 
 STRINGTABLE
@@ -186,6 +203,26 @@ BEGIN
     IDS_BOOTLOADER_VBRONLY "Само VBR"
 END
 
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+    IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+    IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+    IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+    IDS_COPYING  "Copying %s"
+    IDS_MOVING   "Moving %s to %s"
+    IDS_RENAMING "Renaming %s to %s"
+    IDS_DELETING "Deleting %s"
+
+    IDS_PREPARE_PARTITIONS "Preparing partitions..."
+    IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..."
+    IDS_COPYING_FILES "Copying the files..."
+END
+
 /* Error Strings */
 
 STRINGTABLE
@@ -195,8 +232,35 @@ BEGIN
 alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\
 Spaces are not allowed."
 
-// ERROR_DIRECTORY_NAME
     IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path"
     IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \
 and only contain letters, digits, dashes and periods. Spaces are not allowed."
+
+    IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+    IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+    IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+    IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected partition?"
+    IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the selected extended partition and ALL the logical partitions it contains?"
+
+    IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+    IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+    IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to format the partition."
+
+    IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n %s\n"
+
+    IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)."
 END

base/setup/reactos/lang/cs-CZ.rc

@@ -61,27 +61,43 @@ CAPTION "Instalace systému ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
-    PUSHBUTTON "&Vytvořit", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Smazat", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "&Vytvořit", IDC_PARTCREATE, 7, 122, 50, 14
-    PUSHBUTTON "&Ovladač", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Pokročilé volby...", IDC_PARTMOREOPTS, 230, 122, 80, 15
+    PUSHBUTTON "&Smazat", IDC_PARTDELETE, 63, 122, 50, 14
-    // LTEXT "Po klepnutí na Další bude možné zkontrolovat všechna nastavení.", IDC_STATIC, 10, 180, 277, 20
+    PUSHBUTTON "&Ovladač", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "&Pokročilé volby...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+    // LTEXT "Po klepnutí na Další bude možné zkontrolovat všechna nastavení.", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Vytvořit oddíl"
+CAPTION "Vytvořit a naformátovat oddíl"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
+    LTEXT "&Velikost:", IDC_STATIC, 7, 9, 70, 9
-    CONTROL "Vytvořit a naformátovat oddíl", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
+    EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
-    LTEXT "Velikost:", IDC_STATIC, 13, 24, 27, 9
+    CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-    EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
-    LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
+    LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
-    LTEXT "Souborový systém:", IDC_STATIC, 13, 46, 42, 9
+    AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50
+    LTEXT "Sou&borový systém:", IDC_FS_STATIC, 7, 46, 70, 9
-    PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON "&Storno", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+    PUSHBUTTON "Storno", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Naformátovat oddíl"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Sou&borový systém:", IDC_FS_STATIC, 7, 9, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+    PUSHBUTTON "Storno", IDCANCEL, 143, 61, 50, 14
 END
 
 IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -90,12 +106,12 @@ CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
     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
+    EDITTEXT IDC_PATH, 7, 23, 291, 13
     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
+    DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
-    PUSHBUTTON "Storno", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Storno", IDCANCEL, 248, 113, 50, 14
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -166,6 +182,7 @@ BEGIN
     IDS_ABORTSETUP2 "Přerušit instalaci?"
     IDS_NO_TXTSETUP_SIF "Soubor 'txtsetup.sif' nenalezen.\nInstalace nemůže pokračovat."
     IDS_CAPTION "Instalace systému ReactOS"
+    IDS_VOLUME_NOFORMAT "Not formatted"
 END
 
 STRINGTABLE
@@ -192,6 +209,26 @@ BEGIN
     IDS_BOOTLOADER_VBRONLY "Jen VBR"
 END
 
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+    IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+    IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+    IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+    IDS_COPYING  "Copying %s"
+    IDS_MOVING   "Moving %s to %s"
+    IDS_RENAMING "Renaming %s to %s"
+    IDS_DELETING "Deleting %s"
+
+    IDS_PREPARE_PARTITIONS "Preparing partitions..."
+    IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..."
+    IDS_COPYING_FILES "Copying the files..."
+END
+
 /* Error Strings */
 
 STRINGTABLE
@@ -201,8 +238,35 @@ BEGIN
 alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\
 Spaces are not allowed."
 
-// ERROR_DIRECTORY_NAME
     IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path"
     IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \
 and only contain letters, digits, dashes and periods. Spaces are not allowed."
+
+    IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+    IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+    IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+    IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected partition?"
+    IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the selected extended partition and ALL the logical partitions it contains?"
+
+    IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+    IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+    IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to format the partition."
+
+    IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n %s\n"
+
+    IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)."
 END

base/setup/reactos/lang/de-DE.rc

@@ -55,27 +55,43 @@ CAPTION "ReactOS-Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
-    PUSHBUTTON "&Erstellen", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Löschen", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "&Erstellen", IDC_PARTCREATE, 7, 122, 50, 14
-    PUSHBUTTON "&Treiber", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "E&rweiterte Optionen...", IDC_PARTMOREOPTS, 230, 122, 80, 15
+    PUSHBUTTON "&Löschen", IDC_PARTDELETE, 63, 122, 50, 14
-    // LTEXT "Klicken Sie auf Weiter um die Zusammenfassung zu überprüfen.", IDC_STATIC, 10, 180, 277, 20
+    PUSHBUTTON "&Treiber", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "E&rweiterte Optionen...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+    // LTEXT "Klicken Sie auf Weiter um die Zusammenfassung zu überprüfen.", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Erstelle Partition"
+CAPTION "Erstelle und formatiere Partition"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
+    LTEXT "&Größe:", IDC_STATIC, 7, 9, 70, 9
-    CONTROL "Erstelle und formatiere Partition", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
+    EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
-    LTEXT "Größe:", IDC_STATIC, 13, 24, 27, 9
+    CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-    EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
-    LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
+    LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
-    LTEXT "Dateisystem:", IDC_STATIC, 13, 46, 42, 9
+    AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50
+    LTEXT "&Dateisystem:", IDC_FS_STATIC, 7, 46, 70, 9
-    PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON "&Abbrechen", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+    PUSHBUTTON "Abbrechen", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Formatiere Partition"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Dateisystem:", IDC_FS_STATIC, 7, 9, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+    PUSHBUTTON "Abbrechen", IDCANCEL, 143, 61, 50, 14
 END
 
 IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -84,12 +100,12 @@ CAPTION "Erweiterte Installationseinstellungen"
 FONT 8, "MS Shell Dlg"
 BEGIN
     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
+    EDITTEXT IDC_PATH, 7, 23, 291, 13
     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
+    DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
-    PUSHBUTTON "Abbrechen", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Abbrechen", IDCANCEL, 248, 113, 50, 14
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -160,6 +176,7 @@ BEGIN
     IDS_ABORTSETUP2 "Installation abbrechen?"
     IDS_NO_TXTSETUP_SIF "Die Datei 'txtsetup.sif' konnte nicht gefunden werden.\nSetup kann nicht fortfahren."
     IDS_CAPTION "ReactOS Setup"
+    IDS_VOLUME_NOFORMAT "Not formatted"
 END
 
 STRINGTABLE
@@ -186,6 +203,26 @@ BEGIN
     IDS_BOOTLOADER_VBRONLY "Nur VBR"
 END
 
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+    IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+    IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+    IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+    IDS_COPYING  "Copying %s"
+    IDS_MOVING   "Moving %s to %s"
+    IDS_RENAMING "Renaming %s to %s"
+    IDS_DELETING "Deleting %s"
+
+    IDS_PREPARE_PARTITIONS "Preparing partitions..."
+    IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..."
+    IDS_COPYING_FILES "Copying the files..."
+END
+
 /* Error Strings */
 
 STRINGTABLE
@@ -195,8 +232,35 @@ BEGIN
 alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\
 Spaces are not allowed."
 
-// ERROR_DIRECTORY_NAME
     IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path"
     IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \
 and only contain letters, digits, dashes and periods. Spaces are not allowed."
+
+    IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+    IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+    IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+    IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected partition?"
+    IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the selected extended partition and ALL the logical partitions it contains?"
+
+    IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+    IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+    IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to format the partition."
+
+    IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n %s\n"
+
+    IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)."
 END

base/setup/reactos/lang/el-GR.rc

@@ -55,27 +55,43 @@ CAPTION "Εγκατάσταση του ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
-    PUSHBUTTON "&Δημιουργία", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Διαγραφή", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "&Δημιουργία", IDC_PARTCREATE, 7, 122, 50, 14
-    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Επιλογές για προχωρημένους...", IDC_PARTMOREOPTS, 230, 122, 80, 15
+    PUSHBUTTON "Δ&ιαγραφή", IDC_PARTDELETE, 63, 122, 50, 14
-    // LTEXT "Πατήστε Επόμενο για να ξεκινήσετε τη διαδικασία εγκατάστασης.", IDC_STATIC, 10, 180, 277, 20
+    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "&Επιλογές για προχωρημένους...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+    // LTEXT "Πατήστε Επόμενο για να ξεκινήσετε τη διαδικασία εγκατάστασης.", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Δημιουργία Partition"
+CAPTION "Create and Format partition"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
+    LTEXT "&Μέγεθος:", IDC_STATIC, 7, 9, 70, 9
-    CONTROL "Create and format partition", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
+    EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
-    LTEXT "Μέγεθος:", IDC_STATIC, 13, 24, 27, 9
+    CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-    EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
-    LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
+    LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
-    LTEXT "Τύπος συστήματος:", IDC_STATIC, 13, 46, 42, 9
+    AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50
+    LTEXT "&Τύπος συστήματος:", IDC_FS_STATIC, 7, 46, 70, 9
-    PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON "&Άκυρο", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+    PUSHBUTTON "Άκυρο", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Format Partition"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Τύπος συστήματος:", IDC_FS_STATIC, 7, 9, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+    PUSHBUTTON "Άκυρο", IDCANCEL, 143, 61, 50, 14
 END
 
 IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -84,12 +100,12 @@ CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
     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
+    EDITTEXT IDC_PATH, 7, 23, 291, 13
     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
+    DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
-    PUSHBUTTON "Άκυρο", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Άκυρο", IDCANCEL, 248, 113, 50, 14
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -160,6 +176,7 @@ BEGIN
     IDS_ABORTSETUP2 "Abort installation?"
     IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue."
     IDS_CAPTION "ReactOS Setup"
+    IDS_VOLUME_NOFORMAT "Not formatted"
 END
 
 STRINGTABLE
@@ -186,6 +203,26 @@ BEGIN
     IDS_BOOTLOADER_VBRONLY "VBR only"
 END
 
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+    IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+    IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+    IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+    IDS_COPYING  "Copying %s"
+    IDS_MOVING   "Moving %s to %s"
+    IDS_RENAMING "Renaming %s to %s"
+    IDS_DELETING "Deleting %s"
+
+    IDS_PREPARE_PARTITIONS "Preparing partitions..."
+    IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..."
+    IDS_COPYING_FILES "Copying the files..."
+END
+
 /* Error Strings */
 
 STRINGTABLE
@@ -195,8 +232,35 @@ BEGIN
 alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\
 Spaces are not allowed."
 
-// ERROR_DIRECTORY_NAME
     IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path"
     IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \
 and only contain letters, digits, dashes and periods. Spaces are not allowed."
+
+    IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+    IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+    IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+    IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected partition?"
+    IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the selected extended partition and ALL the logical partitions it contains?"
+
+    IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+    IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+    IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to format the partition."
+
+    IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n %s\n"
+
+    IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)."
 END

base/setup/reactos/lang/en-US.rc

@@ -55,27 +55,43 @@ CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
     PUSHBUTTON "&Create", IDC_PARTCREATE, 7, 122, 50, 14
+    PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
     PUSHBUTTON "&Delete", IDC_PARTDELETE, 63, 122, 50, 14
     PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
     PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 230, 122, 80, 14
     // LTEXT "Click Next to check the summary.", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Create Partition"
+CAPTION "Create and Format Partition"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
+    LTEXT "&Size:", IDC_STATIC, 7, 9, 70, 9
-    CONTROL "Create and format partition", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
+    EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
-    LTEXT "Size:", IDC_STATIC, 13, 24, 27, 9
+    CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-    EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
-    LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
+    LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
-    LTEXT "File System:", IDC_STATIC, 13, 46, 42, 9
+    AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50
+    LTEXT "&File System:", IDC_FS_STATIC, 7, 46, 70, 9
-    PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON "&Cancel", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Format Partition"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&File System:", IDC_FS_STATIC, 7, 9, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 143, 61, 50, 14
 END
 
 IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -84,12 +100,12 @@ CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
     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
+    EDITTEXT IDC_PATH, 7, 23, 291, 13
     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
+    DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Cancel", IDCANCEL, 248, 113, 50, 14
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -160,6 +176,7 @@ BEGIN
     IDS_ABORTSETUP2 "Abort installation?"
     IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue."
     IDS_CAPTION "ReactOS Setup"
+    IDS_VOLUME_NOFORMAT "Not formatted"
 END
 
 STRINGTABLE
@@ -186,6 +203,26 @@ BEGIN
     IDS_BOOTLOADER_VBRONLY "VBR only"
 END
 
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+    IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+    IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+    IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+    IDS_COPYING  "Copying %s"
+    IDS_MOVING   "Moving %s to %s"
+    IDS_RENAMING "Renaming %s to %s"
+    IDS_DELETING "Deleting %s"
+
+    IDS_PREPARE_PARTITIONS "Preparing partitions..."
+    IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..."
+    IDS_COPYING_FILES "Copying the files..."
+END
+
 /* Error Strings */
 
 STRINGTABLE
@@ -195,8 +232,35 @@ BEGIN
 alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\
 Spaces are not allowed."
 
-// ERROR_DIRECTORY_NAME
     IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path"
     IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \
 and only contain letters, digits, dashes and periods. Spaces are not allowed."
+
+    IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+    IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+    IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+    IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected partition?"
+    IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the selected extended partition and ALL the logical partitions it contains?"
+
+    IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+    IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+    IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to format the partition."
+
+    IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n %s\n"
+
+    IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)."
 END

base/setup/reactos/lang/es-ES.rc

@@ -64,27 +64,43 @@ CAPTION "Instalación de ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
-    PUSHBUTTON "&Crear", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Borrar", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "&Crear", IDC_PARTCREATE, 7, 122, 50, 14
-    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Opciones avanzadas...", IDC_PARTMOREOPTS, 230, 122, 80, 15
+    PUSHBUTTON "&Borrar", IDC_PARTDELETE, 63, 122, 50, 14
-    // LTEXT "Presione Siguiente para verificar el resumen.", IDC_STATIC, 10, 180, 277, 20
+    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "&Opciones avanzadas...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+    // LTEXT "Presione Siguiente para verificar el resumen.", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Crear Partición"
+CAPTION "Crear y formatear una partición"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
+    LTEXT "&Tamaño:", IDC_STATIC, 7, 9, 70, 9
-    CONTROL "Crear y formatear una partición", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
+    EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
-    LTEXT "Tamaño:", IDC_STATIC, 13, 24, 27, 9
+    CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-    EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
-    LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
+    LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
-    LTEXT "Sistema de archivos:", IDC_STATIC, 13, 46, 42, 9
+    AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50
+    LTEXT "&Sistema de archivos:", IDC_FS_STATIC, 7, 46, 70, 9
-    PUSHBUTTON "&Aceptar", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON "&Cancelar", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "Aceptar", IDOK, 88, 98, 50, 14
+    PUSHBUTTON "Cancelar", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Formatear una partición"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Sistema de archivos:", IDC_FS_STATIC, 7, 9, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+    PUSHBUTTON "Aceptar", IDOK, 88, 61, 50, 14
+    PUSHBUTTON "Cancelar", IDCANCEL, 143, 61, 50, 14
 END
 
 IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -93,12 +109,12 @@ CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
     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
+    EDITTEXT IDC_PATH, 7, 23, 291, 13
     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
+    DEFPUSHBUTTON "Aceptar", IDOK, 193, 113, 50, 14
-    PUSHBUTTON "Cancelar", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Cancelar", IDCANCEL, 248, 113, 50, 14
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -169,6 +185,7 @@ BEGIN
     IDS_ABORTSETUP2 "¿Abortar instalación?"
     IDS_NO_TXTSETUP_SIF "No se pudo encontrar 'txtsetup.sif'.\nLa instalación no puede continuar."
     IDS_CAPTION "Instalación de ReactOS"
+    IDS_VOLUME_NOFORMAT "Not formatted"
 END
 
 STRINGTABLE
@@ -195,6 +212,26 @@ BEGIN
     IDS_BOOTLOADER_VBRONLY "Solo VBR"
 END
 
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+    IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+    IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+    IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+    IDS_COPYING  "Copying %s"
+    IDS_MOVING   "Moving %s to %s"
+    IDS_RENAMING "Renaming %s to %s"
+    IDS_DELETING "Deleting %s"
+
+    IDS_PREPARE_PARTITIONS "Preparing partitions..."
+    IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..."
+    IDS_COPYING_FILES "Copying the files..."
+END
+
 /* Error Strings */
 
 STRINGTABLE
@@ -204,8 +241,35 @@ BEGIN
 alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\
 Spaces are not allowed."
 
-// ERROR_DIRECTORY_NAME
     IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path"
     IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \
 and only contain letters, digits, dashes and periods. Spaces are not allowed."
+
+    IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+    IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+    IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+    IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected partition?"
+    IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the selected extended partition and ALL the logical partitions it contains?"
+
+    IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+    IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+    IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to format the partition."
+
+    IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n %s\n"
+
+    IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)."
 END

base/setup/reactos/lang/et-EE.rc

@@ -55,27 +55,43 @@ CAPTION "ReactOS'i paigaldamine"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
-    PUSHBUTTON "&Loo uus", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Kustuta", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "&Loo uus", IDC_PARTCREATE, 7, 122, 50, 14
-    PUSHBUTTON "D&raiver", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Täpsemad seaded...", IDC_PARTMOREOPTS, 230, 122, 80, 15
+    PUSHBUTTON "&Kustuta", IDC_PARTDELETE, 63, 122, 50, 14
-    // LTEXT "Vajuta Järgmine, et seaded üle kontrollida.", IDC_STATIC, 10, 180, 277, 20
+    PUSHBUTTON "D&raiver", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "&Täpsemad seaded...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+    // LTEXT "Vajuta Järgmine, et seaded üle kontrollida.", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Partitsiooni loomine"
+CAPTION "Loo ja vorminda partitsioon"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
+    LTEXT "&Suurus:", IDC_STATIC, 7, 9, 70, 9
-    CONTROL "Loo ja vorminda ketas", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
+    EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
-    LTEXT "Suurus:", IDC_STATIC, 13, 24, 27, 9
+    CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-    EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
-    LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
+    LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
-    LTEXT "Failisüsteem:", IDC_STATIC, 13, 46, 42, 9
+    AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50
+    LTEXT "&Failisüsteem:", IDC_FS_STATIC, 7, 46, 70, 9
-    PUSHBUTTON "&Olgu", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON "&Tühista", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "Olgu", IDOK, 88, 98, 50, 14
+    PUSHBUTTON "Tühista", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Vorminda partitsioon"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Failisüsteem:", IDC_FS_STATIC, 7, 9, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+    PUSHBUTTON "Olgu", IDOK, 88, 61, 50, 14
+    PUSHBUTTON "Tühista", IDCANCEL, 143, 61, 50, 14
 END
 
 IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -84,12 +100,12 @@ CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
     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
+    EDITTEXT IDC_PATH, 7, 23, 291, 13
     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
+    DEFPUSHBUTTON "Olgu", IDOK, 193, 113, 50, 14
-    PUSHBUTTON "Tühista", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Tühista", IDCANCEL, 248, 113, 50, 14
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -160,6 +176,7 @@ BEGIN
     IDS_ABORTSETUP2 "Katkestada paigaldamine?"
     IDS_NO_TXTSETUP_SIF "Ei leitud faili 'txtsetup.sif'.\nPaigaldust ei saa lõpuni viia."
     IDS_CAPTION "ReactOS'i paigaldamine"
+    IDS_VOLUME_NOFORMAT "Not formatted"
 END
 
 STRINGTABLE
@@ -186,6 +203,26 @@ BEGIN
     IDS_BOOTLOADER_VBRONLY "Ainult VBR"
 END
 
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+    IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+    IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+    IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+    IDS_COPYING  "Copying %s"
+    IDS_MOVING   "Moving %s to %s"
+    IDS_RENAMING "Renaming %s to %s"
+    IDS_DELETING "Deleting %s"
+
+    IDS_PREPARE_PARTITIONS "Preparing partitions..."
+    IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..."
+    IDS_COPYING_FILES "Copying the files..."
+END
+
 /* Error Strings */
 
 STRINGTABLE
@@ -195,8 +232,35 @@ BEGIN
 alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\
 Spaces are not allowed."
 
-// ERROR_DIRECTORY_NAME
     IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path"
     IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \
 and only contain letters, digits, dashes and periods. Spaces are not allowed."
+
+    IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+    IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+    IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+    IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected partition?"
+    IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the selected extended partition and ALL the logical partitions it contains?"
+
+    IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+    IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+    IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to format the partition."
+
+    IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n %s\n"
+
+    IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)."
 END

base/setup/reactos/lang/eu-ES.rc

@@ -62,27 +62,43 @@ CAPTION "Instalación de ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
-    PUSHBUTTON "&Crear", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Borrar", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "&Crear", IDC_PARTCREATE, 7, 122, 50, 14
-    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Opciones avanzadas...", IDC_PARTMOREOPTS, 230, 122, 80, 15
+    PUSHBUTTON "&Borrar", IDC_PARTDELETE, 63, 122, 50, 14
-    // LTEXT "Presione Siguiente para verificar el resumen.", IDC_STATIC, 10, 180, 277, 20
+    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "&Opciones avanzadas...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+    // LTEXT "Presione Siguiente para verificar el resumen.", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Crear Partición"
+CAPTION "Crear y formatear una partición"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
+    LTEXT "&Tamaño:", IDC_STATIC, 7, 9, 70, 9
-    CONTROL "Crear y formatear una partición", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
+    EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
-    LTEXT "Tamaño:", IDC_STATIC, 13, 24, 27, 9
+    CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-    EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
-    LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
+    LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
-    LTEXT "Sistema de archivos:", IDC_STATIC, 13, 46, 42, 9
+    AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50
+    LTEXT "&Sistema de archivos:", IDC_FS_STATIC, 7, 46, 70, 9
-    PUSHBUTTON "&Aceptar", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON "&Cancelar", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "Aceptar", IDOK, 88, 98, 50, 14
+    PUSHBUTTON "Cancelar", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Formatear una partición"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Sistema de archivos:", IDC_FS_STATIC, 7, 9, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+    PUSHBUTTON "Aceptar", IDOK, 88, 61, 50, 14
+    PUSHBUTTON "Cancelar", IDCANCEL, 143, 61, 50, 14
 END
 
 IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -91,12 +107,12 @@ CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
     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
+    EDITTEXT IDC_PATH, 7, 23, 291, 13
     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
+    DEFPUSHBUTTON "Aceptar", IDOK, 193, 113, 50, 14
-    PUSHBUTTON "Cancelar", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Cancelar", IDCANCEL, 248, 113, 50, 14
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -167,6 +183,7 @@ BEGIN
     IDS_ABORTSETUP2 "¿Abortar instalación?"
     IDS_NO_TXTSETUP_SIF "No se pudo encontrar 'txtsetup.sif'.\nLa instalación no puede continuar."
     IDS_CAPTION "Instalación de ReactOS"
+    IDS_VOLUME_NOFORMAT "Not formatted"
 END
 
 STRINGTABLE
@@ -193,6 +210,26 @@ BEGIN
     IDS_BOOTLOADER_VBRONLY "Solo VBR"
 END
 
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+    IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+    IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+    IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+    IDS_COPYING  "Copying %s"
+    IDS_MOVING   "Moving %s to %s"
+    IDS_RENAMING "Renaming %s to %s"
+    IDS_DELETING "Deleting %s"
+
+    IDS_PREPARE_PARTITIONS "Preparing partitions..."
+    IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..."
+    IDS_COPYING_FILES "Copying the files..."
+END
+
 /* Error Strings */
 
 STRINGTABLE
@@ -202,8 +239,35 @@ BEGIN
 alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\
 Spaces are not allowed."
 
-// ERROR_DIRECTORY_NAME
     IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path"
     IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \
 and only contain letters, digits, dashes and periods. Spaces are not allowed."
+
+    IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+    IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+    IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+    IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected partition?"
+    IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the selected extended partition and ALL the logical partitions it contains?"
+
+    IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+    IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+    IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to format the partition."
+
+    IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n %s\n"
+
+    IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)."
 END

base/setup/reactos/lang/fi-FI.rc

@@ -55,27 +55,43 @@ CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
-    PUSHBUTTON "&Create", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Delete", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "&Create", IDC_PARTCREATE, 7, 122, 50, 14
-    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 230, 122, 80, 15
+    PUSHBUTTON "&Delete", IDC_PARTDELETE, 63, 122, 50, 14
-    // LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20
+    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+    // LTEXT "Click Next to check the summary.", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Create Partition"
+CAPTION "Create and Format Partition"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
+    LTEXT "&Size:", IDC_STATIC, 7, 9, 70, 9
-    CONTROL "Create and format partition", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
+    EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
-    LTEXT "Size:", IDC_STATIC, 13, 24, 27, 9
+    CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-    EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
-    LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
+    LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
-    LTEXT "File System:", IDC_STATIC, 13, 46, 42, 9
+    AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50
+    LTEXT "&File System:", IDC_FS_STATIC, 7, 46, 70, 9
-    PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON "&Cancel", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Format Partition"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&File System:", IDC_FS_STATIC, 7, 9, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 143, 61, 50, 14
 END
 
 IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -84,12 +100,12 @@ CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
     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
+    EDITTEXT IDC_PATH, 7, 23, 291, 13
     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
+    DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Cancel", IDCANCEL, 248, 113, 50, 14
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -160,6 +176,7 @@ BEGIN
     IDS_ABORTSETUP2 "Abort installation?"
     IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue."
     IDS_CAPTION "ReactOS Setup"
+    IDS_VOLUME_NOFORMAT "Not formatted"
 END
 
 STRINGTABLE
@@ -186,6 +203,26 @@ BEGIN
     IDS_BOOTLOADER_VBRONLY "VBR only"
 END
 
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+    IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+    IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+    IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+    IDS_COPYING  "Copying %s"
+    IDS_MOVING   "Moving %s to %s"
+    IDS_RENAMING "Renaming %s to %s"
+    IDS_DELETING "Deleting %s"
+
+    IDS_PREPARE_PARTITIONS "Preparing partitions..."
+    IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..."
+    IDS_COPYING_FILES "Copying the files..."
+END
+
 /* Error Strings */
 
 STRINGTABLE
@@ -195,8 +232,35 @@ BEGIN
 alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\
 Spaces are not allowed."
 
-// ERROR_DIRECTORY_NAME
     IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path"
     IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \
 and only contain letters, digits, dashes and periods. Spaces are not allowed."
+
+    IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+    IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+    IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+    IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected partition?"
+    IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the selected extended partition and ALL the logical partitions it contains?"
+
+    IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+    IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+    IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to format the partition."
+
+    IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n %s\n"
+
+    IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)."
 END

base/setup/reactos/lang/fr-FR.rc

@@ -55,27 +55,43 @@ CAPTION "Installation de ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
-    PUSHBUTTON "&Créer", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Initialiser", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Supprimer", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "&Créer", IDC_PARTCREATE, 7, 122, 50, 14
-    PUSHBUTTON "&Pilote", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Formatter", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Options avancées...", IDC_PARTMOREOPTS, 230, 122, 80, 15
+    PUSHBUTTON "&Supprimer", IDC_PARTDELETE, 63, 122, 50, 14
-    // LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20
+    PUSHBUTTON "&Pilote", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "&Options avancées...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+    // LTEXT "Click Next to check the summary.", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Créer une partition"
+CAPTION "Créer et formatter une partition"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
+    LTEXT "&Taille :", IDC_STATIC, 7, 9, 70, 9
-    CONTROL "Créer et formatter une partition", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
+    EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
-    LTEXT "Taille :", IDC_STATIC, 13, 24, 27, 9
+    CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-    EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
-    LTEXT "Go", IDC_UNIT, 117, 24, 14, 9
+    LTEXT "Mo", IDC_UNIT, 134, 9, 14, 9
-    LTEXT "Système de fichier :", IDC_STATIC, 13, 46, 42, 9
+    AUTOCHECKBOX "Partition étendu&e", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50
+    LTEXT "&Système de fichier :", IDC_FS_STATIC, 7, 46, 70, 9
-    PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON "&Annuler", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "Formatage &rapide", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+    PUSHBUTTON "Annuler", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Formatter une partition"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Système de fichier :", IDC_FS_STATIC, 7, 9, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+    AUTOCHECKBOX "Formatage &rapide", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+    PUSHBUTTON "Annuler", IDCANCEL, 143, 61, 50, 14
 END
 
 IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -84,12 +100,12 @@ CAPTION "Paramètres d'installation avancés"
 FONT 8, "MS Shell Dlg"
 BEGIN
     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
+    EDITTEXT IDC_PATH, 7, 23, 291, 13
     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
+    DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
-    PUSHBUTTON "Annuler", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Annuler", IDCANCEL, 248, 113, 50, 14
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -160,6 +176,7 @@ BEGIN
     IDS_ABORTSETUP2 "Abandonner l'installation ?"
     IDS_NO_TXTSETUP_SIF "Impossible de trouver 'txtsetup.sif'.\nL'installation ne peut continuer."
     IDS_CAPTION "Installation de ReactOS"
+    IDS_VOLUME_NOFORMAT "Non formaté"
 END
 
 STRINGTABLE
@@ -186,6 +203,26 @@ BEGIN
     IDS_BOOTLOADER_VBRONLY "VBR seulement"
 END
 
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_FORMATTING_PROGRESS1 "Formate le volume %c: (%s) sur %s..."
+    IDS_FORMATTING_PROGRESS2 "Formate le volume %s sur %s..."
+
+    IDS_CHECKING_PROGRESS1 "Vérifie le volume %c: (%s)..."
+    IDS_CHECKING_PROGRESS2 "Vérifie le volume %s..."
+
+    IDS_COPYING  "Copie %s"
+    IDS_MOVING   "Déplace %s vers %s"
+    IDS_RENAMING "Renomme %s en %s"
+    IDS_DELETING "Supprime %s"
+
+    IDS_PREPARE_PARTITIONS "Prépare les partitions..."
+    IDS_PREPARE_FILES "Prépare la liste de fichiers à copier, veuillez patienter..."
+    IDS_COPYING_FILES "Copie les fichiers..."
+END
+
 /* Error Strings */
 
 STRINGTABLE
@@ -195,8 +232,35 @@ BEGIN
 alphanumériques (a-z, A-Z, 0-9), et\n . \\ - _\n\
 Les caractères d'espacement ne sont pas autorisés."
 
-// ERROR_DIRECTORY_NAME
     IDS_ERROR_DIRECTORY_NAME_TITLE "Chemin d'installation invalide"
     IDS_ERROR_DIRECTORY_NAME "Le chemin d'installation de ReactOS doit être au format DOS de noms 8.3, \
 et contenir seulement des lettres, chiffres, tirets et points. Les caractères d'espacement ne sont pas autorisés."
+
+    IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+    IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+    IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+    IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected partition?"
+    IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the selected extended partition and ALL the logical partitions it contains?"
+
+    IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+    IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+    IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to format the partition."
+
+    IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n %s\n"
+
+    IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)."
 END

base/setup/reactos/lang/he-IL.rc

@@ -57,27 +57,43 @@ CAPTION "התקנת ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
-    PUSHBUTTON "צור", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "Initialize(&I)", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "מחק", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "צור", IDC_PARTCREATE, 7, 122, 50, 14
-    PUSHBUTTON "טעינת מנהל התקן", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "Format(&F)", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "אפשרויות מתקדמות...", IDC_PARTMOREOPTS, 230, 122, 80, 15
+    PUSHBUTTON "מחק", IDC_PARTDELETE, 63, 122, 50, 14
-    // LTEXT "לחץ על 'הבא' כדי לראות סיכום.", IDC_STATIC, 10, 180, 277, 20
+    PUSHBUTTON "טעינת מנהל התקן", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "אפשרויות מתקדמות...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+    // LTEXT "לחץ על 'הבא' כדי לראות סיכום.", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "יצירת מחיצה"
+CAPTION "יצירה ואתחול מחיצה"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
+    LTEXT "גודל(&S):", IDC_STATIC, 7, 9, 70, 9
-    CONTROL "יצירה ואתחול מחיצה", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
+    EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
-    LTEXT "גודל:", IDC_STATIC, 13, 24, 27, 9
+    CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-    EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
-    LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
+    LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
-    LTEXT "מערכת קבצים:", IDC_STATIC, 13, 46, 42, 9
+    AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50
+    LTEXT "מערכת קבצים(&F):", IDC_FS_STATIC, 7, 46, 70, 9
-    PUSHBUTTON "אישור", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON "ביטול", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "אישור", IDOK, 88, 98, 50, 14
+    PUSHBUTTON "ביטול", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Format Partition"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "מערכת קבצים(&F):", IDC_FS_STATIC, 7, 9, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+    PUSHBUTTON "אישור", IDOK, 88, 61, 50, 14
+    PUSHBUTTON "ביטול", IDCANCEL, 143, 61, 50, 14
 END
 
 IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -86,12 +102,12 @@ CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
     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
+    EDITTEXT IDC_PATH, 7, 23, 291, 13
     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
+    DEFPUSHBUTTON "אישור", IDOK, 193, 113, 50, 14
-    PUSHBUTTON "ביטול", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "ביטול", IDCANCEL, 248, 113, 50, 14
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -162,6 +178,7 @@ BEGIN
     IDS_ABORTSETUP2 "לבטל את ההתקנה?"
     IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue."
     IDS_CAPTION "התקנת ReactOS"
+    IDS_VOLUME_NOFORMAT "Not formatted"
 END
 
 STRINGTABLE
@@ -188,6 +205,26 @@ BEGIN
     IDS_BOOTLOADER_VBRONLY "VBR only"
 END
 
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+    IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+    IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+    IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+    IDS_COPYING  "Copying %s"
+    IDS_MOVING   "Moving %s to %s"
+    IDS_RENAMING "Renaming %s to %s"
+    IDS_DELETING "Deleting %s"
+
+    IDS_PREPARE_PARTITIONS "Preparing partitions..."
+    IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..."
+    IDS_COPYING_FILES "Copying the files..."
+END
+
 /* Error Strings */
 
 STRINGTABLE
@@ -197,8 +234,35 @@ BEGIN
 alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\
 Spaces are not allowed."
 
-// ERROR_DIRECTORY_NAME
     IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path"
     IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \
 and only contain letters, digits, dashes and periods. Spaces are not allowed."
+
+    IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+    IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+    IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+    IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected partition?"
+    IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the selected extended partition and ALL the logical partitions it contains?"
+
+    IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+    IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+    IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to format the partition."
+
+    IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n %s\n"
+
+    IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)."
 END

base/setup/reactos/lang/hi-IN.rc

@@ -51,27 +51,43 @@ CAPTION "रिऐक्ट ओएस सेटअप"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
     PUSHBUTTON "&बनाएं", IDC_PARTCREATE, 7, 122, 50, 14
+    PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
     PUSHBUTTON "&डिलीट", IDC_PARTDELETE, 63, 122, 50, 14
     PUSHBUTTON "&ड्राइवर", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
     PUSHBUTTON "&उन्नत विकल्प...", IDC_PARTMOREOPTS, 230, 122, 80, 14
-/*    LTEXT "Click Next to check the summary.", IDC_STATIC, 7, 128, 277, 8 */
+    // LTEXT "Click Next to check the summary.", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "विभाजन बनाएं"
+CAPTION "विभाजन बनाएं और फ़ॉर्मेट करें"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
+    LTEXT "साइज़(&S):", IDC_STATIC, 7, 9, 70, 9
-    CONTROL "विभाजन बनाएं और फ़ॉर्मेट करें", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
+    EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
-    LTEXT "साइज़:", IDC_STATIC, 13, 24, 27, 9
+    CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-    EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
-    LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
+    LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
-    LTEXT "फाइल सिस्टम:", IDC_STATIC, 13, 46, 42, 9
+    AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50
+    LTEXT "फाइल सिस्टम(&F):", IDC_FS_STATIC, 7, 46, 70, 9
-    PUSHBUTTON "&ओके", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON "&रद्द करे", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "ओके", IDOK, 88, 98, 50, 14
+    PUSHBUTTON "रद्द करे", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Format Partition"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "फाइल सिस्टम(&F):", IDC_FS_STATIC, 7, 9, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+    PUSHBUTTON "ओके", IDOK, 88, 61, 50, 14
+    PUSHBUTTON "रद्द करे", IDCANCEL, 143, 61, 50, 14
 END
 
 IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -80,12 +96,12 @@ CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
     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
+    EDITTEXT IDC_PATH, 7, 23, 291, 13
     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
+    DEFPUSHBUTTON "ओके", IDOK, 193, 113, 50, 14
-    PUSHBUTTON "रद्द करे", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "रद्द करे", IDCANCEL, 248, 113, 50, 14
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -138,6 +154,7 @@ BEGIN
     IDS_ABORTSETUP2 "इन्स्टलेशन रद्द करें?"
     IDS_NO_TXTSETUP_SIF "'txtsetup.sif' खोजने में असमर्थ\nसेटअप जारी रखने में असमर्थ है "
     IDS_CAPTION "रिऐक्ट ओएस सेटअप"
+    IDS_VOLUME_NOFORMAT "Not formatted"
 END
 
 STRINGTABLE
@@ -156,6 +173,26 @@ BEGIN
     IDS_BOOTLOADER_VBRONLY "केवल VBR"
 END
 
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+    IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+    IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+    IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+    IDS_COPYING  "Copying %s"
+    IDS_MOVING   "Moving %s to %s"
+    IDS_RENAMING "Renaming %s to %s"
+    IDS_DELETING "Deleting %s"
+
+    IDS_PREPARE_PARTITIONS "Preparing partitions..."
+    IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..."
+    IDS_COPYING_FILES "Copying the files..."
+END
+
 /* Error Strings */
 
 STRINGTABLE
@@ -165,8 +202,35 @@ BEGIN
 alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\
 Spaces are not allowed."
 
-// ERROR_DIRECTORY_NAME
     IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path"
     IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \
 and only contain letters, digits, dashes and periods. Spaces are not allowed."
+
+    IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+    IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+    IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+    IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected partition?"
+    IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the selected extended partition and ALL the logical partitions it contains?"
+
+    IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+    IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+    IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to format the partition."
+
+    IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n %s\n"
+
+    IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)."
 END

base/setup/reactos/lang/hu-HU.rc

@@ -57,27 +57,43 @@ CAPTION "ReactOS telepítõ"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
-    PUSHBUTTON "&Create", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Delete", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "&Create", IDC_PARTCREATE, 7, 122, 50, 14
-    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 230, 122, 80, 15
+    PUSHBUTTON "&Delete", IDC_PARTDELETE, 63, 122, 50, 14
-    // LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20
+    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+    // LTEXT "Click Next to check the summary.", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Create Partition"
+CAPTION "Create and Format Partition"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
+    LTEXT "&Size:", IDC_STATIC, 7, 9, 70, 9
-    CONTROL "Create and format partition", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
+    EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
-    LTEXT "Size:", IDC_STATIC, 13, 24, 27, 9
+    CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-    EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
-    LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
+    LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
-    LTEXT "File System:", IDC_STATIC, 13, 46, 42, 9
+    AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50
+    LTEXT "&File System:", IDC_FS_STATIC, 7, 46, 70, 9
-    PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON "&Cancel", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Format Partition"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&File System:", IDC_FS_STATIC, 7, 9, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 143, 61, 50, 14
 END
 
 IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -86,12 +102,12 @@ CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
     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
+    EDITTEXT IDC_PATH, 7, 23, 291, 13
     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
+    DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Cancel", IDCANCEL, 248, 113, 50, 14
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -162,6 +178,7 @@ BEGIN
     IDS_ABORTSETUP2 "Abort installation?"
     IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue."
     IDS_CAPTION "ReactOS Setup"
+    IDS_VOLUME_NOFORMAT "Not formatted"
 END
 
 STRINGTABLE
@@ -188,6 +205,26 @@ BEGIN
     IDS_BOOTLOADER_VBRONLY "VBR only"
 END
 
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+    IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+    IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+    IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+    IDS_COPYING  "Copying %s"
+    IDS_MOVING   "Moving %s to %s"
+    IDS_RENAMING "Renaming %s to %s"
+    IDS_DELETING "Deleting %s"
+
+    IDS_PREPARE_PARTITIONS "Preparing partitions..."
+    IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..."
+    IDS_COPYING_FILES "Copying the files..."
+END
+
 /* Error Strings */
 
 STRINGTABLE
@@ -197,8 +234,35 @@ BEGIN
 alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\
 Spaces are not allowed."
 
-// ERROR_DIRECTORY_NAME
     IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path"
     IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \
 and only contain letters, digits, dashes and periods. Spaces are not allowed."
+
+    IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+    IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+    IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+    IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected partition?"
+    IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the selected extended partition and ALL the logical partitions it contains?"
+
+    IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+    IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+    IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to format the partition."
+
+    IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n %s\n"
+
+    IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)."
 END

base/setup/reactos/lang/id-ID.rc

@@ -55,27 +55,43 @@ CAPTION "Penyetelan ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
     PUSHBUTTON "&Buat", IDC_PARTCREATE, 7, 122, 50, 14
+    PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
     PUSHBUTTON "&Hapus", IDC_PARTDELETE, 63, 122, 50, 14
     PUSHBUTTON "&Perangkat", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
     PUSHBUTTON "Pilihan &Tingkat Lanjut...", IDC_PARTMOREOPTS, 230, 122, 80, 14
     // LTEXT "Click Next to check the summary.", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Buat Partisi"
+CAPTION "Buat dan format partisi"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
+    LTEXT "&Ukuran:", IDC_STATIC, 7, 9, 70, 9
-    CONTROL "Buat dan format partisi", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
+    EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
-    LTEXT "Ukuran:", IDC_STATIC, 13, 24, 27, 9
+    CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-    EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
-    LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
+    LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
-    LTEXT "Sistem Berkas:", IDC_STATIC, 13, 46, 42, 9
+    AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50
+    LTEXT "&Sistem Berkas:", IDC_FS_STATIC, 7, 46, 70, 9
-    PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON "&Batal", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+    PUSHBUTTON "Batal", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Format partisi"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Sistem Berkas:", IDC_FS_STATIC, 7, 9, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+    PUSHBUTTON "Batal", IDCANCEL, 143, 61, 50, 14
 END
 
 IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -84,12 +100,12 @@ CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
     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
+    EDITTEXT IDC_PATH, 7, 23, 291, 13
     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
+    DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
-    PUSHBUTTON "Batal", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Batal", IDCANCEL, 248, 113, 50, 14
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -160,6 +176,7 @@ BEGIN
     IDS_ABORTSETUP2 "Gugurkan pemasangan?"
     IDS_NO_TXTSETUP_SIF "Tidak bisa menemukan 'txtsetup.sif'.\nPenyetelan tidak bisa dilanjutkan."
     IDS_CAPTION "Penyetelan ReactOS"
+    IDS_VOLUME_NOFORMAT "Not formatted"
 END
 
 STRINGTABLE
@@ -186,6 +203,26 @@ BEGIN
     IDS_BOOTLOADER_VBRONLY "Hanya VBR"
 END
 
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+    IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+    IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+    IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+    IDS_COPYING  "Copying %s"
+    IDS_MOVING   "Moving %s to %s"
+    IDS_RENAMING "Renaming %s to %s"
+    IDS_DELETING "Deleting %s"
+
+    IDS_PREPARE_PARTITIONS "Preparing partitions..."
+    IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..."
+    IDS_COPYING_FILES "Copying the files..."
+END
+
 /* Error Strings */
 
 STRINGTABLE
@@ -195,8 +232,35 @@ BEGIN
 alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\
 Spaces are not allowed."
 
-// ERROR_DIRECTORY_NAME
     IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path"
     IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \
 and only contain letters, digits, dashes and periods. Spaces are not allowed."
+
+    IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+    IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+    IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+    IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected partition?"
+    IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the selected extended partition and ALL the logical partitions it contains?"
+
+    IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+    IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+    IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to format the partition."
+
+    IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n %s\n"
+
+    IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)."
 END

base/setup/reactos/lang/it-IT.rc

@@ -55,27 +55,43 @@ CAPTION "Installazione di ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
-    PUSHBUTTON "&Crea", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Rimuovi", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "&Crea", IDC_PARTCREATE, 7, 122, 50, 14
-    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Opzioni avanzate...", IDC_PARTMOREOPTS, 230, 122, 80, 15
+    PUSHBUTTON "&Rimuovi", IDC_PARTDELETE, 63, 122, 50, 14
-    // LTEXT "Cliccare Avanti per iniziare l'installazione.", IDC_STATIC, 10, 180, 277, 20
+    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "&Opzioni avanzate...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+    // LTEXT "Cliccare Avanti per iniziare l'installazione.", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Creazione Partizioni"
+CAPTION "Crea e formatta la partizione"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
+    LTEXT "&Dimensione:", IDC_STATIC, 7, 9, 70, 9
-    CONTROL "Crea e formatta la partizione", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
+    EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
-    LTEXT "Dimensione:", IDC_STATIC, 13, 24, 27, 9
+    CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-    EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
-    LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
+    LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
-    LTEXT "Filesystem:", IDC_STATIC, 13, 46, 42, 9
+    AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50
+    LTEXT "&Filesystem:", IDC_FS_STATIC, 7, 46, 70, 9
-    PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON "&Annulla", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+    PUSHBUTTON "Annulla", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Formatta la partizione"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Filesystem:", IDC_FS_STATIC, 7, 9, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+    PUSHBUTTON "Annulla", IDCANCEL, 143, 61, 50, 14
 END
 
 IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -84,12 +100,12 @@ CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
     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
+    EDITTEXT IDC_PATH, 7, 23, 291, 13
     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
+    DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
-    PUSHBUTTON "Annulla", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Annulla", IDCANCEL, 248, 113, 50, 14
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -160,6 +176,7 @@ BEGIN
     IDS_ABORTSETUP2 "Volete interrompere l'installazione?"
     IDS_NO_TXTSETUP_SIF "Impossibile trovare 'txtsetup.sif'.\nL'installazione non può continuare."
     IDS_CAPTION "Installazione di ReactOS"
+    IDS_VOLUME_NOFORMAT "Not formatted"
 END
 
 STRINGTABLE
@@ -186,6 +203,26 @@ BEGIN
     IDS_BOOTLOADER_VBRONLY "Solo VBR"
 END
 
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+    IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+    IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+    IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+    IDS_COPYING  "Copying %s"
+    IDS_MOVING   "Moving %s to %s"
+    IDS_RENAMING "Renaming %s to %s"
+    IDS_DELETING "Deleting %s"
+
+    IDS_PREPARE_PARTITIONS "Preparing partitions..."
+    IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..."
+    IDS_COPYING_FILES "Copying the files..."
+END
+
 /* Error Strings */
 
 STRINGTABLE
@@ -195,8 +232,35 @@ BEGIN
 alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\
 Spaces are not allowed."
 
-// ERROR_DIRECTORY_NAME
     IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path"
     IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \
 and only contain letters, digits, dashes and periods. Spaces are not allowed."
+
+    IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+    IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+    IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+    IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected partition?"
+    IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the selected extended partition and ALL the logical partitions it contains?"
+
+    IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+    IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+    IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to format the partition."
+
+    IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n %s\n"
+
+    IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)."
 END

base/setup/reactos/lang/ja-JP.rc

@@ -55,27 +55,43 @@ CAPTION "ReactOS セットアップ"
 FONT 9, "MS UI Gothic"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    PUSHBUTTON "Initialize(&I)", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
     PUSHBUTTON "作成(&C)", IDC_PARTCREATE, 7, 122, 50, 14
+    PUSHBUTTON "Format(&F)", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
     PUSHBUTTON "削除(&D)", IDC_PARTDELETE, 63, 122, 50, 14
     PUSHBUTTON "ドライバ(&R)", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
     PUSHBUTTON "上級者向け(&A)...", IDC_PARTMOREOPTS, 230, 122, 80, 14
     // LTEXT "次へをクリックすれば、要約をチェックできます。", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 175, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "パーティションの作成"
+CAPTION "パーティションを作成し、フォーマットします"
 FONT 9, "MS UI Gothic"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 129, 22, 9, 13
+    LTEXT "サイズ(&S):", IDC_STATIC, 7, 9, 70, 9
-    CONTROL "パーティションを作成し、フォーマットします", IDC_STATIC, "Button", BS_GROUPBOX, 6, 5, 161, 57
+    EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
-    LTEXT "サイズ:", IDC_STATIC, 13, 24, 27, 9
+    CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-    EDITTEXT IDC_PARTSIZE, 83, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
-    LTEXT "GB", IDC_UNIT, 142, 24, 14, 9
+    LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
-    LTEXT "ファイルシステム:", IDC_STATIC, 13, 46, 63, 9
+    AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 83, 42, 73, 50
+    LTEXT "ファイルシステム(&F):", IDC_FS_STATIC, 7, 46, 70, 9
-    PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON "キャンセル(&C)", IDCANCEL, 89, 68, 55, 15, WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+    PUSHBUTTON "キャンセル", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Format Partition"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "ファイルシステム(&F):", IDC_FS_STATIC, 7, 9, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+    PUSHBUTTON "キャンセル", IDCANCEL, 143, 61, 50, 14
 END
 
 IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -84,12 +100,12 @@ CAPTION "Advanced Installation Options"
 FONT 9, "MS UI Gothic"
 BEGIN
     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
+    EDITTEXT IDC_PATH, 7, 23, 291, 13
     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
+    DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
-    PUSHBUTTON "キャンセル", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "キャンセル", IDCANCEL, 248, 113, 50, 14
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -160,6 +176,7 @@ BEGIN
     IDS_ABORTSETUP2 "インストールを中断しますか?"
     IDS_NO_TXTSETUP_SIF "'txtsetup.sif'が見つかりません。\nセットアップは続行できません。"
     IDS_CAPTION "ReactOS セットアップ"
+    IDS_VOLUME_NOFORMAT "Not formatted"
 END
 
 STRINGTABLE
@@ -186,6 +203,26 @@ BEGIN
     IDS_BOOTLOADER_VBRONLY "VBRのみ"
 END
 
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+    IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+    IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+    IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+    IDS_COPYING  "Copying %s"
+    IDS_MOVING   "Moving %s to %s"
+    IDS_RENAMING "Renaming %s to %s"
+    IDS_DELETING "Deleting %s"
+
+    IDS_PREPARE_PARTITIONS "Preparing partitions..."
+    IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..."
+    IDS_COPYING_FILES "Copying the files..."
+END
+
 /* Error Strings */
 
 STRINGTABLE
@@ -195,8 +232,35 @@ BEGIN
 alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\
 Spaces are not allowed."
 
-// ERROR_DIRECTORY_NAME
     IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path"
     IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \
 and only contain letters, digits, dashes and periods. Spaces are not allowed."
+
+    IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+    IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+    IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+    IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected partition?"
+    IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the selected extended partition and ALL the logical partitions it contains?"
+
+    IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+    IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+    IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to format the partition."
+
+    IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n %s\n"
+
+    IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)."
 END

base/setup/reactos/lang/ms-MY.rc

@@ -57,27 +57,43 @@ CAPTION "ReactOS Persediaan"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
-    PUSHBUTTON "Men&cipta", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "Hapus(&D)", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "Men&cipta", IDC_PARTCREATE, 7, 122, 50, 14
-    PUSHBUTTON "Pemacu(&R)", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "Opsyen l&anjutan...", IDC_PARTMOREOPTS, 230, 122, 80, 15
+    PUSHBUTTON "Hapus(&D)", IDC_PARTDELETE, 63, 122, 50, 14
-    // LTEXT "Klik Seterusnya untuk menyemak ringkasan.", IDC_STATIC, 10, 180, 277, 20
+    PUSHBUTTON "Pemacu(&R)", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "Opsyen l&anjutan...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+    // LTEXT "Klik Seterusnya untuk menyemak ringkasan.", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Membuat Partition"
+CAPTION "Cipta dan format partition"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
+    LTEXT "&Saiz:", IDC_STATIC, 7, 9, 70, 9
-    CONTROL "Cipta dan format partition", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
+    EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
-    LTEXT "Saiz:", IDC_STATIC, 13, 24, 27, 9
+    CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-    EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
-    LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
+    LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
-    LTEXT "Sistem fail:", IDC_STATIC, 13, 46, 42, 9
+    AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50
+    LTEXT "Sistem &fail:", IDC_FS_STATIC, 7, 46, 70, 9
-    PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON "Batal(&C)", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+    PUSHBUTTON "Batal", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Format partition"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Sistem &fail:", IDC_FS_STATIC, 7, 9, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+    PUSHBUTTON "Batal", IDCANCEL, 143, 61, 50, 14
 END
 
 IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -86,12 +102,12 @@ CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
     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
+    EDITTEXT IDC_PATH, 7, 23, 291, 13
     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
+    DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
-    PUSHBUTTON "Batal", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Batal", IDCANCEL, 248, 113, 50, 14
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -162,6 +178,7 @@ BEGIN
     IDS_ABORTSETUP2 "Henti paksa pemasangan?"
     IDS_NO_TXTSETUP_SIF "Persediaan tidak dapat mencari 'txtsetup.sif'.\nPersediaan tidak dapat meneruskan."
     IDS_CAPTION "ReactOS Persediaan"
+    IDS_VOLUME_NOFORMAT "Not formatted"
 END
 
 STRINGTABLE
@@ -188,6 +205,26 @@ BEGIN
     IDS_BOOTLOADER_VBRONLY "VBR sahaja"
 END
 
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+    IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+    IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+    IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+    IDS_COPYING  "Copying %s"
+    IDS_MOVING   "Moving %s to %s"
+    IDS_RENAMING "Renaming %s to %s"
+    IDS_DELETING "Deleting %s"
+
+    IDS_PREPARE_PARTITIONS "Preparing partitions..."
+    IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..."
+    IDS_COPYING_FILES "Copying the files..."
+END
+
 /* Error Strings */
 
 STRINGTABLE
@@ -197,8 +234,35 @@ BEGIN
 alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\
 Spaces are not allowed."
 
-// ERROR_DIRECTORY_NAME
     IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path"
     IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \
 and only contain letters, digits, dashes and periods. Spaces are not allowed."
+
+    IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+    IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+    IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+    IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected partition?"
+    IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the selected extended partition and ALL the logical partitions it contains?"
+
+    IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+    IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+    IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to format the partition."
+
+    IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n %s\n"
+
+    IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)."
 END

base/setup/reactos/lang/no-NO.rc

@@ -55,27 +55,43 @@ CAPTION "ReactOS installering"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
-    PUSHBUTTON "&Opprett", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Slett", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "&Opprett", IDC_PARTCREATE, 7, 122, 50, 14
-    PUSHBUTTON "S&tasjon", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Avansert valg...", IDC_PARTMOREOPTS, 230, 122, 80, 15
+    PUSHBUTTON "&Slett", IDC_PARTDELETE, 63, 122, 50, 14
-    // LTEXT "Trykk på Neste for å starte installasjon prosessen.", IDC_STATIC, 10, 180, 277, 20
+    PUSHBUTTON "S&tasjon", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "&Avansert valg...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+    // LTEXT "Trykk på Neste for å starte installasjon prosessen.", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Opprett partisjon"
+CAPTION "Opprett og formater partisjon"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
+    LTEXT "&Størrelse:", IDC_STATIC, 7, 9, 70, 9
-    CONTROL "Opprett og formater partisjon", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
+    EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
-    LTEXT "Størrelse:", IDC_STATIC, 13, 24, 27, 9
+    CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-    EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
-    LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
+    LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
-    LTEXT "Filsystem:", IDC_STATIC, 13, 46, 42, 9
+    AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50
+    LTEXT "&Filsystem:", IDC_FS_STATIC, 7, 46, 70, 9
-    PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON "&Avbryt", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+    PUSHBUTTON "Avbryt", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Formater partisjon"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Filsystem:", IDC_FS_STATIC, 7, 9, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+    PUSHBUTTON "Avbryt", IDCANCEL, 143, 61, 50, 14
 END
 
 IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -84,12 +100,12 @@ CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
     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
+    EDITTEXT IDC_PATH, 7, 23, 291, 13
     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
+    DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
-    PUSHBUTTON "Avbryt", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Avbryt", IDCANCEL, 248, 113, 50, 14
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -160,6 +176,7 @@ BEGIN
     IDS_ABORTSETUP2 "Avbryt installasjonen?"
     IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue."
     IDS_CAPTION "ReactOS installering"
+    IDS_VOLUME_NOFORMAT "Not formatted"
 END
 
 STRINGTABLE
@@ -186,6 +203,26 @@ BEGIN
     IDS_BOOTLOADER_VBRONLY "Bare VBR"
 END
 
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+    IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+    IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+    IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+    IDS_COPYING  "Copying %s"
+    IDS_MOVING   "Moving %s to %s"
+    IDS_RENAMING "Renaming %s to %s"
+    IDS_DELETING "Deleting %s"
+
+    IDS_PREPARE_PARTITIONS "Preparing partitions..."
+    IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..."
+    IDS_COPYING_FILES "Copying the files..."
+END
+
 /* Error Strings */
 
 STRINGTABLE
@@ -195,8 +232,35 @@ BEGIN
 alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\
 Spaces are not allowed."
 
-// ERROR_DIRECTORY_NAME
     IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path"
     IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \
 and only contain letters, digits, dashes and periods. Spaces are not allowed."
+
+    IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+    IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+    IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+    IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected partition?"
+    IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the selected extended partition and ALL the logical partitions it contains?"
+
+    IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+    IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+    IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to format the partition."
+
+    IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n %s\n"
+
+    IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)."
 END

base/setup/reactos/lang/pl-PL.rc

@@ -66,27 +66,43 @@ CAPTION "Instalator systemu ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
-    PUSHBUTTON "&Utwórz", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "U&suń", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "&Utwórz", IDC_PARTCREATE, 7, 122, 50, 14
-    PUSHBUTTON "S&terownik", IDC_DEVICEDRIVER, 169, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Opcje zaawansowane...", IDC_PARTMOREOPTS, 225, 122, 86, 15
+    PUSHBUTTON "U&suń", IDC_PARTDELETE, 63, 122, 50, 14
-    // LTEXT "Kliknij Dalej, aby rozpocząć proces instalacji.", IDC_STATIC, 10, 180, 277, 20
+    PUSHBUTTON "S&terownik", IDC_DEVICEDRIVER, 169, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "&Opcje zaawansowane...", IDC_PARTMOREOPTS, 225, 122, 86, 14
+    // LTEXT "Kliknij Dalej, aby rozpocząć proces instalacji.", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Utwórz partycję"
+CAPTION "Utwórz i sformatuj partycję"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
+    LTEXT "&Rozmiar:",IDC_STATIC, 7, 9, 70, 9
-    CONTROL "Utwórz i sformatuj partycję", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
+    EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
-    LTEXT "Rozmiar:",IDC_STATIC, 13, 24, 27, 9
+    CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-    EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
-    LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
+    LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
-    LTEXT "System plików:", IDC_STATIC, 13, 46, 42, 9
+    AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50
+    LTEXT "&System plików:", IDC_FS_STATIC, 7, 46, 70, 9
-    PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON "&Anuluj", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+    PUSHBUTTON "Anuluj", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Sformatuj partycję"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&System plików:", IDC_FS_STATIC, 7, 9, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+    PUSHBUTTON "Anuluj", IDCANCEL, 143, 61, 50, 14
 END
 
 IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -95,12 +111,12 @@ CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
     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
+    EDITTEXT IDC_PATH, 7, 23, 291, 13
     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
+    DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
-    PUSHBUTTON "Anuluj", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Anuluj", IDCANCEL, 248, 113, 50, 14
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -171,6 +187,7 @@ BEGIN
     IDS_ABORTSETUP2 "Czy na pewno chcesz przerwać instalację?"
     IDS_NO_TXTSETUP_SIF "Nie można znaleźć pliku 'txtsetup.sif'.\nInstalator nie może kontynuować."
     IDS_CAPTION "Instalator systemu ReactOS"
+    IDS_VOLUME_NOFORMAT "Not formatted"
 END
 
 STRINGTABLE
@@ -197,6 +214,26 @@ BEGIN
     IDS_BOOTLOADER_VBRONLY "Tylko VBR"
 END
 
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+    IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+    IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+    IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+    IDS_COPYING  "Copying %s"
+    IDS_MOVING   "Moving %s to %s"
+    IDS_RENAMING "Renaming %s to %s"
+    IDS_DELETING "Deleting %s"
+
+    IDS_PREPARE_PARTITIONS "Preparing partitions..."
+    IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..."
+    IDS_COPYING_FILES "Copying the files..."
+END
+
 /* Error Strings */
 
 STRINGTABLE
@@ -206,8 +243,35 @@ BEGIN
 alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\
 Spaces are not allowed."
 
-// ERROR_DIRECTORY_NAME
     IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path"
     IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \
 and only contain letters, digits, dashes and periods. Spaces are not allowed."
+
+    IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+    IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+    IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+    IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected partition?"
+    IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the selected extended partition and ALL the logical partitions it contains?"
+
+    IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+    IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+    IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to format the partition."
+
+    IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n %s\n"
+
+    IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)."
 END

base/setup/reactos/lang/pt-BR.rc

@@ -55,27 +55,43 @@ CAPTION "Instalação do ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
-    PUSHBUTTON "&Criar", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Apagar", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "&Criar", IDC_PARTCREATE, 7, 122, 50, 14
-    PUSHBUTTON "D&rivers", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Opções Avançadas...", IDC_PARTMOREOPTS, 230, 122, 80, 15
+    PUSHBUTTON "&Apagar", IDC_PARTDELETE, 63, 122, 50, 14
-    // LTEXT "Clique em Próximo para verificar o sumário.", IDC_STATIC, 10, 180, 277, 20
+    PUSHBUTTON "D&rivers", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "&Opções Avançadas...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+    // LTEXT "Clique em Próximo para verificar o sumário.", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Criar Partição"
+CAPTION "Criar e formatar partição"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
+    LTEXT "&Tamanho:", IDC_STATIC, 7, 9, 70, 9
-    CONTROL "Criar e formatar partição", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
+    EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
-    LTEXT "Tamanho:", IDC_STATIC, 13, 24, 27, 9
+    CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-    EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
-    LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
+    LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
-    LTEXT "Sistema de arquivo:", IDC_STATIC, 13, 46, 42, 9
+    AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50
+    LTEXT "&Sistema de arquivo:", IDC_FS_STATIC, 7, 46, 70, 9
-    PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON "&Cancelar", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+    PUSHBUTTON "Cancelar", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Formatar partição"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Sistema de arquivo:", IDC_FS_STATIC, 7, 9, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+    PUSHBUTTON "Cancelar", IDCANCEL, 143, 61, 50, 14
 END
 
 IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -84,12 +100,12 @@ CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
     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
+    EDITTEXT IDC_PATH, 7, 23, 291, 13
     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
+    DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
-    PUSHBUTTON "Cancelar", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Cancelar", IDCANCEL, 248, 113, 50, 14
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -160,6 +176,7 @@ BEGIN
     IDS_ABORTSETUP2 "Abortar instalação?"
     IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue."
     IDS_CAPTION "Instalação do ReactOS"
+    IDS_VOLUME_NOFORMAT "Not formatted"
 END
 
 STRINGTABLE
@@ -186,6 +203,26 @@ BEGIN
     IDS_BOOTLOADER_VBRONLY "Apenas VBR"
 END
 
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+    IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+    IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+    IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+    IDS_COPYING  "Copying %s"
+    IDS_MOVING   "Moving %s to %s"
+    IDS_RENAMING "Renaming %s to %s"
+    IDS_DELETING "Deleting %s"
+
+    IDS_PREPARE_PARTITIONS "Preparing partitions..."
+    IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..."
+    IDS_COPYING_FILES "Copying the files..."
+END
+
 /* Error Strings */
 
 STRINGTABLE
@@ -195,8 +232,35 @@ BEGIN
 alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\
 Spaces are not allowed."
 
-// ERROR_DIRECTORY_NAME
     IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path"
     IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \
 and only contain letters, digits, dashes and periods. Spaces are not allowed."
+
+    IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+    IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+    IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+    IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected partition?"
+    IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the selected extended partition and ALL the logical partitions it contains?"
+
+    IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+    IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+    IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to format the partition."
+
+    IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n %s\n"
+
+    IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)."
 END

base/setup/reactos/lang/pt-PT.rc

@@ -55,27 +55,43 @@ CAPTION "Instalação do ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
-    PUSHBUTTON "&Criar", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Apagar", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "&Criar", IDC_PARTCREATE, 7, 122, 50, 14
-    PUSHBUTTON "D&rivers", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Opções Avançadas...", IDC_PARTMOREOPTS, 230, 122, 80, 15
+    PUSHBUTTON "&Apagar", IDC_PARTDELETE, 63, 122, 50, 14
-    // LTEXT "Clique em Próximo para verificar o sumário.", IDC_STATIC, 10, 180, 277, 20
+    PUSHBUTTON "D&rivers", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "&Opções Avançadas...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+    // LTEXT "Clique em Próximo para verificar o sumário.", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Criar Partição"
+CAPTION "Criar e formatar partição"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
+    LTEXT "&Tamanho:", IDC_STATIC, 7, 9, 70, 9
-    CONTROL "Criar e formatar partição", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
+    EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
-    LTEXT "Tamanho:", IDC_STATIC, 13, 24, 27, 9
+    CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-    EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
-    LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
+    LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
-    LTEXT "Sistema de arquivo:", IDC_STATIC, 13, 46, 42, 9
+    AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50
+    LTEXT "&Sistema de arquivo:", IDC_FS_STATIC, 7, 46, 70, 9
-    PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON "&Cancelar", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+    PUSHBUTTON "Cancelar", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Formatar partição"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Sistema de arquivo:", IDC_FS_STATIC, 7, 9, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+    PUSHBUTTON "Cancelar", IDCANCEL, 143, 61, 50, 14
 END
 
 IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -84,12 +100,12 @@ CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
     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
+    EDITTEXT IDC_PATH, 7, 23, 291, 13
     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
+    DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
-    PUSHBUTTON "Cancelar", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Cancelar", IDCANCEL, 248, 113, 50, 14
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -160,6 +176,7 @@ BEGIN
     IDS_ABORTSETUP2 "Abortar instalação?"
     IDS_NO_TXTSETUP_SIF " 'txtsetup.sif' não foi encontrado.\n o programa de instalação não pode continuar."
     IDS_CAPTION "Instalação do ReactOS"
+    IDS_VOLUME_NOFORMAT "Not formatted"
 END
 
 STRINGTABLE
@@ -186,6 +203,26 @@ BEGIN
     IDS_BOOTLOADER_VBRONLY "Apenas VBR"
 END
 
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+    IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+    IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+    IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+    IDS_COPYING  "Copying %s"
+    IDS_MOVING   "Moving %s to %s"
+    IDS_RENAMING "Renaming %s to %s"
+    IDS_DELETING "Deleting %s"
+
+    IDS_PREPARE_PARTITIONS "Preparing partitions..."
+    IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..."
+    IDS_COPYING_FILES "Copying the files..."
+END
+
 /* Error Strings */
 
 STRINGTABLE
@@ -195,8 +232,35 @@ BEGIN
 alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\
 Spaces are not allowed."
 
-// ERROR_DIRECTORY_NAME
     IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path"
     IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \
 and only contain letters, digits, dashes and periods. Spaces are not allowed."
+
+    IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+    IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+    IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+    IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected partition?"
+    IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the selected extended partition and ALL the logical partitions it contains?"
+
+    IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+    IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+    IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to format the partition."
+
+    IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n %s\n"
+
+    IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)."
 END

base/setup/reactos/lang/ro-RO.rc

@@ -64,27 +64,43 @@ CAPTION "Expert de instalare ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
-    PUSHBUTTON "&Crează", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "Șt&erge", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "&Crează", IDC_PARTCREATE, 7, 122, 50, 14
-    PUSHBUTTON "&Driver", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "Opțiuni a&vansate…", IDC_PARTMOREOPTS, 230, 122, 80, 15
+    PUSHBUTTON "Șt&erge", IDC_PARTDELETE, 63, 122, 50, 14
-    // LTEXT "Apăsați pe Înainte pentru a verifica sumarul.", IDC_STATIC, 10, 180, 277, 20
+    PUSHBUTTON "&Driver", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "Opțiuni a&vansate…", IDC_PARTMOREOPTS, 230, 122, 80, 14
+    // LTEXT "Apăsați pe Înainte pentru a verifica sumarul.", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Creare partiție"
+CAPTION "Crearea și formatarea partiției"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
+    LTEXT "&Mărime:", IDC_STATIC, 7, 9, 70, 9
-    CONTROL "Crearea și formatarea partiției", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
+    EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
-    LTEXT "Mărime:", IDC_STATIC, 13, 24, 27, 9
+    CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-    EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
-    LTEXT "GO", IDC_UNIT, 117, 24, 14, 9
+    LTEXT "MO", IDC_UNIT, 134, 9, 14, 9
-    LTEXT "Sistemul de fișiere:", IDC_STATIC, 13, 46, 42, 9
+    AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50
+    LTEXT "&Sistemul de fișiere:", IDC_FS_STATIC, 7, 46, 70, 9
-    PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON "&Revocare", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+    PUSHBUTTON "Revocare", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Formatarea partiției"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Sistemul de fișiere:", IDC_FS_STATIC, 7, 9, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+    PUSHBUTTON "Revocare", IDCANCEL, 143, 61, 50, 14
 END
 
 IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -93,12 +109,12 @@ CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
     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
+    EDITTEXT IDC_PATH, 7, 23, 291, 13
     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
+    DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
-    PUSHBUTTON "Revocare", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Revocare", IDCANCEL, 248, 113, 50, 14
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -169,6 +185,7 @@ BEGIN
     IDS_ABORTSETUP2 "Abandonați instalarea?"
     IDS_NO_TXTSETUP_SIF "Fișierului „txtsetup.sif” nu poate fi găsit.\nInstalarea nu poate continua."
     IDS_CAPTION "Expertul de instalare ReactOS"
+    IDS_VOLUME_NOFORMAT "Not formatted"
 END
 
 STRINGTABLE
@@ -195,6 +212,26 @@ BEGIN
     IDS_BOOTLOADER_VBRONLY "Numai VBR"
 END
 
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+    IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+    IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+    IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+    IDS_COPYING  "Copying %s"
+    IDS_MOVING   "Moving %s to %s"
+    IDS_RENAMING "Renaming %s to %s"
+    IDS_DELETING "Deleting %s"
+
+    IDS_PREPARE_PARTITIONS "Preparing partitions..."
+    IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..."
+    IDS_COPYING_FILES "Copying the files..."
+END
+
 /* Error Strings */
 
 STRINGTABLE
@@ -204,8 +241,35 @@ BEGIN
 alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\
 Spaces are not allowed."
 
-// ERROR_DIRECTORY_NAME
     IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path"
     IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \
 and only contain letters, digits, dashes and periods. Spaces are not allowed."
+
+    IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+    IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+    IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+    IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected partition?"
+    IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the selected extended partition and ALL the logical partitions it contains?"
+
+    IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+    IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+    IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to format the partition."
+
+    IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n %s\n"
+
+    IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)."
 END

base/setup/reactos/lang/ru-RU.rc

@@ -55,27 +55,43 @@ CAPTION "Установка ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
-    PUSHBUTTON "&Создать", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Удалить", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "&Создать", IDC_PARTCREATE, 7, 122, 50, 14
-    PUSHBUTTON "Д&райвер", IDC_DEVICEDRIVER, 119, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Дополнительные параметры...", IDC_PARTMOREOPTS, 189, 122, 122, 15
+    PUSHBUTTON "&Удалить", IDC_PARTDELETE, 63, 122, 50, 14
-    // LTEXT "Для начала установки нажмите ""Далее"".", IDC_STATIC, 10, 180, 277, 20
+    PUSHBUTTON "Д&райвер", IDC_DEVICEDRIVER, 119, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "&Дополнительные параметры...", IDC_PARTMOREOPTS, 189, 122, 122, 14
+    // LTEXT "Для начала установки нажмите ""Далее"".", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 167, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Создать раздел на диске"
+CAPTION "Создать и отформатировать раздел диска"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 127, 22, 9, 13
+    LTEXT "&Размер:", IDC_STATIC, 7, 9, 70, 9
-    CONTROL "Создать и отформатировать раздел диска", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 153, 57
+    EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
-    LTEXT "Размер:", IDC_STATIC, 13, 24, 27, 9
+    CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-    EDITTEXT IDC_PARTSIZE, 80, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
-    LTEXT "Гб", IDC_UNIT, 143, 24, 14, 9
+    LTEXT "Мб", IDC_UNIT, 134, 9, 14, 9
-    LTEXT "Файловая система:", IDC_STATIC, 13, 44, 65, 9
+    AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 80, 42, 73, 50
+    LTEXT "&Файловая система:", IDC_FS_STATIC, 7, 46, 70, 9
-    PUSHBUTTON "&Есть", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON "&Отставить", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "ОК", IDOK, 88, 98, 50, 14
+    PUSHBUTTON "Отмена", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Отформатировать раздел диска"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Файловая система:", IDC_FS_STATIC, 7, 9, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+    PUSHBUTTON "ОК", IDOK, 88, 61, 50, 14
+    PUSHBUTTON "Отмена", IDCANCEL, 143, 61, 50, 14
 END
 
 IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -84,12 +100,12 @@ CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
     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
+    EDITTEXT IDC_PATH, 7, 23, 291, 13
     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
+    DEFPUSHBUTTON "ОК", IDOK, 193, 113, 50, 14
-    PUSHBUTTON "Отмена", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Отмена", IDCANCEL, 248, 113, 50, 14
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -160,6 +176,7 @@ BEGIN
     IDS_ABORTSETUP2 "Прервать установку?"
     IDS_NO_TXTSETUP_SIF "Не удалось найти файл 'txtsetup.sif'.\nПродолжение установки невозможно."
     IDS_CAPTION "Установка ReactOS"
+    IDS_VOLUME_NOFORMAT "Not formatted"
 END
 
 STRINGTABLE
@@ -186,6 +203,26 @@ BEGIN
     IDS_BOOTLOADER_VBRONLY "Только VBR"
 END
 
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+    IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+    IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+    IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+    IDS_COPYING  "Copying %s"
+    IDS_MOVING   "Moving %s to %s"
+    IDS_RENAMING "Renaming %s to %s"
+    IDS_DELETING "Deleting %s"
+
+    IDS_PREPARE_PARTITIONS "Preparing partitions..."
+    IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..."
+    IDS_COPYING_FILES "Copying the files..."
+END
+
 /* Error Strings */
 
 STRINGTABLE
@@ -195,8 +232,35 @@ BEGIN
 alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\
 Spaces are not allowed."
 
-// ERROR_DIRECTORY_NAME
     IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path"
     IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \
 and only contain letters, digits, dashes and periods. Spaces are not allowed."
+
+    IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+    IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+    IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+    IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected partition?"
+    IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the selected extended partition and ALL the logical partitions it contains?"
+
+    IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+    IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+    IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to format the partition."
+
+    IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n %s\n"
+
+    IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)."
 END

base/setup/reactos/lang/sk-SK.rc

@@ -60,27 +60,43 @@ CAPTION "Inštalácia systému ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
-    PUSHBUTTON "&Vytvoriť", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "O&dstrániť", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "&Vytvoriť", IDC_PARTCREATE, 7, 122, 50, 14
-    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "Rozšírené &možnosti...", IDC_PARTMOREOPTS, 230, 122, 80, 15
+    PUSHBUTTON "O&dstrániť", IDC_PARTDELETE, 63, 122, 50, 14
-    // LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20
+    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "Rozšírené &možnosti...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+    // LTEXT "Click Next to check the summary.", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Vytvoriť partíciu"
+CAPTION "Vytvoriť a naformátovať partíciu"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
+    LTEXT "&Veľkosť:", IDC_STATIC, 7, 9, 70, 9
-    CONTROL "Vytvoriť a naformátovať partíciu", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
+    EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
-    LTEXT "Veľkosť:", IDC_STATIC, 13, 24, 27, 9
+    CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-    EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
-    LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
+    LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
-    LTEXT "Systém súborov:", IDC_STATIC, 13, 46, 42, 9
+    AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50
+    LTEXT "&Systém súborov:", IDC_FS_STATIC, 7, 46, 70, 9
-    PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON "&Zrušiť", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+    PUSHBUTTON "Zrušiť", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Naformátovať partíciu"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Systém súborov:", IDC_FS_STATIC, 7, 9, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+    PUSHBUTTON "Zrušiť", IDCANCEL, 143, 61, 50, 14
 END
 
 IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -89,12 +105,12 @@ CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
     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
+    EDITTEXT IDC_PATH, 7, 23, 291, 13
     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
+    DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
-    PUSHBUTTON "Zrušiť", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Zrušiť", IDCANCEL, 248, 113, 50, 14
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -165,6 +181,7 @@ BEGIN
     IDS_ABORTSETUP2 "Prerušiť inštaláciu?"
     IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue."
     IDS_CAPTION "ReactOS Setup"
+    IDS_VOLUME_NOFORMAT "Not formatted"
 END
 
 STRINGTABLE
@@ -191,6 +208,26 @@ BEGIN
     IDS_BOOTLOADER_VBRONLY "Iba VBR"
 END
 
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+    IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+    IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+    IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+    IDS_COPYING  "Copying %s"
+    IDS_MOVING   "Moving %s to %s"
+    IDS_RENAMING "Renaming %s to %s"
+    IDS_DELETING "Deleting %s"
+
+    IDS_PREPARE_PARTITIONS "Preparing partitions..."
+    IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..."
+    IDS_COPYING_FILES "Copying the files..."
+END
+
 /* Error Strings */
 
 STRINGTABLE
@@ -200,8 +237,35 @@ BEGIN
 alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\
 Spaces are not allowed."
 
-// ERROR_DIRECTORY_NAME
     IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path"
     IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \
 and only contain letters, digits, dashes and periods. Spaces are not allowed."
+
+    IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+    IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+    IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+    IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected partition?"
+    IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the selected extended partition and ALL the logical partitions it contains?"
+
+    IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+    IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+    IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to format the partition."
+
+    IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n %s\n"
+
+    IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)."
 END

base/setup/reactos/lang/sq-AL.rc

@@ -57,27 +57,43 @@ CAPTION "Instalimi i ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
-    PUSHBUTTON "&Krijo", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Fshi", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "&Krijo", IDC_PARTCREATE, 7, 122, 50, 14
-    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Opsionet e avancuara...", IDC_PARTMOREOPTS, 230, 122, 80, 15
+    PUSHBUTTON "&Fshi", IDC_PARTDELETE, 63, 122, 50, 14
-    // LTEXT "Kliko vazhdo për të kontrolluar përmbajtjen.", IDC_STATIC, 10, 180, 277, 20
+    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "&Opsionet e avancuara...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+    // LTEXT "Kliko vazhdo për të kontrolluar përmbajtjen.", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Krijo particion"
+CAPTION "Krijo dhe formato particionin"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
+    LTEXT "&Size:", IDC_STATIC, 7, 9, 70, 9
-    CONTROL "Krijo dhe formato particionin", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
+    EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
-    LTEXT "Size:", IDC_STATIC, 13, 24, 27, 9
+    CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-    EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
-    LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
+    LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
-    LTEXT "Filesystem:", IDC_STATIC, 13, 46, 42, 9
+    AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50
+    LTEXT "&Filesystem:", IDC_FS_STATIC, 7, 46, 70, 9
-    PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON "&Anulo", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+    PUSHBUTTON "Anulo", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Formato particionin"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Filesystem:", IDC_FS_STATIC, 7, 9, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+    PUSHBUTTON "Anulo", IDCANCEL, 143, 61, 50, 14
 END
 
 IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -86,12 +102,12 @@ CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
     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
+    EDITTEXT IDC_PATH, 7, 23, 291, 13
     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
+    DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
-    PUSHBUTTON "Anulo", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Anulo", IDCANCEL, 248, 113, 50, 14
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -162,6 +178,7 @@ BEGIN
     IDS_ABORTSETUP2 "Ndërpritni Instalimin?"
     IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue."
     IDS_CAPTION "ReactOS Setup"
+    IDS_VOLUME_NOFORMAT "Not formatted"
 END
 
 STRINGTABLE
@@ -188,6 +205,26 @@ BEGIN
     IDS_BOOTLOADER_VBRONLY "VBR veq"
 END
 
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+    IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+    IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+    IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+    IDS_COPYING  "Copying %s"
+    IDS_MOVING   "Moving %s to %s"
+    IDS_RENAMING "Renaming %s to %s"
+    IDS_DELETING "Deleting %s"
+
+    IDS_PREPARE_PARTITIONS "Preparing partitions..."
+    IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..."
+    IDS_COPYING_FILES "Copying the files..."
+END
+
 /* Error Strings */
 
 STRINGTABLE
@@ -197,8 +234,35 @@ BEGIN
 alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\
 Spaces are not allowed."
 
-// ERROR_DIRECTORY_NAME
     IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path"
     IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \
 and only contain letters, digits, dashes and periods. Spaces are not allowed."
+
+    IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+    IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+    IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+    IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected partition?"
+    IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the selected extended partition and ALL the logical partitions it contains?"
+
+    IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+    IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+    IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to format the partition."
+
+    IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n %s\n"
+
+    IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)."
 END

base/setup/reactos/lang/tr-TR.rc

@@ -62,27 +62,43 @@ CAPTION "ReactOS Kur"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
-    PUSHBUTTON "&Oluştur...", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Sil", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "&Oluştur...", IDC_PARTCREATE, 7, 122, 50, 14
-    PUSHBUTTON "S&ürücü", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "G&elişmiş Seçenekler...", IDC_PARTMOREOPTS, 230, 122, 80, 15
+    PUSHBUTTON "&Sil", IDC_PARTDELETE, 63, 122, 50, 14
-    // LTEXT "Kurulum özetini gözden geçirmek için İleri'ye tıklayınız.", IDC_STATIC, 10, 180, 277, 20
+    PUSHBUTTON "S&ürücü", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "G&elişmiş Seçenekler...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+    // LTEXT "Kurulum özetini gözden geçirmek için İleri'ye tıklayınız.", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Bölüm Oluştur"
+CAPTION "Bölüm Oluşturma ve Biçimlendirme"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
+    LTEXT "&Boyut:", IDC_STATIC, 7, 9, 70, 9
-    CONTROL "Bölüm Oluşturma ve Biçimlendirme", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
+    EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
-    LTEXT "Boyut:", IDC_STATIC, 13, 24, 27, 9
+    CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-    EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
-    LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
+    LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
-    LTEXT "Dosya sistemi:", IDC_STATIC, 13, 46, 42, 9
+    AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50
+    LTEXT "&Dosya sistemi:", IDC_FS_STATIC, 7, 46, 70, 9
-    PUSHBUTTON "Tamam", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON "İptal", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "Tamam", IDOK, 88, 98, 50, 14
+    PUSHBUTTON "İptal", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Bölüm Biçimlendirme"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Dosya sistemi:", IDC_FS_STATIC, 7, 9, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+    PUSHBUTTON "Tamam", IDOK, 88, 61, 50, 14
+    PUSHBUTTON "İptal", IDCANCEL, 143, 61, 50, 14
 END
 
 IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -91,12 +107,12 @@ CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
     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
+    EDITTEXT IDC_PATH, 7, 23, 291, 13
     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
+    DEFPUSHBUTTON "Tamam", IDOK, 193, 113, 50, 14
-    PUSHBUTTON "İptal", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "İptal", IDCANCEL, 248, 113, 50, 14
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -167,6 +183,7 @@ BEGIN
     IDS_ABORTSETUP2 "Kurulum iptal edilsin mi?"
     IDS_NO_TXTSETUP_SIF """txtsetup.sif"" bulunamıyor.\nKurulum Yöneticisi sürdüremiyor."
     IDS_CAPTION "ReactOS Kur"
+    IDS_VOLUME_NOFORMAT "Not formatted"
 END
 
 STRINGTABLE
@@ -193,6 +210,26 @@ BEGIN
     IDS_BOOTLOADER_VBRONLY "Yalnızca VBR"
 END
 
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+    IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+    IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+    IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+    IDS_COPYING  "Copying %s"
+    IDS_MOVING   "Moving %s to %s"
+    IDS_RENAMING "Renaming %s to %s"
+    IDS_DELETING "Deleting %s"
+
+    IDS_PREPARE_PARTITIONS "Preparing partitions..."
+    IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..."
+    IDS_COPYING_FILES "Copying the files..."
+END
+
 /* Error Strings */
 
 STRINGTABLE
@@ -202,8 +239,35 @@ BEGIN
 alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\
 Spaces are not allowed."
 
-// ERROR_DIRECTORY_NAME
     IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path"
     IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \
 and only contain letters, digits, dashes and periods. Spaces are not allowed."
+
+    IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+    IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+    IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+    IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected partition?"
+    IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the selected extended partition and ALL the logical partitions it contains?"
+
+    IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+    IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+    IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to format the partition."
+
+    IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n %s\n"
+
+    IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)."
 END

base/setup/reactos/lang/uk-UA.rc

@@ -63,27 +63,43 @@ CAPTION "Встановлення ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
-    PUSHBUTTON "&Створити", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Видалити", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "&Створити", IDC_PARTCREATE, 7, 122, 50, 14
-    PUSHBUTTON "Д&райвер", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "&Додаткові Опції...", IDC_PARTMOREOPTS, 230, 122, 80, 15
+    PUSHBUTTON "&Видалити", IDC_PARTDELETE, 63, 122, 50, 14
-    // LTEXT "Для початку встановлення натисніть Далі", IDC_STATIC, 10, 180, 277, 20
+    PUSHBUTTON "Д&райвер", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "&Додаткові Опції...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+    // LTEXT "Для початку встановлення натисніть Далі", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 172, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Створення розділу"
+CAPTION "Створити та відформатувати розділ"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 131, 22, 9, 13
+    LTEXT "&Розмір:", IDC_STATIC, 7, 9, 70, 9
-    CONTROL "Створити та відформатувати розділ", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 156, 57
+    EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
-    LTEXT "Розмір:", IDC_STATIC, 13, 24, 27, 9
+    CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-    EDITTEXT IDC_PARTSIZE, 79, 22, 53, 13, WS_VISIBLE | WS_TABSTOP
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
-    LTEXT "Гб", IDC_UNIT, 144, 24, 14, 9
+    LTEXT "Мб", IDC_UNIT, 134, 9, 14, 9
-    LTEXT "Файлова система:", IDC_STATIC, 13, 46, 65, 9
+    AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 79, 42, 79, 50
+    LTEXT "&Файлова система:", IDC_FS_STATIC, 7, 46, 70, 9
-    PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON "&Скасувати", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+    PUSHBUTTON "Скасувати", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Відформатувати розділ"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Файлова система:", IDC_FS_STATIC, 7, 9, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+    PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+    PUSHBUTTON "Скасувати", IDCANCEL, 143, 61, 50, 14
 END
 
 IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -92,12 +108,12 @@ CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
     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
+    EDITTEXT IDC_PATH, 7, 23, 291, 13
     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
+    DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
-    PUSHBUTTON "Скасувати", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Скасувати", IDCANCEL, 248, 113, 50, 14
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -168,6 +184,7 @@ BEGIN
     IDS_ABORTSETUP2 "Перервати встановлення?"
     IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue."
     IDS_CAPTION "Встановлення ReactOS"
+    IDS_VOLUME_NOFORMAT "Not formatted"
 END
 
 STRINGTABLE
@@ -194,6 +211,26 @@ BEGIN
     IDS_BOOTLOADER_VBRONLY "Лише VBR"
 END
 
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+    IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+    IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+    IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+    IDS_COPYING  "Copying %s"
+    IDS_MOVING   "Moving %s to %s"
+    IDS_RENAMING "Renaming %s to %s"
+    IDS_DELETING "Deleting %s"
+
+    IDS_PREPARE_PARTITIONS "Preparing partitions..."
+    IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..."
+    IDS_COPYING_FILES "Copying the files..."
+END
+
 /* Error Strings */
 
 STRINGTABLE
@@ -203,8 +240,35 @@ BEGIN
 alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\
 Spaces are not allowed."
 
-// ERROR_DIRECTORY_NAME
     IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path"
     IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \
 and only contain letters, digits, dashes and periods. Spaces are not allowed."
+
+    IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+    IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+    IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+    IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected partition?"
+    IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the selected extended partition and ALL the logical partitions it contains?"
+
+    IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+    IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+    IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to format the partition."
+
+    IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n %s\n"
+
+    IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)."
 END

base/setup/reactos/lang/vi-VN.rc

@@ -55,27 +55,43 @@ CAPTION "Cài đặt ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
     PUSHBUTTON "&Tạo", IDC_PARTCREATE, 7, 122, 50, 14
+    PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
     PUSHBUTTON "&Xóa", IDC_PARTDELETE, 63, 122, 50, 14
     PUSHBUTTON "P&hần mềm", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
     PUSHBUTTON "&Tùy chọn nâng cao...", IDC_PARTMOREOPTS, 230, 122, 80, 14
     // LTEXT "Ấn Tiếp để  kiểm tra phần tóm lượct.", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Phân chia ổ cứng"
+CAPTION "Tạo và định dạng phần ổ cứng"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
+    LTEXT "&Kích cỡ:", IDC_STATIC, 7, 9, 70, 9
-    CONTROL "Tạo và định dạng phần ổ cứng", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
+    EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
-    LTEXT "Kích cỡ:", IDC_STATIC, 13, 24, 27, 9
+    CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-    EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
-    LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
+    LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
-    LTEXT "Loại định dạng:", IDC_STATIC, 13, 46, 42, 9
+    AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50
+    LTEXT "&Loại định dạng:", IDC_FS_STATIC, 7, 46, 70, 9
-    PUSHBUTTON "&Đồng ý", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON "&Hủy", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "Đồng ý", IDOK, 88, 98, 50, 14
+    PUSHBUTTON "Hủy", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Format Partition"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Loại định dạng:", IDC_FS_STATIC, 7, 9, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+    PUSHBUTTON "Đồng ý", IDOK, 88, 61, 50, 14
+    PUSHBUTTON "Hủy", IDCANCEL, 143, 61, 50, 14
 END
 
 IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -84,12 +100,12 @@ CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
     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
+    EDITTEXT IDC_PATH, 7, 23, 291, 13
     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
+    DEFPUSHBUTTON "Đồng ý", IDOK, 193, 113, 50, 14
-    PUSHBUTTON "Hủy", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "Hủy", IDCANCEL, 248, 113, 50, 14
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -160,6 +176,7 @@ BEGIN
     IDS_ABORTSETUP2 "Hủy bỏ trình Thiết lập?"
     IDS_NO_TXTSETUP_SIF "Không thể tìm được tập tin 'txtsetup.sif'.\nTrình Thiết lập không thể tiếp tục"
     IDS_CAPTION "Cài đặt ReactOS"
+    IDS_VOLUME_NOFORMAT "Not formatted"
 END
 
 STRINGTABLE
@@ -186,6 +203,26 @@ BEGIN
     IDS_BOOTLOADER_VBRONLY "Chỉ VBR"
 END
 
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+    IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+    IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+    IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+    IDS_COPYING  "Copying %s"
+    IDS_MOVING   "Moving %s to %s"
+    IDS_RENAMING "Renaming %s to %s"
+    IDS_DELETING "Deleting %s"
+
+    IDS_PREPARE_PARTITIONS "Preparing partitions..."
+    IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..."
+    IDS_COPYING_FILES "Copying the files..."
+END
+
 /* Error Strings */
 
 STRINGTABLE
@@ -195,8 +232,35 @@ BEGIN
 alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\
 Spaces are not allowed."
 
-// ERROR_DIRECTORY_NAME
     IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path"
     IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \
 and only contain letters, digits, dashes and periods. Spaces are not allowed."
+
+    IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+    IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+    IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+    IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected partition?"
+    IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the selected extended partition and ALL the logical partitions it contains?"
+
+    IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+    IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+    IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to format the partition."
+
+    IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n %s\n"
+
+    IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)."
 END

base/setup/reactos/lang/zh-CN.rc

@@ -55,27 +55,43 @@ CAPTION "ReactOS 安装程序"
 FONT 9, "宋体"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
-    PUSHBUTTON "新建(&C)", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "Initialize(&I)", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "删除(&D)", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "新建(&C)", IDC_PARTCREATE, 7, 122, 50, 14
-    PUSHBUTTON "驱动器(&R)", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "Format(&F)", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "高级选项(&A)...", IDC_PARTMOREOPTS, 230, 122, 80, 15
+    PUSHBUTTON "删除(&D)", IDC_PARTDELETE, 63, 122, 50, 14
-    // LTEXT "点击下一步检查安装概要。", IDC_STATIC, 10, 180, 277, 20
+    PUSHBUTTON "驱动器(&R)", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "高级选项(&A)...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+    // LTEXT "点击下一步检查安装概要。", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "建立分区"
+CAPTION "创建并格式化分区"
 FONT 9, "宋体"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
+    LTEXT "大小(&S)：", IDC_STATIC, 7, 9, 70, 9
-    CONTROL "创建并格式化分区", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
+    EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
-    LTEXT "大小:", IDC_STATIC, 13, 24, 27, 9
+    CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-    EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
-    LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
+    LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
-    LTEXT "文件系统：", IDC_STATIC, 13, 46, 42, 9
+    AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50
+    LTEXT "文件系统(&F)：", IDC_FS_STATIC, 7, 46, 70, 9
-    PUSHBUTTON "确定(&O)", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON "取消(&C)", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "确定", IDOK, 88, 98, 50, 14
+    PUSHBUTTON "取消", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Format Partition"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "文件系统(&F)：", IDC_FS_STATIC, 7, 9, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+    PUSHBUTTON "确定", IDOK, 88, 61, 50, 14
+    PUSHBUTTON "取消", IDCANCEL, 143, 61, 50, 14
 END
 
 IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -84,12 +100,12 @@ CAPTION "Advanced Installation Options"
 FONT 9, "宋体"
 BEGIN
     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
+    EDITTEXT IDC_PATH, 7, 23, 291, 13
     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
+    DEFPUSHBUTTON "确定", IDOK, 193, 113, 50, 14
-    PUSHBUTTON "取消", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "取消", IDCANCEL, 248, 113, 50, 14
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -160,6 +176,7 @@ BEGIN
     IDS_ABORTSETUP2 "终止安装？"
     IDS_NO_TXTSETUP_SIF "无法找到 'txtsetup.sif'。\n安装程序无法继续。"
     IDS_CAPTION "ReactOS 安装程序"
+    IDS_VOLUME_NOFORMAT "Not formatted"
 END
 
 STRINGTABLE
@@ -186,6 +203,26 @@ BEGIN
     IDS_BOOTLOADER_VBRONLY "仅 VBR"
 END
 
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+    IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+    IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+    IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+    IDS_COPYING  "Copying %s"
+    IDS_MOVING   "Moving %s to %s"
+    IDS_RENAMING "Renaming %s to %s"
+    IDS_DELETING "Deleting %s"
+
+    IDS_PREPARE_PARTITIONS "Preparing partitions..."
+    IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..."
+    IDS_COPYING_FILES "Copying the files..."
+END
+
 /* Error Strings */
 
 STRINGTABLE
@@ -195,8 +232,35 @@ BEGIN
 alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\
 Spaces are not allowed."
 
-// ERROR_DIRECTORY_NAME
     IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path"
     IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \
 and only contain letters, digits, dashes and periods. Spaces are not allowed."
+
+    IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+    IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+    IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+    IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected partition?"
+    IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the selected extended partition and ALL the logical partitions it contains?"
+
+    IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+    IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+    IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to format the partition."
+
+    IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n %s\n"
+
+    IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)."
 END

base/setup/reactos/lang/zh-HK.rc

@@ -63,27 +63,43 @@ CAPTION "ReactOS 安裝程式"
 FONT 9, "新細明體"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
-    PUSHBUTTON "建立(&C)", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "Initialize(&I)", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "刪除(&D)", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "建立(&C)", IDC_PARTCREATE, 7, 122, 50, 14
-    PUSHBUTTON "驅動程式(&R)", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "Format(&F)", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "進階選項(&A)...", IDC_PARTMOREOPTS, 230, 122, 80, 15
+    PUSHBUTTON "刪除(&D)", IDC_PARTDELETE, 63, 122, 50, 14
-    // LTEXT "點選下一步檢查安裝概要。", IDC_STATIC, 10, 180, 277, 20
+    PUSHBUTTON "驅動程式(&R)", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "進階選項(&A)...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+    // LTEXT "點選下一步檢查安裝概要。", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "建立磁碟區"
+CAPTION "建立並格式化磁碟區"
 FONT 9, "新細明體"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
+    LTEXT "大小(&S)：", IDC_STATIC, 7, 9, 70, 9
-    CONTROL "建立並格式化磁碟區", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
+    EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
-    LTEXT "大小：", IDC_STATIC, 13, 24, 27, 9
+    CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-    EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
-    LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
+    LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
-    LTEXT "檔案系統：", IDC_STATIC, 13, 46, 42, 9
+    AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50
+    LTEXT "檔案系統(&F)：", IDC_FS_STATIC, 7, 46, 70, 9
-    PUSHBUTTON "確定(&O)", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON "取消(&C)", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "確定", IDOK, 88, 98, 50, 14
+    PUSHBUTTON "取消", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Format Partition"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "檔案系統(&F)：", IDC_FS_STATIC, 7, 9, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+    PUSHBUTTON "確定", IDOK, 88, 61, 50, 14
+    PUSHBUTTON "取消", IDCANCEL, 143, 61, 50, 14
 END
 
 IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -92,12 +108,12 @@ CAPTION "Advanced Installation Options"
 FONT 9, "新細明體"
 BEGIN
     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
+    EDITTEXT IDC_PATH, 7, 23, 291, 13
     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
+    DEFPUSHBUTTON "確定", IDOK, 193, 113, 50, 14
-    PUSHBUTTON "取消", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "取消", IDCANCEL, 248, 113, 50, 14
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -168,6 +184,7 @@ BEGIN
     IDS_ABORTSETUP2 "終止安裝？"
     IDS_NO_TXTSETUP_SIF "找不到「txtsetup.sif」。\n安裝程式無法繼續。"
     IDS_CAPTION "ReactOS 安裝程式"
+    IDS_VOLUME_NOFORMAT "Not formatted"
 END
 
 STRINGTABLE
@@ -194,6 +211,26 @@ BEGIN
     IDS_BOOTLOADER_VBRONLY "僅 VBR"
 END
 
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+    IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+    IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+    IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+    IDS_COPYING  "Copying %s"
+    IDS_MOVING   "Moving %s to %s"
+    IDS_RENAMING "Renaming %s to %s"
+    IDS_DELETING "Deleting %s"
+
+    IDS_PREPARE_PARTITIONS "Preparing partitions..."
+    IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..."
+    IDS_COPYING_FILES "Copying the files..."
+END
+
 /* Error Strings */
 
 STRINGTABLE
@@ -203,8 +240,35 @@ BEGIN
 alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\
 Spaces are not allowed."
 
-// ERROR_DIRECTORY_NAME
     IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path"
     IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \
 and only contain letters, digits, dashes and periods. Spaces are not allowed."
+
+    IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+    IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+    IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+    IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected partition?"
+    IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the selected extended partition and ALL the logical partitions it contains?"
+
+    IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+    IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+    IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to format the partition."
+
+    IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n %s\n"
+
+    IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)."
 END

base/setup/reactos/lang/zh-TW.rc

@@ -64,27 +64,43 @@ CAPTION "ReactOS 安裝程式"
 FONT 9, "新細明體"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
-    PUSHBUTTON "建立(&C)", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "Initialize(&I)", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "刪除(&D)", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "建立(&C)", IDC_PARTCREATE, 7, 122, 50, 14
-    PUSHBUTTON "驅動程式(&R)", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "Format(&F)", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same position as IDC_PARTCREATE
-    PUSHBUTTON "進階選項(&A)...", IDC_PARTMOREOPTS, 230, 122, 80, 15
+    PUSHBUTTON "刪除(&D)", IDC_PARTDELETE, 63, 122, 50, 14
-    // LTEXT "點選下一步檢查安裝概要。", IDC_STATIC, 10, 180, 277, 20
+    PUSHBUTTON "驅動程式(&R)", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "進階選項(&A)...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+    // LTEXT "點選下一步檢查安裝概要。", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "建立磁碟區"
+CAPTION "建立並格式化磁碟區"
 FONT 9, "新細明體"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
+    LTEXT "大小(&S)：", IDC_STATIC, 7, 9, 70, 9
-    CONTROL "建立並格式化磁碟區", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
+    EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
-    LTEXT "大小：", IDC_STATIC, 13, 24, 27, 9
+    CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-    EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
-    LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
+    LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
-    LTEXT "檔案系統：", IDC_STATIC, 13, 46, 42, 9
+    AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50
+    LTEXT "檔案系統(&F)：", IDC_FS_STATIC, 7, 46, 70, 9
-    PUSHBUTTON "確定(&O)", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON "取消(&C)", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "確定", IDOK, 88, 98, 50, 14
+    PUSHBUTTON "取消", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Format Partition"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "檔案系統(&F)：", IDC_FS_STATIC, 7, 9, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+    PUSHBUTTON "確定", IDOK, 88, 61, 50, 14
+    PUSHBUTTON "取消", IDCANCEL, 143, 61, 50, 14
 END
 
 IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -93,12 +109,12 @@ CAPTION "Advanced Installation Options"
 FONT 9, "新細明體"
 BEGIN
     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
+    EDITTEXT IDC_PATH, 7, 23, 291, 13
     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
+    DEFPUSHBUTTON "確定", IDOK, 193, 113, 50, 14
-    PUSHBUTTON "取消", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "取消", IDCANCEL, 248, 113, 50, 14
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -169,6 +185,7 @@ BEGIN
     IDS_ABORTSETUP2 "終止安裝？"
     IDS_NO_TXTSETUP_SIF "無法找到「txtsetup.sif」。\n安裝程式無法繼續。"
     IDS_CAPTION "ReactOS 安裝程式"
+    IDS_VOLUME_NOFORMAT "Not formatted"
 END
 
 STRINGTABLE
@@ -195,6 +212,26 @@ BEGIN
     IDS_BOOTLOADER_VBRONLY "僅 VBR"
 END
 
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+    IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+    IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+    IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+    IDS_COPYING  "Copying %s"
+    IDS_MOVING   "Moving %s to %s"
+    IDS_RENAMING "Renaming %s to %s"
+    IDS_DELETING "Deleting %s"
+
+    IDS_PREPARE_PARTITIONS "Preparing partitions..."
+    IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..."
+    IDS_COPYING_FILES "Copying the files..."
+END
+
 /* Error Strings */
 
 STRINGTABLE
@@ -204,8 +241,35 @@ BEGIN
 alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\
 Spaces are not allowed."
 
-// ERROR_DIRECTORY_NAME
     IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path"
     IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \
 and only contain letters, digits, dashes and periods. Spaces are not allowed."
+
+    IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+    IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+    IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+    IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected partition?"
+    IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the selected extended partition and ALL the logical partitions it contains?"
+
+    IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+    IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+    IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to format the partition."
+
+    IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n %s\n"
+
+    IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+    IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)."
 END

base/setup/reactos/reactos.c

@@ -41,6 +41,16 @@ HANDLE ProcessHeap;
 BOOLEAN IsUnattendedSetup = FALSE;
 SETUPDATA SetupData;
 
+/* The partition where to perform the installation */
+PPARTENTRY InstallPartition = NULL;
+// static PVOLENTRY InstallVolume = NULL;
+#define InstallVolume (InstallPartition->Volume)
+
+/* The system partition we will actually use */
+PPARTENTRY SystemPartition = NULL;
+// static PVOLENTRY SystemVolume = NULL;
+#define SystemVolume (SystemPartition->Volume)
+
 /* UI elements */
 UI_CONTEXT UiContext;
 
@@ -353,10 +363,10 @@ TypeDlgProc(
 
                 case PSN_QUERYCANCEL:
                 {
-                    if (MessageBoxW(GetParent(hwndDlg),
+                    if (DisplayMessage(GetParent(hwndDlg),
-                                    pSetupData->szAbortMessage,
+                                       MB_YESNO | MB_ICONQUESTION,
-                                    pSetupData->szAbortTitle,
+                                       MAKEINTRESOURCEW(IDS_ABORTSETUP2),
-                                    MB_YESNO | MB_ICONQUESTION) == IDYES)
+                                       MAKEINTRESOURCEW(IDS_ABORTSETUP)) == IDYES)
                     {
                         /* Go to the Terminate page */
                         PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_RESTARTPAGE);
@@ -787,10 +797,10 @@ UpgradeRepairDlgProc(
 
                 case PSN_QUERYCANCEL:
                 {
-                    if (MessageBoxW(GetParent(hwndDlg),
+                    if (DisplayMessage(GetParent(hwndDlg),
-                                    pSetupData->szAbortMessage,
+                                       MB_YESNO | MB_ICONQUESTION,
-                                    pSetupData->szAbortTitle,
+                                       MAKEINTRESOURCEW(IDS_ABORTSETUP2),
-                                    MB_YESNO | MB_ICONQUESTION) == IDYES)
+                                       MAKEINTRESOURCEW(IDS_ABORTSETUP)) == IDYES)
                     {
                         /* Go to the Terminate page */
                         PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_RESTARTPAGE);
@@ -896,10 +906,10 @@ DeviceDlgProc(
 
                 case PSN_QUERYCANCEL:
                 {
-                    if (MessageBoxW(GetParent(hwndDlg),
+                    if (DisplayMessage(GetParent(hwndDlg),
-                                    pSetupData->szAbortMessage,
+                                       MB_YESNO | MB_ICONQUESTION,
-                                    pSetupData->szAbortTitle,
+                                       MAKEINTRESOURCEW(IDS_ABORTSETUP2),
-                                    MB_YESNO | MB_ICONQUESTION) == IDYES)
+                                       MAKEINTRESOURCEW(IDS_ABORTSETUP)) == IDYES)
                     {
                         /* Go to the Terminate page */
                         PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_RESTARTPAGE);
@@ -990,6 +1000,8 @@ SummaryDlgProc(
                 {
                     WCHAR CurrentItemText[256];
 
+                    ASSERT(InstallPartition);
+
                     /* Show the current selected settings */
 
                     // FIXME! Localize
@@ -1025,24 +1037,39 @@ SummaryDlgProc(
                                           ARRAYSIZE(CurrentItemText));
                     SetDlgItemTextW(hwndDlg, IDC_KEYBOARD, CurrentItemText);
 
-                    if (L'C') // FIXME!
+                    if (InstallVolume->Info.DriveLetter)
                     {
+#if 0
                         StringCchPrintfW(CurrentItemText, ARRAYSIZE(CurrentItemText),
                                          L"%c: \x2014 %wZ",
-                                         L'C', // FIXME!
+                                         InstallVolume->Info.DriveLetter,
                                          &pSetupData->USetupData.DestinationRootPath);
+#else
+                        StringCchPrintfW(CurrentItemText, ARRAYSIZE(CurrentItemText),
+                                         L"%c: \x2014 Harddisk %lu, Partition %lu",
+                                         InstallVolume->Info.DriveLetter,
+                                         InstallPartition->DiskEntry->DiskNumber,
+                                         InstallPartition->OnDiskPartitionNumber);
+#endif
                     }
                     else
                     {
+#if 0
                         StringCchPrintfW(CurrentItemText, ARRAYSIZE(CurrentItemText),
                                          L"%wZ",
                                          &pSetupData->USetupData.DestinationRootPath);
+#else
+                        StringCchPrintfW(CurrentItemText, ARRAYSIZE(CurrentItemText),
+                                         L"Harddisk %lu, Partition %lu",
+                                         InstallPartition->DiskEntry->DiskNumber,
+                                         InstallPartition->OnDiskPartitionNumber);
+#endif
                     }
                     SetDlgItemTextW(hwndDlg, IDC_DESTDRIVE, CurrentItemText);
 
                     SetDlgItemTextW(hwndDlg, IDC_PATH,
-                                    /*pSetupData->USetupData.InstallationDirectory*/
+                                    pSetupData->USetupData.InstallationDirectory
-                                    pSetupData->USetupData.InstallPath.Buffer);
+                                    /*pSetupData->USetupData.InstallPath.Buffer*/);
 
 
                     /* Change the "Next" button text to "Install" */
@@ -1076,10 +1103,10 @@ SummaryDlgProc(
 
                 case PSN_QUERYCANCEL:
                 {
-                    if (MessageBoxW(GetParent(hwndDlg),
+                    if (DisplayMessage(GetParent(hwndDlg),
-                                    pSetupData->szAbortMessage,
+                                       MB_YESNO | MB_ICONQUESTION,
-                                    pSetupData->szAbortTitle,
+                                       MAKEINTRESOURCEW(IDS_ABORTSETUP2),
-                                    MB_YESNO | MB_ICONQUESTION) == IDYES)
+                                       MAKEINTRESOURCEW(IDS_ABORTSETUP)) == IDYES)
                     {
                         /* Go to the Terminate page */
                         PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_RESTARTPAGE);
@@ -1104,6 +1131,416 @@ SummaryDlgProc(
 }
 
 
+typedef struct _FSVOL_CONTEXT
+{
+    PSETUPDATA pSetupData;
+    // PAGE_NUMBER NextPageOnAbort;
+} FSVOL_CONTEXT, *PFSVOL_CONTEXT;
+
+static
+BOOLEAN
+NTAPI
+FormatCallback(
+    _In_ CALLBACKCOMMAND Command,
+    _In_ ULONG Modifier,
+    _In_ PVOID Argument)
+{
+    switch (Command)
+    {
+        case PROGRESS:
+        {
+            PULONG Percent = (PULONG)Argument;
+            DPRINT("%lu percent completed\n", *Percent);
+            SendMessageW(UiContext.hWndProgress, PBM_SETPOS, *Percent, 0);
+            break;
+        }
+
+#if 0
+        case OUTPUT:
+        {
+            PTEXTOUTPUT output = (PTEXTOUTPUT)Argument;
+            DPRINT("%s\n", output->Output);
+            break;
+        }
+#endif
+
+        case DONE:
+        {
+#if 0
+            PBOOLEAN Success = (PBOOLEAN)Argument;
+            if (*Success == FALSE)
+            {
+                DPRINT("FormatEx was unable to complete successfully.\n\n");
+            }
+#endif
+            DPRINT("Done\n");
+            break;
+        }
+
+        default:
+            DPRINT("Unknown callback %lu\n", (ULONG)Command);
+            break;
+    }
+
+    return TRUE;
+}
+
+static
+BOOLEAN
+NTAPI
+ChkdskCallback(
+    _In_ CALLBACKCOMMAND Command,
+    _In_ ULONG Modifier,
+    _In_ PVOID Argument)
+{
+    switch (Command)
+    {
+        default:
+            DPRINT("Unknown callback %lu\n", (ULONG)Command);
+            break;
+    }
+
+    return TRUE;
+}
+
+// PFSVOL_CALLBACK
+static FSVOL_OP
+CALLBACK
+FsVolCallback(
+    _In_opt_ PVOID Context,
+    _In_ FSVOLNOTIFY FormatStatus,
+    _In_ ULONG_PTR Param1,
+    _In_ ULONG_PTR Param2)
+{
+    PFSVOL_CONTEXT FsVolContext = (PFSVOL_CONTEXT)Context;
+    WCHAR Buffer[MAX_PATH];
+
+    switch (FormatStatus)
+    {
+    // FIXME: Deprecate!
+    case ChangeSystemPartition:
+    {
+        // PPARTENTRY SystemPartition = (PPARTENTRY)Param1;
+
+        // FsVolContext->NextPageOnAbort = SELECT_PARTITION_PAGE;
+        // if (ChangeSystemPartitionPage(Ir, SystemPartition))
+        //     return FSVOL_DOIT;
+        return FSVOL_ABORT;
+    }
+
+    case FSVOLNOTIFY_PARTITIONERROR:
+    {
+        switch (Param1)
+        {
+        case STATUS_PARTITION_FAILURE:
+        {
+            // ERROR_WRITE_PTABLE
+            DisplayError(NULL,
+                         0, // Default to "Error"
+                         IDS_ERROR_WRITE_PTABLE);
+            // FsVolContext->NextPageOnAbort = QUIT_PAGE;
+            // TODO: Go back to the partitioning page?
+            break;
+        }
+
+        case ERROR_SYSTEM_PARTITION_NOT_FOUND:
+        {
+            /* FIXME: improve the error dialog */
+            //
+            // Error dialog should say that we cannot find a suitable
+            // system partition and create one on the system. At this point,
+            // it may be nice to ask the user whether he wants to continue,
+            // or use an external drive as the system drive/partition
+            // (e.g. floppy, USB drive, etc...)
+            //
+            DisplayError(NULL,
+                         0, // Default to "Error"
+                         IDS_ERROR_SYSTEM_PARTITION);
+            // FsVolContext->NextPageOnAbort = SELECT_PARTITION_PAGE;
+            // TODO: Go back to the partitioning page
+            break;
+        }
+
+        default:
+            break;
+        }
+        return FSVOL_ABORT;
+    }
+
+    case FSVOLNOTIFY_STARTQUEUE:
+    case FSVOLNOTIFY_ENDQUEUE:
+        // NOTE: If needed, clear progress gauges.
+        return FSVOL_DOIT;
+
+    case FSVOLNOTIFY_STARTSUBQUEUE:
+    {
+        if ((FSVOL_OP)Param1 == FSVOL_FORMAT)
+        {
+            /*
+             * In case we just repair an existing installation, or make
+             * an unattended setup without formatting, just go to the
+             * filesystem check step.
+             */
+            if (FsVolContext->pSetupData->RepairUpdateFlag)
+                return FSVOL_SKIP; /** HACK!! **/
+
+            if (IsUnattendedSetup && !FsVolContext->pSetupData->USetupData.FormatPartition)
+                return FSVOL_SKIP; /** HACK!! **/
+
+            /* Set status text */
+            SetDlgItemTextW(UiContext.hwndDlg, IDC_ITEM, L"");
+        }
+        else
+        if ((FSVOL_OP)Param1 == FSVOL_CHECK)
+        {
+            /* Set status text */
+            SetDlgItemTextW(UiContext.hwndDlg, IDC_ITEM, L"");
+
+            /* Filechecking step: set progress marquee style and start it up */
+            UiContext.dwPbStyle = GetWindowLongPtrW(UiContext.hWndProgress, GWL_STYLE);
+            SetWindowLongPtrW(UiContext.hWndProgress, GWL_STYLE, UiContext.dwPbStyle | PBS_MARQUEE);
+            SendMessageW(UiContext.hWndProgress, PBM_SETMARQUEE, TRUE, 0);
+        }
+
+        return FSVOL_DOIT;
+    }
+
+    case FSVOLNOTIFY_ENDSUBQUEUE:
+    {
+        if ((FSVOL_OP)Param1 == FSVOL_CHECK)
+        {
+            /* File-checking finished: stop the progress bar and restore its style */
+            SendMessageW(UiContext.hWndProgress, PBM_SETMARQUEE, FALSE, 0);
+            SetWindowLongPtrW(UiContext.hWndProgress, GWL_STYLE, UiContext.dwPbStyle);
+        }
+        return 0;
+    }
+
+    case FSVOLNOTIFY_FORMATERROR:
+    {
+        PFORMAT_VOLUME_INFO FmtInfo = (PFORMAT_VOLUME_INFO)Param1;
+
+        // FIXME: See also FSVOLNOTIFY_PARTITIONERROR
+        if (FmtInfo->ErrorStatus == STATUS_PARTITION_FAILURE)
+        {
+            // ERROR_WRITE_PTABLE
+            DisplayError(NULL,
+                         0, // Default to "Error"
+                         IDS_ERROR_WRITE_PTABLE);
+            // FsVolContext->NextPageOnAbort = QUIT_PAGE;
+            // TODO: Go back to the partitioning page?
+            return FSVOL_ABORT;
+        }
+        else
+        if (FmtInfo->ErrorStatus == STATUS_UNRECOGNIZED_VOLUME)
+        {
+            /* FIXME: show an error dialog */
+            // MUIDisplayError(ERROR_FORMATTING_PARTITION, Ir, POPUP_WAIT_ANY_KEY, PathBuffer);
+            DisplayError(NULL,
+                         0, // Default to "Error"
+                         IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME);
+            // FsVolContext->NextPageOnAbort = QUIT_PAGE;
+            return FSVOL_ABORT;
+        }
+        else
+        if (FmtInfo->ErrorStatus == STATUS_NOT_SUPPORTED)
+        {
+            INT nRet;
+
+            nRet = DisplayMessage(NULL, MB_ICONERROR | MB_OKCANCEL,
+                                  NULL, // Default to "Error"
+                                  MAKEINTRESOURCEW(IDS_ERROR_COULD_NOT_FORMAT),
+                                  FmtInfo->FileSystemName);
+            if (nRet == IDCANCEL)
+            {
+                // FsVolContext->NextPageOnAbort = QUIT_PAGE;
+                return FSVOL_ABORT;
+            }
+            else if (nRet == IDOK)
+            {
+                return FSVOL_RETRY;
+            }
+        }
+        else if (!NT_SUCCESS(FmtInfo->ErrorStatus))
+        {
+            ASSERT(*FmtInfo->Volume->Info.DeviceName);
+
+            DPRINT1("FormatPartition() failed with status 0x%08lx\n", FmtInfo->ErrorStatus);
+
+            // ERROR_FORMATTING_PARTITION
+            DisplayError(NULL,
+                         0, // Default to "Error"
+                         IDS_ERROR_FORMATTING_PARTITION,
+                         FmtInfo->Volume->Info.DeviceName);
+            // FsVolContext->NextPageOnAbort = QUIT_PAGE;
+            return FSVOL_ABORT;
+        }
+
+        return FSVOL_RETRY;
+    }
+
+    case FSVOLNOTIFY_CHECKERROR:
+    {
+        PCHECK_VOLUME_INFO ChkInfo = (PCHECK_VOLUME_INFO)Param1;
+
+        if (ChkInfo->ErrorStatus == STATUS_NOT_SUPPORTED)
+        {
+            INT nRet;
+
+            nRet = DisplayMessage(NULL, MB_ICONERROR | MB_OKCANCEL,
+                                  NULL, // Default to "Error"
+                                  MAKEINTRESOURCEW(IDS_ERROR_COULD_NOT_CHECK),
+                                  ChkInfo->Volume->Info.FileSystem);
+            if (nRet == IDCANCEL)
+            {
+                // FsVolContext->NextPageOnAbort = QUIT_PAGE;
+                return FSVOL_ABORT;
+            }
+            else if (nRet == IDOK)
+            {
+                return FSVOL_SKIP;
+            }
+        }
+        else if (!NT_SUCCESS(ChkInfo->ErrorStatus))
+        {
+            DPRINT1("ChkdskPartition() failed with status 0x%08lx\n", ChkInfo->ErrorStatus);
+
+            DisplayError(NULL,
+                         0, // Default to "Error"
+                         IDS_ERROR_CHECKING_PARTITION,
+                         ChkInfo->ErrorStatus);
+            return FSVOL_SKIP;
+        }
+
+        return FSVOL_SKIP;
+    }
+
+    case FSVOLNOTIFY_STARTFORMAT:
+    {
+        PFORMAT_VOLUME_INFO FmtInfo = (PFORMAT_VOLUME_INFO)Param1;
+        PVOL_CREATE_INFO VolCreate;
+
+        ASSERT((FSVOL_OP)Param2 == FSVOL_FORMAT);
+
+        /* Find the volume info in the partition TreeList UI.
+         * If none, don't format it. */
+        VolCreate = FindVolCreateInTreeByVolume(UiContext.hPartList,
+                                                FmtInfo->Volume);
+        if (!VolCreate)
+            return FSVOL_SKIP;
+        ASSERT(VolCreate->Volume == FmtInfo->Volume);
+
+        /* If there is no formatting information, skip it */
+        if (!*VolCreate->FileSystemName)
+            return FSVOL_SKIP;
+
+        ASSERT(*FmtInfo->Volume->Info.DeviceName);
+
+        /* Set status text */
+        if (FmtInfo->Volume->Info.DriveLetter)
+        {
+            StringCchPrintfW(Buffer, ARRAYSIZE(Buffer),
+                             L"Formatting volume %c: (%s) in %s...", // IDS_FORMATTING_PROGRESS1
+                             FmtInfo->Volume->Info.DriveLetter,
+                             FmtInfo->Volume->Info.DeviceName,
+                             VolCreate->FileSystemName);
+        }
+        else
+        {
+            StringCchPrintfW(Buffer, ARRAYSIZE(Buffer),
+                             L"Formatting volume %s in %s...", // IDS_FORMATTING_PROGRESS2
+                             FmtInfo->Volume->Info.DeviceName,
+                             VolCreate->FileSystemName);
+        }
+        SetDlgItemTextW(UiContext.hwndDlg, IDC_ITEM, Buffer);
+
+        // StartFormat(FmtInfo, FileSystemList->Selected);
+        FmtInfo->FileSystemName = VolCreate->FileSystemName;
+        FmtInfo->MediaFlag = VolCreate->MediaFlag;
+        FmtInfo->Label = VolCreate->Label;
+        FmtInfo->QuickFormat = VolCreate->QuickFormat;
+        FmtInfo->ClusterSize = VolCreate->ClusterSize;
+        FmtInfo->Callback = FormatCallback;
+
+        /* Set up the progress bar */
+        SendMessageW(UiContext.hWndProgress,
+                     PBM_SETRANGE, 0, MAKELPARAM(0, 100));
+        SendMessageW(UiContext.hWndProgress,
+                     PBM_SETPOS, 0, 0);
+
+        return FSVOL_DOIT;
+    }
+
+    case FSVOLNOTIFY_ENDFORMAT:
+    {
+        PFORMAT_VOLUME_INFO FmtInfo = (PFORMAT_VOLUME_INFO)Param1;
+
+        // EndFormat(FmtInfo->ErrorStatus);
+        if (FmtInfo->FileSystemName)
+            *(PWSTR)FmtInfo->FileSystemName = UNICODE_NULL; // FIXME: HACK!
+
+        // /* Reset the file system list */
+        // ResetFileSystemList();
+        return 0;
+    }
+
+    case FSVOLNOTIFY_STARTCHECK:
+    {
+        PCHECK_VOLUME_INFO ChkInfo = (PCHECK_VOLUME_INFO)Param1;
+        PVOL_CREATE_INFO VolCreate;
+
+        ASSERT((FSVOL_OP)Param2 == FSVOL_CHECK);
+
+        /* Find the volume info in the partition TreeList UI.
+         * If none, don't check it. */
+        VolCreate = FindVolCreateInTreeByVolume(UiContext.hPartList,
+                                                ChkInfo->Volume);
+        if (!VolCreate)
+            return FSVOL_SKIP;
+        ASSERT(VolCreate->Volume == ChkInfo->Volume);
+
+        ASSERT(*ChkInfo->Volume->Info.DeviceName);
+
+        /* Set status text */
+        if (ChkInfo->Volume->Info.DriveLetter)
+        {
+            StringCchPrintfW(Buffer, ARRAYSIZE(Buffer),
+                             L"Checking volume %c: (%s)...", // IDS_CHECKING_PROGRESS1
+                             ChkInfo->Volume->Info.DriveLetter,
+                             ChkInfo->Volume->Info.DeviceName);
+        }
+        else
+        {
+            StringCchPrintfW(Buffer, ARRAYSIZE(Buffer),
+                             L"Checking volume %s...", // IDS_CHECKING_PROGRESS2
+                             ChkInfo->Volume->Info.DeviceName);
+        }
+        SetDlgItemTextW(UiContext.hwndDlg, IDC_ITEM, Buffer);
+
+        // StartCheck(ChkInfo);
+        // TODO: Think about which values could be defaulted...
+        ChkInfo->FixErrors = TRUE;
+        ChkInfo->Verbose = FALSE;
+        ChkInfo->CheckOnlyIfDirty = TRUE;
+        ChkInfo->ScanDrive = FALSE;
+        ChkInfo->Callback = ChkdskCallback;
+
+        return FSVOL_DOIT;
+    }
+
+    case FSVOLNOTIFY_ENDCHECK:
+    {
+        // PCHECK_VOLUME_INFO ChkInfo = (PCHECK_VOLUME_INFO)Param1;
+        // EndCheck(ChkInfo->ErrorStatus);
+        return 0;
+    }
+    }
+
+    return 0;
+}
+
+
+
 typedef struct _COPYCONTEXT
 {
     PSETUPDATA pSetupData;
@@ -1134,11 +1571,14 @@ FileCopyCallback(PVOID Context,
             CopyContext->TotalOperations = (ULONG)Param2;
             CopyContext->CompletedOperations = 0;
 
+            /* Set up the progress bar */
             SendMessageW(UiContext.hWndProgress,
                          PBM_SETRANGE, 0,
                          MAKELPARAM(0, CopyContext->TotalOperations));
             SendMessageW(UiContext.hWndProgress,
                          PBM_SETSTEP, 1, 0);
+            SendMessageW(UiContext.hWndProgress,
+                         PBM_SETPOS, 0, 0);
             break;
         }
 
@@ -1198,6 +1638,15 @@ FileCopyCallback(PVOID Context,
             break;
         }
 
+        case SPFILENOTIFY_COPYERROR:
+        {
+            FilePathInfo = (PFILEPATHS_W)Param1;
+
+            DPRINT1("An error happened while trying to copy file '%S' (error 0x%08lx), skipping it...\n",
+                    FilePathInfo->Target, FilePathInfo->Win32Error);
+            return FILEOP_SKIP;
+        }
+
         case SPFILENOTIFY_ENDDELETE:
         case SPFILENOTIFY_ENDRENAME:
         case SPFILENOTIFY_ENDCOPY:
@@ -1216,6 +1665,23 @@ FileCopyCallback(PVOID Context,
     return FILEOP_DOIT;
 }
 
+/**
+ * @brief
+ * Enables or disables the Cancel and the Close title-bar
+ * property-sheet window buttons.
+ **/
+VOID
+PropSheet_SetCloseCancel(
+    _In_ HWND hWndWiz,
+    _In_ BOOL Enable)
+{
+    EnableDlgItem(hWndWiz, IDCANCEL, Enable);
+    // ShowDlgItem(hWndWiz, IDCANCEL, Enable ? SW_SHOW : SW_HIDE);
+    EnableMenuItem(GetSystemMenu(hWndWiz, FALSE),
+                   SC_CLOSE,
+                   MF_BYCOMMAND | (Enable ? MF_ENABLED : MF_GRAYED));
+}
+
 static DWORD
 WINAPI
 PrepareAndDoCopyThread(
@@ -1227,7 +1693,10 @@ PrepareAndDoCopyThread(
     LONG_PTR dwStyle;
     // ERROR_NUMBER ErrorNumber;
     BOOLEAN Success;
+    NTSTATUS Status;
+    FSVOL_CONTEXT FsVolContext;
     COPYCONTEXT CopyContext;
+    // WCHAR PathBuffer[MAX_PATH];
 
     /* Retrieve pointer to the global setup data */
     pSetupData = (PSETUPDATA)GetWindowLongPtrW(hwndDlg, GWLP_USERDATA);
@@ -1242,6 +1711,103 @@ PrepareAndDoCopyThread(
     UiContext.dwPbStyle = 0;
 
 
+    /* Disable the Close/Cancel buttons during all partition operations */
+    // TODO: Consider, alternatively, to just show an info-box saying
+    // that the installation process cannot be canceled at this stage?
+    // PropSheet_SetWizButtons(GetParent(hwndDlg), 0);
+    PropSheet_SetCloseCancel(GetParent(hwndDlg), FALSE);
+
+
+    /*
+     * Find/Set the system partition, and apply all pending partition operations.
+     */
+
+    /* Create context for the volume/partition operations */
+    FsVolContext.pSetupData = pSetupData;
+
+    /* Set status text */
+    SetDlgItemTextW(hwndDlg, IDC_ACTIVITY, L"Setting the system partition...");
+    SetDlgItemTextW(hwndDlg, IDC_ITEM, L"");
+
+    /* Find or set the active system partition before starting formatting */
+    Success = InitSystemPartition(pSetupData->PartitionList,
+                                  InstallPartition,
+                                  &SystemPartition,
+                                  FsVolCallback,
+                                  &FsVolContext);
+    // if (!Success)
+    //     return FsVolContext.NextPageOnAbort;
+    //
+    // FIXME?? If cannot use any system partition, install FreeLdr on floppy / removable media??
+    //
+    if (!Success)
+    {
+        /* Display an error if an unexpected failure happened */
+        MessageBoxW(GetParent(hwndDlg), L"Failed to find or set the system partition!", L"Error", MB_ICONERROR);
+
+        /* Re-enable the Close/Cancel buttons */
+        PropSheet_SetCloseCancel(GetParent(hwndDlg), TRUE);
+
+        /*
+         * We failed due to an unexpected error, keep on the copy page to view the current state,
+         * but enable the "Next" button to allow the user to continue to the terminate page.
+         */
+        PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT);
+        return 1;
+    }
+
+
+    /* Set status text */
+    SetDlgItemTextW(hwndDlg, IDC_ACTIVITY, L"Preparing partitions...");
+    SetDlgItemTextW(hwndDlg, IDC_ITEM, L"");
+
+    /* Apply all pending operations on partitions: formatting and checking */
+    Success = FsVolCommitOpsQueue(pSetupData->PartitionList,
+                                  SystemVolume,
+                                  InstallVolume,
+                                  FsVolCallback,
+                                  &FsVolContext);
+    if (!Success)
+    {
+        /* Display an error if an unexpected failure happened */
+        MessageBoxW(GetParent(hwndDlg), L"Failed to prepare the partitions!", L"Error", MB_ICONERROR);
+
+        /* Re-enable the Close/Cancel buttons */
+        PropSheet_SetCloseCancel(GetParent(hwndDlg), TRUE);
+
+        /*
+         * We failed due to an unexpected error, keep on the copy page to view the current state,
+         * but enable the "Next" button to allow the user to continue to the terminate page.
+         */
+        PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT);
+        return 1;
+    }
+
+
+    /* Re-enable the Close/Cancel buttons */
+    PropSheet_SetCloseCancel(GetParent(hwndDlg), TRUE);
+
+
+
+    /* Re-calculate the final destination paths */
+    ASSERT(InstallPartition);
+    Status = InitDestinationPaths(&pSetupData->USetupData,
+                                  NULL, // pSetupData->USetupData.InstallationDirectory,
+                                  InstallVolume);
+    if (!NT_SUCCESS(Status))
+    {
+        DisplayMessage(GetParent(hwndDlg), MB_ICONERROR, L"Error", L"InitDestinationPaths() failed with status 0x%08lx\n", Status);
+
+        /*
+         * We failed due to an unexpected error, keep on the copy page to view the current state,
+         * but enable the "Next" button to allow the user to continue to the terminate page.
+         */
+        PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT);
+        return 1;
+    }
+
+
+
     /*
      * Preparation of the list of files to be copied
      */
@@ -1309,9 +1875,9 @@ PrepareAndDoCopyThread(
         return 1;
     }
 
-    /* Set status text */
+    // /* Set status text */
-    SetDlgItemTextW(hwndDlg, IDC_ACTIVITY, L"Finalizing the installation...");
+    // SetDlgItemTextW(hwndDlg, IDC_ACTIVITY, L"Finalizing the installation...");
-    SetDlgItemTextW(hwndDlg, IDC_ITEM, L"");
+    // SetDlgItemTextW(hwndDlg, IDC_ITEM, L"");
 
     /* Create the $winnt$.inf file */
     InstallSetupInfFile(&pSetupData->USetupData);
@@ -1393,10 +1959,10 @@ ProcessDlgProc(
                     /* Halt the on-going file copy */
                     ResetEvent(pSetupData->hHaltInstallEvent);
 
-                    if (MessageBoxW(GetParent(hwndDlg),
+                    if (DisplayMessage(GetParent(hwndDlg),
-                                    pSetupData->szAbortMessage,
+                                       MB_YESNO | MB_ICONQUESTION,
-                                    pSetupData->szAbortTitle,
+                                       MAKEINTRESOURCEW(IDS_ABORTSETUP2),
-                                    MB_YESNO | MB_ICONQUESTION) == IDYES)
+                                       MAKEINTRESOURCEW(IDS_ABORTSETUP)) == IDYES)
                     {
                         /* Stop the file copy thread */
                         pSetupData->bStopInstall = TRUE;
@@ -1499,7 +2065,7 @@ RestartDlgProc(
                 case PSN_SETACTIVE:
                 {
                     /* Only "Finish" for closing the wizard */
-                    ShowWindow(GetDlgItem(GetParent(hwndDlg), IDCANCEL), SW_HIDE);
+                    ShowDlgItem(GetParent(hwndDlg), IDCANCEL, SW_HIDE);
                     PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_FINISH);
 
                     /* Set up the reboot progress bar */
@@ -2034,10 +2600,6 @@ _tWinMain(HINSTANCE hInst,
 
     hHotkeyThread = CreateThread(NULL, 0, HotkeyThread, NULL, 0, NULL);
 
-    /* Cache commonly-used strings */
-    LoadStringW(hInst, IDS_ABORTSETUP, SetupData.szAbortMessage, ARRAYSIZE(SetupData.szAbortMessage));
-    LoadStringW(hInst, IDS_ABORTSETUP2, SetupData.szAbortTitle, ARRAYSIZE(SetupData.szAbortTitle));
-
     /* Whenever any of the common controls are used in your app,
      * you must call InitCommonControlsEx() to register the classes
      * for those controls. */

base/setup/reactos/reactos.h

@@ -45,6 +45,12 @@
 #include <commctrl.h>
 #include <windowsx.h>
 
+#define EnableDlgItem(hDlg, nID, bEnable)   \
+    EnableWindow(GetDlgItem((hDlg), (nID)), (bEnable))
+
+#define ShowDlgItem(hDlg, nID, nCmdShow)    \
+    ShowWindow(GetDlgItem((hDlg), (nID)), (nCmdShow))
+
 /* These are public names and values determined from MFC, and compatible with Windows */
 // Property Sheet control id's (determined with Spy++)
 #define IDC_TAB_CONTROL                 0x3020
@@ -73,6 +79,7 @@
 /* UI elements */
 typedef struct _UI_CONTEXT
 {
+    HWND hPartList; // Disks & partitions list
     HWND hwndDlg;   // Install progress page
     HWND hWndItem;  // Progress action
     HWND hWndProgress;  // Progress gauge
@@ -132,9 +139,6 @@ typedef struct _SETUPDATA
     HANDLE hHaltInstallEvent;
     BOOL bStopInstall;
 
-    TCHAR szAbortMessage[512];
-    TCHAR szAbortTitle[64];
-
     NT_WIN32_PATH_MAPPING_LIST MappingList;
 
     USETUP_DATA USetupData;
@@ -163,6 +167,34 @@ extern BOOLEAN IsUnattendedSetup;
 
 extern SETUPDATA SetupData;
 
+extern PPARTENTRY InstallPartition;
+extern PPARTENTRY SystemPartition;
+
+/**
+ * @brief   Data structure stored when a partition/volume needs to be formatted.
+ **/
+typedef struct _VOL_CREATE_INFO
+{
+    PVOLENTRY Volume;
+
+    /* Volume-related parameters:
+     * Cached input information that will be set to
+     * the FORMAT_VOLUME_INFO structure given to the
+     * 'FSVOLNOTIFY_STARTFORMAT' step */
+    // PCWSTR FileSystemName;
+    WCHAR FileSystemName[MAX_PATH+1];
+    FMIFS_MEDIA_FLAG MediaFlag;
+    PCWSTR Label;
+    BOOLEAN QuickFormat;
+    ULONG ClusterSize;
+} VOL_CREATE_INFO, *PVOL_CREATE_INFO;
+
+/* See drivepage.c */
+PVOL_CREATE_INFO
+FindVolCreateInTreeByVolume(
+    _In_ HWND hTreeList,
+    _In_ PVOLENTRY Volume);
+
 
 /*
  * Attempts to convert a pure NT file path into a corresponding Win32 path.
@@ -181,10 +213,10 @@ ConvertNtPathToWin32Path(
 INT_PTR
 CALLBACK
 DriveDlgProc(
-    HWND hwndDlg,
+    _In_ HWND hwndDlg,
-    UINT uMsg,
+    _In_ UINT uMsg,
-    WPARAM wParam,
+    _In_ WPARAM wParam,
-    LPARAM lParam);
+    _In_ LPARAM lParam);
 
 
 /* reactos.c */

base/setup/reactos/resource.h

@@ -36,9 +36,12 @@
 
 #define IDD_DRIVEPAGE        2040
 #define IDC_PARTITION        2041
-#define IDC_PARTCREATE       2042
+#define IDC_INITDISK         2042
-#define IDC_PARTDELETE       2043
+#define IDC_PARTCREATE       2043
-#define IDC_DEVICEDRIVER     2044
+#define IDC_PARTFORMAT       2044
+#define IDC_PARTDELETE       2045
+#define IDC_DEVICEDRIVER     2046
+#define IDC_PARTMOREOPTS     2047
 
 #define IDD_SUMMARYPAGE      2050
 #define IDC_INSTALLTYPE      2051
@@ -59,17 +62,21 @@
 #define IDD_RESTARTPAGE      2070
 #define IDC_FINISHTITLE      2071
 #define IDC_RESTART_PROGRESS 2072
-#define IDC_PARTMOREOPTS     2073
 
 #define IDD_ADVINSTOPTS      2080
 #define IDC_PATH             2081
 #define IDC_INSTFREELDR      2082
 
 #define IDD_PARTITION        2090
-#define IDC_UPDOWN1          2091
+#define IDC_EDIT_PARTSIZE    2091
-#define IDC_PARTSIZE         2092
+#define IDC_UPDOWN_PARTSIZE  2092
 #define IDC_UNIT             2093
-#define IDC_FSTYPE           2094
+#define IDC_CHECK_MBREXTPART 2094
+#define IDC_FS_STATIC        2095
+#define IDC_FSTYPE           2096
+#define IDC_CHECK_QUICKFMT   2097
+
+#define IDD_FORMAT 2100
 
 
 /* Strings */
@@ -89,28 +96,73 @@
 #define IDS_SUMMARYSUBTITLE  5051
 #define IDS_NO_TXTSETUP_SIF  5053
 #define IDS_CAPTION          5054
+#define IDS_VOLUME_NOFORMAT  5060
 
 #define IDS_INSTALLATION_NAME   5100
 #define IDS_INSTALLATION_PATH   5101
 #define IDS_INSTALLATION_VENDOR 5102
 
-#define IDS_PARTITION_NAME   5200
+#define IDS_PARTITION_NAME   5110
-#define IDS_PARTITION_TYPE   5201
+#define IDS_PARTITION_TYPE   5111
-#define IDS_PARTITION_SIZE   5202
+#define IDS_PARTITION_SIZE   5112
-#define IDS_PARTITION_STATUS 5203
+#define IDS_PARTITION_STATUS 5113
 
 // WARNING: These IDs *MUST* stay in increasing order!
-#define IDS_BOOTLOADER_NOINST       5300
+#define IDS_BOOTLOADER_NOINST       5120
-#define IDS_BOOTLOADER_REMOVABLE    5301
+#define IDS_BOOTLOADER_REMOVABLE    5121
-#define IDS_BOOTLOADER_SYSTEM       5302    // For non-MBR disks
+#define IDS_BOOTLOADER_SYSTEM       5122    // For non-MBR disks
-#define IDS_BOOTLOADER_MBRVBR       5303    // For MBR disks only
+#define IDS_BOOTLOADER_MBRVBR       5123    // For MBR disks only
-#define IDS_BOOTLOADER_VBRONLY      5304    // ""
+#define IDS_BOOTLOADER_VBRONLY      5124    // ""
+
+
+/* Progress Strings */
+#define IDS_FORMATTING_PROGRESS1    5200
+#define IDS_FORMATTING_PROGRESS2    5201
+#define IDS_CHECKING_PROGRESS1      5202
+#define IDS_CHECKING_PROGRESS2      5203
+#define IDS_COPYING                 5204
+#define IDS_MOVING                  5205
+#define IDS_RENAMING                5206
+#define IDS_DELETING                5207
+#define IDS_PREPARE_PARTITIONS      5208
+#define IDS_PREPARE_FILES           5209
+#define IDS_COPYING_FILES           5210
 
 
 /* Error Strings */
-#define IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE 5400
+#define IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE 5300
-#define IDS_ERROR_INVALID_INSTALLDIR_CHAR       5401
+#define IDS_ERROR_INVALID_INSTALLDIR_CHAR       5301
 
 // ERROR_DIRECTORY_NAME
-#define IDS_ERROR_DIRECTORY_NAME_TITLE          5402
+#define IDS_ERROR_DIRECTORY_NAME_TITLE          5302
-#define IDS_ERROR_DIRECTORY_NAME                5403
+#define IDS_ERROR_DIRECTORY_NAME                5303
+
+// ERROR_CREATE_PARTITION // TODO?
+#define IDS_ERROR_CREATE_PARTITION_TITLE        5304
+#define IDS_ERROR_CREATE_PARTITION              5305
+
+#define IDS_WARN_DELETE_PARTITION_TITLE         5306
+#define IDS_WARN_DELETE_PARTITION               5307
+#define IDS_WARN_DELETE_MBR_EXTENDED_PARTITION  5308
+
+// ERROR_WRITE_PTABLE
+#define IDS_ERROR_WRITE_PTABLE          5309
+
+// ERROR_SYSTEM_PARTITION_NOT_FOUND
+// ERROR_SYSTEM_PARTITION // TODO
+#define IDS_ERROR_SYSTEM_PARTITION      5310
+
+// ERROR_FORMAT_UNRECOGNIZED_VOLUME // TODO
+#define IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME    5311
+
+// ERROR_COULD_NOT_FORMAT // TODO?
+#define IDS_ERROR_COULD_NOT_FORMAT      5312
+
+// ERROR_FORMATTING_PARTITION
+#define IDS_ERROR_FORMATTING_PARTITION  5313
+
+// ERROR_COULD_NOT_CHECK // TODO?
+#define IDS_ERROR_COULD_NOT_CHECK       5314
+
+// ERROR_CHECKING_PARTITION // TODO
+#define IDS_ERROR_CHECKING_PARTITION    5315

base/setup/usetup/usetup.c

@@ -1718,7 +1718,7 @@ SelectPartitionPage(PINPUT_RECORD Ir)
                 PopupError("The disk you have selected for installing ReactOS\n"
                            "is not visible by the firmware of your computer,\n"
                            "and so may not be bootable.\n"
-                           "Press ENTER to continue nonetheless.",
+                           "Press ENTER to continue anyway.",
                            MUIGetString(STRING_CONTINUE),
                            Ir, POPUP_WAIT_ENTER);
                 // return SELECT_PARTITION_PAGE;
@@ -2101,8 +2101,8 @@ CreatePartitionPage(PINPUT_RECORD Ir)
 
         /*
          * If the input size, given in MB, specifies the maximum partition
-         * size, it may slightly under- or over-estimate it due to rounding
+         * size, it may slightly under- or over-estimate the latter due to
-         * error. In this case, use all of the unpartitioned disk space.
+         * rounding error. In this case, use all of the unpartitioned space.
          * Otherwise, directly convert the size to bytes.
          */
         if (PartSize == MaxSize)
@@ -2634,7 +2634,7 @@ FsVolCallback(
             // (e.g. floppy, USB drive, etc...)
             //
             PopupError("The ReactOS Setup could not find a supported system partition\n"
-                       "on your system or could not create a new one. Without such partition\n"
+                       "on your system or could not create a new one. Without such a partition\n"
                        "the Setup program cannot install ReactOS.\n"
                        "Press ENTER to return to the partition selection list.",
                        MUIGetString(STRING_CONTINUE),