[dreimer] 32392: Once more... make it possible to translate usetup COMPLETELY. (I hope this time I am right....)

Author: dreimer
Date: Sat Feb 16 21:58:05 2008
New Revision: 32392

URL: http://svn.reactos.org/svn/reactos?rev=32392&view=rev
Log:
Once more... make it possible to translate usetup COMPLETELY. (I hope this time I am
right....)

Modified:
    trunk/reactos/base/setup/usetup/interface/usetup.c
    trunk/reactos/base/setup/usetup/lang/de-DE.h
    trunk/reactos/base/setup/usetup/lang/en-US.h
    trunk/reactos/base/setup/usetup/lang/es-ES.h
    trunk/reactos/base/setup/usetup/lang/fr-FR.h
    trunk/reactos/base/setup/usetup/lang/it-IT.h
    trunk/reactos/base/setup/usetup/lang/pl-PL.h
    trunk/reactos/base/setup/usetup/lang/ru-RU.h
    trunk/reactos/base/setup/usetup/lang/sk-SK.h
    trunk/reactos/base/setup/usetup/mui.h
    trunk/reactos/base/setup/usetup/partlist.c

Modified: trunk/reactos/base/setup/usetup/interface/usetup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac…
==============================================================================
--- trunk/reactos/base/setup/usetup/interface/usetup.c (original)
+++ trunk/reactos/base/setup/usetup/interface/usetup.c Sat Feb 16 21:58:05 2008
@@ -1628,7 +1628,7 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
 
     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 @@
                             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 @@
         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 @@
                                 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,

Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/de-DE.h (original)
+++ trunk/reactos/base/setup/usetup/lang/de-DE.h Sat Feb 16 21:58:05 2008
@@ -1646,6 +1646,32 @@
     " 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}
 };
 

Modified: trunk/reactos/base/setup/usetup/lang/en-US.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/en-US.h (original)
+++ trunk/reactos/base/setup/usetup/lang/en-US.h Sat Feb 16 21:58:05 2008
@@ -1640,6 +1640,32 @@
     " 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}
 };
 

Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/es-ES.h (original)
+++ trunk/reactos/base/setup/usetup/lang/es-ES.h Sat Feb 16 21:58:05 2008
@@ -1568,8 +1568,3 @@
 };
 
 #endif
-
-
-
-
-

Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/fr-FR.h (original)
+++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Sat Feb 16 21:58:05 2008
@@ -1652,6 +1652,32 @@
     " 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}
 };
 

Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/it-IT.h (original)
+++ trunk/reactos/base/setup/usetup/lang/it-IT.h Sat Feb 16 21:58:05 2008
@@ -1574,9 +1574,3 @@
 };
 
 #endif
-
-
-
-
-
-

Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/pl-PL.h (original)
+++ trunk/reactos/base/setup/usetup/lang/pl-PL.h Sat Feb 16 21:58:05 2008
@@ -1648,6 +1648,32 @@
     " 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}
 };
 

Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/ru-RU.h (original)
+++ trunk/reactos/base/setup/usetup/lang/ru-RU.h Sat Feb 16 21:58:05 2008
@@ -1640,6 +1640,32 @@
     " ”®à¬ â¨à®¢ ­¨¥ à §¤¥«  ¢ ä ©«®¢®© á¨á⥬¥ %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}
 };
 

Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-…
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/sk-SK.h (original)
+++ trunk/reactos/base/setup/usetup/lang/sk-SK.h Sat Feb 16 21:58:05 2008
@@ -1645,6 +1645,32 @@
     " 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}
 };
 

Modified: trunk/reactos/base/setup/usetup/mui.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re…
==============================================================================
--- trunk/reactos/base/setup/usetup/mui.h (original)
+++ trunk/reactos/base/setup/usetup/mui.h Sat Feb 16 21:58:05 2008
@@ -104,5 +104,17 @@
 #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

Modified: trunk/reactos/base/setup/usetup/partlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist…
==============================================================================
--- trunk/reactos/base/setup/usetup/partlist.c (original)
+++ trunk/reactos/base/setup/usetup/partlist.c Sat Feb 16 21:58:05 2008
@@ -1136,7 +1136,7 @@
       }
 
       sprintf (LineBuffer,
-               "    Unpartitioned space              %6lu %s",
+               MUIGetString(STRING_UNPSPACE),
                PartSize.u.LowPart,
                Unit);
   }
@@ -1194,7 +1194,7 @@
     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 @@
   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 @@
   else
   {
     sprintf (LineBuffer,
-             "%6lu %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu)",
+             MUIGetString(STRING_HDDINFO11),
              DiskSize.u.LowPart,
              Unit,
              DiskEntry->DiskNumber,