Ros-diffs December 2024

ros-diffs@reactos.org

17 participants
106 discussions

[reactos] 01/01: A problem has been detected and ReactOS has been shut down to prevent damage to your time machine warp core.
by Hermès Bélusca-Maïto 31 Dec '24

31 Dec '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ebdb7b3e4d423cd949fb0… commit ebdb7b3e4d423cd949fb054f9ae8abe7f99ddbd9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Jan 1 00:00:00 2025 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jan 1 00:00:00 2025 +0100 A problem has been detected and ReactOS has been shut down to prevent damage to your time machine warp core. UNEXPECTED_NEW_YEAR_TIMESLIP If this is the first time you have seen this Stop error screen, restart your time machine. If this screen appears again, follow these steps: Check to make sure you wish the ReactOS Community a 🎊 🍾 🥳 *:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:* 🎆 ⚛️ ☢️ █ █ █▀█ █▀█ █▀█ █ █ ██████╗ ██████╗ ██████╗ ███████╗ ██╗ █▀█ █▀█ █▀▀ █▀▀ ▀█▀ ╚════██╗██╔═████╗╚════██╗██╔════╝ ██║ ▀ ▀ ▀ ▀ ▀ ▀ ▀ █████╔╝██║██╔██║ █████╔╝╚█████╗ ██║ █▄ █ █▀▀ █ █ █ █ █ █▀▀ █▀█ █▀█ ██╔═══╝ ████╔╝██║██╔═══╝ ╚═══██╗ ╚═╝ █▀██ █▀▀ █ █ █ ▀█▀ █▀▀ █▀█ ██▀ ███████╗╚██████╔╝███████╗██████╔╝ ██╗ ▀ ▀ ▀▀▀ ▀▀▀ ▀ ▀▀▀ ▀ ▀ ▀ ▀ ╚══════╝ ╚═════╝ ╚══════╝╚═════╝ ╚═╝ 🎆 ⚛️ ☢️ *:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:* 🎊 🍾 🥳 Also, ensure you use the latest nightly ReactOS version and run it attached to a debugger. If problems continue, Keep Calm And Carry On Developing. Test your code more thoroughly, use a sane compiler and debugger, or ask any questions on ReactOS' official Mattermost channel. Technical information: *** STOP: 0x42000042 (0x67747770,0x000007E9,0x00000001,0x00000001) *** jira.reactos.org - Address chat.reactos.org Base at reactos.org *** github.com/reactos - Address git.reactos.org Base at reactos.org --- dll/win32/msgina/resources/reactos.bmp | Bin 89334 -> 89334 bytes dll/win32/msgina/resources/svg/reactos.svg | 2 +- dll/win32/shell32/res/bitmaps/reactos.bmp | Bin 89334 -> 89334 bytes dll/win32/syssetup/resources/reactos.bmp | Bin 89334 -> 89334 bytes ntoskrnl/inbv/resources/copyright.bmp | Bin 1840 -> 1846 bytes sdk/include/reactos/version.cmake | 2 +- 6 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/msgina/resources/reactos.bmp b/dll/win32/msgina/resources/reactos.bmp index 2ec7eeb1772..ef1fc5765c8 100644 Binary files a/dll/win32/msgina/resources/reactos.bmp and b/dll/win32/msgina/resources/reactos.bmp differ diff --git a/dll/win32/msgina/resources/svg/reactos.svg b/dll/win32/msgina/resources/svg/reactos.svg index 3daa8299cd4..5c9d24de586 100644 --- a/dll/win32/msgina/resources/svg/reactos.svg +++ b/dll/win32/msgina/resources/svg/reactos.svg @@ -1928,7 +1928,7 @@ x="5.59375" y="1047.7255" style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#1e2122;fill-opacity:1;font-family:Lucida Sans Unicode;-inkscape-font-specification:Lucida Sans Unicode" - id="tspan3618">Copyright © 1996-2024 ReactOS Team & Contributors</tspan></text> + id="tspan3618">Copyright © 1996-2025 ReactOS Team & Contributors</tspan></text> <g transform="matrix(0.16958533,0,0,0.16958533,89.849943,981.79073)" id="g15501"> diff --git a/dll/win32/shell32/res/bitmaps/reactos.bmp b/dll/win32/shell32/res/bitmaps/reactos.bmp index 2ec7eeb1772..ef1fc5765c8 100644 Binary files a/dll/win32/shell32/res/bitmaps/reactos.bmp and b/dll/win32/shell32/res/bitmaps/reactos.bmp differ diff --git a/dll/win32/syssetup/resources/reactos.bmp b/dll/win32/syssetup/resources/reactos.bmp index 2ec7eeb1772..ef1fc5765c8 100644 Binary files a/dll/win32/syssetup/resources/reactos.bmp and b/dll/win32/syssetup/resources/reactos.bmp differ diff --git a/ntoskrnl/inbv/resources/copyright.bmp b/ntoskrnl/inbv/resources/copyright.bmp index 8ed8975abfc..5f96f94411b 100644 Binary files a/ntoskrnl/inbv/resources/copyright.bmp and b/ntoskrnl/inbv/resources/copyright.bmp differ diff --git a/sdk/include/reactos/version.cmake b/sdk/include/reactos/version.cmake index c06d0919cd1..68cfeafeb85 100644 --- a/sdk/include/reactos/version.cmake +++ b/sdk/include/reactos/version.cmake @@ -9,7 +9,7 @@ endif() set(KERNEL_VERSION_MAJOR "0") set(KERNEL_VERSION_MINOR "4") set(KERNEL_VERSION_PATCH_LEVEL "16") -set(COPYRIGHT_YEAR "2024") +set(COPYRIGHT_YEAR "2025") # KERNEL_VERSION_BUILD_TYPE is "dev" for Git builds # or "RC1", "RC2", "" for releases.

1 0

[reactos] 01/01: [SETUP:REACTOS] Revamp the Install-type page layout (#7581)
by Hermès Bélusca-Maïto 31 Dec '24

31 Dec '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4920e639f99a4b17ad9b9… commit 4920e639f99a4b17ad9b97fbed799a84dcf2692b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Oct 30 12:34:46 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Dec 31 12:33:27 2024 +0100 [SETUP:REACTOS] Revamp the Install-type page layout (#7581) - Update the page title and subtitle. - Embolden the types of installation. - Introduce title and subtitle for the upgrade/repair page (not translated yet). --- base/setup/reactos/lang/bg-BG.rc | 15 ++++++++------- base/setup/reactos/lang/cs-CZ.rc | 15 ++++++++------- base/setup/reactos/lang/de-DE.rc | 15 ++++++++------- base/setup/reactos/lang/el-GR.rc | 15 ++++++++------- base/setup/reactos/lang/en-US.rc | 15 ++++++++------- base/setup/reactos/lang/es-ES.rc | 15 ++++++++------- base/setup/reactos/lang/et-EE.rc | 15 ++++++++------- base/setup/reactos/lang/eu-ES.rc | 15 ++++++++------- base/setup/reactos/lang/fi-FI.rc | 15 ++++++++------- base/setup/reactos/lang/fr-FR.rc | 15 ++++++++------- base/setup/reactos/lang/he-IL.rc | 15 ++++++++------- base/setup/reactos/lang/hi-IN.rc | 15 ++++++++------- base/setup/reactos/lang/hu-HU.rc | 15 ++++++++------- base/setup/reactos/lang/id-ID.rc | 15 ++++++++------- base/setup/reactos/lang/it-IT.rc | 15 ++++++++------- base/setup/reactos/lang/ja-JP.rc | 15 ++++++++------- base/setup/reactos/lang/ms-MY.rc | 15 ++++++++------- base/setup/reactos/lang/no-NO.rc | 15 ++++++++------- base/setup/reactos/lang/pl-PL.rc | 15 ++++++++------- base/setup/reactos/lang/pt-BR.rc | 15 ++++++++------- base/setup/reactos/lang/pt-PT.rc | 15 ++++++++------- base/setup/reactos/lang/ro-RO.rc | 15 ++++++++------- base/setup/reactos/lang/ru-RU.rc | 15 ++++++++------- base/setup/reactos/lang/sk-SK.rc | 15 ++++++++------- base/setup/reactos/lang/sq-AL.rc | 15 ++++++++------- base/setup/reactos/lang/tr-TR.rc | 15 ++++++++------- base/setup/reactos/lang/uk-UA.rc | 15 ++++++++------- base/setup/reactos/lang/vi-VN.rc | 15 ++++++++------- base/setup/reactos/lang/zh-CN.rc | 15 ++++++++------- base/setup/reactos/lang/zh-HK.rc | 15 ++++++++------- base/setup/reactos/lang/zh-TW.rc | 15 ++++++++------- base/setup/reactos/reactos.c | 12 ++++++++---- base/setup/reactos/resource.h | 22 ++++++++++++---------- 33 files changed, 268 insertions(+), 231 deletions(-) diff --git a/base/setup/reactos/lang/bg-BG.rc b/base/setup/reactos/lang/bg-BG.rc index ddba90c57c7..dd3fe00e6b7 100644 --- a/base/setup/reactos/lang/bg-BG.rc +++ b/base/setup/reactos/lang/bg-BG.rc @@ -27,11 +27,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Настройка на РеактОС" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Слагане на РеактОС", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP - AUTORADIOBUTTON "Поправка или осъвременяване на сложен РеактОС", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "Натиснете „Напред“ за настройка на устройствата.", IDC_STATIC, 7, 128, 297, 8 + AUTORADIOBUTTON "&Слагане на РеактОС", IDC_INSTALL, 7, 20, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 36, 279, 27, NOT WS_GROUP + AUTORADIOBUTTON "&Поправка или осъвременяване на РеактОС", IDC_UPDATE, 7, 80, 277, 10 + LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 96, 279, 27, NOT WS_GROUP END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -171,8 +170,10 @@ END STRINGTABLE BEGIN IDS_CAPTION "Настройка на РеактОС" - IDS_TYPETITLE "РеактОС ви приветства!" - IDS_TYPESUBTITLE "Изберете вид на настройването." + IDS_TYPETITLE "Installation Type" + IDS_TYPESUBTITLE "You can setup a new ReactOS installation, or update/repair an existing installation." + IDS_UPDATETITLE "Update or Repair ReactOS" + IDS_UPDATESUBTITLE "Choose which existing ReactOS installation you want to update or repair." IDS_DEVICETITLE "Настройване на основните устройства" IDS_DEVICESUBTITLE "Настройка на екрана и клавиатурата." IDS_DRIVETITLE "Приготвяне на дял за слагане и системна папка" diff --git a/base/setup/reactos/lang/cs-CZ.rc b/base/setup/reactos/lang/cs-CZ.rc index b96eda89b63..8d694465d5d 100644 --- a/base/setup/reactos/lang/cs-CZ.rc +++ b/base/setup/reactos/lang/cs-CZ.rc @@ -33,11 +33,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalace systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Nainstalovat systém ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "Instalovat novou kopii systému ReactOS. Tato možnost odstraní Vaše soubory, nastavení a programy. Můžete provést úpravu disků a oddílů.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP - AUTORADIOBUTTON "Opravit nebo aktualizovat již nainstalovaný systém ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Aktualizovat nebo opravit kopii systémy ReactOS. Tato možnost zachová Vaše soubory, nastavení a programy. Tato možnost je dostupná pouze pokud je již na Vašem počítači systém ReactOS nainstalován.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "Po klepnutí na Další bude možné nastavit zařízení.", IDC_STATIC, 7, 128, 297, 8 + AUTORADIOBUTTON "&Nainstalovat systém ReactOS", IDC_INSTALL, 7, 20, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Instalovat novou kopii systému ReactOS. Tato možnost odstraní Vaše soubory, nastavení a programy. Můžete provést úpravu disků a oddílů.", IDC_INSTALLTEXT, 19, 36, 279, 27, NOT WS_GROUP + AUTORADIOBUTTON "&Opravit nebo aktualizovat ReactOS", IDC_UPDATE, 7, 80, 277, 10 + LTEXT "Aktualizovat nebo opravit kopii systémy ReactOS. Tato možnost zachová Vaše soubory, nastavení a programy. Tato možnost je dostupná pouze pokud je již na Vašem počítači systém ReactOS nainstalován.", IDC_UPDATETEXT, 19, 96, 279, 27, NOT WS_GROUP END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -177,8 +176,10 @@ END STRINGTABLE BEGIN IDS_CAPTION "Instalace systému ReactOS" - IDS_TYPETITLE "Vítejte v průvodci instalace systému ReactOS" - IDS_TYPESUBTITLE "Volba typu instalace." + IDS_TYPETITLE "Installation Type" + IDS_TYPESUBTITLE "You can setup a new ReactOS installation, or update/repair an existing installation." + IDS_UPDATETITLE "Update or Repair ReactOS" + IDS_UPDATESUBTITLE "Choose which existing ReactOS installation you want to update or repair." IDS_DEVICETITLE "Nastavení základních zařízení" IDS_DEVICESUBTITLE "Volba nastavení obrazovky a klávesnice." IDS_DRIVETITLE "Nastavení instalačního oddílu a systémové složky" diff --git a/base/setup/reactos/lang/de-DE.rc b/base/setup/reactos/lang/de-DE.rc index 1ec67347ae6..29f03b8a5bf 100644 --- a/base/setup/reactos/lang/de-DE.rc +++ b/base/setup/reactos/lang/de-DE.rc @@ -27,11 +27,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS-Setup" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Installiere ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "Installiert eine neue Kopie von ReactOS. Diese Option behält nicht Ihre Dateien, Einstellungen und Programme bei. Sie können Änderungen an Festplatten und Partitionen durchführen.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP - AUTORADIOBUTTON "Aktualisiere oder repariere ein installiertes ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Aktualisieren oder reparieren einer installierten Kopie von ReactOS. Diese Option behält Ihre Dateien, Einstellungen und Programme bei. Diese Option ist nur verfügbar, wenn ReactOS bereits auf diesem Computer installiert ist.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "Klicken Sie auf Weiter um die Geräte einzustellen.", IDC_STATIC, 7, 128, 297, 8 + AUTORADIOBUTTON "&Installiere ReactOS", IDC_INSTALL, 7, 20, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Installiert eine neue Kopie von ReactOS. Diese Option behält nicht Ihre Dateien, Einstellungen und Programme bei. Sie können Änderungen an Festplatten und Partitionen durchführen.", IDC_INSTALLTEXT, 19, 36, 279, 27, NOT WS_GROUP + AUTORADIOBUTTON "&Aktualisiere oder repariere ReactOS", IDC_UPDATE, 7, 80, 277, 10 + LTEXT "Aktualisieren oder reparieren einer installierten Kopie von ReactOS. Diese Option behält Ihre Dateien, Einstellungen und Programme bei. Diese Option ist nur verfügbar, wenn ReactOS bereits auf diesem Computer installiert ist.", IDC_UPDATETEXT, 19, 96, 279, 27, NOT WS_GROUP END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -171,8 +170,10 @@ END STRINGTABLE BEGIN IDS_CAPTION "ReactOS Setup" - IDS_TYPETITLE "Willkommen zum ReactOS-Setup" - IDS_TYPESUBTITLE "Wählen Sie einen Setuptypen." + IDS_TYPETITLE "Installation Type" + IDS_TYPESUBTITLE "You can setup a new ReactOS installation, or update/repair an existing installation." + IDS_UPDATETITLE "Update or Repair ReactOS" + IDS_UPDATESUBTITLE "Choose which existing ReactOS installation you want to update or repair." IDS_DEVICETITLE "Einstellen der Basisgeräte" IDS_DEVICESUBTITLE "Einstellungen der Anzeigegeräte und der Tastatur." IDS_DRIVETITLE "Richte Installationspartition und Systemverzeichnis ein" diff --git a/base/setup/reactos/lang/el-GR.rc b/base/setup/reactos/lang/el-GR.rc index e7153a77672..ba7662cd409 100644 --- a/base/setup/reactos/lang/el-GR.rc +++ b/base/setup/reactos/lang/el-GR.rc @@ -27,11 +27,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Εγκατάσταση του ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Install ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP - AUTORADIOBUTTON "Update or repair an installed ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "Πατήστε Επόμενο για να ρυθμίσετε τις συσκευές.", IDC_STATIC, 7, 128, 297, 8 + AUTORADIOBUTTON "&Install ReactOS", IDC_INSTALL, 7, 20, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 36, 279, 27, NOT WS_GROUP + AUTORADIOBUTTON "&Update or repair ReactOS", IDC_UPDATE, 7, 80, 277, 10 + LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 96, 279, 27, NOT WS_GROUP END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -171,8 +170,10 @@ END STRINGTABLE BEGIN IDS_CAPTION "ReactOS Setup" - IDS_TYPETITLE "Καλώς ήλθατε στην Εγκατάσταση του ReactOS" - IDS_TYPESUBTITLE "Επιλέξτε τύπο εγκατάστασης." + IDS_TYPETITLE "Installation Type" + IDS_TYPESUBTITLE "You can setup a new ReactOS installation, or update/repair an existing installation." + IDS_UPDATETITLE "Update or Repair ReactOS" + IDS_UPDATESUBTITLE "Choose which existing ReactOS installation you want to update or repair." IDS_DEVICETITLE "Setup the basic devices" IDS_DEVICESUBTITLE "Ορισμός ρυθμίσεων για εμφάνιση και πληκτρολόγιο." IDS_DRIVETITLE "Ρύθμιση του partition εγκατάστασης και του φακέλου συστήματος" diff --git a/base/setup/reactos/lang/en-US.rc b/base/setup/reactos/lang/en-US.rc index c957f5bc3b1..fd2f3410e00 100644 --- a/base/setup/reactos/lang/en-US.rc +++ b/base/setup/reactos/lang/en-US.rc @@ -27,11 +27,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Install ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP - AUTORADIOBUTTON "Update or repair ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "Click Next to continue.", IDC_STATIC, 7, 128, 297, 8 + AUTORADIOBUTTON "&Install ReactOS", IDC_INSTALL, 7, 20, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 36, 279, 27, NOT WS_GROUP + AUTORADIOBUTTON "&Update or repair ReactOS", IDC_UPDATE, 7, 80, 277, 10 + LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 96, 279, 27, NOT WS_GROUP END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -171,8 +170,10 @@ END STRINGTABLE BEGIN IDS_CAPTION "ReactOS Setup" - IDS_TYPETITLE "Welcome to ReactOS Setup" - IDS_TYPESUBTITLE "Choose setup type." + IDS_TYPETITLE "Installation Type" + IDS_TYPESUBTITLE "You can setup a new ReactOS installation, or update/repair an existing installation." + IDS_UPDATETITLE "Update or Repair ReactOS" + IDS_UPDATESUBTITLE "Choose which existing ReactOS installation you want to update or repair." IDS_DEVICETITLE "Setup the basic devices" IDS_DEVICESUBTITLE "Set the settings of display and keyboard." IDS_DRIVETITLE "Setup the installation partition and system folder" diff --git a/base/setup/reactos/lang/es-ES.rc b/base/setup/reactos/lang/es-ES.rc index e17041d1894..21cfa2cf4a6 100644 --- a/base/setup/reactos/lang/es-ES.rc +++ b/base/setup/reactos/lang/es-ES.rc @@ -36,11 +36,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Instalar ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "Instala una nueva copia de ReactOS. Esta opción no protege sus archivos, programas y ajustes. Puede realizar cambios a su disco duro y particiones.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP - AUTORADIOBUTTON "Actualizar o reparar una instalación existente de ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Actualiza o repara una instalación existente de ReactOS. Esta opción protege sus archivos, programas y ajustes. Esta opción sólo está disponible si ha instalado ReactOS previamente en este equipo.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "Presione Siguiente para instalar los dispositivos.", IDC_STATIC, 7, 128, 297, 8 + AUTORADIOBUTTON "&Instalar ReactOS", IDC_INSTALL, 7, 20, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Instala una nueva copia de ReactOS. Esta opción no protege sus archivos, programas y ajustes. Puede realizar cambios a su disco duro y particiones.", IDC_INSTALLTEXT, 19, 36, 279, 27, NOT WS_GROUP + AUTORADIOBUTTON "&Actualizar o reparar ReactOS", IDC_UPDATE, 7, 80, 277, 10 + LTEXT "Actualiza o repara una instalación existente de ReactOS. Esta opción protege sus archivos, programas y ajustes. Esta opción sólo está disponible si ha instalado ReactOS previamente en este equipo.", IDC_UPDATETEXT, 19, 96, 279, 27, NOT WS_GROUP END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -180,8 +179,10 @@ END STRINGTABLE BEGIN IDS_CAPTION "Instalación de ReactOS" - IDS_TYPETITLE "Bienvenido a la instalación de ReactOS" - IDS_TYPESUBTITLE "Seleccione el tipo de instalación." + IDS_TYPETITLE "Installation Type" + IDS_TYPESUBTITLE "You can setup a new ReactOS installation, or update/repair an existing installation." + IDS_UPDATETITLE "Update or Repair ReactOS" + IDS_UPDATESUBTITLE "Choose which existing ReactOS installation you want to update or repair." IDS_DEVICETITLE "Instalación de los dispositivos básicos" IDS_DEVICESUBTITLE "Seleccione los ajustes de la pantalla y el teclado." IDS_DRIVETITLE "Crear la partición para la instalación y la carpeta del sistema" diff --git a/base/setup/reactos/lang/et-EE.rc b/base/setup/reactos/lang/et-EE.rc index 998b398aa70..bf7da3964c8 100644 --- a/base/setup/reactos/lang/et-EE.rc +++ b/base/setup/reactos/lang/et-EE.rc @@ -27,11 +27,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS'i paigaldamine" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Installeeri ReactOS", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "Paigalda uus koopia ReactOS'ist. See valik ei jäta alles teie faile, suvandeid ja programme. Võite teha muudatusi kettastele ja partitsioonidele.", IDC_INSTALLTEXT, 18, 18, 269, 25 - AUTORADIOBUTTON "Paranda või uuenda installeeritud ReactOS'i", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Uuenda või paranda oma ReactOS'i installatsiooni. See valik säilitab teie failid, suvandid ja programmid. See valik on saadaval juhul kui ReactOS on juba paigaldatud siin arvutis.", IDC_UPDATETEXT, 18, 61, 269, 30 - LTEXT "Vajuta Järgmine, et seadmeid paigaldada.", IDC_STATIC, 7, 128, 297, 8 + AUTORADIOBUTTON "&Installeeri ReactOS", IDC_INSTALL, 7, 20, 277, 10 + LTEXT "Paigalda uus koopia ReactOS'ist. See valik ei jäta alles teie faile, suvandeid ja programme. Võite teha muudatusi kettastele ja partitsioonidele.", IDC_INSTALLTEXT, 19, 36, 279, 27 + AUTORADIOBUTTON "&Paranda või uuenda ReactOS'i", IDC_UPDATE, 7, 80, 277, 10 + LTEXT "Uuenda või paranda oma ReactOS'i installatsiooni. See valik säilitab teie failid, suvandid ja programmid. See valik on saadaval juhul kui ReactOS on juba paigaldatud siin arvutis.", IDC_UPDATETEXT, 19, 96, 279, 27 END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -171,8 +170,10 @@ END STRINGTABLE BEGIN IDS_CAPTION "ReactOS'i paigaldamine" - IDS_TYPETITLE "Tere tulemast ReactOS'i paigaldama" - IDS_TYPESUBTITLE "Vali paigalduse tüüp." + IDS_TYPETITLE "Installation Type" + IDS_TYPESUBTITLE "You can setup a new ReactOS installation, or update/repair an existing installation." + IDS_UPDATETITLE "Update or Repair ReactOS" + IDS_UPDATESUBTITLE "Choose which existing ReactOS installation you want to update or repair." IDS_DEVICETITLE "Põhiliste seadmete paigaldamine" IDS_DEVICESUBTITLE "Ekraani ja klaviatuuri seadistamine." IDS_DRIVETITLE "Partitsioonide ja süsteemikausta seadistamine" diff --git a/base/setup/reactos/lang/eu-ES.rc b/base/setup/reactos/lang/eu-ES.rc index 18ae8fb314b..650f0bf3af2 100644 --- a/base/setup/reactos/lang/eu-ES.rc +++ b/base/setup/reactos/lang/eu-ES.rc @@ -34,11 +34,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Instalar ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "Instala una nueva copia de ReactOS. Esta opción no protege sus archivos, programas y ajustes. Puede realizar cambios a su disco duro y particiones.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP - AUTORADIOBUTTON "Actualizar o reparar una instalación existente de ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Actualiza o repara una instalación existente de ReactOS. Esta opción protege sus archivos, programas y ajustes. Esta opción sólo está disponible si ha instalado ReactOS previamente en este equipo.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "Presione Siguiente para instalar los dispositivos.", IDC_STATIC, 7, 128, 297, 8 + AUTORADIOBUTTON "&Instalar ReactOS", IDC_INSTALL, 7, 20, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Instala una nueva copia de ReactOS. Esta opción no protege sus archivos, programas y ajustes. Puede realizar cambios a su disco duro y particiones.", IDC_INSTALLTEXT, 19, 36, 279, 27, NOT WS_GROUP + AUTORADIOBUTTON "&Actualizar o reparar ReactOS", IDC_UPDATE, 7, 80, 277, 10 + LTEXT "Actualiza o repara una instalación existente de ReactOS. Esta opción protege sus archivos, programas y ajustes. Esta opción sólo está disponible si ha instalado ReactOS previamente en este equipo.", IDC_UPDATETEXT, 19, 96, 279, 27, NOT WS_GROUP END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -178,8 +177,10 @@ END STRINGTABLE BEGIN IDS_CAPTION "Instalación de ReactOS" - IDS_TYPETITLE "Bienvenido a la instalación de ReactOS" - IDS_TYPESUBTITLE "Seleccione el tipo de instalación." + IDS_TYPETITLE "Installation Type" + IDS_TYPESUBTITLE "You can setup a new ReactOS installation, or update/repair an existing installation." + IDS_UPDATETITLE "Update or Repair ReactOS" + IDS_UPDATESUBTITLE "Choose which existing ReactOS installation you want to update or repair." IDS_DEVICETITLE "Instalación de los dispositivos básicos" IDS_DEVICESUBTITLE "Seleccione los ajustes de la pantalla y el teclado." IDS_DRIVETITLE "Crear la partición para la instalación y la carpeta del sistema" diff --git a/base/setup/reactos/lang/fi-FI.rc b/base/setup/reactos/lang/fi-FI.rc index aaa7e9dcc66..84d0a5f199a 100644 --- a/base/setup/reactos/lang/fi-FI.rc +++ b/base/setup/reactos/lang/fi-FI.rc @@ -27,11 +27,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Install ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP - AUTORADIOBUTTON "Update or repair an installed ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "Click Next to setup the devices.", IDC_STATIC, 7, 128, 297, 8 + AUTORADIOBUTTON "&Install ReactOS", IDC_INSTALL, 7, 20, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 36, 279, 27, NOT WS_GROUP + AUTORADIOBUTTON "&Update or repair ReactOS", IDC_UPDATE, 7, 80, 277, 10 + LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 96, 279, 27, NOT WS_GROUP END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -171,8 +170,10 @@ END STRINGTABLE BEGIN IDS_CAPTION "ReactOS Setup" - IDS_TYPETITLE "Welcome to ReactOS Setup" - IDS_TYPESUBTITLE "Choose setup type." + IDS_TYPETITLE "Installation Type" + IDS_TYPESUBTITLE "You can setup a new ReactOS installation, or update/repair an existing installation." + IDS_UPDATETITLE "Update or Repair ReactOS" + IDS_UPDATESUBTITLE "Choose which existing ReactOS installation you want to update or repair." IDS_DEVICETITLE "Setup the basic devices" IDS_DEVICESUBTITLE "Set the settings of display and keyboard." IDS_DRIVETITLE "Setup the installation partition and system folder" diff --git a/base/setup/reactos/lang/fr-FR.rc b/base/setup/reactos/lang/fr-FR.rc index 060ff220b58..fe3fa52ea6d 100644 --- a/base/setup/reactos/lang/fr-FR.rc +++ b/base/setup/reactos/lang/fr-FR.rc @@ -27,11 +27,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Installer ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "Installer une nouvelle copie de ReactOS. Cette option ne conservera pas vos données, paramètres et programmes. Vous pouvez effectuer des modifications sur les disques et les partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP - AUTORADIOBUTTON "Mettre à jour ou réparer ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Mettre à jour ou réparer une copie existante de ReactOS. Cette option conserve vos données, paramètres et programmes. Cette option est seulement disponible si ReactOS est déjà installé sur cet ordinateur.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "Appuyer sur Suivant pour configurer les périphériques.", IDC_STATIC, 7, 1280, 297, 8 + AUTORADIOBUTTON "&Installer ReactOS", IDC_INSTALL, 7, 20, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Installe une nouvelle copie de ReactOS. Cette option ne conservera pas vos données, paramètres et programmes. Vous pouvez effectuer des modifications sur les disques et les partitions.", IDC_INSTALLTEXT, 19, 36, 279, 27, NOT WS_GROUP + AUTORADIOBUTTON "&Mettre à niveau ou réparer ReactOS", IDC_UPDATE, 7, 80, 277, 10 + LTEXT "Met à niveau ou répare une copie existante de ReactOS. Cette option conserve vos données, paramètres et programmes. Cette option est seulement disponible si ReactOS est déjà installé sur cet ordinateur.", IDC_UPDATETEXT, 19, 96, 279, 27, NOT WS_GROUP END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -171,8 +170,10 @@ END STRINGTABLE BEGIN IDS_CAPTION "Installation de ReactOS" - IDS_TYPETITLE "Bienvenue dans l'installation de ReactOS" - IDS_TYPESUBTITLE "Choisissez un type d'installation." + IDS_TYPETITLE "Type d'installation" + IDS_TYPESUBTITLE "Vous pouvez configurer une nouvelle installation de ReactOS, ou bien mettre à niveau ou réparer une installation existante." + IDS_UPDATETITLE "Update or Repair ReactOS" + IDS_UPDATESUBTITLE "Choose which existing ReactOS installation you want to update or repair." IDS_DEVICETITLE "Configurer les périphériques de base" IDS_DEVICESUBTITLE "Configurer l'affichage et le clavier." IDS_DRIVETITLE "Configurer la partition d'installation et le dossier système" diff --git a/base/setup/reactos/lang/he-IL.rc b/base/setup/reactos/lang/he-IL.rc index cdda584b05d..11465212ce5 100644 --- a/base/setup/reactos/lang/he-IL.rc +++ b/base/setup/reactos/lang/he-IL.rc @@ -29,11 +29,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "התקנת ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "התקנת ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP - AUTORADIOBUTTON "תיקון או עדכון גרסה קיימת", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "לחץ על 'הבא' כדי להגדיר את ההתקנים.", IDC_STATIC, 7, 128, 297, 8 + AUTORADIOBUTTON "(&I)התקנת ReactOS", IDC_INSTALL, 7, 20, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 36, 279, 27, NOT WS_GROUP + AUTORADIOBUTTON "(&U)תיקון או עדכון ReactOS", IDC_UPDATE, 7, 80, 277, 10 + LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 96, 279, 27, NOT WS_GROUP END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -173,8 +172,10 @@ END STRINGTABLE BEGIN IDS_CAPTION "התקנת ReactOS" - IDS_TYPETITLE "ברוכים הבאים לתוכנית ההתקנה של ReactOS" - IDS_TYPESUBTITLE "בחירת סוג התקנה." + IDS_TYPETITLE "Installation Type" + IDS_TYPESUBTITLE "You can setup a new ReactOS installation, or update/repair an existing installation." + IDS_UPDATETITLE "Update or Repair ReactOS" + IDS_UPDATESUBTITLE "Choose which existing ReactOS installation you want to update or repair." IDS_DEVICETITLE "Setup the basic devices" IDS_DEVICESUBTITLE "Set the settings of display and keyboard." IDS_DRIVETITLE "Setup the installation partition and system folder" diff --git a/base/setup/reactos/lang/hi-IN.rc b/base/setup/reactos/lang/hi-IN.rc index d21fc04ee1a..da3381a871a 100644 --- a/base/setup/reactos/lang/hi-IN.rc +++ b/base/setup/reactos/lang/hi-IN.rc @@ -34,11 +34,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "रिऐक्ट ओएस सेटअप" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "रिऐक्ट ओएस इंस्टॉल करें", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "रिऐक्ट ओएस की एक नई कापी इन्स्टॉल करें। यह विकल्प आपकी फाइलें, सेटिंग्स और प्रोग्राम नहीं रखता है। आप डिस्क और विभाजन में परिवर्तन कर सकते हैं।", IDC_INSTALLTEXT, 18, 18, 269, 25 - AUTORADIOBUTTON "रिऐक्ट ओएस की अद्यतन या मरम्मत करे। ", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "रिऐक्ट ओएस की एक स्थापित कापी अद्यतन या मरम्मत करे। यह विकल्प आपकी फाइलें, सेटिंग्स और प्रोग्राम रखता है। यह विकल्प केवल तभी उपलब्ध होता है जब इस कंप्यूटर पर रिऐक्ट ओएस पहले से इंस्टॉल हो।", IDC_UPDATETEXT, 18, 61, 269, 30 - LTEXT "जारी रखने के लिए आगे दबाएँ।", IDC_STATIC, 7, 128, 297, 8 + AUTORADIOBUTTON "रिऐक्ट ओएस इंस्टॉल करें(&I)", IDC_INSTALL, 7, 20, 277, 10 + LTEXT "रिऐक्ट ओएस की एक नई कापी इन्स्टॉल करें। यह विकल्प आपकी फाइलें, सेटिंग्स और प्रोग्राम नहीं रखता है। आप डिस्क और विभाजन में परिवर्तन कर सकते हैं।", IDC_INSTALLTEXT, 19, 36, 279, 27 + AUTORADIOBUTTON "रिऐक्ट ओएस की अद्यतन या मरम्मत करे।(&U)", IDC_UPDATE, 7, 80, 277, 10 + LTEXT "रिऐक्ट ओएस की एक स्थापित कापी अद्यतन या मरम्मत करे। यह विकल्प आपकी फाइलें, सेटिंग्स और प्रोग्राम रखता है। यह विकल्प केवल तभी उपलब्ध होता है जब इस कंप्यूटर पर रिऐक्ट ओएस पहले से इंस्टॉल हो।", IDC_UPDATETEXT, 19, 96, 279, 27 END IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -149,8 +148,10 @@ END STRINGTABLE BEGIN IDS_CAPTION "रिऐक्ट ओएस सेटअप" - IDS_TYPETITLE "रिऐक्ट ओएस सेटअप में आपका स्वागत है" - IDS_TYPESUBTITLE "सेटअप प्रकार चुनें।" + IDS_TYPETITLE "Installation Type" + IDS_TYPESUBTITLE "You can setup a new ReactOS installation, or update/repair an existing installation." + IDS_UPDATETITLE "Update or Repair ReactOS" + IDS_UPDATESUBTITLE "Choose which existing ReactOS installation you want to update or repair." IDS_DEVICETITLE "बुनियादी डिवाइसों को सेटअप करें" IDS_DEVICESUBTITLE "डिस्प्ले और कीबोर्ड की सेटिंग्स सेट करें।" IDS_DRIVETITLE "इन्स्टलेशन विभाजन और सिस्टम फ़ोल्डर सेटअप करें" diff --git a/base/setup/reactos/lang/hu-HU.rc b/base/setup/reactos/lang/hu-HU.rc index 81033de9895..b2cae277c1d 100644 --- a/base/setup/reactos/lang/hu-HU.rc +++ b/base/setup/reactos/lang/hu-HU.rc @@ -29,11 +29,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS telepítõ" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Install ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP - AUTORADIOBUTTON "Update or repair an installed ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "Click Next to setup the devices.", IDC_STATIC, 7, 128, 297, 8 + AUTORADIOBUTTON "&Install ReactOS", IDC_INSTALL, 7, 20, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 36, 279, 27, NOT WS_GROUP + AUTORADIOBUTTON "&Update or repair ReactOS", IDC_UPDATE, 7, 80, 277, 10 + LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 96, 279, 27, NOT WS_GROUP END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -173,8 +172,10 @@ END STRINGTABLE BEGIN IDS_CAPTION "ReactOS Setup" - IDS_TYPETITLE "Welcome to ReactOS Setup" - IDS_TYPESUBTITLE "Choose setup type." + IDS_TYPETITLE "Installation Type" + IDS_TYPESUBTITLE "You can setup a new ReactOS installation, or update/repair an existing installation." + IDS_UPDATETITLE "Update or Repair ReactOS" + IDS_UPDATESUBTITLE "Choose which existing ReactOS installation you want to update or repair." IDS_DEVICETITLE "Setup the basic devices" IDS_DEVICESUBTITLE "Set the settings of display and keyboard." IDS_DRIVETITLE "Setup the installation partition and system folder" diff --git a/base/setup/reactos/lang/id-ID.rc b/base/setup/reactos/lang/id-ID.rc index a303bc8e730..7ecd9fff4bd 100644 --- a/base/setup/reactos/lang/id-ID.rc +++ b/base/setup/reactos/lang/id-ID.rc @@ -27,11 +27,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Penyetelan ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Pasang ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "Pasang instalasi ReactOS yang baru. Ini tidak akan menjaga berkas, pengaturan, dan program Anda. Anda bisa membuat perubahan pada disk dan partisi.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP - AUTORADIOBUTTON "Perbarui atau perbaiki ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Perbarui atau perbaiki salinan terpasang dari ReactOS. Pilihan ini tetap menyimpan berkas, Pengaturan dan program. Pilihan ini hanya tersedia jika ReactOS telah terpasang di komputer ini.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "Klik lanjut untuk meneruskan.", IDC_STATIC, 7, 128, 297, 8 + AUTORADIOBUTTON "&Pasang ReactOS", IDC_INSTALL, 7, 20, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Pasang instalasi ReactOS yang baru. Ini tidak akan menjaga berkas, pengaturan, dan program Anda. Anda bisa membuat perubahan pada disk dan partisi.", IDC_INSTALLTEXT, 19, 36, 279, 27, NOT WS_GROUP + AUTORADIOBUTTON "P&erbarui atau perbaiki ReactOS", IDC_UPDATE, 7, 80, 277, 10 + LTEXT "Perbarui atau perbaiki salinan terpasang dari ReactOS. Pilihan ini tetap menyimpan berkas, Pengaturan dan program. Pilihan ini hanya tersedia jika ReactOS telah terpasang di komputer ini.", IDC_UPDATETEXT, 19, 96, 279, 27, NOT WS_GROUP END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -171,8 +170,10 @@ END STRINGTABLE BEGIN IDS_CAPTION "Penyetelan ReactOS" - IDS_TYPETITLE "Selamat datang di Penyetelan ReactOS" - IDS_TYPESUBTITLE "Pilih jenis penyetelan." + IDS_TYPETITLE "Installation Type" + IDS_TYPESUBTITLE "You can setup a new ReactOS installation, or update/repair an existing installation." + IDS_UPDATETITLE "Update or Repair ReactOS" + IDS_UPDATESUBTITLE "Choose which existing ReactOS installation you want to update or repair." IDS_DEVICETITLE "Menyetel perangkat dasar" IDS_DEVICESUBTITLE "Setel pengaturan tampilan dan papan ketik." IDS_DRIVETITLE "Penyetelan pemasangan partisi dan folder sistem" diff --git a/base/setup/reactos/lang/it-IT.rc b/base/setup/reactos/lang/it-IT.rc index 1ee24d21c46..eee40e0ce87 100644 --- a/base/setup/reactos/lang/it-IT.rc +++ b/base/setup/reactos/lang/it-IT.rc @@ -27,11 +27,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Installazione di ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Installa ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "Installa una nuova coppia di ReactOS. Questo opzione non mantiene i tuoi file, le impostazioni e i programmi. E' possibile fare degli cambiamenti sul disco e partizioni.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP - AUTORADIOBUTTON "Aggiorna o ripara una installazione precedente di ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Aggiorna o ripara una coppia già installata di ReactOS. Questo opzione mantiene i tuoi file, le impostazioni e i programmi. Questo opzione è disponibile solo se ReactOS è già installato su questo computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "Cliccare Avanti per impostare i dispositivi.", IDC_STATIC, 7, 128, 297, 8 + AUTORADIOBUTTON "&Installa ReactOS", IDC_INSTALL, 7, 20, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Installa una nuova coppia di ReactOS. Questo opzione non mantiene i tuoi file, le impostazioni e i programmi. E' possibile fare degli cambiamenti sul disco e partizioni.", IDC_INSTALLTEXT, 19, 36, 279, 27, NOT WS_GROUP + AUTORADIOBUTTON "&Aggiorna o ripara ReactOS", IDC_UPDATE, 7, 80, 277, 10 + LTEXT "Aggiorna o ripara una coppia già installata di ReactOS. Questo opzione mantiene i tuoi file, le impostazioni e i programmi. Questo opzione è disponibile solo se ReactOS è già installato su questo computer.", IDC_UPDATETEXT, 19, 96, 279, 27, NOT WS_GROUP END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -171,8 +170,10 @@ END STRINGTABLE BEGIN IDS_CAPTION "Installazione di ReactOS" - IDS_TYPETITLE "Benvenuti nell'installazione di ReactOS" - IDS_TYPESUBTITLE "Scegliere il tipo di installazione." + IDS_TYPETITLE "Installation Type" + IDS_TYPESUBTITLE "You can setup a new ReactOS installation, or update/repair an existing installation." + IDS_UPDATETITLE "Update or Repair ReactOS" + IDS_UPDATESUBTITLE "Choose which existing ReactOS installation you want to update or repair." IDS_DEVICETITLE "Impostazione dei dispositivi di base" IDS_DEVICESUBTITLE "Impostazione di monitor e tastiera." IDS_DRIVETITLE "Impostazione della partizione e della cartella per la installazione" diff --git a/base/setup/reactos/lang/ja-JP.rc b/base/setup/reactos/lang/ja-JP.rc index 31c258c5434..94d413b85f3 100644 --- a/base/setup/reactos/lang/ja-JP.rc +++ b/base/setup/reactos/lang/ja-JP.rc @@ -27,11 +27,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS セットアップ" FONT 9, "MS UI Gothic" BEGIN - AUTORADIOBUTTON "ReactOSをインストールする", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "ReactOSを新しくインストールします。このオプションは、あなたのファイル、設定、プログラムを維持しません。あなたはディスクとパーティションに変更を加えることができます。", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP - AUTORADIOBUTTON "ReactOSを更新または修正する", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "インストールされたReactOSを更新または修正します。このオプションはあなたのファイル、設定、プログラムを保持します。このオプションは、このコンピュータですでにReactOSがインストール済みのときのみ利用できます。", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "次へをクリックすると続行します。", IDC_STATIC, 7, 128, 297, 8 + AUTORADIOBUTTON "ReactOSをインストールする(&I)", IDC_INSTALL, 7, 20, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "ReactOSを新しくインストールします。このオプションは、あなたのファイル、設定、プログラムを維持しません。あなたはディスクとパーティションに変更を加えることができます。", IDC_INSTALLTEXT, 19, 36, 279, 27, NOT WS_GROUP + AUTORADIOBUTTON "ReactOSを更新または修正する(&U)", IDC_UPDATE, 7, 80, 277, 10 + LTEXT "インストールされたReactOSを更新または修正します。このオプションはあなたのファイル、設定、プログラムを保持します。このオプションは、このコンピュータですでにReactOSがインストール済みのときのみ利用できます。", IDC_UPDATETEXT, 19, 96, 279, 27, NOT WS_GROUP END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -171,8 +170,10 @@ END STRINGTABLE BEGIN IDS_CAPTION "ReactOS セットアップ" - IDS_TYPETITLE "ReactOS セットアップにようこそ" - IDS_TYPESUBTITLE "セットアップの種類を選んで下さい。" + IDS_TYPETITLE "Installation Type" + IDS_TYPESUBTITLE "You can setup a new ReactOS installation, or update/repair an existing installation." + IDS_UPDATETITLE "Update or Repair ReactOS" + IDS_UPDATESUBTITLE "Choose which existing ReactOS installation you want to update or repair." IDS_DEVICETITLE "基本デバイスをセットアップします" IDS_DEVICESUBTITLE "ディスプレイとキーボードの設定をします。" IDS_DRIVETITLE "インストール先パーティションとシステムフォルダをセットアップします" diff --git a/base/setup/reactos/lang/ms-MY.rc b/base/setup/reactos/lang/ms-MY.rc index 3d429a596e5..e470da49894 100644 --- a/base/setup/reactos/lang/ms-MY.rc +++ b/base/setup/reactos/lang/ms-MY.rc @@ -29,11 +29,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Persediaan" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Pasang ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP - AUTORADIOBUTTON "Membaiki atau mengemaskini ReactOS yang dipasang", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "Klik Seterusnya untuk memasang peranti.", IDC_STATIC, 7, 128, 297, 8 + AUTORADIOBUTTON "&Pasang ReactOS", IDC_INSTALL, 7, 20, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 36, 279, 27, NOT WS_GROUP + AUTORADIOBUTTON "&Membaiki atau mengemaskini ReactOS", IDC_UPDATE, 7, 80, 277, 10 + LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 96, 279, 27, NOT WS_GROUP END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -173,8 +172,10 @@ END STRINGTABLE BEGIN IDS_CAPTION "ReactOS Persediaan" - IDS_TYPETITLE "Selamat datang ke persediaan ReactOS" - IDS_TYPESUBTITLE "Pilih jenis persediaan." + IDS_TYPETITLE "Installation Type" + IDS_TYPESUBTITLE "You can setup a new ReactOS installation, or update/repair an existing installation." + IDS_UPDATETITLE "Update or Repair ReactOS" + IDS_UPDATESUBTITLE "Choose which existing ReactOS installation you want to update or repair." IDS_DEVICETITLE "Sediakan peranti asas" IDS_DEVICESUBTITLE "Setkan seting paparan dan papan kekunci." IDS_DRIVETITLE "Sediakan folder pemasangan partition dan sistem" diff --git a/base/setup/reactos/lang/no-NO.rc b/base/setup/reactos/lang/no-NO.rc index 5352bc37d9a..d3c897a8ef6 100644 --- a/base/setup/reactos/lang/no-NO.rc +++ b/base/setup/reactos/lang/no-NO.rc @@ -27,11 +27,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS installering" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Installere ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP - AUTORADIOBUTTON "Reparere eller oppdatere en installert ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "Trykk på Neste for installere enhetene.", IDC_STATIC, 7, 128, 297, 8 + AUTORADIOBUTTON "&Installere ReactOS", IDC_INSTALL, 7, 20, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 36, 279, 27, NOT WS_GROUP + AUTORADIOBUTTON "&Reparere eller oppdatere ReactOS", IDC_UPDATE, 7, 80, 277, 10 + LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 96, 279, 27, NOT WS_GROUP END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -171,8 +170,10 @@ END STRINGTABLE BEGIN IDS_CAPTION "ReactOS installering" - IDS_TYPETITLE "Velkommen til ReactOS installering" - IDS_TYPESUBTITLE "Velg installering type." + IDS_TYPETITLE "Installation Type" + IDS_TYPESUBTITLE "You can setup a new ReactOS installation, or update/repair an existing installation." + IDS_UPDATETITLE "Update or Repair ReactOS" + IDS_UPDATESUBTITLE "Choose which existing ReactOS installation you want to update or repair." IDS_DEVICETITLE "Installer grunnleggende enheter" IDS_DEVICESUBTITLE "Velg innstillingene til skjermen og tastaturet." IDS_DRIVETITLE "Valg av installasjon partisjon og system mappe" diff --git a/base/setup/reactos/lang/pl-PL.rc b/base/setup/reactos/lang/pl-PL.rc index 463883adbf7..ea6d6591d9b 100644 --- a/base/setup/reactos/lang/pl-PL.rc +++ b/base/setup/reactos/lang/pl-PL.rc @@ -38,11 +38,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalator systemu ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Zainstaluj system ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "Zainstaluj nową kopię systemu ReactOS. Ta opcja nie zachowa plików, ustawień i programów. Możesz dokonać zmian w dyskach i partycjach.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP - AUTORADIOBUTTON "Napraw lub uaktualnij istniejącą instalację systemu ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Napraw istniejącą instalację lub wykonaj uaktualnienie do nowszej wersji systemu ReactOS. Ta opcja zachowa pliki, ustawienia i programy. Jest dostępna, jeżeli system ReactOS znajduje się już na tym komputerze.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "Kliknij Dalej, aby zmienić ustawienia sprzętu.", IDC_STATIC, 7, 128, 297, 8 + AUTORADIOBUTTON "&Zainstaluj system ReactOS", IDC_INSTALL, 7, 20, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Zainstaluj nową kopię systemu ReactOS. Ta opcja nie zachowa plików, ustawień i programów. Możesz dokonać zmian w dyskach i partycjach.", IDC_INSTALLTEXT, 19, 36, 279, 27, NOT WS_GROUP + AUTORADIOBUTTON "&Napraw lub uaktualnij ReactOS", IDC_UPDATE, 7, 80, 277, 10 + LTEXT "Napraw istniejącą instalację lub wykonaj uaktualnienie do nowszej wersji systemu ReactOS. Ta opcja zachowa pliki, ustawienia i programy. Jest dostępna, jeżeli system ReactOS znajduje się już na tym komputerze.", IDC_UPDATETEXT, 19, 96, 279, 27, NOT WS_GROUP END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -182,8 +181,10 @@ END STRINGTABLE BEGIN IDS_CAPTION "Instalator systemu ReactOS" - IDS_TYPETITLE "Witamy w Kreatorze instalacji systemu ReactOS" - IDS_TYPESUBTITLE "Wybierz typ instalacji." + IDS_TYPETITLE "Installation Type" + IDS_TYPESUBTITLE "You can setup a new ReactOS installation, or update/repair an existing installation." + IDS_UPDATETITLE "Update or Repair ReactOS" + IDS_UPDATESUBTITLE "Choose which existing ReactOS installation you want to update or repair." IDS_DEVICETITLE "Ustawienia podstawowych urządzeń" IDS_DEVICESUBTITLE "Zmień ustawienia monitora i klawiatury." IDS_DRIVETITLE "Ustaw partycję instalacji i katalog systemowy" diff --git a/base/setup/reactos/lang/pt-BR.rc b/base/setup/reactos/lang/pt-BR.rc index 75ad92346b0..47ed4e83fd7 100644 --- a/base/setup/reactos/lang/pt-BR.rc +++ b/base/setup/reactos/lang/pt-BR.rc @@ -27,11 +27,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalação do ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Instalar ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP - AUTORADIOBUTTON "Reparar ou atualizar uma instalação do ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "Clique em Próximo para configurar os dispositivos.", IDC_STATIC, 7, 128, 297, 8 + AUTORADIOBUTTON "&Instalar ReactOS", IDC_INSTALL, 7, 20, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 36, 279, 27, NOT WS_GROUP + AUTORADIOBUTTON "&Reparar ou atualizar ReactOS", IDC_UPDATE, 7, 80, 277, 10 + LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 96, 279, 27, NOT WS_GROUP END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -171,8 +170,10 @@ END STRINGTABLE BEGIN IDS_CAPTION "Instalação do ReactOS" - IDS_TYPETITLE "Bem-vindo(a) a Instalação do ReactOS" - IDS_TYPESUBTITLE "Escolha o modo de instalação." + IDS_TYPETITLE "Installation Type" + IDS_TYPESUBTITLE "You can setup a new ReactOS installation, or update/repair an existing installation." + IDS_UPDATETITLE "Update or Repair ReactOS" + IDS_UPDATESUBTITLE "Choose which existing ReactOS installation you want to update or repair." IDS_DEVICETITLE "Instalar dispositivos básicos" IDS_DEVICESUBTITLE "Definir as configurações de monitor e teclado." IDS_DRIVETITLE "Configurar a partição de instalação e pasta do sistema" diff --git a/base/setup/reactos/lang/pt-PT.rc b/base/setup/reactos/lang/pt-PT.rc index 60ebe7fbdc7..9ada098735f 100644 --- a/base/setup/reactos/lang/pt-PT.rc +++ b/base/setup/reactos/lang/pt-PT.rc @@ -27,11 +27,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalação do ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Instalar ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "Instalar uma nova cópia do ReactOS. Esta opção não preserva os ficheiros, definições ou programas existentes. Pode fazer alterações nos discos ou partições.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP - AUTORADIOBUTTON "Reparar ou actualizar uma instalação do ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Reparar ou actualizar uma instalação do ReactOS. Esta opção preserva os ficheiros, definições e programas existentes. Esta opção só está disponivel se o ReactOS já está instalado neste computador.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "Clique em Próximo para configurar os dispositivos.", IDC_STATIC, 7, 128, 297, 8 + AUTORADIOBUTTON "&Instalar ReactOS", IDC_INSTALL, 7, 20, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Instalar uma nova cópia do ReactOS. Esta opção não preserva os ficheiros, definições ou programas existentes. Pode fazer alterações nos discos ou partições.", IDC_INSTALLTEXT, 19, 36, 279, 27, NOT WS_GROUP + AUTORADIOBUTTON "&Reparar ou actualizar ReactOS", IDC_UPDATE, 7, 80, 277, 10 + LTEXT "Reparar ou actualizar uma instalação do ReactOS. Esta opção preserva os ficheiros, definições e programas existentes. Esta opção só está disponivel se o ReactOS já está instalado neste computador.", IDC_UPDATETEXT, 19, 96, 279, 27, NOT WS_GROUP END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -171,8 +170,10 @@ END STRINGTABLE BEGIN IDS_CAPTION "Instalação do ReactOS" - IDS_TYPETITLE "Bem-vindo(a) a Instalação do ReactOS" - IDS_TYPESUBTITLE "Escolha o modo de instalação." + IDS_TYPETITLE "Installation Type" + IDS_TYPESUBTITLE "You can setup a new ReactOS installation, or update/repair an existing installation." + IDS_UPDATETITLE "Update or Repair ReactOS" + IDS_UPDATESUBTITLE "Choose which existing ReactOS installation you want to update or repair." IDS_DEVICETITLE "Instalar dispositivos básicos" IDS_DEVICESUBTITLE "Definir as configurações de monitor e teclado." IDS_DRIVETITLE "Configurar a partição de instalação e pasta do sistema" diff --git a/base/setup/reactos/lang/ro-RO.rc b/base/setup/reactos/lang/ro-RO.rc index 91dabc7e62c..a23fc0a3a79 100644 --- a/base/setup/reactos/lang/ro-RO.rc +++ b/base/setup/reactos/lang/ro-RO.rc @@ -36,11 +36,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Expert de instalare ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Instalează ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "Instalarea unei noi copii a ReactOS. Fișierele, configurațiile și programele existente nu vor fi păstrate. Sunt posibile ajustări asupra discurilor și partițiilor.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP - AUTORADIOBUTTON "Repară sau actualizează ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Repararea sau actualizarea ReactOS. Această opțiune menține fișierele, configurațiile și programele existente. Opțiune validă doar dacă ReactOS e deja instalat în calculator.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "Apăsați pe Înainte pentru configurarea de dispozitive.", IDC_STATIC, 7, 128, 297, 8 + AUTORADIOBUTTON "&Instalează ReactOS", IDC_INSTALL, 7, 20, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Instalarea unei noi copii a ReactOS. Fișierele, configurațiile și programele existente nu vor fi păstrate. Sunt posibile ajustări asupra discurilor și partițiilor.", IDC_INSTALLTEXT, 19, 36, 279, 27, NOT WS_GROUP + AUTORADIOBUTTON "&Repară sau actualizează ReactOS", IDC_UPDATE, 7, 80, 277, 10 + LTEXT "Repararea sau actualizarea ReactOS. Această opțiune menține fișierele, configurațiile și programele existente. Opțiune validă doar dacă ReactOS e deja instalat în calculator.", IDC_UPDATETEXT, 19, 96, 279, 27, NOT WS_GROUP END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -180,8 +179,10 @@ END STRINGTABLE BEGIN IDS_CAPTION "Expertul de instalare ReactOS" - IDS_TYPETITLE "Bun venit la instalarea ReactOS" - IDS_TYPESUBTITLE "Alegeți tipul de instalare." + IDS_TYPETITLE "Installation Type" + IDS_TYPESUBTITLE "You can setup a new ReactOS installation, or update/repair an existing installation." + IDS_UPDATETITLE "Update or Repair ReactOS" + IDS_UPDATESUBTITLE "Choose which existing ReactOS installation you want to update or repair." IDS_DEVICETITLE "Instalare dispozitive de bază" IDS_DEVICESUBTITLE "Stabilirea parametrilor de afișare și tastatură." IDS_DRIVETITLE "Stabilirea destinației" diff --git a/base/setup/reactos/lang/ru-RU.rc b/base/setup/reactos/lang/ru-RU.rc index 3946f120c7c..def56ff609d 100644 --- a/base/setup/reactos/lang/ru-RU.rc +++ b/base/setup/reactos/lang/ru-RU.rc @@ -27,11 +27,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Установка ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Установка ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "Установить новую копию системы ReactOS. Эта опция НЕ сохраняет файлы, настройки и программы. Вы можете изменять диски и разделы.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP - AUTORADIOBUTTON "Восстановить или изменить установленный ранее ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Обновить или восстановить установленную копию системы ReactOS. Эта опция СОХРАНЯЕТ файлы, настройки и программы. Доступно только при наличии уже установленной на компьютере системы ReactOS.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "Для установки устройств нажмите ""Далее"".", IDC_STATIC, 7, 128, 297, 8 + AUTORADIOBUTTON "&Установка ReactOS", IDC_INSTALL, 7, 20, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Установить новую копию системы ReactOS. Эта опция НЕ сохраняет файлы, настройки и программы. Вы можете изменять диски и разделы.", IDC_INSTALLTEXT, 19, 36, 279, 27, NOT WS_GROUP + AUTORADIOBUTTON "&Восстановить или изменить ReactOS", IDC_UPDATE, 7, 80, 277, 10 + LTEXT "Обновить или восстановить установленную копию системы ReactOS. Эта опция СОХРАНЯЕТ файлы, настройки и программы. Доступно только при наличии уже установленной на компьютере системы ReactOS.", IDC_UPDATETEXT, 19, 96, 279, 27, NOT WS_GROUP END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -171,8 +170,10 @@ END STRINGTABLE BEGIN IDS_CAPTION "Установка ReactOS" - IDS_TYPETITLE "Вас приветствует программа установки ReactOS" - IDS_TYPESUBTITLE "Выберите тип установки." + IDS_TYPETITLE "Installation Type" + IDS_TYPESUBTITLE "You can setup a new ReactOS installation, or update/repair an existing installation." + IDS_UPDATETITLE "Update or Repair ReactOS" + IDS_UPDATESUBTITLE "Choose which existing ReactOS installation you want to update or repair." IDS_DEVICETITLE "Установка базовых устройств" IDS_DEVICESUBTITLE "Настройка параметров экрана и клавиатуры." IDS_DRIVETITLE "Выбор расположения на диске и системного каталога" diff --git a/base/setup/reactos/lang/sk-SK.rc b/base/setup/reactos/lang/sk-SK.rc index 77077aaf141..17364520fee 100644 --- a/base/setup/reactos/lang/sk-SK.rc +++ b/base/setup/reactos/lang/sk-SK.rc @@ -32,11 +32,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Inštalácia systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Nainštalovať systém ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP - AUTORADIOBUTTON "Opraviť alebo aktualizovať nainštalovaný systém ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "Click Next to setup the devices.", IDC_STATIC, 7, 128, 297, 8 + AUTORADIOBUTTON "&Nainštalovať systém ReactOS", IDC_INSTALL, 7, 20, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 36, 279, 27, NOT WS_GROUP + AUTORADIOBUTTON "&Opraviť alebo aktualizovať systém ReactOS", IDC_UPDATE, 7, 80, 277, 10 + LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 96, 279, 27, NOT WS_GROUP END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -176,8 +175,10 @@ END STRINGTABLE BEGIN IDS_CAPTION "ReactOS Setup" - IDS_TYPETITLE "Víta Vás inštalátor systému ReactOS" //Welcome to ReactOS Setup - IDS_TYPESUBTITLE "Choose setup type." + IDS_TYPETITLE "Installation Type" + IDS_TYPESUBTITLE "You can setup a new ReactOS installation, or update/repair an existing installation." + IDS_UPDATETITLE "Update or Repair ReactOS" + IDS_UPDATESUBTITLE "Choose which existing ReactOS installation you want to update or repair." IDS_DEVICETITLE "Setup the basic devices" IDS_DEVICESUBTITLE "Set the settings of display and keyboard." IDS_DRIVETITLE "Setup the installation partition and system folder" diff --git a/base/setup/reactos/lang/sq-AL.rc b/base/setup/reactos/lang/sq-AL.rc index df2c106654e..d95ccc4a9cd 100644 --- a/base/setup/reactos/lang/sq-AL.rc +++ b/base/setup/reactos/lang/sq-AL.rc @@ -29,11 +29,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalimi i ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "InstalO ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP - AUTORADIOBUTTON "Riparo ose apdejto ReactOS'in e instaluar", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "Kliko vazhdo për të konfiguruar pajisjet.", IDC_STATIC, 7, 128, 297, 8 + AUTORADIOBUTTON "&Instalo ReactOS", IDC_INSTALL, 7, 20, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 36, 279, 27, NOT WS_GROUP + AUTORADIOBUTTON "&Riparo ose apdejto ReactOS", IDC_UPDATE, 7, 80, 277, 10 + LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 96, 279, 27, NOT WS_GROUP END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -173,8 +172,10 @@ END STRINGTABLE BEGIN IDS_CAPTION "ReactOS Setup" - IDS_TYPETITLE "Mirë se vini në instalimin e ReactOS" - IDS_TYPESUBTITLE "Zgjidhni llojin e instalimit." + IDS_TYPETITLE "Installation Type" + IDS_TYPESUBTITLE "You can setup a new ReactOS installation, or update/repair an existing installation." + IDS_UPDATETITLE "Update or Repair ReactOS" + IDS_UPDATESUBTITLE "Choose which existing ReactOS installation you want to update or repair." IDS_DEVICETITLE "Instaloni pajisjet themelore" IDS_DEVICESUBTITLE "Vendos parametrat e ekranit dhe tastieres." IDS_DRIVETITLE "Konfiguro particionet për instalim dhe dosjet e sistemit" diff --git a/base/setup/reactos/lang/tr-TR.rc b/base/setup/reactos/lang/tr-TR.rc index af9ee0579e2..797e0dae23a 100644 --- a/base/setup/reactos/lang/tr-TR.rc +++ b/base/setup/reactos/lang/tr-TR.rc @@ -34,11 +34,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Kur" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "ReactOS'u Yükleme", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "ReactOS'un yeni bir kopyasını yükle. Bu seçenek, dosyalarınızı, ayarlarınızı ve programlarınızı korumaz. Disklere ve bölümlere değişiklikler yapabilirsiniz.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP - AUTORADIOBUTTON "Kurulu ReactOS'u Onarma ya da Yükseltme", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Kurulu olan ReactOS'un günceller ya da onarır. Bu seçenek, dosyalarınızı, ayarlarınızı ve programlarınızı korur. Bu seçenek yalnızca ReactOS bu bilgisayarda önceden kuruluysa kullanılabilir.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "Aygıtları kurmak için İleri'ye tıklayınız.", IDC_STATIC, 7, 128, 297, 8 + AUTORADIOBUTTON "ReactOS'u &Yükleme", IDC_INSTALL, 7, 20, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "ReactOS'un yeni bir kopyasını yükle. Bu seçenek, dosyalarınızı, ayarlarınızı ve programlarınızı korumaz. Disklere ve bölümlere değişiklikler yapabilirsiniz.", IDC_INSTALLTEXT, 19, 36, 279, 27, NOT WS_GROUP + AUTORADIOBUTTON "ReactOS'u &Onarma ya da Yükseltme", IDC_UPDATE, 7, 80, 277, 10 + LTEXT "Kurulu olan ReactOS'un günceller ya da onarır. Bu seçenek, dosyalarınızı, ayarlarınızı ve programlarınızı korur. Bu seçenek yalnızca ReactOS bu bilgisayarda önceden kuruluysa kullanılabilir.", IDC_UPDATETEXT, 19, 96, 279, 27, NOT WS_GROUP END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -178,8 +177,10 @@ END STRINGTABLE BEGIN IDS_CAPTION "ReactOS Kur" - IDS_TYPETITLE "ReactOS Kurulum Yöneticisine Hoş Geldiniz" - IDS_TYPESUBTITLE "Kurulum türünü seçiniz." + IDS_TYPETITLE "Installation Type" + IDS_TYPESUBTITLE "You can setup a new ReactOS installation, or update/repair an existing installation." + IDS_UPDATETITLE "Update or Repair ReactOS" + IDS_UPDATESUBTITLE "Choose which existing ReactOS installation you want to update or repair." IDS_DEVICETITLE "Ana Aygıtların Kurulumu" IDS_DEVICESUBTITLE "Ekran ve Klavye ayarlarını yapınız." IDS_DRIVETITLE "Kurulum Bölümünün ve Sistem Dizininin Hazırlanması" diff --git a/base/setup/reactos/lang/uk-UA.rc b/base/setup/reactos/lang/uk-UA.rc index a83ada50cca..8fe8483a95b 100644 --- a/base/setup/reactos/lang/uk-UA.rc +++ b/base/setup/reactos/lang/uk-UA.rc @@ -35,11 +35,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Встановлення ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Встановлення ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP - AUTORADIOBUTTON "Відновити або змінити встановлений раніше ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "Для встановлення пристроїв натисніть Далі.", IDC_STATIC, 7, 128, 297, 8 + AUTORADIOBUTTON "&Встановлення ReactOS", IDC_INSTALL, 7, 20, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 36, 279, 27, NOT WS_GROUP + AUTORADIOBUTTON "В&ідновити або змінити ReactOS", IDC_UPDATE, 7, 80, 277, 10 + LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 96, 279, 27, NOT WS_GROUP END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -179,8 +178,10 @@ END STRINGTABLE BEGIN IDS_CAPTION "Встановлення ReactOS" - IDS_TYPETITLE "Вас вітає програма встановлення ReactOS" - IDS_TYPESUBTITLE "Виберіть тип встановлення." + IDS_TYPETITLE "Installation Type" + IDS_TYPESUBTITLE "You can setup a new ReactOS installation, or update/repair an existing installation." + IDS_UPDATETITLE "Update or Repair ReactOS" + IDS_UPDATESUBTITLE "Choose which existing ReactOS installation you want to update or repair." IDS_DEVICETITLE "Встановлення базових пристроїв" IDS_DEVICESUBTITLE "Налаштування параметрів екрану та клавіатури." IDS_DRIVETITLE "Вибір розташування на диску і системного каталогу" diff --git a/base/setup/reactos/lang/vi-VN.rc b/base/setup/reactos/lang/vi-VN.rc index 3d007b3447f..301192db922 100644 --- a/base/setup/reactos/lang/vi-VN.rc +++ b/base/setup/reactos/lang/vi-VN.rc @@ -27,11 +27,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Cài đặt ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Cài đặt ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "Cài đặt một bản sao mới của ReactOS. Tùy chọn này sẽ không giữ lại các thư mục,tập tin và chương trình của bạn. Bạn có thể thực hiện những thay đổi cho các ổ đĩa và những phần phân chia trong ổ đĩa.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP - AUTORADIOBUTTON "Cập nhật hay sửa chữa ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Cập nhật hay sửa chữa một bản sao đã cài đặt của ReactOS. Tùy chọn này sẽ giữ lại các tập tin, cài đặt và chương trình của bạn. Tùy chọn này chỉ dùng được nếu ReactOS đã được cài đặt trên máy tinh này.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "Ấn Tiếp để tiếp tục.", IDC_STATIC, 7, 128, 297, 8 + AUTORADIOBUTTON "&Cài đặt ReactOS", IDC_INSTALL, 7, 20, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Cài đặt một bản sao mới của ReactOS. Tùy chọn này sẽ không giữ lại các thư mục,tập tin và chương trình của bạn. Bạn có thể thực hiện những thay đổi cho các ổ đĩa và những phần phân chia trong ổ đĩa.", IDC_INSTALLTEXT, 19, 36, 279, 27, NOT WS_GROUP + AUTORADIOBUTTON "Cập &nhật hay sửa chữa ReactOS", IDC_UPDATE, 7, 80, 277, 10 + LTEXT "Cập nhật hay sửa chữa một bản sao đã cài đặt của ReactOS. Tùy chọn này sẽ giữ lại các tập tin, cài đặt và chương trình của bạn. Tùy chọn này chỉ dùng được nếu ReactOS đã được cài đặt trên máy tinh này.", IDC_UPDATETEXT, 19, 96, 279, 27, NOT WS_GROUP END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -171,8 +170,10 @@ END STRINGTABLE BEGIN IDS_CAPTION "Cài đặt ReactOS" - IDS_TYPETITLE "Chào mừng tới trình Thiết lập ReactOS" - IDS_TYPESUBTITLE "Chọn kiểu thiết lập." + IDS_TYPETITLE "Installation Type" + IDS_TYPESUBTITLE "You can setup a new ReactOS installation, or update/repair an existing installation." + IDS_UPDATETITLE "Update or Repair ReactOS" + IDS_UPDATESUBTITLE "Choose which existing ReactOS installation you want to update or repair." IDS_DEVICETITLE "Thiết lập các thiết bị cơ bản" IDS_DEVICESUBTITLE "Chọn những cài đặt cho màn hình và bàn phím." IDS_DRIVETITLE "Thiết lập phần ổ cứng để cài đặt và thư mục hệ thống" diff --git a/base/setup/reactos/lang/zh-CN.rc b/base/setup/reactos/lang/zh-CN.rc index 7b7f56da423..98439dad034 100644 --- a/base/setup/reactos/lang/zh-CN.rc +++ b/base/setup/reactos/lang/zh-CN.rc @@ -27,11 +27,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS 安装程序" FONT 9, "宋体" BEGIN - AUTORADIOBUTTON "安装 ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "安装 ReactOS 的新副本。此选项将不会保存你的文件、设置和程序。你可以对磁盘和分区进行更改。", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP - AUTORADIOBUTTON "修复或更新已安装的 ReactOS 副本", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "更新或修复 ReactOS 安装的副本。此选项会保存您的文件、设置和程序。如果 ReactOS 已经安装，此选项方可使用。", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "点击下一步安装设备。", IDC_STATIC, 7, 128, 297, 8 + AUTORADIOBUTTON "安装 ReactOS(&I)", IDC_INSTALL, 7, 20, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "安装 ReactOS 的新副本。此选项将不会保存你的文件、设置和程序。你可以对磁盘和分区进行更改。", IDC_INSTALLTEXT, 19, 36, 279, 27, NOT WS_GROUP + AUTORADIOBUTTON "修复或更新 ReactOS(&U)", IDC_UPDATE, 7, 80, 277, 10 + LTEXT "更新或修复 ReactOS 安装的副本。此选项会保存您的文件、设置和程序。如果 ReactOS 已经安装，此选项方可使用。", IDC_UPDATETEXT, 19, 96, 279, 27, NOT WS_GROUP END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -171,8 +170,10 @@ END STRINGTABLE BEGIN IDS_CAPTION "ReactOS 安装程序" - IDS_TYPETITLE "ReactOS 安装程序" - IDS_TYPESUBTITLE "选择安装类型。" + IDS_TYPETITLE "Installation Type" + IDS_TYPESUBTITLE "You can setup a new ReactOS installation, or update/repair an existing installation." + IDS_UPDATETITLE "Update or Repair ReactOS" + IDS_UPDATESUBTITLE "Choose which existing ReactOS installation you want to update or repair." IDS_DEVICETITLE "设置基本设备" IDS_DEVICESUBTITLE "指定显示和键盘设置。" IDS_DRIVETITLE "设置安装分区和系统文件夹" diff --git a/base/setup/reactos/lang/zh-HK.rc b/base/setup/reactos/lang/zh-HK.rc index bc93f406c74..6f94145c907 100644 --- a/base/setup/reactos/lang/zh-HK.rc +++ b/base/setup/reactos/lang/zh-HK.rc @@ -35,11 +35,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS 安裝程式" FONT 9, "新細明體" BEGIN - AUTORADIOBUTTON "安裝 ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "安裝 ReactOS 的新副本。這個選項不會儲存您的檔案、設定和程式。您可以對磁碟和磁碟區進行更改。", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP - AUTORADIOBUTTON "修復或更新已安裝的 ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "更新或修復已安裝的 ReactOS 副本。這個選項會儲存您的檔案、設定及程式。只有在 ReactOS 已經安裝在此電腦時才可使用這個選項。", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "按［下一步］繼續安裝。", IDC_STATIC, 7, 128, 297, 8 + AUTORADIOBUTTON "安裝 ReactOS(&I)", IDC_INSTALL, 7, 20, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "安裝 ReactOS 的新副本。這個選項不會儲存您的檔案、設定和程式。您可以對磁碟和磁碟區進行更改。", IDC_INSTALLTEXT, 19, 36, 279, 27, NOT WS_GROUP + AUTORADIOBUTTON "修復或更新 ReactOS(&U)", IDC_UPDATE, 7, 80, 277, 10 + LTEXT "更新或修復已安裝的 ReactOS 副本。這個選項會儲存您的檔案、設定及程式。只有在 ReactOS 已經安裝在此電腦時才可使用這個選項。", IDC_UPDATETEXT, 19, 96, 279, 27, NOT WS_GROUP END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -179,8 +178,10 @@ END STRINGTABLE BEGIN IDS_CAPTION "ReactOS 安裝程式" - IDS_TYPETITLE "ReactOS 安裝程式" - IDS_TYPESUBTITLE "選擇安裝類型。" + IDS_TYPETITLE "Installation Type" + IDS_TYPESUBTITLE "You can setup a new ReactOS installation, or update/repair an existing installation." + IDS_UPDATETITLE "Update or Repair ReactOS" + IDS_UPDATESUBTITLE "Choose which existing ReactOS installation you want to update or repair." IDS_DEVICETITLE "設定基本裝置" IDS_DEVICESUBTITLE "指定顯示和鍵盤設定。" IDS_DRIVETITLE "設定安裝磁碟區和系統資料夾" diff --git a/base/setup/reactos/lang/zh-TW.rc b/base/setup/reactos/lang/zh-TW.rc index 704248d5c39..7eda19e8506 100644 --- a/base/setup/reactos/lang/zh-TW.rc +++ b/base/setup/reactos/lang/zh-TW.rc @@ -36,11 +36,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS 安裝程式" FONT 9, "新細明體" BEGIN - AUTORADIOBUTTON "安裝 ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "安裝 ReactOS 的新副本。此選項不會儲存您的檔案、設定和程式。您可以對磁碟和磁碟區進行更改。", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP - AUTORADIOBUTTON "修復或更新已安裝的 ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "更新或修復已安裝的 ReactOS 副本。此選項會儲存您的檔案、設定和程式。只有在 ReactOS 已經安裝在此電腦時才能使用此選項。", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "按［下一步］繼續安裝。", IDC_STATIC, 7, 128, 297, 8 + AUTORADIOBUTTON "安裝 ReactOS(&I)", IDC_INSTALL, 7, 20, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "安裝 ReactOS 的新副本。此選項不會儲存您的檔案、設定和程式。您可以對磁碟和磁碟區進行更改。", IDC_INSTALLTEXT, 19, 36, 279, 27, NOT WS_GROUP + AUTORADIOBUTTON "修復或更新 ReactOS(&U)", IDC_UPDATE, 7, 80, 277, 10 + LTEXT "更新或修復已安裝的 ReactOS 副本。此選項會儲存您的檔案、設定和程式。只有在 ReactOS 已經安裝在此電腦時才能使用此選項。", IDC_UPDATETEXT, 19, 96, 279, 27, NOT WS_GROUP END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -180,8 +179,10 @@ END STRINGTABLE BEGIN IDS_CAPTION "ReactOS 安裝程式" - IDS_TYPETITLE "ReactOS 安裝程式" - IDS_TYPESUBTITLE "選擇安裝類型。" + IDS_TYPETITLE "Installation Type" + IDS_TYPESUBTITLE "You can setup a new ReactOS installation, or update/repair an existing installation." + IDS_UPDATETITLE "Update or Repair ReactOS" + IDS_UPDATESUBTITLE "Choose which existing ReactOS installation you want to update or repair." IDS_DEVICETITLE "設定基本裝置" IDS_DEVICESUBTITLE "指定顯示和鍵盤設定。" IDS_DRIVETITLE "設定安裝磁碟區和系統資料夾" diff --git a/base/setup/reactos/reactos.c b/base/setup/reactos/reactos.c index 64f864d4dfa..35a68250ff6 100644 --- a/base/setup/reactos/reactos.c +++ b/base/setup/reactos/reactos.c @@ -398,11 +398,15 @@ TypeDlgProc( pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pSetupData); - /* Check the 'install' radio button */ + /* Set the options in bold */ + SetDlgItemFont(hwndDlg, IDC_INSTALL, pSetupData->hBoldFont, TRUE); + SetDlgItemFont(hwndDlg, IDC_UPDATE, pSetupData->hBoldFont, TRUE); + + /* Check the "Install" radio button */ CheckDlgButton(hwndDlg, IDC_INSTALL, BST_CHECKED); /* - * Enable the 'update' radio button and text only if we have + * Enable the "Update" radio button and text only if we have * available NT installations, otherwise disable them. */ if (pSetupData->NtOsInstallsList && @@ -2926,8 +2930,8 @@ _tWinMain(HINSTANCE hInst, /* Create the upgrade/repair selection page */ psp.dwSize = sizeof(PROPSHEETPAGE); psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; - psp.pszHeaderTitle = MAKEINTRESOURCEW(IDS_TYPETITLE); - psp.pszHeaderSubTitle = MAKEINTRESOURCEW(IDS_TYPESUBTITLE); + psp.pszHeaderTitle = MAKEINTRESOURCEW(IDS_UPDATETITLE); + psp.pszHeaderSubTitle = MAKEINTRESOURCEW(IDS_UPDATESUBTITLE); psp.hInstance = hInst; psp.lParam = (LPARAM)&SetupData; psp.pfnDlgProc = UpgradeRepairDlgProc; diff --git a/base/setup/reactos/resource.h b/base/setup/reactos/resource.h index c1c47e0cda8..e0420cafa63 100644 --- a/base/setup/reactos/resource.h +++ b/base/setup/reactos/resource.h @@ -86,16 +86,18 @@ #define IDS_CAPTION 5000 #define IDS_TYPETITLE 5001 #define IDS_TYPESUBTITLE 5002 -#define IDS_DEVICETITLE 5003 -#define IDS_DEVICESUBTITLE 5004 -#define IDS_DRIVETITLE 5005 -#define IDS_DRIVESUBTITLE 5006 -#define IDS_SUMMARYTITLE 5007 -#define IDS_SUMMARYSUBTITLE 5008 -#define IDS_PROCESSTITLE 5009 -#define IDS_PROCESSSUBTITLE 5010 -#define IDS_RESTARTTITLE 5011 -#define IDS_RESTARTSUBTITLE 5012 +#define IDS_UPDATETITLE 5003 +#define IDS_UPDATESUBTITLE 5004 +#define IDS_DEVICETITLE 5005 +#define IDS_DEVICESUBTITLE 5006 +#define IDS_DRIVETITLE 5007 +#define IDS_DRIVESUBTITLE 5008 +#define IDS_SUMMARYTITLE 5009 +#define IDS_SUMMARYSUBTITLE 5010 +#define IDS_PROCESSTITLE 5011 +#define IDS_PROCESSSUBTITLE 5012 +#define IDS_RESTARTTITLE 5013 +#define IDS_RESTARTSUBTITLE 5014 #define IDS_ABORTSETUP 5020 #define IDS_ABORTSETUP2 5021 #define IDS_NO_TXTSETUP_SIF 5022

1 0

[reactos] 01/01: [SETUP:REACTOS] Refactor the Welcome page (#7579)
by Hermès Bélusca-Maïto 31 Dec '24

31 Dec '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d009776810011c7f3fce… commit 8d009776810011c7f3fceab62cacfc130f3fdb05 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Oct 31 22:25:54 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Dec 31 12:09:45 2024 +0100 [SETUP:REACTOS] Refactor the Welcome page (#7579) - Rewrite the introductory text. - Add a temporary (ReactOS-Alpha) informational message. - Hide the "Back" button when the Welcome page is active, and show it back again when switching to the following ones. --- base/setup/reactos/lang/bg-BG.rc | 14 +++++- base/setup/reactos/lang/cs-CZ.rc | 14 +++++- base/setup/reactos/lang/de-DE.rc | 16 ++++-- base/setup/reactos/lang/el-GR.rc | 14 +++++- base/setup/reactos/lang/en-US.rc | 14 +++++- base/setup/reactos/lang/es-ES.rc | 14 +++++- base/setup/reactos/lang/et-EE.rc | 14 +++++- base/setup/reactos/lang/eu-ES.rc | 14 +++++- base/setup/reactos/lang/fi-FI.rc | 14 +++++- base/setup/reactos/lang/fr-FR.rc | 14 +++++- base/setup/reactos/lang/he-IL.rc | 16 ++++-- base/setup/reactos/lang/hi-IN.rc | 14 +++++- base/setup/reactos/lang/hu-HU.rc | 16 ++++-- base/setup/reactos/lang/id-ID.rc | 14 +++++- base/setup/reactos/lang/it-IT.rc | 14 +++++- base/setup/reactos/lang/ja-JP.rc | 14 +++++- base/setup/reactos/lang/ms-MY.rc | 14 +++++- base/setup/reactos/lang/no-NO.rc | 16 ++++-- base/setup/reactos/lang/pl-PL.rc | 14 +++++- base/setup/reactos/lang/pt-BR.rc | 14 +++++- base/setup/reactos/lang/pt-PT.rc | 14 +++++- base/setup/reactos/lang/ro-RO.rc | 14 +++++- base/setup/reactos/lang/ru-RU.rc | 14 +++++- base/setup/reactos/lang/sk-SK.rc | 14 +++++- base/setup/reactos/lang/sq-AL.rc | 14 +++++- base/setup/reactos/lang/tr-TR.rc | 16 ++++-- base/setup/reactos/lang/uk-UA.rc | 14 +++++- base/setup/reactos/lang/vi-VN.rc | 14 +++++- base/setup/reactos/lang/zh-CN.rc | 14 +++++- base/setup/reactos/lang/zh-HK.rc | 14 +++++- base/setup/reactos/lang/zh-TW.rc | 14 +++++- base/setup/reactos/reactos.c | 103 ++++++++++++++++++++++++++------------- base/setup/reactos/reactos.h | 4 ++ base/setup/reactos/resource.h | 3 ++ 34 files changed, 453 insertions(+), 101 deletions(-) diff --git a/base/setup/reactos/lang/bg-BG.rc b/base/setup/reactos/lang/bg-BG.rc index 7c230e346b4..ddba90c57c7 100644 --- a/base/setup/reactos/lang/bg-BG.rc +++ b/base/setup/reactos/lang/bg-BG.rc @@ -8,8 +8,18 @@ CAPTION "Настройка на РеактОС" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Съветникът за настройка на РеактОС ви приветства", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "Все още не можете да сложите РеактОС направо от този КД! Презапуснете компютъра с този КД, за да сложите РеактОС.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Натиснете „Приключване“ за изход от настройването.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "This wizard will install or upgrade ReactOS on your computer, \ +and prepare the second part of the setup.", IDC_STATIC, 115, 40, 195, 27 +//// + GROUPBOX " IMPORTANT INFORMATION ", IDC_WARNTEXT1, 115, 70, 195, 90, BS_CENTER + LTEXT "ReactOS is in Alpha stage: it is not feature- complete and is \ +under heavy development. It is recommended to use it only for \ +evaluation and testing and not as your daily-usage OS.\n\ +It may corrupt your data or damage your hardware.", IDC_WARNTEXT2, 120, 80, 185, 50, SS_CENTER + LTEXT "Backup your data or test on a secondary computer \ +if you attempt to run ReactOS on real hardware.", IDC_WARNTEXT3, 120, 130, 185, 27, SS_CENTER +//// + LTEXT "Натиснете „Напред“ за продължаване на настройката.", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 diff --git a/base/setup/reactos/lang/cs-CZ.rc b/base/setup/reactos/lang/cs-CZ.rc index 8f1b30091c7..b96eda89b63 100644 --- a/base/setup/reactos/lang/cs-CZ.rc +++ b/base/setup/reactos/lang/cs-CZ.rc @@ -14,8 +14,18 @@ CAPTION "Instalace systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Vítejte v průvodci instalace systému ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "Systém ReactOS zatím nelze nainstalovat přímo z tohoto CD! Pro instalaci restartuje počítač z tohoto CD.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Klepnutím na Dokončit ukončíte instalaci.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "This wizard will install or upgrade ReactOS on your computer, \ +and prepare the second part of the setup.", IDC_STATIC, 115, 40, 195, 27 +//// + GROUPBOX " IMPORTANT INFORMATION ", IDC_WARNTEXT1, 115, 70, 195, 90, BS_CENTER + LTEXT "ReactOS is in Alpha stage: it is not feature- complete and is \ +under heavy development. It is recommended to use it only for \ +evaluation and testing and not as your daily-usage OS.\n\ +It may corrupt your data or damage your hardware.", IDC_WARNTEXT2, 120, 80, 185, 50, SS_CENTER + LTEXT "Backup your data or test on a secondary computer \ +if you attempt to run ReactOS on real hardware.", IDC_WARNTEXT3, 120, 130, 185, 27, SS_CENTER +//// + LTEXT "Kliknutím na Další pokračujte v instalaci.", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 diff --git a/base/setup/reactos/lang/de-DE.rc b/base/setup/reactos/lang/de-DE.rc index ffb2edbd217..1ec67347ae6 100644 --- a/base/setup/reactos/lang/de-DE.rc +++ b/base/setup/reactos/lang/de-DE.rc @@ -7,9 +7,19 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS-Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Willkommen beim ReactOS-Setup-Assistenten", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "ReactOS kann noch nicht direkt von dieser CD installiert werden! Bitte starten Sie Ihren Computer mit dieser CD um ReactOS zu installieren.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Klicken Sie auf Beenden um das Setup zu verlassen.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "Willkommen beim ReactOS Installationsassistenten", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "This wizard will install or upgrade ReactOS on your computer, \ +and prepare the second part of the setup.", IDC_STATIC, 115, 40, 195, 27 +//// + GROUPBOX " IMPORTANT INFORMATION ", IDC_WARNTEXT1, 115, 70, 195, 90, BS_CENTER + LTEXT "ReactOS is in Alpha stage: it is not feature- complete and is \ +under heavy development. It is recommended to use it only for \ +evaluation and testing and not as your daily-usage OS.\n\ +It may corrupt your data or damage your hardware.", IDC_WARNTEXT2, 120, 80, 185, 50, SS_CENTER + LTEXT "Backup your data or test on a secondary computer \ +if you attempt to run ReactOS on real hardware.", IDC_WARNTEXT3, 120, 130, 185, 27, SS_CENTER +//// + LTEXT "Klicken Sie auf Weiter, um fortzufahren.", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 diff --git a/base/setup/reactos/lang/el-GR.rc b/base/setup/reactos/lang/el-GR.rc index d8f3c06be63..e7153a77672 100644 --- a/base/setup/reactos/lang/el-GR.rc +++ b/base/setup/reactos/lang/el-GR.rc @@ -8,8 +8,18 @@ CAPTION "Εγκατάσταση του ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Καλώς ήλθατε στον οδηγό εγκατάστασης του ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "Δε μπορείτε να εγκαταστήσετε το ReactOS απευθείας από αυτό το CD ακόμα! Παρακαλούμε επανεκκινήστε τον υπολογιστή σας από αυτό το CD για να μπορέσετε να εγκαταστήσετε το ReactOS.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Πατήστε Ολοκλήρωση για να βγείτε από την Εγκατάσταση.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "This wizard will install or upgrade ReactOS on your computer, \ +and prepare the second part of the setup.", IDC_STATIC, 115, 40, 195, 27 +//// + GROUPBOX " IMPORTANT INFORMATION ", IDC_WARNTEXT1, 115, 70, 195, 90, BS_CENTER + LTEXT "ReactOS is in Alpha stage: it is not feature- complete and is \ +under heavy development. It is recommended to use it only for \ +evaluation and testing and not as your daily-usage OS.\n\ +It may corrupt your data or damage your hardware.", IDC_WARNTEXT2, 120, 80, 185, 50, SS_CENTER + LTEXT "Backup your data or test on a secondary computer \ +if you attempt to run ReactOS on real hardware.", IDC_WARNTEXT3, 120, 130, 185, 27, SS_CENTER +//// + LTEXT "Πατήστε το 'Επόμενο' για να συνεχίσει η εγκατάσταση.", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 diff --git a/base/setup/reactos/lang/en-US.rc b/base/setup/reactos/lang/en-US.rc index 0c6d7e32b7c..c957f5bc3b1 100644 --- a/base/setup/reactos/lang/en-US.rc +++ b/base/setup/reactos/lang/en-US.rc @@ -8,8 +8,18 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Welcome to the ReactOS Setup Wizard", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "You cannot install ReactOS directly from this CD yet! Please restart your computer from this CD in order to install ReactOS.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Click Finish to exit the Setup.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "This wizard will install or upgrade ReactOS on your computer, \ +and prepare the second part of the setup.", IDC_STATIC, 115, 40, 195, 27 +//// + GROUPBOX " IMPORTANT INFORMATION ", IDC_WARNTEXT1, 115, 70, 195, 90, BS_CENTER + LTEXT "ReactOS is in Alpha stage: it is not feature- complete and is \ +under heavy development. It is recommended to use it only for \ +evaluation and testing and not as your daily-usage OS.\n\ +It may corrupt your data or damage your hardware.", IDC_WARNTEXT2, 120, 80, 185, 50, SS_CENTER + LTEXT "Backup your data or test on a secondary computer \ +if you attempt to run ReactOS on real hardware.", IDC_WARNTEXT3, 120, 130, 185, 27, SS_CENTER +//// + LTEXT "Click Next to continue with Setup.", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 diff --git a/base/setup/reactos/lang/es-ES.rc b/base/setup/reactos/lang/es-ES.rc index acac98fea7c..e17041d1894 100644 --- a/base/setup/reactos/lang/es-ES.rc +++ b/base/setup/reactos/lang/es-ES.rc @@ -17,8 +17,18 @@ CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bienvenido al Asistente de Instalación de ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "¡Aún no puede instalar ReactOS desde el ejecutable del CD! Por favor, arranque su equipo desde el CD para instalar ReactOS.", IDC_STATIC, 115, 40, 200, 100 - LTEXT "Pulse Finalizar para salir del instalador.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "This wizard will install or upgrade ReactOS on your computer, \ +and prepare the second part of the setup.", IDC_STATIC, 115, 40, 195, 27 +//// + GROUPBOX " IMPORTANT INFORMATION ", IDC_WARNTEXT1, 115, 70, 195, 90, BS_CENTER + LTEXT "ReactOS is in Alpha stage: it is not feature- complete and is \ +under heavy development. It is recommended to use it only for \ +evaluation and testing and not as your daily-usage OS.\n\ +It may corrupt your data or damage your hardware.", IDC_WARNTEXT2, 120, 80, 185, 50, SS_CENTER + LTEXT "Backup your data or test on a secondary computer \ +if you attempt to run ReactOS on real hardware.", IDC_WARNTEXT3, 120, 130, 185, 27, SS_CENTER +//// + LTEXT "Pulse Siguiente para continuar con la instalación.", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 diff --git a/base/setup/reactos/lang/et-EE.rc b/base/setup/reactos/lang/et-EE.rc index c880c622caf..998b398aa70 100644 --- a/base/setup/reactos/lang/et-EE.rc +++ b/base/setup/reactos/lang/et-EE.rc @@ -8,8 +8,18 @@ CAPTION "ReactOS'i paigaldamine" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Tere tulemast ReactOS'i paigaldamus viisardisse", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "Selle CD pealt ei saa praegu veel ReactOS'i paigaldada! ReactOS'i paigaldamiseks on tarvis arvuti taaskäivitada selle CD-ga.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Vajuta lõpeta, et installeerimine lõpetada.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "This wizard will install or upgrade ReactOS on your computer, \ +and prepare the second part of the setup.", IDC_STATIC, 115, 40, 195, 27 +//// + GROUPBOX " IMPORTANT INFORMATION ", IDC_WARNTEXT1, 115, 70, 195, 90, BS_CENTER + LTEXT "ReactOS is in Alpha stage: it is not feature- complete and is \ +under heavy development. It is recommended to use it only for \ +evaluation and testing and not as your daily-usage OS.\n\ +It may corrupt your data or damage your hardware.", IDC_WARNTEXT2, 120, 80, 185, 50, SS_CENTER + LTEXT "Backup your data or test on a secondary computer \ +if you attempt to run ReactOS on real hardware.", IDC_WARNTEXT3, 120, 130, 185, 27, SS_CENTER +//// + LTEXT "Vajuta Edasi paigaldamise jätkamiseks.", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 diff --git a/base/setup/reactos/lang/eu-ES.rc b/base/setup/reactos/lang/eu-ES.rc index 5ea81031a37..18ae8fb314b 100644 --- a/base/setup/reactos/lang/eu-ES.rc +++ b/base/setup/reactos/lang/eu-ES.rc @@ -15,8 +15,18 @@ CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bienvenido al Asistente de Instalación de ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "¡Aún no puede instalar ReactOS directamente desde el CD! Por favor, reinicie su equipo desde el CD para instalar ReactOS.", IDC_STATIC, 115, 40, 200, 100 - LTEXT "Pulse Finalizar para salir del instalador.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "This wizard will install or upgrade ReactOS on your computer, \ +and prepare the second part of the setup.", IDC_STATIC, 115, 40, 195, 27 +//// + GROUPBOX " IMPORTANT INFORMATION ", IDC_WARNTEXT1, 115, 70, 195, 90, BS_CENTER + LTEXT "ReactOS is in Alpha stage: it is not feature- complete and is \ +under heavy development. It is recommended to use it only for \ +evaluation and testing and not as your daily-usage OS.\n\ +It may corrupt your data or damage your hardware.", IDC_WARNTEXT2, 120, 80, 185, 50, SS_CENTER + LTEXT "Backup your data or test on a secondary computer \ +if you attempt to run ReactOS on real hardware.", IDC_WARNTEXT3, 120, 130, 185, 27, SS_CENTER +//// + LTEXT "Sakatu Aurrera instalazioa jarraitzeko.", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 diff --git a/base/setup/reactos/lang/fi-FI.rc b/base/setup/reactos/lang/fi-FI.rc index 4acfbcce056..aaa7e9dcc66 100644 --- a/base/setup/reactos/lang/fi-FI.rc +++ b/base/setup/reactos/lang/fi-FI.rc @@ -8,8 +8,18 @@ CAPTION "ReactOS Asennus" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Welcome to the ReactOS Setup Wizard", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "Et voi asentaa ReactOS:ä suoraan tältä CDlevyltä! Käynnistä tietokoneesi tältä CD levyltä asentaaksesi ReactOS:ä.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Click Finish to exit the Setup.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "This wizard will install or upgrade ReactOS on your computer, \ +and prepare the second part of the setup.", IDC_STATIC, 115, 40, 195, 27 +//// + GROUPBOX " IMPORTANT INFORMATION ", IDC_WARNTEXT1, 115, 70, 195, 90, BS_CENTER + LTEXT "ReactOS is in Alpha stage: it is not feature- complete and is \ +under heavy development. It is recommended to use it only for \ +evaluation and testing and not as your daily-usage OS.\n\ +It may corrupt your data or damage your hardware.", IDC_WARNTEXT2, 120, 80, 185, 50, SS_CENTER + LTEXT "Backup your data or test on a secondary computer \ +if you attempt to run ReactOS on real hardware.", IDC_WARNTEXT3, 120, 130, 185, 27, SS_CENTER +//// + LTEXT "Click Next to continue with Setup.", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 diff --git a/base/setup/reactos/lang/fr-FR.rc b/base/setup/reactos/lang/fr-FR.rc index a0737ad3a39..060ff220b58 100644 --- a/base/setup/reactos/lang/fr-FR.rc +++ b/base/setup/reactos/lang/fr-FR.rc @@ -8,8 +8,18 @@ CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bienvenue dans l'assistant d'installation de ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "Vous ne pouvez pas encore installer ReactOS directement depuis ce CD ! Veuillez redémarrer votre ordinateur depuis ce CD pour pouvoir installer ReactOS.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Cliquez sur Terminer pour quitter l'installation.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "Cet assistant installe ou met à niveau ReactOS sur votre ordinateur, \ +et prépare la seconde étape d'installation.", IDC_STATIC, 115, 40, 195, 27 +//// + GROUPBOX " INFORMATION IMPORTANTE ", IDC_WARNTEXT1, 115, 70, 195, 90, BS_CENTER + LTEXT "ReactOS est en version Alpha : il n'est pas complet et est \ +en cours de développement. Il est conseillé de ne l'utiliser \ +que pour évaluation et test, pas pour un usage quotidien.\n\ +Il peut corrompre vos données ou endommager votre matériel.", IDC_WARNTEXT2, 120, 80, 185, 50, SS_CENTER + LTEXT "Sauvegardez vos données ou testez sur un ordinateur secondaire \ +si vous souhaitez utiliser ReactOS sur du matériel.", IDC_WARNTEXT3, 120, 130, 185, 27, SS_CENTER +//// + LTEXT "Cliquez sur Suivant pour continuer l'installation.", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 diff --git a/base/setup/reactos/lang/he-IL.rc b/base/setup/reactos/lang/he-IL.rc index 1530d86da94..cdda584b05d 100644 --- a/base/setup/reactos/lang/he-IL.rc +++ b/base/setup/reactos/lang/he-IL.rc @@ -9,9 +9,19 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "התקנת ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ברוכים הבאים לאשף ההתקנה של ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "אתה לא יכול להתקין את ReactOS מהדיסק הזה ברגע זה! נע הפעל מחדש את המחשב מהדיסק הזה בשביל להתקין את ReactOS", IDC_STATIC, 115, 40, 195, 100 - LTEXT "לחץ על 'סיום' כדי לסיים את ההתקנה.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "ברוכים לאשף ההתקנה של ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "This wizard will install or upgrade ReactOS on your computer, \ +and prepare the second part of the setup.", IDC_STATIC, 115, 40, 195, 27 +//// + GROUPBOX " IMPORTANT INFORMATION ", IDC_WARNTEXT1, 115, 70, 195, 90, BS_CENTER + LTEXT "ReactOS is in Alpha stage: it is not feature- complete and is \ +under heavy development. It is recommended to use it only for \ +evaluation and testing and not as your daily-usage OS.\n\ +It may corrupt your data or damage your hardware.", IDC_WARNTEXT2, 120, 80, 185, 50, SS_CENTER + LTEXT "Backup your data or test on a secondary computer \ +if you attempt to run ReactOS on real hardware.", IDC_WARNTEXT3, 120, 130, 185, 27, SS_CENTER +//// + LTEXT "לחץ על הבא כדי להמשיך עם ההתקנה", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 diff --git a/base/setup/reactos/lang/hi-IN.rc b/base/setup/reactos/lang/hi-IN.rc index e0c2fbc9202..d21fc04ee1a 100644 --- a/base/setup/reactos/lang/hi-IN.rc +++ b/base/setup/reactos/lang/hi-IN.rc @@ -15,8 +15,18 @@ CAPTION "रिऐक्ट ओएस सेटअप" FONT 8, "MS Shell Dlg" BEGIN LTEXT "रिऐक्ट ओएस सेटअप विज़ार्ड में आपका स्वागत है।", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "आप अभी तक इस सीडी से सीधे रिऐक्ट ओएस इंस्टॉल नहीं कर सकते हैं! कृपया अपने कंप्यूटर को रिऐक्ट ओएस इंस्टॉल करने के लिए इस सीडी से रीस्टॉर्ट करें।", IDC_STATIC, 115, 40, 195, 100 - LTEXT "सेटअप से बाहर निकलने के लिए समाप्त क्लिक करें।", IDC_STATIC, 115, 169, 195, 17 + LTEXT "This wizard will install or upgrade ReactOS on your computer, \ +and prepare the second part of the setup.", IDC_STATIC, 115, 40, 195, 27 +//// + GROUPBOX " IMPORTANT INFORMATION ", IDC_WARNTEXT1, 115, 70, 195, 90, BS_CENTER + LTEXT "ReactOS is in Alpha stage: it is not feature- complete and is \ +under heavy development. It is recommended to use it only for \ +evaluation and testing and not as your daily-usage OS.\n\ +It may corrupt your data or damage your hardware.", IDC_WARNTEXT2, 120, 80, 185, 50, SS_CENTER + LTEXT "Backup your data or test on a secondary computer \ +if you attempt to run ReactOS on real hardware.", IDC_WARNTEXT3, 120, 130, 185, 27, SS_CENTER +//// + LTEXT "सेटअप के साथ जारी रखने के लिए आगे क्लिक करें।", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 diff --git a/base/setup/reactos/lang/hu-HU.rc b/base/setup/reactos/lang/hu-HU.rc index 93e27c3d5ca..81033de9895 100644 --- a/base/setup/reactos/lang/hu-HU.rc +++ b/base/setup/reactos/lang/hu-HU.rc @@ -9,9 +9,19 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS telepítõ" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Welcome to the ReactOS Setup Wizard", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "Nem tudod feltelepíteni a ReactOS rendszert így! Kérlek indítsd újra a számítógépet ezzel a CD-vel, hogy feltudjad telepíteni a ReactOS rendszert.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Click Finish to exit the Setup.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "Üdvözöljük a ReactOS telepítőben", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "This wizard will install or upgrade ReactOS on your computer, \ +and prepare the second part of the setup.", IDC_STATIC, 115, 40, 195, 27 +//// + GROUPBOX " IMPORTANT INFORMATION ", IDC_WARNTEXT1, 115, 70, 195, 90, BS_CENTER + LTEXT "ReactOS is in Alpha stage: it is not feature- complete and is \ +under heavy development. It is recommended to use it only for \ +evaluation and testing and not as your daily-usage OS.\n\ +It may corrupt your data or damage your hardware.", IDC_WARNTEXT2, 120, 80, 185, 50, SS_CENTER + LTEXT "Backup your data or test on a secondary computer \ +if you attempt to run ReactOS on real hardware.", IDC_WARNTEXT3, 120, 130, 185, 27, SS_CENTER +//// + LTEXT "Kattintson a Tovább gombra a folytatáshoz.", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 diff --git a/base/setup/reactos/lang/id-ID.rc b/base/setup/reactos/lang/id-ID.rc index faeb2b7e961..a303bc8e730 100644 --- a/base/setup/reactos/lang/id-ID.rc +++ b/base/setup/reactos/lang/id-ID.rc @@ -8,8 +8,18 @@ CAPTION "Penyetelan ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Selamat datang di Penuntun Penyetelan ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "ReactOS belum bisa dipasang dari CD secara langsung! Mohon mulai ulang komputer ini dari CD secara berurutan untuk memasang ReactOS.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Klik selesai untuk keluar dari penyetelan.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "This wizard will install or upgrade ReactOS on your computer, \ +and prepare the second part of the setup.", IDC_STATIC, 115, 40, 195, 27 +//// + GROUPBOX " IMPORTANT INFORMATION ", IDC_WARNTEXT1, 115, 70, 195, 90, BS_CENTER + LTEXT "ReactOS is in Alpha stage: it is not feature- complete and is \ +under heavy development. It is recommended to use it only for \ +evaluation and testing and not as your daily-usage OS.\n\ +It may corrupt your data or damage your hardware.", IDC_WARNTEXT2, 120, 80, 185, 50, SS_CENTER + LTEXT "Backup your data or test on a secondary computer \ +if you attempt to run ReactOS on real hardware.", IDC_WARNTEXT3, 120, 130, 185, 27, SS_CENTER +//// + LTEXT "Klik Lanjut untuk melanjutkan Penyetelan.", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 diff --git a/base/setup/reactos/lang/it-IT.rc b/base/setup/reactos/lang/it-IT.rc index 31368d06602..1ee24d21c46 100644 --- a/base/setup/reactos/lang/it-IT.rc +++ b/base/setup/reactos/lang/it-IT.rc @@ -8,8 +8,18 @@ CAPTION "Installazione di ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Benvenuto al wizard di installazione di ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "Non è ancora possibile installare ReactOS direttamente da questo CD! E' necessario riavviare il computer da questo CD per procedere alla installazione di ReactOS.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Cliccare Fine per uscire.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "This wizard will install or upgrade ReactOS on your computer, \ +and prepare the second part of the setup.", IDC_STATIC, 115, 40, 195, 27 +//// + GROUPBOX " IMPORTANT INFORMATION ", IDC_WARNTEXT1, 115, 70, 195, 90, BS_CENTER + LTEXT "ReactOS is in Alpha stage: it is not feature- complete and is \ +under heavy development. It is recommended to use it only for \ +evaluation and testing and not as your daily-usage OS.\n\ +It may corrupt your data or damage your hardware.", IDC_WARNTEXT2, 120, 80, 185, 50, SS_CENTER + LTEXT "Backup your data or test on a secondary computer \ +if you attempt to run ReactOS on real hardware.", IDC_WARNTEXT3, 120, 130, 185, 27, SS_CENTER +//// + LTEXT "Selezionare Avanti per proseguire con la configurazione.", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 diff --git a/base/setup/reactos/lang/ja-JP.rc b/base/setup/reactos/lang/ja-JP.rc index 580d42049bc..31c258c5434 100644 --- a/base/setup/reactos/lang/ja-JP.rc +++ b/base/setup/reactos/lang/ja-JP.rc @@ -8,8 +8,18 @@ CAPTION "ReactOS セットアップ" FONT 9, "MS UI Gothic" BEGIN LTEXT "ReactOS セットアップウィザードへようこそ", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "このCDからまだ直接ReactOSをインストールできません。ReactOSをインストールするために、このCDからコンピュータを再起動して下さい。", IDC_STATIC, 115, 40, 195, 100 - LTEXT "完了をクリックしてセットアップを終了して下さい。", IDC_STATIC, 115, 169, 195, 17 + LTEXT "This wizard will install or upgrade ReactOS on your computer, \ +and prepare the second part of the setup.", IDC_STATIC, 115, 40, 195, 27 +//// + GROUPBOX " IMPORTANT INFORMATION ", IDC_WARNTEXT1, 115, 70, 195, 90, BS_CENTER + LTEXT "ReactOS is in Alpha stage: it is not feature- complete and is \ +under heavy development. It is recommended to use it only for \ +evaluation and testing and not as your daily-usage OS.\n\ +It may corrupt your data or damage your hardware.", IDC_WARNTEXT2, 120, 80, 185, 50, SS_CENTER + LTEXT "Backup your data or test on a secondary computer \ +if you attempt to run ReactOS on real hardware.", IDC_WARNTEXT3, 120, 130, 185, 27, SS_CENTER +//// + LTEXT "セットアップを続行するには [次へ] をクリックして下さい。", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 diff --git a/base/setup/reactos/lang/ms-MY.rc b/base/setup/reactos/lang/ms-MY.rc index a7cd0c0921f..3d429a596e5 100644 --- a/base/setup/reactos/lang/ms-MY.rc +++ b/base/setup/reactos/lang/ms-MY.rc @@ -10,8 +10,18 @@ CAPTION "ReactOS Persediaan" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Selamat datang ke Pendeta Persediaan ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "Anda tidak boleh memasang ReactOS terus dari CD ini lagi! Sila mula semula komputer anda dari CD ini untuk memasang ReactOS.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Klik Selesai untuk keluar persediaan.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "This wizard will install or upgrade ReactOS on your computer, \ +and prepare the second part of the setup.", IDC_STATIC, 115, 40, 195, 27 +//// + GROUPBOX " IMPORTANT INFORMATION ", IDC_WARNTEXT1, 115, 70, 195, 90, BS_CENTER + LTEXT "ReactOS is in Alpha stage: it is not feature- complete and is \ +under heavy development. It is recommended to use it only for \ +evaluation and testing and not as your daily-usage OS.\n\ +It may corrupt your data or damage your hardware.", IDC_WARNTEXT2, 120, 80, 185, 50, SS_CENTER + LTEXT "Backup your data or test on a secondary computer \ +if you attempt to run ReactOS on real hardware.", IDC_WARNTEXT3, 120, 130, 185, 27, SS_CENTER +//// + LTEXT "Click Next to continue with Setup.", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 diff --git a/base/setup/reactos/lang/no-NO.rc b/base/setup/reactos/lang/no-NO.rc index 2b4949e4b96..5352bc37d9a 100644 --- a/base/setup/reactos/lang/no-NO.rc +++ b/base/setup/reactos/lang/no-NO.rc @@ -7,9 +7,19 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS installering" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Velkommen til ReactOS installering veiviseren", IDC_STARTTITLE, 115, 8, 220, 24 - LTEXT "Du kan ennå ikke installere ReactOS direkte fra denne CD-en! Vennligst start datamaskinen på nytt og start fra denne platen for å installere ReactOS.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Trykk på Fullført for å avslutte installeringen.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "Velkommen til ReactOS installering veiviseren", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "This wizard will install or upgrade ReactOS on your computer, \ +and prepare the second part of the setup.", IDC_STATIC, 115, 40, 195, 27 +//// + GROUPBOX " IMPORTANT INFORMATION ", IDC_WARNTEXT1, 115, 70, 195, 90, BS_CENTER + LTEXT "ReactOS is in Alpha stage: it is not feature- complete and is \ +under heavy development. It is recommended to use it only for \ +evaluation and testing and not as your daily-usage OS.\n\ +It may corrupt your data or damage your hardware.", IDC_WARNTEXT2, 120, 80, 185, 50, SS_CENTER + LTEXT "Backup your data or test on a secondary computer \ +if you attempt to run ReactOS on real hardware.", IDC_WARNTEXT3, 120, 130, 185, 27, SS_CENTER +//// + LTEXT "Klikk Neste for å fortsette installasjonen.", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 diff --git a/base/setup/reactos/lang/pl-PL.rc b/base/setup/reactos/lang/pl-PL.rc index c077f071a43..463883adbf7 100644 --- a/base/setup/reactos/lang/pl-PL.rc +++ b/base/setup/reactos/lang/pl-PL.rc @@ -19,8 +19,18 @@ CAPTION "Instalator systemu ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Witamy w Kreatorze instalacji systemu ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "Obecnie nie można zainstalować systemu ReactOS bezpośrednio! Uruchom ponownie komputer z tej płyty, aby zainstalować system ReactOS.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Kliknij przycisk Anuluj, aby zakończyć pracę instalatora.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "This wizard will install or upgrade ReactOS on your computer, \ +and prepare the second part of the setup.", IDC_STATIC, 115, 40, 195, 27 +//// + GROUPBOX " IMPORTANT INFORMATION ", IDC_WARNTEXT1, 115, 70, 195, 90, BS_CENTER + LTEXT "ReactOS is in Alpha stage: it is not feature- complete and is \ +under heavy development. It is recommended to use it only for \ +evaluation and testing and not as your daily-usage OS.\n\ +It may corrupt your data or damage your hardware.", IDC_WARNTEXT2, 120, 80, 185, 50, SS_CENTER + LTEXT "Backup your data or test on a secondary computer \ +if you attempt to run ReactOS on real hardware.", IDC_WARNTEXT3, 120, 130, 185, 27, SS_CENTER +//// + LTEXT "Kliknij Dalej, by kontynuować.", IDC_STATIC, 115, 169, 160, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 diff --git a/base/setup/reactos/lang/pt-BR.rc b/base/setup/reactos/lang/pt-BR.rc index 750fff7a706..75ad92346b0 100644 --- a/base/setup/reactos/lang/pt-BR.rc +++ b/base/setup/reactos/lang/pt-BR.rc @@ -8,8 +8,18 @@ CAPTION "Instalação do ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bem-vindo(a) ao Assistente de Instalação do ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "Você não pode instalar o ReactOS diretamente deste CD! Por favor reinicie seu computador a partir deste CD para instalar o ReactOS.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Clique em Finalizar para sair da Instalação.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "This wizard will install or upgrade ReactOS on your computer, \ +and prepare the second part of the setup.", IDC_STATIC, 115, 40, 195, 27 +//// + GROUPBOX " IMPORTANT INFORMATION ", IDC_WARNTEXT1, 115, 70, 195, 90, BS_CENTER + LTEXT "ReactOS is in Alpha stage: it is not feature- complete and is \ +under heavy development. It is recommended to use it only for \ +evaluation and testing and not as your daily-usage OS.\n\ +It may corrupt your data or damage your hardware.", IDC_WARNTEXT2, 120, 80, 185, 50, SS_CENTER + LTEXT "Backup your data or test on a secondary computer \ +if you attempt to run ReactOS on real hardware.", IDC_WARNTEXT3, 120, 130, 185, 27, SS_CENTER +//// + LTEXT "Clique Avançar para continuar a instalação.", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 diff --git a/base/setup/reactos/lang/pt-PT.rc b/base/setup/reactos/lang/pt-PT.rc index e7867b4b93a..60ebe7fbdc7 100644 --- a/base/setup/reactos/lang/pt-PT.rc +++ b/base/setup/reactos/lang/pt-PT.rc @@ -8,8 +8,18 @@ CAPTION "Instalação do ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bem-vindo(a) ao Assistente de Instalação do ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "Não pode instalar o ReactOS directamente deste CD! Por favor reinicie o computador a partir deste CD para instalar o ReactOS.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Clique em Finalizar para sair da Instalação.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "This wizard will install or upgrade ReactOS on your computer, \ +and prepare the second part of the setup.", IDC_STATIC, 115, 40, 195, 27 +//// + GROUPBOX " IMPORTANT INFORMATION ", IDC_WARNTEXT1, 115, 70, 195, 90, BS_CENTER + LTEXT "ReactOS is in Alpha stage: it is not feature- complete and is \ +under heavy development. It is recommended to use it only for \ +evaluation and testing and not as your daily-usage OS.\n\ +It may corrupt your data or damage your hardware.", IDC_WARNTEXT2, 120, 80, 185, 50, SS_CENTER + LTEXT "Backup your data or test on a secondary computer \ +if you attempt to run ReactOS on real hardware.", IDC_WARNTEXT3, 120, 130, 185, 27, SS_CENTER +//// + LTEXT "Clique Avançar para continuar a instalação.", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 diff --git a/base/setup/reactos/lang/ro-RO.rc b/base/setup/reactos/lang/ro-RO.rc index c0122941cfb..91dabc7e62c 100644 --- a/base/setup/reactos/lang/ro-RO.rc +++ b/base/setup/reactos/lang/ro-RO.rc @@ -17,8 +17,18 @@ CAPTION "Expert de instalare ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bun venit la instalarea ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "ReactOS încă nu poate fi instalat direct de pe acest CD! Pentru a instala ReactOS, reporniți calculatorul și utilizați acest CD în secvența de inițializare.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Apăsați pe Sfârșit pentru a ieși.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "This wizard will install or upgrade ReactOS on your computer, \ +and prepare the second part of the setup.", IDC_STATIC, 115, 40, 195, 27 +//// + GROUPBOX " IMPORTANT INFORMATION ", IDC_WARNTEXT1, 115, 70, 195, 90, BS_CENTER + LTEXT "ReactOS is in Alpha stage: it is not feature- complete and is \ +under heavy development. It is recommended to use it only for \ +evaluation and testing and not as your daily-usage OS.\n\ +It may corrupt your data or damage your hardware.", IDC_WARNTEXT2, 120, 80, 185, 50, SS_CENTER + LTEXT "Backup your data or test on a secondary computer \ +if you attempt to run ReactOS on real hardware.", IDC_WARNTEXT3, 120, 130, 185, 27, SS_CENTER +//// + LTEXT "Apăsați Înainte pentru a continua.", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 diff --git a/base/setup/reactos/lang/ru-RU.rc b/base/setup/reactos/lang/ru-RU.rc index eacc18ce39d..3946f120c7c 100644 --- a/base/setup/reactos/lang/ru-RU.rc +++ b/base/setup/reactos/lang/ru-RU.rc @@ -8,8 +8,18 @@ CAPTION "Установка ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Вас приветствует программа установки ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "Установку ReactOS можно производить только загрузившись с этого диска! После перезапуска компьютера выберите загрузку с CD и начните установку ReactOS.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Нажмите кнопку ""Завершить"" для выхода.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "This wizard will install or upgrade ReactOS on your computer, \ +and prepare the second part of the setup.", IDC_STATIC, 115, 40, 195, 27 +//// + GROUPBOX " IMPORTANT INFORMATION ", IDC_WARNTEXT1, 115, 70, 195, 90, BS_CENTER + LTEXT "ReactOS is in Alpha stage: it is not feature- complete and is \ +under heavy development. It is recommended to use it only for \ +evaluation and testing and not as your daily-usage OS.\n\ +It may corrupt your data or damage your hardware.", IDC_WARNTEXT2, 120, 80, 185, 50, SS_CENTER + LTEXT "Backup your data or test on a secondary computer \ +if you attempt to run ReactOS on real hardware.", IDC_WARNTEXT3, 120, 130, 185, 27, SS_CENTER +//// + LTEXT "Нажмите ""Далее"" для продолжения установки.", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 diff --git a/base/setup/reactos/lang/sk-SK.rc b/base/setup/reactos/lang/sk-SK.rc index d94b765f188..77077aaf141 100644 --- a/base/setup/reactos/lang/sk-SK.rc +++ b/base/setup/reactos/lang/sk-SK.rc @@ -13,8 +13,18 @@ CAPTION "Inštalácia systému ReactOS" //ReactOS Setup FONT 8, "MS Shell Dlg" BEGIN LTEXT "Víta Vás sprievodca inštaláciou systému ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "Systém ReactOS sa z tohto CD nedá nainštalovať ihneď! Reštartujte, prosím, počítač a inštalačné CD nechajte vložené, aby sa mohol systém ReactOS nainštalovať.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Inštaláciu ukončíte kliknutím na tlačidlo Dokončiť.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "This wizard will install or upgrade ReactOS on your computer, \ +and prepare the second part of the setup.", IDC_STATIC, 115, 40, 195, 27 +//// + GROUPBOX " IMPORTANT INFORMATION ", IDC_WARNTEXT1, 115, 70, 195, 90, BS_CENTER + LTEXT "ReactOS is in Alpha stage: it is not feature- complete and is \ +under heavy development. It is recommended to use it only for \ +evaluation and testing and not as your daily-usage OS.\n\ +It may corrupt your data or damage your hardware.", IDC_WARNTEXT2, 120, 80, 185, 50, SS_CENTER + LTEXT "Backup your data or test on a secondary computer \ +if you attempt to run ReactOS on real hardware.", IDC_WARNTEXT3, 120, 130, 185, 27, SS_CENTER +//// + LTEXT "Kliknutím na Ďalej pokračujte v inštalácii.", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 diff --git a/base/setup/reactos/lang/sq-AL.rc b/base/setup/reactos/lang/sq-AL.rc index 99b09a3d02c..df2c106654e 100644 --- a/base/setup/reactos/lang/sq-AL.rc +++ b/base/setup/reactos/lang/sq-AL.rc @@ -10,8 +10,18 @@ CAPTION "Instalimi i ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Mirë se vini në instalimin e ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "Ju nuk mund të instaloni ReactOS direkt nga ky CD! Ju lutem rinisni kompjuterin tuaj nga CD'ja në mënyrë që të instaloni ReactOS.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Kliko Finish për të dalë nga instalimi.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "This wizard will install or upgrade ReactOS on your computer, \ +and prepare the second part of the setup.", IDC_STATIC, 115, 40, 195, 27 +//// + GROUPBOX " IMPORTANT INFORMATION ", IDC_WARNTEXT1, 115, 70, 195, 90, BS_CENTER + LTEXT "ReactOS is in Alpha stage: it is not feature- complete and is \ +under heavy development. It is recommended to use it only for \ +evaluation and testing and not as your daily-usage OS.\n\ +It may corrupt your data or damage your hardware.", IDC_WARNTEXT2, 120, 80, 185, 50, SS_CENTER + LTEXT "Backup your data or test on a secondary computer \ +if you attempt to run ReactOS on real hardware.", IDC_WARNTEXT3, 120, 130, 185, 27, SS_CENTER +//// + LTEXT "Klikoni Tjetër për të vazhduar me Ndërtimin.", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 diff --git a/base/setup/reactos/lang/tr-TR.rc b/base/setup/reactos/lang/tr-TR.rc index 3cba7f7a35f..af9ee0579e2 100644 --- a/base/setup/reactos/lang/tr-TR.rc +++ b/base/setup/reactos/lang/tr-TR.rc @@ -14,9 +14,19 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Kur" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ReactOS Kur Sihirbazına'na Hoş Geldiniz", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "Bu CD'den, henüz ReactOS'u doğrudan kuramazsınız. Lütfen ReactOS'u kurmak için bu CD'den bilgisayarınızı yeniden başlatınız.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Kurulumdan çıkmak için İptal'e tıklayınız.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "ReactOS Kurulum Sihirbazı'na hoşgeldiniz", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "This wizard will install or upgrade ReactOS on your computer, \ +and prepare the second part of the setup.", IDC_STATIC, 115, 40, 195, 27 +//// + GROUPBOX " IMPORTANT INFORMATION ", IDC_WARNTEXT1, 115, 70, 195, 90, BS_CENTER + LTEXT "ReactOS is in Alpha stage: it is not feature- complete and is \ +under heavy development. It is recommended to use it only for \ +evaluation and testing and not as your daily-usage OS.\n\ +It may corrupt your data or damage your hardware.", IDC_WARNTEXT2, 120, 80, 185, 50, SS_CENTER + LTEXT "Backup your data or test on a secondary computer \ +if you attempt to run ReactOS on real hardware.", IDC_WARNTEXT3, 120, 130, 185, 27, SS_CENTER +//// + LTEXT "Kuruluma devam etmek için İleri'ye tıklayınız.", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 diff --git a/base/setup/reactos/lang/uk-UA.rc b/base/setup/reactos/lang/uk-UA.rc index 3ddeee167a2..a83ada50cca 100644 --- a/base/setup/reactos/lang/uk-UA.rc +++ b/base/setup/reactos/lang/uk-UA.rc @@ -16,8 +16,18 @@ CAPTION "Встановлення ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Вас вітає програма встановлення ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "Ви не можете встановити ReactOS прямо з цього CD! Будь ласка перезапустіть Ваш комп’ютер з цього CD для того, щоб встановити ReactOS.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Натисніть кнопку Завершити для виходу.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "This wizard will install or upgrade ReactOS on your computer, \ +and prepare the second part of the setup.", IDC_STATIC, 115, 40, 195, 27 +//// + GROUPBOX " IMPORTANT INFORMATION ", IDC_WARNTEXT1, 115, 70, 195, 90, BS_CENTER + LTEXT "ReactOS is in Alpha stage: it is not feature- complete and is \ +under heavy development. It is recommended to use it only for \ +evaluation and testing and not as your daily-usage OS.\n\ +It may corrupt your data or damage your hardware.", IDC_WARNTEXT2, 120, 80, 185, 50, SS_CENTER + LTEXT "Backup your data or test on a secondary computer \ +if you attempt to run ReactOS on real hardware.", IDC_WARNTEXT3, 120, 130, 185, 27, SS_CENTER +//// + LTEXT "Натисніть ""Далі"", щоб продовжити встановлення.", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 diff --git a/base/setup/reactos/lang/vi-VN.rc b/base/setup/reactos/lang/vi-VN.rc index b082e0e475f..3d007b3447f 100644 --- a/base/setup/reactos/lang/vi-VN.rc +++ b/base/setup/reactos/lang/vi-VN.rc @@ -8,8 +8,18 @@ CAPTION "Cài đặt ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Chào mừng đến với Trình hướng dẫn thiết lập ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "Bạn chưa thể cài đặt ReactOS trực tiếp tư đĩa CD này được! Xin hãy khởi động lại máy tính của bạn từ đĩa CD trên để cài đặt ReactOS.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Ấn Hoàn tất để thoát trình Thiết lập.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "This wizard will install or upgrade ReactOS on your computer, \ +and prepare the second part of the setup.", IDC_STATIC, 115, 40, 195, 27 +//// + GROUPBOX " IMPORTANT INFORMATION ", IDC_WARNTEXT1, 115, 70, 195, 90, BS_CENTER + LTEXT "ReactOS is in Alpha stage: it is not feature- complete and is \ +under heavy development. It is recommended to use it only for \ +evaluation and testing and not as your daily-usage OS.\n\ +It may corrupt your data or damage your hardware.", IDC_WARNTEXT2, 120, 80, 185, 50, SS_CENTER + LTEXT "Backup your data or test on a secondary computer \ +if you attempt to run ReactOS on real hardware.", IDC_WARNTEXT3, 120, 130, 185, 27, SS_CENTER +//// + LTEXT "Click Next to continue with Setup.", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 diff --git a/base/setup/reactos/lang/zh-CN.rc b/base/setup/reactos/lang/zh-CN.rc index dc0cc6494b5..7b7f56da423 100644 --- a/base/setup/reactos/lang/zh-CN.rc +++ b/base/setup/reactos/lang/zh-CN.rc @@ -8,8 +8,18 @@ CAPTION "ReactOS 安装程序" FONT 9, "宋体" BEGIN LTEXT "欢迎使用 ReactOS 安装程序", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "您暂时不能直接从此 CD 安装 ReactOS！请重新启动并从 CD 引导您的电脑以便安装 ReactOS。", IDC_STATIC, 115, 40, 195, 100 - LTEXT "点击完成退出安装。", IDC_STATIC, 115, 169, 195, 17 + LTEXT "This wizard will install or upgrade ReactOS on your computer, \ +and prepare the second part of the setup.", IDC_STATIC, 115, 40, 195, 27 +//// + GROUPBOX " IMPORTANT INFORMATION ", IDC_WARNTEXT1, 115, 70, 195, 90, BS_CENTER + LTEXT "ReactOS is in Alpha stage: it is not feature- complete and is \ +under heavy development. It is recommended to use it only for \ +evaluation and testing and not as your daily-usage OS.\n\ +It may corrupt your data or damage your hardware.", IDC_WARNTEXT2, 120, 80, 185, 50, SS_CENTER + LTEXT "Backup your data or test on a secondary computer \ +if you attempt to run ReactOS on real hardware.", IDC_WARNTEXT3, 120, 130, 185, 27, SS_CENTER +//// + LTEXT "若要继续，请单击“下一步”。", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 diff --git a/base/setup/reactos/lang/zh-HK.rc b/base/setup/reactos/lang/zh-HK.rc index 689cc84cb68..bc93f406c74 100644 --- a/base/setup/reactos/lang/zh-HK.rc +++ b/base/setup/reactos/lang/zh-HK.rc @@ -16,8 +16,18 @@ CAPTION "ReactOS 安裝程式" FONT 9, "新細明體" BEGIN LTEXT "歡迎使用 ReactOS 安裝程式精靈", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "您目前不能直接從這個 CD 安裝 ReactOS！\n請重新開機並從 CD 啟動您的電腦以安裝 ReactOS。", IDC_STATIC, 115, 40, 195, 100 - LTEXT "按［完成］退出安裝程式。", IDC_STATIC, 115, 169, 195, 17 + LTEXT "This wizard will install or upgrade ReactOS on your computer, \ +and prepare the second part of the setup.", IDC_STATIC, 115, 40, 195, 27 +//// + GROUPBOX " IMPORTANT INFORMATION ", IDC_WARNTEXT1, 115, 70, 195, 90, BS_CENTER + LTEXT "ReactOS is in Alpha stage: it is not feature- complete and is \ +under heavy development. It is recommended to use it only for \ +evaluation and testing and not as your daily-usage OS.\n\ +It may corrupt your data or damage your hardware.", IDC_WARNTEXT2, 120, 80, 185, 50, SS_CENTER + LTEXT "Backup your data or test on a secondary computer \ +if you attempt to run ReactOS on real hardware.", IDC_WARNTEXT3, 120, 130, 185, 27, SS_CENTER +//// + LTEXT "按［下一步］繼續安裝程式。", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 diff --git a/base/setup/reactos/lang/zh-TW.rc b/base/setup/reactos/lang/zh-TW.rc index 91639246353..704248d5c39 100644 --- a/base/setup/reactos/lang/zh-TW.rc +++ b/base/setup/reactos/lang/zh-TW.rc @@ -17,8 +17,18 @@ CAPTION "ReactOS 安裝程式" FONT 9, "新細明體" BEGIN LTEXT "歡迎使用 ReactOS 安裝程式精靈", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "您目前不能直接從這個 CD 安裝 ReactOS！請重新開機並從 CD 啟動您的電腦以便安裝 ReactOS。", IDC_STATIC, 115, 40, 195, 100 - LTEXT "按［完成］退出安裝程式。", IDC_STATIC, 115, 169, 195, 17 + LTEXT "This wizard will install or upgrade ReactOS on your computer, \ +and prepare the second part of the setup.", IDC_STATIC, 115, 40, 195, 27 +//// + GROUPBOX " IMPORTANT INFORMATION ", IDC_WARNTEXT1, 115, 70, 195, 90, BS_CENTER + LTEXT "ReactOS is in Alpha stage: it is not feature- complete and is \ +under heavy development. It is recommended to use it only for \ +evaluation and testing and not as your daily-usage OS.\n\ +It may corrupt your data or damage your hardware.", IDC_WARNTEXT2, 120, 80, 185, 50, SS_CENTER + LTEXT "Backup your data or test on a secondary computer \ +if you attempt to run ReactOS on real hardware.", IDC_WARNTEXT3, 120, 130, 185, 27, SS_CENTER +//// + LTEXT "按［下一步］繼續安裝程式。", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 diff --git a/base/setup/reactos/reactos.c b/base/setup/reactos/reactos.c index 8bdb3df629c..64f864d4dfa 100644 --- a/base/setup/reactos/reactos.c +++ b/base/setup/reactos/reactos.c @@ -79,29 +79,50 @@ CenterWindow(HWND hWnd) SWP_NOSIZE); } +/** + * @brief + * Create a bold font derived from the provided font. + **/ static HFONT -CreateTitleFont(VOID) +CreateBoldFont( + _In_opt_ HFONT hOrigFont, + _In_opt_ INT PointSize) { - NONCLIENTMETRICS ncm; - LOGFONT LogFont; - HDC hdc; - INT FontSize; - HFONT hFont; - - ncm.cbSize = sizeof(NONCLIENTMETRICS); - SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); - - LogFont = ncm.lfMessageFont; - LogFont.lfWeight = FW_BOLD; - _tcscpy(LogFont.lfFaceName, _T("MS Shell Dlg")); - - hdc = GetDC(NULL); - FontSize = 12; - LogFont.lfHeight = 0 - GetDeviceCaps (hdc, LOGPIXELSY) * FontSize / 72; - hFont = CreateFontIndirect(&LogFont); - ReleaseDC(NULL, hdc); - - return hFont; + LOGFONTW lf = {0}; + + if (hOrigFont) + { + GetObjectW(hOrigFont, sizeof(lf), &lf); + } + else + { + NONCLIENTMETRICSW ncm; + ncm.cbSize = sizeof(ncm); + SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); + lf = ncm.lfMessageFont; + } + + /* Make the font bold, keeping the other attributes */ + lf.lfWeight = FW_BOLD; + + /* Determine the font height (logical units) if necessary */ + if (PointSize) + { + HDC hdc = GetDC(NULL); + lf.lfHeight = -MulDiv(PointSize, GetDeviceCaps(hdc, LOGPIXELSY), 72); + // lf.lfWidth = 0; + ReleaseDC(NULL, hdc); + } + + return CreateFontIndirect(&lf); +} + +static inline HFONT +CreateTitleFont( + _In_opt_ HFONT hOrigFont) +{ + /* Title font is 12pt bold */ + return CreateBoldFont(hOrigFont, 12); } INT @@ -307,11 +328,13 @@ StartDlgProc( SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pSetupData); /* Set title font */ - SendDlgItemMessage(hwndDlg, - IDC_STARTTITLE, - WM_SETFONT, - (WPARAM)pSetupData->hTitleFont, - (LPARAM)TRUE); + SetDlgItemFont(hwndDlg, IDC_STARTTITLE, pSetupData->hTitleFont, TRUE); + + // TEMPTEMP: Set the ReactOS-Alpha information in bold. + // TODO: Remove once we reach 0.5/Beta :) + SetDlgItemFont(hwndDlg, IDC_WARNTEXT1, pSetupData->hBoldFont, TRUE); + SetDlgItemFont(hwndDlg, IDC_WARNTEXT2, pSetupData->hBoldFont, TRUE); + SetDlgItemFont(hwndDlg, IDC_WARNTEXT3, pSetupData->hBoldFont, TRUE); /* Center the wizard window */ CenterWindow(GetParent(hwndDlg)); @@ -325,8 +348,21 @@ StartDlgProc( switch (lpnm->code) { case PSN_SETACTIVE: + { + /* Only "Next" and "Cancel" for the first page and hide "Back" */ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); + // PropSheet_ShowWizButtons(GetParent(hwndDlg), 0, PSWIZB_BACK); + ShowDlgItem(GetParent(hwndDlg), ID_WIZBACK, SW_HIDE); break; + } + + case PSN_KILLACTIVE: + { + /* Show "Back" button */ + // PropSheet_ShowWizButtons(GetParent(hwndDlg), PSWIZB_BACK, PSWIZB_BACK); + ShowDlgItem(GetParent(hwndDlg), ID_WIZBACK, SW_SHOW); + break; + } default: break; @@ -2282,11 +2318,7 @@ RestartDlgProc( SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pSetupData); /* Set title font */ - SendDlgItemMessage(hwndDlg, - IDC_FINISHTITLE, - WM_SETFONT, - (WPARAM)pSetupData->hTitleFont, - (LPARAM)TRUE); + SetDlgItemFont(hwndDlg, IDC_FINISHTITLE, pSetupData->hTitleFont, TRUE); break; case WM_TIMER: @@ -2864,8 +2896,9 @@ _tWinMain(HINSTANCE hInst, // RegisterTreeListClass(hInst); TreeListRegister(hInst); - /* Create title font */ - SetupData.hTitleFont = CreateTitleFont(); + /* Create the title and bold fonts */ + SetupData.hTitleFont = CreateTitleFont(NULL); + SetupData.hBoldFont = CreateBoldFont(NULL, 0); if (!SetupData.bUnattend) { @@ -2976,8 +3009,10 @@ _tWinMain(HINSTANCE hInst, CloseHandle(SetupData.hHaltInstallEvent); SetupData.hHaltInstallEvent = NULL; + if (SetupData.hBoldFont) + DeleteFont(SetupData.hBoldFont); if (SetupData.hTitleFont) - DeleteObject(SetupData.hTitleFont); + DeleteFont(SetupData.hTitleFont); /* Unregister the TreeList control */ // UnregisterTreeListClass(hInst); diff --git a/base/setup/reactos/reactos.h b/base/setup/reactos/reactos.h index 286a303034c..9d8aecc0439 100644 --- a/base/setup/reactos/reactos.h +++ b/base/setup/reactos/reactos.h @@ -51,6 +51,9 @@ #define ShowDlgItem(hDlg, nID, nCmdShow) \ ShowWindow(GetDlgItem((hDlg), (nID)), (nCmdShow)) +#define SetDlgItemFont(hDlg, nID, hFont, bRedraw) \ + SetWindowFont(GetDlgItem((hDlg), (nID)), (hFont), (bRedraw)) + /* These are public names and values determined from MFC, and compatible with Windows */ // Property Sheet control id's (determined with Spy++) #define IDC_TAB_CONTROL 0x3020 @@ -134,6 +137,7 @@ typedef struct _SETUPDATA BOOL bUnattend; HFONT hTitleFont; + HFONT hBoldFont; HANDLE hInstallThread; HANDLE hHaltInstallEvent; diff --git a/base/setup/reactos/resource.h b/base/setup/reactos/resource.h index a54f4035f8c..c1c47e0cda8 100644 --- a/base/setup/reactos/resource.h +++ b/base/setup/reactos/resource.h @@ -17,6 +17,9 @@ /* Dialogs */ #define IDD_STARTPAGE 2000 #define IDC_STARTTITLE 2001 +#define IDC_WARNTEXT1 2002 // TEMPTEMP: TODO: Remove once we reach 0.5/Beta :) +#define IDC_WARNTEXT2 2003 // TEMPTEMP: TODO: Remove once we reach 0.5/Beta :) +#define IDC_WARNTEXT3 2004 // TEMPTEMP: TODO: Remove once we reach 0.5/Beta :) #define IDD_TYPEPAGE 2010 #define IDC_INSTALL 2011

1 0

[reactos] 01/01: [SHELL32] Fix BrowseForFolder expanding a folder containing a zip (#7585)
by Denis Robert 30 Dec '24

30 Dec '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=894e5cddd69ad95b27c12… commit 894e5cddd69ad95b27c12646533f4a0eccaa7b1d Author: Denis Robert <denis.beru(a)hotmail.fr> AuthorDate: Mon Dec 30 14:14:44 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 30 16:14:44 2024 +0300 [SHELL32] Fix BrowseForFolder expanding a folder containing a zip (#7585) Commit 325d74c30f3 (PR #7437) introduced a side effect that made impossible to expand a folder when it contained both a ZIP file and subfolders. Fix this by ignoring the return value of BrFolder_InsertItem and free the pidlTemp pointer explicitly in all cases. CORE-19955 CORE-19751 --- dll/win32/shell32/brfolder.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/brfolder.cpp b/dll/win32/shell32/brfolder.cpp index 7b211939ef1..705809bb930 100644 --- a/dll/win32/shell32/brfolder.cpp +++ b/dll/win32/shell32/brfolder.cpp @@ -408,8 +408,8 @@ BrFolder_Expand( ULONG ulFetched; while (S_OK == pEnum->Next(1, &pidlTemp, &ulFetched)) { - if (!BrFolder_InsertItem(info, lpsf, pidlTemp, pidlFull, hParent)) - break; + /* Ignore return value of BrFolder_InsertItem to avoid incomplete folder listing */ + BrFolder_InsertItem(info, lpsf, pidlTemp, pidlFull, hParent); pidlTemp.Free(); // Finally, free the pidl that the shell gave us... }

1 0

[reactos] 01/01: [WKSSVC] NetrWkstaGetInfo Level 102: Return the number of currently logged-on users
by Eric Kohl 29 Dec '24

29 Dec '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=26f8fa7ade5c09c6e313b… commit 26f8fa7ade5c09c6e313b0b695497b1f8a9c75ac Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Dec 29 21:14:40 2024 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Dec 29 21:14:40 2024 +0100 [WKSSVC] NetrWkstaGetInfo Level 102: Return the number of currently logged-on users --- base/services/wkssvc/rpcserver.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/base/services/wkssvc/rpcserver.c b/base/services/wkssvc/rpcserver.c index 0c50e494f33..fe39af081bc 100644 --- a/base/services/wkssvc/rpcserver.c +++ b/base/services/wkssvc/rpcserver.c @@ -141,6 +141,7 @@ NetrWkstaGetInfo( LSA_OBJECT_ATTRIBUTES ObjectAttributes; LSA_HANDLE PolicyHandle; PPOLICY_PRIMARY_DOMAIN_INFO DomainInfo = NULL; + ULONG LoggedOnUsers; NTSTATUS NtStatus; DWORD dwResult = NERR_Success; @@ -173,6 +174,33 @@ NetrWkstaGetInfo( return LsaNtStatusToWinError(NtStatus); } + if (Level == 102) + { + MSV1_0_ENUMUSERS_REQUEST EnumRequest; + PMSV1_0_ENUMUSERS_RESPONSE EnumResponseBuffer = NULL; + DWORD EnumResponseBufferSize = 0; + NTSTATUS ProtocolStatus; + + /* enumerate all currently logged-on users */ + EnumRequest.MessageType = MsV1_0EnumerateUsers; + NtStatus = LsaCallAuthenticationPackage(LsaHandle, + LsaAuthenticationPackage, + &EnumRequest, + sizeof(EnumRequest), + (PVOID*)&EnumResponseBuffer, + &EnumResponseBufferSize, + &ProtocolStatus); + if (!NT_SUCCESS(NtStatus)) + { + dwResult = RtlNtStatusToDosError(NtStatus); + goto done; + } + + LoggedOnUsers = EnumResponseBuffer->NumberOfLoggedOnUsers; + + LsaFreeReturnBuffer(EnumResponseBuffer); + } + switch (Level) { case 100: @@ -252,7 +280,7 @@ NetrWkstaGetInfo( if (pWkstaInfo->WkstaInfo102.wki102_lanroot != NULL) wcscpy(pWkstaInfo->WkstaInfo102.wki102_lanroot, pszLanRoot); - pWkstaInfo->WkstaInfo102.wki102_logged_on_users = 1; /* FIXME */ + pWkstaInfo->WkstaInfo102.wki102_logged_on_users = LoggedOnUsers; *WkstaInfo = pWkstaInfo; break; @@ -276,6 +304,7 @@ NetrWkstaGetInfo( break; } +done: if (DomainInfo != NULL) LsaFreeMemory(DomainInfo);

1 0

[reactos] 01/01: [SHELL32] SHELL_FindExecutable: import new path handling code from Wine 10.0-rc3 (#7588)
by Oleg Dubinskiy 29 Dec '24

29 Dec '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=42d5dfd3de5e65da61374… commit 42d5dfd3de5e65da6137413c98b5ab0cbc11325e Author: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> AuthorDate: Sun Dec 29 17:25:43 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 29 17:25:43 2024 +0100 [SHELL32] SHELL_FindExecutable: import new path handling code from Wine 10.0-rc3 (#7588) https://gitlab.winehq.org/wine/wine/-/blob/wine-10.0-rc3/dlls/shell32/shlex… https://gitlab.winehq.org/wine/wine/-/commit/0bad544aab9e2c9ee93bbabac0386e… Import new path handling code from Wine 10.0-rc3. It uses PathResolveW(), which was hacked in ReactOS for a long time but has been implemented properly starting from 0.4.15-dev. So now it should work correctly, and we don't need to use SearchPathW() anymore. This fixes a heap corruption from shell32.dll when launching SpotifyXP 2.0.3 Beta and trying to login with Spotify credentials via OAuth login method. Also it fixes the same heap corruption when pressing Update button in CCleaner 5.39.6399. CORE-14670, CORE-19953 --- dll/win32/shell32/shlexec.cpp | 61 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 51 insertions(+), 10 deletions(-) diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp index 6af8844632e..85c7feab0ff 100644 --- a/dll/win32/shell32/shlexec.cpp +++ b/dll/win32/shell32/shlexec.cpp @@ -756,8 +756,10 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb, WCHAR wBuffer[256]; /* Used to GetProfileString */ UINT retval = SE_ERR_NOASSOC; WCHAR *tok; /* token pointer */ - WCHAR xlpFile[256]; /* result of SearchPath */ + WCHAR xlpFile[MAX_PATH]; /* result of SearchPath */ DWORD attribs; /* file attributes */ + WCHAR curdir[MAX_PATH]; + const WCHAR *search_paths[3] = {0}; TRACE("%s\n", debugstr_w(lpFile)); @@ -782,17 +784,56 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb, return 33; } - if (SearchPathW(lpPath, lpFile, L".exe", ARRAY_SIZE(xlpFile), xlpFile, NULL)) + GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir); + if (!PathIsFileSpecW(lpFile)) { - TRACE("SearchPathW returned non-zero\n"); - lpFile = xlpFile; - /* The file was found in the application-supplied default directory (or the system search path) */ + BOOL found = FALSE; + if (lpPath && *lpPath) + { + TRACE("lpPath %s\n", debugstr_w(lpPath)); + PathCombineW(xlpFile, lpPath, lpFile); + if (PathFileExistsDefExtW(xlpFile, WHICH_DEFAULT | WHICH_OPTIONAL) || PathFileExistsW(xlpFile)) + { + GetFullPathNameW(xlpFile, ARRAY_SIZE(xlpFile), xlpFile, NULL); + found = TRUE; + } + } + if (!found) + { + lstrcpyW(xlpFile, lpFile); + if (PathFileExistsDefExtW(xlpFile, WHICH_DEFAULT | WHICH_OPTIONAL) || PathFileExistsW(xlpFile)) + { + GetFullPathNameW(xlpFile, ARRAY_SIZE(xlpFile), xlpFile, NULL); + found = TRUE; + } + } + if (found) + { + lpFile = xlpFile; + lstrcpyW(lpResult, xlpFile); + } + else + xlpFile[0] = '\0'; } - else if (lpPath && SearchPathW(NULL, lpFile, L".exe", ARRAY_SIZE(xlpFile), xlpFile, NULL)) + else { - TRACE("SearchPathW returned non-zero\n"); - lpFile = xlpFile; - /* The file was found in one of the directories in the system-wide search path */ + if (lpPath && *lpPath) + { + search_paths[0] = lpPath; + search_paths[1] = curdir; + } + else + search_paths[0] = curdir; + lstrcpyW(xlpFile, lpFile); + if (PathResolveW(xlpFile, search_paths, PRF_TRYPROGRAMEXTENSIONS | PRF_VERIFYEXISTS)) + { + TRACE("PathResolveW returned non-zero\n"); + lpFile = xlpFile; + lstrcpyW(lpResult, xlpFile); + /* The file was found in lpPath or one of the directories in the system-wide search path */ + } + else + xlpFile[0] = '\0'; } attribs = GetFileAttributesW(lpFile); @@ -932,7 +973,7 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb, } } - TRACE("returning %s\n", debugstr_w(lpResult)); + TRACE("returning path %s, retval %d\n", debugstr_w(lpResult), retval); return retval; }

1 0

[reactos] 01/01: [SHELL32] ShellExecuteW must call ShellExecuteExW (#7587)
by Whindmar Saksit 29 Dec '24

29 Dec '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fd41270d6db3bcd2fafe8… commit fd41270d6db3bcd2fafe84d49061a4f5f1874428 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sun Dec 29 15:22:30 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 29 15:22:30 2024 +0100 [SHELL32] ShellExecuteW must call ShellExecuteExW (#7587) Adds the DDEWAIT/NOASYNC flag unless compatibility info says otherwise. CORE-19952 --- dll/win32/shell32/shlexec.cpp | 9 +++++---- sdk/include/reactos/shlwapi_undoc.h | 3 +++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp index 68befd32925..6af8844632e 100644 --- a/dll/win32/shell32/shlexec.cpp +++ b/dll/win32/shell32/shlexec.cpp @@ -2341,6 +2341,8 @@ HINSTANCE WINAPI ShellExecuteA(HWND hWnd, LPCSTR lpVerb, LPCSTR lpFile, sei.dwHotKey = 0; sei.hProcess = 0; + if (!(SHGetAppCompatFlags(SHACF_WIN95SHLEXEC) & SHACF_WIN95SHLEXEC)) + sei.fMask |= SEE_MASK_NOASYNC; ShellExecuteExA(&sei); return sei.hInstApp; } @@ -2479,9 +2481,6 @@ ShellExecuteExW(LPSHELLEXECUTEINFOW sei) /************************************************************************* * ShellExecuteW [SHELL32.294] - * from shellapi.h - * WINSHELLAPI HINSTANCE APIENTRY ShellExecuteW(HWND hwnd, LPCWSTR lpVerb, - * LPCWSTR lpFile, LPCWSTR lpParameters, LPCWSTR lpDirectory, INT nShowCmd); */ HINSTANCE WINAPI ShellExecuteW(HWND hwnd, LPCWSTR lpVerb, LPCWSTR lpFile, LPCWSTR lpParameters, LPCWSTR lpDirectory, INT nShowCmd) @@ -2503,7 +2502,9 @@ HINSTANCE WINAPI ShellExecuteW(HWND hwnd, LPCWSTR lpVerb, LPCWSTR lpFile, sei.dwHotKey = 0; sei.hProcess = 0; - SHELL_execute(&sei, SHELL_ExecuteW); + if (!(SHGetAppCompatFlags(SHACF_WIN95SHLEXEC) & SHACF_WIN95SHLEXEC)) + sei.fMask |= SEE_MASK_NOASYNC; + ShellExecuteExW(&sei); return sei.hInstApp; } diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index def0725cdd2..c3ffe8c93df 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -364,6 +364,9 @@ IContextMenu_Invoke( DWORD WINAPI SHGetObjectCompatFlags(IUnknown *pUnk, const CLSID *clsid); +#define SHACF_WIN95SHLEXEC 0x00000200 /* Geoff Chappell */ +DWORD WINAPI SHGetAppCompatFlags(DWORD dwMask); + /* * HACK! These functions are conflicting with <shobjidl.h> inline functions... * We provide a macro option SHLWAPI_ISHELLFOLDER_HELPERS for using these functions.

1 0

[reactos] 01/01: [MSV1_0] LsaApLogonTerminated: Delete the logged-on user from the logon list
by Eric Kohl 29 Dec '24

29 Dec '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a9e7d674278b3f50e7519… commit a9e7d674278b3f50e751998578484b1a7923990c Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Dec 29 12:17:55 2024 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Dec 29 12:17:55 2024 +0100 [MSV1_0] LsaApLogonTerminated: Delete the logged-on user from the logon list --- dll/win32/msv1_0/msv1_0.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dll/win32/msv1_0/msv1_0.c b/dll/win32/msv1_0/msv1_0.c index 35584bba37f..46d6bff6f55 100644 --- a/dll/win32/msv1_0/msv1_0.c +++ b/dll/win32/msv1_0/msv1_0.c @@ -1322,9 +1322,30 @@ LsaApInitializePackage(IN ULONG AuthenticationPackageId, */ VOID NTAPI -LsaApLogonTerminated(IN PLUID LogonId) +LsaApLogonTerminated( + _In_ PLUID LogonId) { + PLOGON_LIST_ENTRY LogonEntry; + TRACE("LsaApLogonTerminated()\n"); + + /* Remove the given logon entry from the list */ + LogonEntry = GetLogonByLogonId(LogonId); + if (LogonEntry != NULL) + { + RemoveEntryList(&LogonEntry->ListEntry); + + if (LogonEntry->UserName.Buffer) + RtlFreeHeap(RtlGetProcessHeap(), 0, LogonEntry->UserName.Buffer); + + if (LogonEntry->LogonDomainName.Buffer) + RtlFreeHeap(RtlGetProcessHeap(), 0, LogonEntry->LogonDomainName.Buffer); + + if (LogonEntry->LogonServer.Buffer) + RtlFreeHeap(RtlGetProcessHeap(), 0, LogonEntry->LogonServer.Buffer); + + RtlFreeHeap(RtlGetProcessHeap(), 0, LogonEntry); + } }

1 0

[reactos] 01/01: [WKSSVC][NETAPI32][IDL] Implement NetWkstaUserGetInfo using the workstation service
by Eric Kohl 28 Dec '24

28 Dec '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=45b008dd2318b1d3d5b8d… commit 45b008dd2318b1d3d5b8dfbe3be35a5c0425fbd6 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Dec 28 21:14:38 2024 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Dec 28 21:14:38 2024 +0100 [WKSSVC][NETAPI32][IDL] Implement NetWkstaUserGetInfo using the workstation service --- base/services/wkssvc/precomp.h | 3 + base/services/wkssvc/rpcserver.c | 196 ++++++++++++++++++++++++++++++++++++- dll/win32/netapi32/wksta.c | 146 --------------------------- dll/win32/netapi32/wksta_new.c | 12 +-- sdk/include/reactos/idl/wkssvc.idl | 13 ++- 5 files changed, 210 insertions(+), 160 deletions(-) diff --git a/base/services/wkssvc/precomp.h b/base/services/wkssvc/precomp.h index f2fbde4e433..71a60f4ea50 100644 --- a/base/services/wkssvc/precomp.h +++ b/base/services/wkssvc/precomp.h @@ -17,7 +17,10 @@ #include <ntsecapi.h> #include <ntmsv1_0.h> //#include <ntstatus.h> +#include <ndk/obfuncs.h> +#include <ndk/psfuncs.h> #include <ndk/rtlfuncs.h> +#include <ndk/sefuncs.h> #include <wkssvc_s.h> diff --git a/base/services/wkssvc/rpcserver.c b/base/services/wkssvc/rpcserver.c index 5088b48f6e9..0c50e494f33 100644 --- a/base/services/wkssvc/rpcserver.c +++ b/base/services/wkssvc/rpcserver.c @@ -77,6 +77,55 @@ void __RPC_USER midl_user_free(void __RPC_FAR * ptr) } +static +NET_API_STATUS +NetpGetClientLogonId( + _Out_ PLUID LogonId) +{ + HANDLE ThreadToken = NULL; + TOKEN_STATISTICS Statistics; + ULONG Length; + NTSTATUS NtStatus; + NET_API_STATUS ApiStatus = NERR_Success; + + ApiStatus = RpcImpersonateClient(NULL); + if (ApiStatus != NERR_Success) + return ApiStatus; + + NtStatus = NtOpenThreadToken(NtCurrentThread(), + TOKEN_QUERY, + TRUE, + &ThreadToken); + if (!NT_SUCCESS(NtStatus)) + { + ApiStatus = RtlNtStatusToDosError(NtStatus); + goto done; + } + + NtStatus = NtQueryInformationToken(ThreadToken, + TokenStatistics, + (PVOID)&Statistics, + sizeof(Statistics), + &Length); + if (!NT_SUCCESS(NtStatus)) + { + ApiStatus = RtlNtStatusToDosError(NtStatus); + goto done; + } + + FIXME("Client LUID: %lx\n", Statistics.AuthenticationId.LowPart); + RtlCopyLuid(LogonId, &Statistics.AuthenticationId); + +done: + if (ThreadToken != NULL) + NtClose(ThreadToken); + + RpcRevertToSelf(); + + return ApiStatus; +} + + /* Function 0 */ unsigned long __stdcall @@ -384,12 +433,149 @@ __stdcall NetrWkstaUserGetInfo( WKSSVC_IDENTIFY_HANDLE Unused, unsigned long Level, - LPWKSTA_USER_INFO UserInfo) -{ - FIXME("(%s, %d, %p)\n", debugstr_w(Unused), Level, UserInfo); + LPWKSTA_USER_INFO *UserInfo) +{ + MSV1_0_GETUSERINFO_REQUEST UserInfoRequest; + PMSV1_0_GETUSERINFO_RESPONSE UserInfoResponseBuffer = NULL; + DWORD UserInfoResponseBufferSize = 0; + NTSTATUS Status, ProtocolStatus; + LUID LogonId; + PWKSTA_USER_INFO pUserInfo; + DWORD dwResult = NERR_Success; - UNIMPLEMENTED; - return 0; + TRACE("NetrWkstaUserGetInfo(%s, %d, %p)\n", debugstr_w(Unused), Level, UserInfo); + + if (Unused != NULL) + return ERROR_INVALID_PARAMETER; + + if (Level > 1 && Level != 1101) + return ERROR_INVALID_LEVEL; + + if (Level != 1101) + { + dwResult = NetpGetClientLogonId(&LogonId); + if (dwResult != NERR_Success) + { + ERR("NetpGetClientLogonId() failed (%u)\n", dwResult); + return dwResult; + } + + TRACE("LogonId: 0x%08lx\n", LogonId.LowPart); + + UserInfoRequest.MessageType = MsV1_0GetUserInfo; + UserInfoRequest.LogonId = LogonId; + Status = LsaCallAuthenticationPackage(LsaHandle, + LsaAuthenticationPackage, + &UserInfoRequest, + sizeof(UserInfoRequest), + (PVOID*)&UserInfoResponseBuffer, + &UserInfoResponseBufferSize, + &ProtocolStatus); + TRACE("LsaCallAuthenticationPackage:MsV1_0GetUserInfo Status 0x%08lx ResponseBufferSize %lu\n", Status, UserInfoResponseBufferSize); + if (!NT_SUCCESS(Status)) + { + ERR("\n"); + return RtlNtStatusToDosError(Status); + } + + TRACE("UserName: %wZ\n", &UserInfoResponseBuffer->UserName); + TRACE("LogonDomain: %wZ\n", &UserInfoResponseBuffer->LogonDomainName); + TRACE("LogonServer: %wZ\n", &UserInfoResponseBuffer->LogonServer); + } + + switch (Level) + { + case 0: + pUserInfo = midl_user_allocate(sizeof(WKSTA_USER_INFO_0)); + if (pUserInfo == NULL) + { + ERR("\n"); + dwResult = ERROR_NOT_ENOUGH_MEMORY; + break; + } + + ZeroMemory(pUserInfo, sizeof(WKSTA_USER_INFO_0)); + + /* User Name */ + pUserInfo->UserInfo0.wkui0_username = midl_user_allocate(UserInfoResponseBuffer->UserName.Length + sizeof(WCHAR)); + if (pUserInfo->UserInfo0.wkui0_username == NULL) + { + ERR("\n"); + dwResult = ERROR_NOT_ENOUGH_MEMORY; + break; + } + + ZeroMemory(pUserInfo->UserInfo0.wkui0_username, UserInfoResponseBuffer->UserName.Length + sizeof(WCHAR)); + CopyMemory(pUserInfo->UserInfo0.wkui0_username, UserInfoResponseBuffer->UserName.Buffer, UserInfoResponseBuffer->UserName.Length); + + *UserInfo = pUserInfo; + break; + + case 1: + pUserInfo = midl_user_allocate(sizeof(WKSTA_USER_INFO_1)); + if (pUserInfo == NULL) + { + ERR("\n"); + dwResult = ERROR_NOT_ENOUGH_MEMORY; + break; + } + + ZeroMemory(pUserInfo, sizeof(WKSTA_USER_INFO_1)); + + /* User Name */ + pUserInfo->UserInfo1.wkui1_username = midl_user_allocate(UserInfoResponseBuffer->UserName.Length + sizeof(WCHAR)); + if (pUserInfo->UserInfo1.wkui1_username == NULL) + { + ERR("\n"); + dwResult = ERROR_NOT_ENOUGH_MEMORY; + break; + } + + ZeroMemory(pUserInfo->UserInfo1.wkui1_username, UserInfoResponseBuffer->UserName.Length + sizeof(WCHAR)); + CopyMemory(pUserInfo->UserInfo1.wkui1_username, UserInfoResponseBuffer->UserName.Buffer, UserInfoResponseBuffer->UserName.Length); + + /* Logon Domain Name */ + pUserInfo->UserInfo1.wkui1_logon_domain = midl_user_allocate(UserInfoResponseBuffer->LogonDomainName.Length + sizeof(WCHAR)); + if (pUserInfo->UserInfo1.wkui1_logon_domain == NULL) + { + ERR("\n"); + dwResult = ERROR_NOT_ENOUGH_MEMORY; + break; + } + + ZeroMemory(pUserInfo->UserInfo1.wkui1_logon_domain, UserInfoResponseBuffer->LogonDomainName.Length + sizeof(WCHAR)); + CopyMemory(pUserInfo->UserInfo1.wkui1_logon_domain, UserInfoResponseBuffer->LogonDomainName.Buffer, UserInfoResponseBuffer->LogonDomainName.Length); + + /* FIXME: wkui1_oth_domains */ + + /* Logon Server */ + pUserInfo->UserInfo1.wkui1_logon_server = midl_user_allocate(UserInfoResponseBuffer->LogonServer.Length + sizeof(WCHAR)); + if (pUserInfo->UserInfo1.wkui1_logon_server == NULL) + { + ERR("\n"); + dwResult = ERROR_NOT_ENOUGH_MEMORY; + break; + } + + ZeroMemory(pUserInfo->UserInfo1.wkui1_logon_server, UserInfoResponseBuffer->LogonServer.Length + sizeof(WCHAR)); + CopyMemory(pUserInfo->UserInfo1.wkui1_logon_server, UserInfoResponseBuffer->LogonServer.Buffer, UserInfoResponseBuffer->LogonServer.Length); + + *UserInfo = pUserInfo; + break; + + case 1101: + /* FIXME: wkui1101_oth_domains */ + break; + + default: + ERR("\n"); + break; + } + + if (UserInfoResponseBuffer) + LsaFreeReturnBuffer(UserInfoResponseBuffer); + + return dwResult; } diff --git a/dll/win32/netapi32/wksta.c b/dll/win32/netapi32/wksta.c index 8890d7ce7e5..d09c5cb201c 100644 --- a/dll/win32/netapi32/wksta.c +++ b/dll/win32/netapi32/wksta.c @@ -273,152 +273,6 @@ NetWkstaTransportEnum(LMSTR ServerName, DWORD level, PBYTE* pbuf, } -/************************************************************ - * NetWkstaUserGetInfo (NETAPI32.@) - */ -NET_API_STATUS WINAPI NetWkstaUserGetInfo(LMSTR reserved, DWORD level, - PBYTE* bufptr) -{ - NET_API_STATUS nastatus; - - TRACE("(%s, %d, %p)\n", debugstr_w(reserved), level, bufptr); - switch (level) - { - case 0: - { - PWKSTA_USER_INFO_0 ui; - DWORD dwSize = UNLEN + 1; - - /* set up buffer */ - nastatus = NetApiBufferAllocate(sizeof(WKSTA_USER_INFO_0) + dwSize * sizeof(WCHAR), - (LPVOID *) bufptr); - if (nastatus != NERR_Success) - return ERROR_NOT_ENOUGH_MEMORY; - - ui = (PWKSTA_USER_INFO_0) *bufptr; - ui->wkui0_username = (LMSTR) (*bufptr + sizeof(WKSTA_USER_INFO_0)); - - /* get data */ - if (!GetUserNameW(ui->wkui0_username, &dwSize)) - { - NetApiBufferFree(ui); - return ERROR_NOT_ENOUGH_MEMORY; - } - else { - nastatus = NetApiBufferReallocate( - *bufptr, sizeof(WKSTA_USER_INFO_0) + - (lstrlenW(ui->wkui0_username) + 1) * sizeof(WCHAR), - (LPVOID *) bufptr); - if (nastatus != NERR_Success) - { - NetApiBufferFree(ui); - return nastatus; - } - ui = (PWKSTA_USER_INFO_0) *bufptr; - ui->wkui0_username = (LMSTR) (*bufptr + sizeof(WKSTA_USER_INFO_0)); - } - break; - } - - case 1: - { - PWKSTA_USER_INFO_1 ui; - PWKSTA_USER_INFO_0 ui0; - LSA_OBJECT_ATTRIBUTES ObjectAttributes; - LSA_HANDLE PolicyHandle; - PPOLICY_ACCOUNT_DOMAIN_INFO DomainInfo; - NTSTATUS NtStatus; - - /* sizes of the field buffers in WCHARS */ - int username_sz, logon_domain_sz, oth_domains_sz, logon_server_sz; - - FIXME("Level 1 processing is partially implemented\n"); - oth_domains_sz = 1; - logon_server_sz = 1; - - /* get some information first to estimate size of the buffer */ - ui0 = NULL; - nastatus = NetWkstaUserGetInfo(NULL, 0, (PBYTE *) &ui0); - if (nastatus != NERR_Success) - return nastatus; - username_sz = lstrlenW(ui0->wkui0_username) + 1; - - ZeroMemory(&ObjectAttributes, sizeof(ObjectAttributes)); - NtStatus = LsaOpenPolicy(NULL, &ObjectAttributes, - POLICY_VIEW_LOCAL_INFORMATION, - &PolicyHandle); - if (NtStatus != STATUS_SUCCESS) - { - TRACE("LsaOpenPolicyFailed with NT status %x\n", - LsaNtStatusToWinError(NtStatus)); - NetApiBufferFree(ui0); - return ERROR_NOT_ENOUGH_MEMORY; - } - LsaQueryInformationPolicy(PolicyHandle, PolicyAccountDomainInformation, - (PVOID*) &DomainInfo); - logon_domain_sz = lstrlenW(DomainInfo->DomainName.Buffer) + 1; - LsaClose(PolicyHandle); - - /* set up buffer */ - nastatus = NetApiBufferAllocate(sizeof(WKSTA_USER_INFO_1) + - (username_sz + logon_domain_sz + - oth_domains_sz + logon_server_sz) * sizeof(WCHAR), - (LPVOID *) bufptr); - if (nastatus != NERR_Success) { - NetApiBufferFree(ui0); - return nastatus; - } - ui = (WKSTA_USER_INFO_1 *) *bufptr; - ui->wkui1_username = (LMSTR) (*bufptr + sizeof(WKSTA_USER_INFO_1)); - ui->wkui1_logon_domain = (LMSTR) ( - ((PBYTE) ui->wkui1_username) + username_sz * sizeof(WCHAR)); - ui->wkui1_oth_domains = (LMSTR) ( - ((PBYTE) ui->wkui1_logon_domain) + - logon_domain_sz * sizeof(WCHAR)); - ui->wkui1_logon_server = (LMSTR) ( - ((PBYTE) ui->wkui1_oth_domains) + - oth_domains_sz * sizeof(WCHAR)); - - /* get data */ - lstrcpyW(ui->wkui1_username, ui0->wkui0_username); - NetApiBufferFree(ui0); - - lstrcpynW(ui->wkui1_logon_domain, DomainInfo->DomainName.Buffer, - logon_domain_sz); - LsaFreeMemory(DomainInfo); - - /* FIXME. Not implemented. Populated with empty strings */ - ui->wkui1_oth_domains[0] = 0; - ui->wkui1_logon_server[0] = 0; - break; - } - case 1101: - { - PWKSTA_USER_INFO_1101 ui; - DWORD dwSize = 1; - - FIXME("Stub. Level 1101 processing is not implemented\n"); - /* FIXME see also wkui1_oth_domains for level 1 */ - - /* set up buffer */ - nastatus = NetApiBufferAllocate(sizeof(WKSTA_USER_INFO_1101) + dwSize * sizeof(WCHAR), - (LPVOID *) bufptr); - if (nastatus != NERR_Success) - return nastatus; - ui = (PWKSTA_USER_INFO_1101) *bufptr; - ui->wkui1101_oth_domains = (LMSTR)(ui + 1); - - /* get data */ - ui->wkui1101_oth_domains[0] = 0; - break; - } - default: - TRACE("Invalid level %d is specified\n", level); - return ERROR_INVALID_LEVEL; - } - return NERR_Success; -} - /************************************************************ * NetpGetComputerName (NETAPI32.@) */ diff --git a/dll/win32/netapi32/wksta_new.c b/dll/win32/netapi32/wksta_new.c index 2739a6c86e0..f427f3cd35f 100644 --- a/dll/win32/netapi32/wksta_new.c +++ b/dll/win32/netapi32/wksta_new.c @@ -1116,20 +1116,19 @@ NetWkstaUserEnum( } -#if 0 NET_API_STATUS WINAPI NetWkstaUserGetInfo( - LPWSTR reserved, + _In_ LPWSTR reserved, _In_ DWORD level, - _Out_ PBYTE *bufptr) + _Out_ LPBYTE *bufptr) { NET_API_STATUS status; TRACE("NetWkstaUserGetInfo(%s, %d, %p)\n", debugstr_w(reserved), level, bufptr); - if (reserved != NULL) + if (reserved != NULL || bufptr == NULL) return ERROR_INVALID_PARAMETER; *bufptr = NULL; @@ -1138,7 +1137,7 @@ NetWkstaUserGetInfo( { status = NetrWkstaUserGetInfo(NULL, level, - (LPWKSTA_USER_INFO)bufptr); + (LPWKSTA_USER_INFO*)bufptr); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) { @@ -1148,13 +1147,12 @@ NetWkstaUserGetInfo( return status; } -#endif NET_API_STATUS WINAPI NetWkstaUserSetInfo( - LPWSTR reserved, + _In_ LPWSTR reserved, _In_ DWORD level, _In_ LPBYTE buf, _Out_ LPDWORD parm_err) diff --git a/sdk/include/reactos/idl/wkssvc.idl b/sdk/include/reactos/idl/wkssvc.idl index b4cac96edd3..88cf97f6057 100644 --- a/sdk/include/reactos/idl/wkssvc.idl +++ b/sdk/include/reactos/idl/wkssvc.idl @@ -180,7 +180,7 @@ typedef struct _WKSTA_USER_INFO_1101 { [string] wchar_t *wkui1101_oth_domains; } WKSTA_USER_INFO_1101, *PWKSTA_USER_INFO_1101, *LPWKSTA_USER_INFO_1101; - +/* typedef [switch_type(unsigned long)] union _WKSTA_USER_INFO { [case(0)] LPWKSTA_USER_INFO_0 UserInfo0; @@ -188,6 +188,14 @@ typedef [switch_type(unsigned long)] union _WKSTA_USER_INFO [case(1101)] LPWKSTA_USER_INFO_1101 UserInfo1101; [default] ; } WKSTA_USER_INFO, *PWKSTA_USER_INFO, *LPWKSTA_USER_INFO; +*/ +typedef [switch_type(unsigned long)] union _WKSTA_USER_INFO +{ + [case(0)] WKSTA_USER_INFO_0 UserInfo0; + [case(1)] WKSTA_USER_INFO_1 UserInfo1; + [case(1101)] WKSTA_USER_INFO_1101 UserInfo1101; + [default] ; +} WKSTA_USER_INFO, *PWKSTA_USER_INFO, *LPWKSTA_USER_INFO; typedef struct _WKSTA_TRANSPORT_INFO_0 { @@ -407,7 +415,8 @@ interface wkssvc NetrWkstaUserGetInfo( [in, string, unique] WKSSVC_IDENTIFY_HANDLE Unused, [in] unsigned long Level, - [out, switch_is(Level)] LPWKSTA_USER_INFO UserInfo); + [out, switch_is(Level)] LPWKSTA_USER_INFO *UserInfo); +// [out, switch_is(Level)] LPWKSTA_USER_INFO UserInfo); /* Function 4 */ unsigned long

1 0

[reactos] 01/01: [MSV1_0] Implement LsaApCallPackage.MsV1_0GetUserInfo
by Eric Kohl 28 Dec '24

28 Dec '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0bb830022c7a2bef814dc… commit 0bb830022c7a2bef814dc96a0311fcc66343389f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Dec 28 16:04:50 2024 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Dec 28 16:04:50 2024 +0100 [MSV1_0] Implement LsaApCallPackage.MsV1_0GetUserInfo --- dll/win32/msv1_0/msv1_0.c | 201 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 199 insertions(+), 2 deletions(-) diff --git a/dll/win32/msv1_0/msv1_0.c b/dll/win32/msv1_0/msv1_0.c index 735b4a3e0df..35584bba37f 100644 --- a/dll/win32/msv1_0/msv1_0.c +++ b/dll/win32/msv1_0/msv1_0.c @@ -17,6 +17,10 @@ typedef struct _LOGON_LIST_ENTRY LIST_ENTRY ListEntry; LUID LogonId; ULONG EnumHandle; + UNICODE_STRING UserName; + UNICODE_STRING LogonDomainName; + UNICODE_STRING LogonServer; + SECURITY_LOGON_TYPE LogonType; } LOGON_LIST_ENTRY, *PLOGON_LIST_ENTRY; /* GLOBALS *****************************************************************/ @@ -27,6 +31,32 @@ ULONG EnumCounter; /* FUNCTIONS ***************************************************************/ +static +PLOGON_LIST_ENTRY +GetLogonByLogonId( + _In_ PLUID LogonId) +{ + PLOGON_LIST_ENTRY LogonEntry; + PLIST_ENTRY CurrentEntry; + + CurrentEntry = LogonListHead.Flink; + while (CurrentEntry != &LogonListHead) + { + LogonEntry = CONTAINING_RECORD(CurrentEntry, + LOGON_LIST_ENTRY, + ListEntry); + + if ((LogonEntry->LogonId.HighPart == LogonId->HighPart) && + (LogonEntry->LogonId.LowPart == LogonId->LowPart)) + return LogonEntry; + + CurrentEntry = CurrentEntry->Flink; + } + + return NULL; +} + + static NTSTATUS BuildInteractiveProfileBuffer(IN PLSA_CLIENT_REQUEST ClientRequest, @@ -287,6 +317,7 @@ done: return Status; } + static PSID AppendRidToSid(PSID SrcSid, @@ -854,6 +885,12 @@ MsvpEnumerateUsers( TRACE("MsvpEnumerateUsers()\n"); + if (SubmitBufferLength < sizeof(MSV1_0_ENUMUSERS_REQUEST)) + { + ERR("Invalid SubmitBufferLength %lu\n", SubmitBufferLength); + return STATUS_INVALID_PARAMETER; + } + /* Count the currently logged-on users */ CurrentEntry = LogonListHead.Flink; while (CurrentEntry != &LogonListHead) @@ -931,7 +968,7 @@ MsvpEnumerateUsers( goto done; } - *ProtocolReturnBuffer = (PMSV1_0_INTERACTIVE_PROFILE)ClientBaseAddress; + *ProtocolReturnBuffer = ClientBaseAddress; *ReturnBufferLength = BufferLength; *ProtocolStatus = STATUS_SUCCESS; @@ -946,7 +983,134 @@ done: ClientBaseAddress); } - return STATUS_SUCCESS; + return Status; +} + + +static +NTSTATUS +MsvpGetUserInfo( + _In_ PLSA_CLIENT_REQUEST ClientRequest, + _In_ PVOID ProtocolSubmitBuffer, + _In_ PVOID ClientBufferBase, + _In_ ULONG SubmitBufferLength, + _Out_ PVOID *ProtocolReturnBuffer, + _Out_ PULONG ReturnBufferLength, + _Out_ PNTSTATUS ProtocolStatus) +{ + PMSV1_0_GETUSERINFO_REQUEST RequestBuffer; + PLOGON_LIST_ENTRY LogonEntry; + PMSV1_0_GETUSERINFO_RESPONSE LocalBuffer = NULL; + PVOID ClientBaseAddress = NULL; + ULONG BufferLength; + PWSTR BufferPtr; + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("MsvpGetUserInfo()\n"); + + if (SubmitBufferLength < sizeof(MSV1_0_GETUSERINFO_REQUEST)) + { + ERR("Invalid SubmitBufferLength %lu\n", SubmitBufferLength); + return STATUS_INVALID_PARAMETER; + } + + RequestBuffer = (PMSV1_0_GETUSERINFO_REQUEST)ProtocolSubmitBuffer; + + TRACE("LogonId: 0x%lx\n", RequestBuffer->LogonId.LowPart); + + LogonEntry = GetLogonByLogonId(&RequestBuffer->LogonId); + if (LogonEntry == NULL) + { + ERR("No logon found for LogonId %lx\n", RequestBuffer->LogonId.LowPart); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + TRACE("UserName: %wZ\n", &LogonEntry->UserName); + TRACE("LogonDomain: %wZ\n", &LogonEntry->LogonDomainName); + TRACE("LogonServer: %wZ\n", &LogonEntry->LogonServer); + + BufferLength = sizeof(MSV1_0_GETUSERINFO_RESPONSE) + + LogonEntry->UserName.MaximumLength + + LogonEntry->LogonDomainName.MaximumLength + + LogonEntry->LogonServer.MaximumLength; + + LocalBuffer = DispatchTable.AllocateLsaHeap(BufferLength); + if (LocalBuffer == NULL) + { + ERR("Failed to allocate the local buffer!\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = DispatchTable.AllocateClientBuffer(ClientRequest, + BufferLength, + &ClientBaseAddress); + if (!NT_SUCCESS(Status)) + { + ERR("DispatchTable.AllocateClientBuffer failed (Status 0x%08lx)\n", Status); + goto done; + } + + TRACE("ClientBaseAddress: %p\n", ClientBaseAddress); + + /* Fill the local buffer */ + LocalBuffer->MessageType = MsV1_0GetUserInfo; + + BufferPtr = (PWSTR)((ULONG_PTR)LocalBuffer + sizeof(MSV1_0_GETUSERINFO_RESPONSE)); + + /* UserName */ + LocalBuffer->UserName.Length = LogonEntry->UserName.Length; + LocalBuffer->UserName.MaximumLength = LogonEntry->UserName.MaximumLength; + LocalBuffer->UserName.Buffer = (PWSTR)((ULONG_PTR)ClientBaseAddress + (ULONG_PTR)BufferPtr - (ULONG_PTR)LocalBuffer); + + RtlCopyMemory(BufferPtr, LogonEntry->UserName.Buffer, LogonEntry->UserName.MaximumLength); + BufferPtr = (PWSTR)((ULONG_PTR)BufferPtr + (ULONG_PTR)LocalBuffer->UserName.MaximumLength); + + /* LogonDomainName */ + LocalBuffer->LogonDomainName.Length = LogonEntry->LogonDomainName.Length; + LocalBuffer->LogonDomainName.MaximumLength = LogonEntry->LogonDomainName.MaximumLength; + LocalBuffer->LogonDomainName.Buffer = (PWSTR)((ULONG_PTR)ClientBaseAddress + (ULONG_PTR)BufferPtr - (ULONG_PTR)LocalBuffer); + + RtlCopyMemory(BufferPtr, LogonEntry->LogonDomainName.Buffer, LogonEntry->LogonDomainName.MaximumLength); + BufferPtr = (PWSTR)((ULONG_PTR)BufferPtr + (ULONG_PTR)LocalBuffer->LogonDomainName.MaximumLength); + + /* LogonServer */ + LocalBuffer->LogonServer.Length = LogonEntry->LogonServer.Length; + LocalBuffer->LogonServer.MaximumLength = LogonEntry->LogonServer.MaximumLength; + LocalBuffer->LogonServer.Buffer = (PWSTR)((ULONG_PTR)ClientBaseAddress + (ULONG_PTR)BufferPtr - (ULONG_PTR)LocalBuffer); + + RtlCopyMemory(BufferPtr, LogonEntry->LogonServer.Buffer, LogonEntry->LogonServer.MaximumLength); + + /* Logon Type */ + LocalBuffer->LogonType = LogonEntry->LogonType; + + Status = DispatchTable.CopyToClientBuffer(ClientRequest, + BufferLength, + ClientBaseAddress, + LocalBuffer); + if (!NT_SUCCESS(Status)) + { + ERR("DispatchTable.CopyToClientBuffer failed (Status 0x%08lx)\n", Status); + goto done; + } + + *ProtocolReturnBuffer = ClientBaseAddress; + *ReturnBufferLength = BufferLength; + *ProtocolStatus = STATUS_SUCCESS; + +done: + if (LocalBuffer != NULL) + DispatchTable.FreeLsaHeap(LocalBuffer); + + if (!NT_SUCCESS(Status)) + { + if (ClientBaseAddress != NULL) + DispatchTable.FreeClientBuffer(ClientRequest, + ClientBaseAddress); + } + + return Status; } @@ -994,6 +1158,15 @@ LsaApCallPackage(IN PLSA_CLIENT_REQUEST ClientRequest, break; case MsV1_0GetUserInfo: + Status = MsvpGetUserInfo(ClientRequest, + ProtocolSubmitBuffer, + ClientBufferBase, + SubmitBufferLength, + ProtocolReturnBuffer, + ReturnBufferLength, + ProtocolStatus); + break; + case MsV1_0ReLogonUsers: Status = STATUS_INVALID_PARAMETER; break; @@ -1484,6 +1657,30 @@ LsaApLogonUserEx2(IN PLSA_CLIENT_REQUEST ClientRequest, LogonEntry->EnumHandle = EnumCounter; EnumCounter++; + TRACE("Logon User: %wZ %wZ %lx\n", LogonUserName, LogonDomain, LogonId->LowPart); + LogonEntry->UserName.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, LogonUserName->MaximumLength); + if (LogonEntry->UserName.Buffer) + { + LogonEntry->UserName.MaximumLength = LogonUserName->MaximumLength; + RtlCopyUnicodeString(&LogonEntry->UserName, LogonUserName); + } + + LogonEntry->LogonDomainName.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, LogonDomain->MaximumLength); + if (LogonEntry->LogonDomainName.Buffer) + { + LogonEntry->LogonDomainName.MaximumLength = LogonDomain->MaximumLength; + RtlCopyUnicodeString(&LogonEntry->LogonDomainName, LogonDomain); + } + + LogonEntry->LogonServer.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, ComputerName.MaximumLength); + if (LogonEntry->LogonServer.Buffer) + { + LogonEntry->LogonServer.MaximumLength = ComputerName.MaximumLength; + RtlCopyUnicodeString(&LogonEntry->LogonServer, &ComputerName); + } + + LogonEntry->LogonType = LogonType; + InsertTailList(&LogonListHead, &LogonEntry->ListEntry); }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2024