[hbelusca] 74548: [USETUP]: Replace the temporary "repair" installation page by an upgrade/repair page. This is work-in-progress, so the translations are all in english.
Author: hbelusca Date: Mon May 15 01:48:19 2017 New Revision: 74548
URL: http://svn.reactos.org/svn/reactos?rev=74548&view=rev Log: [USETUP]: Replace the temporary "repair" installation page by an upgrade/repair page. This is work-in-progress, so the translations are all in english.
Modified: branches/setup_improvements/base/setup/usetup/lang/bg-BG.h branches/setup_improvements/base/setup/usetup/lang/bn-BD.h branches/setup_improvements/base/setup/usetup/lang/cs-CZ.h branches/setup_improvements/base/setup/usetup/lang/da-DK.h branches/setup_improvements/base/setup/usetup/lang/de-DE.h branches/setup_improvements/base/setup/usetup/lang/el-GR.h branches/setup_improvements/base/setup/usetup/lang/en-US.h branches/setup_improvements/base/setup/usetup/lang/es-ES.h branches/setup_improvements/base/setup/usetup/lang/et-EE.h branches/setup_improvements/base/setup/usetup/lang/fr-FR.h branches/setup_improvements/base/setup/usetup/lang/he-IL.h branches/setup_improvements/base/setup/usetup/lang/it-IT.h branches/setup_improvements/base/setup/usetup/lang/ja-JP.h branches/setup_improvements/base/setup/usetup/lang/lt-LT.h branches/setup_improvements/base/setup/usetup/lang/ms-MY.h branches/setup_improvements/base/setup/usetup/lang/nl-NL.h branches/setup_improvements/base/setup/usetup/lang/pl-PL.h branches/setup_improvements/base/setup/usetup/lang/pt-BR.h branches/setup_improvements/base/setup/usetup/lang/ro-RO.h branches/setup_improvements/base/setup/usetup/lang/ru-RU.h branches/setup_improvements/base/setup/usetup/lang/sk-SK.h branches/setup_improvements/base/setup/usetup/lang/sq-AL.h branches/setup_improvements/base/setup/usetup/lang/sv-SE.h branches/setup_improvements/base/setup/usetup/lang/tr-TR.h branches/setup_improvements/base/setup/usetup/lang/uk-UA.h branches/setup_improvements/base/setup/usetup/usetup.h
Modified: branches/setup_improvements/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Mon May 15 01:48:19 2017 @@ -90,7 +90,7 @@ { 8, 17, - "\x07 â¨á¥â¥ R § ¯®¯à ¢ª ¥ ªâ.", + "\x07 Press R to repair a ReactOS installation using the Recovery Console.", TEXT_STYLE_NORMAL }, { @@ -418,7 +418,7 @@ } };
-static MUI_ENTRY bgBGRepairPageEntries[] = +static MUI_ENTRY bgBGUpgradePageEntries[] = { { 4, @@ -429,50 +429,56 @@ { 6, 8, - " áâன¢ çêâ ¥ ªâ ¥ ¢ à á⥯¥ à §à ¡®âª . ᥠ®é¥", + "The ReactOS Setup can upgrade one of the available ReactOS installations", TEXT_STYLE_NORMAL }, { 6, 9, - "ï¬ ¢á¨çª¨ ¢ê§¬®¦®á⨠¯ê«® ¨§¯®«§¢ ¥¬® áâன¢ é® ¯à¨«®¦¥¨¥.", + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", TEXT_STYLE_NORMAL }, { 6, 12, - "ꧬ®¦®áââ § ¯®¯à ¢ª ®é¥ ¥ ¥ £®â®¢ .", - TEXT_STYLE_NORMAL + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT }, { 8, 15, - "\x07 â¨á¥â¥ U § ®¡®¢ï¢ ¥ ®¯¥à 樮 â á¨á⥬ .", + "\x07 Press UP or DOWN to select an OS installation.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 â¨á¥â¥ R § ¢ê§áâ ®¢ï¢ é á। (ª®§®« ).", + "\x07 Press U for upgrading the selected OS installation.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 âᨥ⥠ESC § ¢àêé ¥ ªê¬ £« ¢ â áâà ¨æ .", + "\x07 Press ESC to continue a new installation without upgrading.", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 â¨á¥â¥ ENTER § ¯à¥§ ¯ã᪠ª®¬¯îâêà .", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " ESC = « ¢ áâà ¨æ ENTER = १ ¯ãáª", - TEXT_TYPE_STATUS + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1623,7 +1629,7 @@ bgBGLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, bgBGWelcomePageEntries }, { @@ -1639,8 +1645,8 @@ bgBGDevicePageEntries }, { - REPAIR_INTRO_PAGE, - bgBGRepairPageEntries + UPGRADE_REPAIR_PAGE, + bgBGUpgradePageEntries }, { COMPUTER_SETTINGS_PAGE,
Modified: branches/setup_improvements/base/setup/usetup/lang/bn-BD.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/bn-BD.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/bn-BD.h [iso-8859-1] Mon May 15 01:48:19 2017 @@ -87,7 +87,7 @@ { 8, 17, - "\x07 Press R to repair or update ReactOS.", + "\x07 Press R to repair a ReactOS installation using the Recovery Console.", TEXT_STYLE_NORMAL }, { @@ -409,60 +409,66 @@ } };
-static MUI_ENTRY bnBDRepairPageEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "ReactOS Setup is in an early development phase. It does not yet", +static MUI_ENTRY bnBDUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", TEXT_STYLE_NORMAL }, { 6, 9, - "support all the functions of a fully usable setup application.", + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", TEXT_STYLE_NORMAL }, { 6, 12, - "The repair functions are not implemented yet.", - TEXT_STYLE_NORMAL + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT }, { 8, 15, - "\x07 Press U for Updating OS.", + "\x07 Press UP or DOWN to select an OS installation.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Press R for the Recovery Console.", + "\x07 Press U for upgrading the selected OS installation.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Press ESC to return to the main page.", + "\x07 Press ESC to continue a new installation without upgrading.", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Press ENTER to reboot your computer.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ESC = Main page U = Update R = Recovery ENTER = Reboot", + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1610,7 +1616,7 @@ bnBDLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, bnBDWelcomePageEntries }, { @@ -1626,8 +1632,8 @@ bnBDDevicePageEntries }, { - REPAIR_INTRO_PAGE, - bnBDRepairPageEntries + UPGRADE_REPAIR_PAGE, + bnBDUpgradePageEntries }, { COMPUTER_SETTINGS_PAGE,
Modified: branches/setup_improvements/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Mon May 15 01:48:19 2017 @@ -95,7 +95,7 @@ { 8, 17, - "\x07 Stisknut¡m R zah j¡te opravu nebo aktualizaci ReactOS.", + "\x07 Press R to repair a ReactOS installation using the Recovery Console.", TEXT_STYLE_NORMAL }, { @@ -417,60 +417,66 @@ } };
-static MUI_ENTRY csCZRepairPageEntries[] = -{ - { - 4, - 3, - " Instalace ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "Instalace ReactOS je v ran vìvojov f zi. Zat¡m nejsou", +static MUI_ENTRY csCZUpgradePageEntries[] = +{ + { + 4, + 3, + " Instalace ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", TEXT_STYLE_NORMAL }, { 6, 9, - "podporov ny vçechny funkce plnØ pou§iteln instalan¡ aplikace.", + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", TEXT_STYLE_NORMAL }, { 6, 12, - "Opravn funkce zat¡m nejsou implementov ny.", - TEXT_STYLE_NORMAL + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT }, { 8, 15, - "\x07 Stisknut¡m U zah j¡te Update systmu.", + "\x07 Press UP or DOWN to select an OS installation.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Stisknut¡m R spust¡te Konzoli obnoven¡.", + "\x07 Press U for upgrading the selected OS installation.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Stisknut¡m ESC se vr t¡te na hlavn¡ str nku.", + "\x07 Press ESC to continue a new installation without upgrading.", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Stisknut¡m kl vesy ENTER restartujete po¡ta.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ESC = Hlavn¡ str nka U = Aktualizovat R = Z chrana ENTER = Restartovat", + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1618,7 +1624,7 @@ csCZLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, csCZWelcomePageEntries }, { @@ -1634,8 +1640,8 @@ csCZDevicePageEntries }, { - REPAIR_INTRO_PAGE, - csCZRepairPageEntries + UPGRADE_REPAIR_PAGE, + csCZUpgradePageEntries }, { COMPUTER_SETTINGS_PAGE,
Modified: branches/setup_improvements/base/setup/usetup/lang/da-DK.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/da-DK.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/da-DK.h [iso-8859-1] Mon May 15 01:48:19 2017 @@ -87,7 +87,7 @@ { 8, 17, - "\x07 Tryk p R reparere eller opdatere ReactOS.", + "\x07 Press R to repair a ReactOS installation using the Recovery Console.", TEXT_STYLE_NORMAL }, { @@ -148,7 +148,7 @@ "understtter den ikke alle funtionerne i et fult brugbart", TEXT_STYLE_NORMAL }, - { + { 6, 10, "installationsprogram.", @@ -415,75 +415,76 @@ } };
-static MUI_ENTRY daDKRepairPageEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " installationen ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "ReactOS installationen er i en tilelig udviklingsfase. Derfor", +static MUI_ENTRY daDKUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " installationen ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", TEXT_STYLE_NORMAL }, { 6, 9, - "understtter den ikke alle funtionerne i et fult brugbart", - TEXT_STYLE_NORMAL - }, - { - 6, - 10, - "installationsprogram.", + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", TEXT_STYLE_NORMAL }, { 6, 12, - "Funktionerne til reperation er endnu ikke blevet implementeret.", - TEXT_STYLE_NORMAL + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT }, { 8, 15, - "\x07 Tryk p U for opdatere OS'et.", + "\x07 Press UP or DOWN to select an OS installation.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Tryk p R for at starte gendannelskonsollen.", + "\x07 Press U for upgrading the selected OS installation.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Tryk p ESC for at vende tilbage til hovedskrmen.", + "\x07 Press ESC to continue a new installation without upgrading.", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Tryk p ENTER for at genstart din computer.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ESC = Hovedskrm U = Opdater R = Gendan ENTER = Genstart", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG - }, - { - 0, - 0, - NULL, - 0 - } -}; + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY daDKComputerPageEntries[] = { { @@ -930,7 +931,6 @@ 0 } }; -
static MUI_ENTRY daDKFormatPartitionEntries[] = { @@ -1630,7 +1630,7 @@ daDKLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, daDKWelcomePageEntries }, { @@ -1646,8 +1646,8 @@ daDKDevicePageEntries }, { - REPAIR_INTRO_PAGE, - daDKRepairPageEntries + UPGRADE_REPAIR_PAGE, + daDKUpgradePageEntries }, { COMPUTER_SETTINGS_PAGE,
Modified: branches/setup_improvements/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/de-DE.h [iso-8859-1] Mon May 15 01:48:19 2017 @@ -88,7 +88,7 @@ { 8, 17, - "\x07 Drcken Sie R, um ReactOS zu reparieren oder aktualisieren.", + "\x07 Press R to repair a ReactOS installation using the Recovery Console.", TEXT_STYLE_NORMAL }, { @@ -410,66 +410,66 @@ } };
-static MUI_ENTRY deDERepairPageEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "Der Installationsassistent ist noch der Entwicklungsphase.", +static MUI_ENTRY deDEUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", TEXT_STYLE_NORMAL }, { 6, 9, - "Er untersttzt noch nicht alle Funktionen eines vollstndig", + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", TEXT_STYLE_NORMAL }, { 6, 12, - "nutzbaren Setups.", - TEXT_STYLE_NORMAL - }, - { - 6, - 14, - "Die Reparaturfunktionen sind noch nicht implementiert.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "\x07 Drcken Sie U, um ReactOS zu aktualisieren.", + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 15, + "\x07 Press UP or DOWN to select an OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press U for upgrading the selected OS installation.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Drcken Sie R, fr die Wiederherstellungskonsole.", - TEXT_STYLE_NORMAL - }, - { - 8, - 20, - "\x07 Drcken Sie ESC, um zur Hauptseite zurckzukehren.", - TEXT_STYLE_NORMAL - }, - { - 8, - 22, - "\x07 Drcken Sie die EINGABETASTE, um den Computer neu zu starten.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ESC = Zurck U = Aktualisieren R = Wiederherst. EINGABETASTE = Neustart", + "\x07 Press ESC to continue a new installation without upgrading.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1614,7 +1614,7 @@ deDELanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, deDEWelcomePageEntries }, { @@ -1630,8 +1630,8 @@ deDEDevicePageEntries }, { - REPAIR_INTRO_PAGE, - deDERepairPageEntries + UPGRADE_REPAIR_PAGE, + deDEUpgradePageEntries }, { COMPUTER_SETTINGS_PAGE,
Modified: branches/setup_improvements/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/el-GR.h [iso-8859-1] Mon May 15 01:48:19 2017 @@ -88,7 +88,7 @@ { 7, 17, - "\x07 «ã©« R ¤ § ¦¨é©« «¦ ReactOS.", + "\x07 Press R to repair a ReactOS installation using the Recovery Console.", TEXT_STYLE_NORMAL }, { @@ -410,61 +410,67 @@ } };
-static MUI_ENTRY elGRRepairPageEntries[] = -{ - { - 4, - 3, - " ¡«á©«© «¦¬ ReactOS " KERNEL_VERSION_STR, - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - " ¡«á©«© «¦¬ ReactOS ¨å©¡« © §¨é £¦ ©«á ¦ ¤á§«¬¥ª ¡ ", +static MUI_ENTRY elGRUpgradePageEntries[] = +{ + { + 4, + 3, + " ¡«á©«© «¦¬ ReactOS " KERNEL_VERSION_STR, + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", TEXT_STYLE_NORMAL }, { 6, 9, - "¤ ¬§¦©«¨å ¡æ£ 梪 « ª ¬¤«æ««ª £ ª §¢ã¨¦¬ª ¡«á©«©ª.", + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", TEXT_STYLE_NORMAL }, { 6, 12, - " ¢ «¦¬¨åª § æ¨à©ª ¤ ⮦¬¤ ¬¢¦§¦ å ¡æ£.", - TEXT_STYLE_NORMAL + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT }, { 8, 15, - "\x07 «ã©« U ¤¤âà© «¦¬ ¢ «¨¦¬¨ ¡¦ç.", + "\x07 Press UP or DOWN to select an OS installation.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 «ã©« R ¤ ¡«¢â©« «¤ ¡¦¤©æ¢ § æ¨à©ª.", + "\x07 Press U for upgrading the selected OS installation.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 «ã©« ESC ¤ § ©«¨â¯« ©«¤ ¡ç¨ ©¢å.", + "\x07 Press ESC to continue a new installation without upgrading.", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 «ã©« ENTER ¤ §¤¡¡ ¤ã©« «¦¤ ¬§¦¢¦ ©«ã.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " ESC = ç¨ ©¢å ENTER = §¤¡¡å¤©", - TEXT_TYPE_STATUS + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1627,7 +1633,7 @@ elGRLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, elGRWelcomePageEntries }, { @@ -1643,8 +1649,8 @@ elGRDevicePageEntries }, { - REPAIR_INTRO_PAGE, - elGRRepairPageEntries + UPGRADE_REPAIR_PAGE, + elGRUpgradePageEntries }, { COMPUTER_SETTINGS_PAGE,
Modified: branches/setup_improvements/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/en-US.h [iso-8859-1] Mon May 15 01:48:19 2017 @@ -81,13 +81,13 @@ { 8, 15, - "\x07 Press ENTER to install ReactOS.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Press R to repair or update ReactOS.", + "\x07 Press R to repair a ReactOS installation using the Recovery Console.", TEXT_STYLE_NORMAL }, { @@ -409,69 +409,76 @@ } };
-static MUI_ENTRY enUSRepairPageEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "ReactOS Setup is in an early development phase. It does not yet", +static MUI_ENTRY enUSUpgradePageEntries[] = // enUSRepairPageEntries +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", TEXT_STYLE_NORMAL }, { 6, 9, - "support all the functions of a fully usable setup application.", + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", TEXT_STYLE_NORMAL }, { 6, 12, - "The repair functions are not implemented yet.", - TEXT_STYLE_NORMAL + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT }, { 8, 15, - "\x07 Press U for Updating OS.", + "\x07 Press UP or DOWN to select an OS installation.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Press R for the Recovery Console.", + "\x07 Press U for upgrading the selected OS installation.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Press ESC to return to the main page.", + "\x07 Press ESC to continue a new installation without upgrading.", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Press ENTER to reboot your computer.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ESC = Main page U = Update R = Recovery ENTER = Reboot", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG - }, - { - 0, - 0, - NULL, - 0 - } -}; + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY enUSComputerPageEntries[] = { { @@ -917,7 +924,6 @@ 0 } }; -
static MUI_ENTRY enUSFormatPartitionEntries[] = { @@ -1610,7 +1616,7 @@ enUSLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, enUSWelcomePageEntries }, { @@ -1626,8 +1632,8 @@ enUSDevicePageEntries }, { - REPAIR_INTRO_PAGE, - enUSRepairPageEntries + UPGRADE_REPAIR_PAGE, + enUSUpgradePageEntries }, { COMPUTER_SETTINGS_PAGE,
Modified: branches/setup_improvements/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/es-ES.h [iso-8859-1] Mon May 15 01:48:19 2017 @@ -90,7 +90,7 @@ { 8, 17, - "\x07 Presione R para reparar ReactOS.", + "\x07 Press R to repair a ReactOS installation using the Recovery Console.", TEXT_STYLE_NORMAL }, { @@ -418,60 +418,66 @@ } };
-static MUI_ENTRY esESRepairPageEntries[] = -{ - { - 4, - 3, - " Instalaci¢n de ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "El instalador de ReactOS se encuentra en una etapa preliminar.", +static MUI_ENTRY esESUpgradePageEntries[] = +{ + { + 4, + 3, + " Instalaci¢n de ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", TEXT_STYLE_NORMAL }, { 6, 9, - "A£n no posee todas las funciones de un instalador.", + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", TEXT_STYLE_NORMAL }, { 6, 12, - "Las funciones de reparaci¢n no han sido a£n implementadas.", - TEXT_STYLE_NORMAL + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT }, { 8, 15, - "\x07 Presione U para actualizar el sistema operativo.", + "\x07 Press UP or DOWN to select an OS installation.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Presione R para la consola de recuperaci¢n.", + "\x07 Press U for upgrading the selected OS installation.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Presione ESC para volver al men£ principal.", + "\x07 Press ESC to continue a new installation without upgrading.", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Presione INTRO para reiniciar su equipo.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ESC = Men£ inicial U = Actualizar R = Recuperar INTRO = Reiniciar", + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1620,7 +1626,7 @@ esESLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, esESWelcomePageEntries }, { @@ -1636,8 +1642,8 @@ esESDevicePageEntries }, { - REPAIR_INTRO_PAGE, - esESRepairPageEntries + UPGRADE_REPAIR_PAGE, + esESUpgradePageEntries }, { COMPUTER_SETTINGS_PAGE,
Modified: branches/setup_improvements/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/et-EE.h [iso-8859-1] Mon May 15 01:48:19 2017 @@ -87,7 +87,7 @@ { 8, 17, - "\x07 Vajuta R, et ReactOSi parandada.", + "\x07 Press R to repair a ReactOS installation using the Recovery Console.", TEXT_STYLE_NORMAL }, { @@ -409,60 +409,66 @@ } };
-static MUI_ENTRY etEERepairPageEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " paigaldamine ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "ReactOSi paigaldusprogramm on varajases arendusfaasis. Praegu ei ole", +static MUI_ENTRY etEEUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " paigaldamine ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", TEXT_STYLE_NORMAL }, { 6, 9, - "veel käik korraliku paigaldusprogrammi funktsioonid toetatud.", + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", TEXT_STYLE_NORMAL }, { 6, 12, - "Parandamine ei ole veel toetatud.", - TEXT_STYLE_NORMAL + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT }, { 8, 15, - "\x07 Vajuta U, et ssteemi uuendada.", + "\x07 Press UP or DOWN to select an OS installation.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Vajuta R, et kasutada taastuskonsooli.", + "\x07 Press U for upgrading the selected OS installation.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Vajuta ESC, et minna tagasi pealehele.", + "\x07 Press ESC to continue a new installation without upgrading.", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Vajuta ENTER, et arvuti taaskivitada.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ESC = Pealeht U = Uuenda R = Taastamine ENTER = Taaskivitus", + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1608,7 +1614,7 @@ etEELanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, etEEWelcomePageEntries }, { @@ -1624,8 +1630,8 @@ etEEDevicePageEntries }, { - REPAIR_INTRO_PAGE, - etEERepairPageEntries + UPGRADE_REPAIR_PAGE, + etEEUpgradePageEntries }, { COMPUTER_SETTINGS_PAGE,
Modified: branches/setup_improvements/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Mon May 15 01:48:19 2017 @@ -88,7 +88,7 @@ { 8, 17, - "\x07 Appuyer sur R pour rparer ReactOS.", + "\x07 Press R to repair a ReactOS installation using the Recovery Console.", TEXT_STYLE_NORMAL }, { @@ -416,66 +416,66 @@ } };
-static MUI_ENTRY frFRRepairPageEntries[] = -{ - { - 4, - 3, - " Installation de ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "L'installation de ReactOS est en phase de dveloppement.", +static MUI_ENTRY frFRUpgradePageEntries[] = +{ + { + 4, + 3, + " Installation de ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", TEXT_STYLE_NORMAL }, { 6, 9, - "Elle ne supporte pas encore toutes les fonctions d'une application", - TEXT_STYLE_NORMAL - }, - { - 6, - 10, - "d'installation entirement utilisable.", + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", TEXT_STYLE_NORMAL }, { 6, 12, - "Les fonctions de rparation ne sont pas implmentes pour l'instant.", - TEXT_STYLE_NORMAL + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT }, { 8, 15, - "\x07 Appuyer sur U pour mettre jour l'OS.", + "\x07 Press UP or DOWN to select an OS installation.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Appuyer sur R pour la Console de Rparation.", + "\x07 Press U for upgrading the selected OS installation.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Appuyer sur CHAP pour retourner la page principale.", + "\x07 Press ESC to continue a new installation without upgrading.", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Appuyer sur ENTRE pour redmarrer votre ordinateur.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "CHAP = Page principale ENTRE = Redmarrer", + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1635,7 +1635,7 @@ frFRLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, frFRWelcomePageEntries }, { @@ -1651,8 +1651,8 @@ frFRDevicePageEntries }, { - REPAIR_INTRO_PAGE, - frFRRepairPageEntries + UPGRADE_REPAIR_PAGE, + frFRUpgradePageEntries }, { COMPUTER_SETTINGS_PAGE,
Modified: branches/setup_improvements/base/setup/usetup/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/he-IL.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/he-IL.h [iso-8859-1] Mon May 15 01:48:19 2017 @@ -88,7 +88,7 @@ { 8, 17, - "\x07 .ReactOS R ", + "\x07 Press R to repair a ReactOS installation using the Recovery Console.", TEXT_STYLE_NORMAL }, { @@ -410,7 +410,7 @@ } };
-static MUI_ENTRY heILRepairPageEntries[] = +static MUI_ENTRY heILUpgradePageEntries[] = { { 4, @@ -421,49 +421,55 @@ { 6, 8, - "ReactOS Setup is in an early development phase. It does not yet", + "The ReactOS Setup can upgrade one of the available ReactOS installations", TEXT_STYLE_NORMAL }, { 6, 9, - "support all the functions of a fully usable setup application.", + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", TEXT_STYLE_NORMAL }, { 6, 12, - "The repair functions are not implemented yet.", - TEXT_STYLE_NORMAL + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT }, { 8, 15, - "\x07 Press U for Updating OS.", + "\x07 Press UP or DOWN to select an OS installation.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Press R for the Recovery Console.", + "\x07 Press U for upgrading the selected OS installation.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Press ESC to return to the main page.", + "\x07 Press ESC to continue a new installation without upgrading.", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Press ENTER to reboot your computer.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ESC = U = R = ENTER = ", + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1611,7 +1617,7 @@ heILLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, heILWelcomePageEntries }, { @@ -1627,8 +1633,8 @@ heILDevicePageEntries }, { - REPAIR_INTRO_PAGE, - heILRepairPageEntries + UPGRADE_REPAIR_PAGE, + heILUpgradePageEntries }, { COMPUTER_SETTINGS_PAGE,
Modified: branches/setup_improvements/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/it-IT.h [iso-8859-1] Mon May 15 01:48:19 2017 @@ -88,7 +88,7 @@ { 8, 17, - "\x07 Premere R per riparare ReactOS.", + "\x07 Press R to repair a ReactOS installation using the Recovery Console.", TEXT_STYLE_NORMAL }, { @@ -416,61 +416,67 @@ } };
-static MUI_ENTRY itITRepairPageEntries[] = -{ - { - 4, - 3, - " Installazione di ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "Il setup di ReactOS ancora in una fase preliminare.", - TEXT_STYLE_NORMAL - }, - { - 6, +static MUI_ENTRY itITUpgradePageEntries[] = +{ + { + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", + TEXT_STYLE_NORMAL + }, + { + 6, 9, - "Non ha ancora tutte le funzioni di installazione.", - TEXT_STYLE_NORMAL - }, - { - 6, + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", + TEXT_STYLE_NORMAL + }, + { + 6, 12, - "Le funzioni di ripristino non sono state ancora implementate.", - TEXT_STYLE_NORMAL - }, - { - 8, + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, 15, - "\x07 Premere U per aggiornare il SO.", - TEXT_STYLE_NORMAL - }, - { - 8, + "\x07 Press UP or DOWN to select an OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, 17, - "\x07 Premere R per la console di ripristino.", - TEXT_STYLE_NORMAL - }, - { - 8, + "\x07 Press U for upgrading the selected OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, 19, - "\x07 Premere ESC tornare al men principale.", - TEXT_STYLE_NORMAL - }, - { - 8, + "\x07 Press ESC to continue a new installation without upgrading.", + TEXT_STYLE_NORMAL + }, + { + 8, 21, - "\x07 Premere INVIO per riavviare il computer.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ESC = Men iniziale INVIO = Riavvio", - TEXT_TYPE_STATUS + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1617,7 +1623,7 @@ itITLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, itITWelcomePageEntries }, { @@ -1633,8 +1639,8 @@ itITDevicePageEntries }, { - REPAIR_INTRO_PAGE, - itITRepairPageEntries + UPGRADE_REPAIR_PAGE, + itITUpgradePageEntries }, { COMPUTER_SETTINGS_PAGE,
Modified: branches/setup_improvements/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Mon May 15 01:48:19 2017 @@ -88,7 +88,7 @@ { 8, 17, - "\x07 ReactOS ¦ ¼³Ì¸ Ó¼¸Ê º³¼Ý ½ÙÆÊ R ·°¦ µ¼Ã ¸ÀÞ»²¡", + "\x07 Press R to repair a ReactOS installation using the Recovery Console.", TEXT_STYLE_NORMAL }, { @@ -410,60 +410,66 @@ } };
-static MUI_ENTRY jaJPRepairPageEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " ¾¯Ä±¯Ìß ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "ReactOS ¾¯Ä±¯ÌßÊ ¼®·¶²Ê ÀÞݶ²Æ ±ØϽ¡ ¿ÉÀÒ¤ ÏÀÞ", +static MUI_ENTRY jaJPUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " ¾¯Ä±¯Ìß ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", TEXT_STYLE_NORMAL }, { 6, 9, - "¼Þ³ÌÞÝÆ ØÖ³ ÃÞ·Ù ¾¯Ä±¯Ìß ±Ìßع°¼®ÝÉ ½ÍÞÃÉ ·É³Ê »Îß°Ä »ÚϾݡ", + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", TEXT_STYLE_NORMAL }, { 6, 12, - "¼³Ì¸·É³Ê ÏÀÞ ¼Þ¯¿³ »Úà ²Ï¾Ý¡", - TEXT_STYLE_NORMAL + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT }, { 8, 15, - "\x07 OS ¦ º³¼Ý ½ÙÆÊ U ·°¦ µ¼Ã ¸ÀÞ»²¡", + "\x07 Press UP or DOWN to select an OS installation.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 ¶²Ì¸ ºÝ¿°Ù¦ Ë׸ÆÊ R ·°¦ µ¼Ã ¸ÀÞ»²¡", + "\x07 Press U for upgrading the selected OS installation.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Ò²ÝÍß°¼ÞÆ ÓÄÞÙÆÊ ESC ·°¦ µ¼Ã ¸ÀÞ»²¡", + "\x07 Press ESC to continue a new installation without upgrading.", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 ºÝËß°À¦ »²·ÄÞ³ ½ÙÆÊ ENTER ·°¦ µ¼Ã ¸ÀÞ»²¡", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ESC = Ò²ÝÍß°¼Þ U = º³¼Ý R = ¶²Ì¸ ENTER = »²·ÄÞ³", + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1612,7 +1618,7 @@ jaJPLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, jaJPWelcomePageEntries }, { @@ -1628,8 +1634,8 @@ jaJPDevicePageEntries }, { - REPAIR_INTRO_PAGE, - jaJPRepairPageEntries + UPGRADE_REPAIR_PAGE, + jaJPUpgradePageEntries }, { COMPUTER_SETTINGS_PAGE,
Modified: branches/setup_improvements/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Mon May 15 01:48:19 2017 @@ -97,7 +97,7 @@ { 8, 17, - "\x07 Spauskite R, jei norite taisyti ReactOS.", + "\x07 Press R to repair a ReactOS installation using the Recovery Console.", TEXT_STYLE_NORMAL }, { @@ -419,60 +419,66 @@ } };
-static MUI_ENTRY ltLTRepairPageEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " diegimo programa ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "ReactOS Setup is in an early development phase. It does not yet", +static MUI_ENTRY ltLTUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " diegimo programa ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", TEXT_STYLE_NORMAL }, { 6, 9, - "support all the functions of a fully usable setup application.", + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", TEXT_STYLE_NORMAL }, { 6, 12, - "The repair functions are not implemented yet.", - TEXT_STYLE_NORMAL + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT }, { 8, 15, - "\x07 Press U for Updating OS.", + "\x07 Press UP or DOWN to select an OS installation.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Press R for the Recovery Console.", + "\x07 Press U for upgrading the selected OS installation.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Press ESC to return to the main page.", + "\x07 Press ESC to continue a new installation without upgrading.", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Press ENTER to reboot your computer.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ESC = Main page ENTER = Reboot", + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1620,7 +1626,7 @@ ltLTLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, ltLTWelcomePageEntries }, { @@ -1636,8 +1642,8 @@ ltLTDevicePageEntries }, { - REPAIR_INTRO_PAGE, - ltLTRepairPageEntries + UPGRADE_REPAIR_PAGE, + ltLTUpgradePageEntries }, { COMPUTER_SETTINGS_PAGE,
Modified: branches/setup_improvements/base/setup/usetup/lang/ms-MY.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/ms-MY.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/ms-MY.h [iso-8859-1] Mon May 15 01:48:19 2017 @@ -87,7 +87,7 @@ { 8, 17, - "\x07 Tekan R untuk memperbaiki atau mengemaskini ReactOS.", + "\x07 Press R to repair a ReactOS installation using the Recovery Console.", TEXT_STYLE_NORMAL }, { @@ -409,60 +409,66 @@ } };
-static MUI_ENTRY msMYRepairPageEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " Persediaan ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "ReactOS persediaan sedang untuk fasa pembangunan awal. Ia belum lagi", +static MUI_ENTRY msMYUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Persediaan ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", TEXT_STYLE_NORMAL }, { 6, 9, - "menyokong semua fungsi aplikasi persediaan sepenuhnya digunakan.", + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", TEXT_STYLE_NORMAL }, { 6, 12, - "Fungsi pembaikan tidak dilaksanakan lagi.", - TEXT_STYLE_NORMAL + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT }, { 8, 15, - "\x07 Tekan U untuk mengemaskini ReactOS.", + "\x07 Press UP or DOWN to select an OS installation.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Tekan R bagi konsol pemulihan.", + "\x07 Press U for upgrading the selected OS installation.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Tekan ESC untuk kembali ke halaman utama.", + "\x07 Press ESC to continue a new installation without upgrading.", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Tekan ENTER untuk memulakan semula sistem komputer anda.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ESC = Halaman Utama U = Mengemaskini R = Pemulihan ENTER = But Semula", + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1503,7 +1509,7 @@ msMYLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, msMYWelcomePageEntries }, { @@ -1519,8 +1525,8 @@ msMYDevicePageEntries }, { - REPAIR_INTRO_PAGE, - msMYRepairPageEntries + UPGRADE_REPAIR_PAGE, + msMYUpgradePageEntries }, { COMPUTER_SETTINGS_PAGE,
Modified: branches/setup_improvements/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Mon May 15 01:48:19 2017 @@ -97,7 +97,7 @@ { 8, 17, - "\x07 Druk op R om ReactOS te repareren of bij te werken.", + "\x07 Press R to repair a ReactOS installation using the Recovery Console.", TEXT_STYLE_NORMAL }, { @@ -431,66 +431,66 @@ } };
-static MUI_ENTRY nlNLRepairPageEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "ReactOS Setup is nog in een vroege ontwikkelingsfase", +static MUI_ENTRY nlNLUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", TEXT_STYLE_NORMAL }, { 6, 9, - "Het ondersteunt nog niet alle functies van een volledig", - TEXT_STYLE_NORMAL - }, - { - 6, - 10, - "setup programma.", + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", TEXT_STYLE_NORMAL }, { 6, 12, - "De herstelfuncties zijn nog niet ge\x8Bmplementeerd.", - TEXT_STYLE_NORMAL + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT }, { 8, 15, - "\x07 Druk op U om ReactOS bij te werken.", + "\x07 Press UP or DOWN to select an OS installation.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Druk op R voor de Herstelconsole.", + "\x07 Press U for upgrading the selected OS installation.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Druk op ESC om terug naar het hoofdscherm te gaan.", + "\x07 Press ESC to continue a new installation without upgrading.", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Druk op ENTER om de computer opnieuw op te starten.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ESC = Hoofdscherm U = Bijwerken R = Herstelconsole ENTER = Reboot", + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1650,7 +1650,7 @@ nlNLLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, nlNLWelcomePageEntries }, { @@ -1666,8 +1666,8 @@ nlNLDevicePageEntries }, { - REPAIR_INTRO_PAGE, - nlNLRepairPageEntries + UPGRADE_REPAIR_PAGE, + nlNLUpgradePageEntries }, { COMPUTER_SETTINGS_PAGE,
Modified: branches/setup_improvements/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Mon May 15 01:48:19 2017 @@ -98,7 +98,7 @@ { 8, 17, - "\x07 Nacinij R, aby naprawi zainstalowany system ReactOS.", + "\x07 Press R to repair a ReactOS installation using the Recovery Console.", TEXT_STYLE_NORMAL }, { @@ -420,60 +420,66 @@ } };
-static MUI_ENTRY plPLRepairPageEntries[] = -{ - { - 4, - 3, - " Instalator ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "Instalator ReactOS wci¥¾ jest we wczesnej fazie rozwoju. Nadal nie", +static MUI_ENTRY plPLUpgradePageEntries[] = +{ + { + 4, + 3, + " Instalator ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", TEXT_STYLE_NORMAL }, { 6, 9, - "obsuguje wszystkich funkcji, niezb©dnych dla programu instalacyjnego.", + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", TEXT_STYLE_NORMAL }, { 6, 12, - "Naprawa istniej¥cej instalacji systemu nie jest jeszcze mo¾liwa.", - TEXT_STYLE_NORMAL + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT }, { 8, 15, - "\x07 Nacinij U ¾eby uaktualni system.", + "\x07 Press UP or DOWN to select an OS installation.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Nacinij R, by uruchomi Konsol© Odtwarzania.", + "\x07 Press U for upgrading the selected OS installation.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Nacinij ESC, by powr¢ci do g¢wnego menu.", + "\x07 Press ESC to continue a new installation without upgrading.", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Nacinij ENTER, by zrestartowa komputer.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ESC = Menu g¢wne ENTER = Restart", + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1621,7 +1627,7 @@ plPLLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, plPLWelcomePageEntries }, { @@ -1637,8 +1643,8 @@ plPLDevicePageEntries }, { - REPAIR_INTRO_PAGE, - plPLRepairPageEntries + UPGRADE_REPAIR_PAGE, + plPLUpgradePageEntries }, { COMPUTER_SETTINGS_PAGE,
Modified: branches/setup_improvements/base/setup/usetup/lang/pt-BR.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/pt-BR.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/pt-BR.h [iso-8859-1] Mon May 15 01:48:19 2017 @@ -88,7 +88,7 @@ { 8, 17, - "\x07 Para reparar uma instalaÆo do ReactOS, pressione R.", + "\x07 Press R to repair a ReactOS installation using the Recovery Console.", TEXT_STYLE_NORMAL }, { @@ -410,60 +410,66 @@ } };
-static MUI_ENTRY ptBRRepairPageEntries[] = -{ - { - 4, - 3, - " InstalaÆo do ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "O instalador do ReactOS est em fase inicial de desenvolvimento e", +static MUI_ENTRY ptBRUpgradePageEntries[] = +{ + { + 4, + 3, + " InstalaÆo do ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", TEXT_STYLE_NORMAL }, { 6, 9, - "ainda nÆo suporta todas as funäes de instalaÆo.", + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", TEXT_STYLE_NORMAL }, { 6, 12, - "As funäes reparaÆo ainda nÆo foram implementadas.", - TEXT_STYLE_NORMAL + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT }, { 8, 15, - "\x07 Para atualizar o sistema operacional, pressione U.", + "\x07 Press UP or DOWN to select an OS installation.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Para abrir o console de recuperaÆo, pressione R.", + "\x07 Press U for upgrading the selected OS installation.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Para voltar a p gina principal, pressione ESC.", + "\x07 Press ESC to continue a new installation without upgrading.", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Para reiniciar o computador, pressione ENTER.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ESC=P gina principal U=Atualizar R=Recuperar ENTER=Reiniciar", + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1648,7 +1654,7 @@ ptBRLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, ptBRWelcomePageEntries }, { @@ -1664,8 +1670,8 @@ ptBRDevicePageEntries }, { - REPAIR_INTRO_PAGE, - ptBRRepairPageEntries + UPGRADE_REPAIR_PAGE, + ptBRUpgradePageEntries }, { COMPUTER_SETTINGS_PAGE,
Modified: branches/setup_improvements/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/ro-RO.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/ro-RO.h [iso-8859-1] Mon May 15 01:48:19 2017 @@ -95,15 +95,15 @@ { 8, 18, - "\x07 Tastaþi R pentru a reface un sistem deteriorat sau pentru", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, - " a actualiza ReactOS.", - TEXT_STYLE_NORMAL - }, + "\x07 Press R to repair a ReactOS installation using the Recovery Console.", + TEXT_STYLE_NORMAL + }, + // { + // 8, + // 19, + // " a actualiza ReactOS.", + // TEXT_STYLE_NORMAL + // }, { 8, 21, @@ -466,60 +466,66 @@ } };
-static MUI_ENTRY roRORepairPageEntries[] = -{ - { - 4, - 3, - " Instalare ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "Programul de instalare ReactOS este încã într-o fazã incipientã de", +static MUI_ENTRY roROUpgradePageEntries[] = +{ + { + 4, + 3, + " Instalare ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", TEXT_STYLE_NORMAL }, { 6, 9, - "dezvoltare ºi nu posedã o funcþionalitate completã.", + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", TEXT_STYLE_NORMAL }, { 6, 12, - "Funcþionalitatea de refacere încã nu este implementatã.", - TEXT_STYLE_NORMAL + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT }, { 8, 15, - "\x07 Tastaþi U pentru actualizarea sistemului.", + "\x07 Press UP or DOWN to select an OS installation.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Tastaþi R pentru consola de Recuperare.", + "\x07 Press U for upgrading the selected OS installation.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Apãsaþi ESC pentru a reveni la pagina principalã.", + "\x07 Press ESC to continue a new installation without upgrading.", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Apãsaþi ENTER pentru a reporni calculatorul.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ESC = Revenire U = Actualizare R = Recuperare ENTER = Repornire", + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1682,7 +1688,7 @@ roROLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, roROWelcomePageEntries }, { @@ -1698,8 +1704,8 @@ roRODevicePageEntries }, { - REPAIR_INTRO_PAGE, - roRORepairPageEntries + UPGRADE_REPAIR_PAGE, + roROUpgradePageEntries }, { COMPUTER_SETTINGS_PAGE,
Modified: branches/setup_improvements/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Mon May 15 01:48:19 2017 @@ -88,7 +88,7 @@ { 8, 17, - "\x07 ¦¬¨â¥ R ¤«ï ¢®ááâ ®¢«¥¨ï ReactOS.", + "\x07 Press R to repair a ReactOS installation using the Recovery Console.", TEXT_STYLE_NORMAL }, { @@ -410,60 +410,66 @@ } };
-static MUI_ENTRY ruRURepairPageEntries[] = -{ - { - 4, - 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR, - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "ReactOS 室¨âáï ¢ à ¥© áâ ¤¨¨ à §à ¡®âª¨ ¨ ¥ ¯®¤¤¥à¦¨¢ ¥â ¢á¥", +static MUI_ENTRY ruRUUpgradePageEntries[] = +{ + { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR, + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", TEXT_STYLE_NORMAL }, { 6, 9, - "äãªæ¨¨ ¤«ï ¯®«®© ᮢ¬¥á⨬®á⨠á ãáâ ¢«¨¢ ¥¬ë¬¨ ¯à¨«®¦¥¨ï¬¨.", + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", TEXT_STYLE_NORMAL }, { 6, 12, - "ãªæ¨ï ¢®ááâ ®¢«¥¨ï ¢ ¤ ë¬ ¬®¬¥â ®âáãâáâ¢ã¥â.", - TEXT_STYLE_NORMAL + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT }, { 8, 15, - "\x07 ¦¬¨â¥ U ¤«ï ®¡®¢«¥¨ï .", + "\x07 Press UP or DOWN to select an OS installation.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 ¦¬¨â¥ R ¤«ï § ¯ã᪠ª®á®«¨ ¢®ááâ ®¢«¥¨ï.", + "\x07 Press U for upgrading the selected OS installation.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 ¦¬¨â¥ ESC ¤«ï ¢®§¢à â £« ¢ãî áâà ¨æã.", + "\x07 Press ESC to continue a new installation without upgrading.", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 ¦¬¨â¥ ENTER ¤«ï ¯¥à¥§ £à㧪¨ ª®¬¯ìîâ¥à .", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ESC = £« ¢ãî U = ¡®¢«¥¨¥ R = ®ááâ ®¢«¥¨¥ ENTER = ¥à¥§ £à㧪 ", + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1611,7 +1617,7 @@ ruRULanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, ruRUWelcomePageEntries }, { @@ -1627,8 +1633,8 @@ ruRUDevicePageEntries }, { - REPAIR_INTRO_PAGE, - ruRURepairPageEntries + UPGRADE_REPAIR_PAGE, + ruRUUpgradePageEntries }, { COMPUTER_SETTINGS_PAGE,
Modified: branches/setup_improvements/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Mon May 15 01:48:19 2017 @@ -95,7 +95,7 @@ { 8, 17, - "\x07 Stlate R pre opravu alebo aktualiz ciu systmu ReactOS.", + "\x07 Press R to repair a ReactOS installation using the Recovery Console.", TEXT_STYLE_NORMAL }, { @@ -417,60 +417,66 @@ } };
-static MUI_ENTRY skSKRepairPageEntries[] = -{ - { - 4, - 3, - " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "Inçtal tor systmu ReactOS je v zaiatonom çt diu vìvoja. Zatia", +static MUI_ENTRY skSKUpgradePageEntries[] = +{ + { + 4, + 3, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", TEXT_STYLE_NORMAL }, { 6, 9, - "nepodporuje vçetky funkcie plne vyu§¡vaj£ce program Inçtal tor.", + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", TEXT_STYLE_NORMAL }, { 6, 12, - "Funkcie na opravu systmu zatia nie s£ implementovan.", - TEXT_STYLE_NORMAL + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT }, { 8, 15, - "\x07 Stlate U pre aktualiz ciu OS.", + "\x07 Press UP or DOWN to select an OS installation.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Stlate R pre z chrann£ konzolu.", + "\x07 Press U for upgrading the selected OS installation.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Stlate ESC pre n vrat na hlavn£ str nku.", + "\x07 Press ESC to continue a new installation without upgrading.", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Stlate ENTER pre reçtart po¡taa.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ESC = Hlavn str nka U = Aktualizova R = Z chrana ENTER = Reçtart", + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1622,7 +1628,7 @@ skSKLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, skSKWelcomePageEntries }, { @@ -1638,8 +1644,8 @@ skSKDevicePageEntries }, { - REPAIR_INTRO_PAGE, - skSKRepairPageEntries + UPGRADE_REPAIR_PAGE, + skSKUpgradePageEntries }, { COMPUTER_SETTINGS_PAGE,
Modified: branches/setup_improvements/base/setup/usetup/lang/sq-AL.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/sq-AL.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/sq-AL.h [iso-8859-1] Mon May 15 01:48:19 2017 @@ -91,7 +91,7 @@ { 8, 17, - "\x07 Kliko R pr t riparuar ose apdejtuar ReactOS.", + "\x07 Press R to repair a ReactOS installation using the Recovery Console.", TEXT_STYLE_NORMAL }, { @@ -413,60 +413,66 @@ } };
-static MUI_ENTRY sqALRepairPageEntries[] = -{ - { - 4, - 3, - " Instalimi i ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "Instalimi i ReactOS sht n fazat e zhvillimit. Ajo ende nuk i", +static MUI_ENTRY sqALUpgradePageEntries[] = +{ + { + 4, + 3, + " Instalimi i ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", TEXT_STYLE_NORMAL }, { 6, 9, - "mbshtet t gjitha funksionet e nj instalimi plotsisht t prdorshm.", + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", TEXT_STYLE_NORMAL }, { 6, 12, - "Funksionet e riparim nuk jan implemntuar ende.", - TEXT_STYLE_NORMAL + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT }, { 8, 15, - "\x07 Klikoni U pr t Apdejtuar OS'in.", + "\x07 Press UP or DOWN to select an OS installation.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Klikoni R pr modulin e riparimit.", + "\x07 Press U for upgrading the selected OS installation.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Kliko ESC pr ty kthyer tek menuja kryesore.", + "\x07 Press ESC to continue a new installation without upgrading.", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Kliko ENTER t rinisni kompjuterin tuaj.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ESC = Menuja Kryesore U = Apdejto R = Riparo ENTER = Rinis sistemin", + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1615,7 +1621,7 @@ sqALLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, sqALWelcomePageEntries }, { @@ -1631,8 +1637,8 @@ sqALDevicePageEntries }, { - REPAIR_INTRO_PAGE, - sqALRepairPageEntries + UPGRADE_REPAIR_PAGE, + sqALUpgradePageEntries }, { COMPUTER_SETTINGS_PAGE,
Modified: branches/setup_improvements/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Mon May 15 01:48:19 2017 @@ -94,7 +94,7 @@ { 8, 17, - "\x07 Tryck p R fr att reparera ReactOS.", + "\x07 Press R to repair a ReactOS installation using the Recovery Console.", TEXT_STYLE_NORMAL }, { @@ -416,61 +416,67 @@ } };
-static MUI_ENTRY svSERepairPageEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "ReactOS Setup r i en tidig utvecklingsfas och saknar drfr ett antal", +static MUI_ENTRY svSEUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", TEXT_STYLE_NORMAL }, { 6, 9, - "funktioner som kan frvntas av ett fullt anvndbart setup-program.", + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", TEXT_STYLE_NORMAL }, { 6, 12, - "Reparations- och uppdateringsfunktionerna fungerar ej.", - TEXT_STYLE_NORMAL + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT }, { 8, 15, - "\x07 Tryck p U fr att uppdatera ReactOS.", + "\x07 Press UP or DOWN to select an OS installation.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Tryck p R fr terstllningskonsolen.", + "\x07 Press U for upgrading the selected OS installation.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Tryck p ESC fr att tervnda till fregende sida.", + "\x07 Press ESC to continue a new installation without upgrading.", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Tryck p ENTER fr att starta om datorn.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " ESC = G till fregende sida ENTER = Starta om datorn", - TEXT_TYPE_STATUS + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1618,7 +1624,7 @@ svSELanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, svSEWelcomePageEntries }, { @@ -1634,8 +1640,8 @@ svSEDevicePageEntries }, { - REPAIR_INTRO_PAGE, - svSERepairPageEntries + UPGRADE_REPAIR_PAGE, + svSEUpgradePageEntries }, { COMPUTER_SETTINGS_PAGE,
Modified: branches/setup_improvements/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/tr-TR.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/tr-TR.h [iso-8859-1] Mon May 15 01:48:19 2017 @@ -91,7 +91,7 @@ { 8, 17, - "\x07 ReactOS'u onarmak vey ykseltmek iin R'ye basnz.", + "\x07 Press R to repair a ReactOS installation using the Recovery Console.", TEXT_STYLE_NORMAL }, { @@ -408,60 +408,66 @@ } };
-static MUI_ENTRY trTRRepairPageEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " Kur ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "ReactOS Kur, bir n gelime evresindedir. Daha tmyle kullanl", +static MUI_ENTRY trTRUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Kur ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", TEXT_STYLE_NORMAL }, { 6, 9, - "bir kurulum uygulamasnn tm ilevlerini desteklemez.", + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", TEXT_STYLE_NORMAL }, { 6, 12, - "Onarma ilevleri daha bitirilmemitir.", - TEXT_STYLE_NORMAL + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT }, { 8, 15, - "\x07 letim dizgesini ykseltmek iin U'ya basnz.", + "\x07 Press UP or DOWN to select an OS installation.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Kurtarma Konsolu iin R'ye basnz.", + "\x07 Press U for upgrading the selected OS installation.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Ana sayfaya geri dnmek iin k'a basnz.", + "\x07 Press ESC to continue a new installation without upgrading.", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Bilgisayarnz yeniden balatmak iin Giri'e basnz.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "k = Ana Sayfa U = Ykselt R = Kurtarma Giri = Yeniden Balat", + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1591,7 +1597,7 @@ trTRLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, trTRWelcomePageEntries }, { @@ -1607,8 +1613,8 @@ trTRDevicePageEntries }, { - REPAIR_INTRO_PAGE, - trTRRepairPageEntries + UPGRADE_REPAIR_PAGE, + trTRUpgradePageEntries }, { COMPUTER_SETTINGS_PAGE,
Modified: branches/setup_improvements/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Mon May 15 01:48:19 2017 @@ -93,7 +93,7 @@ { 8, 17, - "\x07 â¨áiâì R ¤«ï ®®¢«¥ï ReactOS.", + "\x07 Press R to repair a ReactOS installation using the Recovery Console.", TEXT_STYLE_NORMAL }, { @@ -415,60 +415,66 @@ } };
-static MUI_ENTRY ukUARepairPageEntries[] = -{ - { - 4, - 3, - " áâ ®¢«¥ï ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "áâ ®¢«î¢ ç ReactOS § 室¨âìáï ¢ à i© áâ ¤iõ ஧஡ª¨ i é¥ ¥", +static MUI_ENTRY ukUAUpgradePageEntries[] = +{ + { + 4, + 3, + " áâ ®¢«¥ï ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", TEXT_STYLE_NORMAL }, { 6, 9, - "¯i¤âਬãó ¢ái äãªæiõ ¯®¢®æi®õ ¯à®£à ¬¨ ¢áâ ®¢«¥ï.", + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", TEXT_STYLE_NORMAL }, { 6, 12, - "ãªæiõ ¢i¤®¢«¥ï é¥ ¥ ¢¯à®¢ ¤¦¥i.", - TEXT_STYLE_NORMAL + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT }, { 8, 15, - "\x07 â¨áiâì U 鮡 ®®¢¨â¨ OS.", + "\x07 Press UP or DOWN to select an OS installation.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 â¨áiâì R ¤«ï § ¯ãáªã ®á®«i i¤®¢«¥ï.", + "\x07 Press U for upgrading the selected OS installation.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 â¨áiâì ESC ¤«ï ¯®¢¥à¥ï ¤® £®«®¢®õ áâ®àiª¨.", + "\x07 Press ESC to continue a new installation without upgrading.", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 â¨áiâì ENTER 鮡 ¯¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ESC = ®«®¢ â®àiª U = ®¢¨â¨ R = i¤®¢¨â¨ ENTER = ¥à¥§ ¢ â ¦¨â¨", + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1618,7 +1624,7 @@ ukUALanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, ukUAWelcomePageEntries }, { @@ -1634,8 +1640,8 @@ ukUADevicePageEntries }, { - REPAIR_INTRO_PAGE, - ukUARepairPageEntries + UPGRADE_REPAIR_PAGE, + ukUAUpgradePageEntries }, { COMPUTER_SETTINGS_PAGE,
Modified: branches/setup_improvements/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/usetup.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/usetup.h [iso-8859-1] Mon May 15 01:48:19 2017 @@ -118,13 +118,16 @@ #define _PAGE_NUMBER_DEFINED typedef enum _PAGE_NUMBER { - START_PAGE, LANGUAGE_PAGE, INTRO_PAGE, + WELCOME_PAGE, LICENSE_PAGE, INSTALL_INTRO_PAGE,
// SCSI_CONTROLLER_PAGE, + +// REPAIR_INTRO_PAGE, + UPGRADE_REPAIR_PAGE,
DEVICE_SETTINGS_PAGE, COMPUTER_SETTINGS_PAGE, @@ -152,13 +155,11 @@ BOOT_LOADER_HARDDISK_MBR_PAGE, BOOT_LOADER_HARDDISK_VBR_PAGE,
- REPAIR_INTRO_PAGE, - SUCCESS_PAGE, QUIT_PAGE, FLUSH_PAGE, - REBOOT_PAGE, /* virtual page */ - RECOVERY_PAGE, /* virtual page */ + REBOOT_PAGE, /* Virtual page */ + RECOVERY_PAGE, /* Virtual page */ } PAGE_NUMBER, *PPAGE_NUMBER; #endif
-
hbelusca＠svn.reactos.org