[USETUP] Modify the integrated user-mode PnP manager along the lines of UMPNPMGR...
[reactos.git] / base / setup / usetup / lang / en-US.h
index d4e7d5f..8ba4fab 100644 (file)
@@ -1,9 +1,37 @@
 #pragma once
 
-MUI_LAYOUTS enUSLayouts[] =
+static MUI_ENTRY enUSSetupInitPageEntries[] =
 {
-    { L"0409", L"00000409" },
-    { NULL, NULL }
+    {
+        4,
+        3,
+        " ReactOS " KERNEL_VERSION_STR " Setup ",
+        TEXT_STYLE_UNDERLINE
+    },
+    {
+        0,
+        20,
+        "Please wait while the ReactOS Setup initializes itself",
+        TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER
+    },
+    {
+        0,
+        21,
+        "and discovers your devices...",
+        TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER
+    },
+    {
+        0,
+        0,
+        "Please wait...",
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
+    },
+    {
+        0,
+        0,
+        NULL,
+        0
+    }
 };
 
 static MUI_ENTRY enUSLanguagePageEntries[] =
@@ -81,13 +109,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
     },
     {
@@ -139,72 +168,48 @@ static MUI_ENTRY enUSIntroPageEntries[] =
     {
         6,
         8,
-        "ReactOS Setup is in an early development phase. It does not yet",
-        TEXT_STYLE_NORMAL
+        "ReactOS Version Status",
+        TEXT_STYLE_HIGHLIGHT
     },
     {
         6,
-        9,
-        "support all the functions of a fully usable setup application.",
+        11,
+        "ReactOS is in Alpha stage, meaning it is not feature-complete",
         TEXT_STYLE_NORMAL
     },
     {
         6,
         12,
-        "The following limitations apply:",
+        "and is under heavy development. It is recommended to use it only for",
         TEXT_STYLE_NORMAL
     },
     {
-        8,
+        6,
         13,
-        "- Setup can not handle more than one primary partition per disk.",
+        "evaluation and testing purposes and not as your daily-usage OS.",
         TEXT_STYLE_NORMAL
     },
     {
-        8,
-        14,
-        "- Setup can not delete a primary partition from a disk",
-        TEXT_STYLE_NORMAL
-    },
-    {
-        8,
+        6,
         15,
-        "  as long as extended partitions exist on this disk.",
+        "Backup your data or test on a secondary computer if you attempt",
         TEXT_STYLE_NORMAL
     },
     {
-        8,
+        6,
         16,
-        "- Setup can not delete the first extended partition from a disk",
-        TEXT_STYLE_NORMAL
-    },
-    {
-        8,
-        17,
-        "  as long as other extended partitions exist on this disk.",
-        TEXT_STYLE_NORMAL
-    },
-    {
-        8,
-        18,
-        "- Setup supports FAT file systems only.",
+        "to run ReactOS on real hardware.",
         TEXT_STYLE_NORMAL
     },
     {
         8,
         19,
-        "- File system checks are not implemented yet.",
+        "\x07  Press ENTER to continue ReactOS Setup.",
         TEXT_STYLE_NORMAL
     },
     {
         8,
-        23,
-        "\x07  Press ENTER to install ReactOS.",
-        TEXT_STYLE_NORMAL
-    },
-    {
-        8,
-        25,
+        21,
         "\x07  Press F3 to quit without installing ReactOS.",
         TEXT_STYLE_NORMAL
     },
@@ -212,7 +217,7 @@ static MUI_ENTRY enUSIntroPageEntries[] =
         0,
         0,
         "ENTER = Continue   F3 = Quit",
-        TEXT_TYPE_STATUS| TEXT_PADDING_BIG
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG
     },
     {
         0,
@@ -502,6 +507,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[] =
 {
     {
@@ -565,19 +641,19 @@ static MUI_ENTRY enUSFlushPageEntries[] =
     {
         10,
         6,
-        "The system is now making sure all data is stored on your disk",
+        "The system is now making sure all data is stored on your disk.",
         TEXT_STYLE_NORMAL
     },
     {
         10,
         8,
-        "This may take a minute",
+        "This may take a minute.",
         TEXT_STYLE_NORMAL
     },
     {
         10,
         9,
-        "When finished, your computer will reboot automatically",
+        "When finished, your computer will reboot automatically.",
         TEXT_STYLE_NORMAL
     },
     {
@@ -605,7 +681,7 @@ static MUI_ENTRY enUSQuitPageEntries[] =
     {
         10,
         6,
-        "ReactOS is not completely installed",
+        "ReactOS is not completely installed.",
         TEXT_STYLE_NORMAL
     },
     {
@@ -629,7 +705,7 @@ static MUI_ENTRY enUSQuitPageEntries[] =
     {
         0,
         0,
-        "Please wait ...",
+        "Please wait...",
         TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
     },
     {
@@ -831,6 +907,12 @@ static MUI_ENTRY enUSSelectPartitionEntries[] =
     {
         8,
         19,
+        "\x07  Press L to create a logical partition.",
+        TEXT_STYLE_NORMAL
+    },
+    {
+        8,
+        21,
         "\x07  Press D to delete an existing partition.",
         TEXT_STYLE_NORMAL
     },
@@ -848,6 +930,100 @@ static MUI_ENTRY enUSSelectPartitionEntries[] =
     }
 };
 
+static MUI_ENTRY enUSConfirmDeleteSystemPartitionEntries[] =
+{
+    {
+        4,
+        3,
+        " ReactOS " KERNEL_VERSION_STR " Setup ",
+        TEXT_STYLE_UNDERLINE
+    },
+    {
+        6,
+        8,
+        "You have chosen to delete the system partition.",
+        TEXT_STYLE_NORMAL
+    },
+    {
+        6,
+        10,
+        "System partitions can contain diagnostic programs, hardware configuration",
+        TEXT_STYLE_NORMAL
+    },
+    {
+        6,
+        11,
+        "programs, programs to start an operating system (like ReactOS) or other",
+        TEXT_STYLE_NORMAL
+    },
+    {
+        6,
+        12,
+        "programs provided by the hardware manufacturer.",
+        TEXT_STYLE_NORMAL
+    },
+    {
+        6,
+        14,
+        "Delete a system partition only when you are sure that there are no such",
+        TEXT_STYLE_NORMAL
+    },
+    {
+        6,
+        15,
+        "programs on the partition, or when you are sure you want to delete them.",
+        TEXT_STYLE_NORMAL
+    },
+    {
+        6,
+        16,
+        "When you delete the partition, you might not be able to boot the",
+        TEXT_STYLE_NORMAL
+    },
+    {
+        6,
+        17,
+        "computer from the harddisk until you finished the ReactOS Setup.",
+        TEXT_STYLE_NORMAL
+    },
+    {
+        8,
+        20,
+        "\x07  Press ENTER to delete the system partition. You will be asked",
+        TEXT_STYLE_NORMAL
+    },
+    {
+        8,
+        21,
+        "   to confirm the deletion of the partition again later.",
+        TEXT_STYLE_NORMAL
+    },
+    {
+        8,
+        24,
+        "\x07  Press ESC to return to the previous page. The partition will",
+        TEXT_STYLE_NORMAL
+    },
+    {
+        8,
+        25,
+        "   not be deleted.",
+        TEXT_STYLE_NORMAL
+    },
+    {
+        0,
+        0,
+        "ENTER=Continue  ESC=Cancel",
+        TEXT_TYPE_STATUS | TEXT_PADDING_BIG
+    },
+    {
+        0,
+        0,
+        NULL,
+        0
+    }
+};
+
 static MUI_ENTRY enUSFormatPartitionEntries[] =
 {
     {
@@ -1142,7 +1318,7 @@ static MUI_ENTRY enUSPrepareCopyEntries[] =
     {
         6,
         8,
-        "Setup prepares your computer for copying the ReactOS files. ",
+        "Setup prepares your computer for copying the ReactOS files.",
         TEXT_STYLE_NORMAL
     },
     {
@@ -1264,7 +1440,7 @@ static MUI_ENTRY enUSRegistryEntries[] =
     {
         6,
         8,
-        "Setup is updating the system configuration. ",
+        "Setup is updating the system configuration.",
         TEXT_STYLE_NORMAL
     },
     {
@@ -1289,7 +1465,7 @@ MUI_ERROR enUSErrorEntries[] =
         "Success\n"
     },
     {
-        //ERROR_NOT_INSTALLED
+        // ERROR_NOT_INSTALLED
         "ReactOS is not completely installed on your\n"
         "computer. If you quit Setup now, you will need to\n"
         "run Setup again to install ReactOS.\n"
@@ -1299,73 +1475,73 @@ MUI_ERROR enUSErrorEntries[] =
         "F3 = Quit  ENTER = Continue"
     },
     {
-        //ERROR_NO_HDD
+        // ERROR_NO_HDD
         "Setup could not find a harddisk.\n",
         "ENTER = Reboot computer"
     },
     {
-        //ERROR_NO_SOURCE_DRIVE
+        // ERROR_NO_SOURCE_DRIVE
         "Setup could not find its source drive.\n",
         "ENTER = Reboot computer"
     },
     {
-        //ERROR_LOAD_TXTSETUPSIF
+        // ERROR_LOAD_TXTSETUPSIF
         "Setup failed to load the file TXTSETUP.SIF.\n",
         "ENTER = Reboot computer"
     },
     {
-        //ERROR_CORRUPT_TXTSETUPSIF
+        // ERROR_CORRUPT_TXTSETUPSIF
         "Setup found a corrupt TXTSETUP.SIF.\n",
         "ENTER = Reboot computer"
     },
     {
-        //ERROR_SIGNATURE_TXTSETUPSIF,
+        // ERROR_SIGNATURE_TXTSETUPSIF,
         "Setup found an invalid signature in TXTSETUP.SIF.\n",
         "ENTER = Reboot computer"
     },
     {
-        //ERROR_DRIVE_INFORMATION
+        // ERROR_DRIVE_INFORMATION
         "Setup could not retrieve system drive information.\n",
         "ENTER = Reboot computer"
     },
     {
-        //ERROR_WRITE_BOOT,
-        "Setup failed to install FAT bootcode on the system partition.",
+        // ERROR_WRITE_BOOT,
+        "Setup failed to install %S bootcode on the system partition.",
         "ENTER = Reboot computer"
     },
     {
-        //ERROR_LOAD_COMPUTER,
+        // ERROR_LOAD_COMPUTER,
         "Setup failed to load the computer type list.\n",
         "ENTER = Reboot computer"
     },
     {
-        //ERROR_LOAD_DISPLAY,
+        // ERROR_LOAD_DISPLAY,
         "Setup failed to load the display settings list.\n",
         "ENTER = Reboot computer"
     },
     {
-        //ERROR_LOAD_KEYBOARD,
+        // ERROR_LOAD_KEYBOARD,
         "Setup failed to load the keyboard type list.\n",
         "ENTER = Reboot computer"
     },
     {
-        //ERROR_LOAD_KBLAYOUT,
+        // ERROR_LOAD_KBLAYOUT,
         "Setup failed to load the keyboard layout list.\n",
         "ENTER = Reboot computer"
     },
     {
-        //ERROR_WARN_PARTITION,
-          "Setup found that at least one harddisk contains an incompatible\n"
-          "partition table that can not be handled properly!\n"
-          "\n"
-          "Creating or deleting partitions can destroy the partition table.\n"
-          "\n"
-          "  \x07  Press F3 to quit Setup.\n"
-          "  \x07  Press ENTER to continue.",
-          "F3= Quit  ENTER = Continue"
+        // ERROR_WARN_PARTITION,
+        "Setup found that at least one harddisk contains an incompatible\n"
+        "partition table that can not be handled properly!\n"
+        "\n"
+        "Creating or deleting partitions can destroy the partition table.\n"
+        "\n"
+        "  \x07  Press F3 to quit Setup.\n"
+        "  \x07  Press ENTER to continue.",
+        "F3 = Quit  ENTER = Continue"
     },
     {
-        //ERROR_NEW_PARTITION,
+        // ERROR_NEW_PARTITION,
         "You can not create a new Partition inside\n"
         "of an already existing Partition!\n"
         "\n"
@@ -1373,144 +1549,153 @@ MUI_ERROR enUSErrorEntries[] =
         NULL
     },
     {
-        //ERROR_DELETE_SPACE,
+        // ERROR_DELETE_SPACE,
         "You can not delete unpartitioned disk space!\n"
         "\n"
         "  * Press any key to continue.",
         NULL
     },
     {
-        //ERROR_INSTALL_BOOTCODE,
-        "Setup failed to install the FAT bootcode on the system partition.",
+        // ERROR_INSTALL_BOOTCODE,
+        "Setup failed to install the %S bootcode on the system partition.",
         "ENTER = Reboot computer"
     },
     {
-        //ERROR_NO_FLOPPY,
+        // ERROR_NO_FLOPPY,
         "No disk in drive A:.",
         "ENTER = Continue"
     },
     {
-        //ERROR_UPDATE_KBSETTINGS,
+        // ERROR_UPDATE_KBSETTINGS,
         "Setup failed to update keyboard layout settings.",
         "ENTER = Reboot computer"
     },
     {
-        //ERROR_UPDATE_DISPLAY_SETTINGS,
+        // ERROR_UPDATE_DISPLAY_SETTINGS,
         "Setup failed to update display registry settings.",
         "ENTER = Reboot computer"
     },
     {
-        //ERROR_IMPORT_HIVE,
+        // ERROR_IMPORT_HIVE,
         "Setup failed to import a hive file.",
         "ENTER = Reboot computer"
     },
     {
-        //ERROR_FIND_REGISTRY
+        // ERROR_FIND_REGISTRY
         "Setup failed to find the registry data files.",
         "ENTER = Reboot computer"
     },
     {
-        //ERROR_CREATE_HIVE,
+        // ERROR_CREATE_HIVE,
         "Setup failed to create the registry hives.",
         "ENTER = Reboot computer"
     },
     {
-        //ERROR_INITIALIZE_REGISTRY,
+        // ERROR_INITIALIZE_REGISTRY,
         "Setup failed to initialize the registry.",
         "ENTER = Reboot computer"
     },
     {
-        //ERROR_INVALID_CABINET_INF,
+        // ERROR_INVALID_CABINET_INF,
         "Cabinet has no valid inf file.\n",
         "ENTER = Reboot computer"
     },
     {
-        //ERROR_CABINET_MISSING,
+        // ERROR_CABINET_MISSING,
         "Cabinet not found.\n",
         "ENTER = Reboot computer"
     },
     {
-        //ERROR_CABINET_SCRIPT,
+        // ERROR_CABINET_SCRIPT,
         "Cabinet has no setup script.\n",
         "ENTER = Reboot computer"
     },
     {
-        //ERROR_COPY_QUEUE,
+        // ERROR_COPY_QUEUE,
         "Setup failed to open the copy file queue.\n",
         "ENTER = Reboot computer"
     },
     {
-        //ERROR_CREATE_DIR,
-        "Setup could not create install directories.",
+        // ERROR_CREATE_DIR,
+        "Setup could not create the installation directories.",
         "ENTER = Reboot computer"
     },
     {
-        //ERROR_TXTSETUP_SECTION,
-        "Setup failed to find the 'Directories' section\n"
+        // ERROR_TXTSETUP_SECTION,
+        "Setup failed to find the '%S' section\n"
         "in TXTSETUP.SIF.\n",
         "ENTER = Reboot computer"
     },
     {
-        //ERROR_CABINET_SECTION,
-        "Setup failed to find the 'Directories' section\n"
+        // ERROR_CABINET_SECTION,
+        "Setup failed to find the '%S' section\n"
         "in the cabinet.\n",
         "ENTER = Reboot computer"
     },
     {
-        //ERROR_CREATE_INSTALL_DIR
-        "Setup could not create the install directory.",
+        // ERROR_CREATE_INSTALL_DIR
+        "Setup could not create the installation directory.",
         "ENTER = Reboot computer"
     },
     {
-        //ERROR_FIND_SETUPDATA,
-        "Setup failed to find the 'SetupData' section\n"
-        "in TXTSETUP.SIF.\n",
-        "ENTER = Reboot computer"
-    },
-    {
-        //ERROR_WRITE_PTABLE,
+        // ERROR_WRITE_PTABLE,
         "Setup failed to write partition tables.\n"
         "ENTER = Reboot computer"
     },
     {
-        //ERROR_ADDING_CODEPAGE,
+        // ERROR_ADDING_CODEPAGE,
         "Setup failed to add codepage to registry.\n"
         "ENTER = Reboot computer"
     },
     {
-        //ERROR_UPDATE_LOCALESETTINGS,
+        // ERROR_UPDATE_LOCALESETTINGS,
         "Setup could not set the system locale.\n"
         "ENTER = Reboot computer"
     },
     {
-        //ERROR_ADDING_KBLAYOUTS,
+        // ERROR_ADDING_KBLAYOUTS,
         "Setup failed to add keyboard layouts to registry.\n"
         "ENTER = Reboot computer"
     },
     {
-        //ERROR_UPDATE_GEOID,
+        // ERROR_UPDATE_GEOID,
         "Setup could not set the geo id.\n"
         "ENTER = Reboot computer"
     },
     {
-        //ERROR_INSUFFICIENT_DISKSPACE,
-        "Not enough free space in the selected partition.\n"
+        // ERROR_DIRECTORY_NAME,
+        "Invalid directory name.\n"
+        "\n"
+        "  * Press any key to continue."
+    },
+    {
+        // ERROR_INSUFFICIENT_PARTITION_SIZE,
+        "The selected partition is not large enough to install ReactOS.\n"
+        "The install partition must have a size of at least %lu MB.\n"
+        "\n"
         "  * Press any key to continue.",
         NULL
     },
     {
-        //ERROR_PARTITION_TABLE_FULL,
+        // ERROR_PARTITION_TABLE_FULL,
         "You can not create a new primary or extended partition in the\n"
         "partition table of this disk because the partition table is full.\n"
         "\n"
         "  * Press any key to continue."
     },
     {
-        //ERROR_ONLY_ONE_EXTENDED,
+        // ERROR_ONLY_ONE_EXTENDED,
         "You can not create more than one extended partition per disk.\n"
         "\n"
         "  * Press any key to continue."
     },
+    {
+        // ERROR_FORMATTING_PARTITION,
+        "Setup is unable to format the partition:\n"
+        " %S\n"
+        "\n"
+        "ENTER = Reboot computer"
+    },
     {
         NULL,
         NULL
@@ -1519,12 +1704,16 @@ MUI_ERROR enUSErrorEntries[] =
 
 MUI_PAGE enUSPages[] =
 {
+    {
+        SETUP_INIT_PAGE,
+        enUSSetupInitPageEntries
+    },
     {
         LANGUAGE_PAGE,
         enUSLanguagePageEntries
     },
     {
-        START_PAGE,
+        WELCOME_PAGE,
         enUSWelcomePageEntries
     },
     {
@@ -1543,6 +1732,10 @@ MUI_PAGE enUSPages[] =
         REPAIR_INTRO_PAGE,
         enUSRepairPageEntries
     },
+    {
+        UPGRADE_REPAIR_PAGE,
+        enUSUpgradePageEntries
+    },
     {
         COMPUTER_SETTINGS_PAGE,
         enUSComputerPageEntries
@@ -1559,6 +1752,10 @@ MUI_PAGE enUSPages[] =
         SELECT_PARTITION_PAGE,
         enUSSelectPartitionEntries
     },
+    {
+        CONFIRM_DELETE_SYSTEM_PARTITION_PAGE,
+        enUSConfirmDeleteSystemPartitionEntries
+    },
     {
         SELECT_FILE_SYSTEM_PAGE,
         enUSSelectFSEntries
@@ -1645,16 +1842,26 @@ MUI_STRING enUSStrings[] =
     "This Partition will be formatted next."},
     {STRING_NONFORMATTEDPART,
     "You chose to install ReactOS on a new or unformatted Partition."},
+    {STRING_NONFORMATTEDSYSTEMPART,
+    "The system partition is not formatted yet."},
+    {STRING_NONFORMATTEDOTHERPART,
+    "The new partition is not formatted yet."},
     {STRING_INSTALLONPART,
     "Setup installs ReactOS onto Partition"},
     {STRING_CHECKINGPART,
     "Setup is now checking the selected partition."},
+    {STRING_CONTINUE,
+    "ENTER = Continue"},
     {STRING_QUITCONTINUE,
-    "F3= Quit  ENTER = Continue"},
+    "F3 = Quit  ENTER = Continue"},
     {STRING_REBOOTCOMPUTER,
     "ENTER = Reboot computer"},
-    {STRING_TXTSETUPFAILED,
-    "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"},
+    {STRING_DELETING,
+     "   Deleting file: %S"},
+    {STRING_MOVING,
+     "   Moving file: %S to: %S"},
+    {STRING_RENAMING,
+     "   Renaming file: %S to: %S"},
     {STRING_COPYING,
      "   Copying file: %S"},
     {STRING_SETUPCOPYINGFILES,
@@ -1663,7 +1870,7 @@ MUI_STRING enUSStrings[] =
     "   Updating registry hives..."},
     {STRING_IMPORTFILE,
     "   Importing %S..."},
-    {STRING_DISPLAYETTINGSUPDATE,
+    {STRING_DISPLAYSETTINGSUPDATE,
     "   Updating display registry settings..."},
     {STRING_LOCALESETTINGSUPDATE,
     "   Updating locale settings..."},
@@ -1675,6 +1882,8 @@ MUI_STRING enUSStrings[] =
     "   Done..."},
     {STRING_REBOOTCOMPUTER2,
     "   ENTER = Reboot computer"},
+    {STRING_REBOOTPROGRESSBAR,
+    " Your computer will reboot in %li second(s)... "},
     {STRING_CONSOLEFAIL1,
     "Unable to open the console\r\n\r\n"},
     {STRING_CONSOLEFAIL2,
@@ -1691,28 +1900,32 @@ MUI_STRING enUSStrings[] =
     " Format partition as %S file system "},
     {STRING_KEEPFORMAT,
     " Keep current file system (no changes) "},
-    {STRING_HDINFOPARTCREATE,
-    "%I64u %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) on %wZ."},
-    {STRING_HDDINFOUNK1,
-    "%I64u %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu)."},
+    {STRING_HDINFOPARTCREATE_1,
+    "%I64u %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."},
+    {STRING_HDINFOPARTCREATE_2,
+    "%I64u %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
     {STRING_HDDINFOUNK2,
-    "   %c%c  Type %lu    %I64u %s"},
-    {STRING_HDINFOPARTDELETE,
-    "on %I64u %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) on %wZ."},
-    {STRING_HDDINFOUNK3,
-    "on %I64u %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu)."},
-    {STRING_HDINFOPARTZEROED,
-    "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
+    "   %c%c  Type 0x%02X    %I64u %s"},
+    {STRING_HDINFOPARTDELETE_1,
+    "on %I64u %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."},
+    {STRING_HDINFOPARTDELETE_2,
+    "on %I64u %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
+    {STRING_HDINFOPARTZEROED_1,
+    "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
+    // {STRING_HDINFOPARTZEROED_2,
+    // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]."},
     {STRING_HDDINFOUNK4,
-    "%c%c  Type %lu    %I64u %s"},
-    {STRING_HDINFOPARTEXISTS,
-    "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
+    "%c%c  Type 0x%02X    %I64u %s"},
+    {STRING_HDINFOPARTEXISTS_1,
+    "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
+    // {STRING_HDINFOPARTEXISTS_2,
+    // "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]."},
     {STRING_HDDINFOUNK5,
-    "%c%c  %sType %-3u%s                       %6lu %s"},
-    {STRING_HDINFOPARTSELECT,
-    "%6lu %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) on %S"},
-    {STRING_HDDINFOUNK6,
-    "%6lu %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu)"},
+    "%c%c %c %sType %-3u%s                      %6lu %s"},
+    {STRING_HDINFOPARTSELECT_1,
+    "%6lu %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"},
+    {STRING_HDINFOPARTSELECT_2,
+    "%6lu %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
     {STRING_NEWPARTITION,
     "Setup created a new partition on"},
     {STRING_UNPSPACE,