From 4255cdb33e40315c44d1dc9c15290c45a544be92 Mon Sep 17 00:00:00 2001 From: Daniel Reimer Date: Sat, 15 Dec 2007 16:30:15 +0000 Subject: [PATCH] eeevil trailing spaces :D svn path=/trunk/; revision=31249 --- reactos/base/setup/usetup/interface/usetup.c | 4 +- reactos/base/setup/usetup/lang/de-DE.h | 86 ++++++++++---------- reactos/base/setup/usetup/lang/en-US.h | 86 ++++++++++---------- reactos/base/setup/usetup/lang/es-ES.h | 84 +++++++++---------- reactos/base/setup/usetup/lang/ru-RU.h | 84 +++++++++---------- reactos/base/setup/usetup/lang/uk-UA.h | 84 +++++++++---------- reactos/base/setup/usetup/mui.c | 6 +- 7 files changed, 217 insertions(+), 217 deletions(-) diff --git a/reactos/base/setup/usetup/interface/usetup.c b/reactos/base/setup/usetup/interface/usetup.c index f1681497e9c..0a4ca51587e 100644 --- a/reactos/base/setup/usetup/interface/usetup.c +++ b/reactos/base/setup/usetup/interface/usetup.c @@ -760,7 +760,7 @@ static PAGE_NUMBER LicensePage(PINPUT_RECORD Ir) { MUIDisplayPage(LICENSE_PAGE); - + while (TRUE) { CONSOLE_ConInKey(Ir); @@ -943,7 +943,7 @@ DeviceSettingsPage(PINPUT_RECORD Ir) CONSOLE_InvertTextXY (24, Line, 48, 1); - if (RepairUpdateFlag) + if (RepairUpdateFlag) { return SELECT_PARTITION_PAGE; } diff --git a/reactos/base/setup/usetup/lang/de-DE.h b/reactos/base/setup/usetup/lang/de-DE.h index ee64f3e10e4..665758d909b 100644 --- a/reactos/base/setup/usetup/lang/de-DE.h +++ b/reactos/base/setup/usetup/lang/de-DE.h @@ -34,7 +34,7 @@ static MUI_ENTRY deDEWelcomePageEntries[] = TEXT_NORMAL }, { - 8, + 8, 19, "\x07 Druecken Sie L, um die Lizenzabkommen von ReactOS zu lesen", TEXT_NORMAL @@ -46,14 +46,14 @@ static MUI_ENTRY deDEWelcomePageEntries[] = TEXT_NORMAL }, { - 6, + 6, 23, "Fuer weitere Informationen, besuchen Sie bitte:", TEXT_NORMAL }, { - 6, - 24, + 6, + 24, "http://www.reactos.org", TEXT_HIGHLIGHT }, @@ -74,31 +74,31 @@ static MUI_ENTRY deDEWelcomePageEntries[] = static MUI_ENTRY deDEIntroPageEntries[] = { { - 4, + 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", TEXT_UNDERLINE }, { - 6, - 8, + 6, + 8, "Das ReactOS Setup ist noch in einer fruehen Entwicklungsphase. Es unter-", TEXT_NORMAL }, { - 6, + 6, 9, "stuetzt noch nicht alle Funktionen eines vollstaendig nutzbaren Setups.", TEXT_NORMAL }, { - 6, + 6, 12, "Folgende Begrenzungen sind vorhanden:", TEXT_NORMAL }, { - 8, + 8, 13, "- Setup kann nur eine primaere Partition auf einer HDD verwalten.", TEXT_NORMAL @@ -128,32 +128,32 @@ static MUI_ENTRY deDEIntroPageEntries[] = TEXT_NORMAL }, { - 8, - 18, + 8, + 18, "- Setup unterstuetzt nur FAT Dateisysteme.", TEXT_NORMAL }, { - 8, + 8, 19, "- Dateisystemueberpruefung ist noch nicht implementiert.", TEXT_NORMAL }, { - 8, - 23, + 8, + 23, "\x07 Druecken Sie ENTER, um ReactOS zu installieren.", TEXT_NORMAL }, { - 8, - 25, + 8, + 25, "\x07 Druecken Sie F3, um das Setup zu beenden.", TEXT_NORMAL }, { 0, - 0, + 0, " ENTER = Fortsetzen F3 = Beenden", TEXT_STATUS }, @@ -239,43 +239,43 @@ static MUI_ENTRY deDELicensePageEntries[] = "GNU General Public License with ReactOS please visit", TEXT_NORMAL }, - { + { 8, 20, "http://www.gnu.org/licenses/licenses.html", TEXT_HIGHLIGHT }, - { + { 8, 22, "Warranty:", TEXT_HIGHLIGHT }, - { + { 8, 24, "This is free software; see the source for copying conditions.", TEXT_NORMAL }, - { + { 8, 25, "There is NO warranty; not even for MERCHANTABILITY or", TEXT_NORMAL }, - { + { 8, 26, "FITNESS FOR A PARTICULAR PURPOSE", TEXT_NORMAL }, - { + { 0, 0, " ENTER = Zurueck", TEXT_STATUS }, - { + { 0, 0, NULL, @@ -286,7 +286,7 @@ static MUI_ENTRY deDELicensePageEntries[] = static MUI_ENTRY deDEDevicePageEntries[] = { { - 6, + 6, 8, "Die untere Liste zeigt die derzeitigen Geraeteeinstellungen.", TEXT_NORMAL @@ -322,7 +322,7 @@ static MUI_ENTRY deDEDevicePageEntries[] = TEXT_NORMAL }, { - 25, + 25, 16, "Diese Geraeteeinstellungen akzeptieren", TEXT_NORMAL }, @@ -333,25 +333,25 @@ static MUI_ENTRY deDEDevicePageEntries[] = TEXT_NORMAL }, { - 6, - 20, + 6, + 20, "Dann druecken Sie ENTER, um eine Alternative Einstellung auszuwaehlen", TEXT_NORMAL }, { - 6, + 6, 21, " ", TEXT_NORMAL }, { - 6, - 23, + 6, + 23, "Wenn alle Einstellungen korrekt sind, waehlen Sie \"Diese Geraete-", TEXT_NORMAL }, { - 6, + 6, 24, "einstellungen akzeptieren\" und druecken Sie ENTER.", TEXT_NORMAL @@ -373,49 +373,49 @@ static MUI_ENTRY deDEDevicePageEntries[] = static MUI_ENTRY deDERepairPageEntries[] = { { - 6, + 6, 8, "Das ReactOS Setup ist noch in einer fruehen Entwicklungsphase. Es unter-", TEXT_NORMAL }, { - 6, + 6, 9, "stuetzt noch nicht alle Funktionen eines vollstaendig nutzbaren Setups.", TEXT_NORMAL }, { - 6, + 6, 12, "Die Reparaturfunktionen sind noch nicht implementiert.", TEXT_NORMAL }, { - 8, + 8, 15, "\x07 Druecken Sie U, um ReactOS zu aktualisieren.", TEXT_NORMAL }, { - 8, + 8, 17, "\x07 Druecken Sie R, fuer die Wiederherstellungskonsole.", TEXT_NORMAL }, { - 8, + 8, 19, "\x07 Druecken Sie ESC, um zur Hauptseite zurueckzukehren.", TEXT_NORMAL }, { - 8, + 8, 21, "\x07 Druecken Sie ENTER, um den Computer neuzustarten.", TEXT_NORMAL }, { - 0, + 0, 0, " ESC = Hauptseite ENTER = Neustarten", TEXT_STATUS @@ -440,7 +440,7 @@ static MUI_ENTRY deDEComputerPageEntries[] = 10, "\x07 Druecken Sie die HOCH- oder RUNTER-Taste um den gewuenschten", TEXT_NORMAL - }, + }, { 8, 11, @@ -840,7 +840,7 @@ MUI_ERROR deDEErrorEntries[] = { //ERROR_CABINET_SECTION, "Setup konnte die 'Ordner' Sektion im\n" - "Cabinet nicht finden.\n", + "Cabinet nicht finden.\n", "ENTER = Computer neustarten" }, { diff --git a/reactos/base/setup/usetup/lang/en-US.h b/reactos/base/setup/usetup/lang/en-US.h index 1199493fb82..2235a4b33e7 100644 --- a/reactos/base/setup/usetup/lang/en-US.h +++ b/reactos/base/setup/usetup/lang/en-US.h @@ -57,7 +57,7 @@ static MUI_ENTRY enUSWelcomePageEntries[] = TEXT_NORMAL }, { - 8, + 8, 19, "\x07 Press L to view the ReactOS Licensing Terms and Conditions", TEXT_NORMAL @@ -69,14 +69,14 @@ static MUI_ENTRY enUSWelcomePageEntries[] = TEXT_NORMAL }, { - 6, + 6, 23, "For more information on ReactOS, please visit:", TEXT_NORMAL }, { - 6, - 24, + 6, + 24, "http://www.reactos.org", TEXT_HIGHLIGHT }, @@ -97,31 +97,31 @@ static MUI_ENTRY enUSWelcomePageEntries[] = static MUI_ENTRY enUSIntroPageEntries[] = { { - 4, + 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", TEXT_UNDERLINE }, { - 6, - 8, + 6, + 8, "ReactOS Setup is in an early development phase. It does not yet", TEXT_NORMAL }, { - 6, + 6, 9, "support all the functions of a fully usable setup application.", TEXT_NORMAL }, { - 6, + 6, 12, "The following limitations apply:", TEXT_NORMAL }, { - 8, + 8, 13, "- Setup can not handle more than one primary partition per disk.", TEXT_NORMAL @@ -151,32 +151,32 @@ static MUI_ENTRY enUSIntroPageEntries[] = TEXT_NORMAL }, { - 8, - 18, + 8, + 18, "- Setup supports FAT file systems only.", TEXT_NORMAL }, { - 8, + 8, 19, "- File system checks are not implemented yet.", TEXT_NORMAL }, { - 8, - 23, + 8, + 23, "\x07 Press ENTER to install ReactOS.", TEXT_NORMAL }, { - 8, - 25, + 8, + 25, "\x07 Press F3 to quit without installing ReactOS.", TEXT_NORMAL }, { 0, - 0, + 0, " ENTER = Continue F3 = Quit", TEXT_STATUS }, @@ -262,43 +262,43 @@ static MUI_ENTRY enUSLicensePageEntries[] = "GNU General Public License with ReactOS please visit", TEXT_NORMAL }, - { + { 8, 20, "http://www.gnu.org/licenses/licenses.html", TEXT_HIGHLIGHT }, - { + { 8, 22, "Warranty:", TEXT_HIGHLIGHT }, - { + { 8, 24, "This is free software; see the source for copying conditions.", TEXT_NORMAL }, - { + { 8, 25, "There is NO warranty; not even for MERCHANTABILITY or", TEXT_NORMAL }, - { + { 8, 26, "FITNESS FOR A PARTICULAR PURPOSE", TEXT_NORMAL }, - { + { 0, 0, " ENTER = Return", TEXT_STATUS }, - { + { 0, 0, NULL, @@ -309,7 +309,7 @@ static MUI_ENTRY enUSLicensePageEntries[] = static MUI_ENTRY enUSDevicePageEntries[] = { { - 6, + 6, 8, "The list below shows the current device settings.", TEXT_NORMAL @@ -345,7 +345,7 @@ static MUI_ENTRY enUSDevicePageEntries[] = TEXT_NORMAL }, { - 25, + 25, 16, "Accept these device settings", TEXT_NORMAL }, @@ -356,25 +356,25 @@ static MUI_ENTRY enUSDevicePageEntries[] = TEXT_NORMAL }, { - 6, - 20, + 6, + 20, "to select an entry. Then press the ENTER key to select alternative", TEXT_NORMAL }, { - 6, + 6, 21, "settings.", TEXT_NORMAL }, { - 6, - 23, + 6, + 23, "When all settings are correct, select \"Accept these device settings\"", TEXT_NORMAL }, { - 6, + 6, 24, "and press ENTER.", TEXT_NORMAL @@ -396,49 +396,49 @@ static MUI_ENTRY enUSDevicePageEntries[] = static MUI_ENTRY enUSRepairPageEntries[] = { { - 6, + 6, 8, "ReactOS Setup is in an early development phase. It does not yet", TEXT_NORMAL }, { - 6, + 6, 9, "support all the functions of a fully usable setup application.", TEXT_NORMAL }, { - 6, + 6, 12, "The repair functions are not implemented yet.", TEXT_NORMAL }, { - 8, + 8, 15, "\x07 Press U for Updating OS.", TEXT_NORMAL }, { - 8, + 8, 17, "\x07 Press R for the Recovery Console.", TEXT_NORMAL }, { - 8, + 8, 19, "\x07 Press ESC to return to the main page.", TEXT_NORMAL }, { - 8, + 8, 21, "\x07 Press ENTER to reboot your computer.", TEXT_NORMAL }, { - 0, + 0, 0, " ESC = Main page ENTER = Reboot", TEXT_STATUS @@ -463,7 +463,7 @@ static MUI_ENTRY enUSComputerPageEntries[] = 10, "\x07 Press the UP or DOWN key to select the desired computer type.", TEXT_NORMAL - }, + }, { 8, 11, @@ -863,7 +863,7 @@ MUI_ERROR enUSErrorEntries[] = { //ERROR_CABINET_SECTION, "Setup failed to find the 'Directories' section\n" - "in the cabinet.\n", + "in the cabinet.\n", "ENTER = Reboot computer" }, { diff --git a/reactos/base/setup/usetup/lang/es-ES.h b/reactos/base/setup/usetup/lang/es-ES.h index b2c957408a2..5830cdc1618 100644 --- a/reactos/base/setup/usetup/lang/es-ES.h +++ b/reactos/base/setup/usetup/lang/es-ES.h @@ -34,7 +34,7 @@ static MUI_ENTRY esESWelcomePageEntries[] = TEXT_NORMAL }, { - 8, + 8, 19, "\x07 Presione L para ver las condiciones y tщrminos de licencia", TEXT_NORMAL @@ -46,14 +46,14 @@ static MUI_ENTRY esESWelcomePageEntries[] = TEXT_NORMAL }, { - 6, + 6, 23, "Para mсs informaciєn sobre ReactOS, visite por favor:", TEXT_NORMAL }, { - 6, - 24, + 6, + 24, "http://www.reactos.org", TEXT_HIGHLIGHT }, @@ -74,31 +74,31 @@ static MUI_ENTRY esESWelcomePageEntries[] = static MUI_ENTRY esESIntroPageEntries[] = { { - 4, + 4, 3, " Instalaciєn de ReactOS " KERNEL_VERSION_STR, TEXT_UNDERLINE }, { - 6, - 8, + 6, + 8, "El instalador de ReactOS se encuentra en una etapa preliminar.", TEXT_NORMAL }, { - 6, + 6, 9, "A·n no posee todas las funciones de un instalador.", TEXT_NORMAL }, { - 6, + 6, 12, "Se presentan las siguientes limitaciones:", TEXT_NORMAL }, { - 8, + 8, 13, "- El instalador no soporta mсs de una particiєn primaria por disco.", TEXT_NORMAL @@ -128,32 +128,32 @@ static MUI_ENTRY esESIntroPageEntries[] = TEXT_NORMAL }, { - 8, - 18, + 8, + 18, "- El instalador soporta solamente el sistema de archivos FAT.", TEXT_NORMAL }, { - 8, + 8, 19, "- El comprobador de integridad del sistema de archivos no estс a·n implementado.", TEXT_NORMAL }, { - 8, - 23, + 8, + 23, "\x07 Presione ENTER para instalar ReactOS.", TEXT_NORMAL }, { - 8, - 25, + 8, + 25, "\x07 Presione F3 para salir sin instalar ReactOS.", TEXT_NORMAL }, { 0, - 0, + 0, " ENTER = Continuar F3 = Salir", TEXT_STATUS }, @@ -239,43 +239,43 @@ static MUI_ENTRY esESLicensePageEntries[] = "GNU General Public License con ReactOS por favor visite", TEXT_NORMAL }, - { + { 8, 20, "http://www.gnu.org/licenses/licenses.html", TEXT_HIGHLIGHT }, - { + { 8, 22, "Garantэa:", TEXT_HIGHLIGHT }, - { + { 8, 24, "Este es software libre; vea el cєdigo para las condiciones de copia.", TEXT_NORMAL }, - { + { 8, 25, "NO existe garantэa; ni siquiera para MERCANTIBILIDAD", TEXT_NORMAL }, - { + { 8, 26, "o el cumplimiento de alg·n propєsito particular", TEXT_NORMAL }, - { + { 0, 0, " ENTER = Regresar", TEXT_STATUS }, - { + { 0, 0, NULL, @@ -286,7 +286,7 @@ static MUI_ENTRY esESLicensePageEntries[] = static MUI_ENTRY esESDevicePageEntries[] = { { - 6, + 6, 8, "La lista inferior muestra la configuraciєn del dispositivo actual.", TEXT_NORMAL @@ -322,7 +322,7 @@ static MUI_ENTRY esESDevicePageEntries[] = TEXT_NORMAL }, { - 25, + 25, 16, "Aceptar la configuraciєn de los dispositivos", TEXT_NORMAL }, @@ -333,25 +333,25 @@ static MUI_ENTRY esESDevicePageEntries[] = TEXT_NORMAL }, { - 6, - 20, + 6, + 20, "para elegir. Luego presione ENTER para cambiar a una configuraciєn", TEXT_NORMAL }, { - 6, + 6, 21, "alternativa.", TEXT_NORMAL }, { - 6, - 23, + 6, + 23, "Cuando la configuraciєn sea correcta, elija \"Aceptar la configuraciєn", TEXT_NORMAL }, { - 6, + 6, 24, "de los dispostivos\" y presione ENTER.", TEXT_NORMAL @@ -373,49 +373,49 @@ static MUI_ENTRY esESDevicePageEntries[] = static MUI_ENTRY esESRepairPageEntries[] = { { - 6, + 6, 8, "El instalador de ReactOS se encuentra en una etapa preliminar.", TEXT_NORMAL }, { - 6, + 6, 9, "A·n no posee todas las funciones de un instalador.", TEXT_NORMAL }, { - 6, + 6, 12, "Las funciones de reparaciєn no han sido a·n implementadas.", TEXT_NORMAL }, { - 8, + 8, 15, "\x07 Presione U para actualizar el SO.", TEXT_NORMAL }, { - 8, + 8, 17, "\x07 Presione R para la consola de recuperaciєn.", TEXT_NORMAL }, { - 8, + 8, 19, "\x07 Presione ESC para volver al men· principal.", TEXT_NORMAL }, { - 8, + 8, 21, "\x07 Presione ENTER para reiniciar su computadora.", TEXT_NORMAL }, { - 0, + 0, 0, "ESC = Men· inicial ENTER = Reiniciar", TEXT_STATUS @@ -440,7 +440,7 @@ static MUI_ENTRY esESComputerPageEntries[] = 10, "\x07 Presione las teclas ARRIBA y ABAJO para elegir el tipo.", TEXT_NORMAL - }, + }, { 8, 11, diff --git a/reactos/base/setup/usetup/lang/ru-RU.h b/reactos/base/setup/usetup/lang/ru-RU.h index acc324c4980..3cdcdd40e8c 100644 --- a/reactos/base/setup/usetup/lang/ru-RU.h +++ b/reactos/base/setup/usetup/lang/ru-RU.h @@ -56,7 +56,7 @@ static MUI_ENTRY ruRUWelcomePageEntries[] = TEXT_NORMAL }, { - 8, + 8, 19, "\x07 Нажмите L для просмотра лицензионного соглашения ReactOS", TEXT_NORMAL @@ -68,14 +68,14 @@ static MUI_ENTRY ruRUWelcomePageEntries[] = TEXT_NORMAL }, { - 6, + 6, 23, "Для дополнительной информации о ReactOS посетите:", TEXT_NORMAL }, { - 6, - 24, + 6, + 24, "http://www.reactos.org", TEXT_HIGHLIGHT }, @@ -96,31 +96,31 @@ static MUI_ENTRY ruRUWelcomePageEntries[] = static MUI_ENTRY ruRUIntroPageEntries[] = { { - 4, + 4, 3, " Установка ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { - 6, - 8, + 6, + 8, "ReactOS находится в ранней стадии разработки и не поддерживает все", TEXT_NORMAL }, { - 6, + 6, 9, "функции для полной совместимости с утанавливаемыми приложениями.", TEXT_NORMAL }, { - 6, + 6, 12, "Имеются следующие ограничения:", TEXT_NORMAL }, { - 8, + 8, 13, "- Установка возможна только на первичный раздел диска", TEXT_NORMAL @@ -150,32 +150,32 @@ static MUI_ENTRY ruRUIntroPageEntries[] = TEXT_NORMAL }, { - 8, - 18, + 8, + 18, "- При установке поддерживается только файловая система FAT.", TEXT_NORMAL }, { - 8, + 8, 19, "- Проверка файловой системы не осуществляется.", TEXT_NORMAL }, { - 8, - 23, + 8, + 23, "\x07 Нажмите ввод для установки ReactOS.", TEXT_NORMAL }, { - 8, - 25, + 8, + 25, "\x07 Нажмите F3 для выхода из установки ReactOS.", TEXT_NORMAL }, { 0, - 0, + 0, " ВВОД = Продолжение F3 = Выход", TEXT_STATUS }, @@ -261,43 +261,43 @@ static MUI_ENTRY ruRULicensePageEntries[] = "лицензионного соглашения GNU вместе с ReactOS, посетите", TEXT_NORMAL }, - { + { 8, 20, "http://www.gnu.org/licenses/licenses.html", TEXT_HIGHLIGHT }, - { + { 8, 22, "Гарантии:", TEXT_HIGHLIGHT }, - { + { 8, 24, "Это свободное программное обеспечение; см. источник для просмотра прав.", TEXT_NORMAL }, - { + { 8, 25, "НЕТ НИКАКИХ ГАРАНТИЙ; нет гарантии ТОВАРНОГО СОСТОЯНИЯ или", TEXT_NORMAL }, - { + { 8, 26, "ПРИГОДНОСТИ ДЛЯ КОНКРЕТНЫХ ЦЕЛЕЙ", TEXT_NORMAL }, - { + { 0, 0, " ВВОД = Возврат", TEXT_STATUS }, - { + { 0, 0, NULL, @@ -308,7 +308,7 @@ static MUI_ENTRY ruRULicensePageEntries[] = static MUI_ENTRY ruRUDevicePageEntries[] = { { - 6, + 6, 8, "В списке ниже приведены устройства и их параметры.", TEXT_NORMAL @@ -344,7 +344,7 @@ static MUI_ENTRY ruRUDevicePageEntries[] = TEXT_NORMAL }, { - 25, + 25, 16, "Применить данные параметры устройств", TEXT_NORMAL }, @@ -355,25 +355,25 @@ static MUI_ENTRY ruRUDevicePageEntries[] = TEXT_NORMAL }, { - 6, - 20, + 6, + 20, "для выделения элемента и клавишу ВВОД для выбора других вариантов", TEXT_NORMAL }, { - 6, + 6, 21, "параметров.", TEXT_NORMAL }, { - 6, - 23, + 6, + 23, "Когда все параметры определены, выберите \"Применить данные параметры устройств\"", TEXT_NORMAL }, { - 6, + 6, 24, "и нажмите ВВОД.", TEXT_NORMAL @@ -395,49 +395,49 @@ static MUI_ENTRY ruRUDevicePageEntries[] = static MUI_ENTRY ruRURepairPageEntries[] = { { - 6, + 6, 8, "ReactOS находится в ранней стадии разработки и не поддерживает все", TEXT_NORMAL }, { - 6, + 6, 9, "функции для полной совместимости с утанавливаемыми приложениями.", TEXT_NORMAL }, { - 6, + 6, 12, "Функция востановления в данным момент отсутствует.", TEXT_NORMAL }, { - 8, + 8, 15, "\x07 Нажмите U для обновления ОС.", TEXT_NORMAL }, { - 8, + 8, 17, "\x07 Нажмите R для запуска консоли востановления.", TEXT_NORMAL }, { - 8, + 8, 19, "\x07 Нажмите ESC для возврата на главную страницу.", TEXT_NORMAL }, { - 8, + 8, 21, "\x07 Нажмите ВВОД для перезагрузки компьютера.", TEXT_NORMAL }, { - 0, + 0, 0, " ESC = Главная страница ВВОД = Перезагрузка", TEXT_STATUS @@ -462,7 +462,7 @@ static MUI_ENTRY ruRUComputerPageEntries[] = 10, "\x07 Нажмите клавишу ВВЕРХ или ВНИЗ для выбора предпочтительного типа компьютера.", TEXT_NORMAL - }, + }, { 8, 11, diff --git a/reactos/base/setup/usetup/lang/uk-UA.h b/reactos/base/setup/usetup/lang/uk-UA.h index 2d7b9ee7f05..d88b5487a28 100644 --- a/reactos/base/setup/usetup/lang/uk-UA.h +++ b/reactos/base/setup/usetup/lang/uk-UA.h @@ -34,7 +34,7 @@ static MUI_ENTRY ukUAWelcomePageEntries[] = TEXT_NORMAL }, { - 8, + 8, 19, "\x07 ═рЄшёэ│Є№ ∙юс яхЁхуы эєЄш ы│Ўхэч│щэ│ єьютш ReactOS", TEXT_NORMAL @@ -46,14 +46,14 @@ static MUI_ENTRY ukUAWelcomePageEntries[] = TEXT_NORMAL }, { - 6, + 6, 23, "─ы  с│ы№° ъюэъЁхЄэю┐ │эЇюЁьрЎ│┐ яЁю ReactOS, сєф№ ырёър т│фт│фрщЄх:", TEXT_NORMAL }, { - 6, - 24, + 6, + 24, "http://www.reactos.org/uk/", TEXT_HIGHLIGHT }, @@ -74,31 +74,31 @@ static MUI_ENTRY ukUAWelcomePageEntries[] = static MUI_ENTRY ukUAIntroPageEntries[] = { { - 4, + 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", TEXT_UNDERLINE }, { - 6, - 8, + 6, + 8, "ReactOS Setup is in an early development phase. It does not yet", TEXT_NORMAL }, { - 6, + 6, 9, "support all the functions of a fully usable setup application.", TEXT_NORMAL }, { - 6, + 6, 12, "The following limitations apply:", TEXT_NORMAL }, { - 8, + 8, 13, "- Setup can not handle more than one primary partition per disk.", TEXT_NORMAL @@ -128,32 +128,32 @@ static MUI_ENTRY ukUAIntroPageEntries[] = TEXT_NORMAL }, { - 8, - 18, + 8, + 18, "- Setup supports FAT file systems only.", TEXT_NORMAL }, { - 8, + 8, 19, "- File system checks are not implemented yet.", TEXT_NORMAL }, { - 8, - 23, + 8, + 23, "\x07 Press ENTER to install ReactOS.", TEXT_NORMAL }, { - 8, - 25, + 8, + 25, "\x07 Press F3 to quit without installing ReactOS.", TEXT_NORMAL }, { 0, - 0, + 0, " ENTER = Continue F3 = Quit", TEXT_STATUS }, @@ -239,43 +239,43 @@ static MUI_ENTRY ukUALicensePageEntries[] = "GNU General Public License with ReactOS please visit", TEXT_NORMAL }, - { + { 8, 20, "http://www.gnu.org/licenses/licenses.html", TEXT_HIGHLIGHT }, - { + { 8, 22, "Warranty:", TEXT_HIGHLIGHT }, - { + { 8, 24, "This is free software; see the source for copying conditions.", TEXT_NORMAL }, - { + { 8, 25, "There is NO warranty; not even for MERCHANTABILITY or", TEXT_NORMAL }, - { + { 8, 26, "FITNESS FOR A PARTICULAR PURPOSE", TEXT_NORMAL }, - { + { 0, 0, " ENTER = Return", TEXT_STATUS }, - { + { 0, 0, NULL, @@ -286,7 +286,7 @@ static MUI_ENTRY ukUALicensePageEntries[] = static MUI_ENTRY ukUADevicePageEntries[] = { { - 6, + 6, 8, "The list below shows the current device settings.", TEXT_NORMAL @@ -322,7 +322,7 @@ static MUI_ENTRY ukUADevicePageEntries[] = TEXT_NORMAL }, { - 25, + 25, 16, "Accept these device settings", TEXT_NORMAL }, @@ -333,25 +333,25 @@ static MUI_ENTRY ukUADevicePageEntries[] = TEXT_NORMAL }, { - 6, - 20, + 6, + 20, "to select an entry. Then press the ENTER key to select alternative", TEXT_NORMAL }, { - 6, + 6, 21, "settings.", TEXT_NORMAL }, { - 6, - 23, + 6, + 23, "When all settings are correct, select \"Accept these device settings\"", TEXT_NORMAL }, { - 6, + 6, 24, "and press ENTER.", TEXT_NORMAL @@ -373,49 +373,49 @@ static MUI_ENTRY ukUADevicePageEntries[] = static MUI_ENTRY ukUARepairPageEntries[] = { { - 6, + 6, 8, "ReactOS Setup is in an early development phase. It does not yet", TEXT_NORMAL }, { - 6, + 6, 9, "support all the functions of a fully usable setup application.", TEXT_NORMAL }, { - 6, + 6, 12, "The repair functions are not implemented yet.", TEXT_NORMAL }, { - 8, + 8, 15, "\x07 Press U for Updating OS.", TEXT_NORMAL }, { - 8, + 8, 17, "\x07 Press R for the Recovery Console.", TEXT_NORMAL }, { - 8, + 8, 19, "\x07 Press ESC to return to the main page.", TEXT_NORMAL }, { - 8, + 8, 21, "\x07 Press ENTER to reboot your computer.", TEXT_NORMAL }, { - 0, + 0, 0, " ESC = Main page ENTER = Reboot", TEXT_STATUS @@ -440,7 +440,7 @@ static MUI_ENTRY ukUAComputerPageEntries[] = 10, "\x07 Press the UP or DOWN key to select the desired computer type.", TEXT_NORMAL - }, + }, { 8, 11, diff --git a/reactos/base/setup/usetup/mui.c b/reactos/base/setup/usetup/mui.c index 5b821e11c9d..8ed77db52da 100644 --- a/reactos/base/setup/usetup/mui.c +++ b/reactos/base/setup/usetup/mui.c @@ -111,7 +111,7 @@ MUIDisplayPage(ULONG pg) NULL, NULL, POPUP_WAIT_NONE); - return; + return; } index = 0; @@ -144,14 +144,14 @@ MUIDisplayError(ULONG ErrorNum, PINPUT_RECORD Ir, ULONG WaitEvent) { if (ErrorNum >= ERROR_LAST_ERROR_CODE) { - PopupError("invalid error number provided", + PopupError("invalid error number provided", "press enter to continue", Ir, POPUP_WAIT_ENTER); return; } - + PopupError(enUSErrorEntries[ErrorNum].ErrorText, enUSErrorEntries[ErrorNum].ErrorStatus, Ir,