21 files changed, 38 insertions, 286 deletions

diff --git a/help_mp-bg.h b/help_mp-bg.h
index 5aa5d722f0..8791b914cd 100644
--- a/help_mp-bg.h
+++ b/help_mp-bg.h
@@ -195,22 +195,7 @@ static char help_text[]=
                       " äåêîäåðúò ñå äúíè)?\n" \
 		      "Ïðè .AVI ôàéë, îïèòàé äà íàëîæèø non-interleaved ðåæèì ñ îïöèÿ -ni\n"
 #define MSGTR_SwitchToNi "\nÎòêðèò å íåïðàâèëíî ñòðóêòóðèðàí .AVI - àâòîìàòè÷íî âêëþ÷âàì îïöèÿ -ni !\n"
-#define MSGTR_DetectedFILMfile "Çàñå÷åí ôàéëîâ ôîðìàò FILM !\n"
-#define MSGTR_DetectedFLIfile "Çàñå÷åí ôàéëîâ ôîðìàò FLI !\n"
-#define MSGTR_DetectedROQfile "Çàñå÷åí ôàéëîâ ôîðìàò RoQ !\n"
-#define MSGTR_DetectedREALfile "Çàñå÷åí ôàéëîâ ôîðìàò REAL !\n"
-#define MSGTR_DetectedAVIfile "Çàñå÷åí ôàéëîâ ôîðìàò AVI !\n"
-#define MSGTR_DetectedASFfile "Çàñå÷åí ôàéëîâ ôîðìàò ASF !\n"
-#define MSGTR_DetectedMPEGPESfile "Çàñå÷åí ôàéëîâ ôîðìàò MPEG-PES !\n"
-#define MSGTR_DetectedMPEGPSfile "Çàñå÷åí ôàéëîâ ôîðìàò MPEG-PS !\n"
-#define MSGTR_DetectedMPEGESfile "Çàñå÷åí ôàéëîâ ôîðìàò MPEG-ES !\n"
-#define MSGTR_DetectedQTMOVfile "Çàñå÷åí ôàéëîâ ôîðìàò QuickTime/MOV !\n"
-#define MSGTR_DetectedYUV4MPEG2file "Çàñå÷åí ôàéëîâ ôîðìàò YUV4MPEG2 !\n"
-#define MSGTR_DetectedNuppelVideofile "Çàñå÷åí ôàéëîâ ôîðìàò NuppelVideo !\n"
-#define MSGTR_DetectedVIVOfile "Çàñå÷åí ôàéëîâ ôîðìàò VIVO !\n"
-#define MSGTR_DetectedBMPfile "Çàñå÷åí ôàéëîâ ôîðìàò BMP !\n"
-#define MSGTR_DetectedOGGfile "Çàñå÷åí ôàéëîâ ôîðìàò OGG !\n"
-#define MSGTR_DetectedRAWDVfile "Çàñå÷åí ôàéëîâ ôîðìàò RAWDV !\n"
+#define MSGTR_Detected_XXX_FileFormat "Çàñå÷åí ôàéëîâ ôîðìàò %s!\n"
 #define MSGTR_DetectedAudiofile "Çàñå÷åí àóäèî ôàéë!\n"
 #define MSGTR_NotSystemStream "Ôîðìàòúò íå å MPEG System Stream ... (ìîæå áè å Transport Stream ?)\n"
 #define MSGTR_InvalidMPEGES "Íåâàëèäåí MPEG-ES ïîòîê??? Ñâúðæåòå ñå ñ àâòîðà, ìîæå äà å áúã :(\n"
diff --git a/help_mp-cs.h b/help_mp-cs.h
index 93b333118c..6fdd8d8510 100644
--- a/help_mp-cs.h
+++ b/help_mp-cs.h
@@ -184,22 +184,7 @@ static char help_text[]=
 #define MSGTR_TooManyVideoInBuffer "\nDEMUXER: Pøíli¹ mnoho (%d v %d bajtech) video paketù v bufferu!\n"
 #define MSGTR_MaybeNI "(mo¾ná pøehráváte neprokládaný proud/soubor nebo kodek selhal)\n"
 #define MSGTR_SwitchToNi "\nDetekován ¹patnì prokládaný soubor .AVI - pøepnuto do -ni modu!\n"
-#define MSGTR_DetectedFILMfile "Detekován FILM formát souboru!\n"
-#define MSGTR_DetectedFLIfile "Detekován FLI formát souboru!\n"
-#define MSGTR_DetectedROQfile "Detekován RoQ formát souboru!\n"
-#define MSGTR_DetectedREALfile "Detekován REAL formát souboru!\n"
-#define MSGTR_DetectedAVIfile "Detekován AVI formát souboru!\n"
-#define MSGTR_DetectedASFfile "Detekován ASF formát souboru!\n"
-#define MSGTR_DetectedMPEGPESfile "Detekován MPEG-PES formát souboru!\n"
-#define MSGTR_DetectedMPEGPSfile "Detekován MPEG-PS formát souboru!\n"
-#define MSGTR_DetectedMPEGESfile "Detekován MPEG-ES formát souboru!\n"
-#define MSGTR_DetectedQTMOVfile "Detekován QuickTime/MOV formát souboru!\n"
-#define MSGTR_DetectedYUV4MPEG2file "Detekován YUV4MPEG2 formát souboru!\n"
-#define MSGTR_DetectedNuppelVideofile "Detekován NuppelVideo formát souboru!\n"
-#define MSGTR_DetectedVIVOfile "Detekován VIVO formát souboru!\n"
-#define MSGTR_DetectedBMPfile "Detekován BMP formát souboru!\n"
-#define MSGTR_DetectedOGGfile "Detekován OGG formát souboru!\n"
-#define MSGTR_DetectedRAWDVfile "Detekován RAWDV formát souboru!\n"
+#define MSGTR_Detected_XXX_FileFormat "Detekován %s formát souboru!\n"
 #define MSGTR_DetectedAudiofile "Detekován audio soubor!\n"
 #define MSGTR_NotSystemStream "Toto není proud ve formátu MPEG System... (mo¾ná Transportní proud?)\n"
 #define MSGTR_InvalidMPEGES "Neplatný MPEG-ES proud!? Kontaktujte autora, mo¾ná to je chyba (bug) :(\n"
diff --git a/help_mp-de.h b/help_mp-de.h
index 76aea381e9..c46e18fbee 100644
--- a/help_mp-de.h
+++ b/help_mp-de.h
@@ -181,22 +181,7 @@ static char help_text[]=
 #define MSGTR_MaybeNI "Vielleicht spielst du einen non-interleaved Stream/Datei oder der Codec funktioniert nicht.\n" \
                       "Versuche für .AVI Dateien den nicht-interleaved Modus mit der Option -ni zu erzwingen\n"
 #define MSGTR_SwitchToNi "\nSchlecht Interleaved .AVI erkannt, schalte in das -ni Modus!\n"
-#define MSGTR_DetectedFILMfile "FILM Dateiformat erkannt!\n"
-#define MSGTR_DetectedFLIfile "FLI Dateiformat erkannt!\n"
-#define MSGTR_DetectedROQfile "RoQ Dateiformat erkannt!\n"
-#define MSGTR_DetectedREALfile "REAL Dateiformat erkannt!\n"
-#define MSGTR_DetectedAVIfile "AVI Dateiformat erkannt!\n"
-#define MSGTR_DetectedASFfile "ASF Dateiformat erkannt!\n"
-#define MSGTR_DetectedMPEGPESfile "MPEG-PES Dateiformat erkannt!\n"
-#define MSGTR_DetectedMPEGPSfile "MPEG-PS Dateiformat erkannt!\n"
-#define MSGTR_DetectedMPEGESfile "MPEG-ES Dateiformat erkannt!\n"
-#define MSGTR_DetectedQTMOVfile "QuickTime/MOV Dateiformat erkannt!\n"
-#define MSGTR_DetectedYUV4MPEG2file "YUV4MPEG2 Dateiformat erkannt!\n"
-#define MSGTR_DetectedNuppelVideofile "NuppelVideo Dateiformat erkannt!\n"
-#define MSGTR_DetectedVIVOfile "VIVO Dateiformat erkannt!\n"
-#define MSGTR_DetectedBMPfile "BMP Dateiformat erkannt!\n"
-#define MSGTR_DetectedOGGfile "OGG Dateiformat erkannt!\n"
-#define MSGTR_DetectedRAWDVfile "RAWDV Dateiformat erkannt!\n"
+#define MSGTR_Detected_XXX_FileFormat "%s Dateiformat erkannt!\n"
 #define MSGTR_DetectedAudiofile "Audiodatei erkannt!\n"
 #define MSGTR_NotSystemStream "Kein MPEG System Stream ... (vielleicht Transport Stream?)\n"
 #define MSGTR_InvalidMPEGES "Ungültiger MPEG-ES Stream??? Kontaktiere den Author, das könnte ein Bug sein :(\n"
diff --git a/help_mp-dk.h b/help_mp-dk.h
index e976da6c11..a2a0076337 100644
--- a/help_mp-dk.h
+++ b/help_mp-dk.h
@@ -178,22 +178,7 @@ static char help_text[]=
 #define MSGTR_TooManyVideoInBuffer "\nDEMUXER: For mange (%d i %d bytes) videopakker i bufferen!\n"
 #define MSGTR_MaybeNI "(måske afspiller du en 'non-interleaved' stream/fil ellers fejlede codec'et)\n"
 #define MSGTR_SwitchToNi "\nDetekteret defekt .AVI - skifter til -ni!\n"
-#define MSGTR_DetectedFILMfile "Detekterede FILM fil format!\n"
-#define MSGTR_DetectedFLIfile "Detekterede FLI filformat!\n"
-#define MSGTR_DetectedROQfile "Detekterede RoQ filformat!\n"
-#define MSGTR_DetectedREALfile "Detekterede REAL filformat!\n"
-#define MSGTR_DetectedAVIfile "Detekterede AVI filformat!\n"
-#define MSGTR_DetectedASFfile "Detekterede ASF filformat!\n"
-#define MSGTR_DetectedMPEGPESfile "Detekterede MPEG-PES filformat!\n"
-#define MSGTR_DetectedMPEGPSfile "Detekterede MPEG-PS filformat!\n"
-#define MSGTR_DetectedMPEGESfile "Detekterede MPEG-ES filformat!\n"
-#define MSGTR_DetectedQTMOVfile "Detekterede QuickTime/MOV filformat!\n"
-#define MSGTR_DetectedYUV4MPEG2file "Detekterede YUV4MPEG2 filformat!\n"
-#define MSGTR_DetectedNuppelVideofile "Detekterede NuppelVideo filformat!\n"
-#define MSGTR_DetectedVIVOfile "Detekterede VIVO filformat!\n"
-#define MSGTR_DetectedBMPfile "Detekterede BMP filformat!\n"
-#define MSGTR_DetectedOGGfile "Detekterede OGG filformat!\n"
-#define MSGTR_DetectedRAWDVfile "Detekterede RAWDV filformat!\n"
+#define MSGTR_Detected_XXX_FileFormat "Detekterede %s filformat!\n"
 #define MSGTR_DetectedAudiofile "Detekterede lydfil!\n"
 #define MSGTR_NotSystemStream "Ikke MPEG System Stream format... (måske Transport Stream?)\n"
 #define MSGTR_InvalidMPEGES "Ugyldig MPEG-ES stream??? Rapporter venligst dette, det kunne være en fejl i programmet :(\n"
diff --git a/help_mp-el.h b/help_mp-el.h
index 011fb9ab17..0950ec2363 100644
--- a/help_mp-el.h
+++ b/help_mp-el.h
@@ -188,22 +188,7 @@ static char help_text[]=
 #define MSGTR_MaybeNI "(ßóùò áíáðáñÜãåôáé Ýíáí non-interleaved êáíÜëé/áñ÷åßï Þ áðÝôõ÷å ôï codec)\n" \
 		      "Ãéá .AVI áñ÷åßá, åíåñãïðïéÞóôå ôç ìÝèïäï non-interleaved ìå ôçí åðéëïãÞ -ni\n"
 #define MSGTR_SwitchToNi "\nÁíáãíùñßóôçêå ëÜèïò interleaved .AVI - åíáëëáãÞ óôç ìÝèïäï -ni!\n"
-#define MSGTR_DetectedFILMfile "Áíáãíùñßóôçêå áñ÷åßï ôýðïõ FILM!\n"
-#define MSGTR_DetectedFLIfile "Áíáãíùñßóôçêå áñ÷åßï ôýðïõ FLI!\n"
-#define MSGTR_DetectedROQfile "Áíáãíùñßóôçêå áñ÷åßï ôýðïõ RoQ!\n"
-#define MSGTR_DetectedREALfile "Áíáãíùñßóôçêå áñ÷åßï ôýðïõ REAL!\n"
-#define MSGTR_DetectedAVIfile "Áíáãíùñßóôçêå áñ÷åßï ôýðïõ AVI!\n"
-#define MSGTR_DetectedASFfile "Áíáãíùñßóôçêå áñ÷åßï ôýðïõ ASF!\n"
-#define MSGTR_DetectedMPEGPESfile "Áíáãíùñßóôçêå áñ÷åßï ôýðïõ MPEG-PES!\n"
-#define MSGTR_DetectedMPEGPSfile "Áíáãíùñßóôçêå áñ÷åßï ôýðïõ MPEG-PS!\n"
-#define MSGTR_DetectedMPEGESfile "Áíáãíùñßóôçêå áñ÷åßï ôýðïõ MPEG-ES!\n"
-#define MSGTR_DetectedQTMOVfile "Áíáãíùñßóôçêå áñ÷åßï ôýðïõ QuickTime/MOV!\n"
-#define MSGTR_DetectedYUV4MPEG2file "Áíáãíùñßóôçêå áñ÷åßï ôýðïõ YUV4MPEG2!\n"
-#define MSGTR_DetectedNuppelVideofile "Áíáãíùñßóôçêå áñ÷åßï ôýðïõ NuppelVideo!\n"
-#define MSGTR_DetectedVIVOfile "Áíáãíùñßóôçêå áñ÷åßï ôýðïõ VIVO!\n"
-#define MSGTR_DetectedBMPfile "Áíáãíùñßóôçêå áñ÷åßï ôýðïõ BMP!\n"
-#define MSGTR_DetectedOGGfile "Áíáãíùñßóôçêå áñ÷åßï ôýðïõ OGG!\n"
-#define MSGTR_DetectedRAWDVfile "Áíáãíùñßóôçêå áñ÷åßï ôýðïõ RAWDV!\n"
+#define MSGTR_Detected_XXX_FileFormat "Áíáãíùñßóôçêå áñ÷åßï ôýðïõ %s!\n"
 #define MSGTR_DetectedAudiofile "Áíáãíùñßóôçêå áñ÷åßï Þ÷ïõ!\n"
 #define MSGTR_NotSystemStream "Ìç Áíáãíùñßóìéìï MPEG System Stream format... (ìÞðùò åßíáé Transport Stream?)\n"
 #define MSGTR_InvalidMPEGES "Ìç Áíáãíùñßóéìï êáíÜëé MPEG-ES??? Åðéêïéíþíçóå ìå ôïí author, ìðïñåß íá åßíáé Ýíá bug :(\n"
diff --git a/help_mp-en.h b/help_mp-en.h
index 2a65e8e219..7a244a29e4 100644
--- a/help_mp-en.h
+++ b/help_mp-en.h
@@ -184,22 +184,7 @@ static char help_text[]=
 #define MSGTR_MaybeNI "Maybe you are playing a non-interleaved stream/file or the codec failed?\n" \
 		      "For .AVI files, try to force non-interleaved mode with the -ni option.\n"
 #define MSGTR_SwitchToNi "\nDetected badly interleaved .AVI - switching to -ni mode!\n"
-#define MSGTR_DetectedFILMfile "Detected FILM file format!\n"
-#define MSGTR_DetectedFLIfile "Detected FLI file format!\n"
-#define MSGTR_DetectedROQfile "Detected RoQ file format!\n"
-#define MSGTR_DetectedREALfile "Detected REAL file format!\n"
-#define MSGTR_DetectedAVIfile "Detected AVI file format!\n"
-#define MSGTR_DetectedASFfile "Detected ASF file format!\n"
-#define MSGTR_DetectedMPEGPESfile "Detected MPEG-PES file format!\n"
-#define MSGTR_DetectedMPEGPSfile "Detected MPEG-PS file format!\n"
-#define MSGTR_DetectedMPEGESfile "Detected MPEG-ES file format!\n"
-#define MSGTR_DetectedQTMOVfile "Detected QuickTime/MOV file format!\n"
-#define MSGTR_DetectedYUV4MPEG2file "Detected YUV4MPEG2 file format!\n"
-#define MSGTR_DetectedNuppelVideofile "Detected NuppelVideo file format!\n"
-#define MSGTR_DetectedVIVOfile "Detected VIVO file format!\n"
-#define MSGTR_DetectedBMPfile "Detected BMP file format!\n"
-#define MSGTR_DetectedOGGfile "Detected OGG file format!\n"
-#define MSGTR_DetectedRAWDVfile "Detected RAWDV file format!\n"
+#define MSGTR_Detected_XXX_FileFormat "Detected %s file format!\n"
 #define MSGTR_DetectedAudiofile "Detected audio file!\n"
 #define MSGTR_NotSystemStream "Not MPEG System Stream format... (maybe Transport Stream?)\n"
 #define MSGTR_InvalidMPEGES "Invalid MPEG-ES stream??? Contact the author, it may be a bug :(\n"
diff --git a/help_mp-es.h b/help_mp-es.h
index 846304370c..4546148025 100644
--- a/help_mp-es.h
+++ b/help_mp-es.h
@@ -137,16 +137,7 @@ static char help_text[]=
 #define MSGTR_TooManyAudioInBuffer "\nDEMUXER: Demasiados (%d en %d bytes) paquetes de audio en el buffer!\n"
 #define MSGTR_TooManyVideoInBuffer "\nDEMUXER: Demasiados (%d en %d bytes) paquetes de video en el buffer!\n"
 #define MSGTR_MaybeNI "(tal vez está reproduciendo un stream/archivo 'non-interleaved' o falló el codec)\n"
-#define MSGTR_DetectedFILMfile "Detectado formato de archivo FILM!\n"
-#define MSGTR_DetectedFLIfile "Detectado formato de archivo FLI!\n"
-#define MSGTR_DetectedROQfile "Detectado formato de archivo RoQ!\n"
-#define MSGTR_DetectedREALfile "Detectado formato de archivo REAL!\n"
-#define MSGTR_DetectedAVIfile "Detectado formato de archivo AVI!\n"
-#define MSGTR_DetectedASFfile "Detectado formato de archivo ASF!\n"
-#define MSGTR_DetectedMPEGPESfile "Detectado formato de archivo MPEG-PES!\n"
-#define MSGTR_DetectedMPEGPSfile "Detectado formato de archivo MPEG-PS!\n"
-#define MSGTR_DetectedMPEGESfile "Detectado formato de archivo MPEG-ES!\n"
-#define MSGTR_DetectedQTMOVfile "Detectado formato de archivo QuickTime/MOV!\n"
+#define MSGTR_Detected_XXX_FileFormat "Detectado formato de archivo %s!\n"
 #define MSGTR_InvalidMPEGES "Stream MPEG-ES inválido??? contacte al autor, puede ser un bug :(\n"
 #define MSGTR_FormatNotRecognized "============ Disculpe, este formato no está soportado/reconocido =============\n"\
 				  "==== Si este archivo es un AVI, ASF o MPEG, por favor contacte al autor! =====\n"
diff --git a/help_mp-fr.h b/help_mp-fr.h
index 124676071b..5581e5c4e4 100644
--- a/help_mp-fr.h
+++ b/help_mp-fr.h
@@ -103,8 +103,6 @@ static char help_text[]=
 			    "- -cache est utilisé avec un fichier mal multiplexé => essayer avec -nocache\n"\
 			    "Si rien de tout cela ne résout le problème, lire DOCS/bugreports.html !\n\n"
 
-
-
 #define MSGTR_NoGui "MPlayer a été compilé SANS support GUI!\n"
 #define MSGTR_GuiNeedsX "MPlayer GUI a besoin de X11!\n"
 #define MSGTR_Playing "Joue %s\n"
@@ -183,22 +181,7 @@ static char help_text[]=
 #define MSGTR_MaybeNI "Peut-être jouez-vous un flux/fichier mal multiplexé, ou le codec n'est pas là...\n"\
                       "Pour les fichier .AVI, essayez l'option -ni."
 #define MSGTR_SwitchToNi "\nFichier .AVI mal multiplexé - passage en mode -ni!\n"
-#define MSGTR_DetectedFILMfile "Fichier de type FILM détecté!\n"
-#define MSGTR_DetectedFLIfile "Fichier de type FLI détecté!\n"
-#define MSGTR_DetectedROQfile "Fichier de type RoQ détecté!\n"
-#define MSGTR_DetectedREALfile "Fichier de type REAL détecté!\n"
-#define MSGTR_DetectedAVIfile "Fichier de type AVI détecté!\n"
-#define MSGTR_DetectedASFfile "Fichier de type ASF détecté!\n"
-#define MSGTR_DetectedMPEGPESfile "Fichier de type MPEG-PES détecté!\n"
-#define MSGTR_DetectedMPEGPSfile "Fichier de type MPEG-PS détecté!\n"
-#define MSGTR_DetectedMPEGESfile "Fichier de type MPEG-ES détecté!\n"
-#define MSGTR_DetectedQTMOVfile "Fichier de type QuickTime/MOV détecté!\n"
-#define MSGTR_DetectedYUV4MPEG2file "Fichier de type YUV4MPEG2 détecté!\n"
-#define MSGTR_DetectedNuppelVideofile "Fichier de type NuppelVideo détecté!\n"
-#define MSGTR_DetectedVIVOfile "Fichier de type VIVO détecté!\n"
-#define MSGTR_DetectedBMPfile "Fichier de type BMP détecté!\n"
-#define MSGTR_DetectedOGGfile "Fichier de type OGG détecté!\n"
-#define MSGTR_DetectedRAWDVfile "Fichier de type RAWDV détecté!\n"
+#define MSGTR_Detected_XXX_FileFormat "Fichier de type %s détecté!\n"
 #define MSGTR_DetectedAudiofile "Fichier audio détecté!\n"
 #define MSGTR_NotSystemStream "Pas un flux de type MPEG System... (peut-être un flux de transport?)\n"
 #define MSGTR_InvalidMPEGES "Flux MPEG-ES invalide??? Contactez l'auteur, c'est peut-être un bug :(\n"
diff --git a/help_mp-hu.h b/help_mp-hu.h
index 299c3b8e98..510eac7279 100644
--- a/help_mp-hu.h
+++ b/help_mp-hu.h
@@ -135,16 +135,7 @@ static char help_text[]=
 #define MSGTR_TooManyVideoInBuffer "\nDEMUXER: Túl sok (%d db, %d bájt) video-csomag a pufferben!\n"
 #define MSGTR_MaybeNI "(talán ez egy nem összefésült (interleaved) file vagy a CODEC nem mûködik jól)\n"
 #define MSGTR_SwitchToNi "\nRosszul összefésült (interleaved) file, átváltás -ni módba!\n"
-#define MSGTR_DetectedFILMfile "Ez egy FILM formátumú file!\n"
-#define MSGTR_DetectedFLIfile "Ez egy FLI formátumú file!\n"
-#define MSGTR_DetectedROQfile "Ez egy RoQ formátumú file!\n"
-#define MSGTR_DetectedREALfile "Ez egy REAL formátumú file!\n"
-#define MSGTR_DetectedAVIfile "Ez egy AVI formátumú file!\n"
-#define MSGTR_DetectedASFfile "Ez egy ASF formátumú file!\n"
-#define MSGTR_DetectedMPEGPESfile "Ez egy MPEG-PES formátumú file!\n"
-#define MSGTR_DetectedMPEGPSfile "Ez egy MPEG-PS formátumú file!\n"
-#define MSGTR_DetectedMPEGESfile "Ez egy MPEG-ES formátumú file!\n"
-#define MSGTR_DetectedQTMOVfile "Ez egy QuickTime/MOV formátumú file! (ez még nem támogatott)\n"
+#define MSGTR_Detected_XXX_FileFormat "Ez egy %s formátumú file!\n"
 #define MSGTR_InvalidMPEGES "Hibás MPEG-ES-folyam? Lépj kapcsolatba a készítõkkel, lehet, hogy hiba!\n"
 #define MSGTR_FormatNotRecognized "========= Sajnos ez a fileformátum ismeretlen vagy nem támogatott ===========\n"\
 				  "= Ha ez egy AVI, ASF vagy MPEG file, lépj kapcsolatba a készítõkkel (hiba)! =\n"
diff --git a/help_mp-it.h b/help_mp-it.h
index f2489adac9..f097dc09c1 100644
--- a/help_mp-it.h
+++ b/help_mp-it.h
@@ -137,16 +137,7 @@ static char help_text[]=
 #define MSGTR_TooManyAudioInBuffer "\nDEMUXER: Troppi (%d in %d byte) pacchetti audio nel buffer!\n"
 #define MSGTR_TooManyVideoInBuffer "\nDEMUXER: Troppi (%d in %d byte) pacchetti video nel buffer!\n"
 #define MSGTR_MaybeNI "(forse stai riproducendo un flusso/file non interlacciato o il codec non funziona)\n"
-#define MSGTR_DetectedFILMfile "Rilevato formato file FILM !\n"
-#define MSGTR_DetectedFLIfile "Rilevato formato file FLI !\n"
-#define MSGTR_DetectedROQfile "Rilevato formato file RoQ !\n"
-#define MSGTR_DetectedREALfile "Rilevato formato file REAL !\n"
-#define MSGTR_DetectedAVIfile "Rilevato formato file AVI !\n"
-#define MSGTR_DetectedASFfile "Rilevato formato file ASF !\n"
-#define MSGTR_DetectedMPEGPESfile "Rilevato formato file MPEG-PES !\n"
-#define MSGTR_DetectedMPEGPSfile "Rilevato formato file MPEG-PS !\n"
-#define MSGTR_DetectedMPEGESfile "Rilevato formato file MPEG-ES !\n"
-#define MSGTR_DetectedQTMOVfile "Rilevato formato file QuickTime/MOV !\n"
+#define MSGTR_Detected_XXX_FileFormat "Rilevato formato file %s!\n"
 #define MSGTR_InvalidMPEGES "Flusso MPEG-ES non valido??? Contatta l\'autore, può essere un baco :(\n"
 #define MSGTR_FormatNotRecognized "===== Mi dispiace, questo formato file non è riconosciuto/supportato ======\n"\
 				  "=== Se questo è un file AVI, ASF o MPEG, per favore contatta l\'autore! ===\n"
diff --git a/help_mp-ko.h b/help_mp-ko.h
index 79d997f870..f9fd45995c 100644
--- a/help_mp-ko.h
+++ b/help_mp-ko.h
@@ -138,16 +138,7 @@ static char help_text[]=
 #define MSGTR_TooManyAudioInBuffer "\nDEMUXER: ¹öÆÛ¿¡ ³Ê¹« ¸¹Àº (%d in %d bytes) ¿Àµð¿À ÆÐŶÀÌ ÀÖ½À´Ï´Ù!\n"
 #define MSGTR_TooManyVideoInBuffer "\nDEMUXER: ¹öÆÛ¿¡ ³Ê¹« ¸¹Àº (%d in %d bytes) ºñµð¿À ÆÐŶÀÌ ÀÖ½À´Ï´Ù!\n"
 #define MSGTR_MaybeNI "(non-interleaved ½ºÆ®¸²/ÆÄÀÏÀ» Àç»ýÇÏ°íÀְųª ÄÚµ¦ÀÌ À߸øµÇ¾ú½À´Ï´Ù.)\n"
-#define MSGTR_DetectedFILMfile "FILM ÆÄÀÏ Çü½ÄÀ» ¹ß°ßÇß½À´Ï´Ù!\n"
-#define MSGTR_DetectedFLIfile "FLI ÆÄÀÏ Çü½ÄÀ» ¹ß°ßÇß½À´Ï´Ù!\n"
-#define MSGTR_DetectedROQfile "RoQ ÆÄÀÏ Çü½ÄÀ» ¹ß°ßÇß½À´Ï´Ù!\n"
-#define MSGTR_DetectedREALfile "REAL ÆÄÀÏ Çü½ÄÀ» ¹ß°ßÇß½À´Ï´Ù!\n"
-#define MSGTR_DetectedAVIfile "AVI ÆÄÀÏ Çü½ÄÀ» ¹ß°ßÇß½À´Ï´Ù!\n"
-#define MSGTR_DetectedASFfile "ASF ÆÄÀÏ Çü½ÄÀ» ¹ß°ßÇß½À´Ï´Ù!\n"
-#define MSGTR_DetectedMPEGPESfile "MPEG-PES ÆÄÀÏ Çü½ÄÀ» ¹ß°ßÇß½À´Ï´Ù!\n"
-#define MSGTR_DetectedMPEGPSfile "MPEG-PS ÆÄÀÏ Çü½ÄÀ» ¹ß°ßÇß½À´Ï´Ù!\n"
-#define MSGTR_DetectedMPEGESfile "MPEG-ES ÆÄÀÏ Çü½ÄÀ» ¹ß°ßÇß½À´Ï´Ù!\n"
-#define MSGTR_DetectedQTMOVfile "QuickTime/MOV ÆÄÀÏ Çü½ÄÀ» ¹ß°ßÇß½À´Ï´Ù!\n"
+#define MSGTR_Detected_XXX_FileFormat "%s ÆÄÀÏ Çü½ÄÀ» ¹ß°ßÇß½À´Ï´Ù!\n"
 #define MSGTR_InvalidMPEGES "À߸øµÈ MPEG-ES ½ºÆ®¸²??? ÀúÀÛÀÚ¿¡°Ô ¹®ÀÇÇϼ¼¿ä, ¹ö±×ÀÏÁöµµ ¸ð¸¨´Ï´Ù. :(\n"
 #define MSGTR_FormatNotRecognized "============= Á˼ÛÇÕ´Ï´Ù, ÀÌ ÆÄÀÏÇü½ÄÀº ÀνĵÇÁö¸øÇ߰ųª Áö¿øµÇÁö¾Ê½À´Ï´Ù ===============\n"\
 				  "=== ¸¸¾à ÀÌ ÆÄÀÏÀÌ AVI, ASF ¶Ç´Â MPEG ½ºÆ®¸²À̶ó¸é, ÀúÀÛÀÚ¿¡°Ô ¹®ÀÇÇϼ¼¿ä! ===\n"
diff --git a/help_mp-nl.h b/help_mp-nl.h
index 2197abdd04..1389dec34b 100644
--- a/help_mp-nl.h
+++ b/help_mp-nl.h
@@ -179,22 +179,7 @@ static char help_text[]=
 #define MSGTR_MaybeNI "(misschien speel je een non-interleaved stream/bestand of werkte de codec niet)\n" \
 		      "Voor .AVI bestanden probeer je best non-interleaved mode met de optie -ni\n"
 #define MSGTR_SwitchToNi "\nSlecht geinterleaved .AVI bestand gedetecteerd - schakel om naar -ni mode!\n"
-#define MSGTR_DetectedFILMfile "FILM bestandsformaat gedetecteerd!\n"
-#define MSGTR_DetectedFLIfile "FLI bestandsformaat gedetecteerd!\n"
-#define MSGTR_DetectedROQfile "RoQ bestandsformaat gedetecteerd!\n"
-#define MSGTR_DetectedREALfile "REAL bestandsformaat gedetecteerd!\n"
-#define MSGTR_DetectedAVIfile "AVI bestandsformaat gedetecteerd!\n"
-#define MSGTR_DetectedASFfile "ASF bestandsformaat gedetecteerd!\n"
-#define MSGTR_DetectedMPEGPESfile "MPEG-PES bestandsformaat gedetecteerd!\n"
-#define MSGTR_DetectedMPEGPSfile "MPEG-PS bestandsformaat gedetecteerd!\n"
-#define MSGTR_DetectedMPEGESfile "MPEG-ES bestandsformaat gedetecteerd!\n"
-#define MSGTR_DetectedQTMOVfile "QuickTime/MOV bestandsformaat gedetecteerd!\n"
-#define MSGTR_DetectedYUV4MPEG2file "YUV4MPEG2 bestandsformaat gedetecteerd!\n"
-#define MSGTR_DetectedNuppelVideofile "NuppelVideo bestandsformaat gedetecteerd!\n"
-#define MSGTR_DetectedVIVOfile "VIVO bestandsformaat gedetecteerd!\n"
-#define MSGTR_DetectedBMPfile "BMP bestandsformaat gedetecteerd!\n"
-#define MSGTR_DetectedOGGfile "OGG bestandsformaat gedetecteerd!\n"
-#define MSGTR_DetectedRAWDVfile "RAWDV bestandsformaat gedetecteerd!\n"
+#define MSGTR_Detected_XXX_FileFormat "%s bestandsformaat gedetecteerd!\n"
 #define MSGTR_DetectedAudiofile "Audio bestandsformaat gedetecteerd!\n"
 #define MSGTR_NotSystemStream "Geen MPEG System Stream formaat... (misschien Transport Stream?)\n"
 #define MSGTR_InvalidMPEGES "Invalid MPEG-ES stream??? Contacteer de auteur, het zou een bug kunnen zijn :(\n"
diff --git a/help_mp-no.h b/help_mp-no.h
index 7cd0a1620a..2e9c60cc78 100644
--- a/help_mp-no.h
+++ b/help_mp-no.h
@@ -137,16 +137,7 @@ static char help_text[]=
 #define MSGTR_TooManyAudioInBuffer "\nDEMUXER: For mange (%d i %d bytes) lyd pakker i bufferen!\n"
 #define MSGTR_TooManyVideoInBuffer "\nDEMUXER: For mange (%d i %d bytes) video pakker i bufferen!\n"
 #define MSGTR_MaybeNI "(kanskje du spiller av en ikke-interleaved stream/fil eller codec'en feilet)\n"
-#define MSGTR_DetectedFILMfile "Detekterte FILM filformat!\n"
-#define MSGTR_DetectedFLIfile "Detekterte FLI filformat!\n"
-#define MSGTR_DetectedROQfile "Detekterte RoQ filformat!\n"
-#define MSGTR_DetectedREALfile "Detekterte REAL filformat!\n"
-#define MSGTR_DetectedAVIfile "Detekterte AVI filformat!\n"
-#define MSGTR_DetectedASFfile "Detekterte ASF filformat!\n"
-#define MSGTR_DetectedMPEGPESfile "Detected MPEG-PES filformat!\n"
-#define MSGTR_DetectedMPEGPSfile "Detekterte MPEG-PS filformat!\n"
-#define MSGTR_DetectedMPEGESfile "Detekterte MPEG-ES filformat!\n"
-#define MSGTR_DetectedQTMOVfile "Detekterte QuickTime/MOV filformat!\n"
+#define MSGTR_Detected_XXX_FileFormat "Detekterte %s filformat!\n"
 #define MSGTR_InvalidMPEGES "Ugyldig MPEG-ES stream??? kontakt utvikleren, det kan være en feil :(\n"
 #define MSGTR_FormatNotRecognized "======== Beklager, dette filformatet er ikke gjenkjent/støttet ===============\n"\
 				  "=== Hvis det er en AVI, ASF eller MPEG stream, kontakt utvikleren! ===\n"
diff --git a/help_mp-pl.h b/help_mp-pl.h
index 8270ffdfe8..63cfb2a975 100644
--- a/help_mp-pl.h
+++ b/help_mp-pl.h
@@ -183,22 +183,7 @@ static char help_text[]=
 #define MSGTR_MaybeNI "Mo¿e odtwarzasz strumieñ/plik non-interleaved lub kodek nie zadzia³a³?\n"\
 		      "Dla plików .AVI spróbuj wymusiæ tryb non-interleaved poprzez opcje -ni\n"
 #define MSGTR_SwitchToNi "\nWykryto non-interleaved .AVI - prze³±czam na tryb -ni !\n"
-#define MSGTR_DetectedFILMfile "Wykryto format FILM!\n"
-#define MSGTR_DetectedFLIfile "Wykryto format FLI!\n"
-#define MSGTR_DetectedROQfile "Wykryto format RoQ!\n"
-#define MSGTR_DetectedREALfile "Wykryto format REAL!\n"
-#define MSGTR_DetectedAVIfile "Wykryto format AVI!\n"
-#define MSGTR_DetectedASFfile "Wykryto format ASF!\n"
-#define MSGTR_DetectedMPEGPESfile "Wykryto format MPEG-PES!\n"
-#define MSGTR_DetectedMPEGPSfile "Wykryto format MPEG-PS!\n"
-#define MSGTR_DetectedMPEGESfile "Wykryto format MPEG-ES!\n"
-#define MSGTR_DetectedQTMOVfile "Wykryto format QuickTime/MOV!\n"
-#define MSGTR_DetectedYUV4MPEG2file "Wykryto format YUV4MPEG2!\n"
-#define MSGTR_DetectedNuppelVideofile "Wykryto format NuppelVideo!\n"
-#define MSGTR_DetectedVIVOfile "Wykryto format VIVO!\n"
-#define MSGTR_DetectedBMPfile "Wykryto format BMP!\n"
-#define MSGTR_DetectedOGGfile "Wykryto format OGG!\n"
-#define MSGTR_DetectedRAWDVfile "Wykryto format RAWDV!\n"
+#define MSGTR_Detected_XXX_FileFormat "Wykryto format %s!\n"
 #define MSGTR_DetectedAudiofile "Wykryto plik audio!\n"
 #define MSGTR_NotSystemStream "Nie jest to MPEG System Stream ... (mo¿e Transport Stream?)\n"
 #define MSGTR_InvalidMPEGES "B³êdny strumieñ MPEG-ES ??? Skontaktuj siê z autorem, mo¿e to b³±d:(\n"
diff --git a/help_mp-pt_BR.h b/help_mp-pt_BR.h
index f6b5c4f0ea..4f4b5c2029 100644
--- a/help_mp-pt_BR.h
+++ b/help_mp-pt_BR.h
@@ -137,16 +137,7 @@ static char help_text[]=
 #define MSGTR_TooManyAudioInBuffer "\nDEMUXER: Muitos (%d em %d bytes) pacotes de áudio no buffer!\n"
 #define MSGTR_TooManyVideoInBuffer "\nDEMUXER: Muitos (%d em %d bytes) pacotes de vídeo no buffer!\n"
 #define MSGTR_MaybeNI "(pode ser que você reprodiziu um não-\"interleaved\" fluxo(stream)/arquivo ou o coded falhou)\n"
-#define MSGTR_DetectedFILMfile "Detectado formato de arquivo FILM!\n"
-#define MSGTR_DetectedFLIfile "Detectado formato de arquivo FLI!\n"
-#define MSGTR_DetectedROQfile "Detectado formato de arquivo RoQ!\n"
-#define MSGTR_DetectedREALfile "Detectado formato de arquivo REAL!\n"
-#define MSGTR_DetectedAVIfile "Detectado formato de arquivo AVI!\n"
-#define MSGTR_DetectedASFfile "Detectado formato de arquivo ASF!\n"
-#define MSGTR_DetectedMPEGPESfile "Detectado formato de arquivo MPEG-PES!\n"
-#define MSGTR_DetectedMPEGPSfile "Detectado formato de arquivo MPEG-PS!\n"
-#define MSGTR_DetectedMPEGESfile "Detectado formato de arquivo MPEG-ES!\n"
-#define MSGTR_DetectedQTMOVfile "Detectado formato de arquivo QuickTime/MOV!\n"
+#define MSGTR_Detected_XXX_FileFormat "Detectado formato de arquivo %s!\n"
 #define MSGTR_InvalidMPEGES "Fluxo (stream) de vídeo MPEG-ES faltando!? Contate o autor, pode ser um bug :(\n"
 #define MSGTR_FormatNotRecognized "============= Desculpe, este formato não é rconhecido/suportado ===============\n"\
 				  "=== Se este arquivo é um AVI, ASF ou MPEG, por favor contate o autor! ===\n"
diff --git a/help_mp-ro.h b/help_mp-ro.h
index a6d037305a..d8e3e8dee0 100644
--- a/help_mp-ro.h
+++ b/help_mp-ro.h
@@ -121,16 +121,7 @@ static char help_text[]=
 #define MSGTR_TooManyAudioInBuffer "\nDEMUXER: Prea multe (%d în %d bytes) pachete audio în tampon!\n"
 #define MSGTR_TooManyVideoInBuffer "\nDEMUXER: Prea multe (%d în %d bytes) pachete video în tampon!\n"
 #define MSGTR_MaybeNI "(poate afiºaþi un film/pistã ne-întreþesut sau codec-ul a dat eroare)\n"
-#define MSGTR_DetectedFILMfile "Format fiºier detectat: FILM\n"
-#define MSGTR_DetectedFLIfile "Format fiºier detectat: FLI\n"
-#define MSGTR_DetectedROQfile "Format fiºier detectat: RoQ\n"
-#define MSGTR_DetectedREALfile "Format fiºier detectat: REAL\n"
-#define MSGTR_DetectedAVIfile "Format fiºier detectat: AVI\n"
-#define MSGTR_DetectedASFfile "Format fiºier detectat: ASF\n"
-#define MSGTR_DetectedMPEGPESfile "Format fiºier detectat: MPEG-PES\n"
-#define MSGTR_DetectedMPEGPSfile "Format fiºier detectat: MPEG-PS\n"
-#define MSGTR_DetectedMPEGESfile "Format fiºier detectat: MPEG-ES\n"
-#define MSGTR_DetectedQTMOVfile "Format fiºier detectat: QuickTime/MOV\n"
+#define MSGTR_Detected_XXX_FileFormat "Format fiºier detectat: %s!\n"
 #define MSGTR_InvalidMPEGES "Pistã MPEG-ES invalidã??? contactaþi autorul, poate fi un bug :(\n"
 #define MSGTR_FormatNotRecognized "============= Îmi pare rãu, acest format de fiºier nu este recunoscut/suportat ===============\n"\
 				  "======== Dacã acest fiºier este o pistã AVI, ASF sau MPEG , contactaþi vã rog autorul! ========\n"
diff --git a/help_mp-ru.h b/help_mp-ru.h
index 935a2dbfe0..9207dc950c 100644
--- a/help_mp-ru.h
+++ b/help_mp-ru.h
@@ -134,16 +134,7 @@ static char help_text[]=
 #define MSGTR_TooManyAudioInBuffer "\nDEMUXER: óÌÉÛËÏÍ ÍÎÏÇÏ (%d × %d ÂÁÊÔÁÈ) ÁÕÄÉÏ ÐÁËÅÔÏ× × ÂÕÆÅÒÅ!\n"
 #define MSGTR_TooManyVideoInBuffer "\nDEMUXER: óÌÉÛËÏÍ ÍÎÏÇÏ (%d × %d ÂÁÊÔÁÈ) ×ÉÄÅÏ ÐÁËÅÔÏ× × ÂÕÆÅÒÅ!\n"
 #define MSGTR_MaybeNI "(×ÏÚÍÏÖÎÏ ÷Ù ÐÒÏÉÇÒÙ×ÁÅÔÅ ÎÅÞÅÒÅÄÏ×ÁÎÎÙÊ ÐÏÔÏË/ÆÁÊÌ ÉÌÉ ÎÅÕÄÁÞÎÙÊ ËÏÄÅË)\n"
-#define MSGTR_DetectedFILMfile "ïÂÎÁÒÕÖÅÎ FILM ÆÏÒÍÁÔ ÆÁÊÌÁ!\n"
-#define MSGTR_DetectedFLIfile "ïÂÎÁÒÕÖÅÎ FLI ÆÏÒÍÁÔ ÆÁÊÌÁ!\n"
-#define MSGTR_DetectedROQfile "ïÂÎÁÒÕÖÅÎ RoQ ÆÏÒÍÁÔ ÆÁÊÌÁ!\n"
-#define MSGTR_DetectedREALfile "ïÂÎÁÒÕÖÅÎ REAL ÆÏÒÍÁÔ ÆÁÊÌÁ!\n"
-#define MSGTR_DetectedAVIfile "ïÂÎÁÒÕÖÅÎ AVI ÆÏÒÍÁÔ ÆÁÊÌÁ!\n"
-#define MSGTR_DetectedASFfile "ïÂÎÁÒÕÖÅÎ ASF ÆÏÒÍÁÔ ÆÁÊÌÁ!\n"
-#define MSGTR_DetectedMPEGPESfile "ïÂÎÁÒÕÖÅÎ MPEG-PES ÆÏÒÍÁÔ ÆÁÊÌÁ!\n"
-#define MSGTR_DetectedMPEGPSfile "ïÂÎÁÒÕÖÅÎ MPEG-PS ÆÏÒÍÁÔ ÆÁÊÌÁ!\n"
-#define MSGTR_DetectedMPEGESfile "ïÂÎÁÒÕÖÅÎ MPEG-ES ÆÏÒÍÁÔ ÆÁÊÌÁ!\n"
-#define MSGTR_DetectedQTMOVfile "ïÂÎÁÒÕÖÅÎ QuickTime/MOV ÆÏÒÍÁÔ ÆÁÊÌÁ!\n"
+#define MSGTR_Detected_XXX_FileFormat "ïÂÎÁÒÕÖÅÎ %s ÆÏÒÍÁÔ ÆÁÊÌÁ!\n"
 #define MSGTR_InvalidMPEGES "îÅÄÏÐÕÓÔÉÍÙÊ MPEG-ES ÐÏÔÏË??? Ó×ÑÖÉÔÅÓØ Ó Á×ÔÏÒÏÍ, ÜÔÏ ÍÏÖÅÔ ÂÙÔØ ÂÁÇÏÍ :(\n"
 #define MSGTR_FormatNotRecognized "========= Sorry, ÆÏÒÍÁÔ ÜÔÏÇÏ ÆÁÊÌÁ ÎÅ ÒÁÓÐÏÚÎÁÎ/ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ===========\n"\
 				  "===== åÓÌÉ ÜÔÏ AVI, ASF ÉÌÉ MPEG ÐÏÔÏË, ÐÏÖÁÌÕÊÓÔÁ Ó×ÑÖÉÔÅÓØ Ó Á×ÔÏÒÏÍ! ======\n"
diff --git a/help_mp-sk.h b/help_mp-sk.h
index 612fd66049..2323f4d2ec 100644
--- a/help_mp-sk.h
+++ b/help_mp-sk.h
@@ -180,22 +180,7 @@ static char help_text[]=
 #define MSGTR_MaybeNI "(mo¾no prehrávate neprekladaný prúd/súbor alebo kodek zlyhal)\n" \
 		      "Pre .AVI súbory skúste vynúti» neprekladaný mód voµbou -ni\n"
 #define MSGTR_SwitchToNi "\nDetekovaný zle prekladaný .AVI - prepnite -ni mód!\n"
-#define MSGTR_DetectedFILMfile "Detekovaný FILM formát súboru!\n"
-#define MSGTR_DetectedFLIfile "Detekovaný FLI formát súboru!\n"
-#define MSGTR_DetectedROQfile "Detekovaný ROQ formát súboru!\n"
-#define MSGTR_DetectedREALfile "Detekovaný REAL formát súboru!\n"
-#define MSGTR_DetectedAVIfile "Detekovaný AVI formát súboru!\n"
-#define MSGTR_DetectedASFfile "Detekovaný ASF formát súboru!\n"
-#define MSGTR_DetectedMPEGPESfile "Detekovaný MPEG-PES formát súboru!\n"
-#define MSGTR_DetectedMPEGPSfile "Detekovaný MPEG-PS formát súboru!\n"
-#define MSGTR_DetectedMPEGESfile "Detekovaný MPEG-ES formát súboru!\n"
-#define MSGTR_DetectedQTMOVfile "Detekovaný QuickTime/MOV formát súboru!\n"
-#define MSGTR_DetectedYUV4MPEG2file "Detekovaný YUV4MPEG2 formát súboru!\n"
-#define MSGTR_DetectedNuppelVideofile "Detekovaný NuppelVideo formát súboru!\n"
-#define MSGTR_DetectedVIVOfile "Detekovaný VIVO formát súboru!\n"
-#define MSGTR_DetectedBMPfile "Detekovaný BMP formát súboru!\n"
-#define MSGTR_DetectedOGGfile "Detekovaný OGG formát súboru!\n"
-#define MSGTR_DetectedRAWDVfile "Detekovaný RAWDV formát súboru!\n"
+#define MSGTR_Detected_XXX_FileFormat "Detekovaný %s formát súboru!\n"
 #define MSGTR_DetectedAudiofile "Detekovaný audio súbor!\n"
 #define MSGTR_NotSystemStream "Nie je to MPEG System Stream formát... (mo¾no Transport Stream?)\n"
 #define MSGTR_InvalidMPEGES "Neplatný MPEG-ES prúd??? kontaktujte autora, mo¾no je to chyba (bug) :(\n"
diff --git a/help_mp-uk.h b/help_mp-uk.h
index 92a08f5abb..24ceb501e9 100644
--- a/help_mp-uk.h
+++ b/help_mp-uk.h
@@ -134,16 +134,7 @@ static char help_text[]=
 #define MSGTR_TooManyAudioInBuffer "\nDEMUXER: îÁÄÔÏ ÂÁÇÁÔÏ (%d, %d ÂÁÊÔ¦×) ÁÕÄ¦Ï ÐÁËÅÔ¦× Õ ÂÕÆÅÒ¦!\n"
 #define MSGTR_TooManyVideoInBuffer "\nDEMUXER: îÁÄÔÏ ÂÁÇÁÔÏ (%d, %d ÂÁÊÔ¦×) צÄÅÏ ÐÁËÅÔ¦× Õ ÂÕÆÅÒ¦!\n"
 #define MSGTR_MaybeNI "(ÍÏÖÌÉ×Ï ×É ÐÒÏÇÒÁ¤ÔÅ ÎÅÞÅÒÅÚÒÑÄËÏ×ÉÊ ÐÏÔ¦Ë/ÆÁÊÌ ÁÂÏ ÎÅ×ÄÁÌÉÊ ËÏÄÅË)\n"
-#define MSGTR_DetectedFILMfile "úÎÁÊÄÅÎÉÊ FILM ÆÏÒÍÁÔ ÆÁÊÌÕ!\n"
-#define MSGTR_DetectedFLIfile "úÎÁÊÄÅÎÉÊ FLI ÆÏÒÍÁÔ ÆÁÊÌÕ!\n"
-#define MSGTR_DetectedROQfile "úÎÁÊÄÅÎÉÊ RoQ ÆÏÒÍÁÔ ÆÁÊÌÕ!\n"
-#define MSGTR_DetectedREALfile "úÎÁÊÄÅÎÉÊ REAL ÆÏÒÍÁÔ ÆÁÊÌÕ!\n"
-#define MSGTR_DetectedAVIfile "úÎÁÊÄÅÎÉÊ AVI ÆÏÒÍÁÔ ÆÁÊÌÕ!\n"
-#define MSGTR_DetectedASFfile "úÎÁÊÄÅÎÉÊ ASF ÆÏÒÍÁÔ ÆÁÊÌÕ!\n"
-#define MSGTR_DetectedMPEGPESfile "úÎÁÊÄÅÎÉÊ MPEG-PES ÆÏÒÍÁÔ ÆÁÊÌÕ!\n"
-#define MSGTR_DetectedMPEGPSfile "úÎÁÊÄÅÎÉÊ MPEG-PS ÆÏÒÍÁÔ ÆÁÊÌÕ!\n"
-#define MSGTR_DetectedMPEGESfile "úÎÁÊÄÅÎÉÊ MPEG-ES ÆÏÒÍÁÔ ÆÁÊÌÕ!\n"
-#define MSGTR_DetectedQTMOVfile "úÎÁÊÄÅÎÉÊ QuickTime/MOV ÆÏÒÍÁÔ ÆÁÊÌÕ!\n"
+#define MSGTR_Detected_XXX_FileFormat "úÎÁÊÄÅÎÉÊ %s ÆÏÒÍÁÔ ÆÁÊÌÕ!\n"
 #define MSGTR_InvalidMPEGES "îÅÐÒÉÐÕÓÔÉÍÉÊ MPEG-ES ÐÏÔ¦Ë??? ú×'ÑÖ¦ÔØÓÑ Ú Á×ÔÏÒÏÍ, ÃÅ ÍÁÂÕÔØ ÐÏÍÉÌËÁ :(\n"
 #define MSGTR_FormatNotRecognized "========= ÷ÉÂÁÞÔÅ, ÆÏÒÍÁÔ ÃØÏÇÏ ÆÁÊÌÕ ÎÅ ÒÏÚЦÚÎÁÎÉÊ ÞÉ ÎŠЦÄÔÒÉÍÕ¤ÔØÓÑ ===========\n"\
 				  "===== ñËÝÏ ÃÅ AVI, ASF ÁÂÏ MPEG ÐÏÔ¦Ë, ÂÕÄØ ÌÁÓËÁ Ú×'ÑÖ¦ÔØÓÑ Ú Á×ÔÏÒÏÍ! ======\n"
diff --git a/help_mp-zh_CN.h b/help_mp-zh_CN.h
index 0868fdffe7..68210eb8a5 100644
--- a/help_mp-zh_CN.h
+++ b/help_mp-zh_CN.h
@@ -178,22 +178,7 @@ static char help_text[]=
 #define MSGTR_MaybeNI "(Ò²ÐíÄã²¥·ÅÁËÒ»¸ö·Ç½»´íµÄÁ÷/Îļþ»òÕßÊǽâÂëʧ°Ü)?\n" \
 		      "¶ÔÓÚ.AVIÎļþ, ³¢ÊÔÓÃ-niÑ¡ÏîÖ¸¶¨·Ç½»´íģʽ\n"
 #define MSGTR_SwitchToNi "\n¼ì²âµ½Ôã¸âµÄ½»´í¸ñʽµÄ.AVI - Çл»µ½-niģʽ!\n"
-#define MSGTR_DetectedFILMfile "¼ì²âµ½FILMÎļþ¸ñʽ!\n"
-#define MSGTR_DetectedFLIfile "¼ì²âµ½FLIÎļþ¸ñʽ!\n"
-#define MSGTR_DetectedROQfile "¼ì²âµ½RoQÎļþ¸ñʽ!\n"
-#define MSGTR_DetectedREALfile "¼ì²âµ½REAL!\n"
-#define MSGTR_DetectedAVIfile "¼ì²âµ½AVIÎļþ¸ñʽ!\n"
-#define MSGTR_DetectedASFfile "¼ì²âµ½ASFÎļþ¸ñʽ!\n"
-#define MSGTR_DetectedMPEGPESfile "¼ì²âµ½MPEG-PESÎļþ¸ñʽ!\n"
-#define MSGTR_DetectedMPEGPSfile "¼ì²âµ½MPEG-PSÎļþ¸ñʽ!\n"
-#define MSGTR_DetectedMPEGESfile "¼ì²âµ½MPEG-ESÎļþ¸ñʽ!\n"
-#define MSGTR_DetectedQTMOVfile "¼ì²âµ½QuickTime/MOVÎļþ¸ñʽ!\n"
-#define MSGTR_DetectedYUV4MPEG2file "¼ì²âµ½YUV4MPEG2Îļþ¸ñʽ!\n"
-#define MSGTR_DetectedNuppelVideofile "¼ì²âµ½NuppelVideoÎļþ¸ñʽ!\n"
-#define MSGTR_DetectedVIVOfile "¼ì²âµ½VIVOÎļþ¸ñʽ!\n"
-#define MSGTR_DetectedBMPfile "¼ì²âµ½BMPÎļþ¸ñʽ!\n"
-#define MSGTR_DetectedOGGfile "¼ì²âµ½OGGÎļþ¸ñʽ!\n"
-#define MSGTR_DetectedRAWDVfile "¼ì²âµ½RAWDVÎļþ¸ñʽ!\n"
+#define MSGTR_Detected_XXX_FileFormat "¼ì²âµ½%sÎļþ¸ñʽ!\n"
 #define MSGTR_DetectedAudiofile "¼ì²âµ½ÒôƵÎļþ!\n"
 #define MSGTR_NotSystemStream "·ÇMPEGϵͳµÄÁ÷¸ñʽ... (¿ÉÄÜÊÇÊäËÍÁ÷?)\n"
 #define MSGTR_MissingMpegVideo "ÕÒ²»µ½MPEGÊÓƵÁ÷!? ÁªÏµ×÷Õß, Õâ¿ÉÄÜÊǸöbug :(\n"
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 8f4f9c9d67..75eb81b99a 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -594,7 +594,7 @@ if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_AVI){
       stream_read_dword_le(demuxer->stream); //filesize
       id=stream_read_dword_le(demuxer->stream); // "AVI "
       if(id==formtypeAVI){ 
-        mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedAVIfile);
+        mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"AVI");
         file_format=DEMUXER_TYPE_AVI;
       } else {
         free_demuxer(demuxer);
@@ -607,7 +607,7 @@ if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_AVI){
 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_Y4M){
   demuxer=new_demuxer(stream,DEMUXER_TYPE_Y4M,audio_id,video_id,dvdsub_id);
   if(y4m_check_file(demuxer)){
-      mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedYUV4MPEG2file);
+      mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"YUV4MPEG2");
       file_format=DEMUXER_TYPE_Y4M;
   } else {
       free_demuxer(demuxer);
@@ -618,7 +618,7 @@ if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_Y4M){
 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_ASF){
   demuxer=new_demuxer(stream,DEMUXER_TYPE_ASF,audio_id,video_id,dvdsub_id);
   if(asf_check_header(demuxer)){
-      mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedASFfile);
+      mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"ASF");
       file_format=DEMUXER_TYPE_ASF;
   } else {
       free_demuxer(demuxer);
@@ -629,7 +629,7 @@ if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_ASF){
 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_NUV){
   demuxer=new_demuxer(stream,DEMUXER_TYPE_NUV,audio_id,video_id,dvdsub_id);
   if(nuv_check_file(demuxer)){
-      mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedNuppelVideofile);
+      mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"NuppelVideo");
       file_format=DEMUXER_TYPE_NUV;
   } else {
       free_demuxer(demuxer);
@@ -640,7 +640,7 @@ if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_NUV){
 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MOV){
   demuxer=new_demuxer(stream,DEMUXER_TYPE_MOV,audio_id,video_id,dvdsub_id);
   if(mov_check_file(demuxer)){
-      mp_msg(MSGT_DEM