[ros-diffs] [jmorlan] 39630: Fix some cases where the "format" program misused the %S format, causing it to display gibberish. To print a TCHAR string with _tprintf, just use %s. (Bug 4067)

Author: jmorlan
Date: Mon Feb 16 17:05:13 2009
New Revision: 39630

URL: http://svn.reactos.org/svn/reactos?rev=39630&view=rev
Log:
Fix some cases where the "format" program misused the %S format, causing it to
display gibberish. To print a TCHAR string with _tprintf, just use %s. (Bug 4067)

Modified:
    trunk/reactos/base/system/format/format.c
    trunk/reactos/base/system/format/lang/bg-BG.rc
    trunk/reactos/base/system/format/lang/cs-CZ.rc
    trunk/reactos/base/system/format/lang/de-DE.rc
    trunk/reactos/base/system/format/lang/el-GR.rc
    trunk/reactos/base/system/format/lang/en-US.rc
    trunk/reactos/base/system/format/lang/es-ES.rc
    trunk/reactos/base/system/format/lang/fr-FR.rc
    trunk/reactos/base/system/format/lang/hu-HU.rc
    trunk/reactos/base/system/format/lang/id-ID.rc
    trunk/reactos/base/system/format/lang/it-IT.rc
    trunk/reactos/base/system/format/lang/ja-JP.rc
    trunk/reactos/base/system/format/lang/lt-LT.rc
    trunk/reactos/base/system/format/lang/no-NO.rc
    trunk/reactos/base/system/format/lang/pl-PL.rc
    trunk/reactos/base/system/format/lang/ru-RU.rc
    trunk/reactos/base/system/format/lang/sk-SK.rc
    trunk/reactos/base/system/format/lang/uk-UA.rc

Modified: trunk/reactos/base/system/format/format.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/format.…
==============================================================================
--- trunk/reactos/base/system/format/format.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/format/format.c [iso-8859-1] Mon Feb 16 17:05:13 2009
@@ -64,7 +64,7 @@
 					MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
 					(LPTSTR)&lpMsgBuf, 0, NULL );
 
-	_tprintf(_T("%S: %S\n"), (LPWSTR)Message, (LPWSTR)lpMsgBuf );
+	_tprintf(_T("%s: %s\n"), Message, lpMsgBuf );
 	LocalFree( lpMsgBuf );
 }
 
@@ -264,7 +264,7 @@
 	LoadString( GetModuleHandle(NULL), STRING_HELP, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 	if (!LoadFMIFSEntryPoints())
 	{
-		_tprintf(szMsg, ProgramName, "");
+		_tprintf(szMsg, ProgramName, _T(""));
 		return;
 	}
 

Modified: trunk/reactos/base/system/format/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/bg…
==============================================================================
--- trunk/reactos/base/system/format/lang/bg-BG.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/format/lang/bg-BG.rc [iso-8859-1] Mon Feb 16 17:05:13 2009
@@ -7,7 +7,7 @@
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 STRINGTABLE DISCARDABLE
 BEGIN
-STRING_HELP,  "Óïîòðåáà: %S óñòðîéñòâî: [-FS:ôàéëîâà_ñèñòåìà] [-V:åòèêåò] [-Q]
[-A:ðàçìåð] [-C]\n\n\
+STRING_HELP,  "Óïîòðåáà: %s óñòðîéñòâî: [-FS:ôàéëîâà_ñèñòåìà] [-V:åòèêåò] [-Q]
[-A:ðàçìåð] [-C]\n\n\
   [drive:]         Óêàçâà óñòðîéñòâîòî çà îðàçìåðÿâàíå.\n\
   -FS:ôàéëîâà_ñèñòåìà  Óêàçâà âèäà íà äàéëîâàòà ñèñòåìà (%s).\n\
   -V:åòèêåò         Óêàçâà åòèêåò çà òîìà.\n\
@@ -29,7 +29,7 @@
 
 STRING_FMIFS_FAIL  "Íåóñïåøíî îïðåäåëÿíå ðàçïîëîæåíèåòî íà âõîäíèòå òî÷êè íà
FMIFS\n\n"
 
-STRING_UNKNOW_ARG  "Íåèçâåñòåí êëþ÷: %S\n"
+STRING_UNKNOW_ARG  "Íåèçâåñòåí êëþ÷: %s\n"
 
 STRING_DRIVE_PARM  "Çàäúëæèòåëíèÿò êëþ÷ çà èìåòî íà óñòðîéñòâîòî ëèïñâà.\n\n"
 
@@ -41,7 +41,7 @@
 
 STRING_NO_VOLUME_SIZE    "Íåóñïåøíî îïðåäåëÿíå íà ðàçìåðà íà òîìà"
 
-STRING_FILESYSTEM        "ÂÈä íà ôàéëîâàòà ñèñòåìà: %S.\n"
+STRING_FILESYSTEM        "ÂÈä íà ôàéëîâàòà ñèñòåìà: %s.\n"
 
 STRING_LABEL_NAME_EDIT  "Âúâåäåòå ñåãàøíèÿ åòèêåò íà óñòðîéñòâî %C: "
 

Modified: trunk/reactos/base/system/format/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/cs…
==============================================================================
--- trunk/reactos/base/system/format/lang/cs-CZ.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/format/lang/cs-CZ.rc [iso-8859-1] Mon Feb 16 17:05:13 2009
@@ -12,7 +12,7 @@
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 STRINGTABLE DISCARDABLE
 BEGIN
-STRING_HELP,  "Použití: %S jednotka: [-FS:filesystem] [-V:jmenovka] [-Q]
[-A:velikost] [-C]\n\n\
+STRING_HELP,  "Použití: %s jednotka: [-FS:filesystem] [-V:jmenovka] [-Q]
[-A:velikost] [-C]\n\n\
   [jednotka:]   Urèí jednotku, která bude zformátována.\n\
   -FS:typfs     Urèí typ souborového systému (%s).\n\
   -V:jmenovka   Urèí jmenovku svazku.\n\
@@ -33,7 +33,7 @@
 
 STRING_FMIFS_FAIL  "Nelze najít vstupní body FMIFS.\n\n"
 
-STRING_UNKNOW_ARG  "Neznámý agrument: %S\n"
+STRING_UNKNOW_ARG  "Neznámý agrument: %s\n"
 
 STRING_DRIVE_PARM  "Schází nutný parametr disku.\n\n"
 
@@ -45,7 +45,7 @@
 
 STRING_NO_VOLUME_SIZE    "Nelze zjistit velikost svazku"
 
-STRING_FILESYSTEM        "Souborový systém je typu %S.\n"
+STRING_FILESYSTEM        "Souborový systém je typu %s.\n"
 
 STRING_LABEL_NAME_EDIT  "Vložte nynìjší jmenovku svazku pro jednotku %C: "
 

Modified: trunk/reactos/base/system/format/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/de…
==============================================================================
--- trunk/reactos/base/system/format/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/format/lang/de-DE.rc [iso-8859-1] Mon Feb 16 17:05:13 2009
@@ -12,7 +12,7 @@
 
 
 
-STRING_HELP,  "Syntax: %S Datenträger: [-FS:Dateisystem] [-V:Label] [-Q] [-A:Größe]
[-C]\n\n\
+STRING_HELP,  "Syntax: %s Datenträger: [-FS:Dateisystem] [-V:Label] [-Q] [-A:Größe]
[-C]\n\n\
   [Datenträger:]   Legt das zu formatierende Laufwerk fest.\n\
   -FS:Dateisystem  Legt das Dateisystem fest (%s).\n\
   -V:Label         Legt den Datenträgernamen fest.\n\
@@ -34,7 +34,7 @@
 
 STRING_FMIFS_FAIL  "Kann FMIFS-Eingangspunkte nicht lokalisieren.\n\n"
 
-STRING_UNKNOW_ARG  "Unbekanntes Argument: %S\n"
+STRING_UNKNOW_ARG  "Unbekanntes Argument: %s\n"
 
 STRING_DRIVE_PARM  "Benötigter Laufwerksparameter fehlt.\n\n"
 
@@ -46,7 +46,7 @@
 
 STRING_NO_VOLUME_SIZE    "Kann Mediumsgröße nicht abfragen"
 
-STRING_FILESYSTEM        "Der Typ des Dateisystems ist %S.\n"
+STRING_FILESYSTEM        "Der Typ des Dateisystems ist %s.\n"
 
 STRING_LABEL_NAME_EDIT  "Geben Sie die aktuelle Datenträgerbezeichnung für
Datenträger %C: ein"
 

Modified: trunk/reactos/base/system/format/lang/el-GR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/el…
==============================================================================
--- trunk/reactos/base/system/format/lang/el-GR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/format/lang/el-GR.rc [iso-8859-1] Mon Feb 16 17:05:13 2009
@@ -7,7 +7,7 @@
 LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
 STRINGTABLE DISCARDABLE
 BEGIN
-STRING_HELP,  "×ñÞóç: %S ôüìïò: [-FS:óýóôçìá-áñ÷åßùí] [-V:åôéêÝôá] [-Q] [-A:ìÝãåèïò]
[-C]\n\n\
+STRING_HELP,  "×ñÞóç: %s ôüìïò: [-FS:óýóôçìá-áñ÷åßùí] [-V:åôéêÝôá] [-Q] [-A:ìÝãåèïò]
[-C]\n\n\
   [ôüìïò:]             Êáèïñßæåé ôï ãñÜììá ìïíÜäáò äßóêïõ ðñïò äéáìüñöùóç.\n\
   -FS:óýóôçìá-áñ÷åßùí  Êáèïñßæåé ôïí ôýðï ôïõ óõóôÞìáôïò áñ÷åßùí FAT, FAT32 Þ NTFS
(%s).\n\
   -V:label             Êáèïñéóìüò ôçò åôéêÝôáò ôïõ ôüìïõ.\n\
@@ -31,7 +31,7 @@
 
 STRING_FMIFS_FAIL  "Could not located FMIFS entry points.\n\n"
 
-STRING_UNKNOW_ARG  "¢ãíùóôï üñéóìá: %S\n"
+STRING_UNKNOW_ARG  "¢ãíùóôï üñéóìá: %s\n"
 
 STRING_DRIVE_PARM  "Required drive parameter is missing.\n\n"
 
@@ -43,7 +43,7 @@
 
 STRING_NO_VOLUME_SIZE    "Could not query volume size"
 
-STRING_FILESYSTEM        "Ï ôýðïò ôïõ óõóôÞìáôïò áñ÷åßùí åßíáé %S.\n"
+STRING_FILESYSTEM        "Ï ôýðïò ôïõ óõóôÞìáôïò áñ÷åßùí åßíáé %s.\n"
 
 STRING_LABEL_NAME_EDIT  "ÅéóÜãåôå ôçí ôñÝ÷ïõóá åôéêÝôá ãéá ôïí ôüìï %C: "
 

Modified: trunk/reactos/base/system/format/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/en…
==============================================================================
--- trunk/reactos/base/system/format/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/format/lang/en-US.rc [iso-8859-1] Mon Feb 16 17:05:13 2009
@@ -7,7 +7,7 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 STRINGTABLE DISCARDABLE
 BEGIN
-STRING_HELP,  "Usage: %S drive: [-FS:file-system] [-V:label] [-Q] [-A:size]
[-C]\n\n\
+STRING_HELP,  "Usage: %s drive: [-FS:file-system] [-V:label] [-Q] [-A:size]
[-C]\n\n\
   [drive:]         Specifies the drive to format.\n\
   -FS:file-system  Specifies the type of file system (%s).\n\
   -V:label         Specifies volume label.\n\
@@ -29,7 +29,7 @@
 
 STRING_FMIFS_FAIL  "Could not located FMIFS entry points.\n\n"
 
-STRING_UNKNOW_ARG  "Unknown argument: %S\n"
+STRING_UNKNOW_ARG  "Unknown argument: %s\n"
 
 STRING_DRIVE_PARM  "Required drive parameter is missing.\n\n"
 
@@ -41,7 +41,7 @@
 
 STRING_NO_VOLUME_SIZE    "Could not query volume size"
 
-STRING_FILESYSTEM        "The type of the file system is %S.\n"
+STRING_FILESYSTEM        "The type of the file system is %s.\n"
 
 STRING_LABEL_NAME_EDIT  "Enter current volume label for drive %C: "
 

Modified: trunk/reactos/base/system/format/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/es…
==============================================================================
--- trunk/reactos/base/system/format/lang/es-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/format/lang/es-ES.rc [iso-8859-1] Mon Feb 16 17:05:13 2009
@@ -7,7 +7,7 @@
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 STRINGTABLE DISCARDABLE
 BEGIN
-STRING_HELP,  "Uso: %S unidad: [-FS:sistema de archivos] [-V:etiqueta] [-Q]
[-A:tamaño] [-C]\n\n\
+STRING_HELP,  "Uso: %s unidad: [-FS:sistema de archivos] [-V:etiqueta] [-Q]
[-A:tamaño] [-C]\n\n\
   [unidad:]       		Especifica la unidad a formatear.\n\
   -FS:sistema de archivos 	Especifica el sistema de archivos (%s).\n\
   -V:etiqueta         		Especifica la etiqueta del volumen.\n\
@@ -29,7 +29,7 @@
 
 STRING_FMIFS_FAIL  "Imposible localizar puntos de entrada FMIFS.\n\n"
 
-STRING_UNKNOW_ARG  "Argumento desconocido: %S\n"
+STRING_UNKNOW_ARG  "Argumento desconocido: %s\n"
 
 STRING_DRIVE_PARM  "Parámetro de unidad requerido no encontrado.\n\n"
 
@@ -41,7 +41,7 @@
 
 STRING_NO_VOLUME_SIZE    "Imposible consultar el tamaño de volumen"
 
-STRING_FILESYSTEM        "El tipo del Sistema de archivos es %S.\n"
+STRING_FILESYSTEM        "El tipo del Sistema de archivos es %s.\n"
 
 STRING_LABEL_NAME_EDIT  "Introduzca la etiqueta del volumen para la unidad %C:
"
 

Modified: trunk/reactos/base/system/format/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/fr…
==============================================================================
--- trunk/reactos/base/system/format/lang/fr-FR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/format/lang/fr-FR.rc [iso-8859-1] Mon Feb 16 17:05:13 2009
@@ -11,7 +11,7 @@
 
 STRINGTABLE DISCARDABLE
 BEGIN
-STRING_HELP,  "Utilisation : %S disque: [-FS:système de fichier] [-V:nom] [-Q]
[-A:taille] [-C]\n\n\
+STRING_HELP,  "Utilisation : %s disque: [-FS:système de fichier] [-V:nom] [-Q]
[-A:taille] [-C]\n\n\
   [disque:]        Indique le disque à formater.\n\
   -FS:système de fichier  Indique le type de système de fichier (%s).\n\
   -V:nom           Détermine le nom du disque.\n\
@@ -31,7 +31,7 @@
 
 STRING_FMIFS_FAIL  "Impossible de trouver les points d'entrée FMIFS.\n\n"
 
-STRING_UNKNOW_ARG  "Argument inconnu : %S\n"
+STRING_UNKNOW_ARG  "Argument inconnu : %s\n"
 
 STRING_DRIVE_PARM  "Le disque à formater n'est pas indiqué.\n\n"
 
@@ -43,7 +43,7 @@
 
 STRING_NO_VOLUME_SIZE    "Impossible de déterminer la taille du disque"
 
-STRING_FILESYSTEM        "Le type de système de fichier est %S.\n"
+STRING_FILESYSTEM        "Le type de système de fichier est %s.\n"
 
 STRING_LABEL_NAME_EDIT  "Donner un nom pour le disque %C : "
 

Modified: trunk/reactos/base/system/format/lang/hu-HU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/hu…
==============================================================================
--- trunk/reactos/base/system/format/lang/hu-HU.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/format/lang/hu-HU.rc [iso-8859-1] Mon Feb 16 17:05:13 2009
@@ -8,7 +8,7 @@
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 STRINGTABLE DISCARDABLE
 BEGIN
-STRING_HELP,  "Használat: %S kötet: [-FS:állományrendszer] [-V:címke] [-Q]
[-A:méret] [-C]\n\n\
+STRING_HELP,  "Használat: %s kötet: [-FS:állományrendszer] [-V:címke] [-Q]
[-A:méret] [-C]\n\n\
   [kötet:]         A meghajtóbetûjelet adja meg (kettõsponttal a végén).\n\
   -FS:állományrendszer Az állományrendszer típusát adja meg (%s).\n\
   -V:címke         A Kötetcímke neve.\n\
@@ -33,7 +33,7 @@
 
 STRING_FMIFS_FAIL  "Nem találtam meg az FMIFS kezdõpontját.\n\n"
 
-STRING_UNKNOW_ARG  "Érvénytelen paraméter: %S\n"
+STRING_UNKNOW_ARG  "Érvénytelen paraméter: %s\n"
 
 STRING_DRIVE_PARM  "Hiányzik a meghajtó meghatározás.\n\n"
 
@@ -45,7 +45,7 @@
 
 STRING_NO_VOLUME_SIZE    "Nem sikerült megállapítani a kötet méretét"
 
-STRING_FILESYSTEM        "A állományrendszer típusa %S.\n"
+STRING_FILESYSTEM        "A állományrendszer típusa %s.\n"
 
 STRING_LABEL_NAME_EDIT  "Adja meg a címkét az alábbi meghajtóhoz: %C: "
 

Modified: trunk/reactos/base/system/format/lang/id-ID.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/id…
==============================================================================
--- trunk/reactos/base/system/format/lang/id-ID.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/format/lang/id-ID.rc [iso-8859-1] Mon Feb 16 17:05:13 2009
@@ -4,7 +4,7 @@
 
 STRINGTABLE DISCARDABLE
 BEGIN
-STRING_HELP,  "Pemakaian: %S drive: [-FS:file-system] [-V:label] [-Q] [-A:size]
[-C]\n\n\
+STRING_HELP,  "Pemakaian: %s drive: [-FS:file-system] [-V:label] [-Q] [-A:size]
[-C]\n\n\
   [drive:]         Menetapkan drive yang akan diformat.\n\
   -FS:file-system  Menetapkan tipe sistem file (%s).\n\
   -V:label         Menetapkan label volume.\n\
@@ -26,7 +26,7 @@
 
 STRING_FMIFS_FAIL  "Tidak bisa menemukan FMIFS entry points.\n\n"
 
-STRING_UNKNOW_ARG  "Argumen tidak dikenal: %S\n"
+STRING_UNKNOW_ARG  "Argumen tidak dikenal: %s\n"
 
 STRING_DRIVE_PARM  "Parameter drive yang diperlukan kurang.\n\n"
 
@@ -38,7 +38,7 @@
 
 STRING_NO_VOLUME_SIZE    "Tidak bisa mendapatkan ukuran volume"
 
-STRING_FILESYSTEM        "Tipe sistem file adalah %S.\n"
+STRING_FILESYSTEM        "Tipe sistem file adalah %s.\n"
 
 STRING_LABEL_NAME_EDIT  "Masukkan label volume saat ini untuk drive %C: "
 

Modified: trunk/reactos/base/system/format/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/it…
==============================================================================
--- trunk/reactos/base/system/format/lang/it-IT.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/format/lang/it-IT.rc [iso-8859-1] Mon Feb 16 17:05:13 2009
@@ -9,7 +9,7 @@
 
 STRINGTABLE DISCARDABLE
 BEGIN
-STRING_HELP,  "Uso: %S drive: [-FS:file-system] [-V:label] [-Q] [-A:size] [-C]\n\n\
+STRING_HELP,  "Uso: %s drive: [-FS:file-system] [-V:label] [-Q] [-A:size] [-C]\n\n\
   [drive:]         Specifica l'unità disco da formattare.\n\
   -FS:file-system  Specifica il tipo di filesystem (%s).\n\
   -V:label         Specifica l'etichetta del volume.\n\
@@ -30,7 +30,7 @@
 
 STRING_FMIFS_FAIL  "Impossibile trovare 'FMIFS entry points'.\n\n"
 
-STRING_UNKNOW_ARG  "Parametro sconosciuto: %S\n"
+STRING_UNKNOW_ARG  "Parametro sconosciuto: %s\n"
 
 STRING_DRIVE_PARM  "Manca il parametro 'drive'.\n\n"
 
@@ -42,7 +42,7 @@
 
 STRING_NO_VOLUME_SIZE    "Impossibile rilevare la dimensione del volume"
 
-STRING_FILESYSTEM        "Il tipo di file system è %S.\n"
+STRING_FILESYSTEM        "Il tipo di file system è %s.\n"
 
 STRING_LABEL_NAME_EDIT  "Inserire l'etichetta attuale del volume del drive %C:
"
 

Modified: trunk/reactos/base/system/format/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/ja…
==============================================================================
--- trunk/reactos/base/system/format/lang/ja-JP.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/format/lang/ja-JP.rc [iso-8859-1] Mon Feb 16 17:05:13 2009
@@ -7,7 +7,7 @@
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 STRINGTABLE DISCARDABLE
 BEGIN
-STRING_HELP,  "Žg—p–@: %S ƒhƒ‰ƒCƒu: [-FS:ƒtƒ@ƒCƒ‹ƒVƒXƒeƒ€] [-V:ƒ‰ƒxƒ‹] [-Q]
[-A:ƒTƒCƒY] [-C]\n\n\
+STRING_HELP,  "Žg—p–@: %s ƒhƒ‰ƒCƒu: [-FS:ƒtƒ@ƒCƒ‹ƒVƒXƒeƒ€] [-V:ƒ‰ƒxƒ‹] [-Q]
[-A:ƒTƒCƒY] [-C]\n\n\
   [ƒhƒ‰ƒCƒu:]         ƒtƒH[ƒ}ƒbƒg‚·‚éƒhƒ‰ƒCƒu‚ðŽw’肵‚Ü‚·B\n\
   -FS:ƒtƒ@ƒCƒ‹ƒVƒXƒeƒ€\n\
                    ƒtƒ@ƒCƒ‹ƒVƒXƒeƒ€‚ÌŽí—Þ‚ðŽw’肵‚Ü‚· (%s)B\n\
@@ -32,7 +32,7 @@
 
 STRING_FMIFS_FAIL  "FMIFS ƒGƒ“ƒgƒŠ ƒ|ƒCƒ“ƒg ‚ðÝ’è‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B\n\n"
 
-STRING_UNKNOW_ARG  "•s–¾‚Ȉø”: %S\n"
+STRING_UNKNOW_ARG  "•s–¾‚Ȉø”: %s\n"
 
 STRING_DRIVE_PARM  "•K—v‚ȃhƒ‰ƒCƒu‚ðŽw’è‚·‚éƒpƒ‰ƒ[ƒ^‚ª•s‘«‚µ‚Ä‚¢‚Ü‚·B\n\n"
 
@@ -44,7 +44,7 @@
 
 STRING_NO_VOLUME_SIZE    "ƒ{ƒŠƒ…[ƒ€ ƒTƒCƒY‚Ì–â‚¢‡‚킹‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½"
 
-STRING_FILESYSTEM        "ƒtƒ@ƒCƒ‹ƒVƒXƒeƒ€‚̃^ƒCƒv‚Í %S ‚Å‚·B\n"
+STRING_FILESYSTEM        "ƒtƒ@ƒCƒ‹ƒVƒXƒeƒ€‚̃^ƒCƒv‚Í %s ‚Å‚·B\n"
 
 STRING_LABEL_NAME_EDIT  "ƒhƒ‰ƒCƒu D: ‚ÌŒ»Ý‚̃{ƒŠƒ…[ƒ€ ƒ‰ƒxƒ‹‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢ "
 

Modified: trunk/reactos/base/system/format/lang/lt-LT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/lt…
==============================================================================
--- trunk/reactos/base/system/format/lang/lt-LT.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/format/lang/lt-LT.rc [iso-8859-1] Mon Feb 16 17:05:13 2009
@@ -5,7 +5,7 @@
 LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
 STRINGTABLE DISCARDABLE
 BEGIN
-STRING_HELP,  "Naudojimas: %S diskas: [-FS:bylø-sistema] [-V:þymë] [-Q] [-A:dydis]
[-C]\n\n\
+STRING_HELP,  "Naudojimas: %s diskas: [-FS:bylø-sistema] [-V:þymë] [-Q] [-A:dydis]
[-C]\n\n\
   [diskas:]        Nurodo diskà formavimui.\n\
   -FS:bylø-sistema Nurodo bylø sistemos tipà (%s).\n\
   -V:þymë          Nurodo tomo þymæ.\n\
@@ -26,7 +26,7 @@
 
 STRING_FMIFS_FAIL  "Nepavyko rasti FMIFS áëjimo taðkø.\n\n"
 
-STRING_UNKNOW_ARG  "Neþinomas parametras: %S\n"
+STRING_UNKNOW_ARG  "Neþinomas parametras: %s\n"
 
 STRING_DRIVE_PARM  "Trûksta reikiamo disko parametro.\n\n"
 
@@ -38,7 +38,7 @@
 
 STRING_NO_VOLUME_SIZE    "Nepavyko nustatyti tomo dydþio"
 
-STRING_FILESYSTEM        "Bylø sistemos tipas yra %S.\n"
+STRING_FILESYSTEM        "Bylø sistemos tipas yra %s.\n"
 
 STRING_LABEL_NAME_EDIT  "Áveskite dabartinæ tomo þymæ diskui %C: "
 

Modified: trunk/reactos/base/system/format/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/no…
==============================================================================
--- trunk/reactos/base/system/format/lang/no-NO.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/format/lang/no-NO.rc [iso-8859-1] Mon Feb 16 17:05:13 2009
@@ -7,7 +7,7 @@
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
 STRINGTABLE DISCARDABLE
 BEGIN
-STRING_HELP,  "bruk: %S stasjon: [-FS:fil-system] [-V:merke] [-Q] [-A:størrelse]
[-C]\n\n\
+STRING_HELP,  "bruk: %s stasjon: [-FS:fil-system] [-V:merke] [-Q] [-A:størrelse]
[-C]\n\n\
   [stasjon:]         Spesifisere stasjon til formater.\n\
   -FS:file-system  Spesifisere typen av fil system (%s).\n\
   -V:merke         Spesifisere volum merke.\n\
@@ -29,7 +29,7 @@
 
 STRING_FMIFS_FAIL  "Kunne ikke befinne seg FMIFS artikkel momenter.\n\n"
 
-STRING_UNKNOW_ARG  "Ukjent argument: %S\n"
+STRING_UNKNOW_ARG  "Ukjent argument: %s\n"
 
 STRING_DRIVE_PARM  "Obligatorisk drive parameter er mistet.\n\n"
 
@@ -41,7 +41,7 @@
 
 STRING_NO_VOLUME_SIZE    "Kunne ikke spørre om volumet størrelse"
 
-STRING_FILESYSTEM        "Typen av filsystem er %S.\n"
+STRING_FILESYSTEM        "Typen av filsystem er %s.\n"
 
 STRING_LABEL_NAME_EDIT  "Velg aktuell volum merke for stasjon %C: "
 

Modified: trunk/reactos/base/system/format/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/pl…
==============================================================================
--- trunk/reactos/base/system/format/lang/pl-PL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/format/lang/pl-PL.rc [iso-8859-1] Mon Feb 16 17:05:13 2009
@@ -8,7 +8,7 @@
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 STRINGTABLE DISCARDABLE
 BEGIN
-STRING_HELP,  "Sposób u¿ycia: %S wolumin: [-FS:syst-plik] [-V:etykieta] [-Q]
[-A:rozmiar] [-C]\n\n\
+STRING_HELP,  "Sposób u¿ycia: %s wolumin: [-FS:syst-plik] [-V:etykieta] [-Q]
[-A:rozmiar] [-C]\n\n\
   [wolumin:]      Okreœla literê dysku przeznaczonego do formatowania.\n\
   -FS:syst-plik   Okreœla rodzaj systemu plików (%s).\n\
   -V:etykieta     Okreœla etykietê woluminu.\n\
@@ -32,7 +32,7 @@
 
 STRING_FMIFS_FAIL  "Nie mo¿na zlokalizowaæ punktów wejœciowych FMIFS.\n\n"
 
-STRING_UNKNOW_ARG  "Nieprawid³owy parametr: %S\n"
+STRING_UNKNOW_ARG  "Nieprawid³owy parametr: %s\n"
 
 STRING_DRIVE_PARM  "Brakuj¹cy wymagany parametr dysku.\n\n"
 
@@ -44,7 +44,7 @@
 
 STRING_NO_VOLUME_SIZE    "Nie mo¿na odczytaæ rozmiaru woluminu"
 
-STRING_FILESYSTEM        "Rodzaj systemu plików to %S.\n"
+STRING_FILESYSTEM        "Rodzaj systemu plików to %s.\n"
 
 STRING_LABEL_NAME_EDIT  "Podaj aktualn¹ etykietê woluminu dla dysku %C: "
 

Modified: trunk/reactos/base/system/format/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/ru…
==============================================================================
--- trunk/reactos/base/system/format/lang/ru-RU.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/format/lang/ru-RU.rc [iso-8859-1] Mon Feb 16 17:05:13 2009
@@ -5,7 +5,7 @@
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 STRINGTABLE DISCARDABLE
 BEGIN
-STRING_HELP,  "Èñïîëüçîâàíèå: %S òîì: [-FS:ñèñòåìà] [-V:ìåòêà] [-Q] [-A:ðàçìåð]
[-C]\n\n\
+STRING_HELP,  "Èñïîëüçîâàíèå: %s òîì: [-FS:ñèñòåìà] [-V:ìåòêà] [-Q] [-A:ðàçìåð]
[-C]\n\n\
   [òîì:]         Óêàçûâàåò áóêâó äèñêà (ñ ïîñëåäóþùèì äâîåòî÷èåì),\n\
                  òî÷êó ïîäêëþ÷åíèÿ èëè èìÿ òîìà.\n\
   -FS:ñèñòåìà    Óêàçûâàåò íà òèï ôàéëîâîé ñèñòåìû (%s).\n\
@@ -27,7 +27,7 @@
 
 STRING_FMIFS_FAIL  "Íåâîçìîæíî îïðåäåëèòü ðàñïîëîæåíèå òî÷åê âõîäà FMIFS.\n\n"
 
-STRING_UNKNOW_ARG  "Íåïðàâèëüíûå àðãóìåíòû: %S\n"
+STRING_UNKNOW_ARG  "Íåïðàâèëüíûå àðãóìåíòû: %s\n"
 
 STRING_DRIVE_PARM  "Òðåáóåìûé ïàðàìåòð îïåðàöèè îòñóòñòâóåò.\n\n"
 
@@ -39,7 +39,7 @@
 
 STRING_NO_VOLUME_SIZE    "Íå óäàëîñü îïðåäåëèòü ðàçìåð òîìà"
 
-STRING_FILESYSTEM        "Òèï ôàéëîâîé ñèñòåìû %S.\n"
+STRING_FILESYSTEM        "Òèï ôàéëîâîé ñèñòåìû %s.\n"
 
 STRING_LABEL_NAME_EDIT  "Ââåäèòå òåêóùóþ ìåòêó òîìà %C: "
 

Modified: trunk/reactos/base/system/format/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/sk…
==============================================================================
--- trunk/reactos/base/system/format/lang/sk-SK.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/format/lang/sk-SK.rc [iso-8859-1] Mon Feb 16 17:05:13 2009
@@ -9,7 +9,7 @@
 STRINGTABLE DISCARDABLE
 BEGIN
 /* menovka zv„zku = volume label, drive = jednotka */
-STRING_HELP,  "Pou§itie: %S jednotka: [-FS:syst‚m s£borov] [-V:menovka] [-Q]
[-A:ve–kosœ] [-C]\n\n\
+STRING_HELP,  "Pou§itie: %s jednotka: [-FS:syst‚m s£borov] [-V:menovka] [-Q]
[-A:ve–kosœ] [-C]\n\n\
   [jednotka:]         UrŸuje jednotku k naform tovaniu.\n\
   -FS:syst‚m s£borov  UrŸuje typ s£borov‚ho syst‚mu (%s).\n\
   -V:menovka          UrŸuje menovku zv„zku.\n\
@@ -31,7 +31,7 @@
 
 STRING_FMIFS_FAIL  "Could not located FMIFS entry points.\n\n"
 
-STRING_UNKNOW_ARG  "Nezn my argument: %S\n"
+STRING_UNKNOW_ARG  "Nezn my argument: %s\n"
 
 STRING_DRIVE_PARM  "Chìba nevyhnutnì parameter jednotky.\n\n"
 
@@ -43,7 +43,7 @@
 
 STRING_NO_VOLUME_SIZE    "Could not query volume size"
 
-STRING_FILESYSTEM        "Typ syst‚mu s£borov je %S.\n"
+STRING_FILESYSTEM        "Typ syst‚mu s£borov je %s.\n"
 
 STRING_LABEL_NAME_EDIT  "Vlo§te s£Ÿasn£ menovku zv„zku pre jednotku %C: "
 

Modified: trunk/reactos/base/system/format/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/uk…
==============================================================================
--- trunk/reactos/base/system/format/lang/uk-UA.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/format/lang/uk-UA.rc [iso-8859-1] Mon Feb 16 17:05:13 2009
@@ -11,7 +11,7 @@
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 STRINGTABLE DISCARDABLE
 BEGIN
-STRING_HELP,  "Âèêîðèñòàííÿ: %S ïðèñòð³é: [-FS:ôàéë-ñèñòåìà] [-V:ì³òêà] [-Q]
[-A:ðîçì³ð] [-C]\n\n\
+STRING_HELP,  "Âèêîðèñòàííÿ: %s ïðèñòð³é: [-FS:ôàéë-ñèñòåìà] [-V:ì³òêà] [-Q]
[-A:ðîçì³ð] [-C]\n\n\
   [ïðèñòð³é:]      Âêàçóº äèñê, ÿêèé ñë³ä â³äôîðìàòóâàòè (äâîêðàïêà îáîâ'ÿçêîâà).\n\
   -FS:ôàéë-ñèñòåìà Âèçíà÷ຠòèï ôàéëîâî¿ ñèñòåìè (%s).\n\
   -V:ì³òêà         Âèçíà÷ຠêîðîòêó íàçâó äèñêó.\n\
@@ -32,7 +32,7 @@
 
 STRING_FMIFS_FAIL  "Íå çì³ã çíàöòè FMIFS òî÷êè âõîäó.\n\n"
 
-STRING_UNKNOW_ARG  "Íåâ³äîìèé àðãóìåíò: %S\n"
+STRING_UNKNOW_ARG  "Íåâ³äîìèé àðãóìåíò: %s\n"
 
 STRING_DRIVE_PARM  "Íåîáõ³äíèé ïàðàìåòð îïåðàö³¿ â³äñóòí³é.\n\n"
 
@@ -44,7 +44,7 @@
 
 STRING_NO_VOLUME_SIZE    "Íå âäàëîñÿ âèçíà÷èòè ðîçì³ð äèñêó"
 
-STRING_FILESYSTEM        "Âèçíà÷åíà ôàéëîâà ñèñòåìà %S.\n"
+STRING_FILESYSTEM        "Âèçíà÷åíà ôàéëîâà ñèñòåìà %s.\n"
 
 STRING_LABEL_NAME_EDIT  "Âèçíà÷òå ì³òêó äèñêó %C: "