diff --git a/reactos/base/setup/usetup/interface/usetup.c b/reactos/base/setup/usetup/interface/usetup.c index d6591fc0664..b7c96550b6d 100644 --- a/reactos/base/setup/usetup/interface/usetup.c +++ b/reactos/base/setup/usetup/interface/usetup.c @@ -1628,7 +1628,7 @@ CreatePartitionPage (PINPUT_RECORD Ir) if (DiskEntry->DriverName.Length > 0) { CONSOLE_PrintTextXY(6, 10, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ.", + MUIGetString(STRING_HDDINFO1), DiskSize, Unit, DiskEntry->DiskNumber, @@ -1640,7 +1640,7 @@ CreatePartitionPage (PINPUT_RECORD Ir) else { CONSOLE_PrintTextXY(6, 10, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu).", + MUIGetString(STRING_HDDINFO2), DiskSize, Unit, DiskEntry->DiskNumber, @@ -1798,7 +1798,7 @@ DeletePartitionPage (PINPUT_RECORD Ir) if (PartType == NULL) { CONSOLE_PrintTextXY(6, 10, - " %c%c Type %lu %I64u %s", + MUIGetString(STRING_HDDINFO3), (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', PartEntry->PartInfo[0].PartitionType, @@ -1836,7 +1836,7 @@ DeletePartitionPage (PINPUT_RECORD Ir) if (DiskEntry->DriverName.Length > 0) { CONSOLE_PrintTextXY(6, 12, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ.", + MUIGetString(STRING_HDDINFO4), DiskSize, Unit, DiskEntry->DiskNumber, @@ -1848,7 +1848,7 @@ DeletePartitionPage (PINPUT_RECORD Ir) else { CONSOLE_PrintTextXY(6, 12, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu).", + MUIGetString(STRING_HDDINFO5), DiskSize, Unit, DiskEntry->DiskNumber, @@ -1965,7 +1965,7 @@ SelectFileSystemPage (PINPUT_RECORD Ir) if (PartEntry->AutoCreate == TRUE) { - CONSOLE_SetTextXY(6, 8, "Setup created a new partition on"); + CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NEWPARTITION)); #if 0 CONSOLE_PrintTextXY(8, 10, "Partition %lu (%I64u %s) %s of", @@ -1975,7 +1975,7 @@ SelectFileSystemPage (PINPUT_RECORD Ir) PartType); #endif - CONSOLE_PrintTextXY(8, 10, "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ).", + CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDDINFO6), DiskEntry->DiskNumber, DiskSize, DiskUnit, @@ -2001,7 +2001,7 @@ SelectFileSystemPage (PINPUT_RECORD Ir) if (PartType == NULL) { CONSOLE_PrintTextXY(8, 10, - "%c%c Type %lu %I64u %s", + MUIGetString(STRING_HDDINFO7), (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', PartEntry->PartInfo[0].PartitionType, @@ -2019,7 +2019,7 @@ SelectFileSystemPage (PINPUT_RECORD Ir) PartUnit); } - CONSOLE_PrintTextXY(6, 12, "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ).", + CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDDINFO8), DiskEntry->DiskNumber, DiskSize, DiskUnit, diff --git a/reactos/base/setup/usetup/lang/de-DE.h b/reactos/base/setup/usetup/lang/de-DE.h index d5d4e42dbaf..839c076c9a3 100644 --- a/reactos/base/setup/usetup/lang/de-DE.h +++ b/reactos/base/setup/usetup/lang/de-DE.h @@ -1646,6 +1646,32 @@ MUI_STRING deDEStrings[] = " Formatiere Partition als %S Dateisystem "}, {STRING_KEEPFORMAT, " Dateisystem beibehalten (Keine Ver„nderungen) "}, + {STRING_HDDINFO1, + "%I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %wZ."}, + {STRING_HDDINFO2, + "%I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO3, + " %c%c Typ %lu %I64u %s"}, + {STRING_HDDINFO4, + "auf %I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %wZ."}, + {STRING_HDDINFO5, + "auf %I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO6, + "Festplatte %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO7, + "%c%c Typ %lu %I64u %s"}, + {STRING_HDDINFO8, + "auf Festplatte %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO9, + "%c%c Typ %-3u %6lu %s"}, + {STRING_HDDINFO10, + "%6lu %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %S"}, + {STRING_HDDINFO11, + "%6lu %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Setup erstellte eine neue Partition auf"}, + {STRING_UNPSPACE, + " Unpartitionierter Speicher %6lu %s"}, {0, 0} }; diff --git a/reactos/base/setup/usetup/lang/en-US.h b/reactos/base/setup/usetup/lang/en-US.h index a4593f0d0a5..c2460c28a36 100644 --- a/reactos/base/setup/usetup/lang/en-US.h +++ b/reactos/base/setup/usetup/lang/en-US.h @@ -1640,6 +1640,32 @@ MUI_STRING enUSStrings[] = " Format partition as %S file system "}, {STRING_KEEPFORMAT, " Keep current file system (no changes) "}, + {STRING_HDDINFO1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFO2, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO3, + " %c%c Type %lu %I64u %s"}, + {STRING_HDDINFO4, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFO5, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO6, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO7, + "%c%c Type %lu %I64u %s"}, + {STRING_HDDINFO8, + "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO9, + "%c%c Type %-3u %6lu %s"}, + {STRING_HDDINFO10, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + {STRING_HDDINFO11, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Setup created a new partition on"}, + {STRING_UNPSPACE, + " Unpartitioned space %6lu %s"}, {0, 0} }; diff --git a/reactos/base/setup/usetup/lang/es-ES.h b/reactos/base/setup/usetup/lang/es-ES.h index 7531ffc47fc..007d486b5fe 100644 --- a/reactos/base/setup/usetup/lang/es-ES.h +++ b/reactos/base/setup/usetup/lang/es-ES.h @@ -1568,8 +1568,3 @@ MUI_PAGE esESPages[] = }; #endif - - - - - diff --git a/reactos/base/setup/usetup/lang/fr-FR.h b/reactos/base/setup/usetup/lang/fr-FR.h index 80a992110ef..7b88f1c2532 100644 --- a/reactos/base/setup/usetup/lang/fr-FR.h +++ b/reactos/base/setup/usetup/lang/fr-FR.h @@ -1652,6 +1652,32 @@ MUI_STRING frFRStrings[] = " Format partition as %S file system "}, {STRING_KEEPFORMAT, " Keep current file system (no changes) "}, + {STRING_HDDINFO1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFO2, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO3, + " %c%c Type %lu %I64u %s"}, + {STRING_HDDINFO4, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFO5, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO6, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO7, + "%c%c Type %lu %I64u %s"}, + {STRING_HDDINFO8, + "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO9, + "%c%c Type %-3u %6lu %s"}, + {STRING_HDDINFO10, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + {STRING_HDDINFO11, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Setup created a new partition on"}, + {STRING_UNPSPACE, + " Unpartitioned space %6lu %s"}, {0, 0} }; diff --git a/reactos/base/setup/usetup/lang/it-IT.h b/reactos/base/setup/usetup/lang/it-IT.h index 08a0e2efbd1..49c0258a693 100644 --- a/reactos/base/setup/usetup/lang/it-IT.h +++ b/reactos/base/setup/usetup/lang/it-IT.h @@ -1574,9 +1574,3 @@ MUI_PAGE itITPages[] = }; #endif - - - - - - diff --git a/reactos/base/setup/usetup/lang/pl-PL.h b/reactos/base/setup/usetup/lang/pl-PL.h index 41de14f6b55..746baed6b3e 100644 --- a/reactos/base/setup/usetup/lang/pl-PL.h +++ b/reactos/base/setup/usetup/lang/pl-PL.h @@ -1648,6 +1648,32 @@ MUI_STRING plPLStrings[] = " Sformatuj partycj© z systemem plik¢w %S "}, {STRING_KEEPFORMAT, " Zachowaj obecny system plik¢w (bez zmian) "}, + {STRING_HDDINFO1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFO2, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO3, + " %c%c Type %lu %I64u %s"}, + {STRING_HDDINFO4, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFO5, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO6, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO7, + "%c%c Type %lu %I64u %s"}, + {STRING_HDDINFO8, + "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO9, + "%c%c Type %-3u %6lu %s"}, + {STRING_HDDINFO10, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + {STRING_HDDINFO11, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Setup created a new partition on"}, + {STRING_UNPSPACE, + " Unpartitioned space %6lu %s"}, {0, 0} }; diff --git a/reactos/base/setup/usetup/lang/ru-RU.h b/reactos/base/setup/usetup/lang/ru-RU.h index 8ddffc282de..4069441875e 100644 --- a/reactos/base/setup/usetup/lang/ru-RU.h +++ b/reactos/base/setup/usetup/lang/ru-RU.h @@ -1640,6 +1640,32 @@ MUI_STRING ruRUStrings[] = " ”®à¬ â¨à®¢ ­¨¥ à §¤¥«  ¢ ä ©«®¢®© á¨á⥬¥ %S "}, {STRING_KEEPFORMAT, " Žáâ ¢¨âì áãé¥áâ¢ãîéãî ä ©«®¢ãî á¨á⥬ã (¡¥§ ¨§¬¥­¥­¨©) "}, + {STRING_HDDINFO1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFO2, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO3, + " %c%c Type %lu %I64u %s"}, + {STRING_HDDINFO4, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFO5, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO6, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO7, + "%c%c Type %lu %I64u %s"}, + {STRING_HDDINFO8, + "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO9, + "%c%c Type %-3u %6lu %s"}, + {STRING_HDDINFO10, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + {STRING_HDDINFO11, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Setup created a new partition on"}, + {STRING_UNPSPACE, + " Unpartitioned space %6lu %s"}, {0, 0} }; diff --git a/reactos/base/setup/usetup/lang/sk-SK.h b/reactos/base/setup/usetup/lang/sk-SK.h index 345aeb677ef..10e759d68b5 100644 --- a/reactos/base/setup/usetup/lang/sk-SK.h +++ b/reactos/base/setup/usetup/lang/sk-SK.h @@ -1645,6 +1645,32 @@ MUI_STRING skSKStrings[] = " Naform tovaœ oblasœ ako syst‚m s£borov %S "}, {STRING_KEEPFORMAT, " Ponechaœ s£Ÿasnì syst‚m s£borov (bez zmeny) "}, + {STRING_HDDINFO1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFO2, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO3, + " %c%c Type %lu %I64u %s"}, + {STRING_HDDINFO4, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFO5, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO6, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO7, + "%c%c Type %lu %I64u %s"}, + {STRING_HDDINFO8, + "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO9, + "%c%c Type %-3u %6lu %s"}, + {STRING_HDDINFO10, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + {STRING_HDDINFO11, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Setup created a new partition on"}, + {STRING_UNPSPACE, + " Unpartitioned space %6lu %s"}, {0, 0} }; diff --git a/reactos/base/setup/usetup/mui.h b/reactos/base/setup/usetup/mui.h index 5b211a56dc8..2c3e8036745 100644 --- a/reactos/base/setup/usetup/mui.h +++ b/reactos/base/setup/usetup/mui.h @@ -104,5 +104,17 @@ MUIGetString(ULONG Number); #define STRING_FORMATDISK1 33 #define STRING_FORMATDISK2 34 #define STRING_KEEPFORMAT 35 - +#define STRING_HDDINFO1 36 +#define STRING_HDDINFO2 37 +#define STRING_HDDINFO3 38 +#define STRING_HDDINFO4 39 +#define STRING_HDDINFO5 40 +#define STRING_HDDINFO6 41 +#define STRING_HDDINFO7 42 +#define STRING_HDDINFO8 43 +#define STRING_HDDINFO9 44 +#define STRING_HDDINFO10 45 +#define STRING_HDDINFO11 46 +#define STRING_NEWPARTITION 47 +#define STRING_UNPSPACE 48 #endif diff --git a/reactos/base/setup/usetup/partlist.c b/reactos/base/setup/usetup/partlist.c index 266e0e03474..64b587fb653 100644 --- a/reactos/base/setup/usetup/partlist.c +++ b/reactos/base/setup/usetup/partlist.c @@ -1136,7 +1136,7 @@ PrintPartitionData (PPARTLIST List, } sprintf (LineBuffer, - " Unpartitioned space %6lu %s", + MUIGetString(STRING_UNPSPACE), PartSize.u.LowPart, Unit); } @@ -1194,7 +1194,7 @@ PrintPartitionData (PPARTLIST List, if (PartType == NULL) { sprintf (LineBuffer, - "%c%c Type %-3u %6lu %s", + MUIGetString(STRING_HDDINFO9), (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', PartEntry->PartInfo[0].PartitionType, @@ -1288,7 +1288,7 @@ PrintDiskData (PPARTLIST List, if (DiskEntry->DriverName.Length > 0) { sprintf (LineBuffer, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S", + MUIGetString(STRING_HDDINFO10), DiskSize.u.LowPart, Unit, DiskEntry->DiskNumber, @@ -1300,7 +1300,7 @@ PrintDiskData (PPARTLIST List, else { sprintf (LineBuffer, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)", + MUIGetString(STRING_HDDINFO11), DiskSize.u.LowPart, Unit, DiskEntry->DiskNumber,