[USETUP] Add an upgrade/repair installation page.
authorHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Mon, 15 May 2017 01:48:19 +0000 (01:48 +0000)
committerHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Fri, 26 Oct 2018 00:15:19 +0000 (02:15 +0200)
Translators, please update the associated translations!

svn path=/branches/setup_improvements/; revision=74548

26 files changed:
base/setup/usetup/lang/bg-BG.h
base/setup/usetup/lang/bn-BD.h
base/setup/usetup/lang/cs-CZ.h
base/setup/usetup/lang/da-DK.h
base/setup/usetup/lang/de-DE.h
base/setup/usetup/lang/el-GR.h
base/setup/usetup/lang/en-US.h
base/setup/usetup/lang/es-ES.h
base/setup/usetup/lang/et-EE.h
base/setup/usetup/lang/fr-FR.h
base/setup/usetup/lang/he-IL.h
base/setup/usetup/lang/it-IT.h
base/setup/usetup/lang/ja-JP.h
base/setup/usetup/lang/lt-LT.h
base/setup/usetup/lang/ms-MY.h
base/setup/usetup/lang/nl-NL.h
base/setup/usetup/lang/pl-PL.h
base/setup/usetup/lang/pt-BR.h
base/setup/usetup/lang/ro-RO.h
base/setup/usetup/lang/ru-RU.h
base/setup/usetup/lang/sk-SK.h
base/setup/usetup/lang/sq-AL.h
base/setup/usetup/lang/sv-SE.h
base/setup/usetup/lang/tr-TR.h
base/setup/usetup/lang/uk-UA.h
base/setup/usetup/usetup.h

index 01fc948..6191c1f 100644 (file)
@@ -84,7 +84,7 @@ static MUI_ENTRY bgBGWelcomePageEntries[] =
     {
         8,
         15,
-        "\x07  \8d â¨á­¥â¥ ENTER §  á« £ ­¥ ­  \90¥ ªâ\8e\91.",
+        "\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
index 689e88c..847c53b 100644 (file)
@@ -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
index 82a5691..7972b86 100644 (file)
@@ -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
index 5e5c1ba..a58f2db 100644 (file)
@@ -81,13 +81,13 @@ static MUI_ENTRY daDKWelcomePageEntries[] =
     {
         8,
         15,
-        "\x07  Tryk p\86 ENTER for at installere ReactOS.",
+        "\x07  Press ENTER to install or upgrade ReactOS.",
         TEXT_STYLE_NORMAL
     },
     {
         8,
         17,
-        "\x07  Tryk p\86 R reparere eller opdatere ReactOS.",
+        "\x07  Tryk p\86 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
index abd8492..2e2d66e 100644 (file)
@@ -82,13 +82,13 @@ static MUI_ENTRY deDEWelcomePageEntries[] =
     {
         8,
         15,
-        "\x07  Dr\81cken Sie die EINGABETASTE, um ReactOS zu installieren.",
+        "\x07  Press ENTER to install or upgrade ReactOS.",
         TEXT_STYLE_NORMAL
     },
     {
         8,
         17,
-        "\x07  Dr\81cken Sie R, um ReactOS zu reparieren oder aktualisieren.",
+        "\x07  Dr\81cken 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
index 8431842..4052a89 100644 (file)
@@ -82,7 +82,7 @@ static MUI_ENTRY elGRWelcomePageEntries[] =
     {
         7,
         15,
-        "\x07  \8f\98«ã©«\9c ENTER \9a \98 ¤\98 \9c\9a¡\98«\98©«ã©\9c«\9c «¦ 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
index 396a009..5905590 100644 (file)
@@ -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
index 569fd5e..c60e0da 100644 (file)
@@ -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
index 87ccc8b..ff36b11 100644 (file)
@@ -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
index ed74aec..3cf8aa7 100644 (file)
@@ -82,7 +82,7 @@ static MUI_ENTRY frFRWelcomePageEntries[] =
     {
         8,
         15,
-        "\x07  Appuyer sur ENTR\90E pour installer ReactOS.",
+        "\x07  Appuyer sur ENTR\90E pour installer ou mettre \85 jour ReactOS.",
         TEXT_STYLE_NORMAL
     },
     {
@@ -463,7 +463,7 @@ static MUI_ENTRY frFRRepairPageEntries[] =
     {
         8,
         19,
-        "\x07  Appuyer sur \90CHAP pour retourne\85 la page principale.",
+        "\x07  Appuyer sur \90CHAP pour reveni\85 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 \85 jour l'une des",
+        TEXT_STYLE_NORMAL
+    },
+    {
+        6,
+        9,
+        "installations de ReactOS list\82es ci-dessous, ou bien, si l'une d'elles",
+        TEXT_STYLE_NORMAL
+    },
+    {
+        6,
+        10,
+        "est endommag\82e, le programme d'installation peut essayer de la r\82parer.",
+        TEXT_STYLE_NORMAL
+    },
+    {
+        6,
+        12,
+        "Les fonctions de r\82paration ne sont pas toutes impl\82ment\82es.",
+        TEXT_STYLE_HIGHLIGHT
+    },
+    {
+        8,
+        15,
+        "\x07  Appuyer sur HAUT ou BAS pour s\82lectionner une installation.",
+        TEXT_STYLE_NORMAL
+    },
+    {
+        8,
+        17,
+        "\x07  Appuyer sur U pour mettre \85 jour l'installation s\82lectionn\82e.",
+        TEXT_STYLE_NORMAL
+    },
+    {
+        8,
+        19,
+        "\x07  Appuyer sur \90CHAP 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 \85 jour   \90CHAP = 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 \90CHAP pour retourne\85 la page principale. La partition",
+        "\x07  Appuyer sur \90CHAP pour reveni\85 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
index 75a192a..29260ab 100644 (file)
@@ -82,7 +82,7 @@ static MUI_ENTRY heILWelcomePageEntries[] =
     {
         8,
         15,
-        "\x07  ReactOS \9a\80 \8f\89\97\9a\84\8c \89\83\8b ENTER \99\97\84",
+        "\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
index e7da507..8d4987f 100644 (file)
@@ -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
index 52fc2c7..f71e340 100644 (file)
@@ -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
index d5fc647..d2cb295 100644 (file)
@@ -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
index e7ef24f..e8ae583 100644 (file)
@@ -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
index d3872cc..f8b6711 100644 (file)
@@ -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
index 5de776e..1df2488 100644 (file)
@@ -92,7 +92,7 @@ static MUI_ENTRY plPLWelcomePageEntries[] =
     {
         8,
         15,
-        "\x07  Naci\98nij ENTER, aby zainstalowa\86 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
index a28ecef..6f3cba1 100644 (file)
@@ -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
index 443688b..2a4f788 100644 (file)
@@ -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
index bfb351b..3d809a1 100644 (file)
@@ -82,7 +82,7 @@ static MUI_ENTRY ruRUWelcomePageEntries[] =
     {
         8,
         15,
-        "\x07  \8d ¦¬¨â¥ 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
index b347d86..efb9d0c 100644 (file)
@@ -89,13 +89,13 @@ static MUI_ENTRY skSKWelcomePageEntries[] =
     {
         8,
         15,
-        "\x07  Stla\9fte ENTER pre nainçtalovanie syst\82mu ReactOS.",
+        "\x07  Press ENTER to install or upgrade ReactOS.",
         TEXT_STYLE_NORMAL
     },
     {
         8,
         17,
-        "\x07  Stla\9fte R pre opravu alebo aktualiz ciu syst\82mu ReactOS.",
+        "\x07  Stla\9fte R pre opravu ciu syst\82mu 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
index 2874983..01b6e61 100644 (file)
@@ -85,7 +85,7 @@ static MUI_ENTRY sqALWelcomePageEntries[] =
     {
         8,
         15,
-        "\x07  Kliko ENTER p\89r 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
index b3a370e..897fbcc 100644 (file)
@@ -88,7 +88,7 @@ static MUI_ENTRY svSEWelcomePageEntries[] =
     {
         8,
         15,
-        "\x07  Tryck p\86 ENTER f\94r 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
index 63e780c..e9e3d8b 100644 (file)
@@ -85,7 +85,7 @@ static MUI_ENTRY trTRWelcomePageEntries[] =
     {
         8,
         15,
-        "\x07  ReactOS'u kurmak i\87in Giri\9f'e bas\8dn\8dz.",
+        "\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
index fdb4dcf..eebea80 100644 (file)
@@ -87,7 +87,7 @@ static MUI_ENTRY ukUAWelcomePageEntries[] =
     {
         8,
         15,
-        "\x07  \8d â¨á­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
index 2f548b5..d0ce275 100644 (file)
@@ -113,6 +113,7 @@ typedef enum _PAGE_NUMBER
 //    OEM_DRIVER_PAGE,
 
     REPAIR_INTRO_PAGE,
+    UPGRADE_REPAIR_PAGE,
 
     DEVICE_SETTINGS_PAGE,
     COMPUTER_SETTINGS_PAGE,