[ros-diffs] 11/13: [REACTOS] Update translations and add dialog controls for Setup Summary dialog.

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

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

commit 6b1e7b182a6ebfffa699c71b3bbab84dd7c4897e
Author:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Sun Jan 28 22:53:47 2018 +0100
Commit:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Tue Nov 6 00:09:15 2018 +0100

    [REACTOS] Update translations and add dialog controls for Setup Summary dialog.
---
 base/setup/reactos/lang/bg-BG.rc |  46 ++++++++++++-----
 base/setup/reactos/lang/cs-CZ.rc |  42 +++++++++++-----
 base/setup/reactos/lang/de-DE.rc |  42 +++++++++++-----
 base/setup/reactos/lang/el-GR.rc |  46 ++++++++++++-----
 base/setup/reactos/lang/en-US.rc |  40 +++++++++++----
 base/setup/reactos/lang/es-ES.rc |  42 +++++++++++-----
 base/setup/reactos/lang/et-EE.rc |  42 +++++++++++-----
 base/setup/reactos/lang/fi-FI.rc |  42 +++++++++++-----
 base/setup/reactos/lang/fr-FR.rc |  46 ++++++++++++-----
 base/setup/reactos/lang/he-IL.rc |  44 ++++++++++++-----
 base/setup/reactos/lang/hu-HU.rc |  54 +++++++++++++-------
 base/setup/reactos/lang/it-IT.rc |  40 +++++++++++----
 base/setup/reactos/lang/ja-JP.rc |  44 ++++++++++++-----
 base/setup/reactos/lang/ms-MY.rc |  44 ++++++++++++-----
 base/setup/reactos/lang/no-NO.rc |  44 ++++++++++++-----
 base/setup/reactos/lang/pl-PL.rc |  44 ++++++++++++-----
 base/setup/reactos/lang/pt-BR.rc |  42 +++++++++++-----
 base/setup/reactos/lang/ro-RO.rc |  40 +++++++++++----
 base/setup/reactos/lang/ru-RU.rc |  42 +++++++++++-----
 base/setup/reactos/lang/sk-SK.rc |  42 +++++++++++-----
 base/setup/reactos/lang/sq-AL.rc |  42 +++++++++++-----
 base/setup/reactos/lang/tr-TR.rc |  38 ++++++++++----
 base/setup/reactos/lang/uk-UA.rc |  42 +++++++++++-----
 base/setup/reactos/lang/vi-VN.rc |  40 +++++++++++----
 base/setup/reactos/lang/zh-CN.rc |  42 +++++++++++-----
 base/setup/reactos/lang/zh-TW.rc |  42 +++++++++++-----
 base/setup/reactos/resource.h    | 104 ++++++++++++++++++++++-----------------
 27 files changed, 875 insertions(+), 343 deletions(-)

diff --git a/base/setup/reactos/lang/bg-BG.rc b/base/setup/reactos/lang/bg-BG.rc
index 0dfb5d6e67..41d203e678 100644
--- a/base/setup/reactos/lang/bg-BG.rc
+++ b/base/setup/reactos/lang/bg-BG.rc
@@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYS
 CAPTION "Настройка на РеактОС"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Съветникът за настройка на РеактОС ви приветства!", IDC_STARTTITLE,
115, 8, 195, 24
+    LTEXT "Съветникът за настройка на РеактОС ви приветства", IDC_STARTTITLE,
115, 8, 195, 24
     LTEXT "Все още не можете да сложите РеактОС направо от този КД! Презапуснете
компютъра с този КД, за да сложите РеактОС.", IDC_STATIC, 115, 40, 195, 100
     LTEXT "Натиснете „Приключване“ за изход от настройването.", IDC_STATIC,
115, 169, 195, 17
 END
@@ -15,22 +15,22 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Настройка на РеактОС"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    AUTORADIOBUTTON "Слагане на РеактОС", IDC_INSTALL, 7, 7, 277, 10
-    LTEXT "Install a new copy of ReactOS. This option does not keep your files,
settings and programs. You can make changes to disks and partitions.",
IDC_INSTALLTEXT, 18, 18, 269, 25
+    AUTORADIOBUTTON "Слагане на РеактОС", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP
| WS_TABSTOP
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files,
settings and programs. You can make changes to disks and partitions.",
IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP
     AUTORADIOBUTTON "Поправка или осъвременяване на сложен РеактОС",
IDC_UPDATE, 7, 50, 277, 10
-    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your
files, settings and programs. This option is only available if ReactOS is already
installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your
files, settings and programs. This option is only available if ReactOS is already
installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP
     LTEXT "Натиснете „Напред“ за настройка на устройствата.", IDC_STATIC, 7,
128, 297, 8
 END
 
 IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Setup"
+CAPTION "Настройка на РеактОС"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT       "The ReactOS Setup can upgrade one of the available ReactOS
installations listed below, or, if a ReactOS installation is damaged, the Setup program
can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18
     CONTROL     "", IDC_NTOSLIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303,
90
     PUSHBUTTON  "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14
-    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
128, 222, 16
+    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
124, 222, 16
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -52,12 +52,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 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
+    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 "Из&триване", IDC_PARTDELETE, 63, 122, 50, 15
     PUSHBUTTON "Драйвер", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
     PUSHBUTTON "Раз&ширани възможности...", IDC_PARTMOREOPTS, 230, 122, 80,
15
-    LTEXT "Натиснете „Напред“, за да започне слагането.", IDC_STATIC, 10, 180,
277, 20
+    // LTEXT "Натиснете „Напред“, за да започне слагането.", IDC_STATIC, 10,
180, 277, 20
 END
 
 IDD_PARTITION DIALOGEX 0, 0, 145, 90
@@ -93,10 +93,28 @@ END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Слагане на РеактОС"
+CAPTION "Настройка на РеактОС"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Натиснете „Напред“ за за начало на слагането.", IDC_STATIC, 7, 180,
303, 20
+    LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11
+    EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11
+    EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL |
WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11
+    EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE
| NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11
+    EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11
+    EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11
+    EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11
+    EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11
+    EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT
WS_BORDER | NOT WS_TABSTOP
+    AUTOCHECKBOX "I confirm that all the installation settings are correct. I also
acknowledge that\nReactOS is alpha-quality software and may break on my computer or
corrupt my data.",
+        IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE
+    LTEXT "Please confirm that all the installation settings are correct,\nthen
click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18
 END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
@@ -111,9 +129,10 @@ END
 
 IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Завършване настройката на РеактОС"
+CAPTION "Настройка на РеактОС"
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195,
24
     LTEXT "Първата степен от настройването на РеактОС приключи успешно.",
IDC_STATIC, 20, 50, 277, 10
     LTEXT "Когато натиснете „Край”, компютърът ви ще се презапусне.",
IDC_STATIC, 20, 80, 277, 10
     CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH
| WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
@@ -136,7 +155,7 @@ BEGIN
     IDS_SUMMARYSUBTITLE "Списък на възможностите за слагане за проверка преди
прилагане върху устройството за слагане"
     IDS_ABORTSETUP "РеактОС не е напълно сложен на компютъра ви. Ако излезете от
настройването сега, ще трябва да пуснете настройването отново, за да сложите Реактос.
Наистина ли излизате?"
     IDS_ABORTSETUP2 "Прекъсване на слагането?"
-    IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to
continue."
+    IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to
continue."
     IDS_CAPTION "Настройка на РеактОС"
 END
 
@@ -150,6 +169,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_PARTITION_NAME "Name"
-    IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_TYPE "Type"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_STATUS "Status"
 END
diff --git a/base/setup/reactos/lang/cs-CZ.rc b/base/setup/reactos/lang/cs-CZ.rc
index 044a6d9029..a40c426f78 100644
--- a/base/setup/reactos/lang/cs-CZ.rc
+++ b/base/setup/reactos/lang/cs-CZ.rc
@@ -11,7 +11,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYS
 CAPTION "Instalace systému ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Vítejte v průvodci instalace systému ReactOS.", IDC_STARTTITLE, 115,
8, 195, 24
+    LTEXT "Vítejte v průvodci instalace systému ReactOS", IDC_STARTTITLE, 115,
8, 195, 24
     LTEXT "Systém ReactOS zatím nelze nainstalovat přímo z tohoto CD! Pro instalaci
restartuje počítač z tohoto CD.", IDC_STATIC, 115, 40, 195, 100
     LTEXT "Klepnutím na Dokončit ukončíte instalaci.", IDC_STATIC, 115, 169,
195, 17
 END
@@ -21,10 +21,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Instalace systému ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    AUTORADIOBUTTON "Nainstalovat systém ReactOS", IDC_INSTALL, 7, 7, 277, 10
-    LTEXT "Instalovat novou kopii systému ReactOS. Tato možnost odstraní Vaše
soubory, nastavení a programy. Můžete provést úpravu disků a oddílů.",
IDC_INSTALLTEXT, 18, 18, 269, 25
+    AUTORADIOBUTTON "Nainstalovat systém ReactOS", IDC_INSTALL, 7, 7, 277, 10,
WS_GROUP | WS_TABSTOP
+    LTEXT "Instalovat novou kopii systému ReactOS. Tato možnost odstraní Vaše
soubory, nastavení a programy. Můžete provést úpravu disků a oddílů.",
IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP
     AUTORADIOBUTTON "Opravit nebo aktualizovat již nainstalovaný systém
ReactOS", IDC_UPDATE, 7, 50, 277, 10
-    LTEXT "Aktualizovat nebo opravit kopii systémy ReactOS. Tato možnost zachová
Vaše soubory, nastavení a programy. Tato možnost je dostupná pouze pokud je již na Vašem
počítači systém ReactOS nainstalován.", IDC_UPDATETEXT, 18, 61, 269, 30
+    LTEXT "Aktualizovat nebo opravit kopii systémy ReactOS. Tato možnost zachová
Vaše soubory, nastavení a programy. Tato možnost je dostupná pouze pokud je již na Vašem
počítači systém ReactOS nainstalován.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT
WS_GROUP
     LTEXT "Po klepnutí na Další bude možné nastavit zařízení.", IDC_STATIC, 7,
128, 297, 8
 END
 
@@ -36,7 +36,7 @@ BEGIN
     LTEXT       "The ReactOS Setup can upgrade one of the available ReactOS
installations listed below, or, if a ReactOS installation is damaged, the Setup program
can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18
     CONTROL     "", IDC_NTOSLIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303,
90
     PUSHBUTTON  "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14
-    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
128, 222, 16
+    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
124, 222, 16
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -58,12 +58,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Instalace systému ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    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 "&Smazat", IDC_PARTDELETE, 63, 122, 50, 15
     PUSHBUTTON "&Ovladač", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
     PUSHBUTTON "&Pokročilé volby...", IDC_PARTMOREOPTS, 230, 122, 80, 15
-    LTEXT "Po klepnutí na Další bude možné zkontrolovat všechna nastavení.",
IDC_STATIC, 10, 180, 277, 20
+    // LTEXT "Po klepnutí na Další bude možné zkontrolovat všechna nastavení.",
IDC_STATIC, 10, 180, 277, 20
 END
 
 IDD_PARTITION DIALOGEX 0, 0, 145, 90
@@ -102,7 +102,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Instalace systému ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Klepnutím na Další zahájíte instalační proces.", IDC_STATIC, 7, 180,
303, 20
+    LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11
+    EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11
+    EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL |
WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11
+    EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE
| NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11
+    EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11
+    EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11
+    EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11
+    EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11
+    EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT
WS_BORDER | NOT WS_TABSTOP
+    AUTOCHECKBOX "I confirm that all the installation settings are correct. I also
acknowledge that\nReactOS is alpha-quality software and may break on my computer or
corrupt my data.",
+        IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE
+    LTEXT "Please confirm that all the installation settings are correct,\nthen
click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18
 END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
@@ -117,9 +135,10 @@ END
 
 IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Dokončení instalace systému ReactOS"
+CAPTION "Instalace systému ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195,
24
     LTEXT "První část instalace systému ReactOS byla úspěšně dokončena.",
IDC_STATIC, 20, 50, 277, 10
     LTEXT "Po klepnutí na Dokončit bude počítač restartován.", IDC_STATIC, 20,
80, 277, 10
     CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH
| WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
@@ -142,7 +161,7 @@ BEGIN
     IDS_SUMMARYSUBTITLE "Výpis voleb instalace k ověření před tím, než začne
instalace"
     IDS_ABORTSETUP "Systém ReactOS není na tomto počítači kompletně nainstalovaný.
Pokud nyní ukončíte instalaci, bude ji pro nainstalování systému ReactOS nutné provést
znova. Opravdu ukončit?"
     IDS_ABORTSETUP2 "Přerušit instalaci?"
-    IDS_NO_TXTSETUP_SIF "Soubor 'txtsetup.sif' nenalezen.\nInstalace nemůže
pokračovat.."
+    IDS_NO_TXTSETUP_SIF "Soubor 'txtsetup.sif' nenalezen.\nInstalace nemůže
pokračovat."
     IDS_CAPTION "Instalace systému ReactOS"
 END
 
@@ -156,6 +175,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_PARTITION_NAME "Name"
-    IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_TYPE "Type"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_STATUS "Status"
 END
diff --git a/base/setup/reactos/lang/de-DE.rc b/base/setup/reactos/lang/de-DE.rc
index d6deb52614..1e245c3573 100644
--- a/base/setup/reactos/lang/de-DE.rc
+++ b/base/setup/reactos/lang/de-DE.rc
@@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYS
 CAPTION "ReactOS-Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Willkommen beim ReactOS-Setup-Assistenten.", IDC_STARTTITLE, 115, 8,
195, 24
+    LTEXT "Willkommen beim ReactOS-Setup-Assistenten", IDC_STARTTITLE, 115, 8,
195, 24
     LTEXT "ReactOS kann noch nicht direkt von dieser CD installiert werden! Bitte
starten Sie Ihren Computer mit dieser CD um ReactOS zu installieren.", IDC_STATIC,
115, 40, 195, 100
     LTEXT "Klicken Sie auf Beenden um das Setup zu verlassen.", IDC_STATIC,
115, 169, 195, 17
 END
@@ -15,22 +15,22 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "ReactOS-Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    AUTORADIOBUTTON "Installiere ReactOS", IDC_INSTALL, 7, 7, 277, 10
-    LTEXT "Installiert eine neue Kopie von ReactOS. Diese Option behält nicht  Ihre
Dateien, Einstellungen und Programme bei. Sie können Änderungen an Festplatten und
Partitionen durchführen.", IDC_INSTALLTEXT, 18, 18, 269, 25
+    AUTORADIOBUTTON "Installiere ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP
| WS_TABSTOP
+    LTEXT "Installiert eine neue Kopie von ReactOS. Diese Option behält nicht  Ihre
Dateien, Einstellungen und Programme bei. Sie können Änderungen an Festplatten und
Partitionen durchführen.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP
     AUTORADIOBUTTON "Aktualisiere oder repariere ein installiertes ReactOS",
IDC_UPDATE, 7, 50, 277, 10
-    LTEXT "Aktualisieren oder reparieren einer installierten Kopie von ReactOS.
Diese Option behält Ihre Dateien, Einstellungen und Programme bei. Diese Option ist nur
verfügbar, wenn ReactOS bereits auf diesem Computer installiert ist.",
IDC_UPDATETEXT, 18, 61, 269, 30
+    LTEXT "Aktualisieren oder reparieren einer installierten Kopie von ReactOS.
Diese Option behält Ihre Dateien, Einstellungen und Programme bei. Diese Option ist nur
verfügbar, wenn ReactOS bereits auf diesem Computer installiert ist.",
IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP
     LTEXT "Klicken Sie auf Weiter um die Geräte einzustellen.", IDC_STATIC, 7,
128, 297, 8
 END
 
 IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Setup"
+CAPTION "ReactOS-Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT       "The ReactOS Setup can upgrade one of the available ReactOS
installations listed below, or, if a ReactOS installation is damaged, the Setup program
can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18
     CONTROL     "", IDC_NTOSLIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303,
90
     PUSHBUTTON  "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14
-    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
128, 222, 16
+    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
124, 222, 16
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -52,12 +52,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "ReactOS-Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    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 "&Löschen", IDC_PARTDELETE, 63, 122, 50, 15
     PUSHBUTTON "&Treiber", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
     PUSHBUTTON "E&rweiterte Optionen...", IDC_PARTMOREOPTS, 230, 122, 80,
15
-    LTEXT "Klicken Sie auf Weiter um die Zusammenfassung zu überprüfen.",
IDC_STATIC, 10, 180, 277, 20
+    // LTEXT "Klicken Sie auf Weiter um die Zusammenfassung zu überprüfen.",
IDC_STATIC, 10, 180, 277, 20
 END
 
 IDD_PARTITION DIALOGEX 0, 0, 145, 90
@@ -96,7 +96,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYS
 CAPTION "ReactOS-Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Klicken Sie auf Weiter um die Installation zu starten.", IDC_STATIC,
7, 180, 303, 20
+    LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11
+    EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11
+    EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL |
WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11
+    EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE
| NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11
+    EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11
+    EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11
+    EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11
+    EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11
+    EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT
WS_BORDER | NOT WS_TABSTOP
+    AUTOCHECKBOX "I confirm that all the installation settings are correct. I also
acknowledge that\nReactOS is alpha-quality software and may break on my computer or
corrupt my data.",
+        IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE
+    LTEXT "Please confirm that all the installation settings are correct,\nthen
click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18
 END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
@@ -111,9 +129,10 @@ END
 
 IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Vervollständige ReactOS-Setup"
+CAPTION "ReactOS-Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195,
24
     LTEXT "Sie haben die erste Stufe des ReactOS-Setup erfolgreich
abgeschlossen.", IDC_STATIC, 20, 50, 277, 10
     LTEXT "Wenn Sie auf Beenden klicken, wird der Computer neu gestartet.",
IDC_STATIC, 20, 80, 277, 10
     CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH
| WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
@@ -150,6 +169,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_PARTITION_NAME "Name"
-    IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_TYPE "Type"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_STATUS "Status"
 END
diff --git a/base/setup/reactos/lang/el-GR.rc b/base/setup/reactos/lang/el-GR.rc
index 5131e5acba..81d3bff8b8 100644
--- a/base/setup/reactos/lang/el-GR.rc
+++ b/base/setup/reactos/lang/el-GR.rc
@@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYS
 CAPTION "Εγκατάσταση του ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Καλώς ήλθατε στον οδηγό εγκατάστασης του ReactOS.", IDC_STARTTITLE,
115, 8, 195, 24
+    LTEXT "Καλώς ήλθατε στον οδηγό εγκατάστασης του ReactOS", IDC_STARTTITLE,
115, 8, 195, 24
     LTEXT "Δε μπορείτε να εγκαταστήσετε το ReactOS απευθείας από αυτό το CD ακόμα!
Παρακαλούμε επανεκκινήστε τον υπολογιστή σας από αυτό το CD για να μπορέσετε να
εγκαταστήσετε το ReactOS.", IDC_STATIC, 115, 40, 195, 100
     LTEXT "Πατήστε Ολοκλήρωση για να βγείτε από την Εγκατάσταση.", IDC_STATIC,
115, 169, 195, 17
 END
@@ -15,22 +15,22 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Εγκατάσταση του ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    AUTORADIOBUTTON "Install ReactOS", IDC_INSTALL, 7, 7, 277, 10
-    LTEXT "Install a new copy of ReactOS. This option does not keep your files,
settings and programs. You can make changes to disks and partitions.",
IDC_INSTALLTEXT, 18, 18, 269, 25
+    AUTORADIOBUTTON "Install ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP |
WS_TABSTOP
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files,
settings and programs. You can make changes to disks and partitions.",
IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP
     AUTORADIOBUTTON "Update or repair an installed ReactOS", IDC_UPDATE, 7, 50,
277, 10
-    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your
files, settings and programs. This option is only available if ReactOS is already
installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your
files, settings and programs. This option is only available if ReactOS is already
installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP
     LTEXT "Πατήστε Επόμενο για να ρυθμίσετε τις συσκευές.", IDC_STATIC, 7, 128,
297, 8
 END
 
 IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Setup"
+CAPTION "Εγκατάσταση του ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT       "The ReactOS Setup can upgrade one of the available ReactOS
installations listed below, or, if a ReactOS installation is damaged, the Setup program
can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18
     CONTROL     "", IDC_NTOSLIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303,
90
     PUSHBUTTON  "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14
-    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
128, 222, 16
+    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
124, 222, 16
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -52,12 +52,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Εγκατάσταση του ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    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 "&Διαγραφή", IDC_PARTDELETE, 63, 122, 50, 15
     PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
     PUSHBUTTON "&Επιλογές για προχωρημένους...", IDC_PARTMOREOPTS, 230,
122, 80, 15
-    LTEXT "Πατήστε Επόμενο για να ξεκινήσετε τη διαδικασία εγκατάστασης.",
IDC_STATIC, 10, 180, 277, 20
+    // LTEXT "Πατήστε Επόμενο για να ξεκινήσετε τη διαδικασία εγκατάστασης.",
IDC_STATIC, 10, 180, 277, 20
 END
 
 IDD_PARTITION DIALOGEX 0, 0, 145, 90
@@ -93,10 +93,28 @@ END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Setup"
+CAPTION "Εγκατάσταση του ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Click Next to start the installation process.", IDC_STATIC, 7, 180,
303, 20
+    LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11
+    EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11
+    EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL |
WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11
+    EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE
| NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11
+    EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11
+    EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11
+    EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11
+    EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11
+    EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT
WS_BORDER | NOT WS_TABSTOP
+    AUTOCHECKBOX "I confirm that all the installation settings are correct. I also
acknowledge that\nReactOS is alpha-quality software and may break on my computer or
corrupt my data.",
+        IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE
+    LTEXT "Please confirm that all the installation settings are correct,\nthen
click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18
 END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
@@ -111,9 +129,10 @@ END
 
 IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Ολοκληρώνεται η εγκατάσταση του ReactOS"
+CAPTION "Εγκατάσταση του ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195,
24
     LTEXT "Ολοκληρώσατε επιτυχώς το πρώτο στάδιο της εγκατάστασης του
ReactOS.", IDC_STATIC, 20, 50, 277, 10
     LTEXT "Όταν πατήσετε Ολοκλήρωση, θα γίνει επανεκκίνηση του υπολογιστή
σας.", IDC_STATIC, 20, 80, 277, 10
     CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH
| WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
@@ -136,7 +155,7 @@ BEGIN
     IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the
installation device"
     IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you
quit Setup now, you will need to run Setup again to install ReactOS. Really quit?"
     IDS_ABORTSETUP2 "Abort installation?"
-    IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to
continue."
+    IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to
continue."
     IDS_CAPTION "ReactOS Setup"
 END
 
@@ -150,6 +169,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_PARTITION_NAME "Name"
-    IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_TYPE "Type"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_STATUS "Status"
 END
diff --git a/base/setup/reactos/lang/en-US.rc b/base/setup/reactos/lang/en-US.rc
index 1009cf9206..68ee6cac5a 100644
--- a/base/setup/reactos/lang/en-US.rc
+++ b/base/setup/reactos/lang/en-US.rc
@@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYS
 CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Welcome to the ReactOS Setup Wizard.", IDC_STARTTITLE, 115, 8, 195,
24
+    LTEXT "Welcome to the ReactOS Setup Wizard", IDC_STARTTITLE, 115, 8, 195,
24
     LTEXT "You cannot install ReactOS directly from this CD yet! Please restart your
computer from this CD in order to install ReactOS.", IDC_STATIC, 115, 40, 195, 100
     LTEXT "Click Finish to exit the Setup.", IDC_STATIC, 115, 169, 195, 17
 END
@@ -15,10 +15,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    AUTORADIOBUTTON "Install ReactOS", IDC_INSTALL, 7, 7, 277, 10
-    LTEXT "Install a new copy of ReactOS. This option does not keep your files,
settings and programs. You can make changes to disks and partitions.",
IDC_INSTALLTEXT, 18, 18, 269, 25
+    AUTORADIOBUTTON "Install ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP |
WS_TABSTOP
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files,
settings and programs. You can make changes to disks and partitions.",
IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP
     AUTORADIOBUTTON "Update or repair ReactOS", IDC_UPDATE, 7, 50, 277, 10
-    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your
files, settings and programs. This option is only available if ReactOS is already
installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your
files, settings and programs. This option is only available if ReactOS is already
installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP
     LTEXT "Click Next to continue.", IDC_STATIC, 7, 128, 297, 8
 END
 
@@ -30,7 +30,7 @@ BEGIN
     LTEXT       "The ReactOS Setup can upgrade one of the available ReactOS
installations listed below, or, if a ReactOS installation is damaged, the Setup program
can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18
     CONTROL     "", IDC_NTOSLIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303,
90
     PUSHBUTTON  "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14
-    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
128, 222, 16
+    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
124, 222, 16
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -52,12 +52,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    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, 14
     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 */
+    // LTEXT "Click Next to check the summary.", IDC_STATIC, 7, 128, 277, 8
 END
 
 IDD_PARTITION DIALOGEX 0, 0, 145, 90
@@ -96,7 +96,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYS
 CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Click Next to start the installation process.", IDC_STATIC, 7, 128,
303, 8
+    LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11
+    EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11
+    EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL |
WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11
+    EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE
| NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11
+    EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11
+    EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11
+    EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11
+    EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11
+    EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT
WS_BORDER | NOT WS_TABSTOP
+    AUTOCHECKBOX "I confirm that all the installation settings are correct. I also
acknowledge that\nReactOS is alpha-quality software and may break on my computer or
corrupt my data.",
+        IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE
+    LTEXT "Please confirm that all the installation settings are correct,\nthen
click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18
 END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
@@ -114,6 +132,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Completing ReactOS Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195,
24
     LTEXT "You have successfully completed the first stage of ReactOS Setup.",
IDC_STATIC, 115, 50, 195, 10
     LTEXT "When you click Finish, your computer will restart.", IDC_STATIC,
115, 80, 195, 10
     CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH
| WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8
@@ -136,7 +155,7 @@ BEGIN
     IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the
installation device"
     IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you
quit Setup now, you will need to run Setup again to install ReactOS. Really quit?"
     IDS_ABORTSETUP2 "Abort installation?"
-    IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to
continue"
+    IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to
continue."
     IDS_CAPTION "ReactOS Setup"
 END
 
@@ -150,6 +169,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_PARTITION_NAME "Name"
-    IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_TYPE "Type"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_STATUS "Status"
 END
diff --git a/base/setup/reactos/lang/es-ES.rc b/base/setup/reactos/lang/es-ES.rc
index 604b5f7665..0f4bd8dfa0 100644
--- a/base/setup/reactos/lang/es-ES.rc
+++ b/base/setup/reactos/lang/es-ES.rc
@@ -13,7 +13,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYS
 CAPTION "Instalación de ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Bienvenido al Asistente de Instalación de ReactOS.", IDC_STARTTITLE,
115, 8, 195, 24
+    LTEXT "Bienvenido al Asistente de Instalación de ReactOS", IDC_STARTTITLE,
115, 8, 195, 24
     LTEXT "¡Aún no puede instalar ReactOS directamente desde este CD! Por favor,
reinicie su equipo desde este CD para instalar ReactOS.", IDC_STATIC, 115, 40, 200,
100
     LTEXT "Pulse Finalizar para salir del instalador.", IDC_STATIC, 115, 169,
195, 17
 END
@@ -23,10 +23,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Instalación de ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    AUTORADIOBUTTON "Instalar ReactOS", IDC_INSTALL, 7, 7, 277, 10
-    LTEXT "Instala una nueva copia de ReactOS. Esta opción no proteje sus archivos,
programas y ajustes. Usted puede realizar cambios a su disco duro y particiones.",
IDC_INSTALLTEXT, 18, 18, 269, 25
+    AUTORADIOBUTTON "Instalar ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP |
WS_TABSTOP
+    LTEXT "Instala una nueva copia de ReactOS. Esta opción no proteje sus archivos,
programas y ajustes. Usted puede realizar cambios a su disco duro y particiones.",
IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP
     AUTORADIOBUTTON "Actualizar o reparar una instalación existente de
ReactOS", IDC_UPDATE, 7, 50, 277, 10
-    LTEXT "Actualiza o repara una instalación existente de ReactOS. Esta opción
proteje sus archivos, programas y ajustes. Esta opción sólo está disponible si ha
instalado ReactOS previamente en esta computadora.", IDC_UPDATETEXT, 18, 61, 269, 30
+    LTEXT "Actualiza o repara una instalación existente de ReactOS. Esta opción
proteje sus archivos, programas y ajustes. Esta opción sólo está disponible si ha
instalado ReactOS previamente en esta computadora.", IDC_UPDATETEXT, 18, 61, 269, 30,
NOT WS_GROUP
     LTEXT "Presione Siguiente para instalar los dispositivos.", IDC_STATIC, 7,
128, 297, 8
 END
 
@@ -38,7 +38,7 @@ BEGIN
     LTEXT       "The ReactOS Setup can upgrade one of the available ReactOS
installations listed below, or, if a ReactOS installation is damaged, the Setup program
can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18
     CONTROL     "", IDC_NTOSLIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303,
90
     PUSHBUTTON  "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14
-    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
128, 222, 16
+    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
124, 222, 16
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -60,12 +60,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Instalación de ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    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 "&Borrar", IDC_PARTDELETE, 63, 122, 50, 15
     PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
     PUSHBUTTON "&Opciones avanzadas...", IDC_PARTMOREOPTS, 230, 122, 80,
15
-    LTEXT "Presione Siguiente para verificar el resumen.", IDC_STATIC, 10, 180,
277, 20
+    // LTEXT "Presione Siguiente para verificar el resumen.", IDC_STATIC, 10,
180, 277, 20
 END
 
 IDD_PARTITION DIALOGEX 0, 0, 145, 90
@@ -104,7 +104,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Instalación de ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Presione Siguiente para comenzar con el proceso de instalación.",
IDC_STATIC, 7, 180, 303, 20
+    LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11
+    EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11
+    EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL |
WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11
+    EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE
| NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11
+    EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11
+    EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11
+    EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11
+    EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11
+    EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT
WS_BORDER | NOT WS_TABSTOP
+    AUTOCHECKBOX "I confirm that all the installation settings are correct. I also
acknowledge that\nReactOS is alpha-quality software and may break on my computer or
corrupt my data.",
+        IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE
+    LTEXT "Please confirm that all the installation settings are correct,\nthen
click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18
 END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
@@ -119,9 +137,10 @@ END
 
 IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Completando la instalación de ReactOS"
+CAPTION "Instalación de ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195,
24
     LTEXT "La primera parte de la instalación de ReactOS se ha completado
satisfactoriamente.", IDC_STATIC, 20, 50, 277, 10
     LTEXT "Cuando presione Finalizar, su equipo será reiniciado.", IDC_STATIC,
20, 80, 277, 10
     CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH
| WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
@@ -144,7 +163,7 @@ BEGIN
     IDS_SUMMARYSUBTITLE "Lista las propiedades de la instalación para su
verificación antes de aplicarlas al dispositivo instalado"
     IDS_ABORTSETUP "ReactOS no está completamente instalado en su equipo. Si sale de
la instalación ahora, tendrá que ejecutar el instalador otra vez para instalar ReactOS.
¿Realmente quiere salir?"
     IDS_ABORTSETUP2 "¿Abortar instalación?"
-    IDS_NO_TXTSETUP_SIF "No se pudo encontrar 'txtsetup.sif'\nLa instalación
no puede continuar."
+    IDS_NO_TXTSETUP_SIF "No se pudo encontrar 'txtsetup.sif'.\nLa
instalación no puede continuar."
     IDS_CAPTION "Instalación de ReactOS"
 END
 
@@ -158,6 +177,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_PARTITION_NAME "Nombre"
-    IDS_PARTITION_SIZE "Tamaño"
     IDS_PARTITION_TYPE "Tipo"
+    IDS_PARTITION_SIZE "Tamaño"
+    IDS_PARTITION_STATUS "Status"
 END
diff --git a/base/setup/reactos/lang/et-EE.rc b/base/setup/reactos/lang/et-EE.rc
index 9eca1f8a9f..6b5f49b483 100644
--- a/base/setup/reactos/lang/et-EE.rc
+++ b/base/setup/reactos/lang/et-EE.rc
@@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYS
 CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Tere tulemast ReactOSi paigaldamisprogrammi.", IDC_STARTTITLE, 115,
8, 195, 24
+    LTEXT "Tere tulemast ReactOSi paigaldamisprogrammi", IDC_STARTTITLE, 115,
8, 195, 24
     LTEXT "Selle CD pealt ei saa praegu veel ReactOSi paigaldada! ReactOSi
paigaldamiseks on tarvis arvuti taaskäivitada selle CD-ga.", IDC_STATIC, 115, 40,
195, 100
     LTEXT "Vajuta lõpeta, et installeerimine lõpetada.", IDC_STATIC, 115, 169,
195, 17
 END
@@ -15,10 +15,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "ReactOSi paigaldamine"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    AUTORADIOBUTTON "Installeeri ReactOS", IDC_INSTALL, 7, 7, 277, 10
-    LTEXT "Install a new copy of ReactOS. This option does not keep your files,
settings and programs. You can make changes to disks and partitions.",
IDC_INSTALLTEXT, 18, 18, 269, 25
+    AUTORADIOBUTTON "Installeeri ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP
| WS_TABSTOP
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files,
settings and programs. You can make changes to disks and partitions.",
IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP
     AUTORADIOBUTTON "Paranda või uuenda installeeritud ReactOS", IDC_UPDATE, 7,
50, 277, 10
-    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your
files, settings and programs. This option is only available if ReactOS is already
installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your
files, settings and programs. This option is only available if ReactOS is already
installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP
     LTEXT "Vajuta Järgmine, et seadmeid paigaldada.", IDC_STATIC, 7, 128, 297,
8
 END
 
@@ -30,7 +30,7 @@ BEGIN
     LTEXT       "The ReactOS Setup can upgrade one of the available ReactOS
installations listed below, or, if a ReactOS installation is damaged, the Setup program
can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18
     CONTROL     "", IDC_NTOSLIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303,
90
     PUSHBUTTON  "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14
-    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
128, 222, 16
+    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
124, 222, 16
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -52,12 +52,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "ReactOSi paigaldamine"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    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 "&Kustuta", IDC_PARTDELETE, 63, 122, 50, 15
     PUSHBUTTON "D&raiver", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
     PUSHBUTTON "&Täpsemad seaded...", IDC_PARTMOREOPTS, 230, 122, 80, 15
-    LTEXT "Vajuta Järgmine, et seaded üle kontrollida.", IDC_STATIC, 10, 180,
277, 20
+    // LTEXT "Vajuta Järgmine, et seaded üle kontrollida.", IDC_STATIC, 10,
180, 277, 20
 END
 
 IDD_PARTITION DIALOGEX 0, 0, 145, 90
@@ -96,7 +96,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYS
 CAPTION "ReactOSi paigaldamine"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Vajuta Järgmine, et paigaldamist alustada.", IDC_STATIC, 7, 180,
303, 20
+    LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11
+    EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11
+    EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL |
WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11
+    EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE
| NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11
+    EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11
+    EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11
+    EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11
+    EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11
+    EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT
WS_BORDER | NOT WS_TABSTOP
+    AUTOCHECKBOX "I confirm that all the installation settings are correct. I also
acknowledge that\nReactOS is alpha-quality software and may break on my computer or
corrupt my data.",
+        IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE
+    LTEXT "Please confirm that all the installation settings are correct,\nthen
click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18
 END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
@@ -111,9 +129,10 @@ END
 
 IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOSi paigaldamise lõpetamine"
+CAPTION "ReactOSi paigaldamine"
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195,
24
     LTEXT "ReactOSi paigaldamise esimene järk on edukalt lõpetatud.",
IDC_STATIC, 20, 50, 277, 10
     LTEXT "Vajuta Lõpeta, et arvuti taaskäivitada.", IDC_STATIC, 20, 80, 277,
10
     CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH
| WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
@@ -136,7 +155,7 @@ BEGIN
     IDS_SUMMARYSUBTITLE "Seadete kontrollimine enne paigaldamise alustamist"
     IDS_ABORTSETUP "ReactOS ei ole veel täielikult paigaldatud. Kas tõesti
lahkuda?"
     IDS_ABORTSETUP2 "Katkestada paigaldamine?"
-    IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to
continue."
+    IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to
continue."
     IDS_CAPTION "ReactOSi paigaldamine"
 END
 
@@ -150,6 +169,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_PARTITION_NAME "Name"
-    IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_TYPE "Type"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_STATUS "Status"
 END
diff --git a/base/setup/reactos/lang/fi-FI.rc b/base/setup/reactos/lang/fi-FI.rc
index 6c55eb004e..52e199f3b0 100644
--- a/base/setup/reactos/lang/fi-FI.rc
+++ b/base/setup/reactos/lang/fi-FI.rc
@@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYS
 CAPTION "ReactOS Asennus"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Welcome to the ReactOS Setup Wizard.", IDC_STARTTITLE, 115, 8, 195,
24
+    LTEXT "Welcome to the ReactOS Setup Wizard", IDC_STARTTITLE, 115, 8, 195,
24
     LTEXT "Et voi asentaa ReactOS:ä suoraan tältä CDlevyltä! Käynnistä tietokoneesi
tältä CD levyltä asentaaksesi ReactOS:ä.", IDC_STATIC, 115, 40, 195, 100
     LTEXT "Click Finish to exit the Setup.", IDC_STATIC, 115, 169, 195, 17
 END
@@ -15,10 +15,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    AUTORADIOBUTTON "Install ReactOS", IDC_INSTALL, 7, 7, 277, 10
-    LTEXT "Install a new copy of ReactOS. This option does not keep your files,
settings and programs. You can make changes to disks and partitions.",
IDC_INSTALLTEXT, 18, 18, 269, 25
+    AUTORADIOBUTTON "Install ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP |
WS_TABSTOP
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files,
settings and programs. You can make changes to disks and partitions.",
IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP
     AUTORADIOBUTTON "Update or repair an installed ReactOS", IDC_UPDATE, 7, 50,
277, 10
-    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your
files, settings and programs. This option is only available if ReactOS is already
installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your
files, settings and programs. This option is only available if ReactOS is already
installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP
     LTEXT "Click Next to setup the devices.", IDC_STATIC, 7, 128, 297, 8
 END
 
@@ -30,7 +30,7 @@ BEGIN
     LTEXT       "The ReactOS Setup can upgrade one of the available ReactOS
installations listed below, or, if a ReactOS installation is damaged, the Setup program
can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18
     CONTROL     "", IDC_NTOSLIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303,
90
     PUSHBUTTON  "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14
-    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
128, 222, 16
+    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
124, 222, 16
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -52,12 +52,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    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 "&Delete", IDC_PARTDELETE, 63, 122, 50, 15
     PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
     PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 230, 122, 80, 15
-    LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20
+    // LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20
 END
 
 IDD_PARTITION DIALOGEX 0, 0, 145, 90
@@ -96,7 +96,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYS
 CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Click Next to start the installation process.", IDC_STATIC, 7, 180,
303, 20
+    LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11
+    EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11
+    EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL |
WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11
+    EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE
| NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11
+    EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11
+    EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11
+    EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11
+    EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11
+    EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT
WS_BORDER | NOT WS_TABSTOP
+    AUTOCHECKBOX "I confirm that all the installation settings are correct. I also
acknowledge that\nReactOS is alpha-quality software and may break on my computer or
corrupt my data.",
+        IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE
+    LTEXT "Please confirm that all the installation settings are correct,\nthen
click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18
 END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
@@ -111,9 +129,10 @@ END
 
 IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Completing ReactOS Setup"
+CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195,
24
     LTEXT "You have successfully completed the first stage of ReactOS Setup.",
IDC_STATIC, 20, 50, 277, 10
     LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20,
80, 277, 10
     CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH
| WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
@@ -136,7 +155,7 @@ BEGIN
     IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the
installation device"
     IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you
quit Setup now, you will need to run Setup again to install ReactOS. Really quit?"
     IDS_ABORTSETUP2 "Abort installation?"
-    IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to
continue."
+    IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to
continue."
     IDS_CAPTION "ReactOS Setup"
 END
 
@@ -150,6 +169,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_PARTITION_NAME "Name"
-    IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_TYPE "Type"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_STATUS "Status"
 END
diff --git a/base/setup/reactos/lang/fr-FR.rc b/base/setup/reactos/lang/fr-FR.rc
index d27d347114..cb6c0bf736 100644
--- a/base/setup/reactos/lang/fr-FR.rc
+++ b/base/setup/reactos/lang/fr-FR.rc
@@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYS
 CAPTION "Installation de ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Bienvenue dans l'assistant d'installation de ReactOS.",
IDC_STARTTITLE, 115, 8, 195, 24
+    LTEXT "Bienvenue dans l'assistant d'installation de ReactOS",
IDC_STARTTITLE, 115, 8, 195, 24
     LTEXT "Vous ne pouvez pas encore installer ReactOS directement depuis ce CD !
Veuillez redémarrer votre ordinateur depuis ce CD pour pouvoir installer ReactOS.",
IDC_STATIC, 115, 40, 195, 100
     LTEXT "Cliquez sur Terminer pour quitter l'installation.", IDC_STATIC,
115, 169, 195, 17
 END
@@ -15,22 +15,22 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Installation de ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    AUTORADIOBUTTON "Install ReactOS", IDC_INSTALL, 7, 7, 277, 10
-    LTEXT "Install a new copy of ReactOS. This option does not keep your files,
settings and programs. You can make changes to disks and partitions.",
IDC_INSTALLTEXT, 18, 18, 269, 25
+    AUTORADIOBUTTON "Install ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP |
WS_TABSTOP
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files,
settings and programs. You can make changes to disks and partitions.",
IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP
     AUTORADIOBUTTON "Update or repair an installed ReactOS", IDC_UPDATE, 7, 50,
277, 10
-    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your
files, settings and programs. This option is only available if ReactOS is already
installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your
files, settings and programs. This option is only available if ReactOS is already
installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP
     LTEXT "Click Next to setup the devices.", IDC_STATIC, 7, 1280, 297, 8
 END
 
 IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Setup"
+CAPTION "Installation de ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT       "The ReactOS Setup can upgrade one of the available ReactOS
installations listed below, or, if a ReactOS installation is damaged, the Setup program
can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18
     CONTROL     "", IDC_NTOSLIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303,
90
     PUSHBUTTON  "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14
-    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
128, 222, 16
+    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
124, 222, 16
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -52,12 +52,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Installation de ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    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 "&Delete", IDC_PARTDELETE, 63, 122, 50, 15
     PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
     PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 230, 122, 80, 15
-    LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20
+    // LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20
 END
 
 IDD_PARTITION DIALOGEX 0, 0, 145, 90
@@ -93,10 +93,28 @@ END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Setup"
+CAPTION "Installation de ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Click Next to start the installation process.", IDC_STATIC, 7, 180,
303, 20
+    LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11
+    EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11
+    EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL |
WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11
+    EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE
| NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11
+    EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11
+    EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11
+    EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11
+    EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11
+    EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT
WS_BORDER | NOT WS_TABSTOP
+    AUTOCHECKBOX "I confirm that all the installation settings are correct. I also
acknowledge that\nReactOS is alpha-quality software and may break on my computer or
corrupt my data.",
+        IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE
+    LTEXT "Please confirm that all the installation settings are correct,\nthen
click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18
 END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
@@ -111,9 +129,10 @@ END
 
 IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Completing ReactOS Setup"
+CAPTION "Installation de ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195,
24
     LTEXT "You have successfully completed the first stage of ReactOS Setup.",
IDC_STATIC, 20, 50, 277, 10
     LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20,
80, 277, 10
     CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH
| WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
@@ -136,7 +155,7 @@ BEGIN
     IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the
installation device"
     IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you
quit Setup now, you will need to run Setup again to install ReactOS. Really quit?"
     IDS_ABORTSETUP2 "Abort installation?"
-    IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to
continue."
+    IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to
continue."
     IDS_CAPTION "Installation de ReactOS"
 END
 
@@ -150,6 +169,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_PARTITION_NAME "Name"
-    IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_TYPE "Type"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_STATUS "Status"
 END
diff --git a/base/setup/reactos/lang/he-IL.rc b/base/setup/reactos/lang/he-IL.rc
index f0666ccdfa..809ee4b34a 100644
--- a/base/setup/reactos/lang/he-IL.rc
+++ b/base/setup/reactos/lang/he-IL.rc
@@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYS
 CAPTION "התקנת ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "ברוכים הבאים לאשף ההתקנה של ReactOS/", IDC_STARTTITLE, 115, 8, 195,
24
+    LTEXT "ברוכים הבאים לאשף ההתקנה של ReactOS", IDC_STARTTITLE, 115, 8, 195,
24
     LTEXT "עדיין אי אפשר להתקין את ReactOS ישירות מהתקליטור הזה! נא אתחל מחדש מחשבך
מהדיסק כדי להתקין את ReactOS.", IDC_STATIC, 115, 40, 195, 100
     LTEXT "לחץ על סיום כדי לסיים את ההתקנה.", IDC_STATIC, 115, 169, 195, 17
 END
@@ -17,22 +17,22 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "התקנת ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    AUTORADIOBUTTON "התקנת ReactOS", IDC_INSTALL, 7, 7, 277, 10
-    LTEXT "Install a new copy of ReactOS. This option does not keep your files,
settings and programs. You can make changes to disks and partitions.",
IDC_INSTALLTEXT, 18, 18, 269, 25
+    AUTORADIOBUTTON "התקנת ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP |
WS_TABSTOP
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files,
settings and programs. You can make changes to disks and partitions.",
IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP
     AUTORADIOBUTTON "תיקון או עדכון גרסה קיימת", IDC_UPDATE, 7, 50, 277, 10
-    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your
files, settings and programs. This option is only available if ReactOS is already
installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your
files, settings and programs. This option is only available if ReactOS is already
installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP
     LTEXT "לחץ על הבא כדי להגדיר את ההתקנים", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Setup"
+CAPTION "התקנת ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT       "The ReactOS Setup can upgrade one of the available ReactOS
installations listed below, or, if a ReactOS installation is damaged, the Setup program
can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18
     CONTROL     "", IDC_NTOSLIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303,
90
     PUSHBUTTON  "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14
-    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
128, 222, 16
+    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
124, 222, 16
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -54,12 +54,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "התקנת ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    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 "מחק", IDC_PARTDELETE, 63, 122, 50, 15
     PUSHBUTTON "טעינת מנהל התקן", IDC_DEVICEDRIVER, 174, 122, 50, 15,
WS_DISABLED
     PUSHBUTTON "אפשרויות מתקדמות...", IDC_PARTMOREOPTS, 230, 122, 80, 15
-    LTEXT "לחץ על הבא כדי לראות סיכום.", IDC_STATIC, 10, 180, 277, 20
+    // LTEXT "לחץ על הבא כדי לראות סיכום.", IDC_STATIC, 10, 180, 277, 20
 END
 
 IDD_PARTITION DIALOGEX 0, 0, 145, 90
@@ -98,7 +98,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYS
 CAPTION "התקנת ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "לחץ על הבא כדי להתחיל בתהליך ההתקנה.", IDC_STATIC, 7, 180, 303, 20
+    LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11
+    EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11
+    EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL |
WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11
+    EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE
| NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11
+    EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11
+    EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11
+    EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11
+    EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11
+    EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT
WS_BORDER | NOT WS_TABSTOP
+    AUTOCHECKBOX "I confirm that all the installation settings are correct. I also
acknowledge that\nReactOS is alpha-quality software and may break on my computer or
corrupt my data.",
+        IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE
+    LTEXT "Please confirm that all the installation settings are correct,\nthen
click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18
 END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
@@ -113,9 +131,10 @@ END
 
 IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "השלמת התקנת ReactOS"
+CAPTION "התקנת ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195,
24
     LTEXT "You have successfully completed the first stage of ReactOS Setup.",
IDC_STATIC, 20, 50, 277, 10
     LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20,
80, 277, 10
     CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH
| WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
@@ -138,7 +157,7 @@ BEGIN
     IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the
installation device"
     IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you
quit Setup now, you will need to run Setup again to install ReactOS. Really quit?"
     IDS_ABORTSETUP2 "Abort installation?"
-    IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to
continue."
+    IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to
continue."
     IDS_CAPTION "התקנת ReactOS"
 END
 
@@ -152,6 +171,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_PARTITION_NAME "Name"
-    IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_TYPE "Type"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_STATUS "Status"
 END
diff --git a/base/setup/reactos/lang/hu-HU.rc b/base/setup/reactos/lang/hu-HU.rc
index 388f86c41e..7b2a1c55e3 100644
--- a/base/setup/reactos/lang/hu-HU.rc
+++ b/base/setup/reactos/lang/hu-HU.rc
@@ -7,37 +7,37 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYS
 CAPTION "ReactOS telepítõ"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Welcome to the ReactOS Setup Wizard.", IDC_STARTTITLE, 115, 8, 195,
24
+    LTEXT "Welcome to the ReactOS Setup Wizard", IDC_STARTTITLE, 115, 8, 195,
24
     LTEXT "Nem tudod feltelepíteni a ReactOS rendszert így! Kérlek indítsd újra a
számítógépet ezzel a CD-vel, hogy feltudjad telepíteni a ReactOS rendszert.",
IDC_STATIC, 115, 40, 195, 100
     LTEXT "Click Finish to exit the Setup.", IDC_STATIC, 115, 169, 195, 17
 END
 
 IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Setup"
+CAPTION "ReactOS telepítõ"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    AUTORADIOBUTTON "Install ReactOS", IDC_INSTALL, 7, 7, 277, 10
-    LTEXT "Install a new copy of ReactOS. This option does not keep your files,
settings and programs. You can make changes to disks and partitions.",
IDC_INSTALLTEXT, 18, 18, 269, 25
+    AUTORADIOBUTTON "Install ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP |
WS_TABSTOP
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files,
settings and programs. You can make changes to disks and partitions.",
IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP
     AUTORADIOBUTTON "Update or repair an installed ReactOS", IDC_UPDATE, 7, 50,
277, 10
-    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your
files, settings and programs. This option is only available if ReactOS is already
installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your
files, settings and programs. This option is only available if ReactOS is already
installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP
     LTEXT "Click Next to setup the devices.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Setup"
+CAPTION "ReactOS telepítõ"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT       "The ReactOS Setup can upgrade one of the available ReactOS
installations listed below, or, if a ReactOS installation is damaged, the Setup program
can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18
     CONTROL     "", IDC_NTOSLIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303,
90
     PUSHBUTTON  "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14
-    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
128, 222, 16
+    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
124, 222, 16
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Setup"
+CAPTION "ReactOS telepítõ"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Computer:", IDC_STATIC, 20, 15, 80, 10
@@ -51,15 +51,15 @@ END
 
 IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Setup"
+CAPTION "ReactOS telepítõ"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    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 "&Delete", IDC_PARTDELETE, 63, 122, 50, 15
     PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
     PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 230, 122, 80, 15
-    LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20
+    // LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20
 END
 
 IDD_PARTITION DIALOGEX 0, 0, 145, 90
@@ -95,15 +95,33 @@ END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Setup"
+CAPTION "ReactOS telepítõ"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Click Next to start the installation process.", IDC_STATIC, 7, 180,
303, 20
+    LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11
+    EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11
+    EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL |
WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11
+    EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE
| NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11
+    EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11
+    EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11
+    EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11
+    EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11
+    EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT
WS_BORDER | NOT WS_TABSTOP
+    AUTOCHECKBOX "I confirm that all the installation settings are correct. I also
acknowledge that\nReactOS is alpha-quality software and may break on my computer or
corrupt my data.",
+        IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE
+    LTEXT "Please confirm that all the installation settings are correct,\nthen
click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18
 END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Setup"
+CAPTION "ReactOS telepítõ"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Install files...", IDC_ACTIVITY, 20, 50, 277, 10
@@ -113,9 +131,10 @@ END
 
 IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Completing ReactOS Setup"
+CAPTION "ReactOS telepítõ"
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195,
24
     LTEXT "You have successfully completed the first stage of ReactOS Setup.",
IDC_STATIC, 20, 50, 277, 10
     LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20,
80, 277, 10
     CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH
| WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
@@ -138,7 +157,7 @@ BEGIN
     IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the
installation device"
     IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you
quit Setup now, you will need to run Setup again to install ReactOS. Really quit?"
     IDS_ABORTSETUP2 "Abort installation?"
-    IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to
continue."
+    IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to
continue."
     IDS_CAPTION "ReactOS Setup"
 END
 
@@ -152,6 +171,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_PARTITION_NAME "Name"
-    IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_TYPE "Type"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_STATUS "Status"
 END
diff --git a/base/setup/reactos/lang/it-IT.rc b/base/setup/reactos/lang/it-IT.rc
index 6849d89fa7..0badfc0746 100644
--- a/base/setup/reactos/lang/it-IT.rc
+++ b/base/setup/reactos/lang/it-IT.rc
@@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYS
 CAPTION "Installazione di ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Benvenuto al wizard di installazione di ReactOS.", IDC_STARTTITLE,
115, 8, 195, 24
+    LTEXT "Benvenuto al wizard di installazione di ReactOS", IDC_STARTTITLE,
115, 8, 195, 24
     LTEXT "Non è ancora possibile installare ReactOS direttamente da questo CD!
E' necessario riavviare il computer da questo CD per procedere alla installazione di
ReactOS.", IDC_STATIC, 115, 40, 195, 100
     LTEXT "Cliccare Fine per uscire.", IDC_STATIC, 115, 169, 195, 17
 END
@@ -15,10 +15,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Installazione di ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    AUTORADIOBUTTON "Installa ReactOS", IDC_INSTALL, 7, 7, 277, 10
-    LTEXT "Installa una nuova coppia di ReactOS. Questo opzione non mantiene i tuoi
file, le impostazioni e i programmi. E' possibile fare degli cambiamenti sul disco e
partizioni.", IDC_INSTALLTEXT, 18, 18, 269, 25
+    AUTORADIOBUTTON "Installa ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP |
WS_TABSTOP
+    LTEXT "Installa una nuova coppia di ReactOS. Questo opzione non mantiene i tuoi
file, le impostazioni e i programmi. E' possibile fare degli cambiamenti sul disco e
partizioni.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP
     AUTORADIOBUTTON "Aggiorna o ripara una installazione precedente di
ReactOS", IDC_UPDATE, 7, 50, 277, 10
-    LTEXT "Aggiorna o ripara una coppia già installata di ReactOS. Questo opzione
mantiene i tuoi file, le impostazioni e i programmi. Questo opzione è disponibile solo se
ReactOS è già installato su questo computer.", IDC_UPDATETEXT, 18, 61, 269, 30
+    LTEXT "Aggiorna o ripara una coppia già installata di ReactOS. Questo opzione
mantiene i tuoi file, le impostazioni e i programmi. Questo opzione è disponibile solo se
ReactOS è già installato su questo computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT
WS_GROUP
     LTEXT "Cliccare Avanti per impostare i dispositivi.", IDC_STATIC, 7, 128,
297, 8
 END
 
@@ -30,7 +30,7 @@ BEGIN
     LTEXT       "The ReactOS Setup can upgrade one of the available ReactOS
installations listed below, or, if a ReactOS installation is damaged, the Setup program
can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18
     CONTROL     "", IDC_NTOSLIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303,
90
     PUSHBUTTON  "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14
-    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
128, 222, 16
+    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
124, 222, 16
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -52,12 +52,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Installazione di ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    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 "&Rimuovi", IDC_PARTDELETE, 63, 122, 50, 15
     PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
     PUSHBUTTON "&Opzioni avanzate...", IDC_PARTMOREOPTS, 230, 122, 80, 15
-    LTEXT "Cliccare Avanti per iniziare l'installazione.", IDC_STATIC, 10,
180, 277, 20
+    // LTEXT "Cliccare Avanti per iniziare l'installazione.", IDC_STATIC,
10, 180, 277, 20
 END
 
 IDD_PARTITION DIALOGEX 0, 0, 145, 90
@@ -96,7 +96,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYS
 CAPTION "Installazione di ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Cliccare Avanti per iniziare l'installazione.", IDC_STATIC, 7,
180, 303, 20
+    LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11
+    EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11
+    EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL |
WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11
+    EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE
| NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11
+    EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11
+    EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11
+    EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11
+    EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11
+    EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT
WS_BORDER | NOT WS_TABSTOP
+    AUTOCHECKBOX "I confirm that all the installation settings are correct. I also
acknowledge that\nReactOS is alpha-quality software and may break on my computer or
corrupt my data.",
+        IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE
+    LTEXT "Please confirm that all the installation settings are correct,\nthen
click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18
 END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
@@ -111,9 +129,10 @@ END
 
 IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Completamento della installazione di ReactOS"
+CAPTION "Installazione di ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195,
24
     LTEXT "La prima fase è stata completata in modo regolare.", IDC_STATIC, 20,
50, 277, 10
     LTEXT "Quando verrà premuto fine il computer si riavvierà.", IDC_STATIC,
20, 80, 277, 10
     CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH
| WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
@@ -150,6 +169,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_PARTITION_NAME "Nome"
-    IDS_PARTITION_SIZE "Dimensione"
     IDS_PARTITION_TYPE "Tipo"
+    IDS_PARTITION_SIZE "Dimensione"
+    IDS_PARTITION_STATUS "Status"
 END
diff --git a/base/setup/reactos/lang/ja-JP.rc b/base/setup/reactos/lang/ja-JP.rc
index b1a740631e..e90ab15e4c 100644
--- a/base/setup/reactos/lang/ja-JP.rc
+++ b/base/setup/reactos/lang/ja-JP.rc
@@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYS
 CAPTION "ReactOS セットアップ"
 FONT 9, "MS UI Gothic"
 BEGIN
-    LTEXT "ReactOS セットアップウィザードへようこそ。", IDC_STARTTITLE, 115, 8, 195, 24
+    LTEXT "ReactOS セットアップウィザードへようこそ", IDC_STARTTITLE, 115, 8, 195, 24
     LTEXT
"このCDからまだ直接ReactOSをインストールできません。ReactOSをインストールするために、このCDからコンピュータを再起動して下さい。",
IDC_STATIC, 115, 40, 195, 100
     LTEXT "完了をクリックしてセットアップを終了して下さい。", IDC_STATIC, 115, 169, 195, 17
 END
@@ -15,22 +15,22 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "ReactOS セットアップ"
 FONT 9, "MS UI Gothic"
 BEGIN
-    AUTORADIOBUTTON "ReactOSをインストールする", IDC_INSTALL, 7, 7, 277, 10
-    LTEXT
"ReactOSを新しくインストールします。このオプションは、あなたのファイル、設定、プログラムを維持しません。あなたはディスクとパーティションに変更を加えることができます。",
IDC_INSTALLTEXT, 18, 18, 269, 25
+    AUTORADIOBUTTON "ReactOSをインストールする", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP |
WS_TABSTOP
+    LTEXT
"ReactOSを新しくインストールします。このオプションは、あなたのファイル、設定、プログラムを維持しません。あなたはディスクとパーティションに変更を加えることができます。",
IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP
     AUTORADIOBUTTON "ReactOSを更新または修正する", IDC_UPDATE, 7, 50, 277, 10
-    LTEXT
"インストールされたReactOSを更新または修正します。このオプションはあなたのファイル、設定、プログラムを保持します。このオプションは、このコンピュータですでにReactOSがインストール済みのときのみ利用できます。",
IDC_UPDATETEXT, 18, 61, 269, 30
+    LTEXT
"インストールされたReactOSを更新または修正します。このオプションはあなたのファイル、設定、プログラムを保持します。このオプションは、このコンピュータですでにReactOSがインストール済みのときのみ利用できます。",
IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP
     LTEXT "次へをクリックすると続行します", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Setup"
+CAPTION "ReactOS セットアップ"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT       "The ReactOS Setup can upgrade one of the available ReactOS
installations listed below, or, if a ReactOS installation is damaged, the Setup program
can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18
     CONTROL     "", IDC_NTOSLIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303,
90
     PUSHBUTTON  "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14
-    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
128, 222, 16
+    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
124, 222, 16
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -52,12 +52,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "ReactOS セットアップ"
 FONT 9, "MS UI Gothic"
 BEGIN
-    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    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, 14
     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 */
+    // LTEXT "次へをクリックすれば、要約をチェックできます。", IDC_STATIC, 7, 128, 277, 8
 END
 
 IDD_PARTITION DIALOGEX 0, 0, 145, 90
@@ -96,7 +96,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYS
 CAPTION "ReactOS セットアップ"
 FONT 9, "MS UI Gothic"
 BEGIN
-    LTEXT "次へをクリックすると、インストールの処理を開始します。", IDC_STATIC, 7, 128, 303, 8
+    LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11
+    EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11
+    EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL |
WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11
+    EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE
| NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11
+    EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11
+    EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11
+    EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11
+    EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11
+    EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT
WS_BORDER | NOT WS_TABSTOP
+    AUTOCHECKBOX "I confirm that all the installation settings are correct. I also
acknowledge that\nReactOS is alpha-quality software and may break on my computer or
corrupt my data.",
+        IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE
+    LTEXT "Please confirm that all the installation settings are correct,\nthen
click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18
 END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
@@ -111,9 +129,10 @@ END
 
 IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS セットアップの完了"
+CAPTION "ReactOS セットアップ"
 FONT 9, "MS UI Gothic"
 BEGIN
+    LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195,
24
     LTEXT "ReactOS セットアップの最初の段階が正しく完了しました。", IDC_STATIC, 115, 50, 195, 10
     LTEXT "完了をクリックすると、あなたのコンピュータは再起動されます。", IDC_STATIC, 115, 80, 195, 10
     CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH
| WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8
@@ -136,7 +155,7 @@ BEGIN
     IDS_SUMMARYSUBTITLE "インストールするデバイスを適用する前にチェックするインストール プロパティをリストアップします"
     IDS_ABORTSETUP
"ReactOSはあなたのコンピュータへのインストールが完了していません。もしセットアップをここで中断すれば、ReactOSをインストールするために、セットアップを再起動する必要があります。本当に中断しますか?"
     IDS_ABORTSETUP2 "インストールを中断しますか?"
-    IDS_NO_TXTSETUP_SIF "'txtsetup.sif'が見つかりません。\nセットアップは続行できません"
+    IDS_NO_TXTSETUP_SIF "'txtsetup.sif'が見つかりません。\nセットアップは続行できません。"
     IDS_CAPTION "ReactOS セットアップ"
 END
 
@@ -150,6 +169,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_PARTITION_NAME "名前"
-    IDS_PARTITION_SIZE "サイズ"
     IDS_PARTITION_TYPE "種類"
+    IDS_PARTITION_SIZE "サイズ"
+    IDS_PARTITION_STATUS "Status"
 END
diff --git a/base/setup/reactos/lang/ms-MY.rc b/base/setup/reactos/lang/ms-MY.rc
index e4d22c7561..afed079f8f 100644
--- a/base/setup/reactos/lang/ms-MY.rc
+++ b/base/setup/reactos/lang/ms-MY.rc
@@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYS
 CAPTION "ReactOS Persediaan"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Selamat datang ke Pendeta Persediaan ReactOS.", IDC_STARTTITLE, 115,
8, 195, 24
+    LTEXT "Selamat datang ke Pendeta Persediaan ReactOS", IDC_STARTTITLE, 115,
8, 195, 24
     LTEXT "Anda tidak boleh memasang ReactOS terus dari CD ini lagi! Sila mula
semula komputer anda dari CD ini untuk memasang ReactOS.", IDC_STATIC, 115, 40, 195,
100
     LTEXT "Klik Selesai untuk keluar persediaan.", IDC_STATIC, 115, 169, 195,
17
 END
@@ -17,22 +17,22 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "ReactOS Persediaan"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    AUTORADIOBUTTON "Pasang ReactOS", IDC_INSTALL, 7, 7, 277, 10
-    LTEXT "Install a new copy of ReactOS. This option does not keep your files,
settings and programs. You can make changes to disks and partitions.",
IDC_INSTALLTEXT, 18, 18, 269, 25
+    AUTORADIOBUTTON "Pasang ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP |
WS_TABSTOP
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files,
settings and programs. You can make changes to disks and partitions.",
IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP
     AUTORADIOBUTTON "Membaiki atau mengemaskini ReactOS yang dipasang",
IDC_UPDATE, 7, 50, 277, 10
-    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your
files, settings and programs. This option is only available if ReactOS is already
installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your
files, settings and programs. This option is only available if ReactOS is already
installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP
     LTEXT "Klik Seterusnya untuk memasang peranti.", IDC_STATIC, 7, 128, 297,
8
 END
 
 IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Setup"
+CAPTION "ReactOS Persediaan"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT       "The ReactOS Setup can upgrade one of the available ReactOS
installations listed below, or, if a ReactOS installation is damaged, the Setup program
can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18
     CONTROL     "", IDC_NTOSLIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303,
90
     PUSHBUTTON  "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14
-    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
128, 222, 16
+    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
124, 222, 16
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -54,12 +54,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "ReactOS Persediaan"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    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 "Hapus(&D)", IDC_PARTDELETE, 63, 122, 50, 15
     PUSHBUTTON "Pemacu(&R)", IDC_DEVICEDRIVER, 174, 122, 50, 15,
WS_DISABLED
     PUSHBUTTON "Opsyen l&anjutan...", IDC_PARTMOREOPTS, 230, 122, 80, 15
-    LTEXT "Klik Seterusnya untuk menyemak ringkasan.", IDC_STATIC, 10, 180,
277, 20
+    // LTEXT "Klik Seterusnya untuk menyemak ringkasan.", IDC_STATIC, 10, 180,
277, 20
 END
 
 IDD_PARTITION DIALOGEX 0, 0, 145, 90
@@ -98,7 +98,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYS
 CAPTION "ReactOS Persediaan"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Klik Seterusnya untuk memulakan proses pemasangan.", IDC_STATIC, 7,
180, 303, 20
+    LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11
+    EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11
+    EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL |
WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11
+    EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE
| NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11
+    EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11
+    EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11
+    EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11
+    EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11
+    EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT
WS_BORDER | NOT WS_TABSTOP
+    AUTOCHECKBOX "I confirm that all the installation settings are correct. I also
acknowledge that\nReactOS is alpha-quality software and may break on my computer or
corrupt my data.",
+        IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE
+    LTEXT "Please confirm that all the installation settings are correct,\nthen
click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18
 END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
@@ -113,9 +131,10 @@ END
 
 IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Melengkapkan persediaan ReactOS"
+CAPTION "ReactOS Persediaan"
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195,
24
     LTEXT "Anda telah berjaya melengkapkan tahap pertama persediaan ReactOS.",
IDC_STATIC, 20, 50, 277, 10
     LTEXT "Apabila anda klik Selesai, komputer akan dimulakan semula.",
IDC_STATIC, 20, 80, 277, 10
     CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH
| WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
@@ -138,7 +157,7 @@ BEGIN
     IDS_SUMMARYSUBTITLE "Senarai pemasangan sifat-sifat untuk menyemak sebelum
digunakan untuk pemasangan peranti"
     IDS_ABORTSETUP "ReactOS tidak benar-benar dipasang pada komputer anda. Jika anda
berhenti persediaan sekarang, anda akan perlu untuk menjalankan persediaan untuk memasang
ReactOS lagi. Benar-benar berhenti?"
     IDS_ABORTSETUP2 "Henti paksa pemasangan?"
-    IDS_NO_TXTSETUP_SIF "Persediaan tidak dapat mencari
'txtsetup.sif'\nPersediaan tidak dapat meneruskan"
+    IDS_NO_TXTSETUP_SIF "Persediaan tidak dapat mencari
'txtsetup.sif'.\nPersediaan tidak dapat meneruskan."
     IDS_CAPTION "ReactOS Persediaan"
 END
 
@@ -152,6 +171,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_PARTITION_NAME "Name"
-    IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_TYPE "Type"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_STATUS "Status"
 END
diff --git a/base/setup/reactos/lang/no-NO.rc b/base/setup/reactos/lang/no-NO.rc
index 9213e76e5c..45c6f94d8a 100644
--- a/base/setup/reactos/lang/no-NO.rc
+++ b/base/setup/reactos/lang/no-NO.rc
@@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYS
 CAPTION "ReactOS installering"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Velkommen til ReactOS installering veiviseren.", IDC_STARTTITLE,
115, 8, 220, 24
+    LTEXT "Velkommen til ReactOS installering veiviseren", IDC_STARTTITLE, 115,
8, 220, 24
     LTEXT "Du kan ennå ikke installere ReactOS direkte fra denne CD-en! Vennligst
start datamaskinen på nytt og start fra denne platen for å installere ReactOS.",
IDC_STATIC, 115, 40, 195, 100
     LTEXT "Trykk på Fullført for å avslutte installeringen.", IDC_STATIC, 115,
169, 195, 17
 END
@@ -15,22 +15,22 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "ReactOS installering"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    AUTORADIOBUTTON "Installere ReactOS", IDC_INSTALL, 7, 7, 277, 10
-    LTEXT "Install a new copy of ReactOS. This option does not keep your files,
settings and programs. You can make changes to disks and partitions.",
IDC_INSTALLTEXT, 18, 18, 269, 25
+    AUTORADIOBUTTON "Installere ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP
| WS_TABSTOP
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files,
settings and programs. You can make changes to disks and partitions.",
IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP
     AUTORADIOBUTTON "Reparere eller oppdatere en installert ReactOS",
IDC_UPDATE, 7, 50, 277, 10
-    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your
files, settings and programs. This option is only available if ReactOS is already
installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your
files, settings and programs. This option is only available if ReactOS is already
installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP
     LTEXT "Trykk på Neste for installere enhetene.", IDC_STATIC, 7, 128, 297,
8
 END
 
 IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Setup"
+CAPTION "ReactOS installering"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT       "The ReactOS Setup can upgrade one of the available ReactOS
installations listed below, or, if a ReactOS installation is damaged, the Setup program
can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18
     CONTROL     "", IDC_NTOSLIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303,
90
     PUSHBUTTON  "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14
-    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
128, 222, 16
+    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
124, 222, 16
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -52,12 +52,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "ReactOS installering"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    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 "&Slett", IDC_PARTDELETE, 63, 122, 50, 15
     PUSHBUTTON "S&tasjon", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
     PUSHBUTTON "&Avansert valg...", IDC_PARTMOREOPTS, 230, 122, 80, 15
-    LTEXT "Trykk på Neste for å starte installasjon prosessen.", IDC_STATIC,
10, 180, 277, 20
+    // LTEXT "Trykk på Neste for å starte installasjon prosessen.", IDC_STATIC,
10, 180, 277, 20
 END
 
 IDD_PARTITION DIALOGEX 0, 0, 145, 90
@@ -96,7 +96,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYS
 CAPTION "ReactOS installering"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Trykk på Neste for å starte installasjon prosessen.", IDC_STATIC, 7,
180, 303, 20
+    LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11
+    EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11
+    EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL |
WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11
+    EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE
| NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11
+    EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11
+    EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11
+    EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11
+    EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11
+    EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT
WS_BORDER | NOT WS_TABSTOP
+    AUTOCHECKBOX "I confirm that all the installation settings are correct. I also
acknowledge that\nReactOS is alpha-quality software and may break on my computer or
corrupt my data.",
+        IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE
+    LTEXT "Please confirm that all the installation settings are correct,\nthen
click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18
 END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
@@ -111,9 +129,10 @@ END
 
 IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Fullfører ReactOS installering"
+CAPTION "ReactOS installering"
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195,
24
     LTEXT "Du har nå fullført første steget av ReactOS installering.",
IDC_STATIC, 20, 50, 277, 10
     LTEXT "Når du trykker Fullført, vil din datamaskin starte på nytt.",
IDC_STATIC, 20, 80, 277, 10
     CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH
| WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
@@ -136,7 +155,7 @@ BEGIN
     IDS_SUMMARYSUBTITLE "Sjekk listen av installasjon egenskapene før du fortsetter
installasjon av enhetene"
     IDS_ABORTSETUP "ReactOS er ikke fullstendig installert på datamaskinen. Hvis du
avslutter nå, trenger du å kjøre installeringen på nytt for å installere ReactOS. Vil du
virkelig avslutte?"
     IDS_ABORTSETUP2 "Avbryt installasjonen?"
-    IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to
continue."
+    IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to
continue."
     IDS_CAPTION "ReactOS installering"
 END
 
@@ -150,6 +169,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_PARTITION_NAME "Name"
-    IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_TYPE "Type"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_STATUS "Status"
 END
diff --git a/base/setup/reactos/lang/pl-PL.rc b/base/setup/reactos/lang/pl-PL.rc
index 6b11b5f35c..ace7cad24b 100644
--- a/base/setup/reactos/lang/pl-PL.rc
+++ b/base/setup/reactos/lang/pl-PL.rc
@@ -16,7 +16,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYS
 CAPTION "Instalator ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Witaj w Kreatorze instalacji ReactOS.", IDC_STARTTITLE, 115, 8, 195,
24
+    LTEXT "Witaj w Kreatorze instalacji ReactOS", IDC_STARTTITLE, 115, 8, 195,
24
     LTEXT "Obecnie nie możesz zainstalować ReactOS bezpośrednio! Uruchom ponownie
komputer z tej płyty, aby zainstalować ReactOS.", IDC_STATIC, 115, 40, 195, 100
     LTEXT "Naciśnij przycisk aby zakończyć pracę Instalatora.", IDC_STATIC,
115, 169, 195, 17
 END
@@ -26,22 +26,22 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Instalator ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    AUTORADIOBUTTON "Zainstaluj ReactOS", IDC_INSTALL, 7, 7, 277, 10
-    LTEXT "Zainstaluj nową kopię ReactOS. Ta opcja nie zachowa plików, ustawień i
programów. Możesz dokonać zmian w dyskach i partycjach.", IDC_INSTALLTEXT, 18, 18,
269, 25
+    AUTORADIOBUTTON "Zainstaluj ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP
| WS_TABSTOP
+    LTEXT "Zainstaluj nową kopię ReactOS. Ta opcja nie zachowa plików, ustawień i
programów. Możesz dokonać zmian w dyskach i partycjach.", IDC_INSTALLTEXT, 18, 18,
269, 25, NOT WS_GROUP
     AUTORADIOBUTTON "Napraw lub zaktualizuj zainstalowany wcześniej ReactOS",
IDC_UPDATE, 7, 50, 277, 10
-    LTEXT "Zaktualizuj lub napraw istniejącą kopię systemu ReactOS. Ta opcja zachowa
pliki, ustawienia i programy. Jest dostępna, jeżeli ReactOS znajduje się już na tym
komputerze.", IDC_UPDATETEXT, 18, 61, 269, 30
+    LTEXT "Zaktualizuj lub napraw istniejącą kopię systemu ReactOS. Ta opcja zachowa
pliki, ustawienia i programy. Jest dostępna, jeżeli ReactOS znajduje się już na tym
komputerze.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP
     LTEXT "Naciśnij Dalej, aby zmienić ustawienia sprzętu.", IDC_STATIC, 7,
128, 297, 8
 END
 
 IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Setup"
+CAPTION "Instalator ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT       "The ReactOS Setup can upgrade one of the available ReactOS
installations listed below, or, if a ReactOS installation is damaged, the Setup program
can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18
     CONTROL     "", IDC_NTOSLIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303,
90
     PUSHBUTTON  "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14
-    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
128, 222, 16
+    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
124, 222, 16
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -63,12 +63,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Instalator ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
     PUSHBUTTON "&Stwórz", IDC_PARTCREATE, 7, 122, 50, 15
     PUSHBUTTON "&Usuń", IDC_PARTDELETE, 63, 122, 50, 15
     PUSHBUTTON "S&terownik", IDC_DEVICEDRIVER, 169, 122, 50, 15,
WS_DISABLED
     PUSHBUTTON "&Opcje zaawansowane...", IDC_PARTMOREOPTS, 225, 122, 86,
15
-    LTEXT "Naciśnij Dalej, aby rozpocząć proces instalacji.", IDC_STATIC, 10,
180, 277, 20
+    // LTEXT "Naciśnij Dalej, aby rozpocząć proces instalacji.", IDC_STATIC,
10, 180, 277, 20
 END
 
 IDD_PARTITION DIALOGEX 0, 0, 145, 90
@@ -107,7 +107,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Instalator ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Kliknij Dalej, aby rozpocząć proces instalacji.", IDC_STATIC, 7,
180, 303, 20
+    LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11
+    EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11
+    EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL |
WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11
+    EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE
| NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11
+    EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11
+    EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11
+    EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11
+    EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11
+    EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT
WS_BORDER | NOT WS_TABSTOP
+    AUTOCHECKBOX "I confirm that all the installation settings are correct. I also
acknowledge that\nReactOS is alpha-quality software and may break on my computer or
corrupt my data.",
+        IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE
+    LTEXT "Please confirm that all the installation settings are correct,\nthen
click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18
 END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
@@ -122,9 +140,10 @@ END
 
 IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kończenie instalacji ReactOS"
+CAPTION "Instalator ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195,
24
     LTEXT "Pierwszy etap instalacji ReactOS został pomyślnie zakończony.",
IDC_STATIC, 20, 50, 277, 10
     LTEXT "Po kliknięciu na Zakończ ten komputer zostanie uruchomiony
ponownie.", IDC_STATIC, 20, 80, 277, 10
     CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH
| WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
@@ -147,7 +166,7 @@ BEGIN
     IDS_SUMMARYSUBTITLE "Sprawdź ustawienia instalacji przed dokonaniem zmian na
dysku"
     IDS_ABORTSETUP "Instalacja ReactOS nie została ukończona na tym komputerze.
Jeśli teraz zakończysz instalację, będziesz musiał uruchomić Instalator ponownie, aby
zainstalować ReactOS. Na pewno zakończyć?"
     IDS_ABORTSETUP2 "Przerwać instalację?"
-    IDS_NO_TXTSETUP_SIF "Nie można znaleźć 'txtsetup.sif'\nInstalator nie
może kontynuować."
+    IDS_NO_TXTSETUP_SIF "Nie można znaleźć 'txtsetup.sif'.\nInstalator nie
może kontynuować."
     IDS_CAPTION "Instalator ReactOS"
 END
 
@@ -161,6 +180,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_PARTITION_NAME "Nazwa"
-    IDS_PARTITION_SIZE "Rozmiar"
     IDS_PARTITION_TYPE "Rodzaj"
+    IDS_PARTITION_SIZE "Rozmiar"
+    IDS_PARTITION_STATUS "Status"
 END
diff --git a/base/setup/reactos/lang/pt-BR.rc b/base/setup/reactos/lang/pt-BR.rc
index 8a812f59dc..5a53820e07 100644
--- a/base/setup/reactos/lang/pt-BR.rc
+++ b/base/setup/reactos/lang/pt-BR.rc
@@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYS
 CAPTION "Instalação do ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Bem-vindo(a) ao Assistente de Instalação do ReactOS.",
IDC_STARTTITLE, 115, 8, 195, 24
+    LTEXT "Bem-vindo(a) ao Assistente de Instalação do ReactOS",
IDC_STARTTITLE, 115, 8, 195, 24
     LTEXT "Você não pode instalar o ReactOS diretamente deste CD! Por favor reinicie
seu computador a partir deste CD para instalar o ReactOS.", IDC_STATIC, 115, 40, 195,
100
     LTEXT "Clique em Finalizar para sair da Instalação.", IDC_STATIC, 115, 169,
195, 17
 END
@@ -15,10 +15,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Instalação do ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    AUTORADIOBUTTON "Instalar ReactOS", IDC_INSTALL, 7, 7, 277, 10
-    LTEXT "Install a new copy of ReactOS. This option does not keep your files,
settings and programs. You can make changes to disks and partitions.",
IDC_INSTALLTEXT, 18, 18, 269, 25
+    AUTORADIOBUTTON "Instalar ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP |
WS_TABSTOP
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files,
settings and programs. You can make changes to disks and partitions.",
IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP
     AUTORADIOBUTTON "Reparar ou atualizar uma instalação do ReactOS",
IDC_UPDATE, 7, 50, 277, 10
-    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your
files, settings and programs. This option is only available if ReactOS is already
installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your
files, settings and programs. This option is only available if ReactOS is already
installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP
     LTEXT "Clique em Próximo para configurar os dispositivos.", IDC_STATIC, 7,
128, 297, 8
 END
 
@@ -30,7 +30,7 @@ BEGIN
     LTEXT       "The ReactOS Setup can upgrade one of the available ReactOS
installations listed below, or, if a ReactOS installation is damaged, the Setup program
can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18
     CONTROL     "", IDC_NTOSLIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303,
90
     PUSHBUTTON  "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14
-    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
128, 222, 16
+    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
124, 222, 16
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -52,12 +52,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Instalação do ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    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 "&Apagar", IDC_PARTDELETE, 63, 122, 50, 15
     PUSHBUTTON "D&rivers", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
     PUSHBUTTON "&Opções Avançadas...", IDC_PARTMOREOPTS, 230, 122, 80, 15
-    LTEXT "Clique em Próximo para verificar o sumário.", IDC_STATIC, 10, 180,
277, 20
+    // LTEXT "Clique em Próximo para verificar o sumário.", IDC_STATIC, 10,
180, 277, 20
 END
 
 IDD_PARTITION DIALOGEX 0, 0, 145, 90
@@ -96,7 +96,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYS
 CAPTION "Instalação do ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Clique em Próximo para iniciar o processo de instalação.",
IDC_STATIC, 7, 180, 303, 20
+    LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11
+    EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11
+    EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL |
WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11
+    EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE
| NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11
+    EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11
+    EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11
+    EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11
+    EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11
+    EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT
WS_BORDER | NOT WS_TABSTOP
+    AUTOCHECKBOX "I confirm that all the installation settings are correct. I also
acknowledge that\nReactOS is alpha-quality software and may break on my computer or
corrupt my data.",
+        IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE
+    LTEXT "Please confirm that all the installation settings are correct,\nthen
click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18
 END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
@@ -111,9 +129,10 @@ END
 
 IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Finalizando Instalação do ReactOS"
+CAPTION "Instalação do ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195,
24
     LTEXT "A primeira etapa de Instalação do ReactOS foi efetuada com
sucesso.", IDC_STATIC, 20, 50, 277, 10
     LTEXT "Clique em Finalizar para reiniciar o computador.", IDC_STATIC, 20,
80, 277, 10
     CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH
| WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
@@ -136,7 +155,7 @@ BEGIN
     IDS_SUMMARYSUBTITLE "Listar propriedades da instalação para verificação antes de
aplicá-las na instalação dos despositivos"
     IDS_ABORTSETUP "ReactOS não está totalmente instalado em seu computador. Se você
sair da Instalação agora, você precisará executar o Instalador novamente para instalar o
ReactOS. Tem certeza que deseja sair?"
     IDS_ABORTSETUP2 "Abortar instalação?"
-    IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to
continue."
+    IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to
continue."
     IDS_CAPTION "Instalação do ReactOS"
 END
 
@@ -150,6 +169,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_PARTITION_NAME "Name"
-    IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_TYPE "Type"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_STATUS "Status"
 END
diff --git a/base/setup/reactos/lang/ro-RO.rc b/base/setup/reactos/lang/ro-RO.rc
index 14dff513b9..199885911e 100644
--- a/base/setup/reactos/lang/ro-RO.rc
+++ b/base/setup/reactos/lang/ro-RO.rc
@@ -24,22 +24,22 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Asistent de instalare ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    AUTORADIOBUTTON "Instalează ReactOS", IDC_INSTALL, 7, 7, 277, 10
-    LTEXT "Instalarea unei noi copii a ReactOS. Fișierele, configurațiile și
programele existente nu vor fi păstrate. Sunt posibile ajustări asupra discurilor și
partițiilor.", IDC_INSTALLTEXT, 18, 18, 269, 25
+    AUTORADIOBUTTON "Instalează ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP
| WS_TABSTOP
+    LTEXT "Instalarea unei noi copii a ReactOS. Fișierele, configurațiile și
programele existente nu vor fi păstrate. Sunt posibile ajustări asupra discurilor și
partițiilor.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP
     AUTORADIOBUTTON "Repară sau actualizează ReactOS", IDC_UPDATE, 7, 50, 277,
10
-    LTEXT "Repararea sau actualizarea ReactOS. Această opțiune menține fișierele,
configurațiile și programele existente. Opțiune validă doar dacă ReactOS e deja instalat
în calculator.", IDC_UPDATETEXT, 18, 61, 269, 30
+    LTEXT "Repararea sau actualizarea ReactOS. Această opțiune menține fișierele,
configurațiile și programele existente. Opțiune validă doar dacă ReactOS e deja instalat
în calculator.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP
     LTEXT "Apăsați pe „Înainte” pentru configurarea de dispozitive.",
IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Setup"
+CAPTION "Asistent de instalare ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT       "The ReactOS Setup can upgrade one of the available ReactOS
installations listed below, or, if a ReactOS installation is damaged, the Setup program
can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18
     CONTROL     "", IDC_NTOSLIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303,
90
     PUSHBUTTON  "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14
-    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
128, 222, 16
+    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
124, 222, 16
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -61,12 +61,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Asistent de instalare ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    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 "Șt&erge", IDC_PARTDELETE, 63, 122, 50, 15
     PUSHBUTTON "Mo&dul pilot", IDC_DEVICEDRIVER, 174, 122, 50, 15,
WS_DISABLED
     PUSHBUTTON "Opțiuni a&vansate…", IDC_PARTMOREOPTS, 230, 122, 80, 15
-    LTEXT "Apăsați pe „Înainte” pentru a verifica sumarul.", IDC_STATIC, 10,
180, 277, 20
+    // LTEXT "Apăsați pe „Înainte” pentru a verifica sumarul.", IDC_STATIC, 10,
180, 277, 20
 END
 
 IDD_PARTITION DIALOGEX 0, 0, 145, 90
@@ -105,7 +105,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Asistent de instalare ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Apăsați „Înainte” pentru a continua procesul de instalare.",
IDC_STATIC, 10, 180, 277, 20
+    LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11
+    EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11
+    EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL |
WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11
+    EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE
| NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11
+    EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11
+    EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11
+    EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11
+    EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11
+    EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT
WS_BORDER | NOT WS_TABSTOP
+    AUTOCHECKBOX "I confirm that all the installation settings are correct. I also
acknowledge that\nReactOS is alpha-quality software and may break on my computer or
corrupt my data.",
+        IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE
+    LTEXT "Please confirm that all the installation settings are correct,\nthen
click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18
 END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
@@ -123,6 +141,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Asistent de instalare ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195,
24
     LTEXT "Ați dus la bun sfârșit prima etapă de instalare a ReactOS",
IDC_STATIC, 20, 50, 277, 10
     LTEXT "Când veți apăsa „Sfârșit”, calculatorul va reporni.", IDC_STATIC,
20, 80, 277, 10
     CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH
| WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
@@ -145,7 +164,7 @@ BEGIN
     IDS_SUMMARYSUBTITLE "Lista cu opțiuni de instalare ce necesită verificare
înainte de a continua instalarea."
     IDS_ABORTSETUP "ReactOS încă nu este complet instalat în calculator. Daca
întrerupeți procesul de instalare, pentru a instala va fi necesară repetarea pașilor
parcurși până acum. Sigur doriți asta?"
     IDS_ABORTSETUP2 "Abandonați instalarea?"
-    IDS_NO_TXTSETUP_SIF "Fișierulu „txtsetup.sif” nu poate fi găsit!\nInstalarea nu
poate continua."
+    IDS_NO_TXTSETUP_SIF "Fișierulu „txtsetup.sif” nu poate fi găsit.\nInstalarea nu
poate continua."
     IDS_CAPTION "Asistentul de instalare ReactOS"
 END
 
@@ -159,6 +178,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_PARTITION_NAME "Nume"
-    IDS_PARTITION_SIZE "Dimensiune"
     IDS_PARTITION_TYPE "Tip"
+    IDS_PARTITION_SIZE "Dimensiune"
+    IDS_PARTITION_STATUS "Status"
 END
diff --git a/base/setup/reactos/lang/ru-RU.rc b/base/setup/reactos/lang/ru-RU.rc
index d70e9973d7..5077e4999a 100644
--- a/base/setup/reactos/lang/ru-RU.rc
+++ b/base/setup/reactos/lang/ru-RU.rc
@@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYS
 CAPTION "Установка ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Вас приветствует программа установки ReactOS.", IDC_STARTTITLE, 115,
8, 195, 24
+    LTEXT "Вас приветствует программа установки ReactOS", IDC_STARTTITLE, 115,
8, 195, 24
     LTEXT "Установку ReactOS можно производить только загрузившись с этого диска!
После перезапуска компьютера выберите загрузку с CD и начните установку ReactOS.",
IDC_STATIC, 115, 40, 195, 100
     LTEXT "Нажмите кнопку ""Завершить"" для выхода.",
IDC_STATIC, 115, 169, 195, 17
 END
@@ -15,10 +15,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Установка ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    AUTORADIOBUTTON "Установка ReactOS", IDC_INSTALL, 7, 7, 277, 10
-    LTEXT "Установить новую копию системы ReactOS. Эта опция НЕ сохраняет файлы,
настройки и программы. Вы можете изменять диски и разделы.", IDC_INSTALLTEXT, 18, 18,
269, 25
+    AUTORADIOBUTTON "Установка ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP |
WS_TABSTOP
+    LTEXT "Установить новую копию системы ReactOS. Эта опция НЕ сохраняет файлы,
настройки и программы. Вы можете изменять диски и разделы.", IDC_INSTALLTEXT, 18, 18,
269, 25, NOT WS_GROUP
     AUTORADIOBUTTON "Восстановить или изменить установленный ранее ReactOS",
IDC_UPDATE, 7, 50, 277, 10
-    LTEXT "Обновить или восстановить установленную копию системы ReactOS. Эта опция
СОХРАНЯЕТ файлы, настройки и программы. Доступно только при наличии уже установленной на
компьютере системы ReactOS.", IDC_UPDATETEXT, 18, 61, 269, 30
+    LTEXT "Обновить или восстановить установленную копию системы ReactOS. Эта опция
СОХРАНЯЕТ файлы, настройки и программы. Доступно только при наличии уже установленной на
компьютере системы ReactOS.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP
     LTEXT "Для установки устройств нажмите ""Далее"".",
IDC_STATIC, 7, 128, 297, 8
 END
 
@@ -30,7 +30,7 @@ BEGIN
     LTEXT       "The ReactOS Setup can upgrade one of the available ReactOS
installations listed below, or, if a ReactOS installation is damaged, the Setup program
can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18
     CONTROL     "", IDC_NTOSLIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303,
90
     PUSHBUTTON  "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14
-    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
128, 222, 16
+    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
124, 222, 16
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -52,12 +52,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Установка ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    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 "&Удалить", IDC_PARTDELETE, 63, 122, 50, 15
     PUSHBUTTON "Д&райвер", IDC_DEVICEDRIVER, 162, 122, 50, 15, WS_DISABLED
     PUSHBUTTON "&Дополнительные параметры...", IDC_PARTMOREOPTS, 176, 122,
122, 15
-    LTEXT "Для начала установки нажмите ""Далее"".",
IDC_STATIC, 10, 180, 277, 20
+    // LTEXT "Для начала установки нажмите ""Далее"".",
IDC_STATIC, 10, 180, 277, 20
 END
 
 IDD_PARTITION DIALOGEX 0, 0, 145, 90
@@ -96,7 +96,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYS
 CAPTION "Установка ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Для начала установки нажмите ""Далее"".",
IDC_STATIC, 7, 180, 303, 20
+    LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11
+    EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11
+    EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL |
WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11
+    EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE
| NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11
+    EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11
+    EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11
+    EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11
+    EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11
+    EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT
WS_BORDER | NOT WS_TABSTOP
+    AUTOCHECKBOX "I confirm that all the installation settings are correct. I also
acknowledge that\nReactOS is alpha-quality software and may break on my computer or
corrupt my data.",
+        IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE
+    LTEXT "Please confirm that all the installation settings are correct,\nthen
click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18
 END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
@@ -111,9 +129,10 @@ END
 
 IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Завершение установки ReactOS"
+CAPTION "Установка ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195,
24
     LTEXT "Первый этап установки ReactOS закончен.", IDC_STATIC, 20, 50, 277,
10
     LTEXT "После нажатия клавиши ""Завершить"" ваш компьютер
будет перезагружен.", IDC_STATIC, 20, 80, 277, 10
     CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH
| WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
@@ -136,7 +155,7 @@ BEGIN
     IDS_SUMMARYSUBTITLE "Проверьте список параметров перед началом установки"
     IDS_ABORTSETUP "ReactOS установлен на компьютер не полностью. Если вы закроете
программу установки сейчас, в дальнейшем вам придется повторить установку ReactOS. Вы
уверены, что необходимо прервать установку?"
     IDS_ABORTSETUP2 "Прервать установку?"
-    IDS_NO_TXTSETUP_SIF "Не удалось найти файл 'txtsetup.sif'\nПродолжение
установки невозможно."
+    IDS_NO_TXTSETUP_SIF "Не удалось найти файл 'txtsetup.sif'.\nПродолжение
установки невозможно."
     IDS_CAPTION "Установка ReactOS"
 END
 
@@ -150,6 +169,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_PARTITION_NAME "Имя"
-    IDS_PARTITION_SIZE "Размер"
     IDS_PARTITION_TYPE "Тип"
+    IDS_PARTITION_SIZE "Размер"
+    IDS_PARTITION_STATUS "Status"
 END
diff --git a/base/setup/reactos/lang/sk-SK.rc b/base/setup/reactos/lang/sk-SK.rc
index 20849ddecd..b7621907fb 100644
--- a/base/setup/reactos/lang/sk-SK.rc
+++ b/base/setup/reactos/lang/sk-SK.rc
@@ -10,7 +10,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYS
 CAPTION "Inštalácia systému ReactOS" //ReactOS Setup
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Víta Vás sprievodca inštaláciou systému ReactOS.", IDC_STARTTITLE,
115, 8, 195, 24
+    LTEXT "Víta Vás sprievodca inštaláciou systému ReactOS", IDC_STARTTITLE,
115, 8, 195, 24
     LTEXT "Systém ReactOS sa z tohto CD nedá nainštalovať ihneď! Reštartujte,
prosím, počítač a inštalačné CD nechajte vložené, aby sa mohol systém ReactOS
nainštalovať.", IDC_STATIC, 115, 40, 195, 100
     LTEXT "Inštaláciu ukončíte kliknutím na tlačidlo Dokončiť.", IDC_STATIC,
115, 169, 195, 17
 END
@@ -20,10 +20,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Inštalácia systému ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    AUTORADIOBUTTON "Nainštalovať systém ReactOS", IDC_INSTALL, 7, 7, 277, 10
-    LTEXT "Install a new copy of ReactOS. This option does not keep your files,
settings and programs. You can make changes to disks and partitions.",
IDC_INSTALLTEXT, 18, 18, 269, 25
+    AUTORADIOBUTTON "Nainštalovať systém ReactOS", IDC_INSTALL, 7, 7, 277, 10,
WS_GROUP | WS_TABSTOP
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files,
settings and programs. You can make changes to disks and partitions.",
IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP
     AUTORADIOBUTTON "Opraviť alebo aktualizovať nainštalovaný systém ReactOS",
IDC_UPDATE, 7, 50, 277, 10
-    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your
files, settings and programs. This option is only available if ReactOS is already
installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your
files, settings and programs. This option is only available if ReactOS is already
installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP
     LTEXT "Click Next to setup the devices.", IDC_STATIC, 7, 128, 297, 8
 END
 
@@ -35,7 +35,7 @@ BEGIN
     LTEXT       "The ReactOS Setup can upgrade one of the available ReactOS
installations listed below, or, if a ReactOS installation is damaged, the Setup program
can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18
     CONTROL     "", IDC_NTOSLIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303,
90
     PUSHBUTTON  "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14
-    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
128, 222, 16
+    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
124, 222, 16
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -57,12 +57,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Inštalácia systému ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    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 "O&dstrániť", IDC_PARTDELETE, 63, 122, 50, 15
     PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
     PUSHBUTTON "Rozšírené &možnosti...", IDC_PARTMOREOPTS, 230, 122, 80,
15
-    LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20
+    // LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20
 END
 
 IDD_PARTITION DIALOGEX 0, 0, 145, 90
@@ -101,7 +101,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Inštalácia systému ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Kliknutím na tlačidlo Ďalej spustíte inštalačný proces.",
IDC_STATIC, 7, 180, 303, 20
+    LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11
+    EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11
+    EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL |
WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11
+    EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE
| NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11
+    EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11
+    EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11
+    EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11
+    EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11
+    EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT
WS_BORDER | NOT WS_TABSTOP
+    AUTOCHECKBOX "I confirm that all the installation settings are correct. I also
acknowledge that\nReactOS is alpha-quality software and may break on my computer or
corrupt my data.",
+        IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE
+    LTEXT "Please confirm that all the installation settings are correct,\nthen
click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18
 END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
@@ -116,9 +134,10 @@ END
 
 IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Completing ReactOS Setup"
+CAPTION "Inštalácia systému ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195,
24
     LTEXT "You have successfully completed the first stage of ReactOS Setup.",
IDC_STATIC, 20, 50, 277, 10
     LTEXT "Kliknutím na tlačidlo Dokončiť reštartujete počítač.", IDC_STATIC,
20, 80, 277, 10
     CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH
| WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
@@ -141,7 +160,7 @@ BEGIN
     IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the
installation device"
     IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you
quit Setup now, you will need to run Setup again to install ReactOS. Naozaj
skončiť?"
     IDS_ABORTSETUP2 "Prerušiť inštaláciu?"
-    IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to
continue."
+    IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to
continue."
     IDS_CAPTION "ReactOS Setup"
 END
 
@@ -155,6 +174,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_PARTITION_NAME "Name"
-    IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_TYPE "Type"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_STATUS "Status"
 END
diff --git a/base/setup/reactos/lang/sq-AL.rc b/base/setup/reactos/lang/sq-AL.rc
index c1f718e6ff..4060a0090f 100644
--- a/base/setup/reactos/lang/sq-AL.rc
+++ b/base/setup/reactos/lang/sq-AL.rc
@@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYS
 CAPTION "Instalimi i ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Mirë se vini në instalimin e ReactOS.", IDC_STARTTITLE, 115, 8, 195,
24
+    LTEXT "Mirë se vini në instalimin e ReactOS", IDC_STARTTITLE, 115, 8, 195,
24
     LTEXT "Ju nuk mund të instaloni ReactOS direkt nga ky CD! Ju lutem rinisni
kompjuterin tuaj nga CD'ja në mënyrë që të instaloni ReactOS.", IDC_STATIC, 115,
40, 195, 100
     LTEXT "Kliko Finish për të dalë nga instalimi.", IDC_STATIC, 115, 169, 195,
17
 END
@@ -17,10 +17,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Instalimi i ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    AUTORADIOBUTTON "InstalO ReactOS", IDC_INSTALL, 7, 7, 277, 10
-    LTEXT "Install a new copy of ReactOS. This option does not keep your files,
settings and programs. You can make changes to disks and partitions.",
IDC_INSTALLTEXT, 18, 18, 269, 25
+    AUTORADIOBUTTON "InstalO ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP |
WS_TABSTOP
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files,
settings and programs. You can make changes to disks and partitions.",
IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP
     AUTORADIOBUTTON "Riparo ose apdejto ReactOS'in e instaluar",
IDC_UPDATE, 7, 50, 277, 10
-    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your
files, settings and programs. This option is only available if ReactOS is already
installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your
files, settings and programs. This option is only available if ReactOS is already
installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP
     LTEXT "Kliko vazhdo për të konfiguruar pajisjet.", IDC_STATIC, 7, 128, 297,
8
 END
 
@@ -32,7 +32,7 @@ BEGIN
     LTEXT       "The ReactOS Setup can upgrade one of the available ReactOS
installations listed below, or, if a ReactOS installation is damaged, the Setup program
can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18
     CONTROL     "", IDC_NTOSLIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303,
90
     PUSHBUTTON  "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14
-    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
128, 222, 16
+    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
124, 222, 16
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -54,12 +54,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Instalimi i ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    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 "&Fshi", IDC_PARTDELETE, 63, 122, 50, 15
     PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
     PUSHBUTTON "&Opsionet e avancuara...", IDC_PARTMOREOPTS, 230, 122, 80,
15
-    LTEXT "Kliko vazhdo për të kontrolluar përmbajtjen.", IDC_STATIC, 10, 180,
277, 20
+    // LTEXT "Kliko vazhdo për të kontrolluar përmbajtjen.", IDC_STATIC, 10,
180, 277, 20
 END
 
 IDD_PARTITION DIALOGEX 0, 0, 145, 90
@@ -98,7 +98,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYS
 CAPTION "Instalimi i ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Kliko vazhdo për të filluar instalimin.", IDC_STATIC, 7, 180, 303,
20
+    LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11
+    EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11
+    EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL |
WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11
+    EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE
| NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11
+    EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11
+    EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11
+    EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11
+    EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11
+    EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT
WS_BORDER | NOT WS_TABSTOP
+    AUTOCHECKBOX "I confirm that all the installation settings are correct. I also
acknowledge that\nReactOS is alpha-quality software and may break on my computer or
corrupt my data.",
+        IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE
+    LTEXT "Please confirm that all the installation settings are correct,\nthen
click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18
 END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
@@ -113,9 +131,10 @@ END
 
 IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kompletimi i instalimit te ReactOS"
+CAPTION "Instalimi i ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195,
24
     LTEXT "Ju keni kompletuar me sukses fazën e parë të instalimit të
ReactOS.", IDC_STATIC, 20, 50, 277, 10
     LTEXT "Kur te klikoni mbarim, kompjuteri juaj do riniset.", IDC_STATIC, 20,
80, 277, 10
     CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH
| WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
@@ -138,7 +157,7 @@ BEGIN
     IDS_SUMMARYSUBTITLE "Listo të dhënat e instalimit për të kontrolluar para së të
aplikohen për pajisjet e instalimit/kompjuterit"
     IDS_ABORTSETUP "ReactOS nuk është instaluar plotësisht në kompjuterin tuaj. Nëse
ju dilni nga instalimi tani, do ju duhet të filloni instalimin përsëri për të instalumar
ReactOS. Doni ta mbyllni?"
     IDS_ABORTSETUP2 "Ndërpritni Instalimin?"
-    IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to
continue."
+    IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to
continue."
     IDS_CAPTION "ReactOS Setup"
 END
 
@@ -152,6 +171,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_PARTITION_NAME "Name"
-    IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_TYPE "Type"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_STATUS "Status"
 END
diff --git a/base/setup/reactos/lang/tr-TR.rc b/base/setup/reactos/lang/tr-TR.rc
index 29153a11e8..f77e115180 100644
--- a/base/setup/reactos/lang/tr-TR.rc
+++ b/base/setup/reactos/lang/tr-TR.rc
@@ -17,10 +17,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "ReactOS Kur"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    AUTORADIOBUTTON "ReactOS'u Yükleme", IDC_INSTALL, 7, 7, 277, 10
-    LTEXT "ReactOS'un yeni bir kopyasını yükle. Bu seçenek, kütüklerinizi,
ayarlarınızı ve izlencelerinizi korumaz. Disklere ve bölümlere değişiklikler
yapabilirsiniz.", IDC_INSTALLTEXT, 18, 18, 269, 25
+    AUTORADIOBUTTON "ReactOS'u Yükleme", IDC_INSTALL, 7, 7, 277, 10,
WS_GROUP | WS_TABSTOP
+    LTEXT "ReactOS'un yeni bir kopyasını yükle. Bu seçenek, kütüklerinizi,
ayarlarınızı ve izlencelerinizi korumaz. Disklere ve bölümlere değişiklikler
yapabilirsiniz.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP
     AUTORADIOBUTTON "Kurulu ReactOS'u Onarma ya da Yükseltme", IDC_UPDATE,
7, 50, 277, 10
-    LTEXT "ReactOS'un kurulu bir kopyasını şimdikileştir ya da onar. Bu seçenek,
kütüklerinizi, ayarlarınızı ve izlencelerinizi korur. Bu seçenek yalnızca ReactOS bu
bilgisayarda önceden kuruluysa kullanılabilir.", IDC_UPDATETEXT, 18, 61, 269, 30
+    LTEXT "ReactOS'un kurulu bir kopyasını şimdikileştir ya da onar. Bu seçenek,
kütüklerinizi, ayarlarınızı ve izlencelerinizi korur. Bu seçenek yalnızca ReactOS bu
bilgisayarda önceden kuruluysa kullanılabilir.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT
WS_GROUP
     LTEXT "Aygıtları kurmak için İleri'ye tıklayınız.", IDC_STATIC, 7, 128,
297, 8
 END
 
@@ -32,7 +32,7 @@ BEGIN
     LTEXT       "The ReactOS Setup can upgrade one of the available ReactOS
installations listed below, or, if a ReactOS installation is damaged, the Setup program
can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18
     CONTROL     "", IDC_NTOSLIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303,
90
     PUSHBUTTON  "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14
-    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
128, 222, 16
+    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
124, 222, 16
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -54,12 +54,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "ReactOS Kur"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    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 "&Sil", IDC_PARTDELETE, 63, 122, 50, 15
     PUSHBUTTON "S&ürücü", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
     PUSHBUTTON "G&elişmiş Seçenekler...", IDC_PARTMOREOPTS, 230, 122, 80,
15
-    LTEXT "Kurulum özetini gözden geçirmek için İleri'ye tıklayınız.",
IDC_STATIC, 10, 180, 277, 20
+    // LTEXT "Kurulum özetini gözden geçirmek için İleri'ye tıklayınız.",
IDC_STATIC, 10, 180, 277, 20
 END
 
 IDD_PARTITION DIALOGEX 0, 0, 145, 90
@@ -98,7 +98,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYS
 CAPTION "ReactOS Kur"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Kurulumu işlemini başlatmak için İleri'ye tıklayınız.",
IDC_STATIC, 7, 180, 303, 20
+    LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11
+    EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11
+    EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL |
WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11
+    EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE
| NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11
+    EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11
+    EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11
+    EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11
+    EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11
+    EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT
WS_BORDER | NOT WS_TABSTOP
+    AUTOCHECKBOX "I confirm that all the installation settings are correct. I also
acknowledge that\nReactOS is alpha-quality software and may break on my computer or
corrupt my data.",
+        IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE
+    LTEXT "Please confirm that all the installation settings are correct,\nthen
click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18
 END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
@@ -113,9 +131,10 @@ END
 
 IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Kurulumunun Bitirilmesi"
+CAPTION "ReactOS Kur"
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195,
24
     LTEXT "ReactOS kurulumunun ilk aşamasını başarıyla bitirdiniz.",
IDC_STATIC, 20, 50, 277, 10
     LTEXT "Bitir'e tıkladığınızda bilgisayarınız yeniden başlatılacaktır.",
IDC_STATIC, 20, 80, 277, 10
     CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH
| WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
@@ -152,6 +171,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_PARTITION_NAME "Ad"
-    IDS_PARTITION_SIZE "Boyut"
     IDS_PARTITION_TYPE "Tür"
+    IDS_PARTITION_SIZE "Boyut"
+    IDS_PARTITION_STATUS "Status"
 END
diff --git a/base/setup/reactos/lang/uk-UA.rc b/base/setup/reactos/lang/uk-UA.rc
index ddcefcbcfe..371a2e6170 100644
--- a/base/setup/reactos/lang/uk-UA.rc
+++ b/base/setup/reactos/lang/uk-UA.rc
@@ -13,7 +13,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYS
 CAPTION "Встановлення ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Вас вітає програма встановлення ReactOS.", IDC_STARTTITLE, 115, 8,
195, 24
+    LTEXT "Вас вітає програма встановлення ReactOS", IDC_STARTTITLE, 115, 8,
195, 24
     LTEXT "Ви не можете встановити ReactOS прямо з цього CD! Будь ласка
перезапустіть Ваш комп’ютер з цього CD для того, щоб встановити ReactOS.",
IDC_STATIC, 115, 40, 195, 100
     LTEXT "Натисніть кнопку Завершити для виходу.", IDC_STATIC, 115, 169, 195,
17
 END
@@ -23,10 +23,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Встановлення ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    AUTORADIOBUTTON "Встановлення ReactOS", IDC_INSTALL, 7, 7, 277, 10
-    LTEXT "Install a new copy of ReactOS. This option does not keep your files,
settings and programs. You can make changes to disks and partitions.",
IDC_INSTALLTEXT, 18, 18, 269, 25
+    AUTORADIOBUTTON "Встановлення ReactOS", IDC_INSTALL, 7, 7, 277, 10,
WS_GROUP | WS_TABSTOP
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files,
settings and programs. You can make changes to disks and partitions.",
IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP
     AUTORADIOBUTTON "Відновити або змінити встановлений раніше ReactOS",
IDC_UPDATE, 7, 50, 277, 10
-    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your
files, settings and programs. This option is only available if ReactOS is already
installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your
files, settings and programs. This option is only available if ReactOS is already
installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP
     LTEXT "Для встановлення пристроїв натисніть Далі.", IDC_STATIC, 7, 128,
297, 8
 END
 
@@ -38,7 +38,7 @@ BEGIN
     LTEXT       "The ReactOS Setup can upgrade one of the available ReactOS
installations listed below, or, if a ReactOS installation is damaged, the Setup program
can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18
     CONTROL     "", IDC_NTOSLIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303,
90
     PUSHBUTTON  "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14
-    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
128, 222, 16
+    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
124, 222, 16
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -60,12 +60,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Встановлення ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    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 "&Видалити", IDC_PARTDELETE, 63, 122, 50, 15
     PUSHBUTTON "Д&райвер", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
     PUSHBUTTON "&Додаткові Опції...", IDC_PARTMOREOPTS, 230, 122, 80, 15
-    LTEXT "Для початку встановлення натисніть Далі", IDC_STATIC, 10, 180, 277,
20
+    // LTEXT "Для початку встановлення натисніть Далі", IDC_STATIC, 10, 180,
277, 20
 END
 
 IDD_PARTITION DIALOGEX 0, 0, 172, 90
@@ -104,7 +104,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Встановлення ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Для початку встановлення натисніть Далі.", IDC_STATIC, 7, 180, 303,
20
+    LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11
+    EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11
+    EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL |
WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11
+    EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE
| NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11
+    EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11
+    EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11
+    EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11
+    EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11
+    EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT
WS_BORDER | NOT WS_TABSTOP
+    AUTOCHECKBOX "I confirm that all the installation settings are correct. I also
acknowledge that\nReactOS is alpha-quality software and may break on my computer or
corrupt my data.",
+        IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE
+    LTEXT "Please confirm that all the installation settings are correct,\nthen
click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18
 END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
@@ -119,9 +137,10 @@ END
 
 IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Завершення встановлення ReactOS"
+CAPTION "Встановлення ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195,
24
     LTEXT "Перший етап встановлення ReactOS завершено.", IDC_STATIC, 20, 50,
277, 10
     LTEXT "Після натискання клавіші Завершити ваш комп'ютер буде
перезавантажений.", IDC_STATIC, 20, 80, 277, 10
     CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH
| WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
@@ -144,7 +163,7 @@ BEGIN
     IDS_SUMMARYSUBTITLE "Перевірте список властивостей встановлення, перш ніж почати
встановлення системи"
     IDS_ABORTSETUP "ReactOS встановлений на комп'ютер не повністю. Якщо ви
закриєте програму встановлення зараз, в подальшому вам доведеться повторити встановлення
ReactOS. Ви впевнені, що необхідно перервати встановлення?"
     IDS_ABORTSETUP2 "Перервати встановлення?"
-    IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to
continue."
+    IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to
continue."
     IDS_CAPTION "Встановлення ReactOS"
 END
 
@@ -158,6 +177,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_PARTITION_NAME "Name"
-    IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_TYPE "Type"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_STATUS "Status"
 END
diff --git a/base/setup/reactos/lang/vi-VN.rc b/base/setup/reactos/lang/vi-VN.rc
index 6738ad0e42..c125df0d2a 100644
--- a/base/setup/reactos/lang/vi-VN.rc
+++ b/base/setup/reactos/lang/vi-VN.rc
@@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYS
 CAPTION "Cài đặt ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Chào mừng đến với Trình hướng dẫn thiết lập ReactOS.",
IDC_STARTTITLE, 115, 8, 195, 24
+    LTEXT "Chào mừng đến với Trình hướng dẫn thiết lập ReactOS",
IDC_STARTTITLE, 115, 8, 195, 24
     LTEXT "Bạn chưa thể cài đặt ReactOS trực tiếp tư đĩa CD này được! Xin hãy khởi
động lại máy tính của bạn từ đĩa CD trên để cài đặt ReactOS.", IDC_STATIC, 115, 40,
195, 100
     LTEXT "Ấn Hoàn tất để thoát trình Thiết lập.", IDC_STATIC, 115, 169, 195,
17
 END
@@ -15,10 +15,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Cài đặt ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    AUTORADIOBUTTON "Cài đặt ReactOS", IDC_INSTALL, 7, 7, 277, 10
-    LTEXT "Cài đặt một bản sao mới của ReactOS. Tùy chọn này sẽ không giữ lại các
thư mục,tập tin và chương trình của bạn. Bạn có thể thực hiện những thay đổi cho các ổ đĩa
và những  phần phân chia trong ổ đĩa.", IDC_INSTALLTEXT, 18, 18, 269, 25
+    AUTORADIOBUTTON "Cài đặt ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP |
WS_TABSTOP
+    LTEXT "Cài đặt một bản sao mới của ReactOS. Tùy chọn này sẽ không giữ lại các
thư mục,tập tin và chương trình của bạn. Bạn có thể thực hiện những thay đổi cho các ổ đĩa
và những  phần phân chia trong ổ đĩa.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT
WS_GROUP
     AUTORADIOBUTTON "Cập nhật hay sửa chữa ReactOS", IDC_UPDATE, 7, 50, 277,
10
-    LTEXT "Cập nhật hay sửa chữa một bản sao đã cài đặt của ReactOS. Tùy chọn này sẽ
giữ lại các tập tin, cài đặt và chương trình của bạn. Tùy chọn này chỉ dùng được nếu
ReactOS đã được cài đặt trên máy tinh này.", IDC_UPDATETEXT, 18, 61, 269, 30
+    LTEXT "Cập nhật hay sửa chữa một bản sao đã cài đặt của ReactOS. Tùy chọn này sẽ
giữ lại các tập tin, cài đặt và chương trình của bạn. Tùy chọn này chỉ dùng được nếu
ReactOS đã được cài đặt trên máy tinh này.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT
WS_GROUP
     LTEXT "Ấn Tiếp để tiếp tục.", IDC_STATIC, 7, 128, 297, 8
 END
 
@@ -30,7 +30,7 @@ BEGIN
     LTEXT       "The ReactOS Setup can upgrade one of the available ReactOS
installations listed below, or, if a ReactOS installation is damaged, the Setup program
can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18
     CONTROL     "", IDC_NTOSLIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303,
90
     PUSHBUTTON  "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14
-    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
128, 222, 16
+    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
124, 222, 16
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -52,12 +52,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Cài đặt ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
     PUSHBUTTON "&Tạo", IDC_PARTCREATE, 7, 122, 50, 14
     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
*/
+    // 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
@@ -96,7 +96,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYS
 CAPTION "Cài đặt ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Ấn Tiếp để băt đầu quá trình cài đặt.", IDC_STATIC, 7, 128, 303, 8
+    LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11
+    EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11
+    EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL |
WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11
+    EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE
| NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11
+    EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11
+    EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11
+    EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11
+    EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11
+    EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT
WS_BORDER | NOT WS_TABSTOP
+    AUTOCHECKBOX "I confirm that all the installation settings are correct. I also
acknowledge that\nReactOS is alpha-quality software and may break on my computer or
corrupt my data.",
+        IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE
+    LTEXT "Please confirm that all the installation settings are correct,\nthen
click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18
 END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
@@ -114,6 +132,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "Đang hoàn tất cài đặt Reactos"
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195,
24
     LTEXT "Bạn đã hoàn thành giai đoạn đầu của việc thiết lập ReactOS.",
IDC_STATIC, 115, 50, 195, 10
     LTEXT "bạn Khi bạn ấn Hoàn tất,máy tính của bạn sẽ khởi động lại.",
IDC_STATIC, 115, 80, 195, 10
     CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH
| WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8
@@ -136,7 +155,7 @@ BEGIN
     IDS_SUMMARYSUBTITLE "Liệt kê các thuộc tính đã lựa chọn nhằm kiểm lại trước khi
áp dụng vào thiết bị được chọn"
     IDS_ABORTSETUP "ReactOS vẵn chưa được hoàn tất cài đặt trên máy tính của bạn.
Nếu bây giờ bạn hủy trình Thiết lập, lần tới ban sẽ cần phải chạy lại trình Thiết lập để
cài đặt ReactOS. Bạn thực sự muốn bỏ?"
     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_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"
 END
 
@@ -150,6 +169,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_PARTITION_NAME "Tên"
-    IDS_PARTITION_SIZE "Kích cỡ"
     IDS_PARTITION_TYPE "Loại định dạng"
+    IDS_PARTITION_SIZE "Kích cỡ"
+    IDS_PARTITION_STATUS "Status"
 END
diff --git a/base/setup/reactos/lang/zh-CN.rc b/base/setup/reactos/lang/zh-CN.rc
index adf33cdfb0..3b681a49aa 100644
--- a/base/setup/reactos/lang/zh-CN.rc
+++ b/base/setup/reactos/lang/zh-CN.rc
@@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYS
 CAPTION "ReactOS 安装程序"
 FONT 9, "宋体"
 BEGIN
-    LTEXT "欢迎使用 ReactOS 安装程序。", IDC_STARTTITLE, 115, 8, 195, 24
+    LTEXT "欢迎使用 ReactOS 安装程序", IDC_STARTTITLE, 115, 8, 195, 24
     LTEXT "您不能直接从此 CD 安装 ReactOS！请重新启动并从 CD 引导您的电脑以便安装 ReactOS。", IDC_STATIC,
115, 40, 195, 100
     LTEXT "点击完成退出安装。", IDC_STATIC, 115, 169, 195, 17
 END
@@ -15,22 +15,22 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "ReactOS 安装程序"
 FONT 9, "宋体"
 BEGIN
-    AUTORADIOBUTTON "安装 ReactOS", IDC_INSTALL, 7, 7, 277, 10
-    LTEXT "安装 ReactOS 的新副本。此选项将不会保存你的文件、设置和程序。你可以对磁盘和分区进行更改。", IDC_INSTALLTEXT,
18, 18, 269, 25
+    AUTORADIOBUTTON "安装 ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP |
WS_TABSTOP
+    LTEXT "安装 ReactOS 的新副本。此选项将不会保存你的文件、设置和程序。你可以对磁盘和分区进行更改。", IDC_INSTALLTEXT,
18, 18, 269, 25, NOT WS_GROUP
     AUTORADIOBUTTON "修复或更新已安装的 ReactOS", IDC_UPDATE, 7, 50, 277, 10
-    LTEXT "更新或修复 ReactOS 安装的副本。此选项会保存您的文件、设置和程序。如果 ReactOS 已经安装，此选项方可使用。",
IDC_UPDATETEXT, 18, 61, 269, 30
+    LTEXT "更新或修复 ReactOS 安装的副本。此选项会保存您的文件、设置和程序。如果 ReactOS 已经安装，此选项方可使用。",
IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP
     LTEXT "点击下一步安装设备。", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Setup"
+CAPTION "ReactOS 安装程序"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT       "The ReactOS Setup can upgrade one of the available ReactOS
installations listed below, or, if a ReactOS installation is damaged, the Setup program
can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18
     CONTROL     "", IDC_NTOSLIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303,
90
     PUSHBUTTON  "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14
-    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
128, 222, 16
+    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
124, 222, 16
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -52,12 +52,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "ReactOS 安装程序"
 FONT 9, "宋体"
 BEGIN
-    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    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 "删除(&D)", IDC_PARTDELETE, 63, 122, 50, 15
     PUSHBUTTON "驱动器(&r)", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
     PUSHBUTTON "高级选项(&A)...", IDC_PARTMOREOPTS, 230, 122, 80, 15
-    LTEXT "点击下一步检查安装概要。", IDC_STATIC, 10, 180, 277, 20
+    // LTEXT "点击下一步检查安装概要。", IDC_STATIC, 10, 180, 277, 20
 END
 
 IDD_PARTITION DIALOGEX 0, 0, 145, 90
@@ -96,7 +96,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYS
 CAPTION "ReactOS 安装程序"
 FONT 9, "宋体"
 BEGIN
-    LTEXT "点击下一步开始安装过程。", IDC_STATIC, 7, 180, 303, 20
+    LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11
+    EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11
+    EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL |
WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11
+    EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE
| NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11
+    EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11
+    EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11
+    EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11
+    EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11
+    EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT
WS_BORDER | NOT WS_TABSTOP
+    AUTOCHECKBOX "I confirm that all the installation settings are correct. I also
acknowledge that\nReactOS is alpha-quality software and may break on my computer or
corrupt my data.",
+        IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE
+    LTEXT "Please confirm that all the installation settings are correct,\nthen
click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18
 END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
@@ -114,6 +132,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "ReactOS 安装程序完成"
 FONT 9, "宋体"
 BEGIN
+    LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195,
24
     LTEXT "您成功完成 ReactOS 第一阶段安装过程。", IDC_STATIC, 20, 50, 277, 10
     LTEXT "点击完成后，您的电脑将会重新启动。", IDC_STATIC, 20, 80, 277, 10
     CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH
| WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
@@ -136,7 +155,7 @@ BEGIN
     IDS_SUMMARYSUBTITLE "安装程序将会执行的内容，以供参考"
     IDS_ABORTSETUP "ReactOS 未在您的电脑上安装完成。如果您现在退出安装程序，您需要再次运行安装程序来安装 ReactOS。
确定退出？"
     IDS_ABORTSETUP2 "终止安装？"
-    IDS_NO_TXTSETUP_SIF "无法找到 'txtsetup.sif'\n安装程序无法继续。"
+    IDS_NO_TXTSETUP_SIF "无法找到 'txtsetup.sif'。\n安装程序无法继续。"
     IDS_CAPTION "ReactOS 安装程序"
 END
 
@@ -150,6 +169,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_PARTITION_NAME "名称"
-    IDS_PARTITION_SIZE "大小"
     IDS_PARTITION_TYPE "类型"
+    IDS_PARTITION_SIZE "大小"
+    IDS_PARTITION_STATUS "Status"
 END
diff --git a/base/setup/reactos/lang/zh-TW.rc b/base/setup/reactos/lang/zh-TW.rc
index c5e511dc0f..5f6ede0e50 100644
--- a/base/setup/reactos/lang/zh-TW.rc
+++ b/base/setup/reactos/lang/zh-TW.rc
@@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYS
 CAPTION "ReactOS 安裝"
 FONT 9, "新細明體"
 BEGIN
-    LTEXT "歡迎使用 ReactOS 安裝嚮導。", IDC_STARTTITLE, 115, 8, 195, 24
+    LTEXT "歡迎使用 ReactOS 安裝嚮導", IDC_STARTTITLE, 115, 8, 195, 24
     LTEXT "您不能直接從此CD安裝 ReactOS！ 請重新啟動並從CD引導您的電腦以便安裝 ReactOS。", IDC_STATIC, 115,
40, 195, 100
     LTEXT "點選完成退出安裝。", IDC_STATIC, 115, 169, 195, 17
 END
@@ -17,22 +17,22 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "ReactOS 安裝"
 FONT 9, "新細明體"
 BEGIN
-    AUTORADIOBUTTON "安裝 ReactOS", IDC_INSTALL, 7, 7, 277, 10
-    LTEXT "安裝 ReactOS 的新副本。此選項沒有儲存你的檔案、 設定和程式。你可以對磁碟和分區進行更改。", IDC_INSTALLTEXT,
18, 18, 269, 25
+    AUTORADIOBUTTON "安裝 ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP |
WS_TABSTOP
+    LTEXT "安裝 ReactOS 的新副本。此選項沒有儲存你的檔案、 設定和程式。你可以對磁碟和分區進行更改。", IDC_INSTALLTEXT,
18, 18, 269, 25, NOT WS_GROUP
     AUTORADIOBUTTON "修復或更新已安裝的 ReactOS", IDC_UPDATE, 7, 50, 277, 10
-    LTEXT "更新或修復 ReactOS 安裝的副本。此選項會儲存您的檔案、 設定和程式。如果 ReactOS 已經安裝在此計算機上,
此選項才能使用的。", IDC_UPDATETEXT, 18, 61, 269, 30
+    LTEXT "更新或修復 ReactOS 安裝的副本。此選項會儲存您的檔案、 設定和程式。如果 ReactOS 已經安裝在此計算機上,
此選項才能使用的。", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP
     LTEXT "點選下一步安裝裝置。", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Setup"
+CAPTION "ReactOS 安裝"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT       "The ReactOS Setup can upgrade one of the available ReactOS
installations listed below, or, if a ReactOS installation is damaged, the Setup program
can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18
     CONTROL     "", IDC_NTOSLIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303,
90
     PUSHBUTTON  "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14
-    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
128, 222, 16
+    LTEXT       "Click Next to upgrade the selected OS installation, or on 'Do
not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7,
124, 222, 16
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -54,12 +54,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "ReactOS 安裝"
 FONT 9, "新細明體"
 BEGIN
-    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    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 "刪除(&D)", IDC_PARTDELETE, 63, 122, 50, 15
     PUSHBUTTON "驅動器(&r)", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
     PUSHBUTTON "高階選項(&A)...", IDC_PARTMOREOPTS, 230, 122, 80, 15
-    LTEXT "點選下一步檢查安裝概要。", IDC_STATIC, 10, 180, 277, 20
+    // LTEXT "點選下一步檢查安裝概要。", IDC_STATIC, 10, 180, 277, 20
 END
 
 IDD_PARTITION DIALOGEX 0, 0, 145, 90
@@ -98,7 +98,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYS
 CAPTION "ReactOS 安裝"
 FONT 9, "新細明體"
 BEGIN
-    LTEXT "點選下一步開始安裝過程。", IDC_STATIC, 7, 180, 303, 20
+    LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11
+    EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11
+    EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL |
WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11
+    EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE
| NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11
+    EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11
+    EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11
+    EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11
+    EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE |
NOT WS_BORDER | NOT WS_TABSTOP
+    LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11
+    EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT
WS_BORDER | NOT WS_TABSTOP
+    AUTOCHECKBOX "I confirm that all the installation settings are correct. I also
acknowledge that\nReactOS is alpha-quality software and may break on my computer or
corrupt my data.",
+        IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE
+    LTEXT "Please confirm that all the installation settings are correct,\nthen
click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18
 END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
@@ -116,6 +134,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
 CAPTION "ReactOS 安裝完成"
 FONT 9, "新細明體"
 BEGIN
+    LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195,
24
     LTEXT "您成功完成 ReactOS 第一階段安裝過程。", IDC_STATIC, 20, 50, 277, 10
     LTEXT "點選完成後，您的電腦將會重新啟動。", IDC_STATIC, 20, 80, 277, 10
     CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH
| WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
@@ -138,7 +157,7 @@ BEGIN
     IDS_SUMMARYSUBTITLE "正是安裝前列出安裝屬性以供檢查"
     IDS_ABORTSETUP "ReactOS 未在您的電腦上安裝完成。如果您現在退出安裝程式，您需要在一次運行安裝程式來安裝 ReactOS。
確定退出？"
     IDS_ABORTSETUP2 "終止安裝？"
-    IDS_NO_TXTSETUP_SIF "無法找到 'txtsetup.sif'\n安裝程式無法繼續。"
+    IDS_NO_TXTSETUP_SIF "無法找到 'txtsetup.sif'。\n安裝程式無法繼續。"
     IDS_CAPTION "ReactOS 安裝"
 END
 
@@ -152,6 +171,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_PARTITION_NAME "名稱"
-    IDS_PARTITION_SIZE "大小"
     IDS_PARTITION_TYPE "類型"
+    IDS_PARTITION_SIZE "大小"
+    IDS_PARTITION_STATUS "Status"
 END
diff --git a/base/setup/reactos/resource.h b/base/setup/reactos/resource.h
index 0cfb9897ae..5d2037ea7c 100644
--- a/base/setup/reactos/resource.h
+++ b/base/setup/reactos/resource.h
@@ -16,50 +16,61 @@
 #define IDD_STARTPAGE        2000
 #define IDC_STARTTITLE       2001
 
-#define IDD_TYPEPAGE         2005
-#define IDC_INSTALL          2006
-#define IDC_INSTALLTEXT      2007
-#define IDC_UPDATE           2008
-#define IDC_UPDATETEXT       2009
-
-#define IDD_UPDATEREPAIRPAGE    2060
-#define IDC_NTOSLIST            2061
-#define IDC_SKIPUPGRADE         2062
-
-#define IDD_DEVICEPAGE       2011
-#define IDC_COMPUTER         2014
-#define IDC_DISPLAY          2015
-#define IDC_KEYBOARD         2016
-#define IDC_KEYLAYOUT        2017
-
-#define IDD_DRIVEPAGE        2018
-#define IDC_PARTITION        2021
-#define IDC_PARTCREATE       2022
-#define IDC_PARTDELETE       2023
-#define IDC_INSTFREELDR      2024
-#define IDC_INSTVBRONLY      2025
-#define IDC_NOINSTFREELDR    2026
-#define IDC_PATH             2027
-
-#define IDD_PROCESSPAGE      2028
-#define IDC_ACTIVITY         2031
-#define IDC_ITEM             2032
-#define IDC_PROCESSPROGRESS  2033
-
-#define IDD_RESTARTPAGE      2034
-#define IDC_RESTART_PROGRESS 2038
-#define IDC_PARTMOREOPTS     2042
-
-#define IDD_BOOTOPTIONS      2043
-
-#define IDD_PARTITION        2044
-#define IDC_UPDOWN1          2045
-#define IDC_PARTSIZE         2046
-#define IDC_UNIT             2047
-#define IDC_FSTYPE           2048
-
-#define IDD_SUMMARYPAGE      2049
-#define IDC_DEVICEDRIVER     2052
+#define IDD_TYPEPAGE         2010
+#define IDC_INSTALL          2011
+#define IDC_INSTALLTEXT      2012
+#define IDC_UPDATE           2013
+#define IDC_UPDATETEXT       2014
+
+#define IDD_UPDATEREPAIRPAGE    2020
+#define IDC_NTOSLIST            2021
+#define IDC_SKIPUPGRADE         2022
+
+#define IDD_DEVICEPAGE       2030
+#define IDC_COMPUTER         2031
+#define IDC_DISPLAY          2032
+#define IDC_KEYBOARD         2033
+#define IDC_KEYLAYOUT        2034
+
+#define IDD_DRIVEPAGE        2040
+#define IDC_PARTITION        2041
+#define IDC_PARTCREATE       2042
+#define IDC_PARTDELETE       2043
+#define IDC_DEVICEDRIVER     2044
+
+#define IDD_SUMMARYPAGE      2050
+#define IDC_INSTALLTYPE      2051
+#define IDC_INSTALLSOURCE    2052
+#define IDC_ARCHITECTURE     2053
+// #define IDC_COMPUTER         2031
+// #define IDC_DISPLAY          2032
+// #define IDC_KEYBOARD         2033
+#define IDC_DESTDRIVE       2054
+// #define IDC_PATH             2071
+#define IDC_CONFIRM_INSTALL 2055
+
+#define IDD_PROCESSPAGE      2060
+#define IDC_ACTIVITY         2061
+#define IDC_ITEM             2062
+#define IDC_PROCESSPROGRESS  2063
+
+#define IDD_RESTARTPAGE      2070
+#define IDC_FINISHTITLE      2071
+#define IDC_RESTART_PROGRESS 2072
+#define IDC_PARTMOREOPTS     2073
+
+#define IDD_BOOTOPTIONS      2080
+#define IDC_PATH             2081
+#define IDC_INSTFREELDR      2082
+#define IDC_INSTVBRONLY      2083
+#define IDC_NOINSTFREELDR    2084
+
+#define IDD_PARTITION        2090
+#define IDC_UPDOWN1          2091
+#define IDC_PARTSIZE         2092
+#define IDC_UNIT             2093
+#define IDC_FSTYPE           2094
+
 
 /* Strings */
 #define IDS_TYPETITLE        5007
@@ -84,5 +95,6 @@
 #define IDS_INSTALLATION_VENDOR 5102
 
 #define IDS_PARTITION_NAME   5200
-#define IDS_PARTITION_SIZE   5201
-#define IDS_PARTITION_TYPE   5202
+#define IDS_PARTITION_TYPE   5201
+#define IDS_PARTITION_SIZE   5202
+#define IDS_PARTITION_STATUS 5203