https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ed4bf1ed774f25da8d4c33f5dfaa2d3582f86af
commit 9ed4bf1ed774f25da8d4c33f5dfaa2d3582f86af
Author: Hermès Bélusca-Maïto <hermes.belusca-ma...@reactos.org>
AuthorDate: Wed Oct 25 22:19:39 2023 +0200
Commit: Hermès Bélusca-Maïto <hermes.belusca-ma...@reactos.org>
CommitDate: Sat Oct 28 17:08:40 2023 +0200
[USETUP] Show the partition description (and its disk) being formatted and
checked (#5837)
And improve some strings -- Translations need to be rechecked!
---
base/setup/usetup/lang/bg-BG.h | 6 +++---
base/setup/usetup/lang/bn-BD.h | 6 +++---
base/setup/usetup/lang/cs-CZ.h | 6 +++---
base/setup/usetup/lang/da-DK.h | 6 +++---
base/setup/usetup/lang/de-DE.h | 6 +++---
base/setup/usetup/lang/el-GR.h | 6 +++---
base/setup/usetup/lang/en-US.h | 6 +++---
base/setup/usetup/lang/es-ES.h | 6 +++---
base/setup/usetup/lang/et-EE.h | 6 +++---
base/setup/usetup/lang/eu-ES.h | 6 +++---
base/setup/usetup/lang/fr-FR.h | 6 +++---
base/setup/usetup/lang/he-IL.h | 6 +++---
base/setup/usetup/lang/hr-HR.h | 6 +++---
base/setup/usetup/lang/hu-HU.h | 6 +++---
base/setup/usetup/lang/id-ID.h | 6 +++---
base/setup/usetup/lang/it-IT.h | 6 +++---
base/setup/usetup/lang/ja-JP.h | 6 +++---
base/setup/usetup/lang/lt-LT.h | 6 +++---
base/setup/usetup/lang/ms-MY.h | 6 +++---
base/setup/usetup/lang/nl-NL.h | 6 +++---
base/setup/usetup/lang/pl-PL.h | 6 +++---
base/setup/usetup/lang/pt-BR.h | 6 +++---
base/setup/usetup/lang/pt-PT.h | 6 +++---
base/setup/usetup/lang/ro-RO.h | 9 ++++++++-
base/setup/usetup/lang/ru-RU.h | 6 +++---
base/setup/usetup/lang/sk-SK.h | 6 +++---
base/setup/usetup/lang/sq-AL.h | 6 +++---
base/setup/usetup/lang/sv-SE.h | 6 +++---
base/setup/usetup/lang/tr-TR.h | 6 +++---
base/setup/usetup/lang/uk-UA.h | 6 +++---
base/setup/usetup/usetup.c | 22 ++++++++++++++++++----
31 files changed, 113 insertions(+), 92 deletions(-)
diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h
index f7150ddcaa9..d2da19acb5d 100644
--- a/base/setup/usetup/lang/bg-BG.h
+++ b/base/setup/usetup/lang/bg-BG.h
@@ -1273,7 +1273,7 @@ static MUI_ENTRY bgBGFormatPartitionEntries[] =
},
{
6,
- 10,
+ 16,
"\204\357\253\352\342 \351\245 \241\352\244\245
\344\256\340\254\240\342\250\340\240\255. \215\240\342\250\341\255\245\342\245
ENTER \247\240 \244\240 \257\340\256\244\352\253\246\250\342\245.",
TEXT_STYLE_NORMAL,
TEXT_ID_FORMAT_PROMPT
@@ -2316,9 +2316,9 @@ MUI_STRING bgBGStrings[] =
{STRING_CONSOLEFAIL3,
"\217\256\244\244\340\352\246\252\240\342\240 \255\240 USB \245
\242\341\245 \256\351\245 \255\245\257\352\253\255\240\r\n"},
{STRING_FORMATTINGPART,
- "\224\256\340\254\240\342\250\340\240\255\245 \255\240
\244\250\341\252\240"},
+ "\224\256\340\254\240\342\250\340\240\255\245 \255\240
\244\357\253\240..."},
{STRING_CHECKINGDISK,
- "\217\340\256\242\245\340\252\240 \255\240 \244\250\341\252\240"},
+ "\217\340\256\242\245\340\252\240 \255\240 \244\250\341\252\240..."},
{STRING_FORMATDISK1,
" \224\256\340\254\240\342\250\340\240\255\245 \255\240 \244\357\253\240
\252\240\342\256 %S \344\240\251\253\256\242\240 \341\250\341\342\245\254\240
(\241\352\340\247\256 \344\256\340\254\240\342\250\340\240\255\245) "},
{STRING_FORMATDISK2,
diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h
index a8ece049194..1be6aaa9384 100644
--- a/base/setup/usetup/lang/bn-BD.h
+++ b/base/setup/usetup/lang/bn-BD.h
@@ -1256,7 +1256,7 @@ static MUI_ENTRY bnBDFormatPartitionEntries[] =
},
{
6,
- 10,
+ 16,
"Setup will now format the partition. Press ENTER to continue.",
TEXT_STYLE_NORMAL,
TEXT_ID_FORMAT_PROMPT
@@ -2290,9 +2290,9 @@ MUI_STRING bnBDStrings[] =
{STRING_CONSOLEFAIL3,
"USB keyboards are not fully supported yet\r\n"},
{STRING_FORMATTINGPART,
- "Setup is formatting your disk"},
+ "Setup is formatting the partition..."},
{STRING_CHECKINGDISK,
- "Setup is checking your disk"},
+ "Setup is checking the disk..."},
{STRING_FORMATDISK1,
" Format partition as %S file system (quick format) "},
{STRING_FORMATDISK2,
diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h
index e185fa42208..74ebdc9ebf8 100644
--- a/base/setup/usetup/lang/cs-CZ.h
+++ b/base/setup/usetup/lang/cs-CZ.h
@@ -1264,7 +1264,7 @@ static MUI_ENTRY csCZFormatPartitionEntries[] =
},
{
6,
- 10,
+ 16,
"Tento odd\241l bude nyn\241 zform\240tov\240n. Stisknut\241m
kl\240vesy ENTER za\237nete.",
TEXT_STYLE_NORMAL,
TEXT_ID_FORMAT_PROMPT
@@ -2298,9 +2298,9 @@ MUI_STRING csCZStrings[] =
{STRING_CONSOLEFAIL3,
"USB kl\240vesnice zat\241m nejsou pln\330 podporov\240ny\r\n"},
{STRING_FORMATTINGPART,
- "Instalace form\240tuje disk"},
+ "Instalace form\240tuje odd\241l..."},
{STRING_CHECKINGDISK,
- "Instalace kontroluje disk"},
+ "Instalace kontroluje disk..."},
{STRING_FORMATDISK1,
" Zform\240tovat odd\241l na souborov\354 syst\202m %S (rychle) "},
{STRING_FORMATDISK2,
diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h
index ab95b478df8..d388585ff82 100644
--- a/base/setup/usetup/lang/da-DK.h
+++ b/base/setup/usetup/lang/da-DK.h
@@ -1258,7 +1258,7 @@ static MUI_ENTRY daDKFormatPartitionEntries[] =
},
{
6,
- 10,
+ 16,
"Installationen vil nu formatere partitionen. Tryk p\206 ENTER for at
forts\221tte.",
TEXT_STYLE_NORMAL,
TEXT_ID_FORMAT_PROMPT
@@ -2300,9 +2300,9 @@ MUI_STRING daDKStrings[] =
{STRING_CONSOLEFAIL3,
"USB-tastatuere er endnu ikke fuldt underst\233ttet\r\n"},
{STRING_FORMATTINGPART,
- "Installationen formatere din disk"},
+ "Installationen formaterer partitionen..."},
{STRING_CHECKINGDISK,
- "Installationen tjekker din disk"},
+ "Installationen tjekker disken..."},
{STRING_FORMATDISK1,
" Formater partitionen som %S-filesystemet (hurtigformatering) "},
{STRING_FORMATDISK2,
diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h
index 3834815ea04..16529f96707 100644
--- a/base/setup/usetup/lang/de-DE.h
+++ b/base/setup/usetup/lang/de-DE.h
@@ -1251,7 +1251,7 @@ static MUI_ENTRY deDEFormatPartitionEntries[] =
},
{
6,
- 10,
+ 16,
"Die gew\201nschte Partition wird nun formatiert.",
TEXT_STYLE_NORMAL,
TEXT_ID_FORMAT_PROMPT
@@ -2302,9 +2302,9 @@ MUI_STRING deDEStrings[] =
{STRING_CONSOLEFAIL3,
"USB-Tastaturen werden noch nicht vollst\204ndig unterst\201tzt\r\n"},
{STRING_FORMATTINGPART,
- "Ihre Festplatte wird formatiert"},
+ "Die Partition wird formatiert..."},
{STRING_CHECKINGDISK,
- "Ihre Festplatte wird \201berpr\201ft"},
+ "Die Festplatte wird \201berpr\201ft..."},
{STRING_FORMATDISK1,
" Partition mit dem %S-Dateisystem formatieren (Schnell) "},
{STRING_FORMATDISK2,
diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h
index 6e092a920c7..2a71f69195f 100644
--- a/base/setup/usetup/lang/el-GR.h
+++ b/base/setup/usetup/lang/el-GR.h
@@ -1273,7 +1273,7 @@ static MUI_ENTRY elGRFormatPartitionEntries[] =
},
{
6,
- 10,
+ 16,
"\206 \234\232\241\230\253\341\251\253\230\251\236 \253\351\250\230
\237\230 \233\240\230\243\246\250\255\351\251\234\240 \253\246
\233\240\230\243\342\250\240\251\243\230 \217\230\253\343\251\253\234 ENTER
\232\240\230 \244\230 \251\254\244\234\256\345\251\234\253\234.",
TEXT_STYLE_NORMAL,
TEXT_ID_FORMAT_PROMPT
@@ -2315,9 +2315,9 @@ MUI_STRING elGRStrings[] =
{STRING_CONSOLEFAIL3,
"\222\230 USB \247\242\236\241\253\250\246\242\346\232\240\230
\233\234\244 \234\345\244\230\240 \247\242\343\250\340\252
\254\247\246\251\253\236\250\240\235\346\243\234\244\230
\230\241\346\243\230\r\n"},
{STRING_FORMATTINGPART,
- "\206 \234\232\241\230\253\341\251\253\230\251\236
\233\240\230\243\246\250\255\351\244\234\240 \253\246 \233\345\251\241\246
\251\230\252"},
+ "Setup is formatting the partition..."},
{STRING_CHECKINGDISK,
- "\206 \234\232\241\230\253\341\251\253\230\251\236
\234\242\342\232\256\234\240 \253\246 \233\345\251\241\246 \251\230\252"},
+ "Setup is checking the disk..."},
{STRING_FORMATDISK1,
" \203\240\230\243\346\250\255\340\251\236 \253\246\254 partition \340\252
%S \251\347\251\253\236\243\230 \230\250\256\234\345\340\244
(\232\250\343\232\246\250\236 \233\240\230\243\346\250\255\340\251\236) "},
{STRING_FORMATDISK2,
diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h
index ae23370e7fa..12c893d6d94 100644
--- a/base/setup/usetup/lang/en-US.h
+++ b/base/setup/usetup/lang/en-US.h
@@ -1256,7 +1256,7 @@ static MUI_ENTRY enUSFormatPartitionEntries[] =
},
{
6,
- 10,
+ 16,
"Setup will now format the partition. Press ENTER to continue.",
TEXT_STYLE_NORMAL,
TEXT_ID_FORMAT_PROMPT
@@ -2290,9 +2290,9 @@ MUI_STRING enUSStrings[] =
{STRING_CONSOLEFAIL3,
"USB keyboards are not fully supported yet\r\n"},
{STRING_FORMATTINGPART,
- "Setup is formatting your disk"},
+ "Setup is formatting the partition..."},
{STRING_CHECKINGDISK,
- "Setup is checking your disk"},
+ "Setup is checking the disk..."},
{STRING_FORMATDISK1,
" Format partition as %S file system (quick format) "},
{STRING_FORMATDISK2,
diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h
index 77e54c61860..374182c5c30 100644
--- a/base/setup/usetup/lang/es-ES.h
+++ b/base/setup/usetup/lang/es-ES.h
@@ -1262,7 +1262,7 @@ static MUI_ENTRY esESFormatPartitionEntries[] =
},
{
6,
- 10,
+ 16,
"El instalador formatear\240 la partici\242n. Pulse INTRO para
continuar.",
TEXT_STYLE_NORMAL,
TEXT_ID_FORMAT_PROMPT
@@ -2303,9 +2303,9 @@ MUI_STRING esESStrings[] =
{STRING_CONSOLEFAIL3,
"Todav\241a no hay soporte del todo para los teclados USB\r\n"},
{STRING_FORMATTINGPART,
- "El instalador est\240 formateando el disco"},
+ "El instalador est\240 formateando la partici\242n..."},
{STRING_CHECKINGDISK,
- "El instalador est\240 verificando el disco"},
+ "El instalador est\240 verificando el disco..."},
{STRING_FORMATDISK1,
" Formatear la partici\242n con sistema de archivos %S (formato r\240pido)
"},
{STRING_FORMATDISK2,
diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h
index 9e78d2b53c1..8daf974411c 100644
--- a/base/setup/usetup/lang/et-EE.h
+++ b/base/setup/usetup/lang/et-EE.h
@@ -1259,7 +1259,7 @@ static MUI_ENTRY etEEFormatPartitionEntries[] =
},
{
6,
- 10,
+ 16,
"N\201\201d vormindatakse partitsioon. Vajuta ENTER j\204tkamiseks.",
TEXT_STYLE_NORMAL,
TEXT_ID_FORMAT_PROMPT
@@ -2292,9 +2292,9 @@ MUI_STRING etEEStrings[] =
{STRING_CONSOLEFAIL3,
"USB klaviatuurid ei ole veel toetatud\r\n"},
{STRING_FORMATTINGPART,
- "K\344vaketta vormindamine"},
+ "Partitsioon vormindamine..."},
{STRING_CHECKINGDISK,
- "K\344vaketta kontrollimine"},
+ "K\344vaketta kontrollimine..."},
{STRING_FORMATDISK1,
" Vorminda partitsioon %S failis\201steemiga (kiire vormindus) "},
{STRING_FORMATDISK2,
diff --git a/base/setup/usetup/lang/eu-ES.h b/base/setup/usetup/lang/eu-ES.h
index b225211ebcf..715e941dc7f 100644
--- a/base/setup/usetup/lang/eu-ES.h
+++ b/base/setup/usetup/lang/eu-ES.h
@@ -1257,7 +1257,7 @@ static MUI_ENTRY euESFormatPartitionEntries[] =
},
{
6,
- 10,
+ 16,
"Orain instalazioa formatuko du partizioa. Sakatu SARTU jarraitzeko.",
TEXT_STYLE_NORMAL,
TEXT_ID_FORMAT_PROMPT
@@ -2298,9 +2298,9 @@ MUI_STRING euESStrings[] =
{STRING_CONSOLEFAIL3,
"USB teklatua ez dago oraindik osoan euskarri\r\n"},
{STRING_FORMATTINGPART,
- "Instalazioa zure disko formateatzen ari da"},
+ "Instalazioa partizioa formateatzen ari da..."},
{STRING_CHECKINGDISK,
- "Instalazioa zure disko ikusten ari da"},
+ "Instalazioa diskoa ikusten ari da..."},
{STRING_FORMATDISK1,
" Formatu partizioa %S sistemaren fitxategia (format azkar) "},
{STRING_FORMATDISK2,
diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h
index 77c51003330..a566b159c46 100644
--- a/base/setup/usetup/lang/fr-FR.h
+++ b/base/setup/usetup/lang/fr-FR.h
@@ -1293,7 +1293,7 @@ static MUI_ENTRY frFRFormatPartitionEntries[] =
},
{
6,
- 10,
+ 16,
"Setup va formater la partition. Appuyer sur ENTR\220E pour
continuer.",
TEXT_STYLE_NORMAL,
TEXT_ID_FORMAT_PROMPT
@@ -2327,9 +2327,9 @@ MUI_STRING frFRStrings[] =
{STRING_CONSOLEFAIL3,
"Les claviers USB ne sont pas compl\212tement support\202s
actuellement\r\n"},
{STRING_FORMATTINGPART,
- "Setup formate votre disque"},
+ "Setup formate la partition..."},
{STRING_CHECKINGDISK,
- "Setup v\202rifie votre disque"},
+ "Setup v\202rifie le disque..."},
{STRING_FORMATDISK1,
" Formater la partition comme syst\212me de fichiers %S (formatage rapide)
"},
{STRING_FORMATDISK2,
diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h
index 6b644999fc8..7a149ee68cb 100644
--- a/base/setup/usetup/lang/he-IL.h
+++ b/base/setup/usetup/lang/he-IL.h
@@ -1260,7 +1260,7 @@ static MUI_ENTRY heILFormatPartitionEntries[] =
},
{
6,
- 10,
+ 16,
".\212\211\231\216\204\214 \211\203\213 ENTER \225\207\214
.\204\226\211\207\216\204 \232\200 \214\207\232\200\232 \205\211\231\213\222
\204\220\227\232\204\204",
TEXT_STYLE_NORMAL,
TEXT_ID_FORMAT_PROMPT
@@ -2292,9 +2292,9 @@ MUI_STRING heILStrings[] =
{STRING_CONSOLEFAIL3,
"\200\214\216 \217\224\205\200\201 \232\205\213\216\232\220 \200\214
\217\211\211\203\222 USB \232\205\203\214\227\216\r\n"},
{STRING_FORMATTINGPART,
- "\217\220\205\213\204 \232\200 \232\214\207\232\200\216
\204\220\227\232\204\204 \232\211\220\213\232"},
+ "Setup is formatting the partition..."},
{STRING_CHECKINGDISK,
- "\217\220\205\213\204 \232\200 \232\227\203\205\201
\204\220\227\232\204\204 \232\211\220\213\232"},
+ "Setup is checking the disk..."},
{STRING_FORMATDISK1,
" (\230\211\204\216 \214\205\207\232\200) %S \215\211\226\201\227
\232\213\230\222\216 \215\222 \204\226\211\207\216 \214\205\207\232\200 "},
{STRING_FORMATDISK2,
diff --git a/base/setup/usetup/lang/hr-HR.h b/base/setup/usetup/lang/hr-HR.h
index 9f0c2bd47d8..a7625d5559b 100644
--- a/base/setup/usetup/lang/hr-HR.h
+++ b/base/setup/usetup/lang/hr-HR.h
@@ -1266,7 +1266,7 @@ static MUI_ENTRY hrHRFormatPartitionEntries[] =
},
{
6,
- 10,
+ 16,
"Instalacijski program \206e sada formatirati particiju.",
TEXT_STYLE_NORMAL,
TEXT_ID_FORMAT_PROMPT
@@ -2321,9 +2321,9 @@ MUI_STRING hrHRStrings[] =
{STRING_CONSOLEFAIL3,
"USB tipkovnice nisu jo\347 potupuno podr\247ane\r\n"},
{STRING_FORMATTINGPART,
- "Instalacijski program formatira va\347 disk"},
+ "Instalacijski program formatira particiju..."},
{STRING_CHECKINGDISK,
- "Instalacijski sustav provjerava va\347 disk"},
+ "Instalacijski program provjerava disk..."},
{STRING_FORMATDISK1,
" Formatiraj particiju kao %S sustav datoteka (brzo formatiranje) "},
{STRING_FORMATDISK2,
diff --git a/base/setup/usetup/lang/hu-HU.h b/base/setup/usetup/lang/hu-HU.h
index cb913f4b792..80c46b1d244 100644
--- a/base/setup/usetup/lang/hu-HU.h
+++ b/base/setup/usetup/lang/hu-HU.h
@@ -1150,7 +1150,7 @@ static MUI_ENTRY huHUFormatPartitionEntries[] =
},
{
6,
- 10,
+ 16,
"A telep\241t\213 form\240zni fogja a part\241ci\242t. Nyomjon ENTER-t
a folytat\240shoz.",
TEXT_STYLE_NORMAL,
TEXT_ID_FORMAT_PROMPT
@@ -2188,9 +2188,9 @@ MUI_STRING huHUStrings[] =
{STRING_CONSOLEFAIL3,
"Az USB-s billenty\373zetek m\202g nincsenek teljesen t\240mogatva\r\n"},
{STRING_FORMATTINGPART,
- "A telep\241t\213 form\240zza a merevlemezt"},
+ "A telep\241t\213 form\240zza a part\241ci\242t..."},
{STRING_CHECKINGDISK,
- "A telep\241t\213 ellen\213rzi a merevlemezt"},
+ "A telep\241t\213 ellen\213rzi a merevlemezt..."},
{STRING_FORMATDISK1,
" Part\241ci\242 form\240z\240sa %S f\240jlrendszerrel
(gyorsform\240z\240s) "},
{STRING_FORMATDISK2,
diff --git a/base/setup/usetup/lang/id-ID.h b/base/setup/usetup/lang/id-ID.h
index 1bd19e8a23e..abe1bcb28b3 100644
--- a/base/setup/usetup/lang/id-ID.h
+++ b/base/setup/usetup/lang/id-ID.h
@@ -1256,7 +1256,7 @@ static MUI_ENTRY idIDFormatPartitionEntries[] =
},
{
6,
- 10,
+ 16,
"Penyetelan akan memformat partisi. Tekan ENTER untuk lanjut.",
TEXT_STYLE_NORMAL,
TEXT_ID_FORMAT_PROMPT
@@ -2297,9 +2297,9 @@ MUI_STRING idIDStrings[] =
{STRING_CONSOLEFAIL3,
"Papan ketik USB belum didukung sepenuhnya\r\n"},
{STRING_FORMATTINGPART,
- "Penyetelan sedang memformat cakram anda"},
+ "Penyetelan sedang memformat partisi..."},
{STRING_CHECKINGDISK,
- "Penyetelan sedang memeriksa cakram anda"},
+ "Penyetelan sedang memeriksa cakram..."},
{STRING_FORMATDISK1,
" Format partisi sebagai sistem berkas %S (format cepat) "},
{STRING_FORMATDISK2,
diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h
index de6aa5c6533..8d49eb82e9f 100644
--- a/base/setup/usetup/lang/it-IT.h
+++ b/base/setup/usetup/lang/it-IT.h
@@ -1262,7 +1262,7 @@ static MUI_ENTRY itITFormatPartitionEntries[] =
},
{
6,
- 10,
+ 16,
"Setup formatter\x85 la partizione. Premere INVIO per continuare.",
TEXT_STYLE_NORMAL,
TEXT_ID_FORMAT_PROMPT
@@ -2303,9 +2303,9 @@ MUI_STRING itITStrings[] =
{STRING_CONSOLEFAIL3,
"le tastiere USB non sono ancora completamente supportate\r\n"},
{STRING_FORMATTINGPART,
- "Setup sta formattando il disco"},
+ "Setup sta formattando la partizione..."},
{STRING_CHECKINGDISK,
- "Setup sta controllando il disco"},
+ "Setup sta controllando il disco..."},
{STRING_FORMATDISK1,
" Formatta la partizione con file system %S (formattazione rapida) "},
{STRING_FORMATDISK2,
diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h
index 7c07986a819..7d4153bdbab 100644
--- a/base/setup/usetup/lang/ja-JP.h
+++ b/base/setup/usetup/lang/ja-JP.h
@@ -1259,7 +1259,7 @@ static MUI_ENTRY jaJPFormatPartitionEntries[] =
},
{
6,
- 10,
+ 16,
"\276\257\304\261\257\314\337\312 \312\337\260\303\250\274\256\335\246
\314\253\260\317\257\304 \274\317\275\241 \277\336\257\272\263 \275\331\306\312
ENTER \267\260\246 \265\274\303 \270\300\336\273\262\241",
TEXT_STYLE_NORMAL,
TEXT_ID_FORMAT_PROMPT
@@ -2302,9 +2302,9 @@ MUI_STRING jaJPStrings[] =
{STRING_CONSOLEFAIL3,
"USB \267\260\316\336\260\304\336 \312 \317\300\336
\266\335\276\336\335\306 \273\316\337\260\304 \273\332\303
\262\317\276\335\r\n"},
{STRING_FORMATTINGPART,
- "\276\257\304\261\257\314\337\312 \303\336\250\275\270\246
\314\253\260\317\257\304 \274\303\262\317\275"},
+ "Setup is formatting the partition..."},
{STRING_CHECKINGDISK,
- "\276\257\304\261\257\314\337\312 \303\336\250\275\270\246 \271\335\273
\274\303\262\317\275\241"},
+ "Setup is checking the disk..."},
{STRING_FORMATDISK1,
" \312\337\260\303\250\274\256\335\246 %S \314\247\262\331
\274\275\303\321 \303\336\314\253\260\317\257\304 (\270\262\257\270
\314\253\260\317\257\304) "},
{STRING_FORMATDISK2,
diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h
index 345c60d450c..050b9ddcbe7 100644
--- a/base/setup/usetup/lang/lt-LT.h
+++ b/base/setup/usetup/lang/lt-LT.h
@@ -1267,7 +1267,7 @@ static MUI_ENTRY ltLTFormatPartitionEntries[] =
},
{
6,
- 10,
+ 16,
"Setup will now format the partition. Press ENTER to continue.",
TEXT_STYLE_NORMAL,
TEXT_ID_FORMAT_PROMPT
@@ -2301,9 +2301,9 @@ MUI_STRING ltLTStrings[] =
{STRING_CONSOLEFAIL3,
"USB keyboards are not fully supported yet\r\n"},
{STRING_FORMATTINGPART,
- "Setup is formatting your disk"},
+ "Setup is formatting the partition..."},
{STRING_CHECKINGDISK,
- "Setup is checking your disk"},
+ "Setup is checking the disk..."},
{STRING_FORMATDISK1,
" Format partition as %S file system (quick format) "},
{STRING_FORMATDISK2,
diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h
index 0384a3fc4ef..69b3a2ccfd9 100644
--- a/base/setup/usetup/lang/ms-MY.h
+++ b/base/setup/usetup/lang/ms-MY.h
@@ -1248,7 +1248,7 @@ static MUI_ENTRY msMYFormatPartitionEntries[] =
},
{
6,
- 10,
+ 16,
"Persediaan sekarang akan format partition. Tekan ENTER untuk
teruskan.",
TEXT_STYLE_NORMAL,
TEXT_ID_FORMAT_PROMPT
@@ -2282,9 +2282,9 @@ MUI_STRING msMYStrings[] =
{STRING_CONSOLEFAIL3,
"Papan kekunci USB tidak disokong sepenuhnya lagi\r\n"},
{STRING_FORMATTINGPART,
- "Persediaan sedang format cakera"},
+ "Persediaan sedang format partition..."},
{STRING_CHECKINGDISK,
- "Persediaan sedang menyemak cakera"},
+ "Persediaan sedang menyemak cakera..."},
{STRING_FORMATDISK1,
" Format partition seperti sistem fail %S (format ringkas) "},
{STRING_FORMATDISK2,
diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h
index c2f994ac24b..950432ee883 100644
--- a/base/setup/usetup/lang/nl-NL.h
+++ b/base/setup/usetup/lang/nl-NL.h
@@ -1271,7 +1271,7 @@ static MUI_ENTRY nlNLFormatPartitionEntries[] =
},
{
6,
- 10,
+ 16,
"Setup gaat nu de partitie formatteren. Druk op ENTER om door te
gaan.",
TEXT_STYLE_NORMAL,
TEXT_ID_FORMAT_PROMPT
@@ -2324,9 +2324,9 @@ MUI_STRING nlNLStrings[] =
{STRING_CONSOLEFAIL3,
"USB toetsenborden worden nog niet volledig ondersteund.\r\n"},
{STRING_FORMATTINGPART,
- "Setup is de vaste schijf aan het formatteren."},
+ "Setup is de partitie aan het formatteren..."},
{STRING_CHECKINGDISK,
- "Setup is de vaste schijf aan het controleren."},
+ "Setup is de vaste schijf aan het controleren..."},
{STRING_FORMATDISK1,
" Formatteer partitie als %S bestandssysteem (snel) "},
{STRING_FORMATDISK2,
diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h
index 2c616e1bc59..69df8c5de9b 100644
--- a/base/setup/usetup/lang/pl-PL.h
+++ b/base/setup/usetup/lang/pl-PL.h
@@ -1268,7 +1268,7 @@ static MUI_ENTRY plPLFormatPartitionEntries[] =
},
{
6,
- 10,
+ 16,
"Instalator sformatuje teraz partycj\251. Naci\230nij ENTER, aby
kontynuowa\206.",
TEXT_STYLE_NORMAL,
TEXT_ID_FORMAT_PROMPT
@@ -2309,9 +2309,9 @@ MUI_STRING plPLStrings[] =
{STRING_CONSOLEFAIL3,
"Nie s\245 obecnie w pe\210ni obs\210ugiwane.\r\n"},
{STRING_FORMATTINGPART,
- "Instalator formatuje tw\242j dysk"},
+ "Instalator formatuje partycj\251..."},
{STRING_CHECKINGDISK,
- "Instalator sprawdza tw\242j dysk"},
+ "Instalator sprawdza dysk..."},
{STRING_FORMATDISK1,
" Formatuj partycj\251 w systemie plik\242w %S (szybkie formatowanie) "},
{STRING_FORMATDISK2,
diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h
index bc897c1d224..9e1cfc1f03a 100644
--- a/base/setup/usetup/lang/pt-BR.h
+++ b/base/setup/usetup/lang/pt-BR.h
@@ -1273,7 +1273,7 @@ static MUI_ENTRY ptBRFormatPartitionEntries[] =
},
{
6,
- 10,
+ 16,
"O instalador ir\240 formatar a parti\207\306o. Para continuar,
pressione ENTER.",
TEXT_STYLE_NORMAL,
TEXT_ID_FORMAT_PROMPT
@@ -2337,9 +2337,9 @@ MUI_STRING ptBRStrings[] =
{STRING_CONSOLEFAIL3,
"Os teclados USB ainda n\306o s\306o completamente suportados\r\n"},
{STRING_FORMATTINGPART,
- "O instalador est\240 formatando o disco"},
+ "O instalador est\240 formatando a parti\207\306o..."},
{STRING_CHECKINGDISK,
- "O instalador est\240 verificando o disco"},
+ "O instalador est\240 verificando o disco..."},
{STRING_FORMATDISK1,
" Formatar a parti\207\306o utilizando o sistema de arquivos %S
(R\240pido) "},
{STRING_FORMATDISK2,
diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/usetup/lang/pt-PT.h
index f383dbfae68..ab19b6d38b1 100644
--- a/base/setup/usetup/lang/pt-PT.h
+++ b/base/setup/usetup/lang/pt-PT.h
@@ -1273,7 +1273,7 @@ static MUI_ENTRY ptPTFormatPartitionEntries[] =
},
{
6,
- 10,
+ 16,
"O instalador ir\240 formatar a parti\207\306o. Para continuar,
pressione ENTER.",
TEXT_STYLE_NORMAL,
TEXT_ID_FORMAT_PROMPT
@@ -2336,9 +2336,9 @@ MUI_STRING ptPTStrings[] =
{STRING_CONSOLEFAIL3,
"Os teclados USB ainda n\306o s\306o completamente suportados\r\n"},
{STRING_FORMATTINGPART,
- "O instalador est\240 a formatar o disco"},
+ "O instalador est\240 a formatar a parti\207\306o..."},
{STRING_CHECKINGDISK,
- "O instalador est\240 a verificar o disco"},
+ "O instalador est\240 a verificar o disco..."},
{STRING_FORMATDISK1,
" Formatar a parti\207\306o utilizando o sistema de arquivos %S
(R\240pido) "},
{STRING_FORMATDISK2,
diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h
index 7cabee005a3..762cd357331 100644
--- a/base/setup/usetup/lang/ro-RO.h
+++ b/base/setup/usetup/lang/ro-RO.h
@@ -1297,6 +1297,13 @@ static MUI_ENTRY roROFormatPartitionEntries[] =
{
6,
8,
+ "Urmeaz\343 formatarea parti\376iei.",
+ TEXT_STYLE_NORMAL,
+ TEXT_ID_STATIC
+ },
+ {
+ 6,
+ 16,
"Urmeaz\343 formatarea parti\376iei. Tasta\376i ENTER pentru a
continua.",
TEXT_STYLE_NORMAL,
TEXT_ID_FORMAT_PROMPT
@@ -2351,7 +2358,7 @@ MUI_STRING roROStrings[] =
{STRING_CONSOLEFAIL3,
"Tastaturile USB nu sunt \356nc\343 toate acceptate\r\n"},
{STRING_FORMATTINGPART,
- "Disc \356n curs de formatare..."},
+ "Parti\376ia \356n curs de formatare..."},
{STRING_CHECKINGDISK,
"Disc \356n curs de verificare..."},
{STRING_FORMATDISK1,
diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h
index 683b130eb15..92f04640bc9 100644
--- a/base/setup/usetup/lang/ru-RU.h
+++ b/base/setup/usetup/lang/ru-RU.h
@@ -1279,7 +1279,7 @@ static MUI_ENTRY ruRUFormatPartitionEntries[] =
},
{
6,
- 10,
+ 16,
"\204\253\357 \343\341\342\240\255\256\242\252\250
\340\240\247\244\245\253 \241\343\244\245\342
\256\342\344\256\340\254\240\342\250\340\256\242\240\255.
\215\240\246\254\250\342\245 ENTER \244\253\357
\257\340\256\244\256\253\246\245\255\250\357.",
TEXT_STYLE_NORMAL,
TEXT_ID_FORMAT_PROMPT
@@ -2320,9 +2320,9 @@ MUI_STRING ruRUStrings[] =
{STRING_CONSOLEFAIL3,
"USB \252\253\240\242\250\240\342\343\340\353 \341\245\251\347\240\341
\257\256\244\244\245\340\246\250\242\240\356\342\341\357 \255\245
\257\256\253\255\256\341\342\354\356\r\n"},
{STRING_FORMATTINGPART,
- "\217\340\256\243\340\240\254\254\240 \343\341\342\240\255\256\242\252\250
\344\256\340\254\240\342\250\340\343\245\342 \242\240\350 \244\250\341\252"},
+ "\217\340\256\243\340\240\254\254\240 \343\341\342\240\255\256\242\252\250
\344\256\340\254\240\342\250\340\343\245\342 \340\240\247\244\245\253..."},
{STRING_CHECKINGDISK,
- "\217\340\256\243\340\240\254\254\240 \343\341\342\240\255\256\242\252\250
\257\340\256\242\245\340\357\245\342 \242\240\350 \244\250\341\252"},
+ "\217\340\256\243\340\240\254\254\240 \343\341\342\240\255\256\242\252\250
\257\340\256\242\245\340\357\245\342 \244\250\341\252..."},
{STRING_FORMATDISK1,
" \224\256\340\254\240\342\250\340\256\242\240\255\250\245
\340\240\247\244\245\253\240 \242 \344\240\251\253\256\242\256\251
\341\250\341\342\245\254\245 %S (\241\353\341\342\340\256\245) "},
{STRING_FORMATDISK2,
diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h
index 37c06321f56..74e50708d2e 100644
--- a/base/setup/usetup/lang/sk-SK.h
+++ b/base/setup/usetup/lang/sk-SK.h
@@ -1265,7 +1265,7 @@ static MUI_ENTRY skSKFormatPartitionEntries[] =
},
{
6,
- 10,
+ 16,
"In\347tal\240tor teraz naform\240tuje oblas\234. Stla\237te ENTER pre
pokra\237ovanie.",
TEXT_STYLE_NORMAL,
TEXT_ID_FORMAT_PROMPT
@@ -2311,9 +2311,9 @@ MUI_STRING skSKStrings[] =
{STRING_CONSOLEFAIL3,
"USB kl\240vesnica e\347te nie je plne podporovan\240\r\n"},
{STRING_FORMATTINGPART,
- "In\347tal\240tor form\240tuje V\240\347 disk"},
+ "In\347tal\240tor form\240tuje oblas\234..."},
{STRING_CHECKINGDISK,
- "In\347tal\240tor kontroluje V\240\347 disk"},
+ "In\347tal\240tor kontroluje disk..."},
{STRING_FORMATDISK1,
" Naform\240tova\234 oblas\234 ako syst\202m s\243borov %S (r\354chly
form\240t) "},
{STRING_FORMATDISK2,
diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h
index f5849cade32..265fb11d62a 100644
--- a/base/setup/usetup/lang/sq-AL.h
+++ b/base/setup/usetup/lang/sq-AL.h
@@ -1263,7 +1263,7 @@ static MUI_ENTRY sqALFormatPartitionEntries[] =
},
{
6,
- 10,
+ 16,
"Instalimi tani do t\211 formatoj\211 particionin. Kliko ENTER p\211r
t\211 vazhduar.",
TEXT_STYLE_NORMAL,
TEXT_ID_FORMAT_PROMPT
@@ -2312,9 +2312,9 @@ MUI_STRING sqALStrings[] =
{STRING_CONSOLEFAIL3,
"Tastierat USB nuk jan\211 t\211 mb\211shtetura ende plot\211sisht\r\n"},
{STRING_FORMATTINGPART,
- "Instalimi po formaton diskun tuaj"},
+ "Instalimi po formaton particionin..."},
{STRING_CHECKINGDISK,
- "Instalimi \211sht\211 duke kontrolluar diskun tuaj"},
+ "Instalimi \211sht\211 duke kontrolluar diskun..."},
{STRING_FORMATDISK1,
" Formato particionin si %S dokumentat e sistemit (formatim i shpejt\211)
"},
{STRING_FORMATDISK2,
diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h
index 95664b2d55a..28463ed63ee 100644
--- a/base/setup/usetup/lang/sv-SE.h
+++ b/base/setup/usetup/lang/sv-SE.h
@@ -1265,7 +1265,7 @@ static MUI_ENTRY svSEFormatPartitionEntries[] =
},
{
6,
- 10,
+ 16,
"Partitionen kommer nu att formaters Tryck ENTER f\224r att
forts\204tta.",
TEXT_STYLE_NORMAL,
TEXT_ID_FORMAT_PROMPT
@@ -2301,9 +2301,9 @@ MUI_STRING svSEStrings[] =
{STRING_CONSOLEFAIL3,
"USB tangentbord \204r itne helt st\224tt \204n\r\n"},
{STRING_FORMATTINGPART,
- "Setup formaterar din disk"},
+ "Setup formaterar partitionen..."},
{STRING_CHECKINGDISK,
- "Setup under\224ker din disk"},
+ "Setup unders\224ker disken..."},
{STRING_FORMATDISK1,
" Formaterar partition som %S filsystem (snabbformatering) "},
{STRING_FORMATDISK2,
diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h
index 59210fc1a56..5c79d50ce18 100644
--- a/base/setup/usetup/lang/tr-TR.h
+++ b/base/setup/usetup/lang/tr-TR.h
@@ -1247,7 +1247,7 @@ static MUI_ENTRY trTRFormatPartitionEntries[] =
},
{
6,
- 10,
+ 16,
"Kur, \237imdi b\224l\201m\201 bi\207imlendirecek. Devam etmek i\207in
ENTER'e bas\215n\215z.",
TEXT_STYLE_NORMAL,
TEXT_ID_FORMAT_PROMPT
@@ -2274,9 +2274,9 @@ MUI_STRING trTRStrings[] =
{STRING_CONSOLEFAIL3,
"USB klavye daha t\201m\201yle desteklenmemektedir.\r\n"},
{STRING_FORMATTINGPART,
- "Kur, diskinizi bi\207imlendiriyor."},
+ "Kur, b\224l\201m\201 bi\207imlendiriyor..."},
{STRING_CHECKINGDISK,
- "Kur, diskinizi g\224zden ge\207iriyor."},
+ "Kur, diski g\224zden ge\207iriyor..."},
{STRING_FORMATDISK1,
" B\224l\201m\201 %S dosya sistemiyle h\215zl\215 bi\207imlendir. "},
{STRING_FORMATDISK2,
diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h
index 1d65687b697..8100b86f660 100644
--- a/base/setup/usetup/lang/uk-UA.h
+++ b/base/setup/usetup/lang/uk-UA.h
@@ -1264,7 +1264,7 @@ static MUI_ENTRY ukUAFormatPartitionEntries[] =
},
{
6,
- 10,
+ 16,
"\207\240\340\240\247 \242\341\342\240\255\256\242\253\356\242\240\347
\242i\244\344\256\340\254\240\342\343\363 \340\256\247\244i\253.
\215\240\342\250\341\255i\342\354 ENTER \244\253\357
\257\340\256\244\256\242\246\245\255\255\357.",
TEXT_STYLE_NORMAL,
TEXT_ID_FORMAT_PROMPT
@@ -2308,9 +2308,9 @@ MUI_STRING ukUAStrings[] =
{STRING_CONSOLEFAIL3,
"USB \252\253\240\242i\240\342\343\340\250 \351\245 \255\245
\257i\244\342\340\250\254\343\356\342\354\341\357
\257\256\242\255i\341\342\356\r\n"},
{STRING_FORMATTINGPART,
- "\202\341\342\240\255\256\242\253\356\242\240\347
\344\256\340\254\240\342\343\363 \242\240\350 \244\250\341\252"},
+ "\202\341\342\240\255\256\242\253\356\242\240\347
\344\256\340\254\240\342\343\363 \340\256\247\244i\253..."},
{STRING_CHECKINGDISK,
- "\202\341\342\240\255\256\242\253\356\242\240\347
\257\245\340\245\242i\340\357\363 \242\240\350 \244\250\341\252"},
+ "\202\341\342\240\255\256\242\253\356\242\240\347
\257\245\340\245\242i\340\357\363 \244\250\341\252..."},
{STRING_FORMATDISK1,
" \224\256\340\254\240\342\343\242\240\342\250 \340\256\247\244i\253 \242
\344\240\251\253\256\242i\251 \341\250\341\342\245\254i %S
(\350\242\250\244\252\245 \344\256\340\254\240\342\343\242\240\255\255\357) "},
{STRING_FORMATDISK2,
diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c
index 492fc9c9d05..10bf53553dd 100644
--- a/base/setup/usetup/usetup.c
+++ b/base/setup/usetup/usetup.c
@@ -2784,8 +2784,6 @@ FormatPartitionPage(PINPUT_RECORD Ir)
DPRINT("FormatPartitionPage()\n");
- MUIDisplayPage(FORMAT_PARTITION_PAGE);
-
if (PartitionList == NULL || TempPartition == NULL)
{
/* FIXME: show an error dialog */
@@ -2800,6 +2798,15 @@ FormatPartitionPage(PINPUT_RECORD Ir)
SelectedFileSystem = FileSystemList->Selected;
ASSERT(SelectedFileSystem && SelectedFileSystem->FileSystem);
+ MUIDisplayPage(FORMAT_PARTITION_PAGE);
+
+ PartitionDescription(PartEntry, Buffer, ARRAYSIZE(Buffer));
+ CONSOLE_SetTextXY(6, 10, Buffer);
+
+ DiskDescription(DiskEntry, Buffer, ARRAYSIZE(Buffer));
+ CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDDISK2),
+ Buffer);
+
while (TRUE)
{
if (!IsUnattendedSetup)
@@ -2929,8 +2936,6 @@ CheckFileSystemPage(PINPUT_RECORD Ir)
PPARTENTRY PartEntry;
CHAR Buffer[MAX_PATH];
- MUIDisplayPage(CHECK_FILE_SYSTEM_PAGE);
-
if (PartitionList == NULL)
{
/* FIXME: show an error dialog */
@@ -2947,6 +2952,15 @@ CheckFileSystemPage(PINPUT_RECORD Ir)
DPRINT1("CheckFileSystemPage -- PartitionType: 0x%02X ; FileSystem: %S\n",
PartEntry->PartitionType, (*PartEntry->FileSystem ?
PartEntry->FileSystem : L"n/a"));
+ MUIDisplayPage(CHECK_FILE_SYSTEM_PAGE);
+
+ PartitionDescription(PartEntry, Buffer, ARRAYSIZE(Buffer));
+ CONSOLE_SetTextXY(6, 10, Buffer);
+
+ DiskDescription(PartEntry->DiskEntry, Buffer, ARRAYSIZE(Buffer));
+ CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDDISK2),
+ Buffer);
+
/* Check the partition */
Status = DoChkdsk(PartEntry);
if (Status == STATUS_NOT_SUPPORTED)
