From 8e17342c8cd5fee1efdad2f6c14632cca926b5e7 Mon Sep 17 00:00:00 2001 From: Joachim Henze Date: Tue, 19 May 2020 15:41:26 +0900 Subject: [PATCH] [0.4.14][SYSSETUP] Fix broken build on RosBE2.1.6 CORE-17028 The build broke due to a typo introduced by 0.4.15-dev-275-g 612729b09272aeb693e156de6b5991891951dbf2 ../dll/win32/syssetup/wizard.c: In function 'ProductPageDlgProc': ../dll/win32/syssetup/wizard.c:527:5: error: ISO C90 forbids mixed declarations and code [-Werror=declaration- after-statement] cc1.exe: all warnings being treated as errors fix cherry-picked from 0.4.15-dev-278-g 4cbb21761cde71af7ad47573099ca92d966c8920 ------------------------- [0.4.14][SYSSETUP][BOOTDATA] Make Server default again and write Service Pack (#2749) - Make "ReactOS Server" the default product option again instead of "ReactOS Workstation". - Write "Service Pack" info onto registry. - Add ProductOption option to bootcd unattend.inf. - Delete IDC_PRODUCT_SUITE and IDC_PRODUCT_TYPE controls. To fix regression with Visual Studio 2010 setup CORE-17028 I took 2 translation files in their most recent version from master 0.4.15-dev-275-g 612729b to prevent having to resolve any conflicts manually: tr-TR.rc uk-UA.rc cherry picked from commit 0.4.15-dev-275-g 612729b09272aeb693e156de6b5991891951dbf2 --- boot/bootdata/bootcd/unattend.inf | 5 + dll/ntdll/rtl/version.c | 2 +- dll/win32/syssetup/lang/bg-BG.rc | 11 +- dll/win32/syssetup/lang/cs-CZ.rc | 11 +- dll/win32/syssetup/lang/da-DK.rc | 11 +- dll/win32/syssetup/lang/de-DE.rc | 11 +- dll/win32/syssetup/lang/el-GR.rc | 11 +- dll/win32/syssetup/lang/en-US.rc | 11 +- dll/win32/syssetup/lang/es-ES.rc | 11 +- dll/win32/syssetup/lang/et-EE.rc | 11 +- dll/win32/syssetup/lang/fi-FI.rc | 11 +- dll/win32/syssetup/lang/fr-FR.rc | 11 +- dll/win32/syssetup/lang/he-IL.rc | 11 +- dll/win32/syssetup/lang/hi-IN.rc | 11 +- dll/win32/syssetup/lang/hu-HU.rc | 11 +- dll/win32/syssetup/lang/id-ID.rc | 11 +- dll/win32/syssetup/lang/it-IT.rc | 11 +- dll/win32/syssetup/lang/ja-JP.rc | 11 +- dll/win32/syssetup/lang/lt-LT.rc | 11 +- dll/win32/syssetup/lang/nl-NL.rc | 11 +- dll/win32/syssetup/lang/no-NO.rc | 11 +- dll/win32/syssetup/lang/pl-PL.rc | 11 +- dll/win32/syssetup/lang/pt-BR.rc | 11 +- dll/win32/syssetup/lang/pt-PT.rc | 11 +- dll/win32/syssetup/lang/ro-RO.rc | 11 +- dll/win32/syssetup/lang/ru-RU.rc | 11 +- dll/win32/syssetup/lang/sk-SK.rc | 11 +- dll/win32/syssetup/lang/sq-AL.rc | 11 +- dll/win32/syssetup/lang/sv-SE.rc | 11 +- dll/win32/syssetup/lang/th-TH.rc | 11 +- dll/win32/syssetup/lang/tr-TR.rc | 153 ++++++++------- dll/win32/syssetup/lang/uk-UA.rc | 37 ++-- dll/win32/syssetup/lang/zh-CN.rc | 11 +- dll/win32/syssetup/lang/zh-TW.rc | 11 +- dll/win32/syssetup/resource.h | 3 +- dll/win32/syssetup/wizard.c | 185 ++++++++++++------- sdk/include/reactos/libs/syssetup/syssetup.h | 3 +- 37 files changed, 336 insertions(+), 382 deletions(-) diff --git a/boot/bootdata/bootcd/unattend.inf b/boot/bootdata/bootcd/unattend.inf index 9d61b5a0b9c..ce5593788e2 100644 --- a/boot/bootdata/bootcd/unattend.inf +++ b/boot/bootdata/bootcd/unattend.inf @@ -53,6 +53,11 @@ DisableGeckoInst = no ; see hivesys.inf for available languages LocaleID = 409 +; set product option +; 0: ReactOS Server +; 1: ReactOS Workstation +ProductOption = 0 + ; enable this section to automatically launch programs ; after 3rd boot ; diff --git a/dll/ntdll/rtl/version.c b/dll/ntdll/rtl/version.c index 37f0960ec66..17415a6420f 100644 --- a/dll/ntdll/rtl/version.c +++ b/dll/ntdll/rtl/version.c @@ -59,7 +59,7 @@ SetRosSpecificInfo(IN OUT PRTL_OSVERSIONINFOEXW VersionInformation) { /* It is, modify the product type to report a workstation */ VersionInformation->wProductType = VER_NT_WORKSTATION; - DPRINT1("We modified the reported OS from NtProductServer to NtProductWinNt\n"); + DPRINT("We modified the reported OS from NtProductServer to NtProductWinNt\n"); } } diff --git a/dll/win32/syssetup/lang/bg-BG.rc b/dll/win32/syssetup/lang/bg-BG.rc index acb30d85d9c..8cd84944369 100644 --- a/dll/win32/syssetup/lang/bg-BG.rc +++ b/dll/win32/syssetup/lang/bg-BG.rc @@ -32,12 +32,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 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 - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -248,7 +244,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" 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""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc index afc12c6d9bb..fb772edfcc4 100644 --- a/dll/win32/syssetup/lang/cs-CZ.rc +++ b/dll/win32/syssetup/lang/cs-CZ.rc @@ -38,12 +38,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 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 - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -254,7 +250,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" 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""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc index 98256294e0d..6e40752aa8b 100644 --- a/dll/win32/syssetup/lang/da-DK.rc +++ b/dll/win32/syssetup/lang/da-DK.rc @@ -51,12 +51,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 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 - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -267,7 +263,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" 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""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc index da3c8c33f03..2c04c138921 100644 --- a/dll/win32/syssetup/lang/de-DE.rc +++ b/dll/win32/syssetup/lang/de-DE.rc @@ -32,12 +32,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 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 - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -248,7 +244,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" 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""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc index 7ff078d51cb..6e1a9f668e0 100644 --- a/dll/win32/syssetup/lang/el-GR.rc +++ b/dll/win32/syssetup/lang/el-GR.rc @@ -32,12 +32,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 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 - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -248,7 +244,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" 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""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc index c908775f3dc..eea2920ef1d 100644 --- a/dll/win32/syssetup/lang/en-US.rc +++ b/dll/win32/syssetup/lang/en-US.rc @@ -51,12 +51,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 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 - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -268,7 +264,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" 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""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/es-ES.rc b/dll/win32/syssetup/lang/es-ES.rc index 1d9a689addb..e5ecf26c24c 100644 --- a/dll/win32/syssetup/lang/es-ES.rc +++ b/dll/win32/syssetup/lang/es-ES.rc @@ -41,12 +41,8 @@ BEGIN LTEXT "&Opciones de producto:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Información de producto", IDC_STATIC, 5, 50, 305, 85 - LTEXT "Suite del Producto:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Tipo de Producto:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Descripción:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Descripción:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -257,7 +253,8 @@ BEGIN IDS_PRODUCTTITLE "Opciones de producto" IDS_PRODUCTSUBTITLE "Puedes seleccionar una opción de producto afectará al comportamiento del sistema." IDS_PRODUCTSERVERNAME "ReactOS como Servidor" - IDS_PRODUCTWORKSTATIONNAME "ReactOS como Sobremesa (Por defecto)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS como Sobremesa" IDS_PRODUCTSERVERINFO "El sistema será reconocido como un servidor. Las carpetas privadas ""Mis imágenes"", ""Mis vídeos"" y ""Mi música"" serán independientes de ""Mis documentos""." IDS_PRODUCTWORKSTATIONINFO "El sistema será reconocido como un PC de sobremesa. Las carpetas privadas ""Mis imágenes"", ""Mis vídeos"" y ""Mi música"" estarán dentro de ""Mis documentos""." + IDS_DEFAULT "(Por defecto)" END diff --git a/dll/win32/syssetup/lang/et-EE.rc b/dll/win32/syssetup/lang/et-EE.rc index 573ffbffe78..3d07a9d2c56 100644 --- a/dll/win32/syssetup/lang/et-EE.rc +++ b/dll/win32/syssetup/lang/et-EE.rc @@ -32,12 +32,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 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 - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -248,7 +244,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" 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""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/fi-FI.rc index 490d2351716..a4c1480ade1 100644 --- a/dll/win32/syssetup/lang/fi-FI.rc +++ b/dll/win32/syssetup/lang/fi-FI.rc @@ -51,12 +51,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 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 - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -267,7 +263,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" 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""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/fr-FR.rc b/dll/win32/syssetup/lang/fr-FR.rc index dd1ab18be48..66dc007feb0 100644 --- a/dll/win32/syssetup/lang/fr-FR.rc +++ b/dll/win32/syssetup/lang/fr-FR.rc @@ -32,12 +32,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 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 - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -248,7 +244,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" 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""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/he-IL.rc b/dll/win32/syssetup/lang/he-IL.rc index 43745881c40..dc201d16d53 100644 --- a/dll/win32/syssetup/lang/he-IL.rc +++ b/dll/win32/syssetup/lang/he-IL.rc @@ -32,12 +32,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 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 - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -248,7 +244,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" 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""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/hi-IN.rc b/dll/win32/syssetup/lang/hi-IN.rc index e342bc288fd..86bf4160689 100644 --- a/dll/win32/syssetup/lang/hi-IN.rc +++ b/dll/win32/syssetup/lang/hi-IN.rc @@ -39,12 +39,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 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 - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -256,7 +252,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" 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""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/hu-HU.rc b/dll/win32/syssetup/lang/hu-HU.rc index 8c81298d715..70f414fb0b5 100644 --- a/dll/win32/syssetup/lang/hu-HU.rc +++ b/dll/win32/syssetup/lang/hu-HU.rc @@ -32,12 +32,8 @@ BEGIN LTEXT "&Kiadások:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Kiadási információk", 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 - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Leírás:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Leírás:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -247,7 +243,8 @@ BEGIN IDS_PRODUCTTITLE "Kiadások" IDS_PRODUCTSUBTITLE "Választhat egy kiadást, amely befolyásolja a rendszer viselkedését." IDS_PRODUCTSERVERNAME "ReactOS Szerver" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Munkaállomás (alapértelmezett)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Munkaállomás" IDS_PRODUCTSERVERINFO "A rendszer szerverként lesz felismerhető. A ""Képek"", ""Videók"" és ""Zenék"" személyes mappák függetlenek lesznek a ""Dokumentumok"" mappától." IDS_PRODUCTWORKSTATIONINFO "A rendszer munkaállomásként lesz felismerhető. A ""Képek"", ""Videók"" és ""Zenék"" személyes mappák a ""Dokumentumok"" mappában lesznek." + IDS_DEFAULT "(alapértelmezett)" END diff --git a/dll/win32/syssetup/lang/id-ID.rc b/dll/win32/syssetup/lang/id-ID.rc index ca3d81bd92e..9b08333fd1d 100644 --- a/dll/win32/syssetup/lang/id-ID.rc +++ b/dll/win32/syssetup/lang/id-ID.rc @@ -32,12 +32,8 @@ BEGIN LTEXT "Pilihan Pr&oduk:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Informasi Produk", IDC_STATIC, 5, 50, 305, 85 - LTEXT "RangkaianProduk:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "JenisProduk:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Deskripsi:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Deskripsi:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -248,7 +244,8 @@ BEGIN IDS_PRODUCTTITLE "Pilihan Produk" IDS_PRODUCTSUBTITLE "Anda bisa memilih opsi produk yang bisa mempengaruhi tindakan sistem." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Asli)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "Sistem akan dikenal sebagai server. Folder pribadi ""Gambar Saya"", ""Video Saya"" dan ""Musik Saya"" disendirikan dari ""Dokumen Saya""." IDS_PRODUCTWORKSTATIONINFO "Sistem akan dikenal sebagai workstation. Folder pribadi ""Gambar Saya"", ""Video Saya"" dan ""Musik Saya"" dimasukkan dalam ""Dokumen Saya""." + IDS_DEFAULT "(Asli)" END diff --git a/dll/win32/syssetup/lang/it-IT.rc b/dll/win32/syssetup/lang/it-IT.rc index 7079281a83f..e8aec4e87a7 100644 --- a/dll/win32/syssetup/lang/it-IT.rc +++ b/dll/win32/syssetup/lang/it-IT.rc @@ -32,12 +32,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 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 - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -248,7 +244,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" 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""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc index 69d89c4f13e..bb6e31cb6bc 100644 --- a/dll/win32/syssetup/lang/ja-JP.rc +++ b/dll/win32/syssetup/lang/ja-JP.rc @@ -32,12 +32,8 @@ BEGIN LTEXT "製品オプション(&O):", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "製品情報", 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 - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "説明:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "説明:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -248,7 +244,8 @@ BEGIN IDS_PRODUCTTITLE "製品オプション" IDS_PRODUCTSUBTITLE "システムのふるまいに影響する製品オプションを選べます。" IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (既定)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "システムはサーバとして認識されます。個人用フォルダ ""マイ ピクチャ""、""マイ ビデオ""、""マイ ミュージック"" は ""マイ ドキュメント"" から独立しています。" IDS_PRODUCTWORKSTATIONINFO "システムはワークステーションとして認識されます。個人用フォルダ ""マイ ピクチャ""、""マイ ビデオ""、""マイ ミュージック"" は、""マイ ドキュメント"" の中にあります。" + IDS_DEFAULT "(既定)" END diff --git a/dll/win32/syssetup/lang/lt-LT.rc b/dll/win32/syssetup/lang/lt-LT.rc index cd66f13dfa3..9aae25cea7a 100644 --- a/dll/win32/syssetup/lang/lt-LT.rc +++ b/dll/win32/syssetup/lang/lt-LT.rc @@ -51,12 +51,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 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 - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -267,7 +263,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" 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""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/nl-NL.rc b/dll/win32/syssetup/lang/nl-NL.rc index b09d3ef683e..5837718d597 100644 --- a/dll/win32/syssetup/lang/nl-NL.rc +++ b/dll/win32/syssetup/lang/nl-NL.rc @@ -32,12 +32,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 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 - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -248,7 +244,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" 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""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/no-NO.rc b/dll/win32/syssetup/lang/no-NO.rc index 1db3db9aebe..2891b5790b6 100644 --- a/dll/win32/syssetup/lang/no-NO.rc +++ b/dll/win32/syssetup/lang/no-NO.rc @@ -32,12 +32,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 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 - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -248,7 +244,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" 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""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/pl-PL.rc b/dll/win32/syssetup/lang/pl-PL.rc index 6abb05c7214..5f2854ce9da 100644 --- a/dll/win32/syssetup/lang/pl-PL.rc +++ b/dll/win32/syssetup/lang/pl-PL.rc @@ -32,12 +32,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 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 - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -248,7 +244,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" 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""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/pt-BR.rc b/dll/win32/syssetup/lang/pt-BR.rc index 40c931d8a3e..f78bd39a79e 100644 --- a/dll/win32/syssetup/lang/pt-BR.rc +++ b/dll/win32/syssetup/lang/pt-BR.rc @@ -32,12 +32,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 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 - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -248,7 +244,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" 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""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/pt-PT.rc b/dll/win32/syssetup/lang/pt-PT.rc index 9b727816bad..dff8801bcb7 100644 --- a/dll/win32/syssetup/lang/pt-PT.rc +++ b/dll/win32/syssetup/lang/pt-PT.rc @@ -32,12 +32,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 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 - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -248,7 +244,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" 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""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc index 614cd25351a..4ab26a635f1 100644 --- a/dll/win32/syssetup/lang/ro-RO.rc +++ b/dll/win32/syssetup/lang/ro-RO.rc @@ -41,12 +41,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 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 - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -257,7 +253,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" 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""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc index 46f572bc366..4e8f4dbdde6 100644 --- a/dll/win32/syssetup/lang/ru-RU.rc +++ b/dll/win32/syssetup/lang/ru-RU.rc @@ -35,12 +35,8 @@ BEGIN LTEXT "&Тип продукта:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Информация о продукте", 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 - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Описание:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Описание:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -251,7 +247,8 @@ BEGIN IDS_PRODUCTTITLE "Тип продукта" IDS_PRODUCTSUBTITLE "Вы можете выбрать тип продукта, который изменяет поведение системы." IDS_PRODUCTSERVERNAME "Сервер ReactOS" - IDS_PRODUCTWORKSTATIONNAME "Рабочая станция ReactOS (по умолчанию)" + IDS_PRODUCTWORKSTATIONNAME "Рабочая станция ReactOS" IDS_PRODUCTSERVERINFO "Система будет распознаваться как сервер. Приватные папки ""Мои Изображения"", ""Мои видеозаписи"" и ""Моя музыка"" не будут зависеть от папки ""Мои документы""." IDS_PRODUCTWORKSTATIONINFO "Система будет разпознаваться как рабочая станция. Приватные папки ""Мои изображения"", ""Мои видеозаписи"" и ""Моя музыка"" будут находится в папке ""Мои документы""." + IDS_DEFAULT "(по умолчанию)" END diff --git a/dll/win32/syssetup/lang/sk-SK.rc b/dll/win32/syssetup/lang/sk-SK.rc index 4748c97c7f1..2341f62500a 100644 --- a/dll/win32/syssetup/lang/sk-SK.rc +++ b/dll/win32/syssetup/lang/sk-SK.rc @@ -38,12 +38,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 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 - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -254,7 +250,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" 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""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/sq-AL.rc b/dll/win32/syssetup/lang/sq-AL.rc index e229246450e..83ebd25cb57 100644 --- a/dll/win32/syssetup/lang/sq-AL.rc +++ b/dll/win32/syssetup/lang/sq-AL.rc @@ -51,12 +51,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 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 - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -267,7 +263,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" 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""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc index 1a581684b2e..b24a9c69e33 100644 --- a/dll/win32/syssetup/lang/sv-SE.rc +++ b/dll/win32/syssetup/lang/sv-SE.rc @@ -51,12 +51,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 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 - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -267,7 +263,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" 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""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/th-TH.rc b/dll/win32/syssetup/lang/th-TH.rc index 63d355645e4..1e99af5eaaa 100644 --- a/dll/win32/syssetup/lang/th-TH.rc +++ b/dll/win32/syssetup/lang/th-TH.rc @@ -51,12 +51,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 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 - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -267,7 +263,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" 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""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/tr-TR.rc b/dll/win32/syssetup/lang/tr-TR.rc index bee503a876c..a911d89e318 100644 --- a/dll/win32/syssetup/lang/tr-TR.rc +++ b/dll/win32/syssetup/lang/tr-TR.rc @@ -1,4 +1,4 @@ -/* TRANSLATORS: 2012 Arda Tanrıkulu (ardatan) (ardatanrikulu [at] gmail [dot] com), 2016 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */ +/* TRANSLATORS: 2012 Arda Tanrıkulu (ardatan) (ardatanrikulu [at] gmail [dot] com), 2016, 2020 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -7,9 +7,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Kur" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ReactOS Kurulum Yardımcısı'na Hoşgeldiniz.", IDC_WELCOMETITLE, 115, 8, 195, 24 - LTEXT "Bu yardımcı ReactOS'u bilgisayarınıza kurar. Yardımcı, ReactOS'u düzgünce kurmak için siz ve bilgisayarınız üzerine biraz bilgi toplamaya gerek duyuyor.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Kur'la sürdürmek için İleri'ye tıklayınız.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "ReactOS Kurulum Sihirbazı'na Hoşgeldiniz.", IDC_WELCOMETITLE, 115, 8, 195, 24 + LTEXT "Bu sihirbaz ReactOS'u bilgisayarınıza kurar. Sihirbaz, ReactOS'u düzgünce kurmak için siz ve bilgisayarınız hakkında bazı bilgiler toplamaya gerek duyuyor.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Kur'la devam etmek için İleri'ye tıklayınız.", IDC_STATIC, 115, 169, 195, 17 END IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 @@ -17,29 +17,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Kur" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "ReactOS geliştiricileri, (parçaları) ReactOS'u oluşturmak için kullanılmış aşağıdaki açık kaynak tasarılara teşekkür etmek istiyorlar:", IDC_STATIC, 15, 7, 286, 19 + LTEXT "ReactOS geliştiricileri, (parçaları) ReactOS'u oluşturmak için kullanılmış aşağıdaki Açık Kaynak projelerine teşekkür etmek istiyorlar:", IDC_STATIC, 15, 7, 286, 19 LISTBOX IDC_PROJECTS, 15, 30, 286, 75, LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL - LTEXT "ReactOS, GPL altında ruhsatlanmıştır, bu yüzden onu (onun parçalarını) yeniden kullanmak veyâ yeniden dağıtmak isterseniz GPL'ye uymalısınız.", IDC_STATIC, 15, 110, 220, 25 + LTEXT "ReactOS, GPL altında lisanslanmıştır, bu yüzden onu (onun parçalarını) yeniden kullanmak veya yeniden dağıtmak isterseniz GPL'ye uymalısınız.", IDC_STATIC, 15, 110, 220, 25 PUSHBUTTON "&GPL'yi Görüntüle...", IDC_VIEWGPL, 236, 110, 65, 19 - LTEXT "Kur'la sürdürmek için İleri'ye tıklayınız.", IDC_STATIC, 15, 136, 195, 17 + LTEXT "Kur'la devam etmek için İleri'ye tıklayınız.", IDC_STATIC, 15, 136, 195, 17 END IDD_PRODUCT DIALOGEX 0, 0, 317, 143 -CAPTION "ReactOS Setup" +CAPTION "ReactOS Kur" STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE FONT 8, "MS Shell Dlg" 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 + LTEXT "Lütfen bir ürün seçeneği seçiniz:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Ü&rün seçenekleri:", IDC_STATIC, 5, 32, 85, 10 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 - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + GROUPBOX "Ürün Bilgisi", IDC_STATIC, 5, 50, 305, 85 + LTEXT "Tanım:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -48,10 +44,10 @@ CAPTION "ReactOS Kur" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 - LTEXT "Tüm adınızı ve ortaklık ya da kuruluşunuzun adını yazınız.", IDC_STATIC, 54, 7, 242, 21 + LTEXT "Tam adınızı ve şirketinizin ya da organizasyonunuzun adını yazınız.", IDC_STATIC, 54, 7, 242, 21 LTEXT "&Ad:", IDC_STATIC, 54, 37, 44, 8 EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Kuruluş:", IDC_STATIC, 54, 57, 44, 8 + LTEXT "&Organizasyon:", IDC_STATIC, 54, 57, 44, 8 EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL END @@ -61,15 +57,15 @@ CAPTION "ReactOS Kur" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 - LTEXT "Bilgisayarınız için 15 ya da daha az damgadan olan bir ad yazınız. Bir ağ üzerindeyseniz bilgisayarınızın adı eşsiz olmalıdır.", IDC_STATIC, 54, 7, 250, 24 + LTEXT "Bilgisayarınız için 15 ya da daha az karakterlik bir ad yazınız. Bir ağ üzerindeyseniz bilgisayarınızın adı eşsiz olmalıdır.", IDC_STATIC, 54, 7, 250, 24 LTEXT "&Bilgisayar Adı:", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 - LTEXT "Kur, bilgisayarınızda ""Yönetici"" olarak adlandırılan bir kullanıcı hesabı oluşturacaktır. Bilgisayarınıza tüm erişime gerek duyarsanız bu hesâbı kullanabilirsiniz.", IDC_STATIC, 54, 57, 250, 25 - LTEXT "127 ya da daha az damgadan olan bir Yönetici şifresi yazınız.", IDC_STATIC, 54, 87, 250, 8 - LTEXT "&Yönetici Şifresi:", IDC_STATIC, 54, 104, 105, 8 + LTEXT "Kur, bilgisayarınızda Yönetici adlı bir kullanıcı hesabı oluşturacaktır. Bilgisayarınıza tam erişime gerek duyarsanız bu hesabı kullanabilirsiniz.", IDC_STATIC, 54, 57, 250, 25 + LTEXT "127 ya da daha az karakterlik bir Yönetici parolası yazınız.", IDC_STATIC, 54, 87, 250, 8 + LTEXT "&Yönetici Parolası:", IDC_STATIC, 54, 104, 105, 8 EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD - LTEXT "&Şifreyi Doğrula:", IDC_STATIC, 54, 123, 105, 8 + LTEXT "&Parolayı Doğrula:", IDC_STATIC, 54, 123, 105, 8 EDITTEXT IDC_ADMINPASSWORD2, 165, 120, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD END @@ -79,14 +75,14 @@ CAPTION "ReactOS Kur" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 - LTEXT "Dizge yerli ayârı, kullanmak istediğiniz uygulamaların diliyle eşleşmelidir. Kullanıcı yerli ayârı; sayıların, para birimlerinin ve zamanların nasıl görüneceğini denetler.", IDC_STATIC, 53, 7, 253, 20 + LTEXT "Sistem yerel ayarı, kullanmak istediğiniz uygulamaların diliyle eşleşmelidir. Kullanıcı yerel ayarı; sayıların, para birimlerinin ve zamanların nasıl görüneceğini denetler.", IDC_STATIC, 53, 7, 253, 20 LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 - LTEXT "Dizge veyâ kullanıcı yerli ayarlarını değiştirmek için Husûsîleştir'e tıklayınız.", IDC_STATIC, 53, 60, 196, 8 - PUSHBUTTON "&Husûsîleştir...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 - LTEXT "Düğme takımı düzeni yazdığınızda gözüken damgaları denetler.", IDC_STATIC, 53, 86, 253, 8 + LTEXT "Sistem veya kullanıcı yerel ayarlarını değiştirmek için Özelleştir'e tıklayınız.", IDC_STATIC, 53, 60, 196, 8 + PUSHBUTTON "Ö&zelleştir...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 + LTEXT "Klavye düzeni, yazdığınızda gözüken karakterleri denetler.", IDC_STATIC, 53, 86, 253, 8 LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 - LTEXT "Düğme takımı düzenini değiştirmek için Husûsîleştir'e tıklayınız.", IDC_STATIC, 53, 126, 184, 8 - PUSHBUTTON "H&usûsîleştir...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14 + LTEXT "Klavye düzenini değiştirmek için Özelleştir'e tıklayınız.", IDC_STATIC, 53, 126, 184, 8 + PUSHBUTTON "Öz&elleştir...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14 END IDD_DATETIMEPAGE DIALOGEX 0, 0, 317, 143 @@ -95,12 +91,12 @@ CAPTION "ReactOS Kur" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20 - LTEXT "Târih ve Saat:", IDC_STATIC, 53, 7, 253, 8 + LTEXT "Tarih ve Saat:", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 - LTEXT "Zaman Dilimi:", IDC_STATIC, 53, 42, 253, 8 + LTEXT "Saat Dilimi:", IDC_STATIC, 53, 42, 253, 8 COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - AUTOCHECKBOX "&Gün ışığı tutum değişiklikleri için saati kendiliğinden ayarla.", IDC_AUTODAYLIGHT, 53, 124, 201, 10 + AUTOCHECKBOX "&Gün ışığı tasarruf değişiklikleri için saati kendiliğinden ayarla.", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 @@ -123,18 +119,18 @@ END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Kur'un Bitirilmesi" +CAPTION "ReactOS Kur'un Tamamlanması" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ReactOS Kurulum Yardımcısı'nın Bitirilmesi", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "ReactOS Kur'u başarıyla bitirdiniz.\n\nBitir'e tıkladığınızda, bilgisayarınız yeniden başlatılacaktır.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "ReactOS Kurulum Sihirbazı'nın Tamamlanması", IDC_FINISHTITLE, 115, 8, 195, 24 + LTEXT "ReactOS Kur'u başarıyla tamamladınız.\n\nBitir'e tıkladığınızda bilgisayarınız yeniden başlatılacaktır.", IDC_STATIC, 115, 40, 195, 100 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 LTEXT "Eğer bir sürücüde bir CD varsa, onu çıkarınız. Sonra bilgisayarınızı yeniden başlatmak için Bitir'e tıklayınız.", IDC_STATIC, 115, 169, 195, 17 END IDD_GPL DIALOGEX 0, 0, 333, 230 STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "GNU Umûmî Kamu Ruhsatı" +CAPTION "GNU Genel Kamu Lisansı" FONT 8, "MS Shell Dlg" BEGIN EDITTEXT IDC_GPL_TEXT, 7, 7, 319, 190, ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL @@ -152,50 +148,50 @@ END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION -CAPTION "Advanced Settings" +CAPTION "Gelişmiş Ayarlar" FONT 8, "MS Shell Dlg" BEGIN - RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 - LTEXT "reports per second", -1, 169, 35, 76, 8 + RTEXT "Ö&rnekleme hızı:", -1, 27, 35, 90, 8 + LTEXT "saniyede bildirme", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + RTEXT "&Tekerlek algılaması:", -1, 27, 55, 90, 8 COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 - LTEXT "packets", -1, 169, 75, 26, 8 + RTEXT "&Girdi tampon uzunluğu:", -1, 27, 75, 90, 8 + LTEXT "paket", -1, 169, 75, 26, 8 EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 - AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 - PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 + AUTOCHECKBOX "&Hızlı Başlatma", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "Ö&n Tanımlılar", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 END STRINGTABLE BEGIN IDS_ACKTITLE "Teşekkürler" - IDS_ACKSUBTITLE "ReactOS'a dayanan destekler ve ruhsat bilgisi:" - IDS_OWNERTITLE "Yazılım'ınızı Şahsîleştirin" - IDS_OWNERSUBTITLE "Kur, ReactOS'u şahsîleştirmek için kendiniz üzerine bu bilgiyi kullanır." - IDS_COMPUTERTITLE "Bilgisayar Adı ve Yönetici Şifresi" - IDS_COMPUTERSUBTITLE "Bilgisayarınız için bir ad ve bir Yönetici şifresi sağlamalısınız." - IDS_LOCALETITLE "Yerli Ayarlar" - IDS_LOCALESUBTITLE "Ayrı bölgeler ve diller için ReactOS'u husûsîleştirebilirsiniz." - IDS_DATETIMETITLE "Târih ve Saat" - IDS_DATETIMESUBTITLE "Bilgisayarınız için doğru zamânı ayarlayınız." + IDS_ACKSUBTITLE "ReactOS'u ayakta tutanlar ve lisans bilgisi:" + IDS_OWNERTITLE "Yazılım'ınızı Kişiselleştirin" + IDS_OWNERSUBTITLE "Kur, ReactOS'u kişiselleştirmek için kendiniz üzerine bu bilgiyi kullanır." + IDS_COMPUTERTITLE "Bilgisayar Adı ve Yönetici Parolası" + IDS_COMPUTERSUBTITLE "Bilgisayarınız için bir ad ve bir Yönetici Parolası sağlamalısınız." + IDS_LOCALETITLE "Yerel Ayarlar" + IDS_LOCALESUBTITLE "Ayrı bölgeler ve diller için ReactOS'u özelleştirebilirsiniz." + IDS_DATETIMETITLE "Tarih ve Saat" + IDS_DATETIMESUBTITLE "Bilgisayarınız için doğru zamanı ayarlayınız." IDS_PROCESSTITLE "Bileşenler Kaydediliyor" IDS_PROCESSSUBTITLE "Lütfen bekleyiniz..." - IDS_THEMESELECTIONTITLE "Appearance" - IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer." + IDS_THEMESELECTIONTITLE "Görünüm" + IDS_THEMESELECTIONSUBTITLE "Tercih ettiğiniz temayı seçiniz." END STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS Kur" - IDS_UNKNOWN_ERROR "Bilinmeyen Yanlışlık" + IDS_UNKNOWN_ERROR "Bilinmeyen hata" IDS_REGISTERING_COMPONENTS "Bileşenler kaydediliyor..." IDS_LOADLIBRARY_FAILED "LoadLibrary başarısız oldu: " IDS_GETPROCADDR_FAILED "GetProcAddr başarısız oldu: " IDS_REGSVR_FAILED "DllRegisterServer başarısız oldu: " IDS_DLLINSTALL_FAILED "DllInstall başarısız oldu: " - IDS_TIMEOUT "Kayıt sırasında süre aşımı." + IDS_TIMEOUT "Kayıt sırasında süre aşımı oldu." IDS_REASON_UNKNOWN "" /* * ATTENTION: @@ -204,18 +200,18 @@ BEGIN * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Yönetici" - IDS_MACHINE_OWNER_NAME "İye" + IDS_MACHINE_OWNER_NAME "Sahip" END STRINGTABLE BEGIN - IDS_WZD_NAME "Kur, adınızı girene dek sürdüremez." + IDS_WZD_NAME "Kur, adınızı girene kadar devam edemez." IDS_WZD_SETCOMPUTERNAME "Kur, bilgisayar adını ayarlamada başarısız oldu." - IDS_WZD_COMPUTERNAME "Kur, bilgisayarınızın adını girene dek sürdüremez." - IDS_WZD_PASSWORDEMPTY "Bir şifre girmelisiniz!" - IDS_WZD_PASSWORDMATCH "Girdiğiniz şifreler uyuşmuyor. Lütfen istenen şifreyi yeniden giriniz." - IDS_WZD_PASSWORDCHAR "Girdiğiniz şifre geçersiz damgalar içeriyor. Lütfen arı bir şifre giriniz." - IDS_WZD_LOCALTIME "Kur, yerli zamânı ayarlayamadı." + IDS_WZD_COMPUTERNAME "Kur, bilgisayarınızın adını girene kadar devam edemez." + IDS_WZD_PASSWORDEMPTY "Bir parola girmelisiniz!" + IDS_WZD_PASSWORDMATCH "Girdiğiniz parolalar uyuşmuyor. Lütfen istenen parolayı yeniden giriniz." + IDS_WZD_PASSWORDCHAR "Girdiğiniz parola geçersiz karakterler içeriyor. Lütfen geçersiz karakter içermeyen bir şifre giriniz." + IDS_WZD_LOCALTIME "Kur, yerel saati ayarlayamadı." END STRINGTABLE @@ -226,31 +222,32 @@ END /* ATTENTION: Synchronize these strings with dll/win32/shell32/lang */ STRINGTABLE BEGIN - IDS_PROGRAMFILES "%SystemDrive%\\İzlence Kütükleri" - IDS_COMMONFILES "Ortak Kütükler" + IDS_PROGRAMFILES "%SystemDrive%\\Program Dosyaları" + IDS_COMMONFILES "Ortak Dosyalar" END STRINGTABLE BEGIN - IDS_DETECTIONDISABLED "Detection disabled" - IDS_LOOKFORWHEEL "Look for wheel" - IDS_ASSUMEPRESENT "Assume wheel is present" + IDS_DETECTIONDISABLED "Algılama pasif" + IDS_LOOKFORWHEEL "Tekerlek için bakınız" + IDS_ASSUMEPRESENT "Tekerleği var say" END STRINGTABLE BEGIN - IDS_CLASSIC "Classic" + IDS_CLASSIC "Klasik" IDS_LAUTUS "Lautus" - IDS_LUNAR "Lunar" + IDS_LUNAR "Ay" IDS_MIZU "Mizu" END 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" - 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""." + IDS_PRODUCTTITLE "Ürün Seçenekleri" + IDS_PRODUCTSUBTITLE "Sisteminizin davranışını etkileyen bir ürün seçeneği seçebilirsiniz." + IDS_PRODUCTSERVERNAME "ReactOS Sunucu" + IDS_PRODUCTWORKSTATIONNAME "ReactOS İş İstasyonu" + IDS_PRODUCTSERVERINFO "Sistem bir sunucu olarak tanınacaktır. ""Resimlerim"", ""Videolarım"" and ""Müziklerim"" özel klasörleri ""Belgelerim""den bağımsızdır." + IDS_PRODUCTWORKSTATIONINFO "Sistem bir iş istasyonu olarak tanınacaktır. ""Resimlerim"", ""Videolarım"" and ""Müziklerim"" özel klasörleri ""Belgelerim""in içindedir." + IDS_DEFAULT "(Ön Tanımlı)" END diff --git a/dll/win32/syssetup/lang/uk-UA.rc b/dll/win32/syssetup/lang/uk-UA.rc index 0708330b63b..b759b174866 100644 --- a/dll/win32/syssetup/lang/uk-UA.rc +++ b/dll/win32/syssetup/lang/uk-UA.rc @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/win32/syssetup/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for syssetup - * TRANSLATORS: Artem Reznikov, Igor Paliychuk + * TRANSLATORS: Artem Reznikov, Igor Paliychuk, Yaroslav Kibysh */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT @@ -14,7 +14,7 @@ CAPTION "Встановлення ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Ласкаво просимо до майстра встановлення ReactOS.", IDC_WELCOMETITLE, 115, 8, 195, 24 - LTEXT "Цей майстер встановлює ReactOS на Ваш комп'ютер. Йому потрібно зібрати деякі відомості про Вас і Ваш комп'ютер щоб установити ReactOS належним чином.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Цей майстер встановлює ReactOS на Ваш комп'ютер. Йому потрібно зібрати деякі відомості про Вас і Ваш комп'ютер щоб встановити ReactOS належним чином.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Натисніть ""Далі"", щоб продовжити встановлення.", IDC_STATIC, 115, 169, 195, 17 END @@ -31,21 +31,17 @@ BEGIN END IDD_PRODUCT DIALOGEX 0, 0, 317, 143 -CAPTION "ReactOS Setup" +CAPTION "Встановлення ReactOS" STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE FONT 8, "MS Shell Dlg" 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 + LTEXT "Будь ласка, виберіть тип продукту:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Тип &продукту:", IDC_STATIC, 5, 32, 85, 10 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 - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + GROUPBOX "Інформація про продукт", IDC_STATIC, 5, 50, 305, 85 + LTEXT "Опис:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -54,7 +50,7 @@ CAPTION "Встановлення ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 - LTEXT "Введіть своє повне ім'я і назву вашої компанії або організації.", IDC_STATIC, 54, 7, 242, 21 + LTEXT "Введіть своє повне ім'я та назву вашої організації.", IDC_STATIC, 54, 7, 242, 21 LTEXT "&Ім'я:", IDC_STATIC, 54, 37, 44, 8 EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL LTEXT "&Організація:", IDC_STATIC, 54, 57, 44, 8 @@ -135,7 +131,7 @@ BEGIN LTEXT "Завершення встановлення ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "Ви успішно завершили встановлення ReactOS.\n\nПісля натиснення кнопки ""Завершити"" комп'ютер буде перезавантажений.", IDC_STATIC, 115, 40, 195, 100 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 - LTEXT "Якщо в дисковод вставлений компакт-диск, вийміть його. Потім для перезавантаження Вашого комп'ютера натистніть ""Завершити"".", IDC_STATIC, 115, 163, 195, 25 + LTEXT "Якщо в дисковод вставлений компакт-диск, вийміть його. Для перезавантаження комп'ютера натистніть ""Завершити"".", IDC_STATIC, 115, 163, 195, 25 END IDD_GPL DIALOGEX 0, 0, 333, 230 @@ -253,10 +249,11 @@ END 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" - 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""." + IDS_PRODUCTTITLE "Тип продукту" + IDS_PRODUCTSUBTITLE "Ви можете вибрати тип продукту. Це вплине на поведінку системи." + IDS_PRODUCTSERVERNAME "Сервер ReactOS" + IDS_PRODUCTWORKSTATIONNAME "Робоча станція ReactOS" + IDS_PRODUCTSERVERINFO "Система буде розпізнаватися як сервер. Особисті папки ""Мої зображення"", ""Мої відео"" та ""Моя музика"" не будуть залежати від папки ""Мої документи""." + IDS_PRODUCTWORKSTATIONINFO "Система буде розпізнаватися як робоча станція. Особисті папки ""Мої зображення"", ""Мої відео"" та ""Моя музика"" будуть в папці ""Мої документи""." + IDS_DEFAULT "(за замовчуванням)" END diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc index aa85fe923d7..fdf9e957017 100644 --- a/dll/win32/syssetup/lang/zh-CN.rc +++ b/dll/win32/syssetup/lang/zh-CN.rc @@ -34,12 +34,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 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 - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -253,7 +249,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" 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""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc index 1167abdf7f3..dcc72bf9e2b 100644 --- a/dll/win32/syssetup/lang/zh-TW.rc +++ b/dll/win32/syssetup/lang/zh-TW.rc @@ -54,12 +54,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 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 - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -275,7 +271,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" 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""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/resource.h b/dll/win32/syssetup/resource.h index 469c22e3fad..a324cfea1ae 100644 --- a/dll/win32/syssetup/resource.h +++ b/dll/win32/syssetup/resource.h @@ -91,8 +91,6 @@ #define IDD_PRODUCT 2400 #define IDC_PRODUCT_ICON 2401 #define IDC_PRODUCT_OPTIONS 2402 -#define IDC_PRODUCT_SUITE 2403 -#define IDC_PRODUCT_TYPE 2404 #define IDC_PRODUCT_DESCRIPTION 2405 #define IDS_ACKTITLE 3010 @@ -159,5 +157,6 @@ #define IDS_PRODUCTWORKSTATIONNAME 3903 #define IDS_PRODUCTSERVERINFO 3904 #define IDS_PRODUCTWORKSTATIONINFO 3905 +#define IDS_DEFAULT 3906 #define IDR_GPL 4000 diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index 386b04bf356..6564407c5a9 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -6,6 +6,7 @@ * PROGRAMMERS: Eric Kohl * Pierre Schweitzer * Ismael Ferreras Morezuelas + * Katayama Hirofumi MZ */ /* INCLUDES *****************************************************************/ @@ -18,8 +19,8 @@ #include #include #include - #include +#include #define NDEBUG #include @@ -390,88 +391,129 @@ AckPageDlgProc(HWND hwndDlg, return FALSE; } +static const WCHAR s_szProductOptions[] = L"SYSTEM\\CurrentControlSet\\Control\\ProductOptions"; +static const WCHAR s_szRosVersion[] = L"SYSTEM\\CurrentControlSet\\Control\\ReactOS\\Settings\\Version"; +static const WCHAR s_szControlWindows[] = L"SYSTEM\\CurrentControlSet\\Control\\Windows"; + +typedef struct PRODUCT_OPTION_DATA +{ + LPCWSTR ProductSuite; + LPCWSTR ProductType; + DWORD ReportAsWorkstation; + DWORD CSDVersion; +} PRODUCT_OPTION_DATA, *LPPRODUCT_OPTION_DATA; + +static const PRODUCT_OPTION_DATA s_ProductOptionData[] = +{ + { L"Terminal Server\0", L"ServerNT", 0, 0x200 }, + { L"\0", L"WinNT", 1, 0x300 } +}; + static BOOL DoWriteProductOption(PRODUCT_OPTION nOption) { - static const WCHAR s_szProductOptions[] = L"SYSTEM\\CurrentControlSet\\Control\\ProductOptions"; - static const WCHAR s_szRosVersion[] = L"SYSTEM\\CurrentControlSet\\Control\\ReactOS\\Settings\\Version"; HKEY hKey; LONG error; - LPCWSTR pData; - DWORD cbData, dwValue; + LPCWSTR pszData; + DWORD dwValue, cbData; + const PRODUCT_OPTION_DATA *pData = &s_ProductOptionData[nOption]; + ASSERT(0 <= nOption && nOption < _countof(s_ProductOptionData)); + /* open ProductOptions key */ error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, s_szProductOptions, 0, KEY_WRITE, &hKey); if (error) - return FALSE; - - switch (nOption) { - case PRODUCT_OPTION_SERVER: - /* write ProductSuite */ - pData = L"Terminal Server\0"; - cbData = sizeof(L"Terminal Server\0"); - error = RegSetValueExW(hKey, L"ProductSuite", 0, REG_MULTI_SZ, (BYTE *)pData, cbData); - if (error) - break; + DPRINT1("RegOpenKeyExW failed\n"); + goto Error; + } - /* write ProductType */ - pData = L"ServerNT"; - cbData = sizeof(L"ServerNT"); - error = RegSetValueExW(hKey, L"ProductType", 0, REG_SZ, (BYTE *)pData, cbData); - break; + /* write ProductSuite */ + pszData = pData->ProductSuite; + cbData = (lstrlenW(pszData) + 2) * sizeof(WCHAR); + error = RegSetValueExW(hKey, L"ProductSuite", 0, REG_MULTI_SZ, (const BYTE *)pData, cbData); + if (error) + { + DPRINT1("RegSetValueExW failed\n"); + goto Error; + } - case PRODUCT_OPTION_WORKSTATION: - /* write ProductSuite */ - pData = L"\0"; - cbData = sizeof(L"\0"); - error = RegSetValueExW(hKey, L"ProductSuite", 0, REG_MULTI_SZ, (BYTE *)pData, cbData); - if (error) - break; - - /* write ProductType */ - pData = L"WinNT"; - cbData = sizeof(L"WinNT"); - error = RegSetValueExW(hKey, L"ProductType", 0, REG_SZ, (BYTE *)pData, cbData); - break; + /* write ProductType */ + pszData = pData->ProductType; + cbData = (lstrlenW(pszData) + 1) * sizeof(WCHAR); + error = RegSetValueExW(hKey, L"ProductType", 0, REG_SZ, (const BYTE *)pData, cbData); + if (error) + { + DPRINT1("RegSetValueExW failed\n"); + goto Error; } RegCloseKey(hKey); + /* open ReactOS version key */ error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, s_szRosVersion, 0, KEY_WRITE, &hKey); if (error) - return FALSE; + { + DPRINT1("RegOpenKeyExW failed\n"); + goto Error; + } - /* write ReportAsWorkstation value */ - dwValue = (nOption == PRODUCT_OPTION_WORKSTATION); + /* write ReportAsWorkstation */ + dwValue = pData->ReportAsWorkstation; cbData = sizeof(dwValue); - error = RegSetValueExW(hKey, L"ReportAsWorkstation", 0, REG_DWORD, (BYTE *)&dwValue, cbData); + error = RegSetValueExW(hKey, L"ReportAsWorkstation", 0, REG_DWORD, (const BYTE *)&dwValue, cbData); + if (error) + { + DPRINT1("RegSetValueExW failed\n"); + goto Error; + } RegCloseKey(hKey); + /* open Control Windows key */ + error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, s_szControlWindows, 0, KEY_WRITE, &hKey); + if (error) + { + DPRINT1("RegOpenKeyExW failed\n"); + goto Error; + } + + /* write Control Windows CSDVersion */ + dwValue = pData->CSDVersion; + cbData = sizeof(dwValue); + error = RegSetValueExW(hKey, L"CSDVersion", 0, REG_DWORD, (const BYTE *)&dwValue, cbData); + if (error) + { + DPRINT1("RegSetValueExW failed\n"); + goto Error; + } + +Error: + if (hKey) + RegCloseKey(hKey); + return error == ERROR_SUCCESS; } static void -OnChooseServer(HWND hwndDlg) +OnChooseOption(HWND hwndDlg, PRODUCT_OPTION nOption) { WCHAR szText[256]; + ASSERT(0 <= nOption && nOption < _countof(s_ProductOptionData)); - SetDlgItemTextW(hwndDlg, IDC_PRODUCT_SUITE, L"Terminal Server"); - SetDlgItemTextW(hwndDlg, IDC_PRODUCT_TYPE, L"ServerNT"); + switch (nOption) + { + case PRODUCT_OPTION_SERVER: + LoadStringW(hDllInstance, IDS_PRODUCTSERVERINFO, szText, _countof(szText)); + break; - LoadStringW(hDllInstance, IDS_PRODUCTSERVERINFO, szText, _countof(szText)); - SetDlgItemTextW(hwndDlg, IDC_PRODUCT_DESCRIPTION, szText); -} + case PRODUCT_OPTION_WORKSTATION: + LoadStringW(hDllInstance, IDS_PRODUCTWORKSTATIONINFO, szText, _countof(szText)); + break; -static void -OnChooseWorkstation(HWND hwndDlg) -{ - WCHAR szText[256]; + default: + return; + } - SetDlgItemTextW(hwndDlg, IDC_PRODUCT_SUITE, L""); - SetDlgItemTextW(hwndDlg, IDC_PRODUCT_TYPE, L"WinNT"); - - LoadStringW(hDllInstance, IDS_PRODUCTWORKSTATIONINFO, szText, _countof(szText)); SetDlgItemTextW(hwndDlg, IDC_PRODUCT_DESCRIPTION, szText); } @@ -481,7 +523,7 @@ ProductPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) LPNMHDR lpnm; PSETUPDATA pSetupData; INT iItem; - WCHAR szText[64]; + WCHAR szText[64], szDefault[64]; HICON hIcon; pSetupData = (PSETUPDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); @@ -493,14 +535,26 @@ ProductPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pSetupData); + LoadStringW(hDllInstance, IDS_DEFAULT, szDefault, _countof(szDefault)); + LoadStringW(hDllInstance, IDS_PRODUCTSERVERNAME, szText, _countof(szText)); + if (PRODUCT_OPTION_DEFAULT == PRODUCT_OPTION_SERVER) + { + StringCchCatW(szText, _countof(szText), L" "); + StringCchCatW(szText, _countof(szText), szDefault); + } SendDlgItemMessageW(hwndDlg, IDC_PRODUCT_OPTIONS, CB_ADDSTRING, 0, (LPARAM)szText); LoadStringW(hDllInstance, IDS_PRODUCTWORKSTATIONNAME, szText, _countof(szText)); + if (PRODUCT_OPTION_DEFAULT == PRODUCT_OPTION_WORKSTATION) + { + StringCchCatW(szText, _countof(szText), L" "); + StringCchCatW(szText, _countof(szText), szDefault); + } SendDlgItemMessageW(hwndDlg, IDC_PRODUCT_OPTIONS, CB_ADDSTRING, 0, (LPARAM)szText); - SendDlgItemMessageW(hwndDlg, IDC_PRODUCT_OPTIONS, CB_SETCURSEL, PRODUCT_OPTION_WORKSTATION, 0); - OnChooseWorkstation(hwndDlg); + SendDlgItemMessageW(hwndDlg, IDC_PRODUCT_OPTIONS, CB_SETCURSEL, PRODUCT_OPTION_DEFAULT, 0); + OnChooseOption(hwndDlg, PRODUCT_OPTION_DEFAULT); hIcon = LoadIcon(NULL, IDI_WINLOGO); SendDlgItemMessageW(hwndDlg, IDC_PRODUCT_ICON, STM_SETICON, (WPARAM)hIcon, 0); @@ -511,19 +565,7 @@ ProductPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) if (HIWORD(wParam) == CBN_SELCHANGE && IDC_PRODUCT_OPTIONS == LOWORD(wParam)) { iItem = SendDlgItemMessageW(hwndDlg, IDC_PRODUCT_OPTIONS, CB_GETCURSEL, 0, 0); - switch ((PRODUCT_OPTION)iItem) - { - case PRODUCT_OPTION_SERVER: - OnChooseServer(hwndDlg); - break; - - case PRODUCT_OPTION_WORKSTATION: - OnChooseWorkstation(hwndDlg); - break; - - default: - break; - } + OnChooseOption(hwndDlg, (PRODUCT_OPTION)iItem); } break; @@ -538,8 +580,7 @@ ProductPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); if (pSetupData->UnattendSetup) { - pSetupData->ProductOption = PRODUCT_OPTION_WORKSTATION; - OnChooseWorkstation(hwndDlg); + OnChooseOption(hwndDlg, pSetupData->ProductOption); DoWriteProductOption(pSetupData->ProductOption); SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, IDD_LOCALEPAGE); return TRUE; @@ -2396,7 +2437,10 @@ ProcessUnattendSection( else pSetupData->DisableGeckoInst = FALSE; } - + else if (!_wcsicmp(szName, L"ProductOption")) + { + pSetupData->ProductOption = (PRODUCT_OPTION)_wtoi(szValue); + } } while (SetupFindNextLine(&InfContext, &InfContext)); if (SetupFindFirstLineW(pSetupData->hSetupInf, @@ -2672,6 +2716,7 @@ InstallWizard(VOID) MB_ICONERROR | MB_OK); goto done; } + pSetupData->ProductOption = PRODUCT_OPTION_DEFAULT; hNetShell = LoadLibraryW(L"netshell.dll"); if (hNetShell != NULL) diff --git a/sdk/include/reactos/libs/syssetup/syssetup.h b/sdk/include/reactos/libs/syssetup/syssetup.h index adb924e390d..1eb5e2ab75c 100644 --- a/sdk/include/reactos/libs/syssetup/syssetup.h +++ b/sdk/include/reactos/libs/syssetup/syssetup.h @@ -26,7 +26,8 @@ typedef enum _PRODUCT_OPTION { PRODUCT_OPTION_SERVER, - PRODUCT_OPTION_WORKSTATION + PRODUCT_OPTION_WORKSTATION, + PRODUCT_OPTION_DEFAULT = PRODUCT_OPTION_SERVER } PRODUCT_OPTION, *PPRODUCT_OPTION; /* Private Setup data shared between syssetup.dll and netshell.dll */