Ros-diffs December 2023

ros-diffs@reactos.org

20 participants
274 discussions

[reactos] 01/01: [WIN32SS:GDI] eng/error.c: Minor code tweaks (#6128)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf7e7c2383b8ef43c1752… commit bf7e7c2383b8ef43c1752df4e0d40ccfc19aa36e Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sun Dec 17 22:13:45 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 17 22:13:45 2023 +0100 [WIN32SS:GDI] eng/error.c: Minor code tweaks (#6128) - Remove a useless debug.h include. - Use the initialized pTeb pointer. - Remove a useless else. - Add a SAL2 annotation. --- win32ss/gdi/eng/error.c | 10 ++-------- win32ss/gdi/ntgdi/misc.h | 6 +++--- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/win32ss/gdi/eng/error.c b/win32ss/gdi/eng/error.c index 380869bfd6e..b276d3aad25 100644 --- a/win32ss/gdi/eng/error.c +++ b/win32ss/gdi/eng/error.c @@ -1,8 +1,5 @@ #include <win32k.h> -#define NDEBUG -#include <debug.h> - /* * @implemented * http://msdn.microsoft.com/en-us/library/ff564940%28VS.85%29.aspx @@ -12,10 +9,7 @@ APIENTRY EngGetLastError(VOID) { PTEB pTeb = NtCurrentTeb(); - if (pTeb) - return NtCurrentTeb()->LastErrorValue; - else - return ERROR_SUCCESS; + return (pTeb ? pTeb->LastErrorValue : ERROR_SUCCESS); } /* @@ -34,7 +28,7 @@ EngSetLastError(_In_ ULONG iError) VOID FASTCALL -SetLastNtError(NTSTATUS Status) +SetLastNtError(_In_ NTSTATUS Status) { EngSetLastError(RtlNtStatusToDosError(Status)); } diff --git a/win32ss/gdi/ntgdi/misc.h b/win32ss/gdi/ntgdi/misc.h index 06fa17b8255..6b0e2f022b0 100644 --- a/win32ss/gdi/ntgdi/misc.h +++ b/win32ss/gdi/ntgdi/misc.h @@ -60,9 +60,9 @@ DWORD NTAPI RegGetSectionDWORD(LPCWSTR pszSection, LPWSTR pszValue, DWORD dwDefault); -VOID FASTCALL -SetLastNtError( - NTSTATUS Status); +VOID +FASTCALL +SetLastNtError(_In_ NTSTATUS Status); typedef struct _GDI_POOL *PGDI_POOL;

10 months

[reactos] 01/01: [SDK:CMAKE] writing_CmakeLists_for_ReactOS.txt: Fix typos (#6105)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=91d291f7662d9e4e5463f… commit 91d291f7662d9e4e5463f8b0e998645737edaff4 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sun Dec 17 22:12:25 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 17 22:12:25 2023 +0100 [SDK:CMAKE] writing_CmakeLists_for_ReactOS.txt: Fix typos (#6105) --- sdk/cmake/writing_CmakeLists_for_ReactOS.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk/cmake/writing_CmakeLists_for_ReactOS.txt b/sdk/cmake/writing_CmakeLists_for_ReactOS.txt index b13cbe91d43..c621b09006d 100644 --- a/sdk/cmake/writing_CmakeLists_for_ReactOS.txt +++ b/sdk/cmake/writing_CmakeLists_for_ReactOS.txt @@ -8,14 +8,14 @@ Optional arguments are marked with [brackets], input is marked with <comparison --------------------------------------------------------------------------------------------------------------------------------------------- set_module_type(<target> <type> [UNICODE] [BASEADDRESS <baseaddress>] [ENTRYPOINT <entrypoint> <stacksize>]) -This set the type of the module, and take cares of setting common linker options or definitions to the specified target, module file extension, etc. Please always use this when adding a module to reactos build. +This sets the type of the module, and takes care of setting common linker options or definitions to the specified target, module file extension, etc. Please always use this when adding a module to ReactOS build. ARGUMENTS: <target>: name of the target. The module must have been added with add_executable or add_library before calling this function. -<type>: one of win32gui, win32cui, win32dll, win32ocx, cpl, nativecui, nativedll, kernelmodedriver -UNICODE: provide this if the module was written for unicode API -<baseaddress>: provide this if you want your module to have a different base address than the defualt one (according to <type>). For win32dll modules, please use baseaddress.cmake instead. -<entrypoint>: name of the function which will be the entr point of the module. If it's not provided, it's guessed from the module type. +<type>: one of win32gui, win32cui, win32dll, win32ocx, cpl, nativecui, nativedll, kernelmodedriver. +UNICODE: provide this if the module was written for unicode API. +<baseaddress>: provide this if you want your module to have a different base address than the default one (according to <type>). For win32dll modules, please use baseaddress.cmake instead. +<entrypoint>: name of the function which will be the entry point of the module. If it's not provided, it's guessed from the module type. <stacksize>: Size of stack required for the parameters of <entrypoint>. TYPICAL USE:

10 months

[reactos] 01/01: [USER32] Support loading icons from data file module (#6065)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=82c07abf1ab070208d3b8… commit 82c07abf1ab070208d3b83bb0f628caef41275da Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sun Dec 17 22:11:50 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 17 22:11:50 2023 +0100 [USER32] Support loading icons from data file module (#6065) GetModuleFileName() fails on LOAD_LIBRARY_AS_DATAFILE causing LoadImage to fail. Use a fake filename for LR_SHARED (with same format as Windows). This may not be a good design, but it does match Windows' behaviour. + Added test. --- modules/rostests/apitests/user32/LoadImage.c | 47 ++++++++++++++++++++++++++++ win32ss/user/user32/windows/cursoricon.c | 16 +++++++++- 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/user32/LoadImage.c b/modules/rostests/apitests/user32/LoadImage.c index 64af37325d2..f46e4be7846 100644 --- a/modules/rostests/apitests/user32/LoadImage.c +++ b/modules/rostests/apitests/user32/LoadImage.c @@ -1,6 +1,50 @@ #include "precomp.h" +static void test_LoadImage_DataFile(void) +{ + static const struct + { + int result; + LPCWSTR file; + int res_id; + UINT lr; + BOOL same_handle; + BOOL after_unload; /* LR_SHARED stays valid */ + } + tests[] = + { + { 1, L"shell32.dll", 2, 0, 0, 0 }, + { 1, L"shell32.dll", 2, LR_SHARED, 1, 1 }, + { 0, L"shell32.dll", 0xfff0, 0, 1, 0 }, /* Icon should not exist */ + { 1, L"regedit.exe", 100, 0, 0, 0 }, + { 1, L"regedit.exe", 100, LR_SHARED, 1, 1 } + }; + + SIZE_T i; + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + HANDLE handle1, handle2; + HMODULE hMod = LoadLibraryExW(tests[i].file, NULL, LOAD_LIBRARY_AS_DATAFILE); + if (!((SIZE_T)hMod & 3)) + { + skip("Could not load library as datafile %ls\n", tests[i].file); + continue; + } + + handle1 = LoadImage(hMod, MAKEINTRESOURCE(tests[i].res_id), IMAGE_ICON, 0, 0, tests[i].lr); + ok(!!handle1 == !!tests[i].result, "Failed to load %ls,-%d from %p\n", tests[i].file, tests[i].res_id, hMod); + + handle2 = LoadImage(hMod, MAKEINTRESOURCE(tests[i].res_id), IMAGE_ICON, 0, 0, tests[i].lr); + ok(!!(handle1 == handle2) == !!tests[i].same_handle, "Shared handles don't match\n"); + + FreeLibrary(hMod); + + handle1 = LoadImage(hMod, MAKEINTRESOURCE(tests[i].res_id), IMAGE_ICON, 0, 0, tests[i].lr); + ok(!!handle1 == !!tests[i].after_unload, "LR_%x handle should %sload after FreeLibrary\n", tests[i].lr, tests[i].after_unload ? "" : "not "); + } +} + START_TEST(LoadImage) { char path[MAX_PATH]; @@ -77,6 +121,9 @@ START_TEST(LoadImage) DeleteObject(ii.hbmMask); if(ii.hbmColor) DeleteObject(ii.hbmColor); + /* LOAD_LIBRARY_AS_DATAFILE */ + test_LoadImage_DataFile(); + return; } diff --git a/win32ss/user/user32/windows/cursoricon.c b/win32ss/user/user32/windows/cursoricon.c index 1f6b71714aa..a3f8a48602e 100644 --- a/win32ss/user/user32/windows/cursoricon.c +++ b/win32ss/user/user32/windows/cursoricon.c @@ -1454,7 +1454,21 @@ CURSORICON_LoadImageW( RtlInitUnicodeString(&ustrRsrc, lpszName); } - if(hinst) + if(LDR_IS_RESOURCE(hinst)) + { + /* We don't have a real module for GetModuleFileName, construct a fake name instead. + * GetIconInfoEx reveals the name used by Windows. */ + LPCWSTR fakeNameFmt = sizeof(void*) > 4 ? L"\x01%016IX" : L"\x01%08IX"; + ustrModule.MaximumLength = 18 * sizeof(WCHAR); + ustrModule.Buffer = HeapAlloc(GetProcessHeap(), 0, ustrModule.MaximumLength); + if (!ustrModule.Buffer) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + ustrModule.Length = wsprintfW(ustrModule.Buffer, fakeNameFmt, hinst) * sizeof(WCHAR); + } + else if(hinst) { DWORD size = MAX_PATH; /* Get the module name string */

10 months

[reactos] 01/01: [NETCFGX] Create only one "Alternative Configuration" tab

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f349ab3c28a6e13c671b… commit 8f349ab3c28a6e13c671b0393fee4784d1ef218e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Dec 17 21:50:20 2023 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Dec 17 21:50:20 2023 +0100 [NETCFGX] Create only one "Alternative Configuration" tab - Check for the presence of the second tab. - Remove unnecessary checks for checked radiobuttons. CORE-19328 --- dll/win32/netcfgx/tcpipconf_notify.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/dll/win32/netcfgx/tcpipconf_notify.c b/dll/win32/netcfgx/tcpipconf_notify.c index e6db3ae9a1d..d662f7fdf33 100644 --- a/dll/win32/netcfgx/tcpipconf_notify.c +++ b/dll/win32/netcfgx/tcpipconf_notify.c @@ -2648,7 +2648,7 @@ TcpipBasicDlg( switch (LOWORD(wParam)) { case IDC_USEDHCP: - if (IsDlgButtonChecked(hwndDlg, IDC_USEDHCP) == BST_CHECKED) + if (SendMessageW(GetParent(hwndDlg), PSM_INDEXTOID, 1, 0) == 0) { PropSheet_Changed(GetParent(hwndDlg), hwndDlg); SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_CLEARADDRESS, 0, 0); @@ -2662,7 +2662,7 @@ TcpipBasicDlg( } break; case IDC_NODHCP: - if (IsDlgButtonChecked(hwndDlg, IDC_NODHCP) == BST_CHECKED) + if (SendMessageW(GetParent(hwndDlg), PSM_INDEXTOID, 1, 0) != 0) { PropSheet_Changed(GetParent(hwndDlg), hwndDlg); EnableWindow(GetDlgItem(hwndDlg, IDC_IPADDR), TRUE); @@ -2680,22 +2680,16 @@ TcpipBasicDlg( } break; case IDC_AUTODNS: - if (IsDlgButtonChecked(hwndDlg, IDC_AUTODNS) == BST_CHECKED) - { - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - SendDlgItemMessageW(hwndDlg, IDC_DNS1, IPM_CLEARADDRESS, 0, 0); - SendDlgItemMessageW(hwndDlg, IDC_DNS2, IPM_CLEARADDRESS, 0, 0); - EnableWindow(GetDlgItem(hwndDlg, IDC_DNS1), FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_DNS2), FALSE); - } + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + SendDlgItemMessageW(hwndDlg, IDC_DNS1, IPM_CLEARADDRESS, 0, 0); + SendDlgItemMessageW(hwndDlg, IDC_DNS2, IPM_CLEARADDRESS, 0, 0); + EnableWindow(GetDlgItem(hwndDlg, IDC_DNS1), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_DNS2), FALSE); break; case IDC_FIXEDDNS: - if (IsDlgButtonChecked(hwndDlg, IDC_FIXEDDNS) == BST_CHECKED) - { - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - EnableWindow(GetDlgItem(hwndDlg, IDC_DNS1), TRUE); - EnableWindow(GetDlgItem(hwndDlg, IDC_DNS2), TRUE); - } + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + EnableWindow(GetDlgItem(hwndDlg, IDC_DNS1), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_DNS2), TRUE); break; case IDC_ADVANCED: LaunchAdvancedTcpipSettings(hwndDlg, (TcpipConfNotifyImpl*)GetWindowLongPtr(hwndDlg, DWLP_USER));

10 months

[reactos] 01/01: [SETUP:REACTOS] Fix identical expression in treelist.c

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bb7661312e25bc3aa59e3… commit bb7661312e25bc3aa59e33c1c65b0a054c93802c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Oct 13 17:08:49 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 17 20:58:32 2023 +0100 [SETUP:REACTOS] Fix identical expression in treelist.c Supersedes PRs #3226 and #5199 by Kyle_Katarn. CORE-16036 --- base/setup/reactos/treelist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/setup/reactos/treelist.c b/base/setup/reactos/treelist.c index d39924e0c09..27697b81151 100644 --- a/base/setup/reactos/treelist.c +++ b/base/setup/reactos/treelist.c @@ -4928,7 +4928,7 @@ static int TreeListSetItem(TreeListData *pData, const TV_ITEM *pItem) { } if((uBits & TVIS_EXPANDED) && pEntry->uFirstChild) { // Sollen Teile auf/zugeklappt werden - uMask &= TVIS_EXPANDPARTIAL | TVIS_EXPANDPARTIAL; + uMask &= TVIS_EXPANDED | TVIS_EXPANDPARTIAL; pEntry->uState ^= TVIS_EXPANDED; pEntry->uState ^= uBits & uMask; iVal = uMask & pItem->state;

10 months

[reactos] 02/02: [SETUP:REACTOS] Simplify CONTROL "ComboBox" to COMBOBOX resource declaration.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=63d5423853a57ac93d35d… commit 63d5423853a57ac93d35d688056288d1cae4c343 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Oct 31 21:46:59 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 17 20:57:11 2023 +0100 [SETUP:REACTOS] Simplify CONTROL "ComboBox" to COMBOBOX resource declaration. --- base/setup/reactos/lang/bg-BG.rc | 6 +++--- base/setup/reactos/lang/cs-CZ.rc | 6 +++--- base/setup/reactos/lang/de-DE.rc | 6 +++--- base/setup/reactos/lang/el-GR.rc | 6 +++--- base/setup/reactos/lang/en-US.rc | 6 +++--- base/setup/reactos/lang/es-ES.rc | 6 +++--- base/setup/reactos/lang/et-EE.rc | 6 +++--- base/setup/reactos/lang/eu-ES.rc | 6 +++--- base/setup/reactos/lang/fi-FI.rc | 6 +++--- base/setup/reactos/lang/fr-FR.rc | 6 +++--- base/setup/reactos/lang/he-IL.rc | 6 +++--- base/setup/reactos/lang/hi-IN.rc | 6 +++--- base/setup/reactos/lang/hu-HU.rc | 6 +++--- base/setup/reactos/lang/id-ID.rc | 6 +++--- base/setup/reactos/lang/it-IT.rc | 6 +++--- base/setup/reactos/lang/ja-JP.rc | 6 +++--- base/setup/reactos/lang/ms-MY.rc | 6 +++--- base/setup/reactos/lang/no-NO.rc | 6 +++--- base/setup/reactos/lang/pl-PL.rc | 6 +++--- base/setup/reactos/lang/pt-BR.rc | 6 +++--- base/setup/reactos/lang/pt-PT.rc | 6 +++--- base/setup/reactos/lang/ro-RO.rc | 6 +++--- base/setup/reactos/lang/ru-RU.rc | 6 +++--- base/setup/reactos/lang/sk-SK.rc | 6 +++--- base/setup/reactos/lang/sq-AL.rc | 6 +++--- base/setup/reactos/lang/tr-TR.rc | 6 +++--- base/setup/reactos/lang/uk-UA.rc | 6 +++--- base/setup/reactos/lang/vi-VN.rc | 6 +++--- base/setup/reactos/lang/zh-CN.rc | 6 +++--- base/setup/reactos/lang/zh-HK.rc | 6 +++--- base/setup/reactos/lang/zh-TW.rc | 6 +++--- 31 files changed, 93 insertions(+), 93 deletions(-) diff --git a/base/setup/reactos/lang/bg-BG.rc b/base/setup/reactos/lang/bg-BG.rc index dd8010c643b..4b2c5c99206 100644 --- a/base/setup/reactos/lang/bg-BG.rc +++ b/base/setup/reactos/lang/bg-BG.rc @@ -39,11 +39,11 @@ CAPTION "Настройка на РеактОС" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Компютър:", IDC_STATIC, 20, 15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 150, 80 + COMBOBOX IDC_COMPUTER, 100, 15, 150, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT " Екран:", IDC_STATIC, 20, 35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 150, 80 + COMBOBOX IDC_DISPLAY, 100, 35, 150, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Клавиатура", IDC_STATIC, 20, 55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 150, 80 + COMBOBOX IDC_KEYBOARD, 100, 55, 150, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Натиснете „Напред“ за избор на устройство за слагане.", IDC_STATIC, 7, 128, 297, 8 END diff --git a/base/setup/reactos/lang/cs-CZ.rc b/base/setup/reactos/lang/cs-CZ.rc index 6e83906babd..501d81ca87a 100644 --- a/base/setup/reactos/lang/cs-CZ.rc +++ b/base/setup/reactos/lang/cs-CZ.rc @@ -45,11 +45,11 @@ CAPTION "Instalace systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Počítač:", IDC_STATIC, 20, 15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 150, 80 + COMBOBOX IDC_COMPUTER, 100, 15, 150, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Obrazovka:", IDC_STATIC, 20, 35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 150, 80 + COMBOBOX IDC_DISPLAY, 100, 35, 150, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Klávesnice:", IDC_STATIC, 20, 55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 150, 80 + COMBOBOX IDC_KEYBOARD, 100, 55, 150, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Po klepnutí na Další bude možné nastavit instalační zařízení.", IDC_STATIC, 7, 128, 297, 8 END diff --git a/base/setup/reactos/lang/de-DE.rc b/base/setup/reactos/lang/de-DE.rc index 89ba88532da..6c3d1415f33 100644 --- a/base/setup/reactos/lang/de-DE.rc +++ b/base/setup/reactos/lang/de-DE.rc @@ -39,11 +39,11 @@ CAPTION "ReactOS-Setup" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Computer:", IDC_STATIC, 20, 15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 + COMBOBOX IDC_COMPUTER, 100, 15, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Anzeige:", IDC_STATIC, 20, 35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 + COMBOBOX IDC_DISPLAY, 100, 35, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Tastatur:", IDC_STATIC, 20, 55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 + COMBOBOX IDC_KEYBOARD, 100, 55, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Klicken Sie auf Weiter um den Installationsort zu konfigurieren.", IDC_STATIC, 7, 128, 297, 8 END diff --git a/base/setup/reactos/lang/el-GR.rc b/base/setup/reactos/lang/el-GR.rc index c7545e9818e..097de2895cf 100644 --- a/base/setup/reactos/lang/el-GR.rc +++ b/base/setup/reactos/lang/el-GR.rc @@ -39,11 +39,11 @@ CAPTION "Εγκατάσταση του ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Υπολογιστής:", IDC_STATIC, 20, 15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 150, 80 + COMBOBOX IDC_COMPUTER, 100, 15, 150, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Εμφάνιση:", IDC_STATIC, 20, 35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 150, 80 + COMBOBOX IDC_DISPLAY, 100, 35, 150, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Πληκτρολόγιο:", IDC_STATIC, 20, 55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 150, 80 + COMBOBOX IDC_KEYBOARD, 100, 55, 150, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Click Next setup of the installation device.", IDC_STATIC, 7, 128, 297, 8 END diff --git a/base/setup/reactos/lang/en-US.rc b/base/setup/reactos/lang/en-US.rc index 74ed3d4bbdd..b5df44b2e01 100644 --- a/base/setup/reactos/lang/en-US.rc +++ b/base/setup/reactos/lang/en-US.rc @@ -39,11 +39,11 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Computer:", IDC_STATIC, 20, 15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 + COMBOBOX IDC_COMPUTER, 100, 15, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Display:", IDC_STATIC, 20, 35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 + COMBOBOX IDC_DISPLAY, 100, 35, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Keyboard:", IDC_STATIC, 20, 55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 + COMBOBOX IDC_KEYBOARD, 100, 55, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Click Next to continue setup on the installation device.", IDC_STATIC, 7, 128, 297, 8 END diff --git a/base/setup/reactos/lang/es-ES.rc b/base/setup/reactos/lang/es-ES.rc index 746dafeb4d2..071125943f7 100644 --- a/base/setup/reactos/lang/es-ES.rc +++ b/base/setup/reactos/lang/es-ES.rc @@ -48,11 +48,11 @@ CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Equipo:", IDC_STATIC, 20, 15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 150, 80 + COMBOBOX IDC_COMPUTER, 100, 15, 150, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Pantalla:", IDC_STATIC, 20, 35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 150, 80 + COMBOBOX IDC_DISPLAY, 100, 35, 150, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Teclado:", IDC_STATIC, 20, 55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 150, 80 + COMBOBOX IDC_KEYBOARD, 100, 55, 150, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Presione Siguiente para configurar la instalación de dispositivos.", IDC_STATIC, 7, 128, 297, 8 END diff --git a/base/setup/reactos/lang/et-EE.rc b/base/setup/reactos/lang/et-EE.rc index 45522859bea..ae936d14da9 100644 --- a/base/setup/reactos/lang/et-EE.rc +++ b/base/setup/reactos/lang/et-EE.rc @@ -39,11 +39,11 @@ CAPTION "ReactOS'i paigaldamine" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Arvuti:", IDC_STATIC, 20, 15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 + COMBOBOX IDC_COMPUTER, 100, 15, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Ekraan:", IDC_STATIC, 20, 35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 + COMBOBOX IDC_DISPLAY, 100, 35, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Klaviatuur:", IDC_STATIC, 20, 55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 + COMBOBOX IDC_KEYBOARD, 100, 55, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Vajuta Järgmine, et seadistada sihtketas.", IDC_STATIC, 7, 128, 297, 8 END diff --git a/base/setup/reactos/lang/eu-ES.rc b/base/setup/reactos/lang/eu-ES.rc index 771f640cb81..827298f5198 100644 --- a/base/setup/reactos/lang/eu-ES.rc +++ b/base/setup/reactos/lang/eu-ES.rc @@ -46,11 +46,11 @@ CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Equipo:", IDC_STATIC, 20, 15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 150, 80 + COMBOBOX IDC_COMPUTER, 100, 15, 150, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Pantalla:", IDC_STATIC, 20, 35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 150, 80 + COMBOBOX IDC_DISPLAY, 100, 35, 150, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Teclado:", IDC_STATIC, 20, 55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 150, 80 + COMBOBOX IDC_KEYBOARD, 100, 55, 150, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Presione Siguiente para configurar la instalación de dispositivos.", IDC_STATIC, 7, 128, 297, 8 END diff --git a/base/setup/reactos/lang/fi-FI.rc b/base/setup/reactos/lang/fi-FI.rc index 2494f9d6c1d..737be4048ff 100644 --- a/base/setup/reactos/lang/fi-FI.rc +++ b/base/setup/reactos/lang/fi-FI.rc @@ -39,11 +39,11 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Computer:", IDC_STATIC, 20, 15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 + COMBOBOX IDC_COMPUTER, 100, 15, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Display:", IDC_STATIC, 20, 35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 + COMBOBOX IDC_DISPLAY, 100, 35, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Keyboard:", IDC_STATIC, 20, 55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 + COMBOBOX IDC_KEYBOARD, 100, 55, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Click Next to continue setup on the installation device.", IDC_STATIC, 7, 128, 297, 8 END diff --git a/base/setup/reactos/lang/fr-FR.rc b/base/setup/reactos/lang/fr-FR.rc index 03da11b938a..d08f495e85c 100644 --- a/base/setup/reactos/lang/fr-FR.rc +++ b/base/setup/reactos/lang/fr-FR.rc @@ -39,11 +39,11 @@ CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Ordinateur :", IDC_STATIC, 20, 15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 + COMBOBOX IDC_COMPUTER, 100, 15, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Affichage :", IDC_STATIC, 20, 35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 + COMBOBOX IDC_DISPLAY, 100, 35, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Clavier :", IDC_STATIC, 20, 55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 + COMBOBOX IDC_KEYBOARD, 100, 55, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Appuyer sur Suivant pour continuer l'installation.", IDC_STATIC, 7, 128, 297, 8 END diff --git a/base/setup/reactos/lang/he-IL.rc b/base/setup/reactos/lang/he-IL.rc index 2101567c561..fa669eb0e05 100644 --- a/base/setup/reactos/lang/he-IL.rc +++ b/base/setup/reactos/lang/he-IL.rc @@ -41,11 +41,11 @@ CAPTION "התקנת ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "מחשב:", IDC_STATIC, 20, 15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 + COMBOBOX IDC_COMPUTER, 100, 15, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "תצוגה:", IDC_STATIC, 20, 35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 + COMBOBOX IDC_DISPLAY, 100, 35, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "תצוגה:", IDC_STATIC, 20, 55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 + COMBOBOX IDC_KEYBOARD, 100, 55, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "לחץ על 'הבא' כדי להגדיר את התקן ההתקנה.", IDC_STATIC, 7, 128, 297, 8 END diff --git a/base/setup/reactos/lang/hi-IN.rc b/base/setup/reactos/lang/hi-IN.rc index ac16dc32225..e32cdf3ef35 100644 --- a/base/setup/reactos/lang/hi-IN.rc +++ b/base/setup/reactos/lang/hi-IN.rc @@ -35,11 +35,11 @@ CAPTION "रिऐक्ट ओएस सेटअप" FONT 8, "MS Shell Dlg" BEGIN LTEXT "कंप्यूटर:", IDC_STATIC, 20, 15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 + COMBOBOX IDC_COMPUTER, 100, 15, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "डिस्प्ले:", IDC_STATIC, 20, 35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 + COMBOBOX IDC_DISPLAY, 100, 35, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "कीबोर्ड:", IDC_STATIC, 20, 55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 + COMBOBOX IDC_KEYBOARD, 100, 55, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "डिवाइस की इन्स्टलेशन का सेटअप के लिए आगे क्लिक करें।", IDC_STATIC, 7, 128, 297, 8 END diff --git a/base/setup/reactos/lang/hu-HU.rc b/base/setup/reactos/lang/hu-HU.rc index 348a9af2b65..1d9edc48a84 100644 --- a/base/setup/reactos/lang/hu-HU.rc +++ b/base/setup/reactos/lang/hu-HU.rc @@ -41,11 +41,11 @@ CAPTION "ReactOS telepítõ" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Computer:", IDC_STATIC, 20, 15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 + COMBOBOX IDC_COMPUTER, 100, 15, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Display:", IDC_STATIC, 20, 35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 + COMBOBOX IDC_DISPLAY, 100, 35, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Keyboard:", IDC_STATIC, 20, 55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 + COMBOBOX IDC_KEYBOARD, 100, 55, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Click Next to continue setup on the installation device.", IDC_STATIC, 7, 128, 297, 8 END diff --git a/base/setup/reactos/lang/id-ID.rc b/base/setup/reactos/lang/id-ID.rc index 896533ce7cc..6a5c1165a31 100644 --- a/base/setup/reactos/lang/id-ID.rc +++ b/base/setup/reactos/lang/id-ID.rc @@ -39,11 +39,11 @@ CAPTION "Penyetelan ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Komputer:", IDC_STATIC, 20, 15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 + COMBOBOX IDC_COMPUTER, 100, 15, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Tampilan:", IDC_STATIC, 20, 35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 + COMBOBOX IDC_DISPLAY, 100, 35, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Papan Ketik:", IDC_STATIC, 20, 55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 + COMBOBOX IDC_KEYBOARD, 100, 55, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Klik Lanjut untuk meneruskan penyetelan pada pemasangan perangkat.", IDC_STATIC, 7, 128, 297, 8 END diff --git a/base/setup/reactos/lang/it-IT.rc b/base/setup/reactos/lang/it-IT.rc index c315ecee269..23e48251893 100644 --- a/base/setup/reactos/lang/it-IT.rc +++ b/base/setup/reactos/lang/it-IT.rc @@ -39,11 +39,11 @@ CAPTION "Installazione di ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Computer:", IDC_STATIC, 20, 15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 150, 80 + COMBOBOX IDC_COMPUTER, 100, 15, 150, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Display:", IDC_STATIC, 20, 35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 150, 80 + COMBOBOX IDC_DISPLAY, 100, 35, 150, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Tastiera:", IDC_STATIC, 20, 55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 150, 80 + COMBOBOX IDC_KEYBOARD, 100, 55, 150, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Cliccare Avanti per scegliere dove effettuare l'installazione.", IDC_STATIC, 7, 128, 297, 8 END diff --git a/base/setup/reactos/lang/ja-JP.rc b/base/setup/reactos/lang/ja-JP.rc index 7d4e0ffcc02..6d3ce4402dd 100644 --- a/base/setup/reactos/lang/ja-JP.rc +++ b/base/setup/reactos/lang/ja-JP.rc @@ -39,11 +39,11 @@ CAPTION "ReactOS セットアップ" FONT 9, "MS UI Gothic" BEGIN LTEXT "コンピュータ:", IDC_STATIC, 20, 15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 + COMBOBOX IDC_COMPUTER, 100, 15, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "ディスプレイ:", IDC_STATIC, 20, 35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 + COMBOBOX IDC_DISPLAY, 100, 35, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "キーボード:", IDC_STATIC, 20, 55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 + COMBOBOX IDC_KEYBOARD, 100, 55, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "デバイスをセットアップするために、次へをクリックして下さい。", IDC_STATIC, 7, 128, 297, 8 END diff --git a/base/setup/reactos/lang/ms-MY.rc b/base/setup/reactos/lang/ms-MY.rc index 680af8794d6..e9033b4f4ef 100644 --- a/base/setup/reactos/lang/ms-MY.rc +++ b/base/setup/reactos/lang/ms-MY.rc @@ -41,11 +41,11 @@ CAPTION "ReactOS Persediaan" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Komputer:", IDC_STATIC, 20, 15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 + COMBOBOX IDC_COMPUTER, 100, 15, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Paparan:", IDC_STATIC, 20, 35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 + COMBOBOX IDC_DISPLAY, 100, 35, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Papan Kekunci:", IDC_STATIC, 20, 55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 + COMBOBOX IDC_KEYBOARD, 100, 55, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Klik di sebelah persediaan peranti pemasangan tersebut.", IDC_STATIC, 7, 128, 297, 8 END diff --git a/base/setup/reactos/lang/no-NO.rc b/base/setup/reactos/lang/no-NO.rc index 914c2b91aec..699e0d55396 100644 --- a/base/setup/reactos/lang/no-NO.rc +++ b/base/setup/reactos/lang/no-NO.rc @@ -39,11 +39,11 @@ CAPTION "ReactOS installering" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Datamaskin:", IDC_STATIC, 20, 15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 150, 80 + COMBOBOX IDC_COMPUTER, 100, 15, 150, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Skjerm:", IDC_STATIC, 20, 35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 150, 80 + COMBOBOX IDC_DISPLAY, 100, 35, 150, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Tastatur:", IDC_STATIC, 20, 55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 150, 80 + COMBOBOX IDC_KEYBOARD, 100, 55, 150, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Trykk på Neste for å installere enhetene.", IDC_STATIC, 7, 128, 297, 8 END diff --git a/base/setup/reactos/lang/pl-PL.rc b/base/setup/reactos/lang/pl-PL.rc index 89b8ed1cc24..f5649f40523 100644 --- a/base/setup/reactos/lang/pl-PL.rc +++ b/base/setup/reactos/lang/pl-PL.rc @@ -50,11 +50,11 @@ CAPTION "Instalator systemu ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Komputer:", IDC_STATIC, 20, 15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 150, 80 + COMBOBOX IDC_COMPUTER, 100, 15, 150, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Monitor:", IDC_STATIC, 20, 35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 150, 80 + COMBOBOX IDC_DISPLAY, 100, 35, 150, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Klawiatura:", IDC_STATIC, 20, 55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 150, 80 + COMBOBOX IDC_KEYBOARD, 100, 55, 150, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Kliknij Dalej, aby ustalić miejsce instalacji.", IDC_STATIC, 7, 128, 297, 8 END diff --git a/base/setup/reactos/lang/pt-BR.rc b/base/setup/reactos/lang/pt-BR.rc index a519ea4d367..79a1d6d711a 100644 --- a/base/setup/reactos/lang/pt-BR.rc +++ b/base/setup/reactos/lang/pt-BR.rc @@ -39,11 +39,11 @@ CAPTION "Instalação do ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Computador:", IDC_STATIC, 20, 15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 + COMBOBOX IDC_COMPUTER, 100, 15, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Monitor:", IDC_STATIC, 20, 35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 + COMBOBOX IDC_DISPLAY, 100, 35, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Teclado:", IDC_STATIC, 20, 55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 + COMBOBOX IDC_KEYBOARD, 100, 55, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Clique em Próximo para configurar o dispositivo de instalação.", IDC_STATIC, 7, 128, 297, 8 END diff --git a/base/setup/reactos/lang/pt-PT.rc b/base/setup/reactos/lang/pt-PT.rc index 5e46b78a50f..1b9c0069e90 100644 --- a/base/setup/reactos/lang/pt-PT.rc +++ b/base/setup/reactos/lang/pt-PT.rc @@ -39,11 +39,11 @@ CAPTION "Instalação do ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Computador:", IDC_STATIC, 20, 15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 + COMBOBOX IDC_COMPUTER, 100, 15, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Monitor:", IDC_STATIC, 20, 35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 + COMBOBOX IDC_DISPLAY, 100, 35, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Teclado:", IDC_STATIC, 20, 55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 + COMBOBOX IDC_KEYBOARD, 100, 55, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Clique em Próximo para configurar o dispositivo de instalação.", IDC_STATIC, 7, 128, 297, 8 END diff --git a/base/setup/reactos/lang/ro-RO.rc b/base/setup/reactos/lang/ro-RO.rc index 04cec85b167..9d36d10f9a0 100644 --- a/base/setup/reactos/lang/ro-RO.rc +++ b/base/setup/reactos/lang/ro-RO.rc @@ -48,11 +48,11 @@ CAPTION "Expert de instalare ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Calculator:", IDC_STATIC, 20, 15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 + COMBOBOX IDC_COMPUTER, 100, 15, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Ecran:", IDC_STATIC, 20, 35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 + COMBOBOX IDC_DISPLAY, 100, 35, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Tastatură:", IDC_STATIC, 20, 55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 + COMBOBOX IDC_KEYBOARD, 100, 55, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Apăsați pe „Înainte” pentru configurarea dispozitivului de instalare.", IDC_STATIC, 7, 128, 297, 8 END diff --git a/base/setup/reactos/lang/ru-RU.rc b/base/setup/reactos/lang/ru-RU.rc index ea5dc80a501..bc010049b0b 100644 --- a/base/setup/reactos/lang/ru-RU.rc +++ b/base/setup/reactos/lang/ru-RU.rc @@ -39,11 +39,11 @@ CAPTION "Установка ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Компьютер:", IDC_STATIC, 20, 15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 150, 80 + COMBOBOX IDC_COMPUTER, 100, 15, 150, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Экран:", IDC_STATIC, 20, 35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 150, 80 + COMBOBOX IDC_DISPLAY, 100, 35, 150, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Клавиатура:", IDC_STATIC, 20, 55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 150, 80 + COMBOBOX IDC_KEYBOARD, 100, 55, 150, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Для установки устройств нажмите ""Далее"".", IDC_STATIC, 7, 128, 297, 8 END diff --git a/base/setup/reactos/lang/sk-SK.rc b/base/setup/reactos/lang/sk-SK.rc index 72dbb0e0a3e..a85503aef94 100644 --- a/base/setup/reactos/lang/sk-SK.rc +++ b/base/setup/reactos/lang/sk-SK.rc @@ -44,11 +44,11 @@ CAPTION "Inštalácia systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Počítač:", IDC_STATIC, 20, 15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 + COMBOBOX IDC_COMPUTER, 100, 15, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Obrazovka:", IDC_STATIC, 20, 35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 + COMBOBOX IDC_DISPLAY, 100, 35, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Klávesnica:", IDC_STATIC, 20, 55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 + COMBOBOX IDC_KEYBOARD, 100, 55, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Click Next setup of the installation device.", IDC_STATIC, 7, 128, 297, 8 END diff --git a/base/setup/reactos/lang/sq-AL.rc b/base/setup/reactos/lang/sq-AL.rc index d92601751fb..c204b6609b3 100644 --- a/base/setup/reactos/lang/sq-AL.rc +++ b/base/setup/reactos/lang/sq-AL.rc @@ -41,11 +41,11 @@ CAPTION "Instalimi i ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Computer:", IDC_STATIC, 20, 15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 + COMBOBOX IDC_COMPUTER, 100, 15, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Display:", IDC_STATIC, 20, 35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 + COMBOBOX IDC_DISPLAY, 100, 35, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Keyboard:", IDC_STATIC, 20, 55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 + COMBOBOX IDC_KEYBOARD, 100, 55, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Klikoni vazhdo për instalim të pajisjeve.", IDC_STATIC, 7, 128, 297, 8 END diff --git a/base/setup/reactos/lang/tr-TR.rc b/base/setup/reactos/lang/tr-TR.rc index 5a3032edb43..1443a70524c 100644 --- a/base/setup/reactos/lang/tr-TR.rc +++ b/base/setup/reactos/lang/tr-TR.rc @@ -46,11 +46,11 @@ CAPTION "ReactOS Kur" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bilgisayar:", IDC_STATIC, 20, 15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 + COMBOBOX IDC_COMPUTER, 100, 15, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Ekran:", IDC_STATIC, 20, 35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 + COMBOBOX IDC_DISPLAY, 100, 35, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Klavye:", IDC_STATIC, 20, 55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 + COMBOBOX IDC_KEYBOARD, 100, 55, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Kurulum aygıtında kuruluma devam etmek için İleri'ye tıklayın", IDC_STATIC, 7, 128, 297, 8 END diff --git a/base/setup/reactos/lang/uk-UA.rc b/base/setup/reactos/lang/uk-UA.rc index ac49c899fef..fefc19c1db6 100644 --- a/base/setup/reactos/lang/uk-UA.rc +++ b/base/setup/reactos/lang/uk-UA.rc @@ -47,11 +47,11 @@ CAPTION "Встановлення ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Комп’ютер:", IDC_STATIC, 20, 15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 + COMBOBOX IDC_COMPUTER, 100, 15, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Екран:", IDC_STATIC, 20, 35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 + COMBOBOX IDC_DISPLAY, 100, 35, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Клавіатура:", IDC_STATIC, 20, 55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 + COMBOBOX IDC_KEYBOARD, 100, 55, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Для встановлення пристроїв натисніть Далі.", IDC_STATIC, 7, 128, 297, 8 END diff --git a/base/setup/reactos/lang/vi-VN.rc b/base/setup/reactos/lang/vi-VN.rc index e0a81526d29..0d67ca9f335 100644 --- a/base/setup/reactos/lang/vi-VN.rc +++ b/base/setup/reactos/lang/vi-VN.rc @@ -39,11 +39,11 @@ CAPTION "Cài đặt ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Máy tính:", IDC_STATIC, 20, 15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 + COMBOBOX IDC_COMPUTER, 100, 15, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Màn hình:", IDC_STATIC, 20, 35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 + COMBOBOX IDC_DISPLAY, 100, 35, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Bàn phím:", IDC_STATIC, 20, 55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 + COMBOBOX IDC_KEYBOARD, 100, 55, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "Ấn Tiếp để thiết lập thiết bị cài đặt.", IDC_STATIC, 7, 128, 297, 8 END diff --git a/base/setup/reactos/lang/zh-CN.rc b/base/setup/reactos/lang/zh-CN.rc index 41d8f9c2d2e..03b0a20ec5e 100644 --- a/base/setup/reactos/lang/zh-CN.rc +++ b/base/setup/reactos/lang/zh-CN.rc @@ -39,11 +39,11 @@ CAPTION "ReactOS 安装程序" FONT 9, "宋体" BEGIN LTEXT "计算机：", IDC_STATIC, 20, 15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 + COMBOBOX IDC_COMPUTER, 100, 15, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "显示：", IDC_STATIC, 20, 35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 + COMBOBOX IDC_DISPLAY, 100, 35, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "键盘：", IDC_STATIC, 20, 55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 + COMBOBOX IDC_KEYBOARD, 100, 55, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "点击下一步设置安装驱动器。", IDC_STATIC, 7, 128, 297, 8 END diff --git a/base/setup/reactos/lang/zh-HK.rc b/base/setup/reactos/lang/zh-HK.rc index c1e4dd8a9a9..7e7ec6d7420 100644 --- a/base/setup/reactos/lang/zh-HK.rc +++ b/base/setup/reactos/lang/zh-HK.rc @@ -47,11 +47,11 @@ CAPTION "ReactOS 安裝程式" FONT 9, "新細明體" BEGIN LTEXT "電腦：", IDC_STATIC, 20, 15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 + COMBOBOX IDC_COMPUTER, 100, 15, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "顯示：", IDC_STATIC, 20, 35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 + COMBOBOX IDC_DISPLAY, 100, 35, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "鍵盤：", IDC_STATIC, 20, 55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 + COMBOBOX IDC_KEYBOARD, 100, 55, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "按［下一步］設定要安裝的磁碟機。", IDC_STATIC, 7, 128, 297, 8 END diff --git a/base/setup/reactos/lang/zh-TW.rc b/base/setup/reactos/lang/zh-TW.rc index a2d1653979c..baa23c4dd9c 100644 --- a/base/setup/reactos/lang/zh-TW.rc +++ b/base/setup/reactos/lang/zh-TW.rc @@ -48,11 +48,11 @@ CAPTION "ReactOS 安裝程式" FONT 9, "新細明體" BEGIN LTEXT "電腦：", IDC_STATIC, 20, 15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 + COMBOBOX IDC_COMPUTER, 100, 15, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "顯示：", IDC_STATIC, 20, 35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 + COMBOBOX IDC_DISPLAY, 100, 35, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "鍵盤：", IDC_STATIC, 20, 55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 + COMBOBOX IDC_KEYBOARD, 100, 55, 180, 80, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST LTEXT "按［下一步］設定安裝的磁碟機。", IDC_STATIC, 7, 128, 297, 8 END

10 months

[reactos] 01/02: [SETUP:REACTOS] Fix layout of the Restart-page.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd51cd14d6a6d441800af… commit bd51cd14d6a6d441800afa5a886f7d3eed53619b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Oct 31 16:53:26 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 17 20:57:10 2023 +0100 [SETUP:REACTOS] Fix layout of the Restart-page. --- base/setup/reactos/lang/bg-BG.rc | 8 ++++---- base/setup/reactos/lang/cs-CZ.rc | 8 ++++---- base/setup/reactos/lang/de-DE.rc | 8 ++++---- base/setup/reactos/lang/el-GR.rc | 8 ++++---- base/setup/reactos/lang/en-US.rc | 4 ++-- base/setup/reactos/lang/es-ES.rc | 8 ++++---- base/setup/reactos/lang/et-EE.rc | 8 ++++---- base/setup/reactos/lang/eu-ES.rc | 8 ++++---- base/setup/reactos/lang/fi-FI.rc | 10 +++++----- base/setup/reactos/lang/fr-FR.rc | 8 ++++---- base/setup/reactos/lang/he-IL.rc | 8 ++++---- base/setup/reactos/lang/hi-IN.rc | 5 +++-- base/setup/reactos/lang/hu-HU.rc | 8 ++++---- base/setup/reactos/lang/id-ID.rc | 4 ++-- base/setup/reactos/lang/it-IT.rc | 8 ++++---- base/setup/reactos/lang/ja-JP.rc | 6 +++--- base/setup/reactos/lang/ms-MY.rc | 8 ++++---- base/setup/reactos/lang/no-NO.rc | 8 ++++---- base/setup/reactos/lang/pl-PL.rc | 8 ++++---- base/setup/reactos/lang/pt-BR.rc | 8 ++++---- base/setup/reactos/lang/pt-PT.rc | 8 ++++---- base/setup/reactos/lang/ro-RO.rc | 8 ++++---- base/setup/reactos/lang/ru-RU.rc | 8 ++++---- base/setup/reactos/lang/sk-SK.rc | 8 ++++---- base/setup/reactos/lang/sq-AL.rc | 8 ++++---- base/setup/reactos/lang/tr-TR.rc | 8 ++++---- base/setup/reactos/lang/uk-UA.rc | 8 ++++---- base/setup/reactos/lang/vi-VN.rc | 4 ++-- base/setup/reactos/lang/zh-CN.rc | 8 ++++---- base/setup/reactos/lang/zh-HK.rc | 8 ++++---- base/setup/reactos/lang/zh-TW.rc | 8 ++++---- 31 files changed, 117 insertions(+), 116 deletions(-) diff --git a/base/setup/reactos/lang/bg-BG.rc b/base/setup/reactos/lang/bg-BG.rc index 41d203e6781..dd8010c643b 100644 --- a/base/setup/reactos/lang/bg-BG.rc +++ b/base/setup/reactos/lang/bg-BG.rc @@ -133,10 +133,10 @@ CAPTION "Настройка на РеактОС" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "Първата степен от настройването на РеактОС приключи успешно.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "Когато натиснете „Край”, компютърът ви ще се презапусне.", IDC_STATIC, 20, 80, 277, 10 - CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Ако в устройството има КД, го извадете. След това натиснете „Приключване“, за да презапуснете компютъра.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "Първата степен от настройването на РеактОС приключи успешно.", IDC_STATIC, 115, 50, 195, 17 + LTEXT "Когато натиснете „Край”, компютърът ви ще се презапусне.", IDC_STATIC, 115, 80, 195, 17 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 + LTEXT "Ако в устройството има КД, го извадете. След това натиснете „Приключване“, за да презапуснете компютъра.", IDC_STATIC, 115, 169, 195, 17 END STRINGTABLE diff --git a/base/setup/reactos/lang/cs-CZ.rc b/base/setup/reactos/lang/cs-CZ.rc index a40c426f78d..6e83906babd 100644 --- a/base/setup/reactos/lang/cs-CZ.rc +++ b/base/setup/reactos/lang/cs-CZ.rc @@ -139,10 +139,10 @@ CAPTION "Instalace systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "První část instalace systému ReactOS byla úspěšně dokončena.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "Po klepnutí na Dokončit bude počítač restartován.", IDC_STATIC, 20, 80, 277, 10 - CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Pokud je v mechanice instalační CD, vyjměte jej. Poté kliknutím na Dokončit restartujte počítač.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "První část instalace systému ReactOS byla úspěšně dokončena.", IDC_STATIC, 115, 50, 195, 17 + LTEXT "Po klepnutí na Dokončit bude počítač restartován.", IDC_STATIC, 115, 80, 195, 17 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 + LTEXT "Pokud je v mechanice instalační CD, vyjměte jej. Poté kliknutím na Dokončit restartujte počítač.", IDC_STATIC, 115, 169, 195, 17 END STRINGTABLE diff --git a/base/setup/reactos/lang/de-DE.rc b/base/setup/reactos/lang/de-DE.rc index 1e245c35731..89ba88532da 100644 --- a/base/setup/reactos/lang/de-DE.rc +++ b/base/setup/reactos/lang/de-DE.rc @@ -133,10 +133,10 @@ CAPTION "ReactOS-Setup" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "Sie haben die erste Stufe des ReactOS-Setup erfolgreich abgeschlossen.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "Wenn Sie auf Beenden klicken, wird der Computer neu gestartet.", IDC_STATIC, 20, 80, 277, 10 - CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Wenn eine CD im Laufwerk ist, entfernen Sie diese. Klicken Sie zum Neustart auf Beenden.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "Sie haben die erste Stufe des ReactOS-Setup erfolgreich abgeschlossen.", IDC_STATIC, 115, 50, 195, 17 + LTEXT "Wenn Sie auf Beenden klicken, wird der Computer neu gestartet.", IDC_STATIC, 115, 80, 195, 17 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 + LTEXT "Wenn eine CD im Laufwerk ist, entfernen Sie diese. Klicken Sie zum Neustart auf Beenden.", IDC_STATIC, 115, 169, 195, 17 END STRINGTABLE diff --git a/base/setup/reactos/lang/el-GR.rc b/base/setup/reactos/lang/el-GR.rc index 81d3bff8b88..c7545e9818e 100644 --- a/base/setup/reactos/lang/el-GR.rc +++ b/base/setup/reactos/lang/el-GR.rc @@ -133,10 +133,10 @@ CAPTION "Εγκατάσταση του ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "Ολοκληρώσατε επιτυχώς το πρώτο στάδιο της εγκατάστασης του ReactOS.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "Όταν πατήσετε Ολοκλήρωση, θα γίνει επανεκκίνηση του υπολογιστή σας.", IDC_STATIC, 20, 80, 277, 10 - CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Αν υπάρχει κάποιο CD, αφαιρέστε το. Έπειτα, για να γίνει επανεκκίνηση, πατήστε Ολοκλήρωση.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "Ολοκληρώσατε επιτυχώς το πρώτο στάδιο της εγκατάστασης του ReactOS.", IDC_STATIC, 115, 50, 195, 17 + LTEXT "Όταν πατήσετε Ολοκλήρωση, θα γίνει επανεκκίνηση του υπολογιστή σας.", IDC_STATIC, 115, 80, 195, 17 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 + LTEXT "Αν υπάρχει κάποιο CD, αφαιρέστε το. Έπειτα, για να γίνει επανεκκίνηση, πατήστε Ολοκλήρωση.", IDC_STATIC, 115, 169, 195, 17 END STRINGTABLE diff --git a/base/setup/reactos/lang/en-US.rc b/base/setup/reactos/lang/en-US.rc index 68ee6cac5a0..74ed3d4bbdd 100644 --- a/base/setup/reactos/lang/en-US.rc +++ b/base/setup/reactos/lang/en-US.rc @@ -133,8 +133,8 @@ CAPTION "Completing ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 115, 50, 195, 10 - LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 115, 80, 195, 10 + LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 115, 50, 195, 17 + LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 115, 80, 195, 17 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 LTEXT "If there is a CD in a drive, remove it. Then, to restart your computer, click Finish.", IDC_STATIC, 115, 169, 195, 17 END diff --git a/base/setup/reactos/lang/es-ES.rc b/base/setup/reactos/lang/es-ES.rc index a0370b74665..746dafeb4d2 100644 --- a/base/setup/reactos/lang/es-ES.rc +++ b/base/setup/reactos/lang/es-ES.rc @@ -142,10 +142,10 @@ CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Completando el Asistente de Instalación de ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "La primera parte de la instalación de ReactOS se ha completado satisfactoriamente.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "Cuando presione Finalizar, su equipo se reiniciará.", IDC_STATIC, 20, 80, 277, 10 - CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Si tiene CDs en alguna unidad, retírelos. Luego, reinicie el equipo haciendo clic en Finalizar.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "La primera parte de la instalación de ReactOS se ha completado satisfactoriamente.", IDC_STATIC, 115, 50, 195, 17 + LTEXT "Cuando presione Finalizar, su equipo se reiniciará.", IDC_STATIC, 115, 80, 195, 17 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 + LTEXT "Si tiene CDs en alguna unidad, retírelos. Luego, reinicie el equipo haciendo clic en Finalizar.", IDC_STATIC, 115, 169, 195, 17 END STRINGTABLE diff --git a/base/setup/reactos/lang/et-EE.rc b/base/setup/reactos/lang/et-EE.rc index 0a03a5d379f..45522859bea 100644 --- a/base/setup/reactos/lang/et-EE.rc +++ b/base/setup/reactos/lang/et-EE.rc @@ -133,10 +133,10 @@ CAPTION "ReactOS'i paigalduse lõpetamine" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Reactos'i paigaldusviisardi lõpetamine", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "ReactOS'i paigaldamise esimene järk on edukalt lõpetatud.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "Vajuta Lõpeta, et arvuti taaskäivitada.", IDC_STATIC, 20, 80, 277, 10 - CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Võta CD välja ja vajuta Lõpeta, et arvuti taaskäivitada.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "ReactOS'i paigaldamise esimene järk on edukalt lõpetatud.", IDC_STATIC, 115, 50, 195, 17 + LTEXT "Vajuta Lõpeta, et arvuti taaskäivitada.", IDC_STATIC, 115, 80, 195, 17 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 + LTEXT "Võta CD välja ja vajuta Lõpeta, et arvuti taaskäivitada.", IDC_STATIC, 115, 169, 195, 17 END STRINGTABLE diff --git a/base/setup/reactos/lang/eu-ES.rc b/base/setup/reactos/lang/eu-ES.rc index e0397efac90..771f640cb81 100644 --- a/base/setup/reactos/lang/eu-ES.rc +++ b/base/setup/reactos/lang/eu-ES.rc @@ -140,10 +140,10 @@ CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Completando el Asistente de Instalación de ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "La primera parte de la instalación de ReactOS se ha completado satisfactoriamente.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "Cuando presione Finalizar, su equipo se reiniciará.", IDC_STATIC, 20, 80, 277, 10 - CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Si tiene CDs en alguna unidad, retírelos. Luego, reinicie el equipo haciendo clic en Finalizar.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "La primera parte de la instalación de ReactOS se ha completado satisfactoriamente.", IDC_STATIC, 115, 50, 195, 17 + LTEXT "Cuando presione Finalizar, su equipo se reiniciará.", IDC_STATIC, 115, 80, 195, 17 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 + LTEXT "Si tiene CDs en alguna unidad, retírelos. Luego, reinicie el equipo haciendo clic en Finalizar.", IDC_STATIC, 115, 169, 195, 17 END STRINGTABLE diff --git a/base/setup/reactos/lang/fi-FI.rc b/base/setup/reactos/lang/fi-FI.rc index 52e199f3b0f..2494f9d6c1d 100644 --- a/base/setup/reactos/lang/fi-FI.rc +++ b/base/setup/reactos/lang/fi-FI.rc @@ -127,16 +127,16 @@ BEGIN CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 END -IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 143 +IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10 - CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "If there is a CD in a drive, remove it. Then, to restart your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 115, 50, 195, 17 + LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 115, 80, 195, 17 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 + LTEXT "If there is a CD in a drive, remove it. Then, to restart your computer, click Finish.", IDC_STATIC, 115, 169, 195, 17 END STRINGTABLE diff --git a/base/setup/reactos/lang/fr-FR.rc b/base/setup/reactos/lang/fr-FR.rc index fe38ddcf1ac..03da11b938a 100644 --- a/base/setup/reactos/lang/fr-FR.rc +++ b/base/setup/reactos/lang/fr-FR.rc @@ -133,10 +133,10 @@ CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Finalisation de l'assistant d'installation de ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "Vous avez complété avec succès la première étape d'installation de ReactOS.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "Si vous appuyez sur Terminer, votre ordinateur va redémarrer.", IDC_STATIC, 20, 80, 277, 10 - CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "S'il y a un CD dans le lecteur, retirez le. Appuyez ensuite sur Terminer pour redémarrer votre ordinateur.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "Vous avez complété avec succès la première étape d'installation de ReactOS.", IDC_STATIC, 115, 50, 195, 17 + LTEXT "Si vous appuyez sur Terminer, votre ordinateur va redémarrer.", IDC_STATIC, 115, 80, 195, 17 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 + LTEXT "S'il y a un CD dans le lecteur, retirez le. Appuyez ensuite sur Terminer pour redémarrer votre ordinateur.", IDC_STATIC, 115, 169, 195, 17 END STRINGTABLE diff --git a/base/setup/reactos/lang/he-IL.rc b/base/setup/reactos/lang/he-IL.rc index 2e6e9f750bc..2101567c561 100644 --- a/base/setup/reactos/lang/he-IL.rc +++ b/base/setup/reactos/lang/he-IL.rc @@ -135,10 +135,10 @@ CAPTION "התקנת ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "כאשר תלחץ על 'סיים' המחשב שלך יפעיל את עצמו מחדש", IDC_STATIC, 20, 80, 277, 10 - CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "'אם יש דיסק בכונן, הסר אותו ואז, בשביל מחדש את המחשב לחץ על 'סיום", IDC_STATIC, 10, 180, 297, 20 + LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 115, 50, 195, 17 + LTEXT "כאשר תלחץ על 'סיים' המחשב שלך יפעיל את עצמו מחדש", IDC_STATIC, 115, 80, 195, 17 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 + LTEXT "'אם יש דיסק בכונן, הסר אותו ואז, בשביל מחדש את המחשב לחץ על 'סיום", IDC_STATIC, 115, 169, 195, 17 END STRINGTABLE diff --git a/base/setup/reactos/lang/hi-IN.rc b/base/setup/reactos/lang/hi-IN.rc index 034da472dca..ac16dc32225 100644 --- a/base/setup/reactos/lang/hi-IN.rc +++ b/base/setup/reactos/lang/hi-IN.rc @@ -110,8 +110,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "रिऐक्ट ओएस सेटअप को पूरा करना" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "आपने रिऐक्ट ओएस सेटअप का पहला चरण सफलतापूर्वक पूरा कर लिया है।", IDC_STATIC, 115, 50, 195, 10 - LTEXT "जब आप समाप्त क्लिक करते हैं, तो आपका कंप्यूटर रीस्टॉर्ट होगा।", IDC_STATIC, 115, 80, 195, 10 + LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 + LTEXT "आपने रिऐक्ट ओएस सेटअप का पहला चरण सफलतापूर्वक पूरा कर लिया है।", IDC_STATIC, 115, 50, 195, 17 + LTEXT "जब आप समाप्त क्लिक करते हैं, तो आपका कंप्यूटर रीस्टॉर्ट होगा।", IDC_STATIC, 115, 80, 195, 17 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 LTEXT "यदि ड्राइव में सीडी है, तो इसे हटा दें। फिर, अपने कंप्यूटर को पुनरारंभ करने के लिए, समाप्त क्लिक करें।", IDC_STATIC, 115, 169, 195, 17 END diff --git a/base/setup/reactos/lang/hu-HU.rc b/base/setup/reactos/lang/hu-HU.rc index 7b2a1c55e39..348a9af2b65 100644 --- a/base/setup/reactos/lang/hu-HU.rc +++ b/base/setup/reactos/lang/hu-HU.rc @@ -135,10 +135,10 @@ CAPTION "ReactOS telepítõ" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10 - CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "If there is a CD in a drive, remove it. Then, to restart your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 115, 50, 195, 17 + LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 115, 80, 195, 17 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 + LTEXT "If there is a CD in a drive, remove it. Then, to restart your computer, click Finish.", IDC_STATIC, 115, 169, 195, 17 END STRINGTABLE diff --git a/base/setup/reactos/lang/id-ID.rc b/base/setup/reactos/lang/id-ID.rc index 4ad9a414123..896533ce7cc 100644 --- a/base/setup/reactos/lang/id-ID.rc +++ b/base/setup/reactos/lang/id-ID.rc @@ -133,8 +133,8 @@ CAPTION "Menyelesaikan Penyetelan ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Menyelesaikan Penuntun Penyetelan ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "Anda menyelesaikan tahap pertama Penyetelan ReactOS dengan berhasil.", IDC_STATIC, 115, 50, 195, 10 - LTEXT "Ketika tombol Selesai ditekan, komputer akan memulai ulang.", IDC_STATIC, 115, 80, 195, 10 + LTEXT "Anda menyelesaikan tahap pertama Penyetelan ReactOS dengan berhasil.", IDC_STATIC, 115, 50, 195, 17 + LTEXT "Ketika tombol Selesai ditekan, komputer akan memulai ulang.", IDC_STATIC, 115, 80, 195, 17 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 LTEXT "Jika terdapat CD pada drive, keluarkan. Lalu, untuk memulai ulang komputer, klik Selesai.", IDC_STATIC, 115, 169, 195, 17 END diff --git a/base/setup/reactos/lang/it-IT.rc b/base/setup/reactos/lang/it-IT.rc index 0badfc07461..c315ecee269 100644 --- a/base/setup/reactos/lang/it-IT.rc +++ b/base/setup/reactos/lang/it-IT.rc @@ -133,10 +133,10 @@ CAPTION "Installazione di ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "La prima fase è stata completata in modo regolare.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "Quando verrà premuto fine il computer si riavvierà.", IDC_STATIC, 20, 80, 277, 10 - CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Se presente rimuovere il CD dal lettore e cliccare Fine per riavviare il computer.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "La prima fase è stata completata in modo regolare.", IDC_STATIC, 115, 50, 195, 17 + LTEXT "Quando verrà premuto fine il computer si riavvierà.", IDC_STATIC, 115, 80, 195, 17 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 + LTEXT "Se presente rimuovere il CD dal lettore e cliccare Fine per riavviare il computer.", IDC_STATIC, 115, 169, 195, 17 END STRINGTABLE diff --git a/base/setup/reactos/lang/ja-JP.rc b/base/setup/reactos/lang/ja-JP.rc index d19a5e3c9d6..7d4e0ffcc02 100644 --- a/base/setup/reactos/lang/ja-JP.rc +++ b/base/setup/reactos/lang/ja-JP.rc @@ -133,10 +133,10 @@ CAPTION "ReactOS セットアップ" FONT 9, "MS UI Gothic" BEGIN LTEXT "ReactOS セットアップウィザードの完了", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "ReactOS セットアップの最初の段階が正しく完了しました。", IDC_STATIC, 115, 50, 195, 10 - LTEXT "完了をクリックすると、あなたのコンピュータは再起動されます。", IDC_STATIC, 115, 80, 195, 20 + LTEXT "ReactOS セットアップの最初の段階が正しく完了しました。", IDC_STATIC, 115, 50, 195, 17 + LTEXT "完了をクリックすると、あなたのコンピュータは再起動されます。", IDC_STATIC, 115, 80, 195, 17 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 - LTEXT "もしCDがドライブにあれば、取り除いて下さい。その後、あなたのコンピュータを再起動するには、完了をクリックして下さい。", IDC_STATIC, 115, 163, 195, 26 + LTEXT "もしCDがドライブにあれば、取り除いて下さい。その後、あなたのコンピュータを再起動するには、完了をクリックして下さい。", IDC_STATIC, 115, 169, 195, 17 END STRINGTABLE diff --git a/base/setup/reactos/lang/ms-MY.rc b/base/setup/reactos/lang/ms-MY.rc index afed079f8f2..680af8794d6 100644 --- a/base/setup/reactos/lang/ms-MY.rc +++ b/base/setup/reactos/lang/ms-MY.rc @@ -135,10 +135,10 @@ CAPTION "ReactOS Persediaan" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "Anda telah berjaya melengkapkan tahap pertama persediaan ReactOS.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "Apabila anda klik Selesai, komputer akan dimulakan semula.", IDC_STATIC, 20, 80, 277, 10 - CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Jika ada CD ke dalam pemacu, mengeluarkannya. Kemudian, untuk memulakan semula komputer anda, klik selesai.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "Anda telah berjaya melengkapkan tahap pertama persediaan ReactOS.", IDC_STATIC, 115, 50, 195, 17 + LTEXT "Apabila anda klik Selesai, komputer akan dimulakan semula.", IDC_STATIC, 115, 80, 195, 17 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 + LTEXT "Jika ada CD ke dalam pemacu, mengeluarkannya. Kemudian, untuk memulakan semula komputer anda, klik selesai.", IDC_STATIC, 115, 169, 195, 17 END STRINGTABLE diff --git a/base/setup/reactos/lang/no-NO.rc b/base/setup/reactos/lang/no-NO.rc index 45c6f94d8aa..914c2b91aec 100644 --- a/base/setup/reactos/lang/no-NO.rc +++ b/base/setup/reactos/lang/no-NO.rc @@ -133,10 +133,10 @@ CAPTION "ReactOS installering" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "Du har nå fullført første steget av ReactOS installering.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "Når du trykker Fullført, vil din datamaskin starte på nytt.", IDC_STATIC, 20, 80, 277, 10 - CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Hvis du fortsatt har CD platen i stasjon, fjern denne. For å starte din datamaskin på nytt, trykk på Fullført.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "Du har nå fullført første steget av ReactOS installering.", IDC_STATIC, 115, 50, 195, 17 + LTEXT "Når du trykker Fullført, vil din datamaskin starte på nytt.", IDC_STATIC, 115, 80, 195, 17 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 + LTEXT "Hvis du fortsatt har CD platen i stasjon, fjern denne. For å starte din datamaskin på nytt, trykk på Fullført.", IDC_STATIC, 115, 169, 195, 17 END STRINGTABLE diff --git a/base/setup/reactos/lang/pl-PL.rc b/base/setup/reactos/lang/pl-PL.rc index c6d8251b1ff..89b8ed1cc24 100644 --- a/base/setup/reactos/lang/pl-PL.rc +++ b/base/setup/reactos/lang/pl-PL.rc @@ -144,10 +144,10 @@ CAPTION "Instalator systemu ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Kończenie pracy Kreatora instalacji systemu ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "Pierwszy etap instalacji ReactOS został pomyślnie zakończony.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "Po kliknięciu na przycisk Zakończ, komputer zostanie uruchomiony ponownie.", IDC_STATIC, 20, 80, 277, 10 - CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Jeśli w napędzie jest płyta CD, wyjmij ją. Następnie Kliknij Zakończ, aby ponownie uruchomić komputer.", IDC_STATIC, 10, 175, 297, 20 + LTEXT "Pierwszy etap instalacji ReactOS został pomyślnie zakończony.", IDC_STATIC, 115, 50, 195, 17 + LTEXT "Po kliknięciu na przycisk Zakończ, komputer zostanie uruchomiony ponownie.", IDC_STATIC, 115, 80, 195, 17 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 + LTEXT "Jeśli w napędzie jest płyta CD, wyjmij ją. Następnie Kliknij Zakończ, aby ponownie uruchomić komputer.", IDC_STATIC, 115, 169, 195, 17 END STRINGTABLE diff --git a/base/setup/reactos/lang/pt-BR.rc b/base/setup/reactos/lang/pt-BR.rc index 3c57520ed03..a519ea4d367 100644 --- a/base/setup/reactos/lang/pt-BR.rc +++ b/base/setup/reactos/lang/pt-BR.rc @@ -133,10 +133,10 @@ CAPTION "Instalação do ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "A primeira etapa de Instalação do ReactOS foi efetuada com sucesso.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "Clique em Finalizar para reiniciar o computador.", IDC_STATIC, 20, 80, 277, 10 - CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Se houver um CD no drive, remova-o. Após isto, clique em Finalizar para reiniciar o computador.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "A primeira etapa de Instalação do ReactOS foi efetuada com sucesso.", IDC_STATIC, 115, 50, 195, 17 + LTEXT "Clique em Finalizar para reiniciar o computador.", IDC_STATIC, 115, 80, 195, 17 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 + LTEXT "Se houver um CD no drive, remova-o. Após isto, clique em Finalizar para reiniciar o computador.", IDC_STATIC, 115, 169, 195, 17 END STRINGTABLE diff --git a/base/setup/reactos/lang/pt-PT.rc b/base/setup/reactos/lang/pt-PT.rc index fe69376e46d..5e46b78a50f 100644 --- a/base/setup/reactos/lang/pt-PT.rc +++ b/base/setup/reactos/lang/pt-PT.rc @@ -133,10 +133,10 @@ CAPTION "Instalação do ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Finalizando o ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "A primeira etapa de Instalação do ReactOS foi efectuada com exito.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "Clique em Finalizar para reiniciar o computador.", IDC_STATIC, 20, 80, 277, 10 - CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Se houver um CD no drive, remova-o. Após isto, clique em Finalizar para reiniciar o computador.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "A primeira etapa de Instalação do ReactOS foi efectuada com exito.", IDC_STATIC, 115, 50, 195, 17 + LTEXT "Clique em Finalizar para reiniciar o computador.", IDC_STATIC, 115, 80, 195, 17 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 + LTEXT "Se houver um CD no drive, remova-o. Após isto, clique em Finalizar para reiniciar o computador.", IDC_STATIC, 115, 169, 195, 17 END STRINGTABLE diff --git a/base/setup/reactos/lang/ro-RO.rc b/base/setup/reactos/lang/ro-RO.rc index 75b1f10e8d1..04cec85b167 100644 --- a/base/setup/reactos/lang/ro-RO.rc +++ b/base/setup/reactos/lang/ro-RO.rc @@ -142,10 +142,10 @@ CAPTION "Expert de instalare ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Finalizarea instalării asistate a ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "Ați dus la bun sfârșit prima etapă de instalare a ReactOS", IDC_STATIC, 20, 50, 277, 10 - LTEXT "Când veți apăsa „Sfârșit”, calculatorul va reporni.", IDC_STATIC, 20, 80, 277, 10 - CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Dacă aveți vreun CD în calculator, scoateți-l, după care apăsați „Sfârșit” pentru a reporni.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "Ați dus la bun sfârșit prima etapă de instalare a ReactOS.", IDC_STATIC, 115, 50, 195, 17 + LTEXT "Când veți apăsa „Sfârșit”, calculatorul va reporni.", IDC_STATIC, 115, 80, 195, 17 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 + LTEXT "Dacă aveți vreun CD în calculator, scoateți-l, după care apăsați „Sfârșit” pentru a reporni.", IDC_STATIC, 115, 169, 195, 17 END STRINGTABLE diff --git a/base/setup/reactos/lang/ru-RU.rc b/base/setup/reactos/lang/ru-RU.rc index 08c4b4373dc..ea5dc80a501 100644 --- a/base/setup/reactos/lang/ru-RU.rc +++ b/base/setup/reactos/lang/ru-RU.rc @@ -133,10 +133,10 @@ CAPTION "Установка ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "Первый этап установки ReactOS закончен.", IDC_STATIC, 115, 50, 182, 10 - LTEXT "После нажатия клавиши ""Завершить"" ваш компьютер будет перезагружен.", IDC_STATIC, 115, 80, 182, 20 - CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 120, 182, 8 - LTEXT "Вы можете извлечь установочный диск. Для перезагрузки компьютера нажмите клавишу ""Завершить"".", IDC_STATIC, 115, 166, 182, 25 + LTEXT "Первый этап установки ReactOS закончен.", IDC_STATIC, 115, 50, 195, 17 + LTEXT "После нажатия клавиши ""Завершить"" ваш компьютер будет перезагружен.", IDC_STATIC, 115, 80, 195, 17 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 + LTEXT "Вы можете извлечь установочный диск. Для перезагрузки компьютера нажмите клавишу ""Завершить"".", IDC_STATIC, 115, 169, 195, 17 END STRINGTABLE diff --git a/base/setup/reactos/lang/sk-SK.rc b/base/setup/reactos/lang/sk-SK.rc index b7621907fb8..72dbb0e0a3e 100644 --- a/base/setup/reactos/lang/sk-SK.rc +++ b/base/setup/reactos/lang/sk-SK.rc @@ -138,10 +138,10 @@ CAPTION "Inštalácia systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "Kliknutím na tlačidlo Dokončiť reštartujete počítač.", IDC_STATIC, 20, 80, 277, 10 - CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "If there is a CD in a drive, remove it. Then, to restart your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 115, 50, 195, 17 + LTEXT "Kliknutím na tlačidlo Dokončiť reštartujete počítač.", IDC_STATIC, 115, 80, 195, 17 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 + LTEXT "If there is a CD in a drive, remove it. Then, to restart your computer, click Finish.", IDC_STATIC, 115, 169, 195, 17 END STRINGTABLE diff --git a/base/setup/reactos/lang/sq-AL.rc b/base/setup/reactos/lang/sq-AL.rc index 4060a0090fc..d92601751fb 100644 --- a/base/setup/reactos/lang/sq-AL.rc +++ b/base/setup/reactos/lang/sq-AL.rc @@ -135,10 +135,10 @@ CAPTION "Instalimi i ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "Ju keni kompletuar me sukses fazën e parë të instalimit të ReactOS.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "Kur te klikoni mbarim, kompjuteri juaj do riniset.", IDC_STATIC, 20, 80, 277, 10 - CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Nëse keni nje CD në drive, hiqeni. Pastaj, për ta rinist kompjuterin tuaj, klikoni mbaroj.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "Ju keni kompletuar me sukses fazën e parë të instalimit të ReactOS.", IDC_STATIC, 115, 50, 195, 17 + LTEXT "Kur te klikoni mbarim, kompjuteri juaj do riniset.", IDC_STATIC, 115, 80, 195, 17 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 + LTEXT "Nëse keni nje CD në drive, hiqeni. Pastaj, për ta rinist kompjuterin tuaj, klikoni mbaroj.", IDC_STATIC, 115, 169, 195, 17 END STRINGTABLE diff --git a/base/setup/reactos/lang/tr-TR.rc b/base/setup/reactos/lang/tr-TR.rc index 4e84d17c1e7..5a3032edb43 100644 --- a/base/setup/reactos/lang/tr-TR.rc +++ b/base/setup/reactos/lang/tr-TR.rc @@ -140,10 +140,10 @@ CAPTION "ReactOS Kur" FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS Kurulum Sihirbazını Tamamlama", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "ReactOS kurulumunun ilk aşamasını başarıyla bitirdiniz.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "Bitir'e tıkladığınızda bilgisayarınız yeniden başlatılacaktır.", IDC_STATIC, 20, 80, 277, 10 - CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Eğer bir sürücüde bir CD varsa onu çıkartınız. Sonra, bilgisayarınızı yeniden başlatmak için Bitir'e tıklayınız.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "ReactOS kurulumunun ilk aşamasını başarıyla bitirdiniz.", IDC_STATIC, 115, 50, 195, 17 + LTEXT "Bitir'e tıkladığınızda bilgisayarınız yeniden başlatılacaktır.", IDC_STATIC, 115, 80, 195, 17 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 + LTEXT "Eğer bir sürücüde bir CD varsa onu çıkartınız. Sonra, bilgisayarınızı yeniden başlatmak için Bitir'e tıklayınız.", IDC_STATIC, 115, 169, 195, 17 END STRINGTABLE diff --git a/base/setup/reactos/lang/uk-UA.rc b/base/setup/reactos/lang/uk-UA.rc index 371a2e61709..ac49c899fef 100644 --- a/base/setup/reactos/lang/uk-UA.rc +++ b/base/setup/reactos/lang/uk-UA.rc @@ -141,10 +141,10 @@ CAPTION "Встановлення ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "Перший етап встановлення ReactOS завершено.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "Після натискання клавіші Завершити ваш комп'ютер буде перезавантажений.", IDC_STATIC, 20, 80, 277, 10 - CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Ви можете витягнути інсталяційний диск. Для перезавантаження комп'ютера натисніть Завершити", IDC_STATIC, 10, 180, 297, 20 + LTEXT "Перший етап встановлення ReactOS завершено.", IDC_STATIC, 115, 50, 195, 17 + LTEXT "Після натискання клавіші Завершити ваш комп'ютер буде перезавантажений.", IDC_STATIC, 115, 80, 195, 17 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 + LTEXT "Ви можете витягнути інсталяційний диск. Для перезавантаження комп'ютера натисніть Завершити", IDC_STATIC, 115, 169, 195, 17 END STRINGTABLE diff --git a/base/setup/reactos/lang/vi-VN.rc b/base/setup/reactos/lang/vi-VN.rc index c125df0d2ad..e0a81526d29 100644 --- a/base/setup/reactos/lang/vi-VN.rc +++ b/base/setup/reactos/lang/vi-VN.rc @@ -133,8 +133,8 @@ CAPTION "Đang hoàn tất cài đặt Reactos" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "Bạn đã hoàn thành giai đoạn đầu của việc thiết lập ReactOS.", IDC_STATIC, 115, 50, 195, 10 - LTEXT "bạn Khi bạn ấn Hoàn tất,máy tính của bạn sẽ khởi động lại.", IDC_STATIC, 115, 80, 195, 10 + LTEXT "Bạn đã hoàn thành giai đoạn đầu của việc thiết lập ReactOS.", IDC_STATIC, 115, 50, 195, 17 + LTEXT "bạn Khi bạn ấn Hoàn tất,máy tính của bạn sẽ khởi động lại.", IDC_STATIC, 115, 80, 195, 17 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 LTEXT "Nếu ổ đĩa của bạn còn chứa dĩa CD cài đặt, hãy lấy nó ra. Sau đó, ấn Hoàn tất để khởi động lại máy tính của bạn.", IDC_STATIC, 115, 169, 195, 17 END diff --git a/base/setup/reactos/lang/zh-CN.rc b/base/setup/reactos/lang/zh-CN.rc index 4c7c4327405..41d8f9c2d2e 100644 --- a/base/setup/reactos/lang/zh-CN.rc +++ b/base/setup/reactos/lang/zh-CN.rc @@ -133,10 +133,10 @@ CAPTION "ReactOS 安装程序已经完成" FONT 9, "宋体" BEGIN LTEXT "正在完成 ReactOS 安装程序向导", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "您成功完成 ReactOS 第一阶段安装过程。", IDC_STATIC, 20, 50, 277, 10 - LTEXT "点击完成后，您的电脑将会重新启动。", IDC_STATIC, 20, 80, 277, 10 - CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "请从光盘驱动器取出所有光盘。然后点击完成来重启您的电脑。", IDC_STATIC, 10, 180, 297, 20 + LTEXT "您成功完成 ReactOS 第一阶段安装过程。", IDC_STATIC, 115, 50, 195, 17 + LTEXT "点击完成后，您的电脑将会重新启动。", IDC_STATIC, 115, 80, 195, 17 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 + LTEXT "请从光盘驱动器取出所有光盘。然后点击完成来重启您的电脑。", IDC_STATIC, 115, 169, 195, 17 END STRINGTABLE diff --git a/base/setup/reactos/lang/zh-HK.rc b/base/setup/reactos/lang/zh-HK.rc index 8791c384731..c1e4dd8a9a9 100644 --- a/base/setup/reactos/lang/zh-HK.rc +++ b/base/setup/reactos/lang/zh-HK.rc @@ -141,10 +141,10 @@ CAPTION "正在完成 ReactOS 安裝程式" FONT 9, "新細明體" BEGIN LTEXT "正在完成 ReactOS 安裝程式", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "ReactOS 的第一階段安裝已順利完成。", IDC_STATIC, 20, 50, 277, 10 - LTEXT "當按下［完成］後，您的電腦將會重新啟動。", IDC_STATIC, 20, 80, 277, 10 - CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "如果光碟機內仍然有光碟，請將其取出。然後按［完成］，重新啟動您的電腦。", IDC_STATIC, 10, 180, 297, 20 + LTEXT "ReactOS 的第一階段安裝已順利完成。", IDC_STATIC, 115, 50, 195, 17 + LTEXT "當按下［完成］後，您的電腦將會重新啟動。", IDC_STATIC, 115, 80, 195, 17 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 + LTEXT "如果光碟機內仍然有光碟，請將其取出。然後按［完成］，重新啟動您的電腦。", IDC_STATIC, 115, 169, 195, 17 END STRINGTABLE diff --git a/base/setup/reactos/lang/zh-TW.rc b/base/setup/reactos/lang/zh-TW.rc index fa3da88fd8a..a2d1653979c 100644 --- a/base/setup/reactos/lang/zh-TW.rc +++ b/base/setup/reactos/lang/zh-TW.rc @@ -142,10 +142,10 @@ CAPTION "正在完成 ReactOS 安裝程式" FONT 9, "新細明體" BEGIN LTEXT "正在完成 ReactOS 安裝程式", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "ReactOS 的第一階段安裝已順利完成。", IDC_STATIC, 20, 50, 277, 10 - LTEXT "按下［完成］後，您的電腦將會重新啟動。", IDC_STATIC, 20, 80, 277, 10 - CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "如果光碟機裡還有光碟，請將其取出。然後按［完成］，重新啟動您的電腦。", IDC_STATIC, 10, 180, 297, 20 + LTEXT "ReactOS 的第一階段安裝已順利完成。", IDC_STATIC, 115, 50, 195, 17 + LTEXT "按下［完成］後，您的電腦將會重新啟動。", IDC_STATIC, 115, 80, 195, 17 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 + LTEXT "如果光碟機裡還有光碟，請將其取出。然後按［完成］，重新啟動您的電腦。", IDC_STATIC, 115, 169, 195, 17 END STRINGTABLE

10 months

[reactos] 01/01: Remove liberapay

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=474a8ea46bec44a915519… commit 474a8ea46bec44a9155194ef2bf92548a9bfca07 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Dec 17 16:27:45 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 17 16:27:45 2023 +0100 Remove liberapay --- .github/FUNDING.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index a5c570ac644..8990a266a20 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,2 +1 @@ custom: ['https://reactos.org/donate/', 'https://www.paypal.me/ReactOS'] -liberapay: ReactOS

10 months

[reactos] 01/01: [DXHALTEST] Correct some typos (#5737)

by Andrew Shelkovenko

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=44c7d9ad428c345e501af… commit 44c7d9ad428c345e501af375bea7262e5e45fdac Author: Andrew Shelkovenko <diakin(a)yandex.ru> AuthorDate: Sun Dec 17 15:56:39 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 17 15:56:39 2023 +0300 [DXHALTEST] Correct some typos (#5737) I.e. translate GreatLordish into proper English :) Reviewed-by: Robert Naumann <gonzomdx(a)gmail.com> Reviewed-by: Joachim Henze <joachim.henze(a)reactos.org> Reviewed-by: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> Reviewed-by: Carl J. Bialorucki <cbialo2(a)outlook.com> --- modules/rostests/tests/DxHalTest/main.c | 42 ++++++++++++++++----------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/rostests/tests/DxHalTest/main.c b/modules/rostests/tests/DxHalTest/main.c index ffc82451534..6d5c6bec22e 100644 --- a/modules/rostests/tests/DxHalTest/main.c +++ b/modules/rostests/tests/DxHalTest/main.c @@ -98,16 +98,16 @@ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrevInst, DdAttachSurface = (BOOL (APIENTRY*)(LPDDRAWI_DDRAWSURFACE_LCL, LPDDRAWI_DDRAWSURFACE_LCL))GetProcAddress(lib, "GdiEntry11"); DdResetVisrgn = (BOOL (APIENTRY*)(LPDDRAWI_DDRAWSURFACE_LCL, HWND))GetProcAddress(lib, "GdiEntry6"); - printf("This apps showing how to start up directx draw/d3d interface and some other as well\n"); - printf("This code have been releae to some close applactons with my premtions, if any company\n"); - printf("want use part or whole code, you need contact the orginal author to ask for premtions\n"); - printf("This code are release under alot of diffent licen\n"); - printf("All GPL and LGPL project have right use and studing this code.\n"); - printf("This code maybe need more comment to known how stuff working and maybe looking bit mesy\n"); - printf("Bestreagds Magnus Olsen magnus(a)greatlord.com or greatlord(a)reactos.org\n"); + printf("This app shows how to start up a DirectDraw/Direct3D interface and some others.\n"); + printf("This code has been released to some closed applications with my permission. If any company\n"); + printf("wants to use this code, you must contact the original author to ask for permission.\n"); + printf("This code is released under many different licenses.\n"); + printf("All GPL and LGPL projects have the right to use and study this code.\n"); + printf("This code may require more comments to know how stuff works.\n"); + printf("Best regards, Magnus Olsen magnus(a)greatlord.com or greatlord(a)reactos.org\n"); printf("Copyright 2006 by Magnus Olsen\n\n"); - printf("This demo showing how to start dx draw hal and create a primary surface,\n"); - printf("and a overlay sufrace and blt to the primary surface\n"); + printf("This demo shows how to start DirectDraw, creating a primary surface\n"); + printf("and an overlay surface, and a blt to the primary surface.\n"); /* @@ -208,11 +208,11 @@ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrevInst, mDDrawGlobal.dwRefCnt = 1; //addref / remove ref - // Do not relase HDC it have been map in kernel mode + // Do not release HDC, it has been mapped in kernel mode // DeleteDC(hdc); - /* we need reanable it if screen res have changes, and some bad drv need be reanble very few - to contiune */ + /* we need to reenable it if the screen resolution has changed, and some + bad driver needs to be reenabled infrequently to continue */ /* if (!DdReenableDirectDrawObject(&mDDrawGlobal, &newmode)) { @@ -254,7 +254,7 @@ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrevInst, HeapFree(GetProcessHeap(), 0, mpModeInfos); DeleteDC(hdc); DeleteObject(hbmp); - // FIXME Close DX fristcall and second call + // FIXME Close DX first call and second call return DD_FALSE; } @@ -265,8 +265,8 @@ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrevInst, HeapFree(GetProcessHeap(), 0, mpModeInfos); DeleteDC(hdc); DeleteObject(hbmp); - // FIXME Close DX fristcall and second call - printf("Fail to QueryDirect Draw Object frist pass\n"); + // FIXME Close DX first call and second call + printf("Fail to QueryDirect Draw Object first pass\n"); return DD_FALSE; } @@ -291,7 +291,7 @@ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrevInst, HeapFree(GetProcessHeap(), 0, mpModeInfos); DeleteDC(hdc); DeleteObject(hbmp); - // FIXME Close DX fristcall and second call + // FIXME Close DX first call and second call printf("Fail QueryDirect Draw Object to Alloc mpTextures \n"); return DD_FALSE; } @@ -328,7 +328,7 @@ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrevInst, Copy over from HalInfo to DirectDrawGlobal */ - // this is wrong, cDriverName need be in ASC code not UNICODE + // this is wrong, cDriverName needs to be in ASCII not UNICODE //memcpy(mDDrawGlobal.cDriverName, mDisplayAdapter, sizeof(wchar)*MAX_DRIVER_NAME); memcpy(&mDDrawGlobal.vmiData, &mHALInfo.vmiData,sizeof(VIDMEMINFO)); @@ -350,7 +350,7 @@ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrevInst, /* Hal insate is down now */ - /* cleare surface code now*/ + /* clear surface code now */ // memset(&mGlobal, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); // memset(&mMore, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); @@ -361,9 +361,9 @@ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrevInst, mPrimaryLocal.lpSurfMore = &mPrimaryMore; - /* cleare surface ends now */ + /* clear surface ends now */ - /* create primare surface now */ + /* create primary surface now */ memset(&mddsdPrimary, 0, sizeof(DDSURFACEDESC)); mddsdPrimary.dwSize = sizeof(DDSURFACEDESC); @@ -453,7 +453,7 @@ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrevInst, mDdBlt.lpDDDestSurface = mpPrimaryLocals[0]; - /* create primare surface is down now */ + /* create primary surface is down now */ /* create overlay surface now */

10 months

[reactos] 01/01: [SHELL32] ShellDispatch::ShellExecute must default to displaying the window (#6143)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=19a0f14bb19403e29d1a4… commit 19a0f14bb19403e29d1a43757f7cf5dab4e397d8 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sun Dec 17 13:48:24 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 17 15:48:24 2023 +0300 [SHELL32] ShellDispatch::ShellExecute must default to displaying the window (#6143) SW_HIDE is not the correct default show mode. This can be reproduced by simple script: WScript.CreateObject("Shell.Application").ShellExecute("calc.exe"); --- dll/win32/shell32/CShellDispatch.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/CShellDispatch.cpp b/dll/win32/shell32/CShellDispatch.cpp index d021bf5ea2b..7df94e0ae04 100644 --- a/dll/win32/shell32/CShellDispatch.cpp +++ b/dll/win32/shell32/CShellDispatch.cpp @@ -245,7 +245,7 @@ HRESULT STDMETHODCALLTYPE CShellDispatch::ShellExecute(BSTR file, VARIANT v_args { CComVariant args_str, dir_str, op_str, show_int; WCHAR *args = NULL, *dir = NULL, *op = NULL; - INT show = 0; + INT show = SW_SHOW; HINSTANCE ret; TRACE("(%s, %s, %s, %s, %s)\n", debugstr_w(file), debugstr_variant(&v_args),

10 months

← Newer
1
...
10
11
12
13
14
15
16
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2023