https://git.reactos.org/?p=reactos.git;a=commitdiff;h=29ace9c0dcc4ca2a812ba0...
commit 29ace9c0dcc4ca2a812ba0e07bcccab99f80b2b0 Author: Hermès Bélusca-Maïto hermes.belusca-maito@reactos.org AuthorDate: Mon May 15 01:48:19 2017 +0000 Commit: Hermès Bélusca-Maïto hermes.belusca-maito@reactos.org CommitDate: Fri Oct 26 02:15:19 2018 +0200
[USETUP] Add an upgrade/repair installation page.
Translators, please update the associated translations!
svn path=/branches/setup_improvements/; revision=74548 --- base/setup/usetup/lang/bg-BG.h | 76 +++++++++++++++++++++++++++++++++- base/setup/usetup/lang/bn-BD.h | 78 ++++++++++++++++++++++++++++++++++- base/setup/usetup/lang/cs-CZ.h | 78 ++++++++++++++++++++++++++++++++++- base/setup/usetup/lang/da-DK.h | 80 ++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/de-DE.h | 78 ++++++++++++++++++++++++++++++++++- base/setup/usetup/lang/el-GR.h | 76 +++++++++++++++++++++++++++++++++- base/setup/usetup/lang/en-US.h | 81 +++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/es-ES.h | 76 +++++++++++++++++++++++++++++++++- base/setup/usetup/lang/et-EE.h | 76 +++++++++++++++++++++++++++++++++- base/setup/usetup/lang/fr-FR.h | 80 ++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/he-IL.h | 76 +++++++++++++++++++++++++++++++++- base/setup/usetup/lang/it-IT.h | 92 +++++++++++++++++++++++++++++++++++++----- base/setup/usetup/lang/ja-JP.h | 76 +++++++++++++++++++++++++++++++++- base/setup/usetup/lang/lt-LT.h | 76 +++++++++++++++++++++++++++++++++- base/setup/usetup/lang/ms-MY.h | 76 +++++++++++++++++++++++++++++++++- base/setup/usetup/lang/nl-NL.h | 78 ++++++++++++++++++++++++++++++++++- base/setup/usetup/lang/pl-PL.h | 76 +++++++++++++++++++++++++++++++++- base/setup/usetup/lang/pt-BR.h | 76 +++++++++++++++++++++++++++++++++- base/setup/usetup/lang/ro-RO.h | 84 ++++++++++++++++++++++++++++++++++---- base/setup/usetup/lang/ru-RU.h | 76 +++++++++++++++++++++++++++++++++- base/setup/usetup/lang/sk-SK.h | 78 ++++++++++++++++++++++++++++++++++- base/setup/usetup/lang/sq-AL.h | 76 +++++++++++++++++++++++++++++++++- base/setup/usetup/lang/sv-SE.h | 76 +++++++++++++++++++++++++++++++++- base/setup/usetup/lang/tr-TR.h | 76 +++++++++++++++++++++++++++++++++- base/setup/usetup/lang/uk-UA.h | 76 +++++++++++++++++++++++++++++++++- base/setup/usetup/usetup.h | 1 + 26 files changed, 1897 insertions(+), 51 deletions(-)
diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index 01fc9482e9..6191c1f857 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -84,7 +84,7 @@ static MUI_ENTRY bgBGWelcomePageEntries[] = { 8, 15, - "\x07 ���᭥� ENTER �� ���� �� ����⎑.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -488,6 +488,76 @@ static MUI_ENTRY bgBGRepairPageEntries[] = } };
+static MUI_ENTRY bgBGUpgradePageEntries[] = +{ + { + 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, + "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 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 Press ESC to continue with a new installation.", + 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 + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY bgBGComputerPageEntries[] = { { @@ -1648,6 +1718,10 @@ MUI_PAGE bgBGPages[] = REPAIR_INTRO_PAGE, bgBGRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + bgBGUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, bgBGComputerPageEntries diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index 689e88c2e2..847c53b712 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -81,13 +81,13 @@ static MUI_ENTRY bnBDWelcomePageEntries[] = { 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.", TEXT_STYLE_NORMAL }, { @@ -479,6 +479,76 @@ static MUI_ENTRY bnBDRepairPageEntries[] = } };
+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, + "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 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 Press ESC to continue with a new installation.", + 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 + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY bnBDComputerPageEntries[] = { { @@ -1635,6 +1705,10 @@ MUI_PAGE bnBDPages[] = REPAIR_INTRO_PAGE, bnBDRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + bnBDUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, bnBDComputerPageEntries diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index 82a5691d78..7972b8603f 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -89,13 +89,13 @@ static MUI_ENTRY csCZWelcomePageEntries[] = { 8, 15, - "\x07 Stisknut�m kl�vesy ENTER zah�j�te instalaci ReactOS.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Stisknut�m R zah�j�te opravu nebo aktualizaci ReactOS.", + "\x07 Stisknut�m R zah�j�te opravu ReactOS.", TEXT_STYLE_NORMAL }, { @@ -487,6 +487,76 @@ static MUI_ENTRY csCZRepairPageEntries[] = } };
+static MUI_ENTRY csCZUpgradePageEntries[] = +{ + { + 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, + "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 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 Press ESC to continue with a new installation.", + 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 + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY csCZComputerPageEntries[] = { { @@ -1643,6 +1713,10 @@ MUI_PAGE csCZPages[] = REPAIR_INTRO_PAGE, csCZRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + csCZUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, csCZComputerPageEntries diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index 5e5c1ba35c..a58f2db920 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -81,13 +81,13 @@ static MUI_ENTRY daDKWelcomePageEntries[] = { 8, 15, - "\x07 Tryk p� ENTER for at installere ReactOS.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Tryk p� R reparere eller opdatere ReactOS.", + "\x07 Tryk p� R reparere ReactOS.", TEXT_STYLE_NORMAL }, { @@ -484,6 +484,77 @@ static MUI_ENTRY daDKRepairPageEntries[] = 0 } }; + +static MUI_ENTRY daDKUpgradePageEntries[] = +{ + { + 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, + "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 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 Press ESC to continue with a new installation.", + 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 + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY daDKComputerPageEntries[] = { { @@ -931,7 +1002,6 @@ static MUI_ENTRY daDKConfirmDeleteSystemPartitionEntries[] = } };
- static MUI_ENTRY daDKFormatPartitionEntries[] = { { @@ -1649,6 +1719,10 @@ MUI_PAGE daDKPages[] = REPAIR_INTRO_PAGE, daDKRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + daDKUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, daDKComputerPageEntries diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index abd84927c3..2e2d66ea7a 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -82,13 +82,13 @@ static MUI_ENTRY deDEWelcomePageEntries[] = { 8, 15, - "\x07 Dr�cken Sie die EINGABETASTE, um ReactOS zu installieren.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Dr�cken Sie R, um ReactOS zu reparieren oder aktualisieren.", + "\x07 Dr�cken Sie R, um ReactOS zu reparieren.", TEXT_STYLE_NORMAL }, { @@ -486,6 +486,76 @@ static MUI_ENTRY deDERepairPageEntries[] = } };
+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, + "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 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 Press ESC to continue with a new installation.", + 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 + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY deDEComputerPageEntries[] = { { @@ -1639,6 +1709,10 @@ MUI_PAGE deDEPages[] = REPAIR_INTRO_PAGE, deDERepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + deDEUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, deDEComputerPageEntries diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index 8431842f50..4052a8997d 100644 --- a/base/setup/usetup/lang/el-GR.h +++ b/base/setup/usetup/lang/el-GR.h @@ -82,7 +82,7 @@ static MUI_ENTRY elGRWelcomePageEntries[] = { 7, 15, - "\x07 ���㩫� ENTER ��� �� ��������㩜�� �� ReactOS.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -480,6 +480,76 @@ static MUI_ENTRY elGRRepairPageEntries[] = } };
+static MUI_ENTRY elGRUpgradePageEntries[] = +{ + { + 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, + "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 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 Press ESC to continue with a new installation.", + 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 + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY elGRComputerPageEntries[] = { { @@ -1652,6 +1722,10 @@ MUI_PAGE elGRPages[] = REPAIR_INTRO_PAGE, elGRRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + elGRUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, elGRComputerPageEntries diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index 396a009a95..5905590a33 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -81,13 +81,14 @@ static MUI_ENTRY enUSWelcomePageEntries[] = { 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.", + "\x07 Press R to repair a ReactOS installation.", TEXT_STYLE_NORMAL }, { @@ -478,6 +479,77 @@ static MUI_ENTRY enUSRepairPageEntries[] = 0 } }; + +static MUI_ENTRY enUSUpgradePageEntries[] = +{ + { + 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, + "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 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 Press ESC to continue with a new installation.", + 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 + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY enUSComputerPageEntries[] = { { @@ -924,7 +996,6 @@ static MUI_ENTRY enUSConfirmDeleteSystemPartitionEntries[] = } };
- static MUI_ENTRY enUSFormatPartitionEntries[] = { { @@ -1635,6 +1706,10 @@ MUI_PAGE enUSPages[] = REPAIR_INTRO_PAGE, enUSRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + enUSUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, enUSComputerPageEntries diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index 569fd5ef75..c60e0daddb 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -84,7 +84,7 @@ static MUI_ENTRY esESWelcomePageEntries[] = { 8, 15, - "\x07 Presione INTRO para instalar ReactOS.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -482,6 +482,76 @@ static MUI_ENTRY esESRepairPageEntries[] = } };
+static MUI_ENTRY esESUpgradePageEntries[] = +{ + { + 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, + "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 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 Press ESC to continue with a new installation.", + 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 + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY esESComputerPageEntries[] = { { @@ -1639,6 +1709,10 @@ MUI_PAGE esESPages[] = REPAIR_INTRO_PAGE, esESRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + esESUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, esESComputerPageEntries diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index 87ccc8bcb5..ff36b11d59 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -81,7 +81,7 @@ static MUI_ENTRY etEEWelcomePageEntries[] = { 8, 15, - "\x07 Vajuta ENTER, et ReactOS paigaldada.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -479,6 +479,76 @@ static MUI_ENTRY etEERepairPageEntries[] = } };
+static MUI_ENTRY etEEUpgradePageEntries[] = +{ + { + 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, + "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 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 Press ESC to continue with a new installation.", + 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 + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY etEEComputerPageEntries[] = { { @@ -1633,6 +1703,10 @@ MUI_PAGE etEEPages[] = REPAIR_INTRO_PAGE, etEERepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + etEEUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, etEEComputerPageEntries diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index ed74aec94c..3cf8aa7600 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -82,7 +82,7 @@ static MUI_ENTRY frFRWelcomePageEntries[] = { 8, 15, - "\x07 Appuyer sur ENTR�E pour installer ReactOS.", + "\x07 Appuyer sur ENTR�E pour installer ou mettre � jour ReactOS.", TEXT_STYLE_NORMAL }, { @@ -463,7 +463,7 @@ static MUI_ENTRY frFRRepairPageEntries[] = { 8, 19, - "\x07 Appuyer sur �CHAP pour retourner � la page principale.", + "\x07 Appuyer sur �CHAP pour revenir � la page principale.", TEXT_STYLE_NORMAL }, { @@ -486,6 +486,76 @@ static MUI_ENTRY frFRRepairPageEntries[] = } };
+static MUI_ENTRY frFRUpgradePageEntries[] = +{ + { + 4, + 3, + " Installation de ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Le programme d'installation de ReactOS peut mettre � jour l'une des", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "installations de ReactOS list�es ci-dessous, ou bien, si l'une d'elles", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "est endommag�e, le programme d'installation peut essayer de la r�parer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "Les fonctions de r�paration ne sont pas toutes impl�ment�es.", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 15, + "\x07 Appuyer sur HAUT ou BAS pour s�lectionner une installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Appuyer sur U pour mettre � jour l'installation s�lectionn�e.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Appuyer sur �CHAP pour effectuer une nouvelle installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Appuyer sur F3 pour quitter sans installer ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Mettre � jour �CHAP = Annuler F3 = Quitter", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY frFRComputerPageEntries[] = { { @@ -921,7 +991,7 @@ static MUI_ENTRY frFRConfirmDeleteSystemPartitionEntries[] = { 8, 26, - "\x07 Appuyer sur �CHAP pour retourner � la page principale. La partition", + "\x07 Appuyer sur �CHAP pour revenir � la page principale. La partition", TEXT_STYLE_NORMAL }, { @@ -1654,6 +1724,10 @@ MUI_PAGE frFRPages[] = REPAIR_INTRO_PAGE, frFRRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + frFRUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, frFRComputerPageEntries diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index 75a192a864..29260ab128 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -82,7 +82,7 @@ static MUI_ENTRY heILWelcomePageEntries[] = { 8, 15, - "\x07 ReactOS �� ������ ��� ENTER ���", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -480,6 +480,76 @@ static MUI_ENTRY heILRepairPageEntries[] = } };
+static MUI_ENTRY heILUpgradePageEntries[] = +{ + { + 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, + "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 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 Press ESC to continue with a new installation.", + 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 + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY heILComputerPageEntries[] = { { @@ -1636,6 +1706,10 @@ MUI_PAGE heILPages[] = REPAIR_INTRO_PAGE, heILRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + heILUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, heILComputerPageEntries diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index e7da50725e..8d4987fcf3 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -82,7 +82,7 @@ static MUI_ENTRY itITWelcomePageEntries[] = { 8, 15, - "\x07 Premere INVIO per installare ReactOS.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -425,49 +425,49 @@ static MUI_ENTRY itITRepairPageEntries[] = TEXT_STYLE_UNDERLINE }, { - 6, + 6, 8, "Il setup di ReactOS \x8A ancora in una fase preliminare.", TEXT_STYLE_NORMAL }, { - 6, + 6, 9, "Non ha ancora tutte le funzioni di installazione.", TEXT_STYLE_NORMAL }, { - 6, + 6, 12, "Le funzioni di ripristino non sono state ancora implementate.", TEXT_STYLE_NORMAL }, { - 8, + 8, 15, "\x07 Premere U per aggiornare il SO.", TEXT_STYLE_NORMAL }, { - 8, + 8, 17, "\x07 Premere R per la console di ripristino.", TEXT_STYLE_NORMAL }, { - 8, + 8, 19, "\x07 Premere ESC tornare al men\x97 principale.", TEXT_STYLE_NORMAL }, { - 8, + 8, 21, "\x07 Premere INVIO per riavviare il computer.", TEXT_STYLE_NORMAL }, { - 0, + 0, 0, "ESC = Men\x97 iniziale INVIO = Riavvio", TEXT_TYPE_STATUS @@ -480,6 +480,76 @@ static MUI_ENTRY itITRepairPageEntries[] = } };
+static MUI_ENTRY itITUpgradePageEntries[] = +{ + { + 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, + "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 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 Press ESC to continue with a new installation.", + 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 + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY itITComputerPageEntries[] = { { @@ -1642,6 +1712,10 @@ MUI_PAGE itITPages[] = REPAIR_INTRO_PAGE, itITRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + itITUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, itITComputerPageEntries diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index 52fc2c785d..f71e340231 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -82,7 +82,7 @@ static MUI_ENTRY jaJPWelcomePageEntries[] = { 8, 15, - "\x07 ReactOS � �ݽİ� ���� ENTER ��� ��� ����", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -480,6 +480,76 @@ static MUI_ENTRY jaJPRepairPageEntries[] = } };
+static MUI_ENTRY jaJPUpgradePageEntries[] = +{ + { + 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, + "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 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 Press ESC to continue with a new installation.", + 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 + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY jaJPComputerPageEntries[] = { { @@ -1637,6 +1707,10 @@ MUI_PAGE jaJPPages[] = REPAIR_INTRO_PAGE, jaJPRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + jaJPUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, jaJPComputerPageEntries diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index d5fc64768d..d2cb29527c 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -91,7 +91,7 @@ static MUI_ENTRY ltLTWelcomePageEntries[] = { 8, 15, - "\x07 Spauskite ENTER, jei norite diegti ReactOS.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -489,6 +489,76 @@ static MUI_ENTRY ltLTRepairPageEntries[] = } };
+static MUI_ENTRY ltLTUpgradePageEntries[] = +{ + { + 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, + "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 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 Press ESC to continue with a new installation.", + 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 + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY ltLTComputerPageEntries[] = { { @@ -1645,6 +1715,10 @@ MUI_PAGE ltLTPages[] = REPAIR_INTRO_PAGE, ltLTRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + ltLTUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, ltLTComputerPageEntries diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index e7ef24f2fb..e8ae583e4d 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -81,7 +81,7 @@ static MUI_ENTRY msMYWelcomePageEntries[] = { 8, 15, - "\x07 Tekan ENTER untuk memasang ReactOS.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -479,6 +479,76 @@ static MUI_ENTRY msMYRepairPageEntries[] = } };
+static MUI_ENTRY msMYUpgradePageEntries[] = +{ + { + 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, + "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 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 Press ESC to continue with a new installation.", + 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 + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY msMYComputerPageEntries[] = { { @@ -1528,6 +1598,10 @@ MUI_PAGE msMYPages[] = REPAIR_INTRO_PAGE, msMYRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + msMYUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, msMYComputerPageEntries diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index d3872cc8f8..f8b6711972 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -91,13 +91,13 @@ static MUI_ENTRY nlNLWelcomePageEntries[] = { 8, 15, - "\x07 Druk op ENTER om ReactOS te installeren.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Druk op R om ReactOS te repareren of bij te werken.", + "\x07 Druk op R om ReactOS te repareren.", TEXT_STYLE_NORMAL }, { @@ -495,6 +495,76 @@ static MUI_ENTRY nlNLRepairPageEntries[] = } };
+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, + "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 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 Press ESC to continue with a new installation.", + 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 + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY nlNLComputerPageEntries[] = { { @@ -1663,6 +1733,10 @@ MUI_PAGE nlNLPages[] = REPAIR_INTRO_PAGE, nlNLRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + nlNLUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, nlNLComputerPageEntries diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index 5de776e8a9..1df2488272 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -92,7 +92,7 @@ static MUI_ENTRY plPLWelcomePageEntries[] = { 8, 15, - "\x07 Naci�nij ENTER, aby zainstalowa� system ReactOS.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -490,6 +490,76 @@ static MUI_ENTRY plPLRepairPageEntries[] = } };
+static MUI_ENTRY plPLUpgradePageEntries[] = +{ + { + 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, + "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 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 Press ESC to continue with a new installation.", + 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 + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY plPLComputerPageEntries[] = { { @@ -1646,6 +1716,10 @@ MUI_PAGE plPLPages[] = REPAIR_INTRO_PAGE, plPLRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + plPLUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, plPLComputerPageEntries diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index a28ecefabb..6f3cba11ce 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -82,7 +82,7 @@ static MUI_ENTRY ptBRWelcomePageEntries[] = { 8, 15, - "\x07 Para instalar o ReactOS agora, pressione ENTER.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -474,6 +474,76 @@ static MUI_ENTRY ptBRRepairPageEntries[] = } };
+static MUI_ENTRY ptBRUpgradePageEntries[] = +{ + { + 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, + "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 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 Press ESC to continue with a new installation.", + 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 + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY ptBRComputerPageEntries[] = { { @@ -1667,6 +1737,10 @@ MUI_PAGE ptBRPages[] = REPAIR_INTRO_PAGE, ptBRRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + ptBRUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, ptBRComputerPageEntries diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index 443688b697..2a4f788617 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -89,19 +89,13 @@ static MUI_ENTRY roROWelcomePageEntries[] = { 8, 16, - "\x07 Ap�sa�i ENTER pentru a instala ReactOS.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { 8, 18, - "\x07 Tasta�i R pentru a reface un sistem deteriorat sau pentru", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, - " a actualiza ReactOS.", + "\x07 Tasta�i R pentru a reface un sistem deteriorat.", TEXT_STYLE_NORMAL }, { @@ -518,6 +512,76 @@ static MUI_ENTRY roRORepairPageEntries[] = } };
+static MUI_ENTRY roROUpgradePageEntries[] = +{ + { + 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, + "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 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 Press ESC to continue with a new installation.", + 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 + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY roROComputerPageEntries[] = { { @@ -1689,6 +1753,10 @@ MUI_PAGE roROPages[] = REPAIR_INTRO_PAGE, roRORepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + roROUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, roROComputerPageEntries diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index bfb351b2fd..3d809a189d 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -82,7 +82,7 @@ static MUI_ENTRY ruRUWelcomePageEntries[] = { 8, 15, - "\x07 ������ ENTER ��� ��⠭���� ReactOS.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -480,6 +480,76 @@ static MUI_ENTRY ruRURepairPageEntries[] = } };
+static MUI_ENTRY ruRUUpgradePageEntries[] = +{ + { + 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, + "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 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 Press ESC to continue with a new installation.", + 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 + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY ruRUComputerPageEntries[] = { { @@ -1636,6 +1706,10 @@ MUI_PAGE ruRUPages[] = REPAIR_INTRO_PAGE, ruRURepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + ruRUUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, ruRUComputerPageEntries diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h index b347d8638e..efb9d0c9f0 100644 --- a/base/setup/usetup/lang/sk-SK.h +++ b/base/setup/usetup/lang/sk-SK.h @@ -89,13 +89,13 @@ static MUI_ENTRY skSKWelcomePageEntries[] = { 8, 15, - "\x07 Stla�te ENTER pre nain�talovanie syst�mu ReactOS.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Stla�te R pre opravu alebo aktualiz�ciu syst�mu ReactOS.", + "\x07 Stla�te R pre opravu ciu syst�mu ReactOS.", TEXT_STYLE_NORMAL }, { @@ -487,6 +487,76 @@ static MUI_ENTRY skSKRepairPageEntries[] = } };
+static MUI_ENTRY skSKUpgradePageEntries[] = +{ + { + 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, + "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 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 Press ESC to continue with a new installation.", + 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 + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY skSKComputerPageEntries[] = { { @@ -1647,6 +1717,10 @@ MUI_PAGE skSKPages[] = REPAIR_INTRO_PAGE, skSKRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + skSKUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, skSKComputerPageEntries diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index 2874983dca..01b6e61a5c 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -85,7 +85,7 @@ static MUI_ENTRY sqALWelcomePageEntries[] = { 8, 15, - "\x07 Kliko ENTER p�r instalimin e ReactOS.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -483,6 +483,76 @@ static MUI_ENTRY sqALRepairPageEntries[] = } };
+static MUI_ENTRY sqALUpgradePageEntries[] = +{ + { + 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, + "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 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 Press ESC to continue with a new installation.", + 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 + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY sqALComputerPageEntries[] = { { @@ -1640,6 +1710,10 @@ MUI_PAGE sqALPages[] = REPAIR_INTRO_PAGE, sqALRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + sqALUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, sqALComputerPageEntries diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index b3a370e607..897fbcca62 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -88,7 +88,7 @@ static MUI_ENTRY svSEWelcomePageEntries[] = { 8, 15, - "\x07 Tryck p� ENTER f�r att installera ReactOS.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -486,6 +486,76 @@ static MUI_ENTRY svSERepairPageEntries[] = } };
+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, + "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 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 Press ESC to continue with a new installation.", + 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 + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY svSEComputerPageEntries[] = { { @@ -1643,6 +1713,10 @@ MUI_PAGE svSEPages[] = REPAIR_INTRO_PAGE, svSERepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + svSEUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, svSEComputerPageEntries diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index 63e780c64d..e9e3d8b6de 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -85,7 +85,7 @@ static MUI_ENTRY trTRWelcomePageEntries[] = { 8, 15, - "\x07 ReactOS'u kurmak i�in Giri�'e bas�n�z.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -478,6 +478,76 @@ static MUI_ENTRY trTRRepairPageEntries[] = } };
+static MUI_ENTRY trTRUpgradePageEntries[] = +{ + { + 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, + "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 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 Press ESC to continue with a new installation.", + 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 + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY trTRComputerPageEntries[] = { { @@ -1616,6 +1686,10 @@ MUI_PAGE trTRPages[] = REPAIR_INTRO_PAGE, trTRRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + trTRUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, trTRComputerPageEntries diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index fdb4dcf692..eebea803ca 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -87,7 +87,7 @@ static MUI_ENTRY ukUAWelcomePageEntries[] = { 8, 15, - "\x07 ����i�� ENTER 鮡 ��⠭���� ReactOS.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -485,6 +485,76 @@ static MUI_ENTRY ukUARepairPageEntries[] = } };
+static MUI_ENTRY ukUAUpgradePageEntries[] = +{ + { + 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, + "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 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 Press ESC to continue with a new installation.", + 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 + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY ukUAComputerPageEntries[] = { { @@ -1643,6 +1713,10 @@ MUI_PAGE ukUAPages[] = REPAIR_INTRO_PAGE, ukUARepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + ukUAUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, ukUAComputerPageEntries diff --git a/base/setup/usetup/usetup.h b/base/setup/usetup/usetup.h index 2f548b57bc..d0ce275f75 100644 --- a/base/setup/usetup/usetup.h +++ b/base/setup/usetup/usetup.h @@ -113,6 +113,7 @@ typedef enum _PAGE_NUMBER // OEM_DRIVER_PAGE,
REPAIR_INTRO_PAGE, + UPGRADE_REPAIR_PAGE,
DEVICE_SETTINGS_PAGE, COMPUTER_SETTINGS_PAGE,
-
Hermès Bélusca-Maïto