[hbelusca] 74614: [USETUP]: Rename some of the uninformative "STRING_HDDINFOUNKx" string labels into more informative ones (actually, when they are versions of others strings, with the disk driver ...

Author: hbelusca
Date: Sun May 21 23:17:24 2017
New Revision: 74614

URL: http://svn.reactos.org/svn/reactos?rev=74614&view=rev
Log:
[USETUP]: Rename some of the uninformative "STRING_HDDINFOUNKx" string labels into more informative ones (actually, when they are versions of others strings, with the disk driver name displayed, I just reuse their string labels and add a "_1" or "_2" in accordance). Also, reserve a new field to display whether the disk is MBR or GPT-initialized.
The code adaptations in usetup.c will follow in a subsequent commit.

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

Modified: branches/setup_improvements/base/setup/usetup/lang/bg-BG.h
URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us...
==============================================================================
--- branches/setup_improvements/base/setup/usetup/lang/bg-BG.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/usetup/lang/bg-BG.h	[iso-8859-1] Sun May 21 23:17:24 2017
@@ -1808,28 +1808,28 @@
     " ”®à¬ â¨à ­¥ ­  ¤ï«  ª â® %S ä ©«®¢  ã।¡  "},
     {STRING_KEEPFORMAT,
     " ‡ ¯ §¢ ­¥ ­  ä ©«®¢ â  ã।¡  (¡¥§ ¯à®¬¥­¨) "},
-    {STRING_HDINFOPARTCREATE,
-    "%I64u %s  â¢êठ¤¨áª %lu  (ˆ§¢®¤=%hu, ˜¨­ =%hu, Ž“=%hu) ­  %wZ."},
-    {STRING_HDDINFOUNK1,
-    "%I64u %s  â¢êठ¤¨áª %lu  (ˆ§¢®¤=%hu, ˜¨­ =%hu, Ž“=%hu)."},
+    {STRING_HDINFOPARTCREATE_1,
+    "%I64u %s  â¢êठ¤¨áª %lu  (ˆ§¢®¤=%hu, ˜¨­ =%hu, Ž“=%hu) ­  %wZ [%s]."},
+    {STRING_HDINFOPARTCREATE_2,
+    "%I64u %s  â¢êठ¤¨áª %lu  (ˆ§¢®¤=%hu, ˜¨­ =%hu, Ž“=%hu) [%s]."},
     {STRING_HDDINFOUNK2,
     "   %c%c  ¢¨¤ 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTDELETE,
-    "­  %I64u %s  â¢êठ¤¨áª %lu  (ˆ§¢®¤=%hu, ˜¨­ =%hu, Ž“=%hu) ­  %wZ."},
-    {STRING_HDDINFOUNK3,
-    "­  %I64u %s  â¢êठ¤¨áª %lu  (ˆ§¢®¤=%hu, ˜¨­ =%hu, Ž“=%hu)."},
-    {STRING_HDINFOPARTZEROED,
-    "â¢êठ¤¨áª %lu (%I64u %s), ˆ§¢®¤=%hu, ˜¨­ =%hu, Ž“=%hu (%wZ)."},
+    {STRING_HDINFOPARTDELETE_1,
+    "­  %I64u %s  â¢êठ¤¨áª %lu  (ˆ§¢®¤=%hu, ˜¨­ =%hu, Ž“=%hu) ­  %wZ [%s]."},
+    {STRING_HDINFOPARTDELETE_2,
+    "­  %I64u %s  â¢êठ¤¨áª %lu  (ˆ§¢®¤=%hu, ˜¨­ =%hu, Ž“=%hu) [%s]."},
+    {STRING_HDINFOPARTZEROED_1,
+    "â¢êठ¤¨áª %lu (%I64u %s), ˆ§¢®¤=%hu, ˜¨­ =%hu, Ž“=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK4,
     "%c%c  ¢¨¤ 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTEXISTS,
-    "­  â¢êठ¤¨áª %lu (%I64u %s), ˆ§¢®¤=%hu, ˜¨­ =%hu, Ž“=%hu (%wZ)."},
+    {STRING_HDINFOPARTEXISTS_1,
+    "­  â¢êठ¤¨áª %lu (%I64u %s), ˆ§¢®¤=%hu, ˜¨­ =%hu, Ž“=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK5,
     "%c%c %c %s¢¨¤ %-3u%s                      %6lu %s"},
-    {STRING_HDINFOPARTSELECT,
-    "%6lu %s  â¢êठ¤¨áª %lu  (ˆ§¢®¤=%hu, ˜¨­ =%hu, Ž“=%hu) ­  %S"},
-    {STRING_HDDINFOUNK6,
-    "%6lu %s  â¢êठ¤¨áª %lu  (ˆ§¢®¤=%hu, ˜¨­ =%hu, Ž“=%hu)"},
+    {STRING_HDINFOPARTSELECT_1,
+    "%6lu %s  â¢êठ¤¨áª %lu  (ˆ§¢®¤=%hu, ˜¨­ =%hu, Ž“=%hu) ­  %wZ [%s]"},
+    {STRING_HDINFOPARTSELECT_2,
+    "%6lu %s  â¢êठ¤¨áª %lu  (ˆ§¢®¤=%hu, ˜¨­ =%hu, Ž“=%hu) [%s]"},
     {STRING_NEWPARTITION,
     "¥ áꧤ ¤¥­ ­®¢ ¤ï« ­ "},
     {STRING_UNPSPACE,

Modified: branches/setup_improvements/base/setup/usetup/lang/bn-BD.h
URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us...
==============================================================================
--- branches/setup_improvements/base/setup/usetup/lang/bn-BD.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/usetup/lang/bn-BD.h	[iso-8859-1] Sun May 21 23:17:24 2017
@@ -1793,28 +1793,28 @@
     " 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 0x%02X    %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)."},
+    {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_HDDINFOUNK4,
     "%c%c  Type 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTEXISTS,
-    "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTEXISTS_1,
+    "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK5,
     "%c%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)"},
+    {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,

Modified: branches/setup_improvements/base/setup/usetup/lang/cs-CZ.h
URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us...
==============================================================================
--- branches/setup_improvements/base/setup/usetup/lang/cs-CZ.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/usetup/lang/cs-CZ.h	[iso-8859-1] Sun May 21 23:17:24 2017
@@ -1801,28 +1801,28 @@
     " Zform tovat odd¡l na souborovì syst‚m %S "},
     {STRING_KEEPFORMAT,
     " Ponechat souŸasnì souborovì syst‚m (bez zmØny) "},
-    {STRING_HDINFOPARTCREATE,
-    "%I64u %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) na %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) na %wZ [%s]."},
+    {STRING_HDINFOPARTCREATE_2,
+    "%I64u %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
     {STRING_HDDINFOUNK2,
     "   %c%c  Typ 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTDELETE,
-    "na %I64u %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) na %wZ."},
-    {STRING_HDDINFOUNK3,
-    "na %I64u %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu)."},
-    {STRING_HDINFOPARTZEROED,
-    "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTDELETE_1,
+    "na %I64u %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) na %wZ [%s]."},
+    {STRING_HDINFOPARTDELETE_2,
+    "na %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_HDDINFOUNK4,
     "%c%c  Typ 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTEXISTS,
-    "na harddisku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTEXISTS_1,
+    "na harddisku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK5,
     "%c%c %c %sTyp %-3u%s                     %6lu %s"},
-    {STRING_HDINFOPARTSELECT,
-    "%6lu %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) na %S"},
-    {STRING_HDDINFOUNK6,
-    "%6lu %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu)"},
+    {STRING_HDINFOPARTSELECT_1,
+    "%6lu %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) na %wZ [%s]"},
+    {STRING_HDINFOPARTSELECT_2,
+    "%6lu %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
     {STRING_NEWPARTITION,
     "Instalace vytvoýila novì odd¡l na"},
     {STRING_UNPSPACE,

Modified: branches/setup_improvements/base/setup/usetup/lang/da-DK.h
URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us...
==============================================================================
--- branches/setup_improvements/base/setup/usetup/lang/da-DK.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/usetup/lang/da-DK.h	[iso-8859-1] Sun May 21 23:17:24 2017
@@ -1807,28 +1807,28 @@
     " Formater partitionen som %S-filesystemet "},
     {STRING_KEEPFORMAT,
     " Behold nuv‘rende filsystem (ingen ‘ndringer) "},
-    {STRING_HDINFOPARTCREATE,
-    "%I64u %s  harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) p† %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) p† %wZ [%s]."},
+    {STRING_HDINFOPARTCREATE_2,
+    "%I64u %s  harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
     {STRING_HDDINFOUNK2,
     "   %c%c  type 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTDELETE,
-    "p† %I64u %s  harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) p† %wZ."},
-    {STRING_HDDINFOUNK3,
-    "p† %I64u %s  harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu)."},
-    {STRING_HDINFOPARTZEROED,
-    "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTDELETE_1,
+    "p† %I64u %s  harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) p† %wZ [%s]."},
+    {STRING_HDINFOPARTDELETE_2,
+    "p† %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_HDDINFOUNK4,
     "%c%c  type 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTEXISTS,
-    "p† harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTEXISTS_1,
+    "p† harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK5,
     "%c%c %c %stype %-3u%s                      %6lu %s"},
-    {STRING_HDINFOPARTSELECT,
-    "%6lu %s  harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) p† %S"},
-    {STRING_HDDINFOUNK6,
-    "%6lu %s  harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu)"},
+    {STRING_HDINFOPARTSELECT_1,
+    "%6lu %s  harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) p† %wZ [%s]"},
+    {STRING_HDINFOPARTSELECT_2,
+    "%6lu %s  harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
     {STRING_NEWPARTITION,
     "Installationen har lavet en ny partition p†"},
     {STRING_UNPSPACE,

Modified: branches/setup_improvements/base/setup/usetup/lang/de-DE.h
URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us...
==============================================================================
--- branches/setup_improvements/base/setup/usetup/lang/de-DE.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/usetup/lang/de-DE.h	[iso-8859-1] Sun May 21 23:17:24 2017
@@ -1791,28 +1791,28 @@
     " Partition mit dem %S-Dateisystem formatieren "},
     {STRING_KEEPFORMAT,
     " Dateisystem beibehalten (Keine Ver„nderungen) "},
-    {STRING_HDINFOPARTCREATE,
-    "%I64u %s  Festplatte %lu  (Port=%hu, Bus=%hu, Id=%hu) auf %wZ."},
-    {STRING_HDDINFOUNK1,
-    "%I64u %s  Festplatte %lu  (Port=%hu, Bus=%hu, Id=%hu)."},
+    {STRING_HDINFOPARTCREATE_1,
+    "%I64u %s  Festplatte %lu  (Port=%hu, Bus=%hu, Id=%hu) auf %wZ [%s]."},
+    {STRING_HDINFOPARTCREATE_2,
+    "%I64u %s  Festplatte %lu  (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
     {STRING_HDDINFOUNK2,
     "   %c%c  Typ 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTDELETE,
-    "auf %I64u %s  Festplatte %lu  (Port=%hu, Bus=%hu, Id=%hu) auf %wZ."},
-    {STRING_HDDINFOUNK3,
-    "auf %I64u %s  Festplatte %lu  (Port=%hu, Bus=%hu, Id=%hu)."},
-    {STRING_HDINFOPARTZEROED,
-    "Festplatte %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTDELETE_1,
+    "auf %I64u %s  Festplatte %lu  (Port=%hu, Bus=%hu, Id=%hu) auf %wZ [%s]."},
+    {STRING_HDINFOPARTDELETE_2,
+    "auf %I64u %s  Festplatte %lu  (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
+    {STRING_HDINFOPARTZEROED_1,
+    "Festplatte %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK4,
     "%c%c  Typ 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTEXISTS,
-    "auf Festplatte %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTEXISTS_1,
+    "auf Festplatte %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK5,
     "%c%c %c %sTyp %-3u%s                      %6lu %s"},
-    {STRING_HDINFOPARTSELECT,
-    "%6lu %s  Festplatte %lu  (Port=%hu, Bus=%hu, Id=%hu) auf %S"},
-    {STRING_HDDINFOUNK6,
-    "%6lu %s  Festplatte %lu  (Port=%hu, Bus=%hu, Id=%hu)"},
+    {STRING_HDINFOPARTSELECT_1,
+    "%6lu %s  Festplatte %lu  (Port=%hu, Bus=%hu, Id=%hu) auf %wZ [%s]"},
+    {STRING_HDINFOPARTSELECT_2,
+    "%6lu %s  Festplatte %lu  (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
     {STRING_NEWPARTITION,
     "Setup erstellte eine neue Partition auf"},
     {STRING_UNPSPACE,

Modified: branches/setup_improvements/base/setup/usetup/lang/el-GR.h
URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us...
==============================================================================
--- branches/setup_improvements/base/setup/usetup/lang/el-GR.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/usetup/lang/el-GR.h	[iso-8859-1] Sun May 21 23:17:24 2017
@@ -1812,28 +1812,28 @@
     " ƒ ˜£æ¨­à©ž «¦¬ partition ઠ%S ©ç©«ž£˜ ˜¨®œåठ"},
     {STRING_KEEPFORMAT,
     " Œ˜ §˜¨˜£œå¤œ  «¦ ©ç©«ž£˜ ˜¨®œåठઠ⮜  (¡˜£å˜ ˜¢¢˜šã) "},
-    {STRING_HDINFOPARTCREATE,
-    "%I64u %s  ‘¡¢ž¨æª ›å©¡¦ª %lu  (Port=%hu, Bus=%hu, Id=%hu) on %wZ."},
-    {STRING_HDDINFOUNK1,
-    "%I64u %s  ‘¡¢ž¨æª ›å©¡¦ª %lu  (Port=%hu, Bus=%hu, Id=%hu)."},
+    {STRING_HDINFOPARTCREATE_1,
+    "%I64u %s  ‘¡¢ž¨æª ›å©¡¦ª %lu  (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."},
+    {STRING_HDINFOPARTCREATE_2,
+    "%I64u %s  ‘¡¢ž¨æª ›å©¡¦ª %lu  (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
     {STRING_HDDINFOUNK2,
     "   %c%c  Type 0x%02X    %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,
-    "‘¡¢ž¨æª ›å©¡¦ª %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
+    {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,
+    "‘¡¢ž¨æª ›å©¡¦ª %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK4,
     "%c%c  Type 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTEXISTS,
-    "©«¦ ©¡¢ž¨æ ›å©¡¦ %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTEXISTS_1,
+    "©«¦ ©¡¢ž¨æ ›å©¡¦ %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK5,
     "%c%c %c %sType %-3u%s                      %6lu %s"},
-    {STRING_HDINFOPARTSELECT,
-    "%6lu %s  ‘¡¢ž¨æª ›å©¡¦ª %lu  (Port=%hu, Bus=%hu, Id=%hu) on %S"},
-    {STRING_HDDINFOUNK6,
-    "%6lu %s  ‘¡¢ž¨æª ›å©¡¦ª %lu  (Port=%hu, Bus=%hu, Id=%hu)"},
+    {STRING_HDINFOPARTSELECT_1,
+    "%6lu %s  ‘¡¢ž¨æª ›å©¡¦ª %lu  (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"},
+    {STRING_HDINFOPARTSELECT_2,
+    "%6lu %s  ‘¡¢ž¨æª ›å©¡¦ª %lu  (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
     {STRING_NEWPARTITION,
     "† œš¡˜«á©«˜©ž ›ž£ ¦ç¨šž©œ ⤘ ¤â¦ partition ©«¦"},
     {STRING_UNPSPACE,

Modified: branches/setup_improvements/base/setup/usetup/lang/en-US.h
URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us...
==============================================================================
--- branches/setup_improvements/base/setup/usetup/lang/en-US.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/usetup/lang/en-US.h	[iso-8859-1] Sun May 21 23:17:24 2017
@@ -1793,28 +1793,32 @@
     " 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 0x%02X    %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)."},
+    {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 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTEXISTS,
-    "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
+    {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 %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)"},
+    {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,

Modified: branches/setup_improvements/base/setup/usetup/lang/es-ES.h
URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us...
==============================================================================
--- branches/setup_improvements/base/setup/usetup/lang/es-ES.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/usetup/lang/es-ES.h	[iso-8859-1] Sun May 21 23:17:24 2017
@@ -1803,28 +1803,28 @@
     " Formatear la partici¢n con sistema de archivos %S "},
     {STRING_KEEPFORMAT,
     " Mantener el sistema de archivos actual (sin cambios) "},
-    {STRING_HDINFOPARTCREATE,
-    "%I64u %s  Disco duro %lu  (Port=%hu, Bus=%hu, Id=%hu) en %wZ."},
-    {STRING_HDDINFOUNK1,
-    "%I64u %s  Disco duro %lu  (Port=%hu, Bus=%hu, Id=%hu)."},
+    {STRING_HDINFOPARTCREATE_1,
+    "%I64u %s  Disco duro %lu  (Port=%hu, Bus=%hu, Id=%hu) en %wZ [%s]."},
+    {STRING_HDINFOPARTCREATE_2,
+    "%I64u %s  Disco duro %lu  (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
     {STRING_HDDINFOUNK2,
     "   %c%c  Tipo 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTDELETE,
-    "en %I64u %s  Disco duro %lu  (Port=%hu, Bus=%hu, Id=%hu) en %wZ."},
-    {STRING_HDDINFOUNK3,
-    "en %I64u %s  Disco duro %lu  (Port=%hu, Bus=%hu, Id=%hu)."},
-    {STRING_HDINFOPARTZEROED,
-    "Disco duro %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTDELETE_1,
+    "en %I64u %s  Disco duro %lu  (Port=%hu, Bus=%hu, Id=%hu) en %wZ [%s]."},
+    {STRING_HDINFOPARTDELETE_2,
+    "en %I64u %s  Disco duro %lu  (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
+    {STRING_HDINFOPARTZEROED_1,
+    "Disco duro %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK4,
     "%c%c  Tipo 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTEXISTS,
-    "en Disco duro %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTEXISTS_1,
+    "en Disco duro %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK5,
     "%c%c %c %sTipo %-3u%s                      %6lu %s"},
-    {STRING_HDINFOPARTSELECT,
-    "%6lu %s  Disco duro %lu  (Port=%hu, Bus=%hu, Id=%hu) en %S"},
-    {STRING_HDDINFOUNK6,
-    "%6lu %s  Disco duro %lu  (Port=%hu, Bus=%hu, Id=%hu)"},
+    {STRING_HDINFOPARTSELECT_1,
+    "%6lu %s  Disco duro %lu  (Port=%hu, Bus=%hu, Id=%hu) en %wZ [%s]"},
+    {STRING_HDINFOPARTSELECT_2,
+    "%6lu %s  Disco duro %lu  (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
     {STRING_NEWPARTITION,
     "El instalador ha creado una nueva partici¢n en"},
     {STRING_UNPSPACE,

Modified: branches/setup_improvements/base/setup/usetup/lang/et-EE.h
URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us...
==============================================================================
--- branches/setup_improvements/base/setup/usetup/lang/et-EE.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/usetup/lang/et-EE.h	[iso-8859-1] Sun May 21 23:17:24 2017
@@ -1793,28 +1793,28 @@
     " Vorminda partitsioon %S failissteemiga "},
     {STRING_KEEPFORMAT,
     " Žra muuda praegust failissteemi "},
-    {STRING_HDINFOPARTCREATE,
-    "%I64u %s  Kävaketas %lu  (Port=%hu, Siin=%hu, Id=%hu) - %wZ."},
-    {STRING_HDDINFOUNK1,
-    "%I64u %s  Kävaketas %lu  (Port=%hu, Siin=%hu, Id=%hu)."},
+    {STRING_HDINFOPARTCREATE_1,
+    "%I64u %s  Kävaketas %lu  (Port=%hu, Siin=%hu, Id=%hu) - %wZ [%s]."},
+    {STRING_HDINFOPARTCREATE_2,
+    "%I64u %s  Kävaketas %lu  (Port=%hu, Siin=%hu, Id=%hu) [%s]."},
     {STRING_HDDINFOUNK2,
     "   %c%c  Type 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTDELETE,
-    "%I64u %s  Kävaketas %lu  (Port=%hu, Siin=%hu, Id=%hu) - %wZ."},
-    {STRING_HDDINFOUNK3,
-    "%I64u %s  Kävaketas %lu  (Port=%hu, Siin=%hu, Id=%hu)."},
-    {STRING_HDINFOPARTZEROED,
-    "Kävaketas %lu (%I64u %s), Port=%hu, Siin=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTDELETE_1,
+    "%I64u %s  Kävaketas %lu  (Port=%hu, Siin=%hu, Id=%hu) - %wZ [%s]."},
+    {STRING_HDINFOPARTDELETE_2,
+    "%I64u %s  Kävaketas %lu  (Port=%hu, Siin=%hu, Id=%hu) [%s]."},
+    {STRING_HDINFOPARTZEROED_1,
+    "Kävaketas %lu (%I64u %s), Port=%hu, Siin=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK4,
     "%c%c  Type 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTEXISTS,
-    "Kävaketas %lu (%I64u %s), Port=%hu, Siin=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTEXISTS_1,
+    "Kävaketas %lu (%I64u %s), Port=%hu, Siin=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK5,
     "%c%c %c %sTp %-3u%s                      %6lu %s"},
-    {STRING_HDINFOPARTSELECT,
-    "%6lu %s  Kävaketas %lu  (Port=%hu, Siin=%hu, Id=%hu) on %S"},
-    {STRING_HDDINFOUNK6,
-    "%6lu %s  Kävaketas %lu  (Port=%hu, Siin=%hu, Id=%hu)"},
+    {STRING_HDINFOPARTSELECT_1,
+    "%6lu %s  Kävaketas %lu  (Port=%hu, Siin=%hu, Id=%hu) - %wZ [%s]"},
+    {STRING_HDINFOPARTSELECT_2,
+    "%6lu %s  Kävaketas %lu  (Port=%hu, Siin=%hu, Id=%hu) [%s]"},
     {STRING_NEWPARTITION,
     "Loodi uus partitsioon"},
     {STRING_UNPSPACE,

Modified: branches/setup_improvements/base/setup/usetup/lang/fr-FR.h
URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us...
==============================================================================
--- branches/setup_improvements/base/setup/usetup/lang/fr-FR.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/usetup/lang/fr-FR.h	[iso-8859-1] Sun May 21 23:17:24 2017
@@ -1812,28 +1812,28 @@
     " Formater la partition comme systŠme de fichiers %S "},
     {STRING_KEEPFORMAT,
     " Garder le systŠme de fichiers courant (pas de changements) "},
-    {STRING_HDINFOPARTCREATE,
-    "%I64u %s  Disque dur %lu  (Port=%hu, Bus=%hu, Id=%hu) sur %wZ."},
-    {STRING_HDDINFOUNK1,
-    "%I64u %s  Disque dur %lu  (Port=%hu, Bus=%hu, Id=%hu)."},
+    {STRING_HDINFOPARTCREATE_1,
+    "%I64u %s  Disque dur %lu  (Port=%hu, Bus=%hu, Id=%hu) sur %wZ [%s]."},
+    {STRING_HDINFOPARTCREATE_2,
+    "%I64u %s  Disque dur %lu  (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
     {STRING_HDDINFOUNK2,
     "   %c%c  Type 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTDELETE,
-    "sur %I64u %s  Disque dur %lu  (Port=%hu, Bus=%hu, Id=%hu) sur %wZ."},
-    {STRING_HDDINFOUNK3,
-    "sur %I64u %s  Disque dur %lu  (Port=%hu, Bus=%hu, Id=%hu)."},
-    {STRING_HDINFOPARTZEROED,
-    "Disque dur %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTDELETE_1,
+    "sur %I64u %s  Disque dur %lu  (Port=%hu, Bus=%hu, Id=%hu) sur %wZ [%s]."},
+    {STRING_HDINFOPARTDELETE_2,
+    "sur %I64u %s  Disque dur %lu  (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
+    {STRING_HDINFOPARTZEROED_1,
+    "Disque dur %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK4,
     "%c%c  Type 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTEXISTS,
-    "sur Disque dur %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTEXISTS_1,
+    "sur Disque dur %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK5,
     "%c%c %c %sType %-3u%s                      %6lu %s"},
-    {STRING_HDINFOPARTSELECT,
-    "%6lu %s  Disque dur %lu  (Port=%hu, Bus=%hu, Id=%hu) sur %S"},
-    {STRING_HDDINFOUNK6,
-    "%6lu %s  Disque dur %lu  (Port=%hu, Bus=%hu, Id=%hu)"},
+    {STRING_HDINFOPARTSELECT_1,
+    "%6lu %s  Disque dur %lu  (Port=%hu, Bus=%hu, Id=%hu) sur %wZ [%s]"},
+    {STRING_HDINFOPARTSELECT_2,
+    "%6lu %s  Disque dur %lu  (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
     {STRING_NEWPARTITION,
     "Setup a cr‚‚ une nouvelle partition sur"},
     {STRING_UNPSPACE,

Modified: branches/setup_improvements/base/setup/usetup/lang/he-IL.h
URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us...
==============================================================================
--- branches/setup_improvements/base/setup/usetup/lang/he-IL.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/usetup/lang/he-IL.h	[iso-8859-1] Sun May 21 23:17:24 2017
@@ -1795,28 +1795,28 @@
     " 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 0x%02X    %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)."},
+    {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_HDDINFOUNK4,
     "%c%c  Type 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTEXISTS,
-    "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTEXISTS_1,
+    "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK5,
     "%c%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)"},
+    {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,

Modified: branches/setup_improvements/base/setup/usetup/lang/it-IT.h
URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us...
==============================================================================
--- branches/setup_improvements/base/setup/usetup/lang/it-IT.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/usetup/lang/it-IT.h	[iso-8859-1] Sun May 21 23:17:24 2017
@@ -1800,28 +1800,28 @@
     " Formatta la partizione con file system %S "},
     {STRING_KEEPFORMAT,
     " Mantieni il file system attuale (nessuna modifica) "},
-    {STRING_HDINFOPARTCREATE,
-    "%I64u %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) su %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) su %wZ [%s]."},
+    {STRING_HDINFOPARTCREATE_2,
+    "%I64u %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
     {STRING_HDDINFOUNK2,
     "   %c%c  Tipo 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTDELETE,
-    "su %I64u %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) su %wZ."},
-    {STRING_HDDINFOUNK3,
-    "su %I64u %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu)."},
-    {STRING_HDINFOPARTZEROED,
-    "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTDELETE_1,
+    "su %I64u %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) su %wZ [%s]."},
+    {STRING_HDINFOPARTDELETE_2,
+    "su %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_HDDINFOUNK4,
     "%c%c  Tipo 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTEXISTS,
-    "su Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTEXISTS_1,
+    "su Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK5,
     "%c%c %c %sTipo %-3u%s                       %6lu %s"},
-    {STRING_HDINFOPARTSELECT,
-    "%6lu %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) su %S"},
-    {STRING_HDDINFOUNK6,
-    "%6lu %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu)"},
+    {STRING_HDINFOPARTSELECT_1,
+    "%6lu %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) su %wZ [%s]"},
+    {STRING_HDINFOPARTSELECT_2,
+    "%6lu %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
     {STRING_NEWPARTITION,
     "Setup ha creato una nuova partizione su"},
     {STRING_UNPSPACE,

Modified: branches/setup_improvements/base/setup/usetup/lang/ja-JP.h
URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us...
==============================================================================
--- branches/setup_improvements/base/setup/usetup/lang/ja-JP.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/usetup/lang/ja-JP.h	[iso-8859-1] Sun May 21 23:17:24 2017
@@ -1797,28 +1797,28 @@
     " Ê߰輮ݦ %S ̧²Ù ¼½ÃÑ ÃÞÌ«°Ï¯Ä "},
     {STRING_KEEPFORMAT,
     " ¹ÞÝ»Þ²É Ì§²Ù ¼½ÃÑÉ ÏÏ (Íݺ³ ¼Å²) "},
-    {STRING_HDINFOPARTCREATE,
-    "%I64u %s  Ê°ÄÞÃÞ¨½¸ %lu  (Îß°Ä=%hu, ÊÞ½=%hu, Id=%hu) on %wZ."},
-    {STRING_HDDINFOUNK1,
-    "%I64u %s  Ê°ÄÞÃÞ¨½¸ %lu  (Îß°Ä=%hu, ÊÞ½=%hu, Id=%hu)."},
+    {STRING_HDINFOPARTCREATE_1,
+    "%I64u %s  Ê°ÄÞÃÞ¨½¸ %lu  (Îß°Ä=%hu, ÊÞ½=%hu, Id=%hu) on %wZ [%s]."},
+    {STRING_HDINFOPARTCREATE_2,
+    "%I64u %s  Ê°ÄÞÃÞ¨½¸ %lu  (Îß°Ä=%hu, ÊÞ½=%hu, Id=%hu) [%s]."},
     {STRING_HDDINFOUNK2,
     "   %c%c  ¼­Ù² 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTDELETE,
-    "on %I64u %s  Ê°ÄÞÃÞ¨½¸ %lu  (Îß°Ä=%hu, ÊÞ½=%hu, Id=%hu) on %wZ."},
-    {STRING_HDDINFOUNK3,
-    "on %I64u %s  Ê°ÄÞÃÞ¨½¸ %lu  (Îß°Ä=%hu, ÊÞ½=%hu, Id=%hu)."},
-    {STRING_HDINFOPARTZEROED,
-    "Ê°ÄÞÃÞ¨½¸ %lu (%I64u %s), Îß°Ä=%hu, ÊÞ½=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTDELETE_1,
+    "on %I64u %s  Ê°ÄÞÃÞ¨½¸ %lu  (Îß°Ä=%hu, ÊÞ½=%hu, Id=%hu) on %wZ [%s]."},
+    {STRING_HDINFOPARTDELETE_2,
+    "on %I64u %s  Ê°ÄÞÃÞ¨½¸ %lu  (Îß°Ä=%hu, ÊÞ½=%hu, Id=%hu) [%s]."},
+    {STRING_HDINFOPARTZEROED_1,
+    "Ê°ÄÞÃÞ¨½¸ %lu (%I64u %s), Îß°Ä=%hu, ÊÞ½=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK4,
     "%c%c  ¼­Ù² 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTEXISTS,
-    "on Ê°ÄÞÃÞ¨½¸ %lu (%I64u %s), Îß°Ä=%hu, ÊÞ½=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTEXISTS_1,
+    "on Ê°ÄÞÃÞ¨½¸ %lu (%I64u %s), Îß°Ä=%hu, ÊÞ½=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK5,
     "%c%c %c %s¼­Ù² %-3u%s                      %6lu %s"},
-    {STRING_HDINFOPARTSELECT,
-    "%6lu %s  Ê°ÄÞÃÞ¨½¸ %lu  (Îß°Ä=%hu, ÊÞ½=%hu, Id=%hu) on %S"},
-    {STRING_HDDINFOUNK6,
-    "%6lu %s  Ê°ÄÞÃÞ¨½¸ %lu  (Îß°Ä=%hu, ÊÞ½=%hu, Id=%hu)"},
+    {STRING_HDINFOPARTSELECT_1,
+    "%6lu %s  Ê°ÄÞÃÞ¨½¸ %lu  (Îß°Ä=%hu, ÊÞ½=%hu, Id=%hu) on %wZ [%s]"},
+    {STRING_HDINFOPARTSELECT_2,
+    "%6lu %s  Ê°ÄÞÃÞ¨½¸ %lu  (Îß°Ä=%hu, ÊÞ½=%hu, Id=%hu) [%s]"},
     {STRING_NEWPARTITION,
     "¾¯Ä±¯ÌßÊ ±À×¼² Ê߰輮ݦ ·ÞÆ »¸¾²¼Ï¼À:"},
     {STRING_UNPSPACE,

Modified: branches/setup_improvements/base/setup/usetup/lang/lt-LT.h
URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us...
==============================================================================
--- branches/setup_improvements/base/setup/usetup/lang/lt-LT.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/usetup/lang/lt-LT.h	[iso-8859-1] Sun May 21 23:17:24 2017
@@ -1803,28 +1803,28 @@
     " 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 0x%02X    %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)."},
+    {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_HDDINFOUNK4,
     "%c%c  Type 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTEXISTS,
-    "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTEXISTS_1,
+    "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK5,
     "%c%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)"},
+    {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,

Modified: branches/setup_improvements/base/setup/usetup/lang/ms-MY.h
URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us...
==============================================================================
--- branches/setup_improvements/base/setup/usetup/lang/ms-MY.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/usetup/lang/ms-MY.h	[iso-8859-1] Sun May 21 23:17:24 2017
@@ -1682,28 +1682,28 @@
     " Format partition seperti sistem fail %S "},
     {STRING_KEEPFORMAT,
     " Memastikan sistem fail semasa (tiada perubahan) "},
-    {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 0x%02X    %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)."},
+    {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_HDDINFOUNK4,
     "%c%c  Type 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTEXISTS,
-    "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTEXISTS_1,
+    "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK5,
     "%c%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)"},
+    {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,
     "Persediaan yang dicipta partition yang baru di"},
     {STRING_UNPSPACE,

Modified: branches/setup_improvements/base/setup/usetup/lang/nl-NL.h
URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us...
==============================================================================
--- branches/setup_improvements/base/setup/usetup/lang/nl-NL.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/usetup/lang/nl-NL.h	[iso-8859-1] Sun May 21 23:17:24 2017
@@ -1829,28 +1829,28 @@
     " Formatteer partitie als %S bestandssysteem "},
     {STRING_KEEPFORMAT,
     " Behoud huidig bestandssysteem (geen wijzigingen) "},
-    {STRING_HDINFOPARTCREATE,
-    "%I64u %s  Schijf %lu  (Poort=%hu, Bus=%hu, Id=%hu) op %wZ."},
-    {STRING_HDDINFOUNK1,
-    "%I64u %s  Schijf %lu  (Poort=%hu, Bus=%hu, Id=%hu)."},
+    {STRING_HDINFOPARTCREATE_1,
+    "%I64u %s  Schijf %lu  (Poort=%hu, Bus=%hu, Id=%hu) op %wZ [%s]."},
+    {STRING_HDINFOPARTCREATE_2,
+    "%I64u %s  Schijf %lu  (Poort=%hu, Bus=%hu, Id=%hu) [%s]."},
     {STRING_HDDINFOUNK2,
     "   %c%c  Type 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTDELETE,
-    "op %I64u %s  Schijf %lu  (Poort=%hu, Bus=%hu, Id=%hu) op %wZ."},
-    {STRING_HDDINFOUNK3,
-    "op %I64u %s  Schijf %lu  (Poort=%hu, Bus=%hu, Id=%hu)."},
-    {STRING_HDINFOPARTZEROED,
-    "Schijf %lu (%I64u %s), Poort=%hu, Bus=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTDELETE_1,
+    "op %I64u %s  Schijf %lu  (Poort=%hu, Bus=%hu, Id=%hu) op %wZ [%s]."},
+    {STRING_HDINFOPARTDELETE_2,
+    "op %I64u %s  Schijf %lu  (Poort=%hu, Bus=%hu, Id=%hu) [%s]."},
+    {STRING_HDINFOPARTZEROED_1,
+    "Schijf %lu (%I64u %s), Poort=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK4,
     "%c%c  Type 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTEXISTS,
-    "op Schijf %lu (%I64u %s), Poort=%hu, Bus=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTEXISTS_1,
+    "op Schijf %lu (%I64u %s), Poort=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK5,
     "%c%c %c %sType %-3u%s                      %6lu %s"},
-    {STRING_HDINFOPARTSELECT,
-    "%6lu %s  Schijf %lu  (Poort=%hu, Bus=%hu, Id=%hu) op %S"},
-    {STRING_HDDINFOUNK6,
-    "%6lu %s  Schijf %lu  (Poort=%hu, Bus=%hu, Id=%hu)"},
+    {STRING_HDINFOPARTSELECT_1,
+    "%6lu %s  Schijf %lu  (Poort=%hu, Bus=%hu, Id=%hu) op %wZ [%s]"},
+    {STRING_HDINFOPARTSELECT_2,
+    "%6lu %s  Schijf %lu  (Poort=%hu, Bus=%hu, Id=%hu) [%s]"},
     {STRING_NEWPARTITION,
     "Setup heeft een nieuwe partitie aangemaakt op"},
     {STRING_UNPSPACE,

Modified: branches/setup_improvements/base/setup/usetup/lang/pl-PL.h
URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us...
==============================================================================
--- branches/setup_improvements/base/setup/usetup/lang/pl-PL.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/usetup/lang/pl-PL.h	[iso-8859-1] Sun May 21 23:17:24 2017
@@ -1804,28 +1804,28 @@
     " Sformatuj partycj© z systemem plik¢w %S "},
     {STRING_KEEPFORMAT,
     " Zachowaj obecny system plik¢w (bez zmian) "},
-    {STRING_HDINFOPARTCREATE,
-    "%I64u %s  Dysku Twardym %lu  (Port=%hu, Szyna=%hu, Id=%hu) na %wZ."},
-    {STRING_HDDINFOUNK1,
-    "%I64u %s  Dysk 02 Twardy %lu  (Port=%hu, Szyna=%hu, Id=%hu)."},
+    {STRING_HDINFOPARTCREATE_1,
+    "%I64u %s  Dysku Twardym %lu  (Port=%hu, Szyna=%hu, Id=%hu) na %wZ [%s]."},
+    {STRING_HDINFOPARTCREATE_2,
+    "%I64u %s  Dysk 02 Twardy %lu  (Port=%hu, Szyna=%hu, Id=%hu) [%s]."},
     {STRING_HDDINFOUNK2,
     "   %c%c  03Typ 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTDELETE,
-    "na %I64u %s  Dysku Twardym %lu  (Port=%hu, Szyna=%hu, Id=%hu) na %wZ."},
-    {STRING_HDDINFOUNK3,
-    "na %I64u %s  Dysku 05 Twardym %lu  (Port=%hu, Szyna=%hu, Id=%hu)."},
-    {STRING_HDINFOPARTZEROED,
-    "Dysk Twardy %lu (%I64u %s), Port=%hu, Szyna=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTDELETE_1,
+    "na %I64u %s  Dysku Twardym %lu  (Port=%hu, Szyna=%hu, Id=%hu) na %wZ [%s]."},
+    {STRING_HDINFOPARTDELETE_2,
+    "na %I64u %s  Dysku 05 Twardym %lu  (Port=%hu, Szyna=%hu, Id=%hu) [%s]."},
+    {STRING_HDINFOPARTZEROED_1,
+    "Dysk Twardy %lu (%I64u %s), Port=%hu, Szyna=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK4,
     "%c%c  07Typ 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTEXISTS,
-    "na Dysku Twardym %lu (%I64u %s), Port=%hu, Szyna=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTEXISTS_1,
+    "na Dysku Twardym %lu (%I64u %s), Port=%hu, Szyna=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK5,
     "%c%c %c %s09Typ %-3u%s                      %6lu %s"},
-    {STRING_HDINFOPARTSELECT,
-    "%6lu %s  Dysk Twardy %lu  (Port=%hu, Szyna=%hu, Id=%hu) na %S"},
-    {STRING_HDDINFOUNK6,
-    "%6lu %s  Dysk11 Twardy %lu  (Port=%hu, Szyna=%hu, Id=%hu)"},
+    {STRING_HDINFOPARTSELECT_1,
+    "%6lu %s  Dysk Twardy %lu  (Port=%hu, Szyna=%hu, Id=%hu) na %wZ [%s]"},
+    {STRING_HDINFOPARTSELECT_2,
+    "%6lu %s  Dysk11 Twardy %lu  (Port=%hu, Szyna=%hu, Id=%hu) [%s]"},
     {STRING_NEWPARTITION,
     "Instalator utworzyˆ now¥ partycj©"},
     {STRING_UNPSPACE,

Modified: branches/setup_improvements/base/setup/usetup/lang/pt-BR.h
URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us...
==============================================================================
--- branches/setup_improvements/base/setup/usetup/lang/pt-BR.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/usetup/lang/pt-BR.h	[iso-8859-1] Sun May 21 23:17:24 2017
@@ -1833,28 +1833,28 @@
     " Formatar a parti‡Æo utilizando o sistema de arquivos %S "},
     {STRING_KEEPFORMAT,
     " Manter o sistema de arquivos atual (sem altera‡äes) "},
-    {STRING_HDINFOPARTCREATE,
-    "%I64u %s  Disco %lu  (Porta=%hu, Barramento=%hu, Id=%hu) em %wZ."},
-    {STRING_HDDINFOUNK1,
-    "%I64u %s  Disco %lu  (Porta=%hu, Barramento=%hu, Id=%hu)."},
+    {STRING_HDINFOPARTCREATE_1,
+    "%I64u %s  Disco %lu  (Porta=%hu, Barramento=%hu, Id=%hu) em %wZ [%s]."},
+    {STRING_HDINFOPARTCREATE_2,
+    "%I64u %s  Disco %lu  (Porta=%hu, Barramento=%hu, Id=%hu) [%s]."},
     {STRING_HDDINFOUNK2,
     "   %c%c  Tipo 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTDELETE,
-    "em %I64u %s  Disco %lu  (Porta=%hu, Barramento=%hu, Id=%hu) em %wZ."},
-    {STRING_HDDINFOUNK3,
-    "em %I64u %s  Disco %lu  (Porta=%hu, Barramento=%hu, Id=%hu)."},
-    {STRING_HDINFOPARTZEROED,
-    "Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTDELETE_1,
+    "em %I64u %s  Disco %lu  (Porta=%hu, Barramento=%hu, Id=%hu) em %wZ [%s]."},
+    {STRING_HDINFOPARTDELETE_2,
+    "em %I64u %s  Disco %lu  (Porta=%hu, Barramento=%hu, Id=%hu) [%s]."},
+    {STRING_HDINFOPARTZEROED_1,
+    "Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK4,
     "%c%c  Tipo 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTEXISTS,
-    "em Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTEXISTS_1,
+    "em Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK5,
     "%c%c %c %sTipo %-3u%s                      %6lu %s"},
-    {STRING_HDINFOPARTSELECT,
-    "%6lu %s  Disco %lu  (Porta=%hu, Barramento=%hu, Id=%hu) em %S"},
-    {STRING_HDDINFOUNK6,
-    "%6lu %s  Disco %lu  (Porta=%hu, Barramento=%hu, Id=%hu)"},
+    {STRING_HDINFOPARTSELECT_1,
+    "%6lu %s  Disco %lu  (Porta=%hu, Barramento=%hu, Id=%hu) em %wZ [%s]"},
+    {STRING_HDINFOPARTSELECT_2,
+    "%6lu %s  Disco %lu  (Porta=%hu, Barramento=%hu, Id=%hu) [%s]"},
     {STRING_NEWPARTITION,
     "O instalador criou uma nova parti‡Æo em"},
     {STRING_UNPSPACE,

Modified: branches/setup_improvements/base/setup/usetup/lang/ro-RO.h
URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us...
==============================================================================
--- branches/setup_improvements/base/setup/usetup/lang/ro-RO.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/usetup/lang/ro-RO.h	[iso-8859-1] Sun May 21 23:17:24 2017
@@ -1865,28 +1865,28 @@
     " Formateazã partiþia ca sistem de fiºiere %S "},
     {STRING_KEEPFORMAT,
     " Pãstreazã sistemul de fiºiere actual (fãrã schimbãri) "},
-    {STRING_HDINFOPARTCREATE,
-    "%I64u %s  Discul %lu  (Port=%hu, Magistrala=%hu, Id=%hu) de tip %wZ."},
-    {STRING_HDDINFOUNK1,
-    "%I64u %s  Discul %lu  (Port=%hu, Magistrala=%hu, Id=%hu)."},
+    {STRING_HDINFOPARTCREATE_1,
+    "%I64u %s  Discul %lu  (Port=%hu, Magistrala=%hu, Id=%hu) de tip %wZ [%s]."},
+    {STRING_HDINFOPARTCREATE_2,
+    "%I64u %s  Discul %lu  (Port=%hu, Magistrala=%hu, Id=%hu) [%s]."},
     {STRING_HDDINFOUNK2,
     "   %c%c  Tip 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTDELETE,
-    "de pe %I64u %s  Discul %lu  (Port=%hu, Magistrala=%hu, Id=%hu) de tip %wZ."},
-    {STRING_HDDINFOUNK3,
-    "de pe %I64u %s  Discul %lu  (Port=%hu, Magistrala=%hu, Id=%hu)."},
-    {STRING_HDINFOPARTZEROED,
-    "Discul %lu (%I64u %s), Port=%hu, Magistrala=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTDELETE_1,
+    "de pe %I64u %s  Discul %lu  (Port=%hu, Magistrala=%hu, Id=%hu) de tip %wZ [%s]."},
+    {STRING_HDINFOPARTDELETE_2,
+    "de pe %I64u %s  Discul %lu  (Port=%hu, Magistrala=%hu, Id=%hu) [%s]."},
+    {STRING_HDINFOPARTZEROED_1,
+    "Discul %lu (%I64u %s), Port=%hu, Magistrala=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK4,
     "%c%c  Tip 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTEXISTS,
-    "de pe Discul %lu (%I64u %s), Port=%hu, Magistrala=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTEXISTS_1,
+    "de pe Discul %lu (%I64u %s), Port=%hu, Magistrala=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK5,
     "%c%c %c %sTip %-3u%s                      %6lu %s"},
-    {STRING_HDINFOPARTSELECT,
-    "%6lu %s  Discul %lu  (Port=%hu, Magistrala=%hu, Id=%hu) de tip %S"},
-    {STRING_HDDINFOUNK6,
-    "%6lu %s  Discul %lu  (Port=%hu, Magistrala=%hu, Id=%hu)"},
+    {STRING_HDINFOPARTSELECT_1,
+    "%6lu %s  Discul %lu  (Port=%hu, Magistrala=%hu, Id=%hu) de tip %wZ [%s]"},
+    {STRING_HDINFOPARTSELECT_2,
+    "%6lu %s  Discul %lu  (Port=%hu, Magistrala=%hu, Id=%hu) [%s]"},
     {STRING_NEWPARTITION,
     "O nouã partiþie a fost creatã în"},
     {STRING_UNPSPACE,

Modified: branches/setup_improvements/base/setup/usetup/lang/ru-RU.h
URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us...
==============================================================================
--- branches/setup_improvements/base/setup/usetup/lang/ru-RU.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/usetup/lang/ru-RU.h	[iso-8859-1] Sun May 21 23:17:24 2017
@@ -1794,28 +1794,28 @@
     " ”®à¬ â¨à®¢ ­¨¥ à §¤¥«  ¢ ä ©«®¢®© á¨á⥬¥ %S "},
     {STRING_KEEPFORMAT,
     " Žáâ ¢¨âì áãé¥áâ¢ãîéãî ä ©«®¢ãî á¨á⥬ã (¡¥§ ¨§¬¥­¥­¨©) "},
-    {STRING_HDINFOPARTCREATE,
-    "%I64u %s  †¥á⪨© ¤¨áª %lu  (®àâ=%hu, ˜¨­ =%hu, Id=%hu) ­  %wZ."},
-    {STRING_HDDINFOUNK1,
-    "%I64u %s  †¥á⪨© ¤¨áª %lu  (®àâ=%hu, ˜¨­ =%hu, Id=%hu)."},
+    {STRING_HDINFOPARTCREATE_1,
+    "%I64u %s  †¥á⪨© ¤¨áª %lu  (®àâ=%hu, ˜¨­ =%hu, Id=%hu) ­  %wZ [%s]."},
+    {STRING_HDINFOPARTCREATE_2,
+    "%I64u %s  †¥á⪨© ¤¨áª %lu  (®àâ=%hu, ˜¨­ =%hu, Id=%hu) [%s]."},
     {STRING_HDDINFOUNK2,
     "   %c%c  ‡ ¯¨áì 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTDELETE,
-    "­  %I64u %s  †¥á⪨© ¤¨áª %lu  (®àâ=%hu, ˜¨­ =%hu, Id=%hu) ­  %wZ."},
-    {STRING_HDDINFOUNK3,
-    "­  %I64u %s  †¥á⪨© ¤¨áª %lu  (®àâ=%hu, ˜¨­ =%hu, Id=%hu)."},
-    {STRING_HDINFOPARTZEROED,
-    "†¥á⪨© ¤¨áª %lu (%I64u %s), ®àâ=%hu, ˜¨­ =%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTDELETE_1,
+    "­  %I64u %s  †¥á⪨© ¤¨áª %lu  (®àâ=%hu, ˜¨­ =%hu, Id=%hu) ­  %wZ [%s]."},
+    {STRING_HDINFOPARTDELETE_2,
+    "­  %I64u %s  †¥á⪨© ¤¨áª %lu  (®àâ=%hu, ˜¨­ =%hu, Id=%hu) [%s]."},
+    {STRING_HDINFOPARTZEROED_1,
+    "†¥á⪨© ¤¨áª %lu (%I64u %s), ®àâ=%hu, ˜¨­ =%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK4,
     "%c%c  ‡ ¯¨áì 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTEXISTS,
-    "­  ¦¥á⪮¬ ¤¨áª¥ %lu (%I64u %s), ®àâ=%hu, ˜¨­ =%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTEXISTS_1,
+    "­  ¦¥á⪮¬ ¤¨áª¥ %lu (%I64u %s), ®àâ=%hu, ˜¨­ =%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK5,
     "%c%c %c %s‡ ¯¨áì %-3u%s                      %6lu %s"},
-    {STRING_HDINFOPARTSELECT,
-    "%6lu %s  †¥á⪨© ¤¨áª %lu  (®àâ=%hu, ˜¨­ =%hu, Id=%hu) ­  %S"},
-    {STRING_HDDINFOUNK6,
-    "%6lu %s  †¥á⪨© ¤¨áª %lu  (®àâ=%hu, ˜¨­ =%hu, Id=%hu)"},
+    {STRING_HDINFOPARTSELECT_1,
+    "%6lu %s  †¥á⪨© ¤¨áª %lu  (®àâ=%hu, ˜¨­ =%hu, Id=%hu) ­  %wZ [%s]"},
+    {STRING_HDINFOPARTSELECT_2,
+    "%6lu %s  †¥á⪨© ¤¨áª %lu  (®àâ=%hu, ˜¨­ =%hu, Id=%hu) [%s]"},
     {STRING_NEWPARTITION,
     "à®£à ¬¬  ãáâ ­®¢ª¨ ᮧ¤ «  ­®¢ë© à §¤¥« ­ :"},
     {STRING_UNPSPACE,

Modified: branches/setup_improvements/base/setup/usetup/lang/sk-SK.h
URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us...
==============================================================================
--- branches/setup_improvements/base/setup/usetup/lang/sk-SK.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/usetup/lang/sk-SK.h	[iso-8859-1] Sun May 21 23:17:24 2017
@@ -1807,28 +1807,28 @@
     " Naform tovaœ oblasœ ako syst‚m s£borov %S "},
     {STRING_KEEPFORMAT,
     " Ponechaœ s£Ÿasnì syst‚m s£borov (bez zmeny) "},
-    {STRING_HDINFOPARTCREATE,
-    "%I64u %s  pevnom disku %lu  (Port=%hu, Bus=%hu, Id=%hu) na %wZ."},
-    {STRING_HDDINFOUNK1,
-    "%I64u %s  pevnì disk %lu  (Port=%hu, Bus=%hu, Id=%hu)."},
+    {STRING_HDINFOPARTCREATE_1,
+    "%I64u %s  pevnom disku %lu  (Port=%hu, Bus=%hu, Id=%hu) na %wZ [%s]."},
+    {STRING_HDINFOPARTCREATE_2,
+    "%I64u %s  pevnì disk %lu  (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
     {STRING_HDDINFOUNK2,
     "   %c%c  typ 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTDELETE,
-    "na %I64u %s  pevnom disku %lu  (Port=%hu, Bus=%hu, Id=%hu) na %wZ."},
-    {STRING_HDDINFOUNK3,
-    "na %I64u %s  pevnom disku %lu  (Port=%hu, Bus=%hu, Id=%hu)."},
-    {STRING_HDINFOPARTZEROED,
-    "pevnì disk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTDELETE_1,
+    "na %I64u %s  pevnom disku %lu  (Port=%hu, Bus=%hu, Id=%hu) na %wZ [%s]."},
+    {STRING_HDINFOPARTDELETE_2,
+    "na %I64u %s  pevnom disku %lu  (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
+    {STRING_HDINFOPARTZEROED_1,
+    "pevnì disk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK4,
     "%c%c  typ 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTEXISTS,
-    "na pevnom disku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTEXISTS_1,
+    "na pevnom disku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK5,
     "%c%c %c %styp %-3u%s                      %6lu %s"},
-    {STRING_HDINFOPARTSELECT,
-    "%6lu %s  pevnì disk %lu  (Port=%hu, Bus=%hu, Id=%hu) na %S"},
-    {STRING_HDDINFOUNK6,
-    "%6lu %s  pevnom disku %lu  (Port=%hu, Bus=%hu, Id=%hu)"},
+    {STRING_HDINFOPARTSELECT_1,
+    "%6lu %s  pevnì disk %lu  (Port=%hu, Bus=%hu, Id=%hu) na %wZ [%s]"},
+    {STRING_HDINFOPARTSELECT_2,
+    "%6lu %s  pevnom disku %lu  (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
     {STRING_NEWPARTITION,
     "Inçtal tor vytvoril nov£ oblasœ na"},
     {STRING_UNPSPACE,

Modified: branches/setup_improvements/base/setup/usetup/lang/sq-AL.h
URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us...
==============================================================================
--- branches/setup_improvements/base/setup/usetup/lang/sq-AL.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/usetup/lang/sq-AL.h	[iso-8859-1] Sun May 21 23:17:24 2017
@@ -1800,28 +1800,28 @@
     " Formato particionin si %S dokumentat e sistemit"},
     {STRING_KEEPFORMAT,
     " Mbaj dokumentat e sistemit siq jan‰ (pa ndryshime) "},
-    {STRING_HDINFOPARTCREATE,
-    "%I64u %s  Harddisku %lu  (Port=%hu, Bus=%hu, Id=%hu) on %wZ."},
-    {STRING_HDDINFOUNK1,
-    "%I64u %s  Harddisku %lu  (Port=%hu, Bus=%hu, Id=%hu)."},
+    {STRING_HDINFOPARTCREATE_1,
+    "%I64u %s  Harddisku %lu  (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."},
+    {STRING_HDINFOPARTCREATE_2,
+    "%I64u %s  Harddisku %lu  (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
     {STRING_HDDINFOUNK2,
     "   %c%c  Tipi 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTDELETE,
-    "on %I64u %s  Harddisku %lu  (Port=%hu, Bus=%hu, Id=%hu) on %wZ."},
-    {STRING_HDDINFOUNK3,
-    "on %I64u %s  Harddisku %lu  (Port=%hu, Bus=%hu, Id=%hu)."},
-    {STRING_HDINFOPARTZEROED,
-    "Harddisku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTDELETE_1,
+    "on %I64u %s  Harddisku %lu  (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."},
+    {STRING_HDINFOPARTDELETE_2,
+    "on %I64u %s  Harddisku %lu  (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
+    {STRING_HDINFOPARTZEROED_1,
+    "Harddisku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK4,
     "%c%c  Tipi 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTEXISTS,
-    "on Harddisku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTEXISTS_1,
+    "on Harddisku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK5,
     "%c%c %c %sTipi %-3u%s                      %6lu %s"},
-    {STRING_HDINFOPARTSELECT,
-    "%6lu %s  Harddisku %lu  (Port=%hu, Bus=%hu, Id=%hu) on %S"},
-    {STRING_HDDINFOUNK6,
-    "%6lu %s  Harddisku %lu  (Port=%hu, Bus=%hu, Id=%hu)"},
+    {STRING_HDINFOPARTSELECT_1,
+    "%6lu %s  Harddisku %lu  (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"},
+    {STRING_HDINFOPARTSELECT_2,
+    "%6lu %s  Harddisku %lu  (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
     {STRING_NEWPARTITION,
     "Instalimi krijoj nj‰ particion t‰ ri n‰"},
     {STRING_UNPSPACE,

Modified: branches/setup_improvements/base/setup/usetup/lang/sv-SE.h
URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us...
==============================================================================
--- branches/setup_improvements/base/setup/usetup/lang/sv-SE.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/usetup/lang/sv-SE.h	[iso-8859-1] Sun May 21 23:17:24 2017
@@ -1803,28 +1803,28 @@
     " Formaterar partition som %S filsystem "},
     {STRING_KEEPFORMAT,
     " Beh†ll nuvarande filsystem (inga f”r„ndringar) "},
-    {STRING_HDINFOPARTCREATE,
-    "%I64u %s  H†rddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) p† %wZ."},
-    {STRING_HDDINFOUNK1,
-    "%I64u %s  H†rddisk %lu  (Port=%hu, Bus=%hu, Id=%hu)."},
+    {STRING_HDINFOPARTCREATE_1,
+    "%I64u %s  H†rddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) p† %wZ [%s]."},
+    {STRING_HDINFOPARTCREATE_2,
+    "%I64u %s  H†rddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
     {STRING_HDDINFOUNK2,
     "   %c%c  Typ 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTDELETE,
-    "on %I64u %s  H†rddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) p† %wZ."},
-    {STRING_HDDINFOUNK3,
-    "on %I64u %s  H†rddisk %lu  (Port=%hu, Bus=%hu, Id=%hu)."},
-    {STRING_HDINFOPARTZEROED,
-    "H†rddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTDELETE_1,
+    "on %I64u %s  H†rddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) p† %wZ [%s]."},
+    {STRING_HDINFOPARTDELETE_2,
+    "on %I64u %s  H†rddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
+    {STRING_HDINFOPARTZEROED_1,
+    "H†rddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK4,
     "%c%c  Typ 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTEXISTS,
-    "p† H†rddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTEXISTS_1,
+    "p† H†rddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK5,
     "%c%c %c %sTyp %-3u%s                      %6lu %s"},
-    {STRING_HDINFOPARTSELECT,
-    "%6lu %s  H†rddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) p† %S"},
-    {STRING_HDDINFOUNK6,
-    "%6lu %s  H†rddisk %lu  (Port=%hu, Bus=%hu, Id=%hu)"},
+    {STRING_HDINFOPARTSELECT_1,
+    "%6lu %s  H†rddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) p† %wZ [%s]"},
+    {STRING_HDINFOPARTSELECT_2,
+    "%6lu %s  H†rddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
     {STRING_NEWPARTITION,
     "Setup skapade en ny partition p†"},
     {STRING_UNPSPACE,

Modified: branches/setup_improvements/base/setup/usetup/lang/tr-TR.h
URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us...
==============================================================================
--- branches/setup_improvements/base/setup/usetup/lang/tr-TR.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/usetup/lang/tr-TR.h	[iso-8859-1] Sun May 21 23:17:24 2017
@@ -1774,28 +1774,28 @@
     " B”lm %S ktk dizgesiyle bi‡imlendir. "},
     {STRING_KEEPFORMAT,
     " žimdiki ktk dizgesini koru. (De§iŸiklik yok.) "},
-    {STRING_HDINFOPARTCREATE,
-    "%I64u %s  Sƒbit Disk %lu  (GiriŸ=%hu, Veriyolu=%hu, Kimlik=%hu), %wZ zerinde."},
-    {STRING_HDDINFOUNK1,
-    "%I64u %s  Sƒbit Disk %lu  (GiriŸ=%hu, Veriyolu=%hu, Kimlik=%hu)."},
+    {STRING_HDINFOPARTCREATE_1,
+    "%I64u %s  Sƒbit Disk %lu  (GiriŸ=%hu, Veriyolu=%hu, Kimlik=%hu), %wZ zerinde [%s]."},
+    {STRING_HDINFOPARTCREATE_2,
+    "%I64u %s  Sƒbit Disk %lu  (GiriŸ=%hu, Veriyolu=%hu, Kimlik=%hu) [%s]."},
     {STRING_HDDINFOUNK2,
     "   %c%c  Tr  0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTDELETE,
-    "šzerinde: %I64u %s  Sƒbit Disk %lu  (GiriŸ=%hu, Veriyolu=%hu, Kimlik=%hu), %wZ zerinde."},
-    {STRING_HDDINFOUNK3,
-    "šzerinde: %I64u %s  Sƒbit Disk %lu  (GiriŸ=%hu, Veriyolu=%hu, Kimlik=%hu)."},
-    {STRING_HDINFOPARTZEROED,
-    "Sƒbit Disk %lu (%I64u %s), GiriŸ=%hu, Veriyolu=%hu, Kimlik=%hu (%wZ)."},
+    {STRING_HDINFOPARTDELETE_1,
+    "šzerinde: %I64u %s  Sƒbit Disk %lu  (GiriŸ=%hu, Veriyolu=%hu, Kimlik=%hu), %wZ zerinde [%s]."},
+    {STRING_HDINFOPARTDELETE_2,
+    "šzerinde: %I64u %s  Sƒbit Disk %lu  (GiriŸ=%hu, Veriyolu=%hu, Kimlik=%hu) [%s]."},
+    {STRING_HDINFOPARTZEROED_1,
+    "Sƒbit Disk %lu (%I64u %s), GiriŸ=%hu, Veriyolu=%hu, Kimlik=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK4,
     "%c%c  Tr  0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTEXISTS,
-    "šzerinde: Sƒbit Disk %lu (%I64u %s), GiriŸ=%hu, Veriyolu=%hu, Kimlik=%hu (%wZ)."},
+    {STRING_HDINFOPARTEXISTS_1,
+    "šzerinde: Sƒbit Disk %lu (%I64u %s), GiriŸ=%hu, Veriyolu=%hu, Kimlik=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK5,
     "%c%c %c %sTr  %-3u%s                      %6lu %s"},
-    {STRING_HDINFOPARTSELECT,
-    "%6lu %s  Sƒbit Disk %lu  (GiriŸ=%hu, Veriyolu=%hu, Kimlik=%hu), %S zerinde"},
-    {STRING_HDDINFOUNK6,
-    "%6lu %s  Sƒbit Disk %lu  (GiriŸ=%hu, Veriyolu=%hu, Kimlik=%hu)"},
+    {STRING_HDINFOPARTSELECT_1,
+    "%6lu %s  Sƒbit Disk %lu  (GiriŸ=%hu, Veriyolu=%hu, Kimlik=%hu), %wZ zerinde [%s]"},
+    {STRING_HDINFOPARTSELECT_2,
+    "%6lu %s  Sƒbit Disk %lu  (GiriŸ=%hu, Veriyolu=%hu, Kimlik=%hu) [%s]"},
     {STRING_NEWPARTITION,
     "Kur, zerinde bir yeni b”lm oluŸturdu:"},
     {STRING_UNPSPACE,

Modified: branches/setup_improvements/base/setup/usetup/lang/uk-UA.h
URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us...
==============================================================================
--- branches/setup_improvements/base/setup/usetup/lang/uk-UA.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/usetup/lang/uk-UA.h	[iso-8859-1] Sun May 21 23:17:24 2017
@@ -1803,28 +1803,28 @@
     " ”®à¬ â㢠⨠஧¤i« ¢ ä ©«®¢i© á¨á⥬i %S  "},
     {STRING_KEEPFORMAT,
     " ‡ «¨è¨â¨ iá­ãîçã ä ©«®¢ã á¨á⥬ã (¡¥§ §¬i­) "},
-    {STRING_HDINFOPARTCREATE,
-    "%I64u %s  †®àá⪨© ¤¨áª %lu  (®àâ=%hu, ˜¨­ =%hu, Id=%hu) on %wZ."},
-    {STRING_HDDINFOUNK1,
-    "%I64u %s  †®àá⪨© ¤¨áª %lu  (®àâ=%hu, ˜¨­ =%hu, Id=%hu)."},
+    {STRING_HDINFOPARTCREATE_1,
+    "%I64u %s  †®àá⪨© ¤¨áª %lu  (®àâ=%hu, ˜¨­ =%hu, Id=%hu) on %wZ [%s]."},
+    {STRING_HDINFOPARTCREATE_2,
+    "%I64u %s  †®àá⪨© ¤¨áª %lu  (®àâ=%hu, ˜¨­ =%hu, Id=%hu) [%s]."},
     {STRING_HDDINFOUNK2,
     "   %c%c  Type 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTDELETE,
-    "­  %I64u %s  †®àá⪨© ¤¨áª %lu  (®àâ=%hu, ˜¨­ =%hu, Id=%hu) on %wZ."},
-    {STRING_HDDINFOUNK3,
-    "­  %I64u %s  †®àá⪨© ¤¨áª %lu  (®àâ=%hu, ˜¨­ =%hu, Id=%hu)."},
-    {STRING_HDINFOPARTZEROED,
-    "†®àá⪨© ¤¨áª %lu (%I64u %s), ®àâ=%hu, ˜¨­ =%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTDELETE_1,
+    "­  %I64u %s  †®àá⪨© ¤¨áª %lu  (®àâ=%hu, ˜¨­ =%hu, Id=%hu) on %wZ [%s]."},
+    {STRING_HDINFOPARTDELETE_2,
+    "­  %I64u %s  †®àá⪨© ¤¨áª %lu  (®àâ=%hu, ˜¨­ =%hu, Id=%hu) [%s]."},
+    {STRING_HDINFOPARTZEROED_1,
+    "†®àá⪨© ¤¨áª %lu (%I64u %s), ®àâ=%hu, ˜¨­ =%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK4,
     "%c%c  Type 0x%02X    %I64u %s"},
-    {STRING_HDINFOPARTEXISTS,
-    "­  †®àá⪮¬ã ¤¨áªã %lu (%I64u %s), ®àâ=%hu, ˜¨­ =%hu, Id=%hu (%wZ)."},
+    {STRING_HDINFOPARTEXISTS_1,
+    "­  †®àá⪮¬ã ¤¨áªã %lu (%I64u %s), ®àâ=%hu, ˜¨­ =%hu, Id=%hu (%wZ) [%s]."},
     {STRING_HDDINFOUNK5,
     "%c%c %c %sType %-3u%s                      %6lu %s"},
-    {STRING_HDINFOPARTSELECT,
-    "%6lu %s  †®àá⪨© ¤¨áª %lu  (®àâ=%hu, ˜¨­ =%hu, Id=%hu) on %S"},
-    {STRING_HDDINFOUNK6,
-    "%6lu %s  †®àá⪨© ¤¨áª %lu  (®àâ=%hu, ˜¨­ =%hu, Id=%hu)"},
+    {STRING_HDINFOPARTSELECT_1,
+    "%6lu %s  †®àá⪨© ¤¨áª %lu  (®àâ=%hu, ˜¨­ =%hu, Id=%hu) on %wZ [%s]"},
+    {STRING_HDINFOPARTSELECT_2,
+    "%6lu %s  †®àá⪨© ¤¨áª %lu  (®àâ=%hu, ˜¨­ =%hu, Id=%hu) [%s]"},
     {STRING_NEWPARTITION,
     "‚áâ ­®¢«î¢ ç á⢮ਢ ­®¢¨© ஧¤i« ­ "},
     {STRING_UNPSPACE,

Modified: branches/setup_improvements/base/setup/usetup/mui.h
URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us...
==============================================================================
--- branches/setup_improvements/base/setup/usetup/mui.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/usetup/mui.h	[iso-8859-1] Sun May 21 23:17:24 2017
@@ -100,9 +100,9 @@

#define STRING_PLEASEWAIT                1
 #define STRING_INSTALLCREATEPARTITION    2
-#define STRING_INSTALLCREATELOGICAL           60
+#define STRING_INSTALLCREATELOGICAL      60
 #define STRING_INSTALLDELETEPARTITION    3
-#define STRING_DELETEPARTITION                59
+#define STRING_DELETEPARTITION           59
 #define STRING_PARTITIONSIZE             4
 #define STRING_CHOOSENEWPARTITION        5
 #define STRING_CHOOSE_NEW_EXTENDED_PARTITION  57
@@ -111,8 +111,8 @@
 #define STRING_CREATEPARTITION           7
 #define STRING_PARTFORMAT                8
 #define STRING_NONFORMATTEDPART          9
-#define STRING_NONFORMATTEDSYSTEMPART         62
-#define STRING_NONFORMATTEDOTHERPART          63
+#define STRING_NONFORMATTEDSYSTEMPART    62
+#define STRING_NONFORMATTEDOTHERPART     63
 #define STRING_INSTALLONPART             10
 #define STRING_CHECKINGPART              11
 #define STRING_CONTINUE                  12
@@ -137,22 +137,22 @@
 #define STRING_FORMATDISK1               33
 #define STRING_FORMATDISK2               34
 #define STRING_KEEPFORMAT                35
-#define STRING_HDINFOPARTCREATE          36
-#define STRING_HDDINFOUNK1               37
+#define STRING_HDINFOPARTCREATE_1        36
+#define STRING_HDINFOPARTCREATE_2        37
 #define STRING_HDDINFOUNK2               38
-#define STRING_HDINFOPARTDELETE          39
-#define STRING_HDDINFOUNK3               40
-#define STRING_HDINFOPARTZEROED          41
+#define STRING_HDINFOPARTDELETE_1        39
+#define STRING_HDINFOPARTDELETE_2        40
+#define STRING_HDINFOPARTZEROED_1        41
 #define STRING_HDDINFOUNK4               42
-#define STRING_HDINFOPARTEXISTS          43
+#define STRING_HDINFOPARTEXISTS_1        43
 #define STRING_HDDINFOUNK5               44
-#define STRING_HDINFOPARTSELECT          45
-#define STRING_HDDINFOUNK6               46
+#define STRING_HDINFOPARTSELECT_1        45
+#define STRING_HDINFOPARTSELECT_2        46
 #define STRING_NEWPARTITION              47
 #define STRING_UNPSPACE                  48
 #define STRING_MAXSIZE                   49
 #define STRING_UNFORMATTED               50
-#define STRING_EXTENDED_PARTITION             58
+#define STRING_EXTENDED_PARTITION        58
 #define STRING_FORMATUNUSED              51
 #define STRING_FORMATUNKNOWN             52
 #define STRING_KB                        53