23 Oct
2018
23 Oct
'18
10:36 p.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3c616b625d620e7683112…
commit 3c616b625d620e7683112affdf3ed02b661be425
Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Sun May 21 23:17:24 2017 +0000
Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Wed Oct 24 00:35:53 2018 +0200
[USETUP] Rename some of the uninformative "STRING_HDDINFOUNKx" string labels
into more informative ones.
- Also, reserve a new field to display whether the disk is MBR or GPT-initialized.
- Adjust the code that used the "STRING_HDDINFOUNKx" string labels.
The extra slot added to some of the strings is to indicate whether the disk is MBR
or GPT.
As attentive readers will notice, the code that "determines" whether the
disk is either MBR or GPT
is of course just temporary: it's just a placeholder code that should currently
just show "MBR".
Having the NoMbr flag mostly signifies that the disk is uninitialized. A GPT disk also
has a MBR
but it's for "backcompatibility" / "protective" reasons (so
that MBR-only tools would see the disk
as just a big 1-partitioned only disk with which they could barely do anything). A
real involved test
for the nature of the disk should involve calling the correct IOCTLs in the disk
detection code in partlist.c .
This is for the future (and when ReactOS will better support GPT disks).
svn path=/branches/setup_improvements/; revision=74614
svn path=/branches/setup_improvements/; revision=74615
---
base/setup/usetup/lang/bg-BG.h | 32 ++++++++++-----------
base/setup/usetup/lang/bn-BD.h | 32 ++++++++++-----------
base/setup/usetup/lang/cs-CZ.h | 32 ++++++++++-----------
base/setup/usetup/lang/da-DK.h | 32 ++++++++++-----------
base/setup/usetup/lang/de-DE.h | 32 ++++++++++-----------
base/setup/usetup/lang/el-GR.h | 32 ++++++++++-----------
base/setup/usetup/lang/en-US.h | 36 +++++++++++++-----------
base/setup/usetup/lang/es-ES.h | 32 ++++++++++-----------
base/setup/usetup/lang/et-EE.h | 32 ++++++++++-----------
base/setup/usetup/lang/fr-FR.h | 32 ++++++++++-----------
base/setup/usetup/lang/he-IL.h | 32 ++++++++++-----------
base/setup/usetup/lang/it-IT.h | 32 ++++++++++-----------
base/setup/usetup/lang/ja-JP.h | 32 ++++++++++-----------
base/setup/usetup/lang/lt-LT.h | 32 ++++++++++-----------
base/setup/usetup/lang/ms-MY.h | 32 ++++++++++-----------
base/setup/usetup/lang/nl-NL.h | 32 ++++++++++-----------
base/setup/usetup/lang/pl-PL.h | 32 ++++++++++-----------
base/setup/usetup/lang/pt-BR.h | 32 ++++++++++-----------
base/setup/usetup/lang/ro-RO.h | 32 ++++++++++-----------
base/setup/usetup/lang/ru-RU.h | 32 ++++++++++-----------
base/setup/usetup/lang/sk-SK.h | 32 ++++++++++-----------
base/setup/usetup/lang/sq-AL.h | 32 ++++++++++-----------
base/setup/usetup/lang/sv-SE.h | 32 ++++++++++-----------
base/setup/usetup/lang/tr-TR.h | 32 ++++++++++-----------
base/setup/usetup/lang/uk-UA.h | 32 ++++++++++-----------
base/setup/usetup/mui.h | 26 ++++++++---------
base/setup/usetup/partlist.c | 10 ++++---
base/setup/usetup/usetup.c | 64 ++++++++++++++++++++++--------------------
28 files changed, 457 insertions(+), 447 deletions(-)
diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h
index 803de8a23c..01fc9482e9 100644
--- a/base/setup/usetup/lang/bg-BG.h
+++ b/base/setup/usetup/lang/bg-BG.h
@@ -1810,28 +1810,28 @@ MUI_STRING bgBGStrings[] =
" ��ଠ�࠭� �� � ��� %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,
diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h
index 145c0e86d0..689e88c2e2 100644
--- a/base/setup/usetup/lang/bn-BD.h
+++ b/base/setup/usetup/lang/bn-BD.h
@@ -1795,28 +1795,28 @@ MUI_STRING bnBDStrings[] =
" 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,
diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h
index 10e517619f..82a5691d78 100644
--- a/base/setup/usetup/lang/cs-CZ.h
+++ b/base/setup/usetup/lang/cs-CZ.h
@@ -1803,28 +1803,28 @@ MUI_STRING csCZStrings[] =
" 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,
diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h
index 9e1d724f2d..5e5c1ba35c 100644
--- a/base/setup/usetup/lang/da-DK.h
+++ b/base/setup/usetup/lang/da-DK.h
@@ -1809,28 +1809,28 @@ MUI_STRING daDKStrings[] =
" 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,
diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h
index afc257b78b..abd84927c3 100644
--- a/base/setup/usetup/lang/de-DE.h
+++ b/base/setup/usetup/lang/de-DE.h
@@ -1799,28 +1799,28 @@ MUI_STRING deDEStrings[] =
" 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,
diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h
index ec8edb65f3..8431842f50 100644
--- a/base/setup/usetup/lang/el-GR.h
+++ b/base/setup/usetup/lang/el-GR.h
@@ -1814,28 +1814,28 @@ MUI_STRING elGRStrings[] =
" ����樭ਫ਼ ��� 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,
diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h
index b8b5665d9c..396a009a95 100644
--- a/base/setup/usetup/lang/en-US.h
+++ b/base/setup/usetup/lang/en-US.h
@@ -1795,28 +1795,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 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,
diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h
index 5e43233d52..569fd5ef75 100644
--- a/base/setup/usetup/lang/es-ES.h
+++ b/base/setup/usetup/lang/es-ES.h
@@ -1799,28 +1799,28 @@ MUI_STRING esESStrings[] =
" 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,
diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h
index e61b71ae53..87ccc8bcb5 100644
--- a/base/setup/usetup/lang/et-EE.h
+++ b/base/setup/usetup/lang/et-EE.h
@@ -1795,28 +1795,28 @@ MUI_STRING etEEStrings[] =
" 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,
diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h
index 8363184f8c..ed74aec94c 100644
--- a/base/setup/usetup/lang/fr-FR.h
+++ b/base/setup/usetup/lang/fr-FR.h
@@ -1814,28 +1814,28 @@ MUI_STRING frFRStrings[] =
" 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,
diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h
index 8c3e4ce198..75a192a864 100644
--- a/base/setup/usetup/lang/he-IL.h
+++ b/base/setup/usetup/lang/he-IL.h
@@ -1797,28 +1797,28 @@ MUI_STRING heILStrings[] =
" 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,
diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h
index c95073e10d..f4e00ed7d6 100644
--- a/base/setup/usetup/lang/it-IT.h
+++ b/base/setup/usetup/lang/it-IT.h
@@ -1802,28 +1802,28 @@ MUI_STRING itITStrings[] =
" 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,
diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h
index 0cbb7c52e6..52fc2c785d 100644
--- a/base/setup/usetup/lang/ja-JP.h
+++ b/base/setup/usetup/lang/ja-JP.h
@@ -1799,28 +1799,28 @@ MUI_STRING jaJPStrings[] =
" �߰è��ݦ %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,
diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h
index 86b3bec27b..d5fc64768d 100644
--- a/base/setup/usetup/lang/lt-LT.h
+++ b/base/setup/usetup/lang/lt-LT.h
@@ -1805,28 +1805,28 @@ MUI_STRING ltLTStrings[] =
" 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,
diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h
index 7b76c4f81f..e7ef24f2fb 100644
--- a/base/setup/usetup/lang/ms-MY.h
+++ b/base/setup/usetup/lang/ms-MY.h
@@ -1684,28 +1684,28 @@ MUI_STRING msMYStrings[] =
" 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,
diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h
index cfcc71fce4..773598de21 100644
--- a/base/setup/usetup/lang/nl-NL.h
+++ b/base/setup/usetup/lang/nl-NL.h
@@ -1825,28 +1825,28 @@ MUI_STRING nlNLStrings[] =
" 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,
diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h
index 1849b809fe..5de776e8a9 100644
--- a/base/setup/usetup/lang/pl-PL.h
+++ b/base/setup/usetup/lang/pl-PL.h
@@ -1806,28 +1806,28 @@ MUI_STRING plPLStrings[] =
" 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,
diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h
index 0d9f7b3f37..1b35608c7d 100644
--- a/base/setup/usetup/lang/pt-BR.h
+++ b/base/setup/usetup/lang/pt-BR.h
@@ -1829,28 +1829,28 @@ MUI_STRING ptBRStrings[] =
" 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,
diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h
index 457ba53ba3..443688b697 100644
--- a/base/setup/usetup/lang/ro-RO.h
+++ b/base/setup/usetup/lang/ro-RO.h
@@ -1849,28 +1849,28 @@ MUI_STRING roROStrings[] =
" 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,
diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h
index 52e9b81da6..bfb351b2fd 100644
--- a/base/setup/usetup/lang/ru-RU.h
+++ b/base/setup/usetup/lang/ru-RU.h
@@ -1796,28 +1796,28 @@ MUI_STRING ruRUStrings[] =
" ��ଠ����� ࠧ���� � 䠩����� ��⥬� %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,
diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h
index d44fcb9ac0..b347d8638e 100644
--- a/base/setup/usetup/lang/sk-SK.h
+++ b/base/setup/usetup/lang/sk-SK.h
@@ -1809,28 +1809,28 @@ MUI_STRING skSKStrings[] =
" 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,
diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h
index 13c7c105a9..59ed8c9b4d 100644
--- a/base/setup/usetup/lang/sq-AL.h
+++ b/base/setup/usetup/lang/sq-AL.h
@@ -1802,28 +1802,28 @@ MUI_STRING sqALStrings[] =
" 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,
diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h
index 15c3f493a7..f6fac58029 100644
--- a/base/setup/usetup/lang/sv-SE.h
+++ b/base/setup/usetup/lang/sv-SE.h
@@ -1805,28 +1805,28 @@ MUI_STRING svSEStrings[] =
" 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,
diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h
index e61abbbdb3..ed011e9f29 100644
--- a/base/setup/usetup/lang/tr-TR.h
+++ b/base/setup/usetup/lang/tr-TR.h
@@ -1776,28 +1776,28 @@ MUI_STRING trTRStrings[] =
" 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,
diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h
index 12f3ce1bef..424d8d5f90 100644
--- a/base/setup/usetup/lang/uk-UA.h
+++ b/base/setup/usetup/lang/uk-UA.h
@@ -1805,28 +1805,28 @@ MUI_STRING ukUAStrings[] =
" ��ଠ�㢠� �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,
diff --git a/base/setup/usetup/mui.h b/base/setup/usetup/mui.h
index 707bb80076..a823c33206 100644
--- a/base/setup/usetup/mui.h
+++ b/base/setup/usetup/mui.h
@@ -100,9 +100,9 @@ MUIGetString(
#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 @@ MUIGetString(
#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 @@ MUIGetString(
#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
diff --git a/base/setup/usetup/partlist.c b/base/setup/usetup/partlist.c
index 6feb52b80f..5ae9edc88d 100644
--- a/base/setup/usetup/partlist.c
+++ b/base/setup/usetup/partlist.c
@@ -458,25 +458,27 @@ PrintDiskData(
if (DiskEntry->DriverName.Length > 0)
{
sprintf(LineBuffer,
- MUIGetString(STRING_HDINFOPARTSELECT),
+ MUIGetString(STRING_HDINFOPARTSELECT_1),
DiskSize.u.LowPart,
Unit,
DiskEntry->DiskNumber,
DiskEntry->Port,
DiskEntry->Bus,
DiskEntry->Id,
- DiskEntry->DriverName.Buffer);
+ &DiskEntry->DriverName,
+ DiskEntry->NoMbr ? "GPT" : "MBR");
}
else
{
sprintf(LineBuffer,
- MUIGetString(STRING_HDDINFOUNK6),
+ MUIGetString(STRING_HDINFOPARTSELECT_2),
DiskSize.u.LowPart,
Unit,
DiskEntry->DiskNumber,
DiskEntry->Port,
DiskEntry->Bus,
- DiskEntry->Id);
+ DiskEntry->Id,
+ DiskEntry->NoMbr ? "GPT" : "MBR");
}
if (ListUi->Line >= 0 && ListUi->Line <= Height)
diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c
index eea168791e..410e25753a 100644
--- a/base/setup/usetup/usetup.c
+++ b/base/setup/usetup/usetup.c
@@ -2022,25 +2022,27 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir)
if (DiskEntry->DriverName.Length > 0)
{
CONSOLE_PrintTextXY(6, 10,
- MUIGetString(STRING_HDINFOPARTCREATE),
+ MUIGetString(STRING_HDINFOPARTCREATE_1),
DiskSize,
Unit,
DiskEntry->DiskNumber,
DiskEntry->Port,
DiskEntry->Bus,
DiskEntry->Id,
- &DiskEntry->DriverName);
+ &DiskEntry->DriverName,
+ DiskEntry->NoMbr ? "GPT" : "MBR");
}
else
{
CONSOLE_PrintTextXY(6, 10,
- MUIGetString(STRING_HDDINFOUNK1),
+ MUIGetString(STRING_HDINFOPARTCREATE_2),
DiskSize,
Unit,
DiskEntry->DiskNumber,
DiskEntry->Port,
DiskEntry->Bus,
- DiskEntry->Id);
+ DiskEntry->Id,
+ DiskEntry->NoMbr ? "GPT" : "MBR");
}
CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE));
@@ -2179,25 +2181,27 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir)
if (DiskEntry->DriverName.Length > 0)
{
CONSOLE_PrintTextXY(6, 10,
- MUIGetString(STRING_HDINFOPARTCREATE),
+ MUIGetString(STRING_HDINFOPARTCREATE_1),
DiskSize,
Unit,
DiskEntry->DiskNumber,
DiskEntry->Port,
DiskEntry->Bus,
DiskEntry->Id,
- &DiskEntry->DriverName);
+ &DiskEntry->DriverName,
+ DiskEntry->NoMbr ? "GPT" : "MBR");
}
else
{
CONSOLE_PrintTextXY(6, 10,
- MUIGetString(STRING_HDDINFOUNK1),
+ MUIGetString(STRING_HDINFOPARTCREATE_2),
DiskSize,
Unit,
DiskEntry->DiskNumber,
DiskEntry->Port,
DiskEntry->Bus,
- DiskEntry->Id);
+ DiskEntry->Id,
+ DiskEntry->NoMbr ? "GPT" : "MBR");
}
CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE));
@@ -2335,25 +2339,27 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir)
if (DiskEntry->DriverName.Length > 0)
{
CONSOLE_PrintTextXY(6, 10,
- MUIGetString(STRING_HDINFOPARTCREATE),
+ MUIGetString(STRING_HDINFOPARTCREATE_1),
DiskSize,
Unit,
DiskEntry->DiskNumber,
DiskEntry->Port,
DiskEntry->Bus,
DiskEntry->Id,
- &DiskEntry->DriverName);
+ &DiskEntry->DriverName,
+ DiskEntry->NoMbr ? "GPT" : "MBR");
}
else
{
CONSOLE_PrintTextXY(6, 10,
- MUIGetString(STRING_HDDINFOUNK1),
+ MUIGetString(STRING_HDINFOPARTCREATE_2),
DiskSize,
Unit,
DiskEntry->DiskNumber,
DiskEntry->Port,
DiskEntry->Bus,
- DiskEntry->Id);
+ DiskEntry->Id,
+ DiskEntry->NoMbr ? "GPT" : "MBR");
}
CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE));
@@ -2572,25 +2578,27 @@ DeletePartitionPage(PINPUT_RECORD Ir)
if (DiskEntry->DriverName.Length > 0)
{
CONSOLE_PrintTextXY(6, 12,
- MUIGetString(STRING_HDINFOPARTDELETE),
+ MUIGetString(STRING_HDINFOPARTDELETE_1),
DiskSize,
Unit,
DiskEntry->DiskNumber,
DiskEntry->Port,
DiskEntry->Bus,
DiskEntry->Id,
- &DiskEntry->DriverName);
+ &DiskEntry->DriverName,
+ DiskEntry->NoMbr ? "GPT" : "MBR");
}
else
{
CONSOLE_PrintTextXY(6, 12,
- MUIGetString(STRING_HDDINFOUNK3),
+ MUIGetString(STRING_HDINFOPARTDELETE_2),
DiskSize,
Unit,
DiskEntry->DiskNumber,
DiskEntry->Port,
DiskEntry->Bus,
- DiskEntry->Id);
+ DiskEntry->Id,
+ DiskEntry->NoMbr ? "GPT" : "MBR");
}
while (TRUE)
@@ -2802,14 +2810,15 @@ SelectFileSystemPage(PINPUT_RECORD Ir)
PartTypeString);
#endif
- CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDINFOPARTZEROED),
+ CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDINFOPARTZEROED_1),
DiskEntry->DiskNumber,
DiskSize,
DiskUnit,
DiskEntry->Port,
DiskEntry->Bus,
DiskEntry->Id,
- &DiskEntry->DriverName);
+ &DiskEntry->DriverName,
+ DiskEntry->NoMbr ? "GPT" : "MBR");
CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_PARTFORMAT));
@@ -2862,14 +2871,15 @@ SelectFileSystemPage(PINPUT_RECORD Ir)
PartUnit);
}
- CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDINFOPARTEXISTS),
+ CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDINFOPARTEXISTS_1),
DiskEntry->DiskNumber,
DiskSize,
DiskUnit,
DiskEntry->Port,
DiskEntry->Bus,
DiskEntry->Id,
- &DiskEntry->DriverName);
+ &DiskEntry->DriverName,
+ DiskEntry->NoMbr ? "GPT" : "MBR");
}
MUIDisplayPage(SELECT_FILE_SYSTEM_PAGE);
@@ -2885,8 +2895,6 @@ SelectFileSystemPage(PINPUT_RECORD Ir)
}
}
- DrawFileSystemList(FileSystemList);
-
if (RepairUpdateFlag)
{
return CHECK_FILE_SYSTEM_PAGE;
@@ -2910,6 +2918,8 @@ SelectFileSystemPage(PINPUT_RECORD Ir)
return CHECK_FILE_SYSTEM_PAGE;
}
+ DrawFileSystemList(FileSystemList);
+
while (TRUE)
{
CONSOLE_ConInKey(Ir);
@@ -4441,15 +4451,12 @@ BootLoaderFloppyPage(PINPUT_RECORD Ir)
static PAGE_NUMBER
BootLoaderHarddiskVbrPage(PINPUT_RECORD Ir)
{
- UCHAR PartitionType;
NTSTATUS Status;
- PartitionType = PartitionList->SystemPartition->PartitionType;
-
Status = InstallVBRToPartition(&SystemRootPath,
&SourceRootPath,
&DestinationArcPath,
- PartitionType);
+ PartitionList->SystemPartition->PartitionType);
if (!NT_SUCCESS(Status))
{
MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER);
@@ -4477,19 +4484,16 @@ BootLoaderHarddiskVbrPage(PINPUT_RECORD Ir)
static PAGE_NUMBER
BootLoaderHarddiskMbrPage(PINPUT_RECORD Ir)
{
- UCHAR PartitionType;
NTSTATUS Status;
WCHAR DestinationDevicePathBuffer[MAX_PATH];
WCHAR SourceMbrPathBuffer[MAX_PATH];
WCHAR DstPath[MAX_PATH];
/* Step 1: Write the VBR */
- PartitionType = PartitionList->SystemPartition->PartitionType;
-
Status = InstallVBRToPartition(&SystemRootPath,
&SourceRootPath,
&DestinationArcPath,
- PartitionType);
+ PartitionList->SystemPartition->PartitionType);
if (!NT_SUCCESS(Status))
{
MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER);