Author: janderwald Date: Wed Dec 19 17:29:39 2007 New Revision: 31326
URL: http://svn.reactos.org/svn/reactos?rev=31326&view=rev Log: - move nearly all hardcoded strings to the language specific files - translate the new imported strings for german resource - put all moved string for all other languages - remove country identifier for languages which only has currently one translation (english/french)
Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/mui.c
Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interface... ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Wed Dec 19 17:29:39 2007 @@ -1107,13 +1107,7 @@ static PAGE_NUMBER KeyboardSettingsPage(PINPUT_RECORD Ir) { - CONSOLE_SetTextXY(6, 8, "You want to change the type of keyboard to be installed."); - - CONSOLE_SetTextXY(8, 10, "\x07 Press the UP or DOWN key to select the desired keyboard type."); - CONSOLE_SetTextXY(8, 11, " Then press ENTER."); - - CONSOLE_SetTextXY(8, 13, "\x07 Press the ESC key to return to the previous page without changing"); - CONSOLE_SetTextXY(8, 14, " the keyboard type."); + MUIDisplayPage(KEYBOARD_SETTINGS_PAGE);
DrawGenericList(KeyboardList, 2, @@ -1121,7 +1115,7 @@ xScreen - 3, yScreen - 3);
- CONSOLE_SetStatusText(" ENTER = Continue ESC = Cancel F3 = Quit"); +
SaveGenericListState(KeyboardList);
@@ -1165,13 +1159,7 @@ static PAGE_NUMBER LayoutSettingsPage(PINPUT_RECORD Ir) { - CONSOLE_SetTextXY(6, 8, "You want to change the keyboard layout to be installed."); - - CONSOLE_SetTextXY(8, 10, "\x07 Press the UP or DOWN key to select the desired keyboard"); - CONSOLE_SetTextXY(8, 11, " layout. Then press ENTER."); - - CONSOLE_SetTextXY(8, 13, "\x07 Press the ESC key to return to the previous page without changing"); - CONSOLE_SetTextXY(8, 14, " the keyboard layout."); + MUIDisplayPage(LAYOUT_SETTINGS_PAGE);
DrawGenericList(LayoutList, 2, @@ -1179,8 +1167,6 @@ xScreen - 3, yScreen - 3);
- CONSOLE_SetStatusText(" ENTER = Continue ESC = Cancel F3 = Quit"); - SaveGenericListState(LayoutList);
while(TRUE) @@ -1223,15 +1209,7 @@ static PAGE_NUMBER SelectPartitionPage(PINPUT_RECORD Ir) { - CONSOLE_SetTextXY(6, 8, "The list below shows existing partitions and unused disk"); - CONSOLE_SetTextXY(6, 9, "space for new partitions."); - - CONSOLE_SetTextXY(8, 11, "\x07 Press UP or DOWN to select a list entry."); - CONSOLE_SetTextXY(8, 13, "\x07 Press ENTER to install ReactOS onto the selected partition."); - CONSOLE_SetTextXY(8, 15, "\x07 Press C to create a new partition."); - CONSOLE_SetTextXY(8, 17, "\x07 Press D to delete an existing partition."); - - CONSOLE_SetStatusText(" Please wait..."); + MUIDisplayPage(SELECT_PARTITION_PAGE);
if (PartitionList == NULL) { @@ -1663,7 +1641,7 @@ DiskEntry = PartitionList->CurrentDisk; PartEntry = PartitionList->CurrentPartition;
- CONSOLE_SetTextXY (6, 8, "You have chosen to delete the partition"); + MUIDisplayPage(DELETE_PARTITION_PAGE);
/* Determine partition type */ PartType = NULL; @@ -1770,13 +1748,6 @@ DiskEntry->Id); }
- CONSOLE_SetTextXY (8, 18, "\x07 Press D to delete the partition."); - CONSOLE_SetTextXY (11, 19, "WARNING: All data on this partition will be lost!"); - - CONSOLE_SetTextXY (8, 21, "\x07 Press ESC to cancel."); - - CONSOLE_SetStatusText (" D = Delete Partition ESC = Cancel F3 = Quit"); - while (TRUE) { CONSOLE_ConInKey (Ir); @@ -1944,12 +1915,7 @@ &DiskEntry->DriverName); }
- - CONSOLE_SetTextXY(6, 17, "Select a file system from the list below."); - - CONSOLE_SetTextXY(8, 19, "\x07 Press UP or DOWN to select a file system."); - CONSOLE_SetTextXY(8, 21, "\x07 Press ENTER to format the partition."); - CONSOLE_SetTextXY(8, 23, "\x07 Press ESC to select another partition."); + MUIDisplayPage(SELECT_FILE_SYSTEM_PAGE);
if (FileSystemList == NULL) { @@ -1964,7 +1930,6 @@ } DrawFileSystemList (FileSystemList);
- CONSOLE_SetStatusText (" ENTER = Continue ESC = Cancel F3 = Quit"); if (RepairUpdateFlag) { return (CHECK_FILE_SYSTEM_PAGE); @@ -2039,13 +2004,7 @@ PLIST_ENTRY Entry; #endif
- - CONSOLE_SetTextXY(6, 8, "Format partition"); - - CONSOLE_SetTextXY(6, 10, "Setup will now format the partition. Press ENTER to continue."); - - CONSOLE_SetStatusText(" ENTER = Continue F3 = Quit"); - + MUIDisplayPage(FORMAT_PARTITION_PAGE);
if (PartitionList == NULL || PartitionList->CurrentDisk == NULL || @@ -2438,17 +2397,8 @@ wcscpy(InstallDir, L"\ReactOS"); } Length = wcslen(InstallDir); - - CONSOLE_SetTextXY(6, 8, "Setup installs ReactOS files onto the selected partition. Choose a"); - CONSOLE_SetTextXY(6, 9, "directory where you want ReactOS to be installed:"); - CONSOLE_SetInputTextXY(8, 11, 51, InstallDir); - - CONSOLE_SetTextXY(6, 14, "To change the suggested directory, press BACKSPACE to delete"); - CONSOLE_SetTextXY(6, 15, "characters and then type the directory where you want ReactOS to"); - CONSOLE_SetTextXY(6, 16, "be installed."); - - CONSOLE_SetStatusText(" ENTER = Continue F3 = Quit"); + MUIDisplayPage(INSTALL_DIRECTORY_PAGE);
if (IsUnattendedSetup) { @@ -2778,9 +2728,7 @@ UINT ErrorLine; PVOID InfFileData;
- CONSOLE_SetTextXY(6, 8, "Setup prepares your computer for copying the ReactOS files. "); - - CONSOLE_SetStatusText(" Building the file copy list..."); + MUIDisplayPage(PREPARE_COPY_PAGE);
/* Create the file queue */ SetupFileQueue = SetupOpenFileQueue(); @@ -2939,13 +2887,7 @@ { COPYCONTEXT CopyContext;
- /* Display status text */ - CONSOLE_SetStatusText(" \xB3 Please wait... "); - - /* Displey information text */ - CONSOLE_SetTextXY(11, 12, "Please wait while ReactOS Setup copies files to your ReactOS"); - CONSOLE_SetTextXY(30, 13, "installation folder."); - CONSOLE_SetTextXY(20, 14, "This may take several minutes to complete."); + MUIDisplayPage(FILE_COPY_PAGE);
/* Create context for the copy process */ CopyContext.DestinationRootPath = DestinationRootPath.Buffer; @@ -3189,14 +3131,8 @@ } }
- CONSOLE_SetTextXY(6, 8, "Setup is installing the boot loader"); - - CONSOLE_SetTextXY(8, 12, "Install bootloader on the harddisk (MBR)."); - CONSOLE_SetTextXY(8, 13, "Install bootloader on a floppy disk."); - CONSOLE_SetTextXY(8, 14, "Skip install bootloader."); - CONSOLE_InvertTextXY (8, Line, 48, 1); - - CONSOLE_SetStatusText(" ENTER = Continue F3 = Quit"); + MUIDisplayPage(BOOT_LOADER_PAGE); + CONSOLE_InvertTextXY (8, Line, 60, 1);
while(TRUE) { @@ -3205,7 +3141,7 @@ if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DOWN)) /* DOWN */ { - CONSOLE_NormalTextXY (8, Line, 48, 1); + CONSOLE_NormalTextXY (8, Line, 60, 1);
Line++; if (Line<12) Line=14; @@ -3213,7 +3149,7 @@
- CONSOLE_InvertTextXY (8, Line, 48, 1); + CONSOLE_InvertTextXY (8, Line, 60, 1); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_UP)) /* UP */
Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-D... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h Wed Dec 19 17:29:39 2007 @@ -672,6 +672,392 @@ }
}; + +static MUI_ENTRY deDESelectPartitionEntries[] = +{ + { + 6, + 8, + "Diese Liste zeigt existierende Partitionen an und den freien", + TEXT_NORMAL + }, + { + 6, + 9, + "Speicherplatz fuer neue Partitionen.", + TEXT_NORMAL + }, + { + 8, + 11, + "\x07 Druecken Sie die Pfeiltasten um eine Partition auszuwaehlen.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Druecken Sie die Eingabetaste um die Auswahl zu bestaetigen.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Druecken Sie C um eine neue Partition zu erstellen.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Druecken Sie D um eine vorhandene Partition zu löschen.", + TEXT_NORMAL + }, + { + 0, + 0, + " Bitte warten...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY deDEFormatPartitionEntries[] = +{ + { + 6, + 8, + "Formatiere Partition", + TEXT_NORMAL + }, + { + 6, + 10, + "Setup wird nun die gewuenschte Partition formatieren.", + TEXT_NORMAL + }, + { + 6, + 11, + "Druecken Sie die Eingabetaste um fortzufahren.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Fortfahren F3 = Beenden", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + TEXT_NORMAL + } +}; + +static MUI_ENTRY deDEInstallDirectoryEntries[] = +{ + { + 6, + 8, + "Setup installiert die ReactOS Installationsdateien in die ausgewaehlte ", + TEXT_NORMAL + }, + { + 6, + 9, + "Partition. Waehlen Sie ein Installationsverzeichniss fuer ReactOS:", + TEXT_NORMAL + }, + { + 6, + 14, + "Um den Vorschlag zu aendern druecken sie die 'Delete' Taste um", + TEXT_NORMAL + }, + { + 6, + 15, + "Zeichen zu loeschen und gegeben sie dann den Namen des Verzeichniss ein", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Fortfahren F3 = Beenden", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY deDEFileCopyEntries[] = +{ + { + 11, + 12, + "Bitte warten Sie waehrend ReactOS Setup die ReactOS Dateien", + TEXT_NORMAL + }, + { + 30, + 13, + "in das Installationsverzeichniss kopiert.", + TEXT_NORMAL + }, + { + 20, + 14, + "Dieser Vorgang kann mehrere Minuten in Anspruch nehmen.", + TEXT_NORMAL + }, + { + 0, + 0, + " \xB3 Bitte warten... ", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY deDEBootLoaderEntries[] = +{ + { + 6, + 8, + "Setup installiert nun den Betriebssystemlader.", + TEXT_NORMAL + }, + { + 8, + 12, + "Installiere den Betriebssystemlader im MBR", + TEXT_NORMAL + }, + { + 8, + 13, + "Installiere den Betriebssystemlader auf einer Diskette", + TEXT_NORMAL + }, + { + 8, + 14, + "Auslassen der Installation des Betriebssystemladers", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Fortfahren F3 = Abbrechen", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY deDEKeyboardSettingsEntries[] = +{ + { + 6, + 8, + "Sie möchten den Tastaturtyp aendern.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Druecken Sie die Pfeiltasten um den gewuenschten Typ zu waehlen.", + TEXT_NORMAL + }, + { + 8, + 11, + "\x07 Druecken Sie zum Bestaetigen die Eingabetaste.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Druecken Sie ESC Taste um die aenderungen zu verwerfen.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Fortfahren ESC = Abbrechen F3 = Beenden", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY deDELayoutSettingsEntries[] = +{ + { + 6, + 8, + "Sie möchten das Tastaturlayout aendern.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Druecken Sie die Pfeiltasten um das gewuenschte Layout auszuwaehlen.", + TEXT_NORMAL + }, + { + 8, + 11, + "\x07 Druecken Sie zum Bestaetigen die Eingabetaste.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Druecken Sie ESC um die Auswahl zu beenden und zur vorherigen Setupseite zurueckzukehren.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Fortfahren ESC = Abbrechen F3 = Beenden", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY deDEPrepareCopyEntries[] = +{ + { + 6, + 8, + "Setup bereitet ihren Computer fuer die Installation vor.", + TEXT_NORMAL + }, + { + 0, + 0, + " Erstelle Liste der zu kopierenden Dateien...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY deDESelectFSEntries[] = +{ + { + 6, + 17, + "Waehlen Sie ein Dateisystem von der folgenden Liste.", + 0 + }, + { + 8, + 19, + "\x07 Druecken Sie die Pfeiltasten um das Dateisystem zu aendern.", + 0 + }, + { + 8, + 21, + "\x07 Druecken Sie die Eingabetaste um die Partition zu formatieren.", + 0 + }, + { + 8, + 23, + "\x07 Druecken Sie ESC um eine andere Partition auszuwaehlen.", + 0 + }, + { + 0, + 0, + " ENTER = Fortfahren ESC = Abbrechen F3 = Beenden", + TEXT_STATUS + }, + + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY deDEDeletePartitionEntries[] = +{ + { + 6, + 8, + "Sie haben sich entschieden diese Partition zu löschen", + TEXT_NORMAL + }, + { + 8, + 18, + "\x07 Druecken Sie D um die Partition zu löschen.", + TEXT_NORMAL + }, + { + 11, + 19, + "Warnung: Alle Daten auf dieser Partition werden gelöscht!", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 ESC um abzubrechen.", + TEXT_NORMAL + }, + { + 0, + 0, + " D = Lösche Partition ESC = Abbrechen F3 = Beenden", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; +
MUI_ERROR deDEErrorEntries[] = { @@ -901,6 +1287,46 @@ deDEFlushPageEntries }, { + SELECT_PARTITION_PAGE, + deDESelectPartitionEntries + }, + { + SELECT_FILE_SYSTEM_PAGE, + deDESelectFSEntries + }, + { + FORMAT_PARTITION_PAGE, + deDEFormatPartitionEntries + }, + { + DELETE_PARTITION_PAGE, + deDEDeletePartitionEntries + }, + { + INSTALL_DIRECTORY_PAGE, + deDEInstallDirectoryEntries + }, + { + PREPARE_COPY_PAGE, + deDEPrepareCopyEntries + }, + { + FILE_COPY_PAGE, + deDEFileCopyEntries + }, + { + KEYBOARD_SETTINGS_PAGE, + deDEKeyboardSettingsEntries + }, + { + BOOT_LOADER_PAGE, + deDEBootLoaderEntries + }, + { + LAYOUT_SETTINGS_PAGE, + deDELayoutSettingsEntries + }, + { QUIT_PAGE, deDEQuitPageEntries },
Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-U... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h Wed Dec 19 17:29:39 2007 @@ -694,6 +694,403 @@ 0 }
+}; + +static MUI_ENTRY enUSSelectPartitionEntries[] = +{ + { + 6, + 8, + "The list below shows existing partitions and unused disk", + TEXT_NORMAL + }, + { + 6, + 9, + "space for new partitions.", + TEXT_NORMAL + }, + { + 8, + 11, + "\x07 Press UP or DOWN to select a list entry.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press ENTER to install ReactOS onto the selected partition.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Press C to create a new partition.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Press D to delete an existing partition.", + TEXT_NORMAL + }, + { + 0, + 0, + " Please wait...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY enUSFormatPartitionEntries[] = +{ + { + 6, + 8, + "Format partition", + TEXT_NORMAL + }, + { + 6, + 10, + "Setup will now format the partition. Press ENTER to continue.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + TEXT_NORMAL + } +}; + +static MUI_ENTRY enUSInstallDirectoryEntries[] = +{ + { + 6, + 8, + "Setup installs ReactOS files onto the selected partition. Choose a", + TEXT_NORMAL + }, + { + 6, + 9, + "directory where you want ReactOS to be installed:", + TEXT_NORMAL + }, + { + 6, + 14, + "To change the suggested directory, press BACKSPACE to delete", + TEXT_NORMAL + }, + { + 6, + 15, + "characters and then type the directory where you want ReactOS to", + TEXT_NORMAL + }, + { + 6, + 16, + "be installed.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY enUSFileCopyEntries[] = +{ + { + 11, + 12, + "Please wait while ReactOS Setup copies files to your ReactOS", + TEXT_NORMAL + }, + { + 30, + 13, + "installation folder.", + TEXT_NORMAL + }, + { + 20, + 14, + "This may take several minutes to complete.", + TEXT_NORMAL + }, + { + 0, + 0, + " \xB3 Please wait... ", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY enUSBootLoaderEntries[] = +{ + { + 6, + 8, + "Setup is installing the boot loader", + TEXT_NORMAL + }, + { + 8, + 12, + "Install bootloader on the harddisk (MBR).", + TEXT_NORMAL + }, + { + 8, + 13, + "Install bootloader on a floppy disk.", + TEXT_NORMAL + }, + { + 8, + 14, + "Skip install bootloader.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY enUSKeyboardSettingsEntries[] = +{ + { + 6, + 8, + "You want to change the type of keyboard to be installed.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Press the UP or DOWN key to select the desired keyboard type.", + TEXT_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_NORMAL + }, + { + 8, + 14, + " the keyboard type.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY enUSLayoutSettingsEntries[] = +{ + { + 6, + 8, + "You want to change the keyboard layout to be installed.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Press the UP or DOWN key to select the desired keyboard", + TEXT_NORMAL + }, + { + 8, + 11, + " layout. Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_NORMAL + }, + { + 8, + 14, + " the keyboard layout.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY enUSPrepareCopyEntries[] = +{ + { + 6, + 8, + "Setup prepares your computer for copying the ReactOS files. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Building the file copy list...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY enUSSelectFSEntries[] = +{ + { + 6, + 17, + "Select a file system from the list below.", + 0 + }, + { + 8, + 19, + "\x07 Press UP or DOWN to select a file system.", + 0 + }, + { + 8, + 21, + "\x07 Press ENTER to format the partition.", + 0 + }, + { + 8, + 23, + "\x07 Press ESC to select another partition.", + 0 + }, + { + 0, + 0, + " ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY enUSDeletePartitionEntries[] = +{ + { + 6, + 8, + "You have chosen to delete the partition", + TEXT_NORMAL + }, + { + 8, + 18, + "\x07 Press D to delete the partition.", + TEXT_NORMAL + }, + { + 11, + 19, + "WARNING: All data on this partition will be lost!", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Press ESC to cancel.", + TEXT_NORMAL + }, + { + 0, + 0, + " D = Delete Partition ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } };
MUI_ERROR enUSErrorEntries[] = @@ -928,6 +1325,46 @@ enUSFlushPageEntries }, { + SELECT_PARTITION_PAGE, + enUSSelectPartitionEntries + }, + { + SELECT_FILE_SYSTEM_PAGE, + enUSSelectFSEntries + }, + { + FORMAT_PARTITION_PAGE, + enUSFormatPartitionEntries + }, + { + DELETE_PARTITION_PAGE, + enUSDeletePartitionEntries + }, + { + INSTALL_DIRECTORY_PAGE, + enUSInstallDirectoryEntries + }, + { + PREPARE_COPY_PAGE, + enUSPrepareCopyEntries + }, + { + FILE_COPY_PAGE, + enUSFileCopyEntries + }, + { + KEYBOARD_SETTINGS_PAGE, + enUSKeyboardSettingsEntries + }, + { + BOOT_LOADER_PAGE, + enUSBootLoaderEntries + }, + { + LAYOUT_SETTINGS_PAGE, + enUSLayoutSettingsEntries + }, + { QUIT_PAGE, enUSQuitPageEntries },
Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-E... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h Wed Dec 19 17:29:39 2007 @@ -673,6 +673,403 @@
};
+static MUI_ENTRY esESSelectPartitionEntries[] = +{ + { + 6, + 8, + "The list below shows existing partitions and unused disk", + TEXT_NORMAL + }, + { + 6, + 9, + "space for new partitions.", + TEXT_NORMAL + }, + { + 8, + 11, + "\x07 Press UP or DOWN to select a list entry.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press ENTER to install ReactOS onto the selected partition.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Press C to create a new partition.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Press D to delete an existing partition.", + TEXT_NORMAL + }, + { + 0, + 0, + " Please wait...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY esESFormatPartitionEntries[] = +{ + { + 6, + 8, + "Format partition", + TEXT_NORMAL + }, + { + 6, + 10, + "Setup will now format the partition. Press ENTER to continue.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + TEXT_NORMAL + } +}; + +static MUI_ENTRY esESInstallDirectoryEntries[] = +{ + { + 6, + 8, + "Setup installs ReactOS files onto the selected partition. Choose a", + TEXT_NORMAL + }, + { + 6, + 9, + "directory where you want ReactOS to be installed:", + TEXT_NORMAL + }, + { + 6, + 14, + "To change the suggested directory, press BACKSPACE to delete", + TEXT_NORMAL + }, + { + 6, + 15, + "characters and then type the directory where you want ReactOS to", + TEXT_NORMAL + }, + { + 6, + 16, + "be installed.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY esESFileCopyEntries[] = +{ + { + 11, + 12, + "Please wait while ReactOS Setup copies files to your ReactOS", + TEXT_NORMAL + }, + { + 30, + 13, + "installation folder.", + TEXT_NORMAL + }, + { + 20, + 14, + "This may take several minutes to complete.", + TEXT_NORMAL + }, + { + 0, + 0, + " \xB3 Please wait... ", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY esESBootLoaderEntries[] = +{ + { + 6, + 8, + "Setup is installing the boot loader", + TEXT_NORMAL + }, + { + 8, + 12, + "Install bootloader on the harddisk (MBR).", + TEXT_NORMAL + }, + { + 8, + 13, + "Install bootloader on a floppy disk.", + TEXT_NORMAL + }, + { + 8, + 14, + "Skip install bootloader.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY esESKeyboardSettingsEntries[] = +{ + { + 6, + 8, + "You want to change the type of keyboard to be installed.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Press the UP or DOWN key to select the desired keyboard type.", + TEXT_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_NORMAL + }, + { + 8, + 14, + " the keyboard type.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY esESLayoutSettingsEntries[] = +{ + { + 6, + 8, + "You want to change the keyboard layout to be installed.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Press the UP or DOWN key to select the desired keyboard", + TEXT_NORMAL + }, + { + 8, + 11, + " layout. Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_NORMAL + }, + { + 8, + 14, + " the keyboard layout.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY esESPrepareCopyEntries[] = +{ + { + 6, + 8, + "Setup prepares your computer for copying the ReactOS files. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Building the file copy list...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY esESSelectFSEntries[] = +{ + { + 6, + 17, + "Select a file system from the list below.", + 0 + }, + { + 8, + 19, + "\x07 Press UP or DOWN to select a file system.", + 0 + }, + { + 8, + 21, + "\x07 Press ENTER to format the partition.", + 0 + }, + { + 8, + 23, + "\x07 Press ESC to select another partition.", + 0 + }, + { + 0, + 0, + " ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY esESDeletePartitionEntries[] = +{ + { + 6, + 8, + "You have chosen to delete the partition", + TEXT_NORMAL + }, + { + 8, + 18, + "\x07 Press D to delete the partition.", + TEXT_NORMAL + }, + { + 11, + 19, + "WARNING: All data on this partition will be lost!", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Press ESC to cancel.", + TEXT_NORMAL + }, + { + 0, + 0, + " D = Delete Partition ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + MUI_PAGE esESPages[] = { { @@ -712,6 +1109,46 @@ esESFlushPageEntries }, { + SELECT_PARTITION_PAGE, + esESSelectPartitionEntries + }, + { + SELECT_FILE_SYSTEM_PAGE, + esESSelectFSEntries + }, + { + FORMAT_PARTITION_PAGE, + esESFormatPartitionEntries + }, + { + DELETE_PARTITION_PAGE, + esESDeletePartitionEntries + }, + { + INSTALL_DIRECTORY_PAGE, + esESInstallDirectoryEntries + }, + { + PREPARE_COPY_PAGE, + esESPrepareCopyEntries + }, + { + FILE_COPY_PAGE, + esESFileCopyEntries + }, + { + KEYBOARD_SETTINGS_PAGE, + esESKeyboardSettingsEntries + }, + { + BOOT_LOADER_PAGE, + esESBootLoaderEntries + }, + { + LAYOUT_SETTINGS_PAGE, + esESLayoutSettingsEntries + }, + { QUIT_PAGE, esESQuitPageEntries },
Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-F... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Wed Dec 19 17:29:39 2007 @@ -684,6 +684,404 @@ }
}; + +static MUI_ENTRY frFRSelectPartitionEntries[] = +{ + { + 6, + 8, + "The list below shows existing partitions and unused disk", + TEXT_NORMAL + }, + { + 6, + 9, + "space for new partitions.", + TEXT_NORMAL + }, + { + 8, + 11, + "\x07 Press UP or DOWN to select a list entry.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press ENTER to install ReactOS onto the selected partition.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Press C to create a new partition.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Press D to delete an existing partition.", + TEXT_NORMAL + }, + { + 0, + 0, + " Please wait...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY frFRFormatPartitionEntries[] = +{ + { + 6, + 8, + "Format partition", + TEXT_NORMAL + }, + { + 6, + 10, + "Setup will now format the partition. Press ENTER to continue.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + TEXT_NORMAL + } +}; + +static MUI_ENTRY frFRInstallDirectoryEntries[] = +{ + { + 6, + 8, + "Setup installs ReactOS files onto the selected partition. Choose a", + TEXT_NORMAL + }, + { + 6, + 9, + "directory where you want ReactOS to be installed:", + TEXT_NORMAL + }, + { + 6, + 14, + "To change the suggested directory, press BACKSPACE to delete", + TEXT_NORMAL + }, + { + 6, + 15, + "characters and then type the directory where you want ReactOS to", + TEXT_NORMAL + }, + { + 6, + 16, + "be installed.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY frFRFileCopyEntries[] = +{ + { + 11, + 12, + "Please wait while ReactOS Setup copies files to your ReactOS", + TEXT_NORMAL + }, + { + 30, + 13, + "installation folder.", + TEXT_NORMAL + }, + { + 20, + 14, + "This may take several minutes to complete.", + TEXT_NORMAL + }, + { + 0, + 0, + " \xB3 Please wait... ", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY frFRBootLoaderEntries[] = +{ + { + 6, + 8, + "Setup is installing the boot loader", + TEXT_NORMAL + }, + { + 8, + 12, + "Install bootloader on the harddisk (MBR).", + TEXT_NORMAL + }, + { + 8, + 13, + "Install bootloader on a floppy disk.", + TEXT_NORMAL + }, + { + 8, + 14, + "Skip install bootloader.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY frFRKeyboardSettingsEntries[] = +{ + { + 6, + 8, + "You want to change the type of keyboard to be installed.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Press the UP or DOWN key to select the desired keyboard type.", + TEXT_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_NORMAL + }, + { + 8, + 14, + " the keyboard type.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY frFRLayoutSettingsEntries[] = +{ + { + 6, + 8, + "You want to change the keyboard layout to be installed.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Press the UP or DOWN key to select the desired keyboard", + TEXT_NORMAL + }, + { + 8, + 11, + " layout. Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_NORMAL + }, + { + 8, + 14, + " the keyboard layout.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY frFRPrepareCopyEntries[] = +{ + { + 6, + 8, + "Setup prepares your computer for copying the ReactOS files. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Building the file copy list...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY frFRSelectFSEntries[] = +{ + { + 6, + 17, + "Select a file system from the list below.", + 0 + }, + { + 8, + 19, + "\x07 Press UP or DOWN to select a file system.", + 0 + }, + { + 8, + 21, + "\x07 Press ENTER to format the partition.", + 0 + }, + { + 8, + 23, + "\x07 Press ESC to select another partition.", + 0 + }, + { + 0, + 0, + " ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY frFRDeletePartitionEntries[] = +{ + { + 6, + 8, + "You have chosen to delete the partition", + TEXT_NORMAL + }, + { + 8, + 18, + "\x07 Press D to delete the partition.", + TEXT_NORMAL + }, + { + 11, + 19, + "WARNING: All data on this partition will be lost!", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Press ESC to cancel.", + TEXT_NORMAL + }, + { + 0, + 0, + " D = Delete Partition ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; +
MUI_ERROR frFRErrorEntries[] = { @@ -917,6 +1315,46 @@ frFRFlushPageEntries }, { + SELECT_PARTITION_PAGE, + frFRSelectPartitionEntries + }, + { + SELECT_FILE_SYSTEM_PAGE, + frFRSelectFSEntries + }, + { + FORMAT_PARTITION_PAGE, + frFRFormatPartitionEntries + }, + { + DELETE_PARTITION_PAGE, + frFRDeletePartitionEntries + }, + { + INSTALL_DIRECTORY_PAGE, + frFRInstallDirectoryEntries + }, + { + PREPARE_COPY_PAGE, + frFRPrepareCopyEntries + }, + { + FILE_COPY_PAGE, + frFRFileCopyEntries + }, + { + KEYBOARD_SETTINGS_PAGE, + frFRKeyboardSettingsEntries + }, + { + BOOT_LOADER_PAGE, + frFRBootLoaderEntries + }, + { + LAYOUT_SETTINGS_PAGE, + frFRLayoutSettingsEntries + }, + { QUIT_PAGE, frFRQuitPageEntries },
Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-I... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h Wed Dec 19 17:29:39 2007 @@ -672,6 +672,404 @@ }
}; + +static MUI_ENTRY itITSelectPartitionEntries[] = +{ + { + 6, + 8, + "The list below shows existing partitions and unused disk", + TEXT_NORMAL + }, + { + 6, + 9, + "space for new partitions.", + TEXT_NORMAL + }, + { + 8, + 11, + "\x07 Press UP or DOWN to select a list entry.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press ENTER to install ReactOS onto the selected partition.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Press C to create a new partition.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Press D to delete an existing partition.", + TEXT_NORMAL + }, + { + 0, + 0, + " Please wait...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY itITFormatPartitionEntries[] = +{ + { + 6, + 8, + "Format partition", + TEXT_NORMAL + }, + { + 6, + 10, + "Setup will now format the partition. Press ENTER to continue.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + TEXT_NORMAL + } +}; + +static MUI_ENTRY itITInstallDirectoryEntries[] = +{ + { + 6, + 8, + "Setup installs ReactOS files onto the selected partition. Choose a", + TEXT_NORMAL + }, + { + 6, + 9, + "directory where you want ReactOS to be installed:", + TEXT_NORMAL + }, + { + 6, + 14, + "To change the suggested directory, press BACKSPACE to delete", + TEXT_NORMAL + }, + { + 6, + 15, + "characters and then type the directory where you want ReactOS to", + TEXT_NORMAL + }, + { + 6, + 16, + "be installed.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY itITFileCopyEntries[] = +{ + { + 11, + 12, + "Please wait while ReactOS Setup copies files to your ReactOS", + TEXT_NORMAL + }, + { + 30, + 13, + "installation folder.", + TEXT_NORMAL + }, + { + 20, + 14, + "This may take several minutes to complete.", + TEXT_NORMAL + }, + { + 0, + 0, + " \xB3 Please wait... ", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY itITBootLoaderEntries[] = +{ + { + 6, + 8, + "Setup is installing the boot loader", + TEXT_NORMAL + }, + { + 8, + 12, + "Install bootloader on the harddisk (MBR).", + TEXT_NORMAL + }, + { + 8, + 13, + "Install bootloader on a floppy disk.", + TEXT_NORMAL + }, + { + 8, + 14, + "Skip install bootloader.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY itITKeyboardSettingsEntries[] = +{ + { + 6, + 8, + "You want to change the type of keyboard to be installed.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Press the UP or DOWN key to select the desired keyboard type.", + TEXT_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_NORMAL + }, + { + 8, + 14, + " the keyboard type.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY itITLayoutSettingsEntries[] = +{ + { + 6, + 8, + "You want to change the keyboard layout to be installed.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Press the UP or DOWN key to select the desired keyboard", + TEXT_NORMAL + }, + { + 8, + 11, + " layout. Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_NORMAL + }, + { + 8, + 14, + " the keyboard layout.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY itITPrepareCopyEntries[] = +{ + { + 6, + 8, + "Setup prepares your computer for copying the ReactOS files. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Building the file copy list...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY itITSelectFSEntries[] = +{ + { + 6, + 17, + "Select a file system from the list below.", + 0 + }, + { + 8, + 19, + "\x07 Press UP or DOWN to select a file system.", + 0 + }, + { + 8, + 21, + "\x07 Press ENTER to format the partition.", + 0 + }, + { + 8, + 23, + "\x07 Press ESC to select another partition.", + 0 + }, + { + 0, + 0, + " ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY itITDeletePartitionEntries[] = +{ + { + 6, + 8, + "You have chosen to delete the partition", + TEXT_NORMAL + }, + { + 8, + 18, + "\x07 Press D to delete the partition.", + TEXT_NORMAL + }, + { + 11, + 19, + "WARNING: All data on this partition will be lost!", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Press ESC to cancel.", + TEXT_NORMAL + }, + { + 0, + 0, + " D = Delete Partition ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; +
MUI_ERROR itITErrorEntries[] = { @@ -904,6 +1302,46 @@ itITFlushPageEntries }, { + SELECT_PARTITION_PAGE, + itITSelectPartitionEntries + }, + { + SELECT_FILE_SYSTEM_PAGE, + itITSelectFSEntries + }, + { + FORMAT_PARTITION_PAGE, + itITFormatPartitionEntries + }, + { + DELETE_PARTITION_PAGE, + itITDeletePartitionEntries + }, + { + INSTALL_DIRECTORY_PAGE, + itITInstallDirectoryEntries + }, + { + PREPARE_COPY_PAGE, + itITPrepareCopyEntries + }, + { + FILE_COPY_PAGE, + itITFileCopyEntries + }, + { + KEYBOARD_SETTINGS_PAGE, + itITKeyboardSettingsEntries + }, + { + BOOT_LOADER_PAGE, + itITBootLoaderEntries + }, + { + LAYOUT_SETTINGS_PAGE, + itITLayoutSettingsEntries + }, + { QUIT_PAGE, itITQuitPageEntries },
Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-R... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h Wed Dec 19 17:29:39 2007 @@ -695,6 +695,404 @@
};
+static MUI_ENTRY ruRUSelectPartitionEntries[] = +{ + { + 6, + 8, + "The list below shows existing partitions and unused disk", + TEXT_NORMAL + }, + { + 6, + 9, + "space for new partitions.", + TEXT_NORMAL + }, + { + 8, + 11, + "\x07 Press UP or DOWN to select a list entry.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press ENTER to install ReactOS onto the selected partition.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Press C to create a new partition.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Press D to delete an existing partition.", + TEXT_NORMAL + }, + { + 0, + 0, + " Please wait...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ruRUFormatPartitionEntries[] = +{ + { + 6, + 8, + "Format partition", + TEXT_NORMAL + }, + { + 6, + 10, + "Setup will now format the partition. Press ENTER to continue.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + TEXT_NORMAL + } +}; + +static MUI_ENTRY ruRUInstallDirectoryEntries[] = +{ + { + 6, + 8, + "Setup installs ReactOS files onto the selected partition. Choose a", + TEXT_NORMAL + }, + { + 6, + 9, + "directory where you want ReactOS to be installed:", + TEXT_NORMAL + }, + { + 6, + 14, + "To change the suggested directory, press BACKSPACE to delete", + TEXT_NORMAL + }, + { + 6, + 15, + "characters and then type the directory where you want ReactOS to", + TEXT_NORMAL + }, + { + 6, + 16, + "be installed.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ruRUFileCopyEntries[] = +{ + { + 11, + 12, + "Please wait while ReactOS Setup copies files to your ReactOS", + TEXT_NORMAL + }, + { + 30, + 13, + "installation folder.", + TEXT_NORMAL + }, + { + 20, + 14, + "This may take several minutes to complete.", + TEXT_NORMAL + }, + { + 0, + 0, + " \xB3 Please wait... ", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ruRUBootLoaderEntries[] = +{ + { + 6, + 8, + "Setup is installing the boot loader", + TEXT_NORMAL + }, + { + 8, + 12, + "Install bootloader on the harddisk (MBR).", + TEXT_NORMAL + }, + { + 8, + 13, + "Install bootloader on a floppy disk.", + TEXT_NORMAL + }, + { + 8, + 14, + "Skip install bootloader.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ruRUKeyboardSettingsEntries[] = +{ + { + 6, + 8, + "You want to change the type of keyboard to be installed.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Press the UP or DOWN key to select the desired keyboard type.", + TEXT_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_NORMAL + }, + { + 8, + 14, + " the keyboard type.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ruRULayoutSettingsEntries[] = +{ + { + 6, + 8, + "You want to change the keyboard layout to be installed.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Press the UP or DOWN key to select the desired keyboard", + TEXT_NORMAL + }, + { + 8, + 11, + " layout. Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_NORMAL + }, + { + 8, + 14, + " the keyboard layout.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY ruRUPrepareCopyEntries[] = +{ + { + 6, + 8, + "Setup prepares your computer for copying the ReactOS files. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Building the file copy list...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY ruRUSelectFSEntries[] = +{ + { + 6, + 17, + "Select a file system from the list below.", + 0 + }, + { + 8, + 19, + "\x07 Press UP or DOWN to select a file system.", + 0 + }, + { + 8, + 21, + "\x07 Press ENTER to format the partition.", + 0 + }, + { + 8, + 23, + "\x07 Press ESC to select another partition.", + 0 + }, + { + 0, + 0, + " ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ruRUDeletePartitionEntries[] = +{ + { + 6, + 8, + "You have chosen to delete the partition", + TEXT_NORMAL + }, + { + 8, + 18, + "\x07 Press D to delete the partition.", + TEXT_NORMAL + }, + { + 11, + 19, + "WARNING: All data on this partition will be lost!", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Press ESC to cancel.", + TEXT_NORMAL + }, + { + 0, + 0, + " D = Delete Partition ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + + MUI_PAGE ruRUPages[] = { { @@ -734,6 +1132,46 @@ ruRUFlushPageEntries }, { + SELECT_PARTITION_PAGE, + ruRUSelectPartitionEntries + }, + { + SELECT_FILE_SYSTEM_PAGE, + ruRUSelectFSEntries + }, + { + FORMAT_PARTITION_PAGE, + ruRUFormatPartitionEntries + }, + { + DELETE_PARTITION_PAGE, + ruRUDeletePartitionEntries + }, + { + INSTALL_DIRECTORY_PAGE, + ruRUInstallDirectoryEntries + }, + { + PREPARE_COPY_PAGE, + ruRUPrepareCopyEntries + }, + { + FILE_COPY_PAGE, + ruRUFileCopyEntries + }, + { + KEYBOARD_SETTINGS_PAGE, + ruRUKeyboardSettingsEntries + }, + { + BOOT_LOADER_PAGE, + ruRUBootLoaderEntries + }, + { + LAYOUT_SETTINGS_PAGE, + ruRULayoutSettingsEntries + }, + { QUIT_PAGE, ruRUQuitPageEntries },
Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-S... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h Wed Dec 19 17:29:39 2007 @@ -673,6 +673,404 @@
};
+static MUI_ENTRY svSESelectPartitionEntries[] = +{ + { + 6, + 8, + "The list below shows existing partitions and unused disk", + TEXT_NORMAL + }, + { + 6, + 9, + "space for new partitions.", + TEXT_NORMAL + }, + { + 8, + 11, + "\x07 Press UP or DOWN to select a list entry.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press ENTER to install ReactOS onto the selected partition.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Press C to create a new partition.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Press D to delete an existing partition.", + TEXT_NORMAL + }, + { + 0, + 0, + " Please wait...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY svSEFormatPartitionEntries[] = +{ + { + 6, + 8, + "Format partition", + TEXT_NORMAL + }, + { + 6, + 10, + "Setup will now format the partition. Press ENTER to continue.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + TEXT_NORMAL + } +}; + +static MUI_ENTRY svSEInstallDirectoryEntries[] = +{ + { + 6, + 8, + "Setup installs ReactOS files onto the selected partition. Choose a", + TEXT_NORMAL + }, + { + 6, + 9, + "directory where you want ReactOS to be installed:", + TEXT_NORMAL + }, + { + 6, + 14, + "To change the suggested directory, press BACKSPACE to delete", + TEXT_NORMAL + }, + { + 6, + 15, + "characters and then type the directory where you want ReactOS to", + TEXT_NORMAL + }, + { + 6, + 16, + "be installed.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY svSEFileCopyEntries[] = +{ + { + 11, + 12, + "Please wait while ReactOS Setup copies files to your ReactOS", + TEXT_NORMAL + }, + { + 30, + 13, + "installation folder.", + TEXT_NORMAL + }, + { + 20, + 14, + "This may take several minutes to complete.", + TEXT_NORMAL + }, + { + 0, + 0, + " \xB3 Please wait... ", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY svSEBootLoaderEntries[] = +{ + { + 6, + 8, + "Setup is installing the boot loader", + TEXT_NORMAL + }, + { + 8, + 12, + "Install bootloader on the harddisk (MBR).", + TEXT_NORMAL + }, + { + 8, + 13, + "Install bootloader on a floppy disk.", + TEXT_NORMAL + }, + { + 8, + 14, + "Skip install bootloader.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY svSEKeyboardSettingsEntries[] = +{ + { + 6, + 8, + "You want to change the type of keyboard to be installed.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Press the UP or DOWN key to select the desired keyboard type.", + TEXT_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_NORMAL + }, + { + 8, + 14, + " the keyboard type.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY svSELayoutSettingsEntries[] = +{ + { + 6, + 8, + "You want to change the keyboard layout to be installed.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Press the UP or DOWN key to select the desired keyboard", + TEXT_NORMAL + }, + { + 8, + 11, + " layout. Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_NORMAL + }, + { + 8, + 14, + " the keyboard layout.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY svSEPrepareCopyEntries[] = +{ + { + 6, + 8, + "Setup prepares your computer for copying the ReactOS files. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Building the file copy list...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY svSESelectFSEntries[] = +{ + { + 6, + 17, + "Select a file system from the list below.", + 0 + }, + { + 8, + 19, + "\x07 Press UP or DOWN to select a file system.", + 0 + }, + { + 8, + 21, + "\x07 Press ENTER to format the partition.", + 0 + }, + { + 8, + 23, + "\x07 Press ESC to select another partition.", + 0 + }, + { + 0, + 0, + " ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY svSEDeletePartitionEntries[] = +{ + { + 6, + 8, + "You have chosen to delete the partition", + TEXT_NORMAL + }, + { + 8, + 18, + "\x07 Press D to delete the partition.", + TEXT_NORMAL + }, + { + 11, + 19, + "WARNING: All data on this partition will be lost!", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Press ESC to cancel.", + TEXT_NORMAL + }, + { + 0, + 0, + " D = Delete Partition ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + + MUI_PAGE svSEPages[] = { { @@ -712,6 +1110,46 @@ svSEFlushPageEntries }, { + SELECT_PARTITION_PAGE, + svSESelectPartitionEntries + }, + { + SELECT_FILE_SYSTEM_PAGE, + svSESelectFSEntries + }, + { + FORMAT_PARTITION_PAGE, + svSEFormatPartitionEntries + }, + { + DELETE_PARTITION_PAGE, + svSEDeletePartitionEntries + }, + { + INSTALL_DIRECTORY_PAGE, + svSEInstallDirectoryEntries + }, + { + PREPARE_COPY_PAGE, + svSEPrepareCopyEntries + }, + { + FILE_COPY_PAGE, + svSEFileCopyEntries + }, + { + KEYBOARD_SETTINGS_PAGE, + svSEKeyboardSettingsEntries + }, + { + BOOT_LOADER_PAGE, + svSEBootLoaderEntries + }, + { + LAYOUT_SETTINGS_PAGE, + svSELayoutSettingsEntries + }, + { QUIT_PAGE, svSEQuitPageEntries },
Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-U... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h Wed Dec 19 17:29:39 2007 @@ -673,6 +673,404 @@
};
+static MUI_ENTRY ukUASelectPartitionEntries[] = +{ + { + 6, + 8, + "The list below shows existing partitions and unused disk", + TEXT_NORMAL + }, + { + 6, + 9, + "space for new partitions.", + TEXT_NORMAL + }, + { + 8, + 11, + "\x07 Press UP or DOWN to select a list entry.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press ENTER to install ReactOS onto the selected partition.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Press C to create a new partition.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Press D to delete an existing partition.", + TEXT_NORMAL + }, + { + 0, + 0, + " Please wait...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ukUAFormatPartitionEntries[] = +{ + { + 6, + 8, + "Format partition", + TEXT_NORMAL + }, + { + 6, + 10, + "Setup will now format the partition. Press ENTER to continue.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + TEXT_NORMAL + } +}; + +static MUI_ENTRY ukUAInstallDirectoryEntries[] = +{ + { + 6, + 8, + "Setup installs ReactOS files onto the selected partition. Choose a", + TEXT_NORMAL + }, + { + 6, + 9, + "directory where you want ReactOS to be installed:", + TEXT_NORMAL + }, + { + 6, + 14, + "To change the suggested directory, press BACKSPACE to delete", + TEXT_NORMAL + }, + { + 6, + 15, + "characters and then type the directory where you want ReactOS to", + TEXT_NORMAL + }, + { + 6, + 16, + "be installed.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ukUAFileCopyEntries[] = +{ + { + 11, + 12, + "Please wait while ReactOS Setup copies files to your ReactOS", + TEXT_NORMAL + }, + { + 30, + 13, + "installation folder.", + TEXT_NORMAL + }, + { + 20, + 14, + "This may take several minutes to complete.", + TEXT_NORMAL + }, + { + 0, + 0, + " \xB3 Please wait... ", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ukUABootLoaderEntries[] = +{ + { + 6, + 8, + "Setup is installing the boot loader", + TEXT_NORMAL + }, + { + 8, + 12, + "Install bootloader on the harddisk (MBR).", + TEXT_NORMAL + }, + { + 8, + 13, + "Install bootloader on a floppy disk.", + TEXT_NORMAL + }, + { + 8, + 14, + "Skip install bootloader.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ukUAKeyboardSettingsEntries[] = +{ + { + 6, + 8, + "You want to change the type of keyboard to be installed.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Press the UP or DOWN key to select the desired keyboard type.", + TEXT_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_NORMAL + }, + { + 8, + 14, + " the keyboard type.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ukUALayoutSettingsEntries[] = +{ + { + 6, + 8, + "You want to change the keyboard layout to be installed.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Press the UP or DOWN key to select the desired keyboard", + TEXT_NORMAL + }, + { + 8, + 11, + " layout. Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_NORMAL + }, + { + 8, + 14, + " the keyboard layout.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY ukUAPrepareCopyEntries[] = +{ + { + 6, + 8, + "Setup prepares your computer for copying the ReactOS files. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Building the file copy list...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY ukUASelectFSEntries[] = +{ + { + 6, + 17, + "Select a file system from the list below.", + 0 + }, + { + 8, + 19, + "\x07 Press UP or DOWN to select a file system.", + 0 + }, + { + 8, + 21, + "\x07 Press ENTER to format the partition.", + 0 + }, + { + 8, + 23, + "\x07 Press ESC to select another partition.", + 0 + }, + { + 0, + 0, + " ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ukUADeletePartitionEntries[] = +{ + { + 6, + 8, + "You have chosen to delete the partition", + TEXT_NORMAL + }, + { + 8, + 18, + "\x07 Press D to delete the partition.", + TEXT_NORMAL + }, + { + 11, + 19, + "WARNING: All data on this partition will be lost!", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Press ESC to cancel.", + TEXT_NORMAL + }, + { + 0, + 0, + " D = Delete Partition ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + + MUI_PAGE ukUAPages[] = { { @@ -708,6 +1106,46 @@ ukUAFlushPageEntries }, { + SELECT_PARTITION_PAGE, + ukUASelectPartitionEntries + }, + { + SELECT_FILE_SYSTEM_PAGE, + ukUASelectFSEntries + }, + { + FORMAT_PARTITION_PAGE, + ukUAFormatPartitionEntries + }, + { + DELETE_PARTITION_PAGE, + ukUADeletePartitionEntries + }, + { + INSTALL_DIRECTORY_PAGE, + ukUAInstallDirectoryEntries + }, + { + PREPARE_COPY_PAGE, + ukUAPrepareCopyEntries + }, + { + FILE_COPY_PAGE, + ukUAFileCopyEntries + }, + { + KEYBOARD_SETTINGS_PAGE, + ukUAKeyboardSettingsEntries + }, + { + BOOT_LOADER_PAGE, + ukUABootLoaderEntries + }, + { + LAYOUT_SETTINGS_PAGE, + ukUALayoutSettingsEntries + }, + { QUIT_PAGE, ukUAQuitPageEntries },
Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?rev... ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c (original) +++ trunk/reactos/base/setup/usetup/mui.c Wed Dec 19 17:29:39 2007 @@ -15,11 +15,11 @@ static MUI_LANGUAGE LanguageList[] = { { - "English (USA)", + "English", enUSPages }, { - "French (France)", + "French", frFRPages }, {