diff --git a/reactos/base/setup/usetup/chkdsk.c b/reactos/base/setup/usetup/chkdsk.c index 69787d4c4e3..3c662b8e2b0 100644 --- a/reactos/base/setup/usetup/chkdsk.c +++ b/reactos/base/setup/usetup/chkdsk.c @@ -67,7 +67,7 @@ ChkdskPartition( 10, 24, TRUE, - "Setup is checking your disk"); + MUIGetString(STRING_CHECKINGDISK)); ProgressSetStepCount(ChkdskProgressBar, 100); diff --git a/reactos/base/setup/usetup/format.c b/reactos/base/setup/usetup/format.c index a85213f57ae..8f3709fa60d 100644 --- a/reactos/base/setup/usetup/format.c +++ b/reactos/base/setup/usetup/format.c @@ -99,7 +99,7 @@ FormatPartition( 10, 24, TRUE, - "Setup is formatting your disk"); + MUIGetString(STRING_FORMATTINGDISK)); ProgressSetStepCount(FormatProgressBar, 100); diff --git a/reactos/base/setup/usetup/fslist.c b/reactos/base/setup/usetup/fslist.c index e5ea8136151..d67223fd5c0 100644 --- a/reactos/base/setup/usetup/fslist.c +++ b/reactos/base/setup/usetup/fslist.c @@ -163,9 +163,9 @@ DrawFileSystemList( if (Item->FileSystem) { if (Item->QuickFormat) - sprintf(Buffer, " Format partition as %S file system (quick format) ", Item->FileSystem); + sprintf(Buffer, MUIGetString(STRING_FORMATDISK1), Item->FileSystem); else - sprintf(Buffer, " Format partition as %S file system ", Item->FileSystem); + sprintf(Buffer, MUIGetString(STRING_FORMATDISK2), Item->FileSystem); } else sprintf(Buffer, " Keep current file system (no changes) "); diff --git a/reactos/base/setup/usetup/interface/usetup.c b/reactos/base/setup/usetup/interface/usetup.c index e561f97b2ea..d6591fc0664 100644 --- a/reactos/base/setup/usetup/interface/usetup.c +++ b/reactos/base/setup/usetup/interface/usetup.c @@ -686,7 +686,7 @@ SetupStartPage(PINPUT_RECORD Ir) UINT ErrorLine; SIZE_T ReturnSize; - CONSOLE_SetStatusText(" Please wait..."); + CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); /* Check whether a harddisk is available */ @@ -1024,7 +1024,7 @@ DeviceSettingsPage(PINPUT_RECORD Ir) CONSOLE_SetTextXY(25, 13, GetGenericListEntry(KeyboardList)->Text); CONSOLE_SetTextXY(25, 14, GetGenericListEntry(LayoutList)->Text); - CONSOLE_InvertTextXY (24, Line, 48, 1); + CONSOLE_InvertTextXY(24, Line, 48, 1); if (RepairUpdateFlag) { @@ -1038,7 +1038,7 @@ DeviceSettingsPage(PINPUT_RECORD Ir) if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DOWN)) /* DOWN */ { - CONSOLE_NormalTextXY (24, Line, 48, 1); + CONSOLE_NormalTextXY(24, Line, 48, 1); if (Line == 14) Line = 16; @@ -1047,12 +1047,12 @@ DeviceSettingsPage(PINPUT_RECORD Ir) else Line++; - CONSOLE_InvertTextXY (24, Line, 48, 1); + CONSOLE_InvertTextXY(24, Line, 48, 1); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_UP)) /* UP */ { - CONSOLE_NormalTextXY (24, Line, 48, 1); + CONSOLE_NormalTextXY(24, Line, 48, 1); if (Line == 11) Line = 16; @@ -1061,7 +1061,7 @@ DeviceSettingsPage(PINPUT_RECORD Ir) else Line--; - CONSOLE_InvertTextXY (24, Line, 48, 1); + CONSOLE_InvertTextXY(24, Line, 48, 1); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ @@ -1327,7 +1327,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) while (TRUE) { - CONSOLE_ConInKey (Ir); + CONSOLE_ConInKey(Ir); if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ @@ -1370,11 +1370,11 @@ SelectPartitionPage(PINPUT_RECORD Ir) if (PartitionList->CurrentPartition == NULL || PartitionList->CurrentPartition->Unpartitioned == TRUE) { - CONSOLE_SetStatusText (MUIGetString(STRING_INSTALLCREATEPARTITION)); + CONSOLE_SetStatusText(MUIGetString(STRING_INSTALLCREATEPARTITION)); } else { - CONSOLE_SetStatusText (MUIGetString(STRING_INSTALLDELETEPARTITION)); + CONSOLE_SetStatusText(MUIGetString(STRING_INSTALLDELETEPARTITION)); } CONSOLE_ConInKey(Ir); @@ -1523,7 +1523,7 @@ ShowPartitionSizeInputBox(SHORT Left, while (TRUE) { - CONSOLE_ConInKey (&Ir); + CONSOLE_ConInKey(&Ir); if ((Ir.Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir.Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ @@ -1604,9 +1604,9 @@ CreatePartitionPage (PINPUT_RECORD Ir) DiskEntry = PartitionList->CurrentDisk; PartEntry = PartitionList->CurrentPartition; - CONSOLE_SetStatusText (MUIGetString(STRING_PLEASEWAIT)); + CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); - CONSOLE_SetTextXY (6, 8, MUIGetString(STRING_CHOOSENEWPARTITION)); + CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHOOSENEWPARTITION)); #if 0 if (DiskEntry->DiskSize >= 0x280000000ULL) /* 10 GB */ @@ -1627,7 +1627,7 @@ CreatePartitionPage (PINPUT_RECORD Ir) if (DiskEntry->DriverName.Length > 0) { - CONSOLE_PrintTextXY (6, 10, + CONSOLE_PrintTextXY(6, 10, "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ.", DiskSize, Unit, @@ -1639,7 +1639,7 @@ CreatePartitionPage (PINPUT_RECORD Ir) } else { - CONSOLE_PrintTextXY (6, 10, + CONSOLE_PrintTextXY(6, 10, "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu).", DiskSize, Unit, @@ -1649,14 +1649,14 @@ CreatePartitionPage (PINPUT_RECORD Ir) DiskEntry->Id); } - CONSOLE_SetTextXY (6, 12, "Please enter the size of the new partition in megabytes."); + CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE)); #if 0 - CONSOLE_PrintTextXY (8, 10, "Maximum size of the new partition is %I64u MB", + CONSOLE_PrintTextXY(8, 10, "Maximum size of the new partition is %I64u MB", PartitionList->CurrentPartition->UnpartitionedLength / (1024*1024)); #endif - CONSOLE_SetStatusText (MUIGetString(STRING_CREATEPARTITION)); + CONSOLE_SetStatusText(MUIGetString(STRING_CREATEPARTITION)); PartEntry = PartitionList->CurrentPartition; while (TRUE) @@ -1797,7 +1797,7 @@ DeletePartitionPage (PINPUT_RECORD Ir) if (PartType == NULL) { - CONSOLE_PrintTextXY (6, 10, + CONSOLE_PrintTextXY(6, 10, " %c%c Type %lu %I64u %s", (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', @@ -1807,7 +1807,7 @@ DeletePartitionPage (PINPUT_RECORD Ir) } else { - CONSOLE_PrintTextXY (6, 10, + CONSOLE_PrintTextXY(6, 10, " %c%c %s %I64u %s", (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', @@ -1835,7 +1835,7 @@ DeletePartitionPage (PINPUT_RECORD Ir) if (DiskEntry->DriverName.Length > 0) { - CONSOLE_PrintTextXY (6, 12, + CONSOLE_PrintTextXY(6, 12, "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ.", DiskSize, Unit, @@ -1847,7 +1847,7 @@ DeletePartitionPage (PINPUT_RECORD Ir) } else { - CONSOLE_PrintTextXY (6, 12, + CONSOLE_PrintTextXY(6, 12, "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu).", DiskSize, Unit, @@ -1859,7 +1859,7 @@ DeletePartitionPage (PINPUT_RECORD Ir) while (TRUE) { - CONSOLE_ConInKey (Ir); + CONSOLE_ConInKey(Ir); if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ @@ -1984,23 +1984,23 @@ SelectFileSystemPage (PINPUT_RECORD Ir) DiskEntry->Id, &DiskEntry->DriverName); - CONSOLE_SetTextXY(6, 12, "This Partition will be formatted next."); + CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_PARTFORMAT)); PartEntry->AutoCreate = FALSE; } else if (PartEntry->New == TRUE) { - CONSOLE_SetTextXY(6, 8, "You chose to install ReactOS on a new or unformatted Partition."); - CONSOLE_SetTextXY(6, 10, "This Partition will be formatted next."); + CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NONFORMATTEDPART)); + CONSOLE_SetTextXY(6, 10, MUIGetString(STRING_PARTFORMAT)); } else { - CONSOLE_SetTextXY(6, 8, "Setup install ReactOS onto Partition"); + CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_INSTALLONPART)); if (PartType == NULL) { - CONSOLE_PrintTextXY (8, 10, + CONSOLE_PrintTextXY(8, 10, "%c%c Type %lu %I64u %s", (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', @@ -2010,7 +2010,7 @@ SelectFileSystemPage (PINPUT_RECORD Ir) } else { - CONSOLE_PrintTextXY (8, 10, + CONSOLE_PrintTextXY(8, 10, "%c%c %s %I64u %s", (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', @@ -2062,7 +2062,7 @@ SelectFileSystemPage (PINPUT_RECORD Ir) while (TRUE) { - CONSOLE_ConInKey (Ir); + CONSOLE_ConInKey(Ir); if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ @@ -2152,7 +2152,7 @@ FormatPartitionPage (PINPUT_RECORD Ir) } else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RETURN || IsUnattendedSetup) /* ENTER */ { - CONSOLE_SetStatusText (" Please wait ..."); + CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); if (PartEntry->PartInfo[0].PartitionType == PARTITION_ENTRY_UNUSED) { @@ -2208,7 +2208,7 @@ FormatPartitionPage (PINPUT_RECORD Ir) CheckActiveBootPartition (PartitionList); #ifndef NDEBUG - CONSOLE_PrintTextXY (6, 12, + CONSOLE_PrintTextXY(6, 12, "Disk: %I64u Cylinder: %I64u Track: %I64u", DiskEntry->DiskSize, DiskEntry->CylinderSize, @@ -2226,7 +2226,7 @@ FormatPartitionPage (PINPUT_RECORD Ir) { for (i = 0; i < 4; i++) { - CONSOLE_PrintTextXY (6, Line, + CONSOLE_PrintTextXY(6, Line, "%2u: %2u %c %12I64u %12I64u %2u %c", i, PartEntry->PartInfo[i].PartitionNumber, @@ -2363,7 +2363,7 @@ FormatPartitionPage (PINPUT_RECORD Ir) } #ifndef NDEBUG - CONSOLE_SetStatusText (" Done. Press any key ..."); + CONSOLE_SetStatusText(" Done. Press any key ..."); CONSOLE_ConInKey(Ir); #endif @@ -2404,9 +2404,9 @@ CheckFileSystemPage(PINPUT_RECORD Ir) RtlCreateUnicodeString(&SystemRootPath, PathBuffer); DPRINT("SystemRootPath: %wZ\n", &SystemRootPath); - CONSOLE_SetTextXY(6, 8, "Setup is now checking the selected partition."); + CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHECKINGPART)); - CONSOLE_SetStatusText(" Please wait..."); + CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); /* WRONG: first filesystem is not necesseraly the one of the current partition! */ CurrentFileSystem = CONTAINING_RECORD(FileSystemList->ListHead.Flink, FILE_SYSTEM_ITEM, ListEntry); @@ -2421,7 +2421,7 @@ CheckFileSystemPage(PINPUT_RECORD Ir) CurrentFileSystem->FileSystem); PopupError(Buffer, - "F3= Quit ENTER = Continue", + MUIGetString(STRING_QUITCONTINUE), NULL, POPUP_WAIT_NONE); while(TRUE) @@ -2452,7 +2452,7 @@ CheckFileSystemPage(PINPUT_RECORD Ir) "(Status 0x%08lx).\n", Status); PopupError(Buffer, - "ENTER = Reboot computer", + MUIGetString(STRING_REBOOTCOMPUTER), Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; @@ -2605,8 +2605,8 @@ AddSectionToCopyQueueCab(HINF InfFile, if (!SetupFindFirstLineW (InfFile, SectionName, NULL, &FilesContext)) { char Buffer[128]; - sprintf(Buffer, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n", SectionName); - PopupError(Buffer, "ENTER = Reboot computer", Ir, POPUP_WAIT_ENTER); + sprintf(Buffer, MUIGetString(STRING_TXTSETUPFAILED), SectionName); + PopupError(Buffer, MUIGetString(STRING_REBOOTCOMPUTER), Ir, POPUP_WAIT_ENTER); return(FALSE); } @@ -2682,8 +2682,8 @@ AddSectionToCopyQueue(HINF InfFile, if (!SetupFindFirstLineW (InfFile, SectionName, NULL, &FilesContext)) { char Buffer[128]; - sprintf(Buffer, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n", SectionName); - PopupError(Buffer, "ENTER = Reboot computer", Ir, POPUP_WAIT_ENTER); + sprintf(Buffer, MUIGetString(STRING_TXTSETUPFAILED), SectionName); + PopupError(Buffer, MUIGetString(STRING_REBOOTCOMPUTER), Ir, POPUP_WAIT_ENTER); return FALSE; } @@ -3131,7 +3131,7 @@ RegistryPage(PINPUT_RECORD Ir) #endif /* Update registry */ - CONSOLE_SetStatusText(" Updating registry hives..."); + CONSOLE_SetStatusText(MUIGetString(STRING_REGHIVEUPDATE)); if (!SetupFindFirstLineW(SetupInf, L"HiveInfs.Install", NULL, &InfContext)) { @@ -3161,7 +3161,7 @@ RegistryPage(PINPUT_RECORD Ir) continue; } - CONSOLE_SetStatusText(" Importing %S...", File); + CONSOLE_SetStatusText(MUIGetString(STRING_IMPORTFILE), File); if (!ImportRegistryFile(File, Section, Delete)) { @@ -3173,7 +3173,7 @@ RegistryPage(PINPUT_RECORD Ir) } while (SetupFindNextLine (&InfContext, &InfContext)); /* Update display registry settings */ - CONSOLE_SetStatusText(" Updating display registry settings..."); + CONSOLE_SetStatusText(MUIGetString(STRING_DISPLAYETTINGSUPDATE)); if (!ProcessDisplayRegistry(SetupInf, DisplayList)) { MUIDisplayError(ERROR_UPDATE_DISPLAY_SETTINGS, Ir, POPUP_WAIT_ENTER); @@ -3181,7 +3181,7 @@ RegistryPage(PINPUT_RECORD Ir) } /* Set the locale */ - CONSOLE_SetStatusText(" Updating locale settings..."); + CONSOLE_SetStatusText(MUIGetString(STRING_LOCALESETTINGSUPDATE)); if (!ProcessLocaleRegistry(LanguageList)) { MUIDisplayError(ERROR_UPDATE_LOCALESETTINGS, Ir, POPUP_WAIT_ENTER); @@ -3189,7 +3189,7 @@ RegistryPage(PINPUT_RECORD Ir) } /* Update keyboard layout settings */ - CONSOLE_SetStatusText(" Updating keyboard layout settings..."); + CONSOLE_SetStatusText(MUIGetString(STRING_KEYBOARDSETTINGSUPDATE)); if (!ProcessKeyboardLayoutRegistry(LayoutList)) { MUIDisplayError(ERROR_UPDATE_KBSETTINGS, Ir, POPUP_WAIT_ENTER); @@ -3197,7 +3197,7 @@ RegistryPage(PINPUT_RECORD Ir) } /* Add codepage information to registry */ - CONSOLE_SetStatusText(" Adding codepage information to registry..."); + CONSOLE_SetStatusText(MUIGetString(STRING_CODEPAGEINFOUPDATE)); if (!AddCodePage()) { MUIDisplayError(ERROR_ADDING_CODEPAGE, Ir, POPUP_WAIT_ENTER); @@ -3207,7 +3207,7 @@ RegistryPage(PINPUT_RECORD Ir) /* Update the mounted devices list */ SetMountedDeviceValues(PartitionList); - CONSOLE_SetStatusText(" Done..."); + CONSOLE_SetStatusText(MUIGetString(STRING_DONE)); return BOOT_LOADER_PAGE; } @@ -3220,7 +3220,7 @@ BootLoaderPage(PINPUT_RECORD Ir) BOOLEAN InstallOnFloppy; USHORT Line = 12; - CONSOLE_SetStatusText(" Please wait..."); + CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); PartitionType = PartitionList->ActiveBootPartition->PartInfo[0].PartitionType; @@ -3286,7 +3286,7 @@ BootLoaderPage(PINPUT_RECORD Ir) } MUIDisplayPage(BOOT_LOADER_PAGE); - CONSOLE_InvertTextXY (8, Line, 60, 1); + CONSOLE_InvertTextXY(8, Line, 60, 1); while(TRUE) { @@ -3295,24 +3295,24 @@ BootLoaderPage(PINPUT_RECORD Ir) if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DOWN)) /* DOWN */ { - CONSOLE_NormalTextXY (8, Line, 60, 1); + CONSOLE_NormalTextXY(8, Line, 60, 1); Line++; if (Line<12) Line=14; if (Line>14) Line=12; - CONSOLE_InvertTextXY (8, Line, 60, 1); + CONSOLE_InvertTextXY(8, Line, 60, 1); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_UP)) /* UP */ { - CONSOLE_NormalTextXY (8, Line, 60, 1); + CONSOLE_NormalTextXY(8, Line, 60, 1); Line--; if (Line<12) Line=14; if (Line>14) Line=12; - CONSOLE_InvertTextXY (8, Line, 60, 1); + CONSOLE_InvertTextXY(8, Line, 60, 1); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ @@ -3478,7 +3478,7 @@ QuitPage(PINPUT_RECORD Ir) LanguageList = NULL; } - CONSOLE_SetStatusText(" ENTER = Reboot computer"); + CONSOLE_SetStatusText(MUIGetString(STRING_REBOOTCOMPUTER2)); while(TRUE) { @@ -3541,9 +3541,9 @@ RunUSetup(VOID) if (!CONSOLE_Init()) { - PrintString("Unable to open the console\n\n"); - PrintString("The most common cause of this is using an USB keyboard\n"); - PrintString("USB keyboards are not fully supported yet\n"); + PrintString(MUIGetString(STRING_CONSOLEFAIL1)); + PrintString(MUIGetString(STRING_CONSOLEFAIL2)); + PrintString(MUIGetString(STRING_CONSOLEFAIL3)); /* Raise a hard error (crash the system/BSOD) */ NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, diff --git a/reactos/base/setup/usetup/lang/de-DE.h b/reactos/base/setup/usetup/lang/de-DE.h index 703d5fabb49..1d0f890176e 100644 --- a/reactos/base/setup/usetup/lang/de-DE.h +++ b/reactos/base/setup/usetup/lang/de-DE.h @@ -1253,13 +1253,13 @@ static MUI_ENTRY deDERegistryEntries[] = { 6, 8, - "Setup is updating the system configuration. ", + "Setup aktualisiert die Systemkonfiguration. ", TEXT_NORMAL }, { 0, 0, - " Creating registry hives...", + " Registry Hives erstellen...", TEXT_STATUS }, { @@ -1576,28 +1576,74 @@ MUI_PAGE deDEPages[] = MUI_STRING deDEStrings[] = { + {STRING_PLEASEWAIT, + " Bitte warten..."}, {STRING_INSTALLCREATEPARTITION, " ENTER = Installieren C = Partition erstellen F3 = Beenden"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Installieren D = Partition l”schen F3 = Beenden"}, {STRING_PARTITIONSIZE, "Gr”áe der neuen Partition:"}, - {STRING_PLEASEWAIT, - " Bitte warten..."}, {STRING_CHOOSENEWPARTITION, "Sie haben beschlossen eine neue Partition zu erstellen auf"}, + {STRING_HDDSIZE, + "Bitte geben Sie die Gr”áe der neuen Partition in Megabyte ein."}, {STRING_CREATEPARTITION, " ENTER = Partition erstellen ESC = Abbruch F3 = Beenden"}, + {STRING_PARTFORMAT, + "Diese Partition wird als n„chstes formatiert."}, + {STRING_NONFORMATTEDPART, + "Sie wollen ReactOS auf einer neuen/unformatieren Partition installieren."}, + {STRING_INSTALLONPART, + "Setup installiert ReactOS auf diese Partition"}, + {STRING_CHECKINGPART, + "Setup berprft die ausgew„hlte Partition."}, + {STRING_QUITCONTINUE, + "F3 = Beenden ENTER = Fortsetzen"}, + {STRING_REBOOTCOMPUTER, + "ENTER = Computer neustarten"}, + {STRING_TXTSETUPFAILED, + "Setup konnte die '%S' Sektion\nin TXTSETUP.SIF nicht finden.\n"}, {STRING_COPYING, " \xB3 Kopiere Datei: %S"}, {STRING_SETUPCOPYINGFILES, "Setup kopiert Dateien..."}, {STRING_PAGEDMEM, - "Paged Memory"}, + "Ausgel. Speicher"}, {STRING_NONPAGEDMEM, - "Nonpaged Memory"}, + "Nicht ausgel. Speicher"}, {STRING_FREEMEM, - "Free Memory"}, + "Freier Speicher"}, + {STRING_REGHIVEUPDATE, + " Registry hives werden aktualisiert..."}, + {STRING_IMPORTFILE, + " Importiere %S..."}, + {STRING_DISPLAYETTINGSUPDATE, + " Bildschirm-Registryeinstellungen werden aktualisiert..."}, + {STRING_LOCALESETTINGSUPDATE, + " Lokalisierungseinstellungen werden aktualisiert..."}, + {STRING_KEYBOARDSETTINGSUPDATE, + " Tastaturlayout Einstellungen werden aktualisiert..."}, + {STRING_CODEPAGEINFOUPDATE, + " Codepage Informationen werden hinzugefgt..."}, + {STRING_DONE, + " Fertig..."}, + {STRING_REBOOTCOMPUTER2, + " ENTER = Computer neustarten"}, + {STRING_CONSOLEFAIL1, + "Konsole konnte nicht ge”ffnet werden\n\n"}, + {STRING_CONSOLEFAIL2, + "Der h„ufigste Grund hierfr ist die Verwendung einer USB Tastautur\n"}, + {STRING_CONSOLEFAIL3, + "USB Tastaturen werden noch nicht vollst„ndig untersttzt\n"}, + {STRING_FORMATTINGDISK, + "Setup formatiert Ihre Festplatte"}, + {STRING_CHECKINGDISK, + "Setup überprüft Ihre Festplatte"}, + {STRING_FORMATDISK1, + " Formatiere Partition als %S Dateisystem (Schnell) "}, + {STRING_FORMATDISK2, + " Formatiere Partition als %S Dateisystem "}, {0, 0} }; diff --git a/reactos/base/setup/usetup/lang/en-US.h b/reactos/base/setup/usetup/lang/en-US.h index e7a6b64cb70..9be8504dd00 100644 --- a/reactos/base/setup/usetup/lang/en-US.h +++ b/reactos/base/setup/usetup/lang/en-US.h @@ -1570,18 +1570,34 @@ MUI_PAGE enUSPages[] = MUI_STRING enUSStrings[] = { + {STRING_PLEASEWAIT, + " Please wait..."}, {STRING_INSTALLCREATEPARTITION, " ENTER = Install C = Create Partition F3 = Quit"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Install D = Delete Partition F3 = Quit"}, {STRING_PARTITIONSIZE, "Size of new partition:"}, - {STRING_PLEASEWAIT, - " Please wait..."}, {STRING_CHOOSENEWPARTITION, "You have chosen to create a new partition on"}, + {STRING_HDDSIZE, + "Please enter the size of the new partition in megabytes."}, {STRING_CREATEPARTITION, " ENTER = Create Partition ESC = Cancel F3 = Quit"}, + {STRING_PARTFORMAT, + "This Partition will be formatted next."}, + {STRING_NONFORMATTEDPART, + "You chose to install ReactOS on a new or unformatted Partition."}, + {STRING_INSTALLONPART, + "Setup install ReactOS onto Partition"}, + {STRING_CHECKINGPART, + "Setup is now checking the selected partition."}, + {STRING_QUITCONTINUE, + "F3= Quit ENTER = Continue"}, + {STRING_REBOOTCOMPUTER, + "ENTER = Reboot computer"}, + {STRING_TXTSETUPFAILED, + "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, " \xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, @@ -1592,6 +1608,36 @@ MUI_STRING enUSStrings[] = "Nonpaged Memory"}, {STRING_FREEMEM, "Free Memory"}, + {STRING_REGHIVEUPDATE, + " Updating registry hives..."}, + {STRING_IMPORTFILE, + " Importing %S..."}, + {STRING_DISPLAYETTINGSUPDATE, + " Updating display registry settings..."}, + {STRING_LOCALESETTINGSUPDATE, + " Updating locale settings..."}, + {STRING_KEYBOARDSETTINGSUPDATE, + " Updating keyboard layout settings..."}, + {STRING_CODEPAGEINFOUPDATE, + " Adding codepage information to registry..."}, + {STRING_DONE, + " Done..."}, + {STRING_REBOOTCOMPUTER2, + " ENTER = Reboot computer"}, + {STRING_CONSOLEFAIL1, + "Unable to open the console\n\n"}, + {STRING_CONSOLEFAIL2, + "The most common cause of this is using an USB keyboard\n"}, + {STRING_CONSOLEFAIL3, + "USB keyboards are not fully supported yet\n"}, + {STRING_FORMATTINGDISK, + "Setup is formatting your disk"}, + {STRING_CHECKINGDISK, + "Setup is checking your disk"}, + {STRING_FORMATDISK1, + " Format partition as %S file system (quick format) "}, + {STRING_FORMATDISK2, + " Format partition as %S file system "}, {0, 0} }; diff --git a/reactos/base/setup/usetup/lang/fr-FR.h b/reactos/base/setup/usetup/lang/fr-FR.h index 276e55fb1ab..5afec85fb27 100644 --- a/reactos/base/setup/usetup/lang/fr-FR.h +++ b/reactos/base/setup/usetup/lang/fr-FR.h @@ -1582,18 +1582,34 @@ MUI_PAGE frFRPages[] = MUI_STRING frFRStrings[] = { + {STRING_PLEASEWAIT, + " Veuillez patienter..."}, {STRING_INSTALLCREATEPARTITION, " ENTER = Installer C = Créer Partition F3 = Quitter"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Installer D = Supprimer Partition F3 = Quitter"}, {STRING_PARTITIONSIZE, "Taille de la nouvelle partition :"}, - {STRING_PLEASEWAIT, - " Veuillez patienter..."}, {STRING_CHOOSENEWPARTITION, "Vous avez choisi de créer une nouvelle partition sur"}, + {STRING_HDDSIZE, + "Please enter the size of the new partition in megabytes."}, {STRING_CREATEPARTITION, " ENTER = Créer Partition ESC = Annuler F3 = Quitter"}, + {STRING_PARTFORMAT, + "This Partition will be formatted next."}, + {STRING_NONFORMATTEDPART, + "You chose to install ReactOS on a new or unformatted Partition."}, + {STRING_INSTALLONPART, + "Setup install ReactOS onto Partition"}, + {STRING_CHECKINGPART, + "Setup is now checking the selected partition."}, + {STRING_QUITCONTINUE, + "F3= Quit ENTER = Continue"}, + {STRING_REBOOTCOMPUTER, + "ENTER = Reboot computer"}, + {STRING_TXTSETUPFAILED, + "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, " \xB3 Copie du fichier: %S"}, {STRING_SETUPCOPYINGFILES, @@ -1604,6 +1620,36 @@ MUI_STRING frFRStrings[] = "Mémoire non paginée"}, {STRING_FREEMEM, "Mémoire libre"}, + {STRING_REGHIVEUPDATE, + " Updating registry hives..."}, + {STRING_IMPORTFILE, + " Importing %S..."}, + {STRING_DISPLAYETTINGSUPDATE, + " Updating display registry settings..."}, + {STRING_LOCALESETTINGSUPDATE, + " Updating locale settings..."}, + {STRING_KEYBOARDSETTINGSUPDATE, + " Updating keyboard layout settings..."}, + {STRING_CODEPAGEINFOUPDATE, + " Adding codepage information to registry..."}, + {STRING_DONE, + " Done..."}, + {STRING_REBOOTCOMPUTER2, + " ENTER = Reboot computer"}, + {STRING_CONSOLEFAIL1, + "Unable to open the console\n\n"}, + {STRING_CONSOLEFAIL2, + "The most common cause of this is using an USB keyboard\n"}, + {STRING_CONSOLEFAIL3, + "USB keyboards are not fully supported yet\n"}, + {STRING_FORMATTINGDISK, + "Setup is formatting your disk"}, + {STRING_CHECKINGDISK, + "Setup is checking your disk"}, + {STRING_FORMATDISK1, + " Format partition as %S file system (quick format) "}, + {STRING_FORMATDISK2, + " Format partition as %S file system "}, {0, 0} }; diff --git a/reactos/base/setup/usetup/lang/pl-PL.h b/reactos/base/setup/usetup/lang/pl-PL.h index 4bd32f6083c..5d36ada499f 100644 --- a/reactos/base/setup/usetup/lang/pl-PL.h +++ b/reactos/base/setup/usetup/lang/pl-PL.h @@ -1578,18 +1578,34 @@ MUI_PAGE plPLPages[] = MUI_STRING plPLStrings[] = { + {STRING_PLEASEWAIT, + " Prosz© czeka†..."}, {STRING_INSTALLCREATEPARTITION, " ENTER = Instalacja C = Utworzenie Partycji F3 = Wyj˜cie"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Instalacja D = Skasowanie Partycji F3 = Wyj˜cie"}, {STRING_PARTITIONSIZE, "Rozmiar nowej partycji:"}, - {STRING_PLEASEWAIT, - " Prosz© czeka†..."}, {STRING_CHOOSENEWPARTITION, "Wybrane: utworzenie nowej partycji na"}, + {STRING_HDDSIZE, + "Please enter the size of the new partition in megabytes."}, {STRING_CREATEPARTITION, " ENTER = Utworzenie Partycji ESC = Anulowanie F3 = Wyj˜cie"}, + {STRING_PARTFORMAT, + "This Partition will be formatted next."}, + {STRING_NONFORMATTEDPART, + "You chose to install ReactOS on a new or unformatted Partition."}, + {STRING_INSTALLONPART, + "Setup install ReactOS onto Partition"}, + {STRING_CHECKINGPART, + "Setup is now checking the selected partition."}, + {STRING_QUITCONTINUE, + "F3= Quit ENTER = Continue"}, + {STRING_REBOOTCOMPUTER, + "ENTER = Reboot computer"}, + {STRING_TXTSETUPFAILED, + "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, " \xB3 Kopiowanie plik¢w: %S"}, {STRING_SETUPCOPYINGFILES, @@ -1600,6 +1616,36 @@ MUI_STRING plPLStrings[] = "Niestronicowanej"}, {STRING_FREEMEM, "Dost©pnej"}, + {STRING_REGHIVEUPDATE, + " Updating registry hives..."}, + {STRING_IMPORTFILE, + " Importing %S..."}, + {STRING_DISPLAYETTINGSUPDATE, + " Updating display registry settings..."}, + {STRING_LOCALESETTINGSUPDATE, + " Updating locale settings..."}, + {STRING_KEYBOARDSETTINGSUPDATE, + " Updating keyboard layout settings..."}, + {STRING_CODEPAGEINFOUPDATE, + " Adding codepage information to registry..."}, + {STRING_DONE, + " Done..."}, + {STRING_REBOOTCOMPUTER2, + " ENTER = Reboot computer"}, + {STRING_CONSOLEFAIL1, + "Unable to open the console\n\n"}, + {STRING_CONSOLEFAIL2, + "The most common cause of this is using an USB keyboard\n"}, + {STRING_CONSOLEFAIL3, + "USB keyboards are not fully supported yet\n"}, + {STRING_FORMATTINGDISK, + "Setup is formatting your disk"}, + {STRING_CHECKINGDISK, + "Setup is checking your disk"}, + {STRING_FORMATDISK1, + " Format partition as %S file system (quick format) "}, + {STRING_FORMATDISK2, + " Format partition as %S file system "}, {0, 0} }; diff --git a/reactos/base/setup/usetup/lang/ru-RU.h b/reactos/base/setup/usetup/lang/ru-RU.h index 62e5bfe3e42..ca797f990de 100644 --- a/reactos/base/setup/usetup/lang/ru-RU.h +++ b/reactos/base/setup/usetup/lang/ru-RU.h @@ -1570,18 +1570,34 @@ MUI_PAGE ruRUPages[] = MUI_STRING ruRUStrings[] = { + {STRING_PLEASEWAIT, + " ®¦ «ã©áâ , ¯®¤®¦¤¨â¥..."}, {STRING_INSTALLCREATEPARTITION, " ENTER = “áâ ­®¢¨âì C = ‘®§¤ âì à §¤¥« F3 = ‚ë室"}, {STRING_INSTALLDELETEPARTITION, " ENTER = “áâ ­®¢¨âì D = “¤ «¨âì à §¤¥« F3 = ‚ë室"}, {STRING_PARTITIONSIZE, " §¬¥à ­®¢®£® à §¤¥« :"}, - {STRING_PLEASEWAIT, - " ®¦ «ã©áâ , ¯®¤®¦¤¨â¥..."}, {STRING_CHOOSENEWPARTITION, "‚ë å®â¨â¥ ᮧ¤ âì ­®¢ë© à §¤¥« ­ "}, + {STRING_HDDSIZE, + "Please enter the size of the new partition in megabytes."}, {STRING_CREATEPARTITION, " ENTER = ‘®§¤ âì à §¤¥« ESC = Žâ¬¥­  F3 = ‚ë室"}, + {STRING_PARTFORMAT, + "This Partition will be formatted next."}, + {STRING_NONFORMATTEDPART, + "You chose to install ReactOS on a new or unformatted Partition."}, + {STRING_INSTALLONPART, + "Setup install ReactOS onto Partition"}, + {STRING_CHECKINGPART, + "Setup is now checking the selected partition."}, + {STRING_QUITCONTINUE, + "F3= Quit ENTER = Continue"}, + {STRING_REBOOTCOMPUTER, + "ENTER = Reboot computer"}, + {STRING_TXTSETUPFAILED, + "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, " \xB3 Š®¯¨à®¢ ­¨¥: %S"}, {STRING_SETUPCOPYINGFILES, @@ -1592,6 +1608,36 @@ MUI_STRING ruRUStrings[] = " ¥áâà ­¨ç­ ï"}, {STRING_FREEMEM, "‘¢®¡®¤­ ï ¯ ¬ïâì"}, + {STRING_REGHIVEUPDATE, + " Updating registry hives..."}, + {STRING_IMPORTFILE, + " Importing %S..."}, + {STRING_DISPLAYETTINGSUPDATE, + " Updating display registry settings..."}, + {STRING_LOCALESETTINGSUPDATE, + " Updating locale settings..."}, + {STRING_KEYBOARDSETTINGSUPDATE, + " Updating keyboard layout settings..."}, + {STRING_CODEPAGEINFOUPDATE, + " Adding codepage information to registry..."}, + {STRING_DONE, + " Done..."}, + {STRING_REBOOTCOMPUTER2, + " ENTER = Reboot computer"}, + {STRING_CONSOLEFAIL1, + "Unable to open the console\n\n"}, + {STRING_CONSOLEFAIL2, + "The most common cause of this is using an USB keyboard\n"}, + {STRING_CONSOLEFAIL3, + "USB keyboards are not fully supported yet\n"}, + {STRING_FORMATTINGDISK, + "Setup is formatting your disk"}, + {STRING_CHECKINGDISK, + "Setup is checking your disk"}, + {STRING_FORMATDISK1, + " Format partition as %S file system (quick format) "}, + {STRING_FORMATDISK2, + " Format partition as %S file system "}, {0, 0} }; diff --git a/reactos/base/setup/usetup/lang/sk-SK.h b/reactos/base/setup/usetup/lang/sk-SK.h index 05e587c5c11..857a75fbae5 100644 --- a/reactos/base/setup/usetup/lang/sk-SK.h +++ b/reactos/base/setup/usetup/lang/sk-SK.h @@ -1575,18 +1575,34 @@ MUI_PAGE skSKPages[] = MUI_STRING skSKStrings[] = { + {STRING_PLEASEWAIT, + " PoŸkajte, pros¡m ..."}, {STRING_INSTALLCREATEPARTITION, " ENTER = Inçtalovaœ C = Vytvoriœ oblasœ F3 = SkonŸiœ"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Inçtalovaœ D = Odstr niœ oblasœ F3 = SkonŸiœ"}, {STRING_PARTITIONSIZE, "Ve–kosœ novej oblasti:"}, - {STRING_PLEASEWAIT, - " PoŸkajte, pros¡m ..."}, {STRING_CHOOSENEWPARTITION, "Zvolili Ste vytvorenie novej oblasti na"}, + {STRING_HDDSIZE, + "Please enter the size of the new partition in megabytes."}, {STRING_CREATEPARTITION, " ENTER = Vytvoriœ oblasœ ESC = Zruçiœ F3 = SkonŸiœ"}, + {STRING_PARTFORMAT, + "This Partition will be formatted next."}, + {STRING_NONFORMATTEDPART, + "You chose to install ReactOS on a new or unformatted Partition."}, + {STRING_INSTALLONPART, + "Setup install ReactOS onto Partition"}, + {STRING_CHECKINGPART, + "Setup is now checking the selected partition."}, + {STRING_QUITCONTINUE, + "F3= Quit ENTER = Continue"}, + {STRING_REBOOTCOMPUTER, + "ENTER = Reboot computer"}, + {STRING_TXTSETUPFAILED, + "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, " \xB3 Kop¡ruje sa s£bor: %S"}, {STRING_SETUPCOPYINGFILES, @@ -1597,6 +1613,36 @@ MUI_STRING skSKStrings[] = "Nestr nkovan  pam„œ"}, {STRING_FREEMEM, "Vo–n  pam„œ"}, + {STRING_REGHIVEUPDATE, + " Updating registry hives..."}, + {STRING_IMPORTFILE, + " Importing %S..."}, + {STRING_DISPLAYETTINGSUPDATE, + " Updating display registry settings..."}, + {STRING_LOCALESETTINGSUPDATE, + " Updating locale settings..."}, + {STRING_KEYBOARDSETTINGSUPDATE, + " Updating keyboard layout settings..."}, + {STRING_CODEPAGEINFOUPDATE, + " Adding codepage information to registry..."}, + {STRING_DONE, + " Done..."}, + {STRING_REBOOTCOMPUTER2, + " ENTER = Reboot computer"}, + {STRING_CONSOLEFAIL1, + "Unable to open the console\n\n"}, + {STRING_CONSOLEFAIL2, + "The most common cause of this is using an USB keyboard\n"}, + {STRING_CONSOLEFAIL3, + "USB keyboards are not fully supported yet\n"}, + {STRING_FORMATTINGDISK, + "Setup is formatting your disk"}, + {STRING_CHECKINGDISK, + "Setup is checking your disk"}, + {STRING_FORMATDISK1, + " Format partition as %S file system (quick format) "}, + {STRING_FORMATDISK2, + " Format partition as %S file system "}, {0, 0} }; diff --git a/reactos/base/setup/usetup/mui.c b/reactos/base/setup/usetup/mui.c index 4ec4d77a801..3266e2af10c 100644 --- a/reactos/base/setup/usetup/mui.c +++ b/reactos/base/setup/usetup/mui.c @@ -84,6 +84,31 @@ PopupError(IN PCCH Text, IN PINPUT_RECORD Ir, IN ULONG WaitEvent); +static +ULONG +FindLanguageIndex() +{ + ULONG lngIndex = 0; + + if (SelectedLanguageId == NULL) + { + return -1; + } + + do + { + if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) + { + return lngIndex; + } + + lngIndex++; + }while (LanguageList[lngIndex].MuiPages != NULL); + + return -1; +} + + static const MUI_ENTRY * FindMUIEntriesOfPage(IN ULONG PageNumber) @@ -145,6 +170,15 @@ const MUI_STRING * FindMUIStringEntries(VOID) { ULONG lngIndex = 0; + + if (SelectedLanguageId == NULL) + { + /* language has not yet been selected + * default to english + */ + ASSERT(!_wcsicmp(LanguageList[lngIndex].LanguageDescriptor, L"English")); + return LanguageList[lngIndex].MuiStrings; + } do { @@ -261,6 +295,7 @@ MUIGetString(ULONG Number) { ULONG i; const MUI_STRING * entry; + CHAR szErr[100]; entry = FindMUIStringEntries(); if (entry) @@ -274,7 +309,9 @@ MUIGetString(ULONG Number) } } - PopupError("Error: Failed to find translated string", + sprintf(szErr, "Error: failed find string id %lu for language index %lu\n", Number, FindLanguageIndex()); + + PopupError(szErr, NULL, NULL, POPUP_WAIT_NONE); diff --git a/reactos/base/setup/usetup/mui.h b/reactos/base/setup/usetup/mui.h index cfe87aefcac..fc823bc860f 100644 --- a/reactos/base/setup/usetup/mui.h +++ b/reactos/base/setup/usetup/mui.h @@ -69,17 +69,39 @@ SetConsoleCodePage(VOID); LPSTR MUIGetString(ULONG Number); -#define STRING_INSTALLCREATEPARTITION 1 -#define STRING_INSTALLDELETEPARTITION 2 -#define STRING_CREATEPARTITION 3 +#define STRING_PLEASEWAIT 1 +#define STRING_INSTALLCREATEPARTITION 2 +#define STRING_INSTALLDELETEPARTITION 3 #define STRING_PARTITIONSIZE 4 -#define STRING_PLEASEWAIT 5 -#define STRING_CHOOSENEWPARTITION 6 -#define STRING_COPYING 7 -#define STRING_SETUPCOPYINGFILES 8 -#define STRING_PAGEDMEM 9 -#define STRING_NONPAGEDMEM 10 -#define STRING_FREEMEM 11 - +#define STRING_CHOOSENEWPARTITION 5 +#define STRING_HDDSIZE 6 +#define STRING_CREATEPARTITION 7 +#define STRING_PARTFORMAT 8 +#define STRING_NONFORMATTEDPART 9 +#define STRING_INSTALLONPART 10 +#define STRING_CHECKINGPART 11 +#define STRING_QUITCONTINUE 12 +#define STRING_REBOOTCOMPUTER 13 +#define STRING_TXTSETUPFAILED 14 +#define STRING_COPYING 15 +#define STRING_SETUPCOPYINGFILES 16 +#define STRING_PAGEDMEM 17 +#define STRING_NONPAGEDMEM 18 +#define STRING_FREEMEM 19 +#define STRING_REGHIVEUPDATE 20 +#define STRING_IMPORTFILE 21 +#define STRING_DISPLAYETTINGSUPDATE 22 +#define STRING_LOCALESETTINGSUPDATE 23 +#define STRING_KEYBOARDSETTINGSUPDATE 24 +#define STRING_CODEPAGEINFOUPDATE 25 +#define STRING_DONE 26 +#define STRING_REBOOTCOMPUTER2 27 +#define STRING_CONSOLEFAIL1 28 +#define STRING_CONSOLEFAIL2 29 +#define STRING_CONSOLEFAIL3 30 +#define STRING_FORMATTINGDISK 31 +#define STRING_CHECKINGDISK 32 +#define STRING_FORMATDISK1 33 +#define STRING_FORMATDISK2 34 #endif