Ros-diffs June 2018

ros-diffs@reactos.org

26 participants
174 discussions

01/01: [SYSSETUP] Fix a DPH report about dwPageCount

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1668527acf67a1f0bf405… commit 1668527acf67a1f0bf405316bf86fd5b213e1f85 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri Jun 8 06:31:26 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Tue Jun 12 23:57:12 2018 +0200 [SYSSETUP] Fix a DPH report about dwPageCount - "(sdk/lib/rtl/heappage.c:1329) corrupted suffix pattern" detected at "dll/win32/syssetup/wizard.c:2672 (InstallWizard)" - Add an ASSERT(), as hinted by Mark Jansen. --- dll/win32/syssetup/wizard.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index b896adf193..6e34d35783 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -2503,7 +2503,7 @@ InstallWizard(VOID) PSETUPDATA pSetupData = NULL; HMODULE hNetShell = NULL; PFNREQUESTWIZARDPAGES pfn = NULL; - DWORD dwPageCount = 8, dwNetworkPageCount = 0; + DWORD dwPageCount = 9, dwNetworkPageCount = 0; LogItem(L"BEGIN_SECTION", L"InstallWizard"); @@ -2636,6 +2636,8 @@ InstallWizard(VOID) psp.pszTemplate = MAKEINTRESOURCE(IDD_FINISHPAGE); phpage[nPages++] = CreatePropertySheetPage(&psp); + ASSERT(nPages == dwPageCount); + /* Create the property sheet */ psh.dwSize = sizeof(PROPSHEETHEADER); psh.dwFlags = PSH_WIZARD97 | PSH_WATERMARK | PSH_HEADER | PSH_MODELESS;

6 years, 4 months

01/01: [MODULES] Update README file, with instructions about how to include rostests and rosapps (#613)

by Yaroslav Veremenko

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=04ff92bbdd6b31a17f19e… commit 04ff92bbdd6b31a17f19ee6bb1bc94dba6241859 Author: Yaroslav Veremenko <yaroslav(a)veremenko.info> AuthorDate: Tue Jun 12 15:38:05 2018 -0600 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jun 12 23:38:05 2018 +0200 [MODULES] Update README file, with instructions about how to include rostests and rosapps (#613) --- modules/rosapps/readme.txt | 15 +++++---------- modules/rostests/readme.txt | 13 ++++--------- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/modules/rosapps/readme.txt b/modules/rosapps/readme.txt index 0c6a1c158d..f0b5b84ea1 100644 --- a/modules/rosapps/readme.txt +++ b/modules/rosapps/readme.txt @@ -2,23 +2,18 @@ ReactOS Applications ==================== -This directory contains extra applicatons for ReactOS. +This directory contains extra applications for ReactOS. Make sure you also have a copy of the rest of the ReactOS source before you attempt to build anything in this module. It is to be placed under "modules" subdirectory of a trunk checkout. -No additional changes to build files are necessary, it'll be picked up -automatically. +The module requires to be enabled during the "configure" process. -To include "rosapps" in your build folder: -1. Copy the rosapps folder into the reactos\modules folder, or -2. Link reactos/modules/rosapps to rosapps +To include the module in your build folder, run the configure script with the flags -DENABLE_ROSAPPS=1 # For Windows users - cd %%_ROSSOURCEDIR%%\reactos\modules - mklink /j rosapps %%_ROSSOURCEDIR%%\rosapps + configure.cmd -DENABLE_ROSAPPS=1 # For UNIX users - cd \$$_ROSSOURCEDIR/reactos/modules - ln -s \$$_ROSSOURCEDIR/rosapps rosapps + ./configure.sh -DENABLE_ROSAPPS=1 \ No newline at end of file diff --git a/modules/rostests/readme.txt b/modules/rostests/readme.txt index 639bfd7a54..8c4b9428b6 100644 --- a/modules/rostests/readme.txt +++ b/modules/rostests/readme.txt @@ -6,19 +6,14 @@ This directory contains various tests for ReactOS. Make sure you also have a copy of the rest of the ReactOS source before you attempt to build anything in this module. It is to be placed under "modules" subdirectory of a trunk checkout. -No additional changes to build files are necessary, it'll be picked up -automatically. +The module requires to be enabled during the "configure" process. -To include "rostests" in your build folder: -1. Copy the rostests folder into the reactos\modules folder, or -2. Link reactos/modules/rostests to rostests +To include the module in your build folder, run the configure script with the flags -DENABLE_ROSTESTS=1 # For Windows users - cd %%_ROSSOURCEDIR%%\reactos\modules - mklink /j rostests %%_ROSSOURCEDIR%%\rostests + configure.cmd -DENABLE_ROSTESTS=1 # For UNIX users - cd \$$_ROSSOURCEDIR/reactos/modules - ln -s \$$_ROSSOURCEDIR/rostests rostests + ./configure.sh -DENABLE_ROSTESTS=1

6 years, 4 months

01/01: [TRANSLATION] Polish translation update (#611)

by Adam Słaboń

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=565ce5e8274fb7fc6e431… commit 565ce5e8274fb7fc6e431d09ae834097b4db0ede Author: Adam Słaboń <asaillen456esx(a)gmail.com> AuthorDate: Tue Jun 12 15:51:37 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jun 12 15:51:37 2018 +0200 [TRANSLATION] Polish translation update (#611) Polish translation update for MODE, USETUP and SHELL32. --- base/applications/cmdutils/mode/lang/pl-PL.rc | 5 ++- base/setup/usetup/lang/pl-PL.h | 20 +++++------ dll/win32/shell32/lang/pl-PL.rc | 52 +++++++++++++-------------- 3 files changed, 40 insertions(+), 37 deletions(-) diff --git a/base/applications/cmdutils/mode/lang/pl-PL.rc b/base/applications/cmdutils/mode/lang/pl-PL.rc index 05dc62c948..0cd8d44268 100644 --- a/base/applications/cmdutils/mode/lang/pl-PL.rc +++ b/base/applications/cmdutils/mode/lang/pl-PL.rc @@ -54,13 +54,16 @@ END STRINGTABLE BEGIN - IDS_ERROR_QUERY_DEVICES "BŁĄD: nie można wysłać zapytania do urządzeń DOS (0x%lx).\n" + IDS_ERROR_QUERY_DEVICES "BŁĄD: Nie można wysłać zapytania do urządzeń DOS (0x%lx).\n" IDS_ERROR_QUERY_DEVICES_FORM " QueryDosDeviceW(%s) zwrócił nierozpoznaną formę %s.\n" IDS_ERROR_SET_PARALLEL_STATE "SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n" IDS_ERROR_INVALID_PARAMETER "BŁĄD: Nieprawidłowy parametr - %s\n" IDS_ERROR_ILLEGAL_DEVICE_NAME "BŁĄD: Niedozwolona nazwa urządzenia - %s (0x%lx)\n" + IDS_ERROR_DEVICE_NOT_AVAILABLE "BŁĄD: Urządzenie %s nie jest aktualnie dostępne.\n" IDS_ERROR_STATUS_GET_DEVICE "BŁĄD: Nie udało się uzyskać stanu urządzenia COM%d:\n" IDS_ERROR_STATUS_SET_DEVICE "BŁĄD: Nie można ustawić stanu urządzenia COM%d:\n" + IDS_ERROR_TIMEOUT_GET_DEVICE "BŁĄD: Nie można uzyskać limitu czasu dla urządzenia %s:\n" + IDS_ERROR_TIMEOUT_SET_DEVICE "BŁĄD: Nie można ustawić limitu czasu dla urządzenia %s:\n" IDS_ERROR_INVALID_PARITY_BITS "BŁĄD: Nieprawidłowa wartość dla parzystości bitów %d:\n" IDS_ERROR_INVALID_STOP_BITS "BŁĄD: Nieprawidłowa wartość dla bitów separatora %d:\n" IDS_ERROR_NO_MEMORY "BŁĄD: Za mało pamięci.\n" diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index dd4ef5c977..384da7a97a 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -144,61 +144,61 @@ static MUI_ENTRY plPLIntroPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " Instalator ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "ReactOS Version Status", + "Stan rozwoju systemu ReactOS", TEXT_STYLE_HIGHLIGHT }, { 6, 11, - "ReactOS is in Alpha stage, meaning it is not feature-complete", + "System ReactOS jest w fazie Alpha, co oznacza, �e jest niekompletny", TEXT_STYLE_NORMAL }, { 6, 12, - "and is under heavy development. It is recommended to use it only for", + "i wci�� intensywnie rozwijany. Zaleca si� u�ywania systemu wy��cznie", TEXT_STYLE_NORMAL }, { 6, 13, - "evaluation and testing purposes and not as your daily-usage OS.", + "w celach ewauluacji i testowania, nie jako system codziennego u�ytku.", TEXT_STYLE_NORMAL }, { 6, 15, - "Backup your data or test on a secondary computer if you attempt", + "Wykonaj kopi� zapasow� danych lub testuj na dodatkowym komputerze,", TEXT_STYLE_NORMAL }, { 6, 16, - "to run ReactOS on real hardware.", + "je�li pr�bujesz uruchomi� system ReactOS poza maszyn� wirtualn�.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Press ENTER to continue ReactOS Setup.", + "\x07 Naci�nij ENTER, aby zainstalowa� system ReactOS.", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Press F3 to quit without installing ReactOS.", + "\x07 Naci�nij F3, aby wyj�� bez instalacji systemu ReactOS.", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER = Continue F3 = Quit", + "ENTER = Kontynuacja F3 = Wyj�cie", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index c7f39ce468..cdb49c7a53 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -661,39 +661,39 @@ BEGIN END IDD_EDITTYPE DIALOG 0, 0, 225, 190 -CAPTION "Edit File Type" +CAPTION "Edytowanie typu pliku" STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL - PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 - LTEXT "&Actions:", -1, 5, 37, 70, 10 + PUSHBUTTON "Z&mień ikonę...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Akcje:", -1, 5, 37, 70, 10 LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 - PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 - PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 - PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 - AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 - AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 - AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + PUSHBUTTON "&Nowa...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edytuj...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Usuń", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "Ustaw &domyślną", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "&Potwierdź otwarcie po pobraniu", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "&Zawsze pokazuj rozszerzenia", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "Przeglądaj w tym &samym oknie", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 160, 170, 60, 14 END IDD_ACTION DIALOG 0, 0, 225, 95 -CAPTION "New Action" +CAPTION "Nowa akcja" STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Action:", -1, 5, 7, 150, 10 + LTEXT "&Akcja:", -1, 5, 7, 150, 10 EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL - LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + LTEXT "Aplikacja używana do &wykonania akcji:", -1, 5, 42, 150, 10 EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 - AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + PUSHBUTTON "&Przeglądaj...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Użyj DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 160, 40, 60, 14 END STRINGTABLE @@ -941,13 +941,13 @@ BEGIN IDS_NEWEXT_ALREADY_ASSOC "Rozszerzenie %s jest już związane z typem plików %s. Czy chcesz usunąć powiązanie %s z %s i utworzyć dla niego nowy typ plików?" IDS_NEWEXT_EXT_IN_USE "Rozszerzenie jest w użyciu" - IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" - IDS_SPECIFY_ACTION "You must specify an action." - IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." - IDS_REMOVE_ACTION "Are you sure you want to remove this action?" - IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." - IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" - IDS_EDITING_ACTION "Editing action for type: " - IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." - IDS_FILE_NOT_FOUND "The file '%s' was not found." + IDS_REMOVE_EXT "Jeśli usuniesz zarejestrowane rozszerzenie nazwy pliku, nie będzie można otwierać plików o tym rozszerzeniu przez dwukrotne kliknięcie ich ikon.\n\nCzy na pewno chcesz usunąć to rozszerzenie?" + IDS_SPECIFY_ACTION "Musisz określić akcję." + IDS_INVALID_PROGRAM "Nie można odnaleźć podanego programu. Upewnij się, że nazwa pliku i ścieżka są poprawne." + IDS_REMOVE_ACTION "Czy na pewno chcesz usunąć tę akcję?" + IDS_ACTION_EXISTS "Akcja '%s' jest już zarejestrowana dla tego typu plików. Wpisz inną nazwę i spróbuj ponownie." + IDS_EXE_FILTER "Programy\0*.exe\0Wszystkie pliki\0*.*\0" + IDS_EDITING_ACTION "Edytowanie akcji dla typu: " + IDS_NO_ICONS "Plik '%s' nie zawiera ikon.\n\nWybierz ikonę z listy lub określ inny plik." + IDS_FILE_NOT_FOUND "Nie odnaleziono pliku '%s'." END

6 years, 5 months

01/01: [USETUP] Display the ReactOS release status (#608)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=03b7e13df520ac177699e… commit 03b7e13df520ac177699ea82b7ade9604d5f7645 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Mon Jun 11 22:53:57 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jun 11 22:53:57 2018 +0200 [USETUP] Display the ReactOS release status (#608) Update the introduction page with a more up-to-date exposition of the current status of ReactOS. --- base/setup/usetup/lang/bg-BG.h | 40 ++++++++++++++++------------ base/setup/usetup/lang/bn-BD.h | 34 ++++++++++++++---------- base/setup/usetup/lang/cs-CZ.h | 38 +++++++++++++++----------- base/setup/usetup/lang/da-DK.h | 44 +++++++++++++++---------------- base/setup/usetup/lang/de-DE.h | 38 +++++++++++++++----------- base/setup/usetup/lang/el-GR.h | 44 ++++++++++++++++++------------- base/setup/usetup/lang/en-US.h | 34 ++++++++++++++---------- base/setup/usetup/lang/es-ES.h | 38 +++++++++++++------------- base/setup/usetup/lang/et-EE.h | 40 ++++++++++++++++------------ base/setup/usetup/lang/fr-FR.h | 40 ++++++++++++++-------------- base/setup/usetup/lang/he-IL.h | 38 +++++++++++++++----------- base/setup/usetup/lang/it-IT.h | 60 +++++++++++++++++++++--------------------- base/setup/usetup/lang/ja-JP.h | 40 ++++++++++++++++------------ base/setup/usetup/lang/lt-LT.h | 36 ++++++++++++++----------- base/setup/usetup/lang/ms-MY.h | 40 ++++++++++++++++------------ base/setup/usetup/lang/nl-NL.h | 44 +++++++++++++------------------ base/setup/usetup/lang/pl-PL.h | 40 ++++++++++++++++------------ base/setup/usetup/lang/pt-BR.h | 42 ++++++++++++++--------------- base/setup/usetup/lang/ro-RO.h | 48 +++++++++++++-------------------- base/setup/usetup/lang/ru-RU.h | 38 +++++++++++++++----------- base/setup/usetup/lang/sk-SK.h | 40 ++++++++++++++++------------ base/setup/usetup/lang/sq-AL.h | 40 ++++++++++++++++------------ base/setup/usetup/lang/sv-SE.h | 38 +++++++++++++++----------- base/setup/usetup/lang/tr-TR.h | 38 +++++++++++++++----------- base/setup/usetup/lang/uk-UA.h | 40 ++++++++++++++++------------ 25 files changed, 551 insertions(+), 461 deletions(-) diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index 77f323a666..c85d48cc86 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -142,56 +142,62 @@ static MUI_ENTRY bgBGIntroPageEntries[] = { 4, 3, - " �� ⎑ " KERNEL_VERSION_STR " . ", + " ReactOS " KERNEL_VERSION_STR " Setup ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "��ன�� ⎑ � � ࠭�� ⥯�� ࠧࠡ�⪠. �� ", - TEXT_STYLE_NORMAL + "ReactOS Version Status", + TEXT_STYLE_HIGHLIGHT }, { 6, - 9, - "�ﬠ ��窨 �ꧬ�� ꫭ� �� ன�� ਫ��.", + 11, + "ReactOS is in Alpha stage, meaning it is not feature-complete", TEXT_STYLE_NORMAL }, { 6, 12, - "��㢠� ᫥�� ࠭�祭��:", + "and is under heavy development. It is recommended to use it only for", TEXT_STYLE_NORMAL }, { - 8, + 6, 13, - "- ��ன�� ঠ ᠬ� FAT.", + "evaluation and testing purposes and not as your daily-usage OS.", TEXT_STYLE_NORMAL }, { - 8, - 14, - "- �஢�ઠ� �� 䠩�� ।�� ⮢�.", + 6, + 15, + "Backup your data or test on a secondary computer if you attempt", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "to run ReactOS on real hardware.", TEXT_STYLE_NORMAL }, { 8, - 23, - "\x07 ��᭥� ENTER �� ᫠�� ⎑.", + 19, + "\x07 Press ENTER to continue ReactOS Setup.", TEXT_STYLE_NORMAL }, { 8, - 25, - "\x07 ��᭥� F3 �� 室 �� ᫠�� ⎑.", + 21, + "\x07 Press F3 to quit without installing ReactOS.", TEXT_STYLE_NORMAL }, { 0, 0, - " ENTER = �தꫦ�� F3 = ��室", - TEXT_TYPE_STATUS + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index f53212f8ae..fcc483b7d3 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -139,42 +139,48 @@ static MUI_ENTRY bnBDIntroPageEntries[] = { 6, 8, - "ReactOS Setup is in an early development phase. It does not yet", - TEXT_STYLE_NORMAL + "ReactOS Version Status", + TEXT_STYLE_HIGHLIGHT }, { 6, - 9, - "support all the functions of a fully usable setup application.", + 11, + "ReactOS is in Alpha stage, meaning it is not feature-complete", TEXT_STYLE_NORMAL }, { 6, 12, - "The following limitations apply:", + "and is under heavy development. It is recommended to use it only for", TEXT_STYLE_NORMAL }, { - 8, + 6, 13, - "- Setup supports FAT file systems only.", + "evaluation and testing purposes and not as your daily-usage OS.", TEXT_STYLE_NORMAL }, { - 8, - 14, - "- File system checks are not implemented yet.", + 6, + 15, + "Backup your data or test on a secondary computer if you attempt", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "to run ReactOS on real hardware.", TEXT_STYLE_NORMAL }, { 8, - 23, - "\x07 Press ENTER to install ReactOS.", + 19, + "\x07 Press ENTER to continue ReactOS Setup.", TEXT_STYLE_NORMAL }, { 8, - 25, + 21, "\x07 Press F3 to quit without installing ReactOS.", TEXT_STYLE_NORMAL }, @@ -182,7 +188,7 @@ static MUI_ENTRY bnBDIntroPageEntries[] = 0, 0, "ENTER = Continue F3 = Quit", - TEXT_TYPE_STATUS| TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index 693d413410..790fbfc6e6 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -141,55 +141,61 @@ static MUI_ENTRY csCZIntroPageEntries[] = { 4, 3, - " Instalace ReactOS " KERNEL_VERSION_STR " ", + " ReactOS " KERNEL_VERSION_STR " Setup ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "Instalace ReactOS je v ran� v�vojov� f�zi. Zat�m nejsou podporov�ny", - TEXT_STYLE_NORMAL + "ReactOS Version Status", + TEXT_STYLE_HIGHLIGHT }, { 6, - 9, - "v�echny funkce pln� pou�iteln� instala�n� aplikace.", + 11, + "ReactOS is in Alpha stage, meaning it is not feature-complete", TEXT_STYLE_NORMAL }, { 6, 12, - "Plat� n�sleduj�c� omezen�:", + "and is under heavy development. It is recommended to use it only for", TEXT_STYLE_NORMAL }, { - 8, + 6, 13, - "- Instalace podporuje pouze souborov� syst�m FAT.", + "evaluation and testing purposes and not as your daily-usage OS.", TEXT_STYLE_NORMAL }, { - 8, - 14, - "- Kontroly souborov�ch syst�m� zat�m nejsou implementov�ny.", + 6, + 15, + "Backup your data or test on a secondary computer if you attempt", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "to run ReactOS on real hardware.", TEXT_STYLE_NORMAL }, { 8, - 23, - "\x07 Stisknut�m kl�vesy ENTER zah�j�te instalaci ReactOS.", + 19, + "\x07 Press ENTER to continue ReactOS Setup.", TEXT_STYLE_NORMAL }, { 8, - 25, - "\x07 Stisknut�m F3 ukon��te instalaci ReactOS.", + 21, + "\x07 Press F3 to quit without installing ReactOS.", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER = Pokra�ovat F3 = Ukon�it", + "ENTER = Continue F3 = Quit", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index 012f2862d4..f6029f6613 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -133,62 +133,62 @@ static MUI_ENTRY daDKIntroPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " installationen ", + " ReactOS " KERNEL_VERSION_STR " Setup ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "ReactOS installationen er i en tilelig udviklingsfase. Derfor", - TEXT_STYLE_NORMAL + "ReactOS Version Status", + TEXT_STYLE_HIGHLIGHT }, { 6, - 9, - "underst�tter den ikke alle funtionerne i et fult brugbart", + 11, + "ReactOS is in Alpha stage, meaning it is not feature-complete", TEXT_STYLE_NORMAL }, - { + { 6, - 10, - "installationsprogram.", + 12, + "and is under heavy development. It is recommended to use it only for", TEXT_STYLE_NORMAL }, { 6, - 12, - "Der er f�lgende begr�ndsninger:", + 13, + "evaluation and testing purposes and not as your daily-usage OS.", TEXT_STYLE_NORMAL }, { - 8, - 13, - "- Installationen underst�tter kun FAT-filsystmet.", + 6, + 15, + "Backup your data or test on a secondary computer if you attempt", TEXT_STYLE_NORMAL }, { - 8, - 14, - "- Tjek af filsystem er endnu ikke implementeret.", + 6, + 16, + "to run ReactOS on real hardware.", TEXT_STYLE_NORMAL }, { 8, - 23, - "\x07 Tryk p� ENTER for at installere ReactOS.", + 19, + "\x07 Press ENTER to continue ReactOS Setup.", TEXT_STYLE_NORMAL }, { 8, - 25, - "\x07 Tryk p� F3 for at afslutte uden at installere ReactOS.", + 21, + "\x07 Press F3 to quit without installing ReactOS.", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER = Forts�t F3 = Afslut", - TEXT_TYPE_STATUS| TEXT_PADDING_BIG + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index 6372cee3f1..9ddac46c7f 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -140,50 +140,56 @@ static MUI_ENTRY deDEIntroPageEntries[] = { 6, 8, - "Der Installationsassistent befindet sich noch in der Entwicklungsphase.", - TEXT_STYLE_NORMAL + "ReactOS Version Status", + TEXT_STYLE_HIGHLIGHT }, { 6, - 9, - "Einige Funktionen werden noch nicht vollst�ndig unterst�tzt.", + 11, + "ReactOS is in Alpha stage, meaning it is not feature-complete", TEXT_STYLE_NORMAL }, { 6, 12, - "Es existieren folgende Beschr�nkungen:", + "and is under heavy development. It is recommended to use it only for", TEXT_STYLE_NORMAL }, { - 8, + 6, 13, - "- Es werden nur FAT-Dateisysteme unterst�tzt.", + "evaluation and testing purposes and not as your daily-usage OS.", TEXT_STYLE_NORMAL }, { - 8, - 14, - "- Die Dateisystem�berpr�fung ist noch nicht implementiert.", + 6, + 15, + "Backup your data or test on a secondary computer if you attempt", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "to run ReactOS on real hardware.", TEXT_STYLE_NORMAL }, { 8, - 23, - "\x07 Dr�cken Sie die EINGABETASTE, um ReactOS zu installieren.", + 19, + "\x07 Press ENTER to continue ReactOS Setup.", TEXT_STYLE_NORMAL }, { 8, - 25, - "\x07 Dr�cken Sie F3, um die Installation abzubrechen.", + 21, + "\x07 Press F3 to quit without installing ReactOS.", TEXT_STYLE_NORMAL }, { 0, 0, - "EINGABETASTE = Fortsetzen F3 = Installation abbrechen", - TEXT_TYPE_STATUS| TEXT_PADDING_BIG + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index 322fab8fb4..034b895f90 100644 --- a/base/setup/usetup/lang/el-GR.h +++ b/base/setup/usetup/lang/el-GR.h @@ -134,56 +134,62 @@ static MUI_ENTRY elGRIntroPageEntries[] = { 4, 3, - " ��ᩫ�� ReactOS " KERNEL_VERSION_STR, + " ReactOS " KERNEL_VERSION_STR " Setup ", TEXT_STYLE_UNDERLINE }, { 6, - 7, - "� ��ᩫ�� ReactOS ��婡�� 頣� ��ᛠ� ��᧫�� ", + 8, + "ReactOS Version Status", + TEXT_STYLE_HIGHLIGHT + }, + { + 6, + 11, + "ReactOS is in Alpha stage, meaning it is not feature-complete", TEXT_STYLE_NORMAL }, { 6, - 8, - "�� 坜� ��棘梜� �� 櫞�� 㨦�� ᩫ��", + 12, + "and is under heavy development. It is recommended to use it only for", TEXT_STYLE_NORMAL }, { 6, - 11, - "��禬� �� :", + 13, + "evaluation and testing purposes and not as your daily-usage OS.", TEXT_STYLE_NORMAL }, { - 8, - 12, - "- � ��ᩫ�� 坜� �椦 FAT ��㣘�� .", + 6, + 15, + "Backup your data or test on a secondary computer if you attempt", TEXT_STYLE_NORMAL }, { - 8, - 13, - "- �� 坜�� 棘 ⢜�� 㣘�� .", + 6, + 16, + "to run ReactOS on real hardware.", TEXT_STYLE_NORMAL }, { 8, - 23, - "\x07 ��㩫� ENTER �� 㩜�� ReactOS.", + 19, + "\x07 Press ENTER to continue ReactOS Setup.", TEXT_STYLE_NORMAL }, { 8, - 25, - "\x07 ��㩫� F3 �� 㩜�� 㩜�� ReactOS.", + 21, + "\x07 Press F3 to quit without installing ReactOS.", TEXT_STYLE_NORMAL }, { 0, 0, - " ENTER = ��⮜�� F3 = ��騞��", - TEXT_TYPE_STATUS + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index a19120f6dd..216df8fc3b 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -139,42 +139,48 @@ static MUI_ENTRY enUSIntroPageEntries[] = { 6, 8, - "ReactOS Setup is in an early development phase. It does not yet", - TEXT_STYLE_NORMAL + "ReactOS Version Status", + TEXT_STYLE_HIGHLIGHT }, { 6, - 9, - "support all the functions of a fully usable setup application.", + 11, + "ReactOS is in Alpha stage, meaning it is not feature-complete", TEXT_STYLE_NORMAL }, { 6, 12, - "The following limitations apply:", + "and is under heavy development. It is recommended to use it only for", TEXT_STYLE_NORMAL }, { - 8, + 6, 13, - "- Setup supports FAT file systems only.", + "evaluation and testing purposes and not as your daily-usage OS.", TEXT_STYLE_NORMAL }, { - 8, - 14, - "- File system checks are not implemented yet.", + 6, + 15, + "Backup your data or test on a secondary computer if you attempt", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "to run ReactOS on real hardware.", TEXT_STYLE_NORMAL }, { 8, - 23, - "\x07 Press ENTER to install ReactOS.", + 19, + "\x07 Press ENTER to continue ReactOS Setup.", TEXT_STYLE_NORMAL }, { 8, - 25, + 21, "\x07 Press F3 to quit without installing ReactOS.", TEXT_STYLE_NORMAL }, @@ -182,7 +188,7 @@ static MUI_ENTRY enUSIntroPageEntries[] = 0, 0, "ENTER = Continue F3 = Quit", - TEXT_TYPE_STATUS| TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index 5fcf2fe384..2bf3418b58 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -136,61 +136,61 @@ static MUI_ENTRY esESIntroPageEntries[] = { 4, 3, - " Instalaci�n de ReactOS " KERNEL_VERSION_STR " ", + " ReactOS " KERNEL_VERSION_STR " Setup ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "El instalador de ReactOS se encuentra en una etapa preliminar.", - TEXT_STYLE_NORMAL + "ReactOS Version Status", + TEXT_STYLE_HIGHLIGHT }, { 6, - 9, - "A�n no posee todas las funciones de un instalador.", + 11, + "ReactOS is in Alpha stage, meaning it is not feature-complete", TEXT_STYLE_NORMAL }, { 6, 12, - "Se presentan las siguientes limitaciones:", + "and is under heavy development. It is recommended to use it only for", TEXT_STYLE_NORMAL }, { - 8, + 6, 13, - "- El instalador s�lo puede utilizar el sistema de archivos FAT.", + "evaluation and testing purposes and not as your daily-usage OS.", TEXT_STYLE_NORMAL }, { - 8, - 14, - "- El comprobador de integridad del sistema de archivos no est� a�n", + 6, + 15, + "Backup your data or test on a secondary computer if you attempt", TEXT_STYLE_NORMAL }, { - 8, - 15, - " implementado.", + 6, + 16, + "to run ReactOS on real hardware.", TEXT_STYLE_NORMAL }, { 8, - 25, - "\x07 Presione INTRO para instalar ReactOS.", + 19, + "\x07 Press ENTER to continue ReactOS Setup.", TEXT_STYLE_NORMAL }, { 8, - 27, - "\x07 Presione F3 para salir sin instalar ReactOS.", + 21, + "\x07 Press F3 to quit without installing ReactOS.", TEXT_STYLE_NORMAL }, { 0, 0, - " INTRO = Continuar F3 = Salir", + "ENTER = Continue F3 = Quit", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index b4432ee475..b21105d6c2 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -133,56 +133,62 @@ static MUI_ENTRY etEEIntroPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " paigaldamine ", + " ReactOS " KERNEL_VERSION_STR " Setup ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "ReactOSi paigaldusprogramm on varajases arendusfaasis. Praegu ei ole", - TEXT_STYLE_NORMAL + "ReactOS Version Status", + TEXT_STYLE_HIGHLIGHT }, { 6, - 9, - "veel k�ik korraliku paigaldusprogrammi funktsioonid toetatud.", + 11, + "ReactOS is in Alpha stage, meaning it is not feature-complete", TEXT_STYLE_NORMAL }, { 6, 12, - "Kehtivad j�rgmised piirangud:", + "and is under heavy development. It is recommended to use it only for", TEXT_STYLE_NORMAL }, { - 8, + 6, 13, - "- Toetatud on ainult FAT failis�steem.", + "evaluation and testing purposes and not as your daily-usage OS.", TEXT_STYLE_NORMAL }, { - 8, - 14, - "- Failis�steemi kontrollimist veel ei tehta.", + 6, + 15, + "Backup your data or test on a secondary computer if you attempt", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "to run ReactOS on real hardware.", TEXT_STYLE_NORMAL }, { 8, - 23, - "\x07 Vajuta ENTER, et ReactOS paigaldada.", + 19, + "\x07 Press ENTER to continue ReactOS Setup.", TEXT_STYLE_NORMAL }, { 8, - 25, - "\x07 Vajuta F3, et v�ljuda ReactOSi paigaldamata.", + 21, + "\x07 Press F3 to quit without installing ReactOS.", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER = J�tka F3 = V�lju", - TEXT_TYPE_STATUS| TEXT_PADDING_BIG + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index 86d1be6bb6..7f11d9ba68 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -134,61 +134,61 @@ static MUI_ENTRY frFRIntroPageEntries[] = { 4, 3, - " Installation de ReactOS " KERNEL_VERSION_STR " ", + " ReactOS " KERNEL_VERSION_STR " Setup ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "L'installation de ReactOS est en phase de d�veloppement.", - TEXT_STYLE_NORMAL + "ReactOS Version Status", + TEXT_STYLE_HIGHLIGHT }, { 6, - 9, - "Elle ne supporte pas encore toutes les fonctions d'une application", + 11, + "ReactOS is in Alpha stage, meaning it is not feature-complete", TEXT_STYLE_NORMAL }, { 6, - 10, - " d'installation enti�rement utilisable.", + 12, + "and is under heavy development. It is recommended to use it only for", TEXT_STYLE_NORMAL }, { 6, - 12, - "Les limitations suivantes s'appliquent:", + 13, + "evaluation and testing purposes and not as your daily-usage OS.", TEXT_STYLE_NORMAL }, { - 8, - 13, - "- L'installation supporte uniquement le syst�me de fichiers FAT.", + 6, + 15, + "Backup your data or test on a secondary computer if you attempt", TEXT_STYLE_NORMAL }, { - 8, - 14, - "- Les v�rifications de syst�me de fichers ne sont pas impl�ment�es.", + 6, + 16, + "to run ReactOS on real hardware.", TEXT_STYLE_NORMAL }, { 8, - 23, - "\x07 Appuyer sur ENTR�E pour installer ReactOS.", + 19, + "\x07 Press ENTER to continue ReactOS Setup.", TEXT_STYLE_NORMAL }, { 8, - 25, - "\x07 Appuyer sur F3 pour quitter sans installer ReactOS.", + 21, + "\x07 Press F3 to quit without installing ReactOS.", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTR�E = Continuer F3 = Quitter", + "ENTER = Continue F3 = Quit", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index 7330af5fd0..e48da925d2 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -134,56 +134,62 @@ static MUI_ENTRY heILIntroPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " �� ", + " ReactOS " KERNEL_VERSION_STR " Setup ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "�� .�� ReactOS ��", - TEXT_STYLE_NORMAL + "ReactOS Version Status", + TEXT_STYLE_HIGHLIGHT }, { 6, - 9, - ".�� ", + 11, + "ReactOS is in Alpha stage, meaning it is not feature-complete", TEXT_STYLE_NORMAL }, { 6, 12, - ":�� ", + "and is under heavy development. It is recommended to use it only for", TEXT_STYLE_NORMAL }, { - 8, + 6, 13, - "- Setup supports FAT file systems only.", + "evaluation and testing purposes and not as your daily-usage OS.", TEXT_STYLE_NORMAL }, { - 8, - 14, - "- File system checks are not implemented yet.", + 6, + 15, + "Backup your data or test on a secondary computer if you attempt", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "to run ReactOS on real hardware.", TEXT_STYLE_NORMAL }, { 8, - 23, - "\x07 Press ENTER to install ReactOS.", + 19, + "\x07 Press ENTER to continue ReactOS Setup.", TEXT_STYLE_NORMAL }, { 8, - 25, + 21, "\x07 Press F3 to quit without installing ReactOS.", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER = �� F3 = ��", - TEXT_TYPE_STATUS| TEXT_PADDING_BIG + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index b28d54b935..33dfe6d364 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -132,64 +132,64 @@ static MUI_ENTRY itITWelcomePageEntries[] = static MUI_ENTRY itITIntroPageEntries[] = { { - 4, + 4, 3, - " Installazione di ReactOS " KERNEL_VERSION_STR " ", + " ReactOS " KERNEL_VERSION_STR " Setup ", TEXT_STYLE_UNDERLINE }, { - 4, - 3, - " Installazione di ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE + 6, + 8, + "ReactOS Version Status", + TEXT_STYLE_HIGHLIGHT }, { - 6, - 8, - "Il setup di ReactOS � ancora in una fase preliminare.", + 6, + 11, + "ReactOS is in Alpha stage, meaning it is not feature-complete", TEXT_STYLE_NORMAL }, { - 6, - 9, - "Non ha ancora tutte le funzioni di installazione.", + 6, + 12, + "and is under heavy development. It is recommended to use it only for", TEXT_STYLE_NORMAL }, { - 6, - 12, - "Si applicano le seguenti limitazioni:", + 6, + 13, + "evaluation and testing purposes and not as your daily-usage OS.", TEXT_STYLE_NORMAL }, { - 8, - 13, - "- Il setup supporta solamente il sistema FAT.", + 6, + 15, + "Backup your data or test on a secondary computer if you attempt", TEXT_STYLE_NORMAL }, { - 8, - 14, - "- File system checks are not implemented yet.", + 6, + 16, + "to run ReactOS on real hardware.", TEXT_STYLE_NORMAL }, { - 8, - 23, - "\x07 Premere INVIO per installare ReactOS.", + 8, + 19, + "\x07 Press ENTER to continue ReactOS Setup.", TEXT_STYLE_NORMAL }, { - 8, - 25, - "\x07 Premere F3 per uscire senza installare ReactOS.", + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", TEXT_STYLE_NORMAL }, { 0, - 0, - " INVIO = Continua F3 = Termina", - TEXT_TYPE_STATUS + 0, + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index 99bd07a37d..1000261c0d 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -134,56 +134,62 @@ static MUI_ENTRY jaJPIntroPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " ��ı�� ", + " ReactOS " KERNEL_VERSION_STR " Setup ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "ReactOS ��ı�� ݶ�� Ͻ� ��Ҥ ��", - TEXT_STYLE_NORMAL + "ReactOS Version Status", + TEXT_STYLE_HIGHLIGHT }, { 6, - 9, - "�ޭ�� ֳ�޷� ��ı�� ع�� ɳ� ��߰� ��Ͼݡ", + 11, + "ReactOS is in Alpha stage, meaning it is not feature-complete", TEXT_STYLE_NORMAL }, { 6, 12, - "·�� Ը�� ÷ֳ ��Ͻ:", + "and is under heavy development. It is recommended to use it only for", TEXT_STYLE_NORMAL }, { - 8, + 6, 13, - "- ��ı�� FAT ̧�ټ�� ߰� �Ͻ�", + "evaluation and testing purposes and not as your daily-usage OS.", TEXT_STYLE_NORMAL }, { - 8, - 14, - "- ̧�ټ�� ɳ� �� ޯ�� Ͼݡ", + 6, + 15, + "Backup your data or test on a secondary computer if you attempt", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "to run ReactOS on real hardware.", TEXT_STYLE_NORMAL }, { 8, - 23, - "\x07 ReactOS � �ݽİ� �� ENTER �� ޻��", + 19, + "\x07 Press ENTER to continue ReactOS Setup.", TEXT_STYLE_NORMAL }, { 8, - 25, - "\x07 ReactOS � �ݽİپ�� ޱ�� F3 �� ޻��", + 21, + "\x07 Press F3 to quit without installing ReactOS.", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER = �ޯ�� F3 = ��", - TEXT_TYPE_STATUS| TEXT_PADDING_BIG + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index 6ef2afb48b..9a90a8dbab 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -143,55 +143,61 @@ static MUI_ENTRY ltLTIntroPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " diegimo programa ", + " ReactOS " KERNEL_VERSION_STR " Setup ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "ReactOS Setup is in an early development phase. It does not yet", - TEXT_STYLE_NORMAL + "ReactOS Version Status", + TEXT_STYLE_HIGHLIGHT }, { 6, - 9, - "support all the functions of a fully usable setup application.", + 11, + "ReactOS is in Alpha stage, meaning it is not feature-complete", TEXT_STYLE_NORMAL }, { 6, 12, - "The following limitations apply:", + "and is under heavy development. It is recommended to use it only for", TEXT_STYLE_NORMAL }, { - 8, + 6, 13, - "- Setup supports FAT file systems only.", + "evaluation and testing purposes and not as your daily-usage OS.", TEXT_STYLE_NORMAL }, { - 8, - 14, - "- File system checks are not implemented yet.", + 6, + 15, + "Backup your data or test on a secondary computer if you attempt", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "to run ReactOS on real hardware.", TEXT_STYLE_NORMAL }, { 8, - 23, - "\x07 Press ENTER to install ReactOS.", + 19, + "\x07 Press ENTER to continue ReactOS Setup.", TEXT_STYLE_NORMAL }, { 8, - 25, + 21, "\x07 Press F3 to quit without installing ReactOS.", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER = T�sti F3 = Baigti", + "ENTER = Continue F3 = Quit", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index 77310c9a85..b4eceeb2f2 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -133,56 +133,62 @@ static MUI_ENTRY msMYIntroPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Persediaan ", + " ReactOS " KERNEL_VERSION_STR " Setup ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "ReactOS persediaan sedang untuk fasa pembangunan awal. Ia tidak lagi", - TEXT_STYLE_NORMAL + "ReactOS Version Status", + TEXT_STYLE_HIGHLIGHT }, { 6, - 9, - "menyokong semua fungsi aplikasi persediaan sepenuhnya digunakan.", + 11, + "ReactOS is in Alpha stage, meaning it is not feature-complete", TEXT_STYLE_NORMAL }, { 6, 12, - "Kepada had berikut diguna pakai:", + "and is under heavy development. It is recommended to use it only for", TEXT_STYLE_NORMAL }, { - 8, + 6, 13, - "- Persediaan menyokong sistem fail FAT sahaja.", + "evaluation and testing purposes and not as your daily-usage OS.", TEXT_STYLE_NORMAL }, { - 8, - 14, - "- Pemeriksaan sistem fail tidak dilaksanakan lagi.", + 6, + 15, + "Backup your data or test on a secondary computer if you attempt", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "to run ReactOS on real hardware.", TEXT_STYLE_NORMAL }, { 8, - 23, - "\x07 Tekan ENTER untuk memasang ReactOS.", + 19, + "\x07 Press ENTER to continue ReactOS Setup.", TEXT_STYLE_NORMAL }, { 8, - 25, - "\x07 Tekan F3 untuk keluar tanpa memasang ReactOS.", + 21, + "\x07 Press F3 to quit without installing ReactOS.", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER = Teruskan F3 = Keluar", - TEXT_TYPE_STATUS| TEXT_PADDING_BIG + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index ada57e46e3..c25d939dad 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -155,62 +155,56 @@ static MUI_ENTRY nlNLIntroPageEntries[] = { 6, 8, - "ReactOS Setup is nog in een vroege ontwikkelingsfase.", - TEXT_STYLE_NORMAL - }, - { - 6, - 9, - "Het ondersteunt nog niet alle functies van een volledig", - TEXT_STYLE_NORMAL + "ReactOS Version Status", + TEXT_STYLE_HIGHLIGHT }, { 6, - 10, - "setup programma.", + 11, + "ReactOS is in Alpha stage, meaning it is not feature-complete", TEXT_STYLE_NORMAL }, { 6, 12, - "De volgende beperkingen zijn van toepassing:", + "and is under heavy development. It is recommended to use it only for", TEXT_STYLE_NORMAL }, { - 8, + 6, 13, - "\x07 Setup ondersteunt alleen FAT bestandssystemen.", + "evaluation and testing purposes and not as your daily-usage OS.", TEXT_STYLE_NORMAL }, { - 8, - 14, - "\x07 Bestandssysteemcontrole is nog niet ge\x8Bmplementeerd.", + 6, + 15, + "Backup your data or test on a secondary computer if you attempt", TEXT_STYLE_NORMAL }, { - 8, - 23, - "\x07 Druk op ENTER om ReactOS te installeren.", + 6, + 16, + "to run ReactOS on real hardware.", TEXT_STYLE_NORMAL }, { 8, - 25, - "\x07 Druk op F3 als u Setup wilt afsluiten zonder ReactOS te", + 19, + "\x07 Press ENTER to continue ReactOS Setup.", TEXT_STYLE_NORMAL }, { 8, - 26, - " installeren.", + 21, + "\x07 Press F3 to quit without installing ReactOS.", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER = Doorgaan F3 = Afsluiten", - TEXT_TYPE_STATUS| TEXT_PADDING_BIG + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index 0b2a3be212..dd4ef5c977 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -144,56 +144,62 @@ static MUI_ENTRY plPLIntroPageEntries[] = { 4, 3, - " Instalator ReactOS " KERNEL_VERSION_STR " ", + " ReactOS " KERNEL_VERSION_STR " Setup ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "Instalator ReactOS wci�� jest we wczesnej fazie rozwoju. Nadal nie", - TEXT_STYLE_NORMAL + "ReactOS Version Status", + TEXT_STYLE_HIGHLIGHT }, { 6, - 9, - "obs�uguje wszystkich funkcji, niezb�dnych dla programu instalacyjnego.", + 11, + "ReactOS is in Alpha stage, meaning it is not feature-complete", TEXT_STYLE_NORMAL }, { 6, 12, - "Najwa�niejsze ograniczenia:", + "and is under heavy development. It is recommended to use it only for", TEXT_STYLE_NORMAL }, { - 8, + 6, 13, - "- Instalator obs�uguje jedynie system plik�w FAT.", + "evaluation and testing purposes and not as your daily-usage OS.", TEXT_STYLE_NORMAL }, { - 8, - 14, - "- Brakuje sprawdzenia poprawno�ci systemu plik�w.", + 6, + 15, + "Backup your data or test on a secondary computer if you attempt", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "to run ReactOS on real hardware.", TEXT_STYLE_NORMAL }, { 8, - 23, - "\x07 Naci�nij ENTER, aby zainstalowa� system ReactOS.", + 19, + "\x07 Press ENTER to continue ReactOS Setup.", TEXT_STYLE_NORMAL }, { 8, - 25, - "\x07 Naci�nij F3, aby wyj�� bez instalacji systemu ReactOS.", + 21, + "\x07 Press F3 to quit without installing ReactOS.", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER = Kontynuacja F3 = Wyj�cie", - TEXT_TYPE_STATUS| TEXT_PADDING_BIG + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index 9a1ae2a739..e1cd55e159 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -134,61 +134,61 @@ static MUI_ENTRY ptBRIntroPageEntries[] = { 4, 3, - " Instala��o do ReactOS " KERNEL_VERSION_STR " ", + " ReactOS " KERNEL_VERSION_STR " Setup ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "O instalador do ReactOS est� em fase inicial de desenvolvimento e", - TEXT_STYLE_NORMAL + "ReactOS Version Status", + TEXT_STYLE_HIGHLIGHT }, { 6, - 9, - "ainda n�o suporta todas as fun��es de instala��o.", + 11, + "ReactOS is in Alpha stage, meaning it is not feature-complete", TEXT_STYLE_NORMAL }, { 6, - 11, - "As seguintes limita��es se aplicam:", + 12, + "and is under heavy development. It is recommended to use it only for", TEXT_STYLE_NORMAL }, { - 8, - 12, - "- O instalador suporta somente o sistema de arquivos FAT.", + 6, + 13, + "evaluation and testing purposes and not as your daily-usage OS.", TEXT_STYLE_NORMAL }, { - 8, - 13, - "- O verificador de integridade de sistema de arquivos ainda n�o est�", + 6, + 15, + "Backup your data or test on a secondary computer if you attempt", TEXT_STYLE_NORMAL }, { - 8, - 14, - " implementado.", + 6, + 16, + "to run ReactOS on real hardware.", TEXT_STYLE_NORMAL }, { 8, - 25, - "\x07 Para continuar a instala��o do ReactOS, pressione ENTER.", + 19, + "\x07 Press ENTER to continue ReactOS Setup.", TEXT_STYLE_NORMAL }, { 8, - 27, - "\x07 Para sair sem instalar o ReactOS, pressione F3.", + 21, + "\x07 Press F3 to quit without installing ReactOS.", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER=Continuar F3=Sair", + "ENTER = Continue F3 = Quit", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index 04b6f9e099..67a8b312b7 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -147,74 +147,62 @@ static MUI_ENTRY roROIntroPageEntries[] = { 4, 3, - " Instalare ReactOS " KERNEL_VERSION_STR " ", + " ReactOS " KERNEL_VERSION_STR " Setup ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "Programul curent de instalare este �nc� �ntr-un stadiu primar", - TEXT_STYLE_NORMAL + "ReactOS Version Status", + TEXT_STYLE_HIGHLIGHT }, { 6, - 9, - "de dezvoltare �i nu con�ine toate func�ionalit��ile unui", + 11, + "ReactOS is in Alpha stage, meaning it is not feature-complete", TEXT_STYLE_NORMAL }, { 6, - 10, - "program de instalare complet.", + 12, + "and is under heavy development. It is recommended to use it only for", TEXT_STYLE_NORMAL }, { 6, 13, - "Sunt aplicabile urm�toarele limit�ri:", + "evaluation and testing purposes and not as your daily-usage OS.", TEXT_STYLE_NORMAL }, { - 8, - 14, - "- Programul curent de instalare poate opera doar cu sisteme", - TEXT_STYLE_NORMAL - }, - { - 8, + 6, 15, - " de fi�iere FAT.", + "Backup your data or test on a secondary computer if you attempt", TEXT_STYLE_NORMAL }, { - 8, + 6, 16, - "- Verific�rile de integritate pentru fi�iere nu sunt", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " �nc� implementate.", + "to run ReactOS on real hardware.", TEXT_STYLE_NORMAL }, { 8, - 26, - "\x07 Ap�sa�i ENTER pentru a instala ReactOS.", + 19, + "\x07 Press ENTER to continue ReactOS Setup.", TEXT_STYLE_NORMAL }, { 8, - 28, - "\x07 Ap�sa�i F3 pentru a ie�i f�r� a instala ReactOS.", + 21, + "\x07 Press F3 to quit without installing ReactOS.", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER = Continuare F3 = Ie�ire", - TEXT_TYPE_STATUS| TEXT_PADDING_BIG + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index b06c92179b..6d087dfafd 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -134,55 +134,61 @@ static MUI_ENTRY ruRUIntroPageEntries[] = { 4, 3, - " ��⠭�� ReactOS " KERNEL_VERSION_STR, + " ReactOS " KERNEL_VERSION_STR " Setup ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "ReactOS ��室�� ࠭�� ⠤�� ࠧࠡ�⪨ � �� ন�� ", - TEXT_STYLE_NORMAL + "ReactOS Version Status", + TEXT_STYLE_HIGHLIGHT }, { 6, - 9, - "�㭪樨 �� ᮢ��⨬�� ⠭��묨 �ਫ��ﬨ.", + 11, + "ReactOS is in Alpha stage, meaning it is not feature-complete", TEXT_STYLE_NORMAL }, { 6, 12, - "�� ᫥��騥 ��࠭�祭��:", + "and is under heavy development. It is recommended to use it only for", TEXT_STYLE_NORMAL }, { - 8, + 6, 13, - "- �� ⠭�� ন�� ⮫쪮 䠩�� ⥬� FAT.", + "evaluation and testing purposes and not as your daily-usage OS.", TEXT_STYLE_NORMAL }, { - 8, - 14, - "- �஢�ઠ 䠩�� ⥬� �� ⢫��.", + 6, + 15, + "Backup your data or test on a secondary computer if you attempt", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "to run ReactOS on real hardware.", TEXT_STYLE_NORMAL }, { 8, - 23, - "\x07 �� ENTER �� ⠭�� ReactOS.", + 19, + "\x07 Press ENTER to continue ReactOS Setup.", TEXT_STYLE_NORMAL }, { 8, - 25, - "\x07 �� F3 �� 室� �� ⠭�� ReactOS.", + 21, + "\x07 Press F3 to quit without installing ReactOS.", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER = �த�� F3 = ��室", + "ENTER = Continue F3 = Quit", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h index 09bef2eb9b..35682911ce 100644 --- a/base/setup/usetup/lang/sk-SK.h +++ b/base/setup/usetup/lang/sk-SK.h @@ -141,56 +141,62 @@ static MUI_ENTRY skSKIntroPageEntries[] = { 4, 3, - " In�tal�tor syst�mu ReactOS " KERNEL_VERSION_STR " ", + " ReactOS " KERNEL_VERSION_STR " Setup ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "In�tal�tor syst�mu ReactOS je v za�iato�nom �t�diu v�voja. Zatia�", - TEXT_STYLE_NORMAL + "ReactOS Version Status", + TEXT_STYLE_HIGHLIGHT }, { 6, - 9, - "nepodporuje v�etky funkcie plne vyu��vaj�ce program In�tal�tor.", + 11, + "ReactOS is in Alpha stage, meaning it is not feature-complete", TEXT_STYLE_NORMAL }, { 6, 12, - "M� nasleduj�ce obmedzenia:", + "and is under heavy development. It is recommended to use it only for", TEXT_STYLE_NORMAL }, { - 8, + 6, 13, - "- In�tal�tor podporuje iba s�borov� syst�m FAT.", + "evaluation and testing purposes and not as your daily-usage OS.", TEXT_STYLE_NORMAL }, { - 8, - 14, - "- Kontrola s�borov�ho syst�mu zatia� nie je implementovan�.", + 6, + 15, + "Backup your data or test on a secondary computer if you attempt", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "to run ReactOS on real hardware.", TEXT_STYLE_NORMAL }, { 8, - 23, - "\x07 Stla�te ENTER pre nain�talovanie syst�mu ReactOS.", + 19, + "\x07 Press ENTER to continue ReactOS Setup.", TEXT_STYLE_NORMAL }, { 8, - 25, - "\x07 Stla�te F3 pre skon�enie in�tal�cie, syst�m ReactOS sa nenain�taluje.", + 21, + "\x07 Press F3 to quit without installing ReactOS.", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER = Pokra�ova� F3 = Skon�i�", - TEXT_TYPE_STATUS| TEXT_PADDING_BIG + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index a8cb0b0e8f..021f11ad8c 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -137,56 +137,62 @@ static MUI_ENTRY sqALIntroPageEntries[] = { 4, 3, - "Instalimi i ReactOS " KERNEL_VERSION_STR " ", + " ReactOS " KERNEL_VERSION_STR " Setup ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "Instalimi i ReactOS �sht� n� fazat e para t� zhvillimit. Ajo ende nuk i", - TEXT_STYLE_NORMAL + "ReactOS Version Status", + TEXT_STYLE_HIGHLIGHT }, { 6, - 9, - "suporton te gjitha funksionet e nj� instalimit plot�sisht t� p�rdorsh�m.", + 11, + "ReactOS is in Alpha stage, meaning it is not feature-complete", TEXT_STYLE_NORMAL }, { 6, 12, - "Kufizimet e meposhtme aplikohen:", + "and is under heavy development. It is recommended to use it only for", TEXT_STYLE_NORMAL }, { - 8, + 6, 13, - "- Instalimi suporton vet�m dokumentat FAT t� sistemit.", + "evaluation and testing purposes and not as your daily-usage OS.", TEXT_STYLE_NORMAL }, { - 8, - 14, - "- Kontrollet e dokumentave t� sistemit nuk jan� implementuar ende.", + 6, + 15, + "Backup your data or test on a secondary computer if you attempt", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "to run ReactOS on real hardware.", TEXT_STYLE_NORMAL }, { 8, - 23, - "\x07 Kliko ENTER p�r t� instaluar ReactOS.", + 19, + "\x07 Press ENTER to continue ReactOS Setup.", TEXT_STYLE_NORMAL }, { 8, - 25, - "\x07 Kliko F3 t� dilni pa instaluar ReactOS.", + 21, + "\x07 Press F3 to quit without installing ReactOS.", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER = Vazhdo F3 = Dil", - TEXT_TYPE_STATUS| TEXT_PADDING_BIG + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index 5bdb4b9d2d..2dafaf3602 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -146,50 +146,56 @@ static MUI_ENTRY svSEIntroPageEntries[] = { 6, 8, - "ReactOS Setup �r i en tidig utvecklingsfas och saknar d�rf�r ett antal", - TEXT_STYLE_NORMAL + "ReactOS Version Status", + TEXT_STYLE_HIGHLIGHT }, { 6, - 9, - "funktioner som kan f�rv�ntas av ett fullt anv�ndbart setup-program.", + 11, + "ReactOS is in Alpha stage, meaning it is not feature-complete", TEXT_STYLE_NORMAL }, { 6, 12, - "F�ljande begr�nsningar g�ller:", + "and is under heavy development. It is recommended to use it only for", TEXT_STYLE_NORMAL }, { - 8, + 6, 13, - "- Setup st�der endast filsystem av typen FAT.", + "evaluation and testing purposes and not as your daily-usage OS.", TEXT_STYLE_NORMAL }, { - 8, - 14, - "- Kontrollering av h�rddiskens filsystem st�ds (�nnu) ej.", + 6, + 15, + "Backup your data or test on a secondary computer if you attempt", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "to run ReactOS on real hardware.", TEXT_STYLE_NORMAL }, { 8, - 23, - "\x07 Tryck p� ENTER f�r att installera ReactOS.", + 19, + "\x07 Press ENTER to continue ReactOS Setup.", TEXT_STYLE_NORMAL }, { 8, - 25, - "\x07 Tryck p� F3 f�r att avbryta installationen.", + 21, + "\x07 Press F3 to quit without installing ReactOS.", TEXT_STYLE_NORMAL }, { 0, 0, - " ENTER = Forts�tt F3 = Avbryt", - TEXT_TYPE_STATUS + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index 334679f0ea..59b9d13b2f 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -137,55 +137,61 @@ static MUI_ENTRY trTRIntroPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Kur ", + " ReactOS " KERNEL_VERSION_STR " Setup ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "ReactOS Kur, bir �n geli�me evresindedir. Daha t�m�yle kullan��l�", - TEXT_STYLE_NORMAL + "ReactOS Version Status", + TEXT_STYLE_HIGHLIGHT }, { 6, - 9, - "bir kurulum uygulamas�n�n t�m i�levlerini desteklemez.", + 11, + "ReactOS is in Alpha stage, meaning it is not feature-complete", TEXT_STYLE_NORMAL }, { 6, 12, - "A�a��daki k�s�tlamalar uygulan�r:", + "and is under heavy development. It is recommended to use it only for", TEXT_STYLE_NORMAL }, { - 8, + 6, 13, - "- Kur, yaln�zca FAT k�t�k dizgelerini destekler.", + "evaluation and testing purposes and not as your daily-usage OS.", TEXT_STYLE_NORMAL }, { - 8, - 14, - "- K�t�k dizgesi denetimi daha bitirilmemi�tir.", + 6, + 15, + "Backup your data or test on a secondary computer if you attempt", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "to run ReactOS on real hardware.", TEXT_STYLE_NORMAL }, { 8, - 23, - "\x07 ReactOS'u kurmak i�in Giri�'e bas�n�z.", + 19, + "\x07 Press ENTER to continue ReactOS Setup.", TEXT_STYLE_NORMAL }, { 8, - 25, - "\x07 ReactOS'u kurmadan ��kmak i�in F3'e bas�n�z.", + 21, + "\x07 Press F3 to quit without installing ReactOS.", TEXT_STYLE_NORMAL }, { 0, 0, - "Giri� = S�rd�r F3 = ��k", + "ENTER = Continue F3 = Quit", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index 8acb82957b..b0b6d53e97 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -139,56 +139,62 @@ static MUI_ENTRY ukUAIntroPageEntries[] = { 4, 3, - " ��⠭�� ReactOS " KERNEL_VERSION_STR " ", + " ReactOS " KERNEL_VERSION_STR " Setup ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "��⠭��� ReactOS ��室�� ࠭�i� �⠤i� ஧஡�� i � ��", - TEXT_STYLE_NORMAL + "ReactOS Version Status", + TEXT_STYLE_HIGHLIGHT }, { 6, - 9, - "�i��ਬ�� i �㭪�i� ��i�� ணࠬ� ��⠭��.", + 11, + "ReactOS is in Alpha stage, meaning it is not feature-complete", TEXT_STYLE_NORMAL }, { 6, 12, - "��i ��㯭i ��:", + "and is under heavy development. It is recommended to use it only for", TEXT_STYLE_NORMAL }, { - 8, + 6, 13, - "- ��⠭��� �i��ਬ�� 䠩�� ⥬� FAT.", + "evaluation and testing purposes and not as your daily-usage OS.", TEXT_STYLE_NORMAL }, { - 8, - 14, - "- ��ॢiઠ 䠩�� ⥬� � �� ஢��.", + 6, + 15, + "Backup your data or test on a secondary computer if you attempt", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "to run ReactOS on real hardware.", TEXT_STYLE_NORMAL }, { 8, - 23, - "\x07 ��i�� ENTER 鮡 ��⠭�� ReactOS.", + 19, + "\x07 Press ENTER to continue ReactOS Setup.", TEXT_STYLE_NORMAL }, { 8, - 25, - "\x07 ��i�� F3 鮡 ��, �� ⠭�� ReactOS.", + 21, + "\x07 Press F3 to quit without installing ReactOS.", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER = �த�� F3 = ��", - TEXT_TYPE_STATUS| TEXT_PADDING_BIG + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0,

6 years, 5 months

01/01: [TRANSLATION][NOTEPAD] Update Turkish translation (#609)

by Erdem Ersoy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a6bd5b8ceb45823f7e01b… commit a6bd5b8ceb45823f7e01b1b9c42dad59fca608b1 Author: Erdem Ersoy <erdemersoy(a)erdemersoy.net> AuthorDate: Mon Jun 11 12:56:59 2018 +0000 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jun 11 14:56:59 2018 +0200 [TRANSLATION][NOTEPAD] Update Turkish translation (#609) --- base/applications/notepad/lang/tr-TR.rc | 78 ++++++++++++++++----------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/base/applications/notepad/lang/tr-TR.rc b/base/applications/notepad/lang/tr-TR.rc index 60d5012e38..b6ca27f3d1 100644 --- a/base/applications/notepad/lang/tr-TR.rc +++ b/base/applications/notepad/lang/tr-TR.rc @@ -1,4 +1,4 @@ -/* TRANSLATORS: 2012 Arda Tanrıkulu (ardatan) (ardatanrikulu [at] gmail [dot] com), 2013-2016 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */ +/* TRANSLATORS: 2012 Arda Tanrıkulu (ardatan) (ardatanrikulu [at] gmail [dot] com), 2013-2016, 2018 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -22,38 +22,38 @@ END MAIN_MENU MENU BEGIN - POPUP "&Kütük" + POPUP "&Dosya" BEGIN MENUITEM "&Yeni\tDenetim+N", CMD_NEW MENUITEM "&Aç...\tDenetim+O", CMD_OPEN - MENUITEM "&Sakla\tDenetim+S", CMD_SAVE - MENUITEM "Ay&rı Sakla...", CMD_SAVE_AS + MENUITEM "&Kaydet\tDenetim+S", CMD_SAVE + MENUITEM "&Farklı Kaydet...", CMD_SAVE_AS MENUITEM SEPARATOR - MENUITEM "Say&fa Ayarla...", CMD_PAGE_SETUP + MENUITEM "&Sayfa Yapısı...", CMD_PAGE_SETUP MENUITEM "Ya&zdır...\tDenetim+P", CMD_PRINT MENUITEM SEPARATOR MENUITEM "&Çıkış", CMD_EXIT END - POPUP "&Düzen" + POPUP "Dü&zen" BEGIN MENUITEM "&Geri Al\tDenetim+Z", CMD_UNDO MENUITEM SEPARATOR MENUITEM "&Kes\tDenetim+X", CMD_CUT - MENUITEM "&Çoğalt\tDenetim+C", CMD_COPY - MENUITEM "&Yapıştır\tDenetim+V", CMD_PASTE + MENUITEM "K&opyala\tDenetim+C", CMD_COPY + MENUITEM "Y&apıştır\tDenetim+V", CMD_PASTE MENUITEM "&Sil\tSil", CMD_DELETE MENUITEM SEPARATOR MENUITEM "&Bul...\tDenetim+F", CMD_SEARCH - MENUITEM "S&onrakini Bul\tF3", CMD_SEARCH_NEXT + MENUITEM "Son&rakini Bul\tF3", CMD_SEARCH_NEXT MENUITEM "&Değiştir...\tDenetim+H", CMD_REPLACE MENUITEM "G&it...\tDenetim+G", CMD_GOTO MENUITEM SEPARATOR MENUITEM "&Tümünü Seç\tDenetim+A", CMD_SELECT_ALL - MENUITEM "&Şimdiki Zamânı Koy\tF5", CMD_TIME_DATE + MENUITEM "Saat/Tari&h\tF5", CMD_TIME_DATE END POPUP "&Biçim" BEGIN - MENUITEM "&Uzun Yataçları Kaydır", CMD_WRAP + MENUITEM "&Sözcük Kaydır", CMD_WRAP MENUITEM "&Yazı Tipi...", CMD_FONT END POPUP "&Görünüm" @@ -62,10 +62,10 @@ BEGIN END POPUP "&Yardım" BEGIN - MENUITEM "&İçindekiler", CMD_HELP_CONTENTS + MENUITEM "Yardım'ı &Görüntüle", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&Bilgi...", CMD_ABOUT - MENUITEM "&Üzerine...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "Not Defteri &Hakkında...", CMD_ABOUT + MENUITEM "&Bilgi...", CMD_HELP_ABOUT_NOTEPAD END END @@ -73,32 +73,32 @@ END DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP FONT 8, "MS Shell Dlg" -CAPTION "Sayfa Ayarla" +CAPTION "Sayfa Yapısı" BEGIN GROUPBOX "Ön İzleme", 0, 240, 6, 120, 153, BS_GROUPBOX CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80 CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80 CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4 GROUPBOX "Kâğıt", grp2, 8, 6, 224, 56, BS_GROUPBOX - LTEXT "&Büyüklük:", stc2, 16, 22, 36, 8 + LTEXT "Boy&ut:", stc2, 16, 22, 36, 8 COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL - LTEXT "&Kaynak:", stc3, 16, 42, 36, 8 + LTEXT "Kay&nak:", stc3, 16, 42, 36, 8 COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL GROUPBOX "Yön", grp1, 8, 66, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Portre", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "K&ır Resmi", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON - GROUPBOX "Kıyılar", grp4, 80, 66, 152, 56, BS_GROUPBOX + AUTORADIOBUTTON "&Dikey", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "Ya&tay", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "Kenar Boşlukları", grp4, 80, 66, 152, 56, BS_GROUPBOX LTEXT "&Sağ:", stc15, 88, 82, 30, 8 EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER LTEXT "S&ol:", stc16, 159, 82, 30, 8 EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER LTEXT "&Üst:", stc17, 88, 102, 30, 8 EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER - LTEXT "&Alt:", stc18, 159, 102, 30, 8 + LTEXT "A&lt:", stc18, 159, 102, 30, 8 EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER - LTEXT "Üs&t Bilgi:", 0x140, 8, 132, 40, 15 + LTEXT "Üst &Bilgi:", 0x140, 8, 132, 40, 15 EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "A&lt Bilgi:", 0x142, 8, 149, 40, 15 + LTEXT "Alt Bil&gi:", 0x142, 8, 149, 40, 15 EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL PUSHBUTTON "Yardım", IDHELP, 8, 170, 50, 14 DEFPUSHBUTTON "Tamam", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON @@ -122,17 +122,17 @@ END DIALOG_GOTO DIALOGEX 0, 0, 165, 50 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Yataca Git" +CAPTION "Satıra Git" BEGIN EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Yataç Numarası:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER + LTEXT "&Satır Numarası:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER DEFPUSHBUTTON "Tamam", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP PUSHBUTTON "İptal", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Not Defteri Üzerine" +CAPTION "Not Defteri Hakkında" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Not Defteri - Sürüm: 1.0\r\nTelif Hakları:\r\n1997,98 - Marcel Baur\r\n2000 - Mike McCormack\r\n2002 - Sylvain Petreolle\r\n2002 - Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 @@ -144,7 +144,7 @@ END STRINGTABLE BEGIN - STRING_LICENSE "ÖNEMLİ: Aşağıdaki metin, özgün metnin resmî olmayan çevirisidir. Çeviri metniyle özgün metin arasında ayrım olabilir. Özgün metin, çeviri metninin altındadır.\r\n\r\n***\r\n\r\nBu izlence özgür yazılımdır; bunu, Özgür Yazılım Vakfı'nın yayımladığı GNU Umûmî Kamu Ruhsatı'nın, 2. sürümünün ya da daha sonraki bir sürümünün (Orası size bağlı.) şartları altında yeniden dağıtabilir veyâ değiştirebilirsiniz.\r\n\r\nBu izlence, kullanışlı olabileceği beklentisiyle dağıtılmışt [...] + STRING_LICENSE "ÖNEMLİ: Aşağıdaki metin, özgün metnin resmî olmayan çevirisidir. Çeviri metniyle özgün metin arasında ayrım olabilir. Özgün metin, çeviri metninin altındadır.\r\n\r\n***\r\n\r\nBu program özgür yazılımdır; bunu, Özgür Yazılım Vakfı'nın yayımladığı GNU Genel Kamu Lisansı'nın, 2. sürümünün ya da daha sonraki bir sürümünün (Orası size bağlı.) şartları altında yeniden dağıtabilir veya değiştirebilirsiniz.\r\n\r\nBu program, kullanışlı olabileceği beklentisiyle dağıtılmışt [...] END STRINGTABLE @@ -156,28 +156,28 @@ BEGIN STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ STRING_NOTEPAD "Not Defteri" - STRING_ERROR "YANLIŞLIK" + STRING_ERROR "HATA" STRING_WARNING "UYARI" STRING_INFO "Bilgi" STRING_UNTITLED "Adsız" - STRING_ALL_FILES "Tüm Kütükler (*.*)" + STRING_ALL_FILES "Tüm Dosyalar (*.*)" STRING_TEXT_FILES_TXT "Metin Belgeleri (*.txt)" - STRING_TOOLARGE "%s kütüğü Not Defteri için çok büyük. Lütfen başka bir düzenleyici kullanınız." - STRING_NOTEXT "Bir metin girmediniz. Lütfen birşeyler yazıp yeniden deneyiniz." - STRING_DOESNOTEXIST "%s kütüğü yok. Yeni bir kütük oluşturmak ister misiniz?" - STRING_NOTSAVED "%s kütüğü değiştirilmiş. Değişiklikleri saklamak ister misiniz?" + STRING_TOOLARGE "%s dosyası Not Defteri için çok büyük. Lütfen başka bir düzenleyici kullanınız." + STRING_NOTEXT "Hiç metin girmediniz. Lütfen bir şeyler yazıp yeniden deneyiniz." + STRING_DOESNOTEXIST "%s dosyası yok. Yeni bir dosya oluşturmak ister misiniz?" + STRING_NOTSAVED "%s dosyası değiştirilmiş. Değişiklikleri kaydetmek ister misiniz?" STRING_NOTFOUND "%s bulunamadı." - STRING_OUT_OF_MEMORY "Bu işi bitirmek için bellek yetersiz. Kullanılabilen belleği arttırmak için bir ya da daha çok uygulama kapatınız." + STRING_OUT_OF_MEMORY "Bu görevi bitirmek için bellek yetersiz. Kullanılabilen belleği arttırmak için bir ya da daha çok uygulama kapatınız." STRING_CANNOTFIND "%s bulunamadı." STRING_ANSI "ANSI" - STRING_UNICODE "Evrenlik Kod" - STRING_UNICODE_BE "Evrenlik Kod (Büyük Sonlu)" + STRING_UNICODE "Unicode" + STRING_UNICODE_BE "Unicode (Büyük Sonlu)" STRING_UTF8 "UTF-8" STRING_CRLF "Windows (CR + LF)" - STRING_LF "UNIX (LF)" + STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" - STRING_LINE_COLUMN "%d. Yataç, %d. Dikeç" - STRING_PRINTERROR """%s"" kütüğü yazdırılamıyor.\n\nYazıcının açık olduğundan ve doğru yapılandırıldığından emin olunuz." + STRING_LINE_COLUMN "%d. Satır, %d. Sütun" + STRING_PRINTERROR """%s"" dosyası yazdırılamıyor.\n\nYazıcının açık olduğundan ve doğru yapılandırıldığından emin olunuz." STRING_TEXT_DOCUMENT "Metin Belgesi" END

6 years, 5 months

01/01: [ADVAPI32] Fix crash when running advapi32:security with DPH.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=95c3e17a80a6645c51d33… commit 95c3e17a80a6645c51d3316953e42b21e098c574 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Jun 10 15:45:57 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Jun 10 19:05:26 2018 +0200 [ADVAPI32] Fix crash when running advapi32:security with DPH. Import the following Wine commits: * 79636bebbfa Michael Müller: advapi32: Set last error to ERROR_SUCCESS in GetSidIdentifierAuthority. * 1d03ba76116 Hans Leidekker: advapi32: Fix parsing empty DACL/SACL security descriptor strings. * 5bc2e83c7ab Hans Leidekker: advapi32: Fix size returned from ConvertStringSecurityDescriptorToSecurityDescriptor on 64-bit. --- dll/win32/advapi32/wine/security.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/advapi32/wine/security.c b/dll/win32/advapi32/wine/security.c index 5885f5d738..54dd595d49 100644 --- a/dll/win32/advapi32/wine/security.c +++ b/dll/win32/advapi32/wine/security.c @@ -759,6 +759,7 @@ PSID_IDENTIFIER_AUTHORITY WINAPI GetSidIdentifierAuthority(PSID pSid) { + SetLastError(ERROR_SUCCESS); return RtlIdentifierAuthoritySid(pSid); } @@ -2227,7 +2228,7 @@ static DWORD ParseAclStringFlags(LPCWSTR* StringAcl) DWORD flags = 0; LPCWSTR szAcl = *StringAcl; - while (*szAcl != '(') + while (*szAcl && *szAcl != '(') { if (*szAcl == 'P') { @@ -2538,7 +2539,7 @@ static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, pAcl->AclRevision = ACL_REVISION; pAcl->Sbz1 = 0; pAcl->AclSize = length; - pAcl->AceCount = acecount++; + pAcl->AceCount = acecount; pAcl->Sbz2 = 0; } return TRUE; @@ -2549,7 +2550,6 @@ lerr: return FALSE; } - /****************************************************************************** * ParseStringSecurityDescriptorToSecurityDescriptor */ @@ -2565,7 +2565,7 @@ static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( LPBYTE lpNext = NULL; DWORD len; - *cBytes = sizeof(SECURITY_DESCRIPTOR); + *cBytes = sizeof(SECURITY_DESCRIPTOR_RELATIVE); tok = heap_alloc( (lstrlenW(StringSecurityDescriptor) + 1) * sizeof(WCHAR));

6 years, 5 months

01/01: [AFD] Respect the maximum receive buffer size for datagram sockets. CORE-14048

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=05b4bd38338abce17ea3e… commit 05b4bd38338abce17ea3e2b8484baad3984a44cd Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Mon Dec 4 21:13:43 2017 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Jun 10 13:00:37 2018 +0200 [AFD] Respect the maximum receive buffer size for datagram sockets. CORE-14048 --- drivers/network/afd/afd/bind.c | 2 +- drivers/network/afd/afd/read.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/network/afd/afd/bind.c b/drivers/network/afd/afd/bind.c index 1962d226fa..5d8e197308 100644 --- a/drivers/network/afd/afd/bind.c +++ b/drivers/network/afd/afd/bind.c @@ -51,7 +51,7 @@ NTSTATUS WarmSocketForBind( PAFD_FCB FCB, ULONG ShareType ) { Status = STATUS_NO_MEMORY; } - if (NT_SUCCESS(Status)) + if (NT_SUCCESS(Status) && FCB->Recv.Content < FCB->Recv.Size) { Status = TdiReceiveDatagram(&FCB->ReceiveIrp.InFlightRequest, FCB->AddressFile.Object, diff --git a/drivers/network/afd/afd/read.c b/drivers/network/afd/afd/read.c index b0ff01add6..e786faa251 100644 --- a/drivers/network/afd/afd/read.c +++ b/drivers/network/afd/afd/read.c @@ -681,7 +681,7 @@ PacketSocketRecvComplete( } else FCB->PollState &= ~AFD_EVENT_RECEIVE; - if( NT_SUCCESS(Irp->IoStatus.Status) ) { + if( NT_SUCCESS(Irp->IoStatus.Status) && FCB->Recv.Content < FCB->Recv.Size ) { /* Now relaunch the datagram request */ Status = TdiReceiveDatagram ( &FCB->ReceiveIrp.InFlightRequest,

6 years, 5 months

03/03: [CONSRV] Don't show the newly-created console if the window station, on which the console is created, is not interactive.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8a83c24419034eb015327… commit 8a83c24419034eb0153278c3cc2e92064dc692c7 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jun 10 03:59:22 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jun 10 04:00:18 2018 +0200 [CONSRV] Don't show the newly-created console if the window station, on which the console is created, is not interactive. --- win32ss/user/winsrv/consrv/frontends/gui/guiterm.c | 23 ++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c b/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c index e371ea484a..1b6120ec63 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c +++ b/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c @@ -203,9 +203,7 @@ GuiConsoleInputThread(PVOID Param) if (GuiData->GuiInfo.FullScreen) SwitchFullScreen(GuiData, TRUE); DPRINT("PM_CREATE_CONSOLE -- showing window\n"); - // ShowWindow(NewWindow, (int)GuiData->GuiInfo.ShowWindow); ShowWindowAsync(NewWindow, (int)GuiData->GuiInfo.ShowWindow); - DPRINT("Window showed\n"); } else { @@ -1174,6 +1172,7 @@ GuiLoadFrontEnd(IN OUT PFRONTEND FrontEnd, { PCONSOLE_START_INFO ConsoleStartInfo; PGUI_INIT_INFO GuiInitInfo; + USEROBJECTFLAGS UserObjectFlags; if (FrontEnd == NULL || ConsoleInfo == NULL || ConsoleInitInfo == NULL) return STATUS_INVALID_PARAMETER; @@ -1194,6 +1193,21 @@ GuiLoadFrontEnd(IN OUT PFRONTEND FrontEnd, return STATUS_UNSUCCESSFUL; } + GuiInitInfo->IsWindowVisible = ConsoleInitInfo->IsWindowVisible; + if (GuiInitInfo->IsWindowVisible) + { + /* Don't show the console if the window station is not interactive */ + if (GetUserObjectInformationW(GuiInitInfo->WinSta, + UOI_FLAGS, + &UserObjectFlags, + sizeof(UserObjectFlags), + NULL)) + { + if (!(UserObjectFlags.dwFlags & WSF_VISIBLE)) + GuiInitInfo->IsWindowVisible = FALSE; + } + } + /* * Load terminal settings */ @@ -1209,7 +1223,7 @@ GuiLoadFrontEnd(IN OUT PFRONTEND FrontEnd, GuiInitInfo->TermInfo.ShowWindow = SW_SHOWNORMAL; - if (ConsoleInitInfo->IsWindowVisible) + if (GuiInitInfo->IsWindowVisible) { /* 2. Load the remaining console settings via the registry */ if ((ConsoleStartInfo->dwStartupFlags & STARTF_TITLEISLINKNAME) == 0) @@ -1256,7 +1270,6 @@ GuiLoadFrontEnd(IN OUT PFRONTEND FrontEnd, // Display GuiInitInfo->TermInfo.FullScreen = ConsoleInfo->FullScreen; - // GuiInitInfo->TermInfo.ShowWindow; GuiInitInfo->TermInfo.AutoPosition = ConsoleInfo->AutoPosition; GuiInitInfo->TermInfo.WindowOrigin = ConsoleInfo->WindowPosition; @@ -1273,8 +1286,6 @@ GuiLoadFrontEnd(IN OUT PFRONTEND FrontEnd, // ASSERT(GuiInitInfo->hIcon && GuiInitInfo->hIconSm); - GuiInitInfo->IsWindowVisible = ConsoleInitInfo->IsWindowVisible; - /* Finally, initialize the frontend structure */ FrontEnd->Vtbl = &GuiVtbl; FrontEnd->Context = NULL;

6 years, 5 months

02/03: [CONSRV] Use a similar parameter name as in other functions.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=243fe6d6a399f0e6842fb… commit 243fe6d6a399f0e6842fb545ea7e7096416e8638 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jun 10 03:23:01 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jun 10 04:00:18 2018 +0200 [CONSRV] Use a similar parameter name as in other functions. --- win32ss/user/winsrv/consrv/console.c | 4 ++-- win32ss/user/winsrv/consrv/console.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/win32ss/user/winsrv/consrv/console.c b/win32ss/user/winsrv/consrv/console.c index b45828e223..a6e687b3a3 100644 --- a/win32ss/user/winsrv/consrv/console.c +++ b/win32ss/user/winsrv/consrv/console.c @@ -294,7 +294,7 @@ ConSrvGetConsole(IN PCONSOLE_PROCESS_DATA ProcessData, VOID ConSrvReleaseConsole(IN PCONSRV_CONSOLE Console, - IN BOOLEAN WasConsoleLocked) + IN BOOLEAN IsConsoleLocked) { LONG RefCount = 0; @@ -314,7 +314,7 @@ ConSrvReleaseConsole(IN PCONSRV_CONSOLE Console, RefCount = _InterlockedDecrement(&Console->ReferenceCount); /* Unlock the console if needed */ - if (WasConsoleLocked) LeaveCriticalSection(&Console->Lock); + if (IsConsoleLocked) LeaveCriticalSection(&Console->Lock); /* Delete the console if needed */ if (RefCount <= 0) ConSrvDeleteConsole(Console); diff --git a/win32ss/user/winsrv/consrv/console.h b/win32ss/user/winsrv/consrv/console.h index 67bedfe7cd..07741638c2 100644 --- a/win32ss/user/winsrv/consrv/console.h +++ b/win32ss/user/winsrv/consrv/console.h @@ -39,7 +39,7 @@ ConSrvGetConsole(IN PCONSOLE_PROCESS_DATA ProcessData, IN BOOLEAN LockConsole); VOID ConSrvReleaseConsole(IN struct _CONSRV_CONSOLE* /* PCONSRV_CONSOLE */ Console, - IN BOOLEAN WasConsoleLocked); + IN BOOLEAN IsConsoleLocked); BOOLEAN NTAPI

6 years, 5 months

01/03: [WIN32K] Fix DBG_PRINT macro.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d3d5e464d78921240c69… commit 9d3d5e464d78921240c695dca09491fbb2b1c457 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jun 10 00:48:45 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jun 10 04:00:06 2018 +0200 [WIN32K] Fix DBG_PRINT macro. --- win32ss/user/ntuser/msgqueue.c | 4 ++-- win32ss/user/ntuser/win32kdebug.h | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/win32ss/user/ntuser/msgqueue.c b/win32ss/user/ntuser/msgqueue.c index bba976ad2b..446895915c 100644 --- a/win32ss/user/ntuser/msgqueue.c +++ b/win32ss/user/ntuser/msgqueue.c @@ -751,7 +751,7 @@ MsqCreateMessage(LPMSG Msg) VOID FASTCALL MsqDestroyMessage(PUSER_MESSAGE Message) { - TRACE("Post Destroy %d\n",PostMsgCount) + TRACE("Post Destroy %d\n",PostMsgCount); if (Message->pti == NULL) { ERR("Double Free Message\n"); @@ -1151,7 +1151,7 @@ co_MsqSendMessage(PTHREADINFO ptirec, } Timeout.QuadPart = Int32x32To64(-10000,uTimeout); // Pass SMTO test with a TO of 0x80000000. - TRACE("Timeout val %lld\n",Timeout.QuadPart) + TRACE("Timeout val %lld\n",Timeout.QuadPart); Message->Msg.hwnd = Wnd; Message->Msg.message = Msg; diff --git a/win32ss/user/ntuser/win32kdebug.h b/win32ss/user/ntuser/win32kdebug.h index c83f3fdb2c..dd58b75b85 100644 --- a/win32ss/user/ntuser/win32kdebug.h +++ b/win32ss/user/ntuser/win32kdebug.h @@ -134,10 +134,11 @@ #define DBG_DISABLE_CHANNEL(ppi,ch,level) ((ppi)->DbgChannelLevel[ch] &= ~level) #define DBG_IS_CHANNEL_ENABLED(ppi,ch,level) (((ppi)->DbgChannelLevel[ch] & level) == level) - #define DBG_PRINT(ppi,ch,level,fmt, ...) do { \ - if((level == ERR_LEVEL) || (ppi && DBG_IS_CHANNEL_ENABLED(ppi,ch,level))) \ - DbgPrint("(%s:%d) " fmt, __RELFILE__, __LINE__, ##__VA_ARGS__); \ - }while(0); + #define DBG_PRINT(ppi,ch,level,fmt, ...) \ + do { \ + if ((level == ERR_LEVEL) || (ppi && DBG_IS_CHANNEL_ENABLED(ppi,ch,level))) \ + DbgPrint("(%s:%d) " fmt, __RELFILE__, __LINE__, ##__VA_ARGS__); \ + } while (0) #define ERR(fmt, ...) DBG_PRINT(DBG_GET_PPI, DbgDefaultChannel, ERR_LEVEL,"err: " fmt, ##__VA_ARGS__) #define FIXME(fmt, ...) DBG_PRINT(DBG_GET_PPI, DbgDefaultChannel, FIXME_LEVEL,"fixme: " fmt, ##__VA_ARGS__)

6 years, 5 months

← Newer
1
...
5
6
7
8
9
10
11
...
18
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 June 2018