[ekohl] 70643: [REACTOS] - Remove the code that hides the system menu and the cancel button. Users should be able to cancel the installation process. - Add code to reboot ReactOS after completing o...
Author: ekohl Date: Mon Jan 25 22:39:26 2016 New Revision: 70643
URL: http://svn.reactos.org/svn/reactos?rev=70643&view=rev Log: [REACTOS] - Remove the code that hides the system menu and the cancel button. Users should be able to cancel the installation process. - Add code to reboot ReactOS after completing or cancelling the wizard. It is disabled for now. - Remove the groupbox on the device page. - Resize / realign the controls on the drive page. - Replace the listbox on the drive page by a list view.
Modified: trunk/reactos/base/setup/reactos/CMakeLists.txt trunk/reactos/base/setup/reactos/drivepage.c trunk/reactos/base/setup/reactos/lang/bg-BG.rc trunk/reactos/base/setup/reactos/lang/cs-CZ.rc trunk/reactos/base/setup/reactos/lang/de-DE.rc trunk/reactos/base/setup/reactos/lang/el-GR.rc trunk/reactos/base/setup/reactos/lang/en-US.rc trunk/reactos/base/setup/reactos/lang/es-ES.rc trunk/reactos/base/setup/reactos/lang/et-EE.rc trunk/reactos/base/setup/reactos/lang/fi-FI.rc trunk/reactos/base/setup/reactos/lang/fr-FR.rc trunk/reactos/base/setup/reactos/lang/he-IL.rc trunk/reactos/base/setup/reactos/lang/hu-HU.rc trunk/reactos/base/setup/reactos/lang/it-IT.rc trunk/reactos/base/setup/reactos/lang/ms-MY.rc trunk/reactos/base/setup/reactos/lang/no-NO.rc trunk/reactos/base/setup/reactos/lang/pl-PL.rc trunk/reactos/base/setup/reactos/lang/pt-BR.rc trunk/reactos/base/setup/reactos/lang/ro-RO.rc trunk/reactos/base/setup/reactos/lang/ru-RU.rc trunk/reactos/base/setup/reactos/lang/sk-SK.rc trunk/reactos/base/setup/reactos/lang/sq-AL.rc trunk/reactos/base/setup/reactos/lang/tr-TR.rc trunk/reactos/base/setup/reactos/lang/uk-UA.rc trunk/reactos/base/setup/reactos/lang/zh-CN.rc trunk/reactos/base/setup/reactos/lang/zh-TW.rc trunk/reactos/base/setup/reactos/reactos.c
Modified: trunk/reactos/base/setup/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/CMakeLis... ============================================================================== --- trunk/reactos/base/setup/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/CMakeLists.txt [iso-8859-1] Mon Jan 25 22:39:26 2016 @@ -10,5 +10,5 @@ add_pch(reactos reactos.h SOURCE) target_link_libraries(reactos uuid) set_module_type(reactos win32gui UNICODE) -add_importlibs(reactos gdi32 user32 comctl32 setupapi msvcrt kernel32 ntdll) +add_importlibs(reactos advapi32 gdi32 user32 comctl32 setupapi msvcrt kernel32 ntdll) add_cd_file(TARGET reactos DESTINATION reactos NO_CAB FOR bootcd)
Modified: trunk/reactos/base/setup/reactos/drivepage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/drivepag... ============================================================================== --- trunk/reactos/base/setup/reactos/drivepage.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/drivepage.c [iso-8859-1] Mon Jan 25 22:39:26 2016 @@ -126,24 +126,10 @@ { case WM_INITDIALOG: { - HWND hwndControl; - DWORD dwStyle; - /* Save pointer to the global setup data */ pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pSetupData);
- hwndControl = GetParent(hwndDlg); - - dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE); - SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); - - /* Set title font */ - /*SendDlgItemMessage(hwndDlg, - IDC_STARTTITLE, - WM_SETFONT, - (WPARAM)hTitleFont, - (LPARAM)TRUE);*/ #if 1 h = SetupDiGetClassDevs(&GUID_DEVCLASS_DISKDRIVE, NULL, NULL, DIGCF_PRESENT); if (h != INVALID_HANDLE_VALUE)
Modified: trunk/reactos/base/setup/reactos/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/bg-... ============================================================================== --- trunk/reactos/base/setup/reactos/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/bg-BG.rc [iso-8859-1] Mon Jan 25 22:39:26 2016 @@ -19,7 +19,7 @@ LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25 AUTORADIOBUTTON "ÐопÑавка или оÑÑвÑеменÑване на Ñложен РеакÑÐС", IDC_UPDATE, 7, 50, 277, 10 LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30 - LTEXT "ÐаÑиÑнеÑе âÐапÑедâ за наÑÑÑойка на ÑÑÑÑойÑÑваÑа.", IDC_STATIC, 10, 180, 297, 10 + LTEXT "ÐаÑиÑнеÑе âÐапÑедâ за наÑÑÑойка на ÑÑÑÑойÑÑваÑа.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -27,14 +27,13 @@ CAPTION "ÐаÑÑÑойка на РеакÑÐС" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ÐаÑÑÑойки на ÑÑÑÑойÑÑваÑа", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "ÐомпÑÑÑÑ:", IDC_STATIC, 20, 15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 150, 80 LTEXT " ÐкÑан:", IDC_STATIC, 20, 35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 150, 80 LTEXT "ÐлавиаÑÑÑа", IDC_STATIC, 20, 55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 150, 80 - LTEXT "ÐаÑиÑнеÑе âÐапÑедâ за Ð¸Ð·Ð±Ð¾Ñ Ð½Ð° ÑÑÑÑойÑÑво за Ñлагане.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "ÐаÑиÑнеÑе âÐапÑедâ за Ð¸Ð·Ð±Ð¾Ñ Ð½Ð° ÑÑÑÑойÑÑво за Ñлагане.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 @@ -42,12 +41,11 @@ CAPTION "ÐаÑÑÑойка на РеакÑÐС" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ÐÑл за Ñлагане на РеакÑÐС", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176 - LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "&СÑздаване", IDC_PARTCREATE, 20, 155, 50, 15 - PUSHBUTTON "Ðз&ÑÑиване", IDC_PARTDELETE, 76, 155, 50, 15 - PUSHBUTTON "ÐÑайвеÑ", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED - PUSHBUTTON "Раз&ÑиÑани вÑзможноÑÑи...", IDC_PARTMOREOPTS, 218, 155, 80, 15 + CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + PUSHBUTTON "&СÑздаване", IDC_PARTCREATE, 7, 122, 50, 15 + PUSHBUTTON "Ðз&ÑÑиване", IDC_PARTDELETE, 63, 122, 50, 15 + PUSHBUTTON "ÐÑайвеÑ", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED + PUSHBUTTON "Раз&ÑиÑани вÑзможноÑÑи...", IDC_PARTMOREOPTS, 230, 122, 80, 15 LTEXT "ÐаÑиÑнеÑе âÐапÑедâ, за да запоÑне ÑлаганеÑо.", IDC_STATIC, 10, 180, 277, 20 END
Modified: trunk/reactos/base/setup/reactos/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/cs-... ============================================================================== --- trunk/reactos/base/setup/reactos/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/cs-CZ.rc [iso-8859-1] Mon Jan 25 22:39:26 2016 @@ -25,7 +25,7 @@ LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25 AUTORADIOBUTTON "Opravit nebo aktualizovat již nainstalovaný systém ReactOS", IDC_UPDATE, 7, 50, 277, 10 LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30 - LTEXT "Po klepnutà na DalÅ¡Ã bude možné nastavit zaÅÃzenÃ.", IDC_STATIC, 10, 180, 297, 10 + LTEXT "Po klepnutà na DalÅ¡Ã bude možné nastavit zaÅÃzenÃ.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -33,14 +33,13 @@ CAPTION "Instalace systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Nastavenà zaÅÃzenÃ", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "PoÄÃtaÄ:", IDC_STATIC, 20, 15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 150, 80 LTEXT "Obrazovka:", IDC_STATIC, 20, 35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 150, 80 LTEXT "Klávesnice:", IDC_STATIC, 20, 55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 150, 80 - LTEXT "Po klepnutà na DalÅ¡Ã bude možné nastavit instalaÄnà zaÅÃzenÃ.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "Po klepnutà na DalÅ¡Ã bude možné nastavit instalaÄnà zaÅÃzenÃ.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 @@ -48,12 +47,11 @@ CAPTION "Instalace systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "OddÃl, do kterého bude systém ReactOS nainstalován", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176 - LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "&VytvoÅit", IDC_PARTCREATE, 20, 155, 50, 15 - PUSHBUTTON "&Smazat", IDC_PARTDELETE, 76, 155, 50, 15 - PUSHBUTTON "&OvladaÄ", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED - PUSHBUTTON "&PokroÄilé volby...", IDC_PARTMOREOPTS, 218, 155, 80, 15 + CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + PUSHBUTTON "&VytvoÅit", IDC_PARTCREATE, 7, 122, 50, 15 + PUSHBUTTON "&Smazat", IDC_PARTDELETE, 63, 122, 50, 15 + PUSHBUTTON "&OvladaÄ", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED + PUSHBUTTON "&PokroÄilé volby...", IDC_PARTMOREOPTS, 230, 122, 80, 15 LTEXT "Po klepnutà na DalÅ¡Ã bude možné zkontrolovat vÅ¡echna nastavenÃ.", IDC_STATIC, 10, 180, 277, 20 END
Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/de-... ============================================================================== --- trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] Mon Jan 25 22:39:26 2016 @@ -19,7 +19,7 @@ LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25 AUTORADIOBUTTON "Aktualisiere oder repariere ein installiertes ReactOS", IDC_UPDATE, 7, 50, 277, 10 LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30 - LTEXT "Klicken Sie auf Weiter um die Geräte einzustellen.", IDC_STATIC, 10, 180, 297, 10 + LTEXT "Klicken Sie auf Weiter um die Geräte einzustellen.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -27,14 +27,13 @@ CAPTION "ReactOS-Setup" FONT 8, "MS Shell Dlg" BEGIN -// CONTROL "Geräteeinstellungen", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Computer:", IDC_STATIC, 20, 15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 LTEXT "Anzeige:", IDC_STATIC, 20, 35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 LTEXT "Tastatur:", IDC_STATIC, 20, 55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 - LTEXT "Klicken Sie auf Weiter um den Installationsort zu konfigurieren.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "Klicken Sie auf Weiter um den Installationsort zu konfigurieren.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 @@ -42,12 +41,11 @@ CAPTION "ReactOS-Setup" FONT 8, "MS Shell Dlg" BEGIN -// CONTROL "Partition für die ReactOS-Installation", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176 - LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "&Erstellen", IDC_PARTCREATE, 20, 155, 50, 15 - PUSHBUTTON "&Löschen", IDC_PARTDELETE, 76, 155, 50, 15 - PUSHBUTTON "&Treiber", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED - PUSHBUTTON "E&rweiterte Optionen...", IDC_PARTMOREOPTS, 218, 155, 80, 15 + CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + PUSHBUTTON "&Erstellen", IDC_PARTCREATE, 7, 122, 50, 15 + PUSHBUTTON "&Löschen", IDC_PARTDELETE, 63, 122, 50, 15 + PUSHBUTTON "&Treiber", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED + PUSHBUTTON "E&rweiterte Optionen...", IDC_PARTMOREOPTS, 230, 122, 80, 15 LTEXT "Klicken Sie auf Weiter um die Zusammenfassung zu überprüfen.", IDC_STATIC, 10, 180, 277, 20 END
Modified: trunk/reactos/base/setup/reactos/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/el-... ============================================================================== --- trunk/reactos/base/setup/reactos/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/el-GR.rc [iso-8859-1] Mon Jan 25 22:39:26 2016 @@ -19,7 +19,7 @@ LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25 AUTORADIOBUTTON "Update or repair an installed ReactOS", IDC_UPDATE, 7, 50, 277, 10 LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30 - LTEXT "ΠαÏήÏÏε ÎÏÏμενο για να ÏÏ Î¸Î¼Î¯ÏεÏε ÏÎ¹Ï ÏÏ ÏÎºÎµÏ ÎÏ.", IDC_STATIC, 10, 180, 297, 10 + LTEXT "ΠαÏήÏÏε ÎÏÏμενο για να ÏÏ Î¸Î¼Î¯ÏεÏε ÏÎ¹Ï ÏÏ ÏÎºÎµÏ ÎÏ.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -27,14 +27,13 @@ CAPTION "ÎγκαÏάÏÏαÏη ÏÎ¿Ï ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Î¡Ï Î¸Î¼Î¯ÏÎµÎ¹Ï ÏÏ ÏÎºÎµÏ Ïν", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Î¥ÏολογιÏÏήÏ:", IDC_STATIC, 20, 15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 150, 80 LTEXT "ÎμÏάνιÏη:", IDC_STATIC, 20, 35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 150, 80 LTEXT "ΠληκÏÏολÏγιο:", IDC_STATIC, 20, 55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 150, 80 - LTEXT "Click Next setup of the installation device.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "Click Next setup of the installation device.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 @@ -42,12 +41,11 @@ CAPTION "ÎγκαÏάÏÏαÏη ÏÎ¿Ï ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Partition για Ïην εγκαÏάÏÏαÏη ÏÎ¿Ï ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176 - LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "&ÎÎ·Î¼Î¹Î¿Ï Ïγία", IDC_PARTCREATE, 20, 155, 50, 15 - PUSHBUTTON "&ÎιαγÏαÏή", IDC_PARTDELETE, 76, 155, 50, 15 - PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED - PUSHBUTTON "&ÎÏιλογÎÏ Î³Î¹Î± ÏÏοÏÏÏημÎÎ½Î¿Ï Ï...", IDC_PARTMOREOPTS, 218, 155, 80, 15 + CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + PUSHBUTTON "&ÎÎ·Î¼Î¹Î¿Ï Ïγία", IDC_PARTCREATE, 7, 122, 50, 15 + PUSHBUTTON "&ÎιαγÏαÏή", IDC_PARTDELETE, 63, 122, 50, 15 + PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED + PUSHBUTTON "&ÎÏιλογÎÏ Î³Î¹Î± ÏÏοÏÏÏημÎÎ½Î¿Ï Ï...", IDC_PARTMOREOPTS, 230, 122, 80, 15 LTEXT "ΠαÏήÏÏε ÎÏÏμενο για να ξεκινήÏεÏε Ïη διαδικαÏία εγκαÏάÏÏαÏηÏ.", IDC_STATIC, 10, 180, 277, 20 END
Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/en-... ============================================================================== --- trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] Mon Jan 25 22:39:26 2016 @@ -33,7 +33,7 @@ CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 LTEXT "Keyboard:", IDC_STATIC, 20, 55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 -/* LTEXT "Click Next to setup of the installation device.", IDC_STATIC, 7, 128, 277, 8 */ + LTEXT "Click Next to setup of the installation device.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 @@ -41,7 +41,7 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_PARTITION, 7, 7, 303, 112, LBS_HASSTRINGS | WS_VSCROLL + CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 PUSHBUTTON "&Create", IDC_PARTCREATE, 7, 122, 50, 14 PUSHBUTTON "&Delete", IDC_PARTDELETE, 63, 122, 50, 14 PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
Modified: trunk/reactos/base/setup/reactos/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/es-... ============================================================================== --- trunk/reactos/base/setup/reactos/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/es-ES.rc [iso-8859-1] Mon Jan 25 22:39:26 2016 @@ -21,7 +21,7 @@ LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25 AUTORADIOBUTTON "Actualizar o reparar una versión instalada de ReactOS", IDC_UPDATE, 7, 50, 277, 10 LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30 - LTEXT "Presione Siguiente para instalar los dispositivos.", IDC_STATIC, 10, 180, 297, 10 + LTEXT "Presione Siguiente para instalar los dispositivos.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -29,14 +29,13 @@ CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Ajustes de dispositivos", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Equipo:", IDC_STATIC, 20, 15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 150, 80 LTEXT "Pantalla:", IDC_STATIC, 20, 35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 150, 80 LTEXT "Teclado:", IDC_STATIC, 20, 55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 150, 80 - LTEXT "Presione Siguiente para configurar la instalación de dispositivos.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "Presione Siguiente para configurar la instalación de dispositivos.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 @@ -44,12 +43,11 @@ CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Partición para la instalación de ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176 - LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "&Crear", IDC_PARTCREATE, 20, 155, 50, 15 - PUSHBUTTON "&Borrar", IDC_PARTDELETE, 76, 155, 50, 15 - PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED - PUSHBUTTON "&Opciones avanzadas...", IDC_PARTMOREOPTS, 218, 155, 80, 15 + CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + PUSHBUTTON "&Crear", IDC_PARTCREATE, 7, 122, 50, 15 + PUSHBUTTON "&Borrar", IDC_PARTDELETE, 63, 122, 50, 15 + PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED + PUSHBUTTON "&Opciones avanzadas...", IDC_PARTMOREOPTS, 230, 122, 80, 15 LTEXT "Presione Siguiente para verificar el resumen.", IDC_STATIC, 10, 180, 277, 20 END
Modified: trunk/reactos/base/setup/reactos/lang/et-EE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/et-... ============================================================================== --- trunk/reactos/base/setup/reactos/lang/et-EE.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/et-EE.rc [iso-8859-1] Mon Jan 25 22:39:26 2016 @@ -19,7 +19,7 @@ LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25 AUTORADIOBUTTON "Paranda või uuenda installeeritud ReactOS", IDC_UPDATE, 7, 50, 277, 10 LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30 - LTEXT "Vajuta Järgmine, et seadmeid paigaldada.", IDC_STATIC, 10, 180, 297, 10 + LTEXT "Vajuta Järgmine, et seadmeid paigaldada.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -27,14 +27,13 @@ CAPTION "ReactOSi paigaldamine" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Seadmete seaded", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Arvuti:", IDC_STATIC, 20, 15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 LTEXT "Monitor:", IDC_STATIC, 20, 35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 LTEXT "Klaviatuur:", IDC_STATIC, 20, 55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 - LTEXT "Vajuta Järgmine, et seadistada sihtketas.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "Vajuta Järgmine, et seadistada sihtketas.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 @@ -42,12 +41,11 @@ CAPTION "ReactOSi paigaldamine" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Partitsioneerimine", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176 - LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "&Loo uus", IDC_PARTCREATE, 20, 155, 50, 15 - PUSHBUTTON "&Kustuta", IDC_PARTDELETE, 76, 155, 50, 15 - PUSHBUTTON "D&raiver", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED - PUSHBUTTON "&Täpsemad seaded...", IDC_PARTMOREOPTS, 218, 155, 80, 15 + CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + PUSHBUTTON "&Loo uus", IDC_PARTCREATE, 7, 122, 50, 15 + PUSHBUTTON "&Kustuta", IDC_PARTDELETE, 63, 122, 50, 15 + PUSHBUTTON "D&raiver", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED + PUSHBUTTON "&Täpsemad seaded...", IDC_PARTMOREOPTS, 230, 122, 80, 15 LTEXT "Vajuta Järgmine, et seaded üle kontrollida.", IDC_STATIC, 10, 180, 277, 20 END
Modified: trunk/reactos/base/setup/reactos/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/fi-... ============================================================================== --- trunk/reactos/base/setup/reactos/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/fi-FI.rc [iso-8859-1] Mon Jan 25 22:39:26 2016 @@ -19,7 +19,7 @@ LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25 AUTORADIOBUTTON "Update or repair an installed ReactOS", IDC_UPDATE, 7, 50, 277, 10 LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30 - LTEXT "Click Next to setup the devices.", IDC_STATIC, 10, 180, 297, 10 + LTEXT "Click Next to setup the devices.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -27,14 +27,13 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Device settings", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Computer:", IDC_STATIC, 20, 15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 LTEXT "Display:", IDC_STATIC, 20, 35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 LTEXT "Keyboard:", IDC_STATIC, 20, 55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 - LTEXT "Click Next to setup of the installation device.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "Click Next to setup of the installation device.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 @@ -42,12 +41,11 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Partition for ReactOS installation", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176 - LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "&Create", IDC_PARTCREATE, 20, 155, 50, 15 - PUSHBUTTON "&Delete", IDC_PARTDELETE, 76, 155, 50, 15 - PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED - PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 218, 155, 80, 15 + CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + PUSHBUTTON "&Create", IDC_PARTCREATE, 7, 122, 50, 15 + PUSHBUTTON "&Delete", IDC_PARTDELETE, 63, 122, 50, 15 + PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED + PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 230, 122, 80, 15 LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20 END
Modified: trunk/reactos/base/setup/reactos/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/fr-... ============================================================================== --- trunk/reactos/base/setup/reactos/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/fr-FR.rc [iso-8859-1] Mon Jan 25 22:39:26 2016 @@ -19,7 +19,7 @@ LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25 AUTORADIOBUTTON "Update or repair an installed ReactOS", IDC_UPDATE, 7, 50, 277, 10 LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30 - LTEXT "Click Next to setup the devices.", IDC_STATIC, 10, 180, 297, 10 + LTEXT "Click Next to setup the devices.", IDC_STATIC, 7, 1280, 297, 8 END
IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -27,14 +27,13 @@ CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Device settings", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Computer:", IDC_STATIC, 20, 15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 LTEXT "Display:", IDC_STATIC, 20, 35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 LTEXT "Keyboard:", IDC_STATIC, 20, 55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 - LTEXT "Click Next to setup of the installation device.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "Click Next to setup of the installation device.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 @@ -42,12 +41,11 @@ CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Partition for ReactOS installation", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176 - LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "&Create", IDC_PARTCREATE, 20, 155, 50, 15 - PUSHBUTTON "&Delete", IDC_PARTDELETE, 76, 155, 50, 15 - PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED - PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 218, 155, 80, 15 + CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + PUSHBUTTON "&Create", IDC_PARTCREATE, 7, 122, 50, 15 + PUSHBUTTON "&Delete", IDC_PARTDELETE, 63, 122, 50, 15 + PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED + PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 230, 122, 80, 15 LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20 END
Modified: trunk/reactos/base/setup/reactos/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/he-... ============================================================================== --- trunk/reactos/base/setup/reactos/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/he-IL.rc [iso-8859-1] Mon Jan 25 22:39:26 2016 @@ -21,7 +21,7 @@ LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25 AUTORADIOBUTTON "ת×ק×× ×× ×¢×××× ××¨×¡× ×§×××ת", IDC_UPDATE, 7, 50, 277, 10 LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30 - LTEXT "×××¥ ×¢× ××× ××× ×××××ר ×ת ×××ª×§× ××", IDC_STATIC, 10, 180, 297, 10 + LTEXT "×××¥ ×¢× ××× ××× ×××××ר ×ת ×××ª×§× ××", IDC_STATIC, 7, 128, 297, 8 END
IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -29,14 +29,13 @@ CAPTION "××ª×§× ×ª ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "×××ר×ת ××ª×§× ××", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "××ש×:", IDC_STATIC, 20, 15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 LTEXT "תצ×××:", IDC_STATIC, 20, 35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 LTEXT "תצ×××:", IDC_STATIC, 20, 55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 - LTEXT "×××¥ ×¢× ××× ××× ×××××ר ×ת ××ª×§× ×××ª×§× ×.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "×××¥ ×¢× ××× ××× ×××××ר ×ת ××ª×§× ×××ª×§× ×.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 @@ -44,12 +43,11 @@ CAPTION "××ª×§× ×ª ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "××××¦× ×¢××ר ××ª×§× ×ª ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176 - LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "צ×ר", IDC_PARTCREATE, 20, 155, 50, 15 - PUSHBUTTON "××ק", IDC_PARTDELETE, 76, 155, 50, 15 - PUSHBUTTON "××¢×× ×ª ×× ×× ×תק×", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED - PUSHBUTTON "×פשר×××ת ×תק×××ת...", IDC_PARTMOREOPTS, 218, 155, 80, 15 + CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + PUSHBUTTON "צ×ר", IDC_PARTCREATE, 7, 122, 50, 15 + PUSHBUTTON "××ק", IDC_PARTDELETE, 63, 122, 50, 15 + PUSHBUTTON "××¢×× ×ª ×× ×× ×תק×", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED + PUSHBUTTON "×פשר×××ת ×תק×××ת...", IDC_PARTMOREOPTS, 230, 122, 80, 15 LTEXT "×××¥ ×¢× ××× ××× ×ר××ת ס××××.", IDC_STATIC, 10, 180, 277, 20 END
Modified: trunk/reactos/base/setup/reactos/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/hu-... ============================================================================== --- trunk/reactos/base/setup/reactos/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/hu-HU.rc [iso-8859-1] Mon Jan 25 22:39:26 2016 @@ -21,7 +21,7 @@ LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25 AUTORADIOBUTTON "Update or repair an installed ReactOS", IDC_UPDATE, 7, 50, 277, 10 LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30 - LTEXT "Click Next to setup the devices.", IDC_STATIC, 10, 180, 297, 10 + LTEXT "Click Next to setup the devices.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -29,14 +29,13 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Device settings", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Computer:", IDC_STATIC, 20, 15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 LTEXT "Display:", IDC_STATIC, 20, 35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 LTEXT "Keyboard:", IDC_STATIC, 20, 55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 - LTEXT "Click Next to setup of the installation device.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "Click Next to setup of the installation device.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 @@ -44,12 +43,11 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Partition for ReactOS installation", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176 - LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "&Create", IDC_PARTCREATE, 20, 155, 50, 15 - PUSHBUTTON "&Delete", IDC_PARTDELETE, 76, 155, 50, 15 - PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED - PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 218, 155, 80, 15 + CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + PUSHBUTTON "&Create", IDC_PARTCREATE, 7, 122, 50, 15 + PUSHBUTTON "&Delete", IDC_PARTDELETE, 63, 122, 50, 15 + PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED + PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 230, 122, 80, 15 LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20 END
Modified: trunk/reactos/base/setup/reactos/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/it-... ============================================================================== --- trunk/reactos/base/setup/reactos/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/it-IT.rc [iso-8859-1] Mon Jan 25 22:39:26 2016 @@ -19,7 +19,7 @@ LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25 AUTORADIOBUTTON "Aggiorna o ripara una installazione precedente di ReactOS", IDC_UPDATE, 7, 50, 277, 10 LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30 - LTEXT "Cliccare Avanti per impostare i dispositivi.", IDC_STATIC, 10, 180, 297, 10 + LTEXT "Cliccare Avanti per impostare i dispositivi.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -27,14 +27,13 @@ CAPTION "Installazione di ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Impostazione dei dispositivi", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Computer:", IDC_STATIC, 20, 15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 150, 80 LTEXT "Display:", IDC_STATIC, 20, 35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 150, 80 LTEXT "Tastiera:", IDC_STATIC, 20, 55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 150, 80 - LTEXT "Cliccare Avanti per scegliere dove effettuare l'installazione.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "Cliccare Avanti per scegliere dove effettuare l'installazione.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 @@ -42,12 +41,11 @@ CAPTION "Installazione di ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Partizione per l'installazione di ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176 - LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "&Crea", IDC_PARTCREATE, 20, 155, 50, 15 - PUSHBUTTON "&Rimuovi", IDC_PARTDELETE, 76, 155, 50, 15 - PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED - PUSHBUTTON "&Opzioni avanzate...", IDC_PARTMOREOPTS, 218, 155, 80, 15 + CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + PUSHBUTTON "&Crea", IDC_PARTCREATE, 7, 122, 50, 15 + PUSHBUTTON "&Rimuovi", IDC_PARTDELETE, 63, 122, 50, 15 + PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED + PUSHBUTTON "&Opzioni avanzate...", IDC_PARTMOREOPTS, 230, 122, 80, 15 LTEXT "Cliccare Avanti per iniziare l'installazione.", IDC_STATIC, 10, 180, 277, 20 END
Modified: trunk/reactos/base/setup/reactos/lang/ms-MY.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ms-... ============================================================================== --- trunk/reactos/base/setup/reactos/lang/ms-MY.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/ms-MY.rc [iso-8859-1] Mon Jan 25 22:39:26 2016 @@ -21,7 +21,7 @@ LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25 AUTORADIOBUTTON "Membaiki atau mengemaskini ReactOS yang dipasang", IDC_UPDATE, 7, 50, 277, 10 LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30 - LTEXT "Klik Seterusnya untuk memasang peranti.", IDC_STATIC, 10, 180, 297, 10 + LTEXT "Klik Seterusnya untuk memasang peranti.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -29,14 +29,13 @@ CAPTION "ReactOS Persediaan" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Seting peranti", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Komputer:", IDC_STATIC, 20, 15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 LTEXT "Paparan:", IDC_STATIC, 20, 35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 LTEXT "Papan Kekunci:", IDC_STATIC, 20, 55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 - LTEXT "Klik di sebelah persediaan peranti pemasangan tersebut.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "Klik di sebelah persediaan peranti pemasangan tersebut.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 @@ -44,12 +43,11 @@ CAPTION "ReactOS Persediaan" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Partition untuk pemasangan ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176 - LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "Men&cipta", IDC_PARTCREATE, 20, 155, 50, 15 - PUSHBUTTON "Hapus(&D)", IDC_PARTDELETE, 76, 155, 50, 15 - PUSHBUTTON "Pemacu(&R)", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED - PUSHBUTTON "Opsyen l&anjutan...", IDC_PARTMOREOPTS, 218, 155, 80, 15 + CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + PUSHBUTTON "Men&cipta", IDC_PARTCREATE, 7, 122, 50, 15 + PUSHBUTTON "Hapus(&D)", IDC_PARTDELETE, 63, 122, 50, 15 + PUSHBUTTON "Pemacu(&R)", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED + PUSHBUTTON "Opsyen l&anjutan...", IDC_PARTMOREOPTS, 230, 122, 80, 15 LTEXT "Klik Seterusnya untuk menyemak ringkasan.", IDC_STATIC, 10, 180, 277, 20 END
Modified: trunk/reactos/base/setup/reactos/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/no-... ============================================================================== --- trunk/reactos/base/setup/reactos/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/no-NO.rc [iso-8859-1] Mon Jan 25 22:39:26 2016 @@ -19,7 +19,7 @@ LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25 AUTORADIOBUTTON "Reparere eller oppdatere en installert ReactOS", IDC_UPDATE, 7, 50, 277, 10 LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30 - LTEXT "Trykk på Neste for installere enhetene.", IDC_STATIC, 10, 180, 297, 10 + LTEXT "Trykk på Neste for installere enhetene.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -27,14 +27,13 @@ CAPTION "ReactOS installering" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Enhetsinnstillinger", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Datamaskin:", IDC_STATIC, 20, 15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 150, 80 LTEXT "Skjerm:", IDC_STATIC, 20, 35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 150, 80 LTEXT "Tastatur:", IDC_STATIC, 20, 55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 150, 80 - LTEXT "Trykk på Neste for å installere enhetene.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "Trykk på Neste for å installere enhetene.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 @@ -42,12 +41,11 @@ CAPTION "ReactOS installering" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ReactOS partisjon installasjon", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176 - LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "&Opprett", IDC_PARTCREATE, 20, 155, 50, 15 - PUSHBUTTON "&Slett", IDC_PARTDELETE, 76, 155, 50, 15 - PUSHBUTTON "S&tasjon", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED - PUSHBUTTON "&Avansert valg...", IDC_PARTMOREOPTS, 218, 155, 80, 15 + CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + PUSHBUTTON "&Opprett", IDC_PARTCREATE, 7, 122, 50, 15 + PUSHBUTTON "&Slett", IDC_PARTDELETE, 63, 122, 50, 15 + PUSHBUTTON "S&tasjon", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED + PUSHBUTTON "&Avansert valg...", IDC_PARTMOREOPTS, 230, 122, 80, 15 LTEXT "Trykk på Neste for å starte installasjon prosessen.", IDC_STATIC, 10, 180, 277, 20 END
Modified: trunk/reactos/base/setup/reactos/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/pl-... ============================================================================== --- trunk/reactos/base/setup/reactos/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/pl-PL.rc [iso-8859-1] Mon Jan 25 22:39:26 2016 @@ -29,7 +29,7 @@ LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25 AUTORADIOBUTTON "Napraw lub zaktualizuj zainstalowany wczeÅniej ReactOS", IDC_UPDATE, 7, 50, 277, 10 LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30 - LTEXT "NaciÅnij Dalej, aby zmieniÄ ustawienia sprzÄtu.", IDC_STATIC, 10, 180, 297, 10 + LTEXT "NaciÅnij Dalej, aby zmieniÄ ustawienia sprzÄtu.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -37,14 +37,13 @@ CAPTION "Instalator ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Ustawienia sprzÄtu", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Komputer:", IDC_STATIC, 20, 15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 150, 80 LTEXT "Ekran:", IDC_STATIC, 20, 35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 150, 80 LTEXT "Klawiatura:", IDC_STATIC, 20, 55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 150, 80 - LTEXT "NaciÅnij Dalej, aby ustaliÄ miejsce instalacji.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "NaciÅnij Dalej, aby ustaliÄ miejsce instalacji.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 @@ -52,12 +51,11 @@ CAPTION "Instalator ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Partycja dla instalacji ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176 - LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "&Stwórz", IDC_PARTCREATE, 20, 155, 50, 15 - PUSHBUTTON "&UsuÅ", IDC_PARTDELETE, 76, 155, 50, 15 - PUSHBUTTON "s&terownik", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED - PUSHBUTTON "&Opcje zaawansowane...", IDC_PARTMOREOPTS, 218, 155, 80, 15 + CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + PUSHBUTTON "&Stwórz", IDC_PARTCREATE, 7, 122, 50, 15 + PUSHBUTTON "&UsuÅ", IDC_PARTDELETE, 63, 122, 50, 15 + PUSHBUTTON "s&terownik", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED + PUSHBUTTON "&Opcje zaawansowane...", IDC_PARTMOREOPTS, 230, 122, 80, 15 LTEXT "NaciÅnij Dalej, aby rozpoczÄ Ä proces instalacji.", IDC_STATIC, 10, 180, 277, 20 END
Modified: trunk/reactos/base/setup/reactos/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/pt-... ============================================================================== --- trunk/reactos/base/setup/reactos/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/pt-BR.rc [iso-8859-1] Mon Jan 25 22:39:26 2016 @@ -19,7 +19,7 @@ LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25 AUTORADIOBUTTON "Reparar ou atualizar uma instalação do ReactOS", IDC_UPDATE, 7, 50, 277, 10 LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30 - LTEXT "Clique em Próximo para configurar os dispositivos.", IDC_STATIC, 10, 180, 297, 10 + LTEXT "Clique em Próximo para configurar os dispositivos.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -27,14 +27,13 @@ CAPTION "Instalação do ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Configuração de dispositivo", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Computador:", IDC_STATIC, 20, 15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 LTEXT "Monitor:", IDC_STATIC, 20, 35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 LTEXT "Teclado:", IDC_STATIC, 20, 55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 - LTEXT "Clique em Próximo para configurar o dispositivo de instalação.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "Clique em Próximo para configurar o dispositivo de instalação.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 @@ -42,12 +41,11 @@ CAPTION "Instalação do ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Partição para instalação do ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176 - LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "&Criar", IDC_PARTCREATE, 20, 155, 50, 15 - PUSHBUTTON "&Apagar", IDC_PARTDELETE, 76, 155, 50, 15 - PUSHBUTTON "D&rivers", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED - PUSHBUTTON "&Opções Avançadas...", IDC_PARTMOREOPTS, 218, 155, 80, 15 + CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + PUSHBUTTON "&Criar", IDC_PARTCREATE, 7, 122, 50, 15 + PUSHBUTTON "&Apagar", IDC_PARTDELETE, 63, 122, 50, 15 + PUSHBUTTON "D&rivers", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED + PUSHBUTTON "&Opções Avançadas...", IDC_PARTMOREOPTS, 230, 122, 80, 15 LTEXT "Clique em Próximo para verificar o sumário.", IDC_STATIC, 10, 180, 277, 20 END
Modified: trunk/reactos/base/setup/reactos/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ro-... ============================================================================== --- trunk/reactos/base/setup/reactos/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/ro-RO.rc [iso-8859-1] Mon Jan 25 22:39:26 2016 @@ -28,7 +28,7 @@ LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25 AUTORADIOBUTTON "ReparÄ sau actualizeazÄ ReactOS", IDC_UPDATE, 7, 50, 277, 10 LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30 - LTEXT "ApÄsaÈi pe âÃnainteâ pentru configurarea de dispozitive.", IDC_STATIC, 10, 180, 297, 10 + LTEXT "ApÄsaÈi pe âÃnainteâ pentru configurarea de dispozitive.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -36,14 +36,13 @@ CAPTION "Asistent de instalare ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Configurare dispozitive", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Calculator:", IDC_STATIC, 20, 15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 LTEXT "Ecran:", IDC_STATIC, 20, 35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 LTEXT "TastaturÄ:", IDC_STATIC, 20, 55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 - LTEXT "ApÄsaÈi pe âÃnainteâ pentru configurarea dispozitivului de instalare.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "ApÄsaÈi pe âÃnainteâ pentru configurarea dispozitivului de instalare.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 @@ -51,12 +50,11 @@ CAPTION "Asistent de instalare ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "PartiÈia pentru instalarea ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176 - LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "&CreazÄ", IDC_PARTCREATE, 20, 155, 50, 15 - PUSHBUTTON "&Èterge", IDC_PARTDELETE, 76, 155, 50, 15 - PUSHBUTTON "Mo&dul pilot", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED - PUSHBUTTON "&OpÈiuni avansateâ¦", IDC_PARTMOREOPTS, 218, 155, 80, 15 + CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + PUSHBUTTON "&CreazÄ", IDC_PARTCREATE, 7, 122, 50, 15 + PUSHBUTTON "&Èterge", IDC_PARTDELETE, 63, 122, 50, 15 + PUSHBUTTON "Mo&dul pilot", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED + PUSHBUTTON "&OpÈiuni avansateâ¦", IDC_PARTMOREOPTS, 230, 122, 80, 15 LTEXT "ApÄsaÈi pe âÃnainteâ pentru a verifica sumarul.", IDC_STATIC, 10, 180, 277, 20 END
Modified: trunk/reactos/base/setup/reactos/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ru-... ============================================================================== --- trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] Mon Jan 25 22:39:26 2016 @@ -19,7 +19,7 @@ LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25 AUTORADIOBUTTON "ÐоÑÑÑановиÑÑ Ð¸Ð»Ð¸ измениÑÑ ÑÑÑановленнÑй Ñанее ReactOS", IDC_UPDATE, 7, 50, 277, 10 LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30 - LTEXT "ÐÐ»Ñ ÑÑÑановки ÑÑÑÑойÑÑв нажмиÑе ""Ðалее"".", IDC_STATIC, 10, 180, 297, 10 + LTEXT "ÐÐ»Ñ ÑÑÑановки ÑÑÑÑойÑÑв нажмиÑе ""Ðалее"".", IDC_STATIC, 7, 128, 297, 8 END
IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -27,14 +27,13 @@ CAPTION "УÑÑановка ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ÐÑновнÑе ÑÑÑÑойÑÑва", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "ÐомпÑÑÑеÑ:", IDC_STATIC, 20, 15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 150, 80 LTEXT "ÐкÑан:", IDC_STATIC, 20, 35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 150, 80 LTEXT "ÐлавиаÑÑÑа:", IDC_STATIC, 20, 55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 150, 80 - LTEXT "ÐÐ»Ñ ÑÑÑановки ÑÑÑÑойÑÑв нажмиÑе ""Ðалее"".", IDC_STATIC, 10, 180, 277, 20 + LTEXT "ÐÐ»Ñ ÑÑÑановки ÑÑÑÑойÑÑв нажмиÑе ""Ðалее"".", IDC_STATIC, 7, 128, 297, 8 END
IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 @@ -42,12 +41,11 @@ CAPTION "УÑÑановка ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Ð Ð°Ð·Ð´ÐµÐ»Ñ Ð´Ð»Ñ ÑÑÑановки ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176 - LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "&СоздаÑÑ", IDC_PARTCREATE, 20, 155, 50, 15 - PUSHBUTTON "&УдалиÑÑ", IDC_PARTDELETE, 76, 155, 50, 15 - PUSHBUTTON "Ð&ÑайвеÑ", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED - PUSHBUTTON "&ÐополниÑелÑнÑе паÑамеÑÑÑ...", IDC_PARTMOREOPTS, 176, 155, 122, 15 + CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + PUSHBUTTON "&СоздаÑÑ", IDC_PARTCREATE, 7, 122, 50, 15 + PUSHBUTTON "&УдалиÑÑ", IDC_PARTDELETE, 63, 122, 50, 15 + PUSHBUTTON "Ð&ÑайвеÑ", IDC_DEVICEDRIVER, 162, 122, 50, 15, WS_DISABLED + PUSHBUTTON "&ÐополниÑелÑнÑе паÑамеÑÑÑ...", IDC_PARTMOREOPTS, 176, 122, 122, 15 LTEXT "ÐÐ»Ñ Ð½Ð°Ñала ÑÑÑановки нажмиÑе ""Ðалее"".", IDC_STATIC, 10, 180, 277, 20 END
Modified: trunk/reactos/base/setup/reactos/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/sk-... ============================================================================== --- trunk/reactos/base/setup/reactos/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/sk-SK.rc [iso-8859-1] Mon Jan 25 22:39:26 2016 @@ -24,7 +24,7 @@ LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25 AUTORADIOBUTTON "Opraviť alebo aktualizovať nainštalovaný systém ReactOS", IDC_UPDATE, 7, 50, 277, 10 LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30 - LTEXT "Click Next to setup the devices.", IDC_STATIC, 10, 180, 297, 10 + LTEXT "Click Next to setup the devices.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -32,14 +32,13 @@ CAPTION "InÅ¡talácia systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Nastavenia zariadenÃ", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "PoÄÃtaÄ:", IDC_STATIC, 20, 15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 LTEXT "Obrazovka:", IDC_STATIC, 20, 35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 LTEXT "Klávesnica:", IDC_STATIC, 20, 55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 - LTEXT "Click Next setup of the installation device.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "Click Next setup of the installation device.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 @@ -47,12 +46,11 @@ CAPTION "InÅ¡talácia systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "PartÃcia na nainÅ¡talovanie systému ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176 - LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "&VytvoriÅ¥", IDC_PARTCREATE, 20, 155, 50, 15 - PUSHBUTTON "O&dstrániÅ¥", IDC_PARTDELETE, 76, 155, 50, 15 - PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED - PUSHBUTTON "RozÅ¡Ãrené &možnosti...", IDC_PARTMOREOPTS, 218, 155, 80, 15 + CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + PUSHBUTTON "&VytvoriÅ¥", IDC_PARTCREATE, 7, 122, 50, 15 + PUSHBUTTON "O&dstrániÅ¥", IDC_PARTDELETE, 63, 122, 50, 15 + PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED + PUSHBUTTON "RozÅ¡Ãrené &možnosti...", IDC_PARTMOREOPTS, 230, 122, 80, 15 LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20 END
Modified: trunk/reactos/base/setup/reactos/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/sq-... ============================================================================== --- trunk/reactos/base/setup/reactos/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/sq-AL.rc [iso-8859-1] Mon Jan 25 22:39:26 2016 @@ -21,7 +21,7 @@ LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25 AUTORADIOBUTTON "Riparo ose apdejto ReactOS'in e instaluar", IDC_UPDATE, 7, 50, 277, 10 LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30 - LTEXT "Kliko vazhdo për të konfiguruar pajisjet.", IDC_STATIC, 10, 180, 297, 10 + LTEXT "Kliko vazhdo për të konfiguruar pajisjet.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -29,14 +29,13 @@ CAPTION "Instalimi i ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Cilesimet e pajisjeve", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Computer:", IDC_STATIC, 20, 15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 LTEXT "Display:", IDC_STATIC, 20, 35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 LTEXT "Keyboard:", IDC_STATIC, 20, 55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 - LTEXT "Klikoni vazhdo për instalim të pajisjeve.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "Klikoni vazhdo për instalim të pajisjeve.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 @@ -44,12 +43,11 @@ CAPTION "Instalimi i ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Konfigurimi i particioneve për ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176 - LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "&Krijo", IDC_PARTCREATE, 20, 155, 50, 15 - PUSHBUTTON "&Fshi", IDC_PARTDELETE, 76, 155, 50, 15 - PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED - PUSHBUTTON "&Opsionet e avancuara...", IDC_PARTMOREOPTS, 218, 155, 80, 15 + CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + PUSHBUTTON "&Krijo", IDC_PARTCREATE, 7, 122, 50, 15 + PUSHBUTTON "&Fshi", IDC_PARTDELETE, 63, 122, 50, 15 + PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED + PUSHBUTTON "&Opsionet e avancuara...", IDC_PARTMOREOPTS, 230, 122, 80, 15 LTEXT "Kliko vazhdo për të kontrolluar përmbajtjen.", IDC_STATIC, 10, 180, 277, 20 END
Modified: trunk/reactos/base/setup/reactos/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/tr-... ============================================================================== --- trunk/reactos/base/setup/reactos/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/tr-TR.rc [iso-8859-1] Mon Jan 25 22:39:26 2016 @@ -21,7 +21,7 @@ LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25 AUTORADIOBUTTON "Kurulu ReactOS'u Onarma ya da Yükseltme", IDC_UPDATE, 7, 50, 277, 10 LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30 - LTEXT "Aygıtları kurmak için İleri'ye tıklayınız.", IDC_STATIC, 10, 180, 297, 10 + LTEXT "Aygıtları kurmak için İleri'ye tıklayınız.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -29,14 +29,13 @@ CAPTION "ReactOS Kur" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Aygıt Ayarları", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "Bilgisayar:", IDC_STATIC, 20, 15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 LTEXT "Görüntü:", IDC_STATIC, 20, 35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 LTEXT "DüÄme Takımı:", IDC_STATIC, 20, 55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 - LTEXT "Kurulum aygıtını kurmak için Ä°leri'ye tıklayınız.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "Kurulum aygıtını kurmak için Ä°leri'ye tıklayınız.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 @@ -44,12 +43,11 @@ CAPTION "ReactOS Kur" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ReactOS Kurulumu İçin Bölümlendirme", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176 - LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "&OluÅtur...", IDC_PARTCREATE, 20, 155, 50, 15 - PUSHBUTTON "&Sil", IDC_PARTDELETE, 76, 155, 50, 15 - PUSHBUTTON "S&ürücü", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED - PUSHBUTTON "G&eliÅmiÅ Seçenekler...", IDC_PARTMOREOPTS, 218, 155, 80, 15 + CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + PUSHBUTTON "&OluÅtur...", IDC_PARTCREATE, 7, 122, 50, 15 + PUSHBUTTON "&Sil", IDC_PARTDELETE, 63, 122, 50, 15 + PUSHBUTTON "S&ürücü", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED + PUSHBUTTON "G&eliÅmiÅ Seçenekler...", IDC_PARTMOREOPTS, 230, 122, 80, 15 LTEXT "Kurulum özetini gözden geçirmek için Ä°leri'ye tıklayınız.", IDC_STATIC, 10, 180, 277, 20 END
Modified: trunk/reactos/base/setup/reactos/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/uk-... ============================================================================== --- trunk/reactos/base/setup/reactos/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/uk-UA.rc [iso-8859-1] Mon Jan 25 22:39:26 2016 @@ -27,7 +27,7 @@ LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25 AUTORADIOBUTTON "ÐÑдновиÑи або змÑниÑи вÑÑановлений ÑанÑÑе ReactOS", IDC_UPDATE, 7, 50, 277, 10 LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30 - LTEXT "ÐÐ»Ñ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿ÑиÑÑÑоÑв наÑиÑнÑÑÑ ÐалÑ.", IDC_STATIC, 10, 180, 297, 10 + LTEXT "ÐÐ»Ñ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿ÑиÑÑÑоÑв наÑиÑнÑÑÑ ÐалÑ.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -35,14 +35,13 @@ CAPTION "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ÐÑÐ½Ð¾Ð²Ð½Ñ Ð¿ÑиÑÑÑоÑ", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "ÐомпâÑÑеÑ:", IDC_STATIC, 20, 15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 LTEXT "ÐкÑан:", IDC_STATIC, 20, 35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 LTEXT "ÐлавÑаÑÑÑа:", IDC_STATIC, 20, 55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 - LTEXT "ÐÐ»Ñ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿ÑиÑÑÑоÑв наÑиÑнÑÑÑ ÐалÑ.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "ÐÐ»Ñ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿ÑиÑÑÑоÑв наÑиÑнÑÑÑ ÐалÑ.", IDC_STATIC, 7, 128, 297, 8 END
IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 @@ -50,12 +49,11 @@ CAPTION "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "РоздÑли Ð´Ð»Ñ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176 - LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "&СÑвоÑиÑи", IDC_PARTCREATE, 20, 155, 50, 15 - PUSHBUTTON "&ÐидалиÑи", IDC_PARTDELETE, 76, 155, 50, 15 - PUSHBUTTON "Ð&ÑайвеÑ", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED - PUSHBUTTON "&ÐодаÑÐºÐ¾Ð²Ñ ÐпÑÑÑ...", IDC_PARTMOREOPTS, 218, 155, 80, 15 + CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + PUSHBUTTON "&СÑвоÑиÑи", IDC_PARTCREATE, 7, 122, 50, 15 + PUSHBUTTON "&ÐидалиÑи", IDC_PARTDELETE, 63, 122, 50, 15 + PUSHBUTTON "Ð&ÑайвеÑ", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED + PUSHBUTTON "&ÐодаÑÐºÐ¾Ð²Ñ ÐпÑÑÑ...", IDC_PARTMOREOPTS, 230, 122, 80, 15 LTEXT "ÐÐ»Ñ Ð¿Ð¾ÑаÑÐºÑ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ð°ÑиÑнÑÑÑ ÐалÑ", IDC_STATIC, 10, 180, 277, 20 END
Modified: trunk/reactos/base/setup/reactos/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/zh-... ============================================================================== --- trunk/reactos/base/setup/reactos/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/zh-CN.rc [iso-8859-1] Mon Jan 25 22:39:26 2016 @@ -19,7 +19,7 @@ LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25 AUTORADIOBUTTON "ä¿®å¤ææ´æ°å·²å®è£ ç ReactOS", IDC_UPDATE, 7, 50, 277, 10 LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30 - LTEXT "ç¹å»ä¸ä¸æ¥å®è£ 设å¤ã", IDC_STATIC, 10, 180, 297, 10 + LTEXT "ç¹å»ä¸ä¸æ¥å®è£ 设å¤ã", IDC_STATIC, 7, 128, 297, 8 END
IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -27,14 +27,13 @@ CAPTION "ReactOS å®è£ " FONT 9, "MS Shell Dlg" BEGIN - CONTROL "设å¤è®¾ç½®", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "计ç®æº:", IDC_STATIC, 20, 15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 LTEXT "æ¾ç¤º:", IDC_STATIC, 20, 35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 LTEXT "é®ç:", IDC_STATIC, 20, 55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 - LTEXT "ç¹å»ä¸ä¸æ¥è®¾ç½®å®è£ 驱å¨å¨ã", IDC_STATIC, 10, 180, 277, 20 + LTEXT "ç¹å»ä¸ä¸æ¥è®¾ç½®å®è£ 驱å¨å¨ã", IDC_STATIC, 7, 128, 297, 8 END
IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 @@ -42,12 +41,11 @@ CAPTION "ReactOS å®è£ " FONT 9, "MS Shell Dlg" BEGIN - CONTROL "ReactOS å®è£ ååº", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176 - LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "建ç«(&C)", IDC_PARTCREATE, 20, 155, 50, 15 - PUSHBUTTON "å é¤(&D)", IDC_PARTDELETE, 76, 155, 50, 15 - PUSHBUTTON "驱å¨å¨(&r)", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED - PUSHBUTTON "é«çº§é项(&A)...", IDC_PARTMOREOPTS, 218, 155, 80, 15 + CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + PUSHBUTTON "建ç«(&C)", IDC_PARTCREATE, 7, 122, 50, 15 + PUSHBUTTON "å é¤(&D)", IDC_PARTDELETE, 63, 122, 50, 15 + PUSHBUTTON "驱å¨å¨(&r)", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED + PUSHBUTTON "é«çº§é项(&A)...", IDC_PARTMOREOPTS, 230, 122, 80, 15 LTEXT "ç¹å»ä¸ä¸æ¥æ£æ¥å®è£ æ¦è¦ã", IDC_STATIC, 10, 180, 277, 20 END
Modified: trunk/reactos/base/setup/reactos/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/zh-... ============================================================================== --- trunk/reactos/base/setup/reactos/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/zh-TW.rc [iso-8859-1] Mon Jan 25 22:39:26 2016 @@ -21,7 +21,7 @@ LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25 AUTORADIOBUTTON "修復ææ´æ°å·²å®è£ç ReactOS", IDC_UPDATE, 7, 50, 277, 10 LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30 - LTEXT "é»é¸ä¸ä¸æ¥å®è£è£ç½®ã", IDC_STATIC, 10, 180, 297, 10 + LTEXT "é»é¸ä¸ä¸æ¥å®è£è£ç½®ã", IDC_STATIC, 7, 128, 297, 8 END
IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -29,14 +29,13 @@ CAPTION "ReactOS å®è£" FONT 9, "MS Shell Dlg" BEGIN - CONTROL "è£ç½®è¨å®", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172 LTEXT "è¨ç®æ©:", IDC_STATIC, 20, 15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 LTEXT "顯示:", IDC_STATIC, 20, 35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 LTEXT "éµç¤:", IDC_STATIC, 20, 55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 - LTEXT "é»é¸ä¸ä¸æ¥è¨å®å®è£é© åå¨ã", IDC_STATIC, 10, 180, 277, 20 + LTEXT "é»é¸ä¸ä¸æ¥è¨å®å®è£é© åå¨ã", IDC_STATIC, 7, 128, 297, 8 END
IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 @@ -44,12 +43,11 @@ CAPTION "ReactOS å®è£" FONT 9, "MS Shell Dlg" BEGIN - CONTROL "ReactOS å®è£åå", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176 - LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "建ç«(&C)", IDC_PARTCREATE, 20, 155, 50, 15 - PUSHBUTTON "åªé¤(&D)", IDC_PARTDELETE, 76, 155, 50, 15 - PUSHBUTTON "é© åå¨(&r)", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED - PUSHBUTTON "é«éé¸é (&A)...", IDC_PARTMOREOPTS, 218, 155, 80, 15 + CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + PUSHBUTTON "建ç«(&C)", IDC_PARTCREATE, 7, 122, 50, 15 + PUSHBUTTON "åªé¤(&D)", IDC_PARTDELETE, 63, 122, 50, 15 + PUSHBUTTON "é© åå¨(&r)", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED + PUSHBUTTON "é«éé¸é (&A)...", IDC_PARTMOREOPTS, 230, 122, 80, 15 LTEXT "é»é¸ä¸ä¸æ¥æª¢æ¥å®è£æ¦è¦ã", IDC_STATIC, 10, 180, 277, 20 END
Modified: trunk/reactos/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos.... ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Mon Jan 25 22:39:26 2016 @@ -97,38 +97,20 @@ switch (uMsg) { case WM_INITDIALOG: - { - HWND hwndControl; - DWORD dwStyle; - /* Save pointer to the global setup data */ pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pSetupData);
- hwndControl = GetParent(hwndDlg); - /* Center the wizard window */ - CenterWindow (hwndControl); - - dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE); - SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); - - /* Hide and disable the 'Cancel' button at the moment, - * we use this button to cancel the setup process - * like F3 in usetup - */ - hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); - ShowWindow (hwndControl, SW_HIDE); - EnableWindow (hwndControl, FALSE); - + CenterWindow(GetParent(hwndDlg)); + /* Set title font */ SendDlgItemMessage(hwndDlg, IDC_STARTTITLE, WM_SETFONT, (WPARAM)pSetupData->hTitleFont, (LPARAM)TRUE); - } - break; + break;
case WM_NOTIFY: { @@ -168,25 +150,17 @@ switch (uMsg) { case WM_INITDIALOG: - { - HWND hwndControl; - DWORD dwStyle; - /* Save pointer to the global setup data */ pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pSetupData);
- hwndControl = GetParent(hwndDlg); - - dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE); - SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); - + /* Check the 'install' radio button */ CheckDlgButton(hwndDlg, IDC_INSTALL, BST_CHECKED);
+ /* Disable the 'update' radio button and text */ EnableWindow(GetDlgItem(hwndDlg, IDC_UPDATE), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_UPDATETEXT), FALSE); - } - break; + break;
case WM_NOTIFY: { @@ -196,7 +170,7 @@ { case PSN_SETACTIVE: PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK); - break; + break;
case PSN_QUERYCANCEL: SetWindowLongPtr(hwndDlg, @@ -244,26 +218,10 @@ switch (uMsg) { case WM_INITDIALOG: - { - HWND hwndControl; - DWORD dwStyle; - /* Save pointer to the global setup data */ pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pSetupData);
- hwndControl = GetParent(hwndDlg); - - dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE); - SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); - - /* Set title font */ - /*SendDlgItemMessage(hwndDlg, - IDC_STARTTITLE, - WM_SETFONT, - (WPARAM)hTitleFont, - (LPARAM)TRUE);*/ - hList = GetDlgItem(hwndDlg, IDC_COMPUTER);
for (i=0; i < pSetupData->CompCount; i++) @@ -290,8 +248,7 @@ SendMessage(hList,CB_SETITEMDATA,tindex,i); } SendMessage(hList,CB_SETCURSEL,0,0); // set first as default - } - break; + break;
case WM_NOTIFY: { @@ -376,27 +333,10 @@ switch (uMsg) { case WM_INITDIALOG: - { - HWND hwndControl; - DWORD dwStyle; - /* Save pointer to the global setup data */ pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pSetupData); - - hwndControl = GetParent(hwndDlg); - - dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE); - SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); - - /* Set title font */ - /*SendDlgItemMessage(hwndDlg, - IDC_STARTTITLE, - WM_SETFONT, - (WPARAM)hTitleFont, - (LPARAM)TRUE);*/ - } - break; + break;
case WM_NOTIFY: { @@ -443,27 +383,10 @@ switch (uMsg) { case WM_INITDIALOG: - { - HWND hwndControl; - DWORD dwStyle; - /* Save pointer to the global setup data */ pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pSetupData); - - hwndControl = GetParent(hwndDlg); - - dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE); - SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); - - /* Set title font */ - /*SendDlgItemMessage(hwndDlg, - IDC_STARTTITLE, - WM_SETFONT, - (WPARAM)hTitleFont, - (LPARAM)TRUE);*/ - } - break; + break;
case WM_NOTIFY: { @@ -504,21 +427,17 @@ WPARAM wParam, LPARAM lParam) { + PSETUPDATA pSetupData; + + /* Retrieve pointer to the global setup data */ + pSetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + switch (uMsg) { case WM_INITDIALOG: - { - HWND hwndControl; - DWORD dwStyle; - - hwndControl = GetParent(hwndDlg); - - dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE); - SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); - - hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); - ShowWindow(hwndControl, SW_HIDE); - EnableWindow(hwndControl, FALSE); + /* Save pointer to the global setup data */ + pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pSetupData);
/* Set title font */ /*SendDlgItemMessage(hwndDlg, @@ -526,8 +445,7 @@ WM_SETFONT, (WPARAM)hTitleFont, (LPARAM)TRUE);*/ - } - break; + break;
case WM_TIMER: { @@ -558,13 +476,11 @@ switch (lpnm->code) { case PSN_SETACTIVE: // Only "Finish" for closing the App - { PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_FINISH); SendDlgItemMessage(hwndDlg, IDC_RESTART_PROGRESS, PBM_SETRANGE, 0, MAKELPARAM(0, 300)); SendDlgItemMessage(hwndDlg, IDC_RESTART_PROGRESS, PBM_SETPOS, 0, 0); SetTimer(hwndDlg, 1, 50, NULL); - } - break; + break;
default: break; @@ -753,12 +669,12 @@ while (SetupFindNextLine(context, context) && Count < TotalCount); } } - else return 0; + else return 0; } return TotalCount; }
-BOOL isUnattendSetup() +BOOL isUnattendSetup(VOID) { WCHAR szPath[MAX_PATH]; WCHAR *ch; @@ -796,6 +712,51 @@
return result; } + +#if 0 +static +VOID +EnableShutdownPrivilege(VOID) +{ + HANDLE hToken = NULL; + TOKEN_PRIVILEGES Privileges; + + /* Get shutdown privilege */ + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken)) + { +// FatalError("OpenProcessToken() failed!"); + return; + } + + if (!LookupPrivilegeValue(NULL, + SE_SHUTDOWN_NAME, + &Privileges.Privileges[0].Luid)) + { +// FatalError("LookupPrivilegeValue() failed!"); + goto done; + } + + Privileges.PrivilegeCount = 1; + Privileges.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; + + if (AdjustTokenPrivileges(hToken, + FALSE, + &Privileges, + 0, + (PTOKEN_PRIVILEGES)NULL, + NULL) == 0) + { +// FatalError("AdjustTokenPrivileges() failed!"); + goto done; + } + +done: + if (hToken != NULL) + CloseHandle(hToken); + + return; +} +#endif
int WINAPI _tWinMain(HINSTANCE hInst, @@ -923,6 +884,11 @@ if (pSetupData != NULL) HeapFree(GetProcessHeap(), 0, pSetupData);
+#if 0 + EnableShutdownPrivilege(); + ExitWindowsEx(EWX_REBOOT, 0); +#endif + return 0; }
-
ekohl＠svn.reactos.org