[reactos] 01/01: [SYSSETUP] Make Workstation default product option (#2332)

[Katayama Hirofumi MZ]

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

commit 3ef235e7cbad6c948c620c5a82cd959fe03e62ee
Author:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Wed Feb 12 19:29:56 2020 +0900
Commit:     GitHub <noreply(a)github.com>
CommitDate: Wed Feb 12 19:29:56 2020 +0900

    [SYSSETUP] Make Workstation default product option (#2332)
    
    We set ReactOS Workstation as the default product option. That means we retargeted
this project to Windows XP. Unattended Setup is supported.
    CORE-13795
---
 dll/win32/syssetup/lang/bg-BG.rc | 6 +++---
 dll/win32/syssetup/lang/cs-CZ.rc | 6 +++---
 dll/win32/syssetup/lang/da-DK.rc | 6 +++---
 dll/win32/syssetup/lang/de-DE.rc | 6 +++---
 dll/win32/syssetup/lang/el-GR.rc | 6 +++---
 dll/win32/syssetup/lang/en-US.rc | 6 +++---
 dll/win32/syssetup/lang/es-ES.rc | 6 +++---
 dll/win32/syssetup/lang/et-EE.rc | 6 +++---
 dll/win32/syssetup/lang/fi-FI.rc | 6 +++---
 dll/win32/syssetup/lang/fr-FR.rc | 6 +++---
 dll/win32/syssetup/lang/he-IL.rc | 6 +++---
 dll/win32/syssetup/lang/hi-IN.rc | 6 +++---
 dll/win32/syssetup/lang/hu-HU.rc | 6 +++---
 dll/win32/syssetup/lang/id-ID.rc | 6 +++---
 dll/win32/syssetup/lang/it-IT.rc | 6 +++---
 dll/win32/syssetup/lang/ja-JP.rc | 6 +++---
 dll/win32/syssetup/lang/lt-LT.rc | 6 +++---
 dll/win32/syssetup/lang/nl-NL.rc | 6 +++---
 dll/win32/syssetup/lang/no-NO.rc | 6 +++---
 dll/win32/syssetup/lang/pl-PL.rc | 6 +++---
 dll/win32/syssetup/lang/pt-BR.rc | 6 +++---
 dll/win32/syssetup/lang/pt-PT.rc | 6 +++---
 dll/win32/syssetup/lang/ro-RO.rc | 6 +++---
 dll/win32/syssetup/lang/ru-RU.rc | 6 +++---
 dll/win32/syssetup/lang/sk-SK.rc | 6 +++---
 dll/win32/syssetup/lang/sq-AL.rc | 6 +++---
 dll/win32/syssetup/lang/sv-SE.rc | 6 +++---
 dll/win32/syssetup/lang/th-TH.rc | 6 +++---
 dll/win32/syssetup/lang/tr-TR.rc | 6 +++---
 dll/win32/syssetup/lang/uk-UA.rc | 6 +++---
 dll/win32/syssetup/lang/zh-CN.rc | 6 +++---
 dll/win32/syssetup/lang/zh-TW.rc | 6 +++---
 dll/win32/syssetup/wizard.c      | 7 ++++---
 33 files changed, 100 insertions(+), 99 deletions(-)

diff --git a/dll/win32/syssetup/lang/bg-BG.rc b/dll/win32/syssetup/lang/bg-BG.rc
index 7085c419204..81818e58615 100644
--- a/dll/win32/syssetup/lang/bg-BG.rc
+++ b/dll/win32/syssetup/lang/bg-BG.rc
@@ -30,7 +30,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -247,8 +247,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc
index 1b2852bf952..0f6f313dfc2 100644
--- a/dll/win32/syssetup/lang/cs-CZ.rc
+++ b/dll/win32/syssetup/lang/cs-CZ.rc
@@ -36,7 +36,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -253,8 +253,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc
index 39fd84a4d29..bb8ae55b40d 100644
--- a/dll/win32/syssetup/lang/da-DK.rc
+++ b/dll/win32/syssetup/lang/da-DK.rc
@@ -49,7 +49,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -266,8 +266,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc
index 494f16a19df..49311538f63 100644
--- a/dll/win32/syssetup/lang/de-DE.rc
+++ b/dll/win32/syssetup/lang/de-DE.rc
@@ -30,7 +30,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -247,8 +247,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc
index 2c049b8e793..da95c35a699 100644
--- a/dll/win32/syssetup/lang/el-GR.rc
+++ b/dll/win32/syssetup/lang/el-GR.rc
@@ -30,7 +30,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -247,8 +247,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc
index 2414e315d11..fa52280a237 100644
--- a/dll/win32/syssetup/lang/en-US.rc
+++ b/dll/win32/syssetup/lang/en-US.rc
@@ -49,7 +49,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -267,8 +267,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/lang/es-ES.rc b/dll/win32/syssetup/lang/es-ES.rc
index 90abbfed4ef..2e72c99934f 100644
--- a/dll/win32/syssetup/lang/es-ES.rc
+++ b/dll/win32/syssetup/lang/es-ES.rc
@@ -38,7 +38,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -255,8 +255,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/lang/et-EE.rc b/dll/win32/syssetup/lang/et-EE.rc
index f88511359bc..49b7eb6328f 100644
--- a/dll/win32/syssetup/lang/et-EE.rc
+++ b/dll/win32/syssetup/lang/et-EE.rc
@@ -30,7 +30,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -247,8 +247,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/fi-FI.rc
index a1c5f140666..03c77e75adc 100644
--- a/dll/win32/syssetup/lang/fi-FI.rc
+++ b/dll/win32/syssetup/lang/fi-FI.rc
@@ -49,7 +49,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -266,8 +266,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/lang/fr-FR.rc b/dll/win32/syssetup/lang/fr-FR.rc
index 04171476ba9..2589e57a737 100644
--- a/dll/win32/syssetup/lang/fr-FR.rc
+++ b/dll/win32/syssetup/lang/fr-FR.rc
@@ -30,7 +30,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -247,8 +247,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/lang/he-IL.rc b/dll/win32/syssetup/lang/he-IL.rc
index e1076999634..55e3fd67cf4 100644
--- a/dll/win32/syssetup/lang/he-IL.rc
+++ b/dll/win32/syssetup/lang/he-IL.rc
@@ -30,7 +30,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -247,8 +247,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/lang/hi-IN.rc b/dll/win32/syssetup/lang/hi-IN.rc
index c7d9da274bb..f10a2609bb9 100644
--- a/dll/win32/syssetup/lang/hi-IN.rc
+++ b/dll/win32/syssetup/lang/hi-IN.rc
@@ -37,7 +37,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -255,8 +255,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/lang/hu-HU.rc b/dll/win32/syssetup/lang/hu-HU.rc
index 362d203bb78..ee1f9bd42b7 100644
--- a/dll/win32/syssetup/lang/hu-HU.rc
+++ b/dll/win32/syssetup/lang/hu-HU.rc
@@ -30,7 +30,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -246,8 +246,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/lang/id-ID.rc b/dll/win32/syssetup/lang/id-ID.rc
index aef4e7ce0e1..f611941f2d1 100644
--- a/dll/win32/syssetup/lang/id-ID.rc
+++ b/dll/win32/syssetup/lang/id-ID.rc
@@ -30,7 +30,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -247,8 +247,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/lang/it-IT.rc b/dll/win32/syssetup/lang/it-IT.rc
index 333044dc9a5..8920cd372ab 100644
--- a/dll/win32/syssetup/lang/it-IT.rc
+++ b/dll/win32/syssetup/lang/it-IT.rc
@@ -30,7 +30,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -247,8 +247,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc
index 9984cff78ee..466d0ed94dd 100644
--- a/dll/win32/syssetup/lang/ja-JP.rc
+++ b/dll/win32/syssetup/lang/ja-JP.rc
@@ -30,7 +30,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -247,8 +247,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/lang/lt-LT.rc b/dll/win32/syssetup/lang/lt-LT.rc
index 0307968d8ba..65da0ae4000 100644
--- a/dll/win32/syssetup/lang/lt-LT.rc
+++ b/dll/win32/syssetup/lang/lt-LT.rc
@@ -49,7 +49,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -266,8 +266,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/lang/nl-NL.rc b/dll/win32/syssetup/lang/nl-NL.rc
index 01f6bb3b858..89b254054df 100644
--- a/dll/win32/syssetup/lang/nl-NL.rc
+++ b/dll/win32/syssetup/lang/nl-NL.rc
@@ -30,7 +30,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -247,8 +247,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/lang/no-NO.rc b/dll/win32/syssetup/lang/no-NO.rc
index bd436c889a7..11b507f583a 100644
--- a/dll/win32/syssetup/lang/no-NO.rc
+++ b/dll/win32/syssetup/lang/no-NO.rc
@@ -30,7 +30,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -247,8 +247,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/lang/pl-PL.rc b/dll/win32/syssetup/lang/pl-PL.rc
index 4b8013bd391..3caea4d4cae 100644
--- a/dll/win32/syssetup/lang/pl-PL.rc
+++ b/dll/win32/syssetup/lang/pl-PL.rc
@@ -30,7 +30,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -247,8 +247,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/lang/pt-BR.rc b/dll/win32/syssetup/lang/pt-BR.rc
index 7b79334b32a..94e78749e12 100644
--- a/dll/win32/syssetup/lang/pt-BR.rc
+++ b/dll/win32/syssetup/lang/pt-BR.rc
@@ -30,7 +30,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -247,8 +247,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/lang/pt-PT.rc b/dll/win32/syssetup/lang/pt-PT.rc
index 71b3c00a849..6148b63983a 100644
--- a/dll/win32/syssetup/lang/pt-PT.rc
+++ b/dll/win32/syssetup/lang/pt-PT.rc
@@ -30,7 +30,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -247,8 +247,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc
index 4c8f51e1711..ef846e5f5c4 100644
--- a/dll/win32/syssetup/lang/ro-RO.rc
+++ b/dll/win32/syssetup/lang/ro-RO.rc
@@ -39,7 +39,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -256,8 +256,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc
index 3c2d9d18864..f4195575acc 100644
--- a/dll/win32/syssetup/lang/ru-RU.rc
+++ b/dll/win32/syssetup/lang/ru-RU.rc
@@ -32,7 +32,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -249,8 +249,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/lang/sk-SK.rc b/dll/win32/syssetup/lang/sk-SK.rc
index 12f30a74604..bd0558c7f9d 100644
--- a/dll/win32/syssetup/lang/sk-SK.rc
+++ b/dll/win32/syssetup/lang/sk-SK.rc
@@ -36,7 +36,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -253,8 +253,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/lang/sq-AL.rc b/dll/win32/syssetup/lang/sq-AL.rc
index d34e7d26a9c..4bd954fcf59 100644
--- a/dll/win32/syssetup/lang/sq-AL.rc
+++ b/dll/win32/syssetup/lang/sq-AL.rc
@@ -49,7 +49,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -266,8 +266,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc
index 1cdc8880559..893a9ed8c72 100644
--- a/dll/win32/syssetup/lang/sv-SE.rc
+++ b/dll/win32/syssetup/lang/sv-SE.rc
@@ -49,7 +49,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -266,8 +266,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/lang/th-TH.rc b/dll/win32/syssetup/lang/th-TH.rc
index 1194b0d55cf..5b6ddee906d 100644
--- a/dll/win32/syssetup/lang/th-TH.rc
+++ b/dll/win32/syssetup/lang/th-TH.rc
@@ -49,7 +49,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -266,8 +266,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/lang/tr-TR.rc b/dll/win32/syssetup/lang/tr-TR.rc
index 7f4a8fd1eca..6cc3224e4e0 100644
--- a/dll/win32/syssetup/lang/tr-TR.rc
+++ b/dll/win32/syssetup/lang/tr-TR.rc
@@ -32,7 +32,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -249,8 +249,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/lang/uk-UA.rc b/dll/win32/syssetup/lang/uk-UA.rc
index 596e176a786..e2eb75512b8 100644
--- a/dll/win32/syssetup/lang/uk-UA.rc
+++ b/dll/win32/syssetup/lang/uk-UA.rc
@@ -38,7 +38,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -255,8 +255,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc
index e2efd6d9705..9b76c052180 100644
--- a/dll/win32/syssetup/lang/zh-CN.rc
+++ b/dll/win32/syssetup/lang/zh-CN.rc
@@ -32,7 +32,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -252,8 +252,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc
index 156c9ed33a9..93c7bae0428 100644
--- a/dll/win32/syssetup/lang/zh-TW.rc
+++ b/dll/win32/syssetup/lang/zh-TW.rc
@@ -52,7 +52,7 @@ BEGIN
     ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20
     LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12
     LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10
-    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL |
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85
     LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10
     EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL
@@ -274,8 +274,8 @@ STRINGTABLE
 BEGIN
     IDS_PRODUCTTITLE "Product Options"
     IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour
of the system."
-    IDS_PRODUCTSERVERNAME "ReactOS Server (Default)"
-    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation"
+    IDS_PRODUCTSERVERNAME "ReactOS Server"
+    IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)"
     IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private
folders ""My Pictures"", ""My Videos"" and
""My Music"" are independent from ""My
Documents""."
     IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation.
Private folders ""My Pictures"", ""My Videos"" and
""My Music"" are in ""My Documents""."
 END
diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c
index a6f83bd280f..c5f4ce8174c 100644
--- a/dll/win32/syssetup/wizard.c
+++ b/dll/win32/syssetup/wizard.c
@@ -486,8 +486,8 @@ ProductPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
lParam)
             LoadStringW(hDllInstance, IDS_PRODUCTWORKSTATIONNAME, szText,
_countof(szText));
             SendDlgItemMessageW(hwndDlg, IDC_PRODUCT_OPTIONS, CB_ADDSTRING, 0,
(LPARAM)szText);
 
-            SendDlgItemMessageW(hwndDlg, IDC_PRODUCT_OPTIONS, CB_SETCURSEL,
PRODUCT_OPTION_SERVER, 0);
-            OnChooseServer(hwndDlg);
+            SendDlgItemMessageW(hwndDlg, IDC_PRODUCT_OPTIONS, CB_SETCURSEL,
PRODUCT_OPTION_WORKSTATION, 0);
+            OnChooseWorkstation(hwndDlg);
 
             hIcon = LoadIcon(NULL, IDI_WINLOGO);
             SendDlgItemMessageW(hwndDlg, IDC_PRODUCT_ICON, STM_SETICON, (WPARAM)hIcon,
0);
@@ -525,7 +525,8 @@ ProductPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
lParam)
                     PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK |
PSWIZB_NEXT);
                     if (pSetupData->UnattendSetup)
                     {
-                        pSetupData->ProductOption = PRODUCT_OPTION_SERVER;
+                        pSetupData->ProductOption = PRODUCT_OPTION_WORKSTATION;
+                        OnChooseWorkstation(hwndDlg);
                         DoWriteProductOption(pSetupData->ProductOption);
                         SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, IDD_LOCALEPAGE);
                         return TRUE;