Merge svn changes up to r29277

22 files changed, 66 insertions, 88 deletions

diff --git a/help/help_mp-bg.h b/help/help_mp-bg.h
index 0ac845038e..6005107677 100644
--- a/help/help_mp-bg.h
+++ b/help/help_mp-bg.h
@@ -72,7 +72,6 @@ static const char help_text[]=
 #define MSGTR_FPSnotspecified "Броя кадри в секунда не е указан или е невалиден, ползвайте опцията -fps .\n"
 #define MSGTR_TryForceAudioFmtStr "Опит за ползване на фамилия аудио кодеци %s...\n"
 #define MSGTR_CantFindAudioCodec "Не може да бъде намерен кодек за този аудио формат 0x%X.\n"
-#define MSGTR_RTFMCodecs "Прочетете DOCS/HTML/en/codecs.html!\n"
 #define MSGTR_TryForceVideoFmtStr "Опит за ползване на фамилия видео кодеци %s...\n"
 #define MSGTR_CantFindVideoCodec "Няма подходящ кодек за указаните -vo и видео формат 0x%X.\n"
 #define MSGTR_CannotInitVO "ФАТАЛНО: Видео драйвера не може да бъде инициализиран.\n"
diff --git a/help/help_mp-cs.h b/help/help_mp-cs.h
index a9f0db02e3..b6edb8b329 100644
--- a/help/help_mp-cs.h
+++ b/help/help_mp-cs.h
@@ -70,7 +70,6 @@ static const char help_text[]=
 #define MSGTR_FPSnotspecified "Údaj o FPS v hlavičce souboru je špatný nebo chybí, použijte volbu -fps!\n"
 #define MSGTR_TryForceAudioFmtStr "Pokouším se vynutit rodinu audiokodeku %s...\n"
 #define MSGTR_CantFindAudioCodec "Nemohu nalézt kodek pro audio formát 0x%X!\n"
-#define MSGTR_RTFMCodecs "Přečtěte si DOCS/HTML/en/codecs.html!\n"
 #define MSGTR_TryForceVideoFmtStr "Pokouším se vynutit rodinu videokodeku %s...\n"
 #define MSGTR_CantFindVideoCodec "Nemohu nalézt kodek pro vybraný -vo a video formát 0x%X.\n"
 #define MSGTR_CannotInitVO "Kritická chyba: Nemohu inicializovat video rozhraní!\n"
diff --git a/help/help_mp-de.h b/help/help_mp-de.h
index db7f5ca8cd..0b5f467382 100644
--- a/help/help_mp-de.h
+++ b/help/help_mp-de.h
@@ -79,7 +79,6 @@ static const char help_text[]=
 #define MSGTR_FPSnotspecified "FPS ist im Header nicht angegeben (oder ungültig)! Benutze die Option -fps!\n"
 #define MSGTR_TryForceAudioFmtStr "Versuche Audiocodecfamilie %s zu erzwingen...\n"
 #define MSGTR_CantFindAudioCodec "Kann Codec für Audioformat 0x%X nicht finden!\n"
-#define MSGTR_RTFMCodecs "Lies DOCS/HTML/de/codecs.html!\n"
 #define MSGTR_TryForceVideoFmtStr "Versuche Videocodecfamilie %s zu erzwingen...\n"
 #define MSGTR_CantFindVideoCodec "Kann keinen Codec finden, der zu gewählter Option -vo und Videoformat 0x%X passt!\n"
 #define MSGTR_CannotInitVO "FATAL: Kann Videoausgabetreiber nicht initialisieren!\n"
@@ -1424,7 +1423,7 @@ static const char help_text[]=
 #define MSGTR_MPDEMUX_MMST_UnknownObject "unbekanntes Objekt\n"
 #define MSGTR_MPDEMUX_MMST_MediaDataReadFailed "Konnte Mediendaten nicht lesen.\n"
 #define MSGTR_MPDEMUX_MMST_MissingSignature "fehlende Signatur\n"
-#define MSGTR_MPDEMUX_MMST_PatentedTechnologyJoke "Alles fertig. Vielen dank, dass Du eine prorietäre und patentierte Technologie beinhaltende Mediendatei heruntergeladen hast.\n"
+#define MSGTR_MPDEMUX_MMST_PatentedTechnologyJoke "Alles fertig. Vielen Dank, dass Du eine proprietäre und patentierte Technologie beinhaltende Mediendatei heruntergeladen hast.\n"
 #define MSGTR_MPDEMUX_MMST_UnknownCmd "Unbekanntes Kommando %02x\n"
 #define MSGTR_MPDEMUX_MMST_GetMediaPacketErr "get_media_packet lieferte Fehler zurück: %s\n"
 #define MSGTR_MPDEMUX_MMST_Connected "Verbunden.\n"
diff --git a/help/help_mp-el.h b/help/help_mp-el.h
index bc9e6f494c..99114c8185 100644
--- a/help/help_mp-el.h
+++ b/help/help_mp-el.h
@@ -68,7 +68,6 @@ static const char help_text[]=
 #define MSGTR_FPSnotspecified "Μη ορισμένα FPS (ή λάθος) στην επικεφαλίδα! Χρησιμοποιήστε την επιλογή -fps!\n"
 #define MSGTR_TryForceAudioFmtStr "Προσπάθεια  επιβολής της οικογένειας του οδηγού του ήχου %s...\n"
 #define MSGTR_CantFindAudioCodec "Δεν είναι δυνατή η εύρεση του format του οδηγού του ήχου 0x%X!\n"
-#define MSGTR_RTFMCodecs "Διαβάστε DOCS/HTML/en/codecs.html!\n"
 #define MSGTR_TryForceVideoFmtStr "Προσπάθεια  επιβολής της οικογένειας του οδηγού του βίντεο %s...\n"
 #define MSGTR_CantFindVideoCodec "Δεν είναι δυνατή η εύρεση του οδηγού  για τον συγκεκριμένο -vo και το format του βίντεο 0x%X!\n"
 #define MSGTR_VOincompCodec "Λυπάμαι, η επιλεγμένη συσκευή video_out δεν είναι συμβατή με αυτό τον οδηγό.\n"
diff --git a/help/help_mp-en.h b/help/help_mp-en.h
index a9f07a9ab5..384fee2c23 100644
--- a/help/help_mp-en.h
+++ b/help/help_mp-en.h
@@ -75,7 +75,6 @@ static const char help_text[]=
 #define MSGTR_FPSnotspecified "FPS not specified in the header or invalid, use the -fps option.\n"
 #define MSGTR_TryForceAudioFmtStr "Trying to force audio codec driver family %s...\n"
 #define MSGTR_CantFindAudioCodec "Cannot find codec for audio format 0x%X.\n"
-#define MSGTR_RTFMCodecs "Read DOCS/HTML/en/codecs.html!\n"
 #define MSGTR_TryForceVideoFmtStr "Trying to force video codec driver family %s...\n"
 #define MSGTR_CantFindVideoCodec "Cannot find codec matching selected -vo and video format 0x%X.\n"
 #define MSGTR_CannotInitVO "FATAL: Cannot initialize video driver.\n"
diff --git a/help/help_mp-es.h b/help/help_mp-es.h
index 3de10bb189..f23c4e720d 100644
--- a/help/help_mp-es.h
+++ b/help/help_mp-es.h
@@ -79,7 +79,6 @@ static const char help_text[]=
 #define MSGTR_CoreDumped "Core dumped ;)\n"
 #define MSGTR_FPSnotspecified "FPS no especificado (o inválido) en la cabecera! Usa la opción -fps.\n"
 #define MSGTR_TryForceAudioFmtStr "Tratando de forzar la familia de codecs de audio %s...\n"
-#define MSGTR_RTFMCodecs "Revise el archivo DOCS/HTML/es/codecs.html!\n"
 #define MSGTR_CantFindAudioCodec "No se encontró codec para el formato de audio 0x%X!\n"
 #define MSGTR_TryForceVideoFmtStr "Tratando de forzar la familia de codecs de video %s...\n"
 #define MSGTR_CantFindVideoCodec "No se encontró codec para el formato de video 0x%X!\n"
diff --git a/help/help_mp-fr.h b/help/help_mp-fr.h
index 9a8cbf2666..df5da9bb24 100644
--- a/help/help_mp-fr.h
+++ b/help/help_mp-fr.h
@@ -73,7 +73,6 @@ static const char help_text[]=
 #define MSGTR_FPSnotspecified "FPS non spécifié dans l'entête ou invalide ! Utilisez l'option -fps.\n"
 #define MSGTR_TryForceAudioFmtStr "Tente de forcer la famille de codecs audio %s ...\n"
 #define MSGTR_CantFindAudioCodec "Ne peut trouver de codec pour le format audio 0x%X.\n"
-#define MSGTR_RTFMCodecs "Veuillez lire DOCS/HTML/fr/codecs.html !\n"
 #define MSGTR_TryForceVideoFmtStr "Tente de forcer la famille de codecs vidéo %s  ...\n"
 #define MSGTR_CantFindVideoCodec "Ne peut trouver codec pour format -vo sélectionné et vidéo 0x%X.\n"
 #define MSGTR_CannotInitVO "FATAL : Ne peut initialiser le pilote vidéo.\n"
diff --git a/help/help_mp-hu.h b/help/help_mp-hu.h
index 770c552b88..36a155cf2a 100644
--- a/help/help_mp-hu.h
+++ b/help/help_mp-hu.h
@@ -71,7 +71,6 @@ static const char help_text[]=
 #define MSGTR_FPSnotspecified "Az FPS (képkocka/mp) érték nincs megadva, vagy hibás! Használd az -fps opciót!\n"
 #define MSGTR_TryForceAudioFmtStr "Megpróbálom a(z) %s audio codec-családot használni...\n"
 #define MSGTR_CantFindAudioCodec "Nem találok codecet a(z) 0x%X audio-formátumhoz!\n"
-#define MSGTR_RTFMCodecs "Olvasd el a DOCS/HTML/hu/codecs.html fájlt!\n"
 #define MSGTR_TryForceVideoFmtStr "Megpróbálom a(z) %s video codec-családot használni...\n"
 #define MSGTR_CantFindVideoCodec "Nem találok codec-et ami megfelel a kivalasztott vo-hoz és 0x%X video-formátumhoz!\n"
 #define MSGTR_CannotInitVO "VÉGZETES HIBA: Nem tudom elindítani a video-meghajtót!\n"
diff --git a/help/help_mp-it.h b/help/help_mp-it.h
index c747ae3a49..5a991e4ab1 100644
--- a/help/help_mp-it.h
+++ b/help/help_mp-it.h
@@ -73,7 +73,6 @@ static const char help_text[]=
 #define MSGTR_FPSnotspecified "FPS non specificato (o non valido) nell'intestazione! Usa l'opzione -fps!\n"
 #define MSGTR_TryForceAudioFmtStr "Cerco di forzare l'uso della famiglia dei driver dei codec audio %s...\n"
 #define MSGTR_CantFindAudioCodec "Impossibile trovare il codec per il formato audio 0x%X!\n"
-#define MSGTR_RTFMCodecs "Leggi DOCS/HTML/it/codecs.html!\n"
 #define MSGTR_TryForceVideoFmtStr "Cerco di forzare l'uso della famiglia dei driver dei codec video %s...\n"
 #define MSGTR_CantFindVideoCodec "Impossibile trovare il codec per il formato video 0x%X!\n"
 #define MSGTR_CannotInitVO "FATALE: Impossibile inizializzare il driver video!\n"
diff --git a/help/help_mp-ja.h b/help/help_mp-ja.h
index 61aa98a765..9aa57f2053 100644
--- a/help/help_mp-ja.h
+++ b/help/help_mp-ja.h
@@ -67,7 +67,6 @@ static const char help_text[]=
 #define MSGTR_CoreDumped "コアダンプ ;)\n"
 #define MSGTR_FPSnotspecified "FPS がヘッダに指定されていないか不正です. -fps オプションを利用して下さい.\n"
 #define MSGTR_CantFindAudioCodec "audio format 0x%X 向けのコーデックを見付ける事が出来ませんでした.\n"
-#define MSGTR_RTFMCodecs "DOCS/HTML/en/codecs.html を御覧下さい\n"
 #define MSGTR_VOincompCodec "選択された映像出力デバイスはコーデックと互換性がありません\n"
 #define MSGTR_CannotInitVO "FATAL: 映像出力ドライバの初期化に失敗しました.\n"
 #define MSGTR_CannotInitAO "音声デバイスの初期化に失敗しました -> 無音声になります.\n"
diff --git a/help/help_mp-ko.h b/help/help_mp-ko.h
index 7d883a35dd..0059ae3ccf 100644
--- a/help/help_mp-ko.h
+++ b/help/help_mp-ko.h
@@ -67,7 +67,6 @@ static const char help_text[]=
 #define MSGTR_FPSnotspecified "헤더에 FPS가 지정되지 않았거나 유효하지 않습니다. -fps 옵션을 사용하세요.\n"
 #define MSGTR_TryForceAudioFmtStr "오디오 코덱 드라이버 집합 %s를 시도하고 있습니다...\n"
 #define MSGTR_CantFindAudioCodec "오디오 형식 0x%X를 위한 코덱을 찾을 수 없습니다.\n"
-#define MSGTR_RTFMCodecs "DOCS/HTML/en/codecs.html을 참조하세요!\n"
 #define MSGTR_TryForceVideoFmtStr "비디오 코덱 드라이버 집합 %s를 시도하고 있습니다...\n"
 #define MSGTR_CantFindVideoCodec "선택한 -vo 및 비디오 형식 0x%X과 일치하는 코덱을 찾을 수 없습니다.\n"
 #define MSGTR_VOincompCodec "선택한 비디오 출력 장치는 이 코덱과 호환되지 않습니다.\n"
diff --git a/help/help_mp-mk.h b/help/help_mp-mk.h
index a65ea9d86c..153a0bcca5 100644
--- a/help/help_mp-mk.h
+++ b/help/help_mp-mk.h
@@ -68,7 +68,6 @@ static const char help_text[]=
 #define MSGTR_FPSnotspecified "FPS(Frames Per Second) не се специфицирани во хедерот или се невалидни, користете ја -fps опцијата.\n"
 #define MSGTR_TryForceAudioFmtStr "Проба да го присили драјверот на аудио кодекот %s ...\n"
 #define MSGTR_CantFindAudioCodec "Не може да го пронајде кодекот за аудио форматот 0x%X.\n"
-#define MSGTR_RTFMCodecs "Прочитај DOCS/HTML/en/codecs.html!\n"
 #define MSGTR_TryForceVideoFmtStr "Пробува да го присили драјверот на видео кодекот %s ...\n"
 #define MSGTR_CantFindVideoCodec "Не може да го пронајде кодекот кој одговара избран со -vo и видео форматот 0x%X.\n"
 #define MSGTR_VOincompCodec "Избраниот излезен видео уред не е соодветен со овој кодек.\n"
diff --git a/help/help_mp-nl.h b/help/help_mp-nl.h
index 9171a03954..b838f87a12 100644
--- a/help/help_mp-nl.h
+++ b/help/help_mp-nl.h
@@ -68,7 +68,6 @@ static const char help_text[]=
 #define MSGTR_FPSnotspecified "FPS niet gespecificeerd (of foutief) in de header! Gebruik de optie -fps!\n"
 #define MSGTR_TryForceAudioFmtStr "Probeer audio codec driver familie %s te forceren...\n"
 #define MSGTR_CantFindAudioCodec "Kan codec voor audio format 0x%X niet vinden!\n"
-#define MSGTR_RTFMCodecs "Lees DOCS/HTML/en/codecs.html voor meer informatie!\n"
 #define MSGTR_TryForceVideoFmtStr "Probeer video codec driver familie %s te forceren...\n"
 #define MSGTR_CantFindVideoCodec "Kan codec voor video format 0x%X niet vinden!\n"
 #define MSGTR_VOincompCodec "Sorry, geselecteerde video_out device is incompatibel met deze codec.\n"
diff --git a/help/help_mp-pl.h b/help/help_mp-pl.h
index 14191d1e8f..499a600fda 100644
--- a/help/help_mp-pl.h
+++ b/help/help_mp-pl.h
@@ -72,7 +72,6 @@ static const char help_text[]=
 #define MSGTR_FPSnotspecified "Brak wartości FPS w nagłówku lub jest ona nieprawidłowa, użyj opcji -fps <ilość_klatek>.\n"
 #define MSGTR_TryForceAudioFmtStr "Próbuję wymusić kodek audio z rodziny %s...\n"
 #define MSGTR_CantFindAudioCodec "Nie mogę odnaleźć kodeka audio 0x%X.\n"
-#define MSGTR_RTFMCodecs "Zobacz DOCS/HTML/en/codecs.html!\n"
 #define MSGTR_TryForceVideoFmtStr "Próbuję wymusić kodek video z rodziny %s...\n"
 #define MSGTR_CantFindVideoCodec "Nie mogę odnaleźć kodeka video pasującego do wybranego -vo i formatu video 0x%X.\n"
 #define MSGTR_CannotInitVO "Błąd krytyczny: Nie mogę uruchomić sterownika video.\n"
@@ -625,8 +624,8 @@ static const char help_text[]=
 #define MSGTR_UsingExternalPP "[PP] Używam zewnętrznego filtra postprocessing, max q = %d.\n"
 #define MSGTR_UsingCodecPP "[PP] Używam filtra postprocessing kodeka, max q = %d.\n"
 #define MSGTR_VideoAttributeNotSupportedByVO_VD "Atrybut video '%s' nie jest obsługiwany przez wybrany vo & vd.\n"
-#define MSGTR_VideoCodecFamilyNotAvailableStr "Zarządano rodziny kodeków video [%s] (vfm=%s) niedostępna.\nWłącz ją przy kompilacji.\n"
-#define MSGTR_AudioCodecFamilyNotAvailableStr "Zarządano rodziny kodeków audio [%s] (afm=%s) niedostępna.\nWłącz ją przy kompilacji.\n"
+#define MSGTR_VideoCodecFamilyNotAvailableStr "Zażądano rodziny kodeków video [%s] (vfm=%s) niedostępna.\nWłącz ją przy kompilacji.\n"
+#define MSGTR_AudioCodecFamilyNotAvailableStr "Zażądano rodziny kodeków audio [%s] (afm=%s) niedostępna.\nWłącz ją przy kompilacji.\n"
 #define MSGTR_OpeningVideoDecoder "Otwieram dekoder video: [%s] %s\n"
 #define MSGTR_SelectedVideoCodec "Wybrany kodek video: [%s] vfm: %s (%s)\n"
 #define MSGTR_OpeningAudioDecoder "Otwieram dekoder audio: [%s] %s\n"
diff --git a/help/help_mp-ro.h b/help/help_mp-ro.h
index 499a470c4f..19f501359c 100644
--- a/help/help_mp-ro.h
+++ b/help/help_mp-ro.h
@@ -75,7 +75,6 @@ static const char help_text[]=
 #define MSGTR_FPSnotspecified "FPS (nr. de cadre pe secundã) nu e specificat în header sau e greºit; foloseºte opþiunea '-fps'.\n"
 #define MSGTR_TryForceAudioFmtStr "Forþez familia de codec audio %s...\n"
 #define MSGTR_CantFindAudioCodec "Nu gãsesc codec pentru formatul audio 0x%X.\n"
-#define MSGTR_RTFMCodecs "Citeºte DOCS/HTML/en/codecs.html!\n" //lang
 #define MSGTR_TryForceVideoFmtStr "Forþez familia de codecuri video %s...\n"
 #define MSGTR_CantFindVideoCodec "Nu gãsesc codec potrivit pentru ieºirea '-vo' aleasã ºi formatul video 0x%X.\n"
 #define MSGTR_VOincompCodec "Dispozitivul de ieºire video ales e incompatibil cu acest codec.\n"
diff --git a/help/help_mp-ru.h b/help/help_mp-ru.h
index d997bf1347..3371b8e38f 100644
--- a/help/help_mp-ru.h
+++ b/help/help_mp-ru.h
@@ -71,7 +71,6 @@ static const char help_text[]=
 #define MSGTR_FPSnotspecified "В заголовке кадры/сек не указаны (или недопустимые)! Используйте опцию -fps!\n"
 #define MSGTR_TryForceAudioFmtStr "Попытка форсировать семейство аудиокодеков %s...\n"
 #define MSGTR_CantFindAudioCodec "Не могу найти кодек для аудиоформата 0x%X!\n"
-#define MSGTR_RTFMCodecs "Прочтите DOCS/HTML/ru/codecs.html!\n"
 #define MSGTR_TryForceVideoFmtStr "Попытка форсировать семейство видеокодеков %s...\n"
 #define MSGTR_CantFindVideoCodec "Не могу найти кодек для выбранного -vo и видеоформата 0x%X!\n"
 #define MSGTR_CannotInitVO "ФАТАЛЬНАЯ ОШИБКА: Не могу инициализировать видеодрайвер!\n"
diff --git a/help/help_mp-sk.h b/help/help_mp-sk.h
index 875adedf2c..a2b2392dac 100644
--- a/help/help_mp-sk.h
+++ b/help/help_mp-sk.h
@@ -71,7 +71,6 @@ static const char help_text[]=
 #define MSGTR_FPSnotspecified "V hlavičke súboru nie je udané (alebo je zlé) FPS! Použite voľbu -fps!\n"
 #define MSGTR_TryForceAudioFmtStr "Pokúšam sa vynútiť rodinu audiokodeku %s...\n"
 #define MSGTR_CantFindAudioCodec "Nemôžem nájsť kodek pre audio formát 0x%X!\n"
-#define MSGTR_RTFMCodecs "Prečítajte si DOCS/HTML/en/codecs.html!\n"
 #define MSGTR_TryForceVideoFmtStr "Pokúšam se vnútiť rodinu videokodeku %s...\n"
 #define MSGTR_CantFindVideoCodec "Nemôžem najsť kodek pre video formát 0x%X!\n"
 #define MSGTR_CannotInitVO "FATAL: Nemôžem inicializovať video driver!\n"
diff --git a/help/help_mp-sv.h b/help/help_mp-sv.h
index 79e624b924..55a31c4362 100644
--- a/help/help_mp-sv.h
+++ b/help/help_mp-sv.h
@@ -70,7 +70,6 @@ static const char help_text[]=
 #define MSGTR_FPSnotspecified "FPS ej specifierad i filhuvudet eller är icke godkänd, använd argument -fps.\n"
 #define MSGTR_TryForceAudioFmtStr "Försöker att forcera audiocodecfamilj %s...\n"
 #define MSGTR_CantFindAudioCodec "Kan inte finna codec för audioformat 0x%X.\n"
-#define MSGTR_RTFMCodecs "Läs DOCS/HTML/en/codecs.html!\n"
 #define MSGTR_TryForceVideoFmtStr "Försöker att forcera videocodecfamilj %s...\n"
 #define MSGTR_CantFindVideoCodec "Kan inte finna codec för vald -vo och videoformat 0x%X.\n"
 #define MSGTR_CannotInitVO "FATALT: Kan inte initiera videodrivrutin.\n"
diff --git a/help/help_mp-tr.h b/help/help_mp-tr.h
index ae7b57c4d9..0ced0bf95c 100644
--- a/help/help_mp-tr.h
+++ b/help/help_mp-tr.h
@@ -73,7 +73,6 @@ static const char help_text[]=
 #define MSGTR_FPSnotspecified "Başlıktaki FPS belirsiz veya geçersiz, -fps seçeneğini kullanınız!\n"
 #define MSGTR_TryForceAudioFmtStr "%s ses kodek sürücülerini zorlama deneniyor...\n"
 #define MSGTR_CantFindAudioCodec "0x%X! ses biçimi için kodek bulunamıyor\n"
-#define MSGTR_RTFMCodecs "DOCS/HTML/en/codecs.html sayfasını okuyunuz!\n"
 #define MSGTR_TryForceVideoFmtStr "%s video kodek sürücülerini zorlama deneniyor...\n"
 #define MSGTR_CantFindVideoCodec "Seçili -vo sürücüsü ve 0x%X video biçimi için kodek bulunamadı!\n"
 #define MSGTR_CannotInitVO "HATA: Video sürücüsü başlatılamıyor!\n"
diff --git a/help/help_mp-uk.h b/help/help_mp-uk.h
index bebc874970..81e3637175 100644
--- a/help/help_mp-uk.h
+++ b/help/help_mp-uk.h
@@ -69,7 +69,6 @@ static const char help_text[]=
 #define MSGTR_FPSnotspecified "Не вказано чи невірна кількість кадрів, застосуйте опцію -fps.\n"
 #define MSGTR_TryForceAudioFmtStr "Намагаюсь форсувати групу аудіо кодеків %s...\n"
 #define MSGTR_CantFindVideoCodec "Не можу знайти кодек для відео формату 0x%X!\n"
-#define MSGTR_RTFMCodecs "Прочитайте DOCS/HTML/en/codecs.html!\n"
 #define MSGTR_TryForceVideoFmtStr "Намагаюсь форсувати групу відео кодеків %s...\n"
 #define MSGTR_CannotInitVO "ФАТАЛЬНО: Не можу ініціалізувати відео драйвер!\n"
 #define MSGTR_CannotInitAO "не можу відкрити/ініціалізувати аудіо пристрій -> ГРАЮ БЕЗ ЗВУКУ\n"
diff --git a/help/help_mp-zh_CN.h b/help/help_mp-zh_CN.h
index 26df21c131..c43f04db38 100644
--- a/help/help_mp-zh_CN.h
+++ b/help/help_mp-zh_CN.h
@@ -1,4 +1,4 @@
-// Synced with help_mp-en.h r28122 （MSGTR_EdlOutOfMem）
+// Synced with help_mp-en.h r29209 （MSGTR_RecommendedVideoBitrate）
 // Reminder of hard terms which need better/final solution later:
 //   (file links to be updated later if available!);  
 //   NAV; section/subsection;  XScreenSaver; keycolor;  
@@ -79,7 +79,6 @@ static const char help_text[]=
 #define MSGTR_FPSnotspecified "FPS 在文件头中没有指定或者无效，请使用 -fps 选项。\n"
 #define MSGTR_TryForceAudioFmtStr "尝试强制使用音频编解码器驱动族 %s...\n"
 #define MSGTR_CantFindAudioCodec "找不到音频格式 0x%X 的编解码器。\n"
-#define MSGTR_RTFMCodecs "请阅读 DOCS/zh/codecs.html！\n"
 #define MSGTR_TryForceVideoFmtStr "尝试强制使用视频编解码器驱动族 %s...\n"
 #define MSGTR_CantFindVideoCodec "找不到匹配所选 -vo 参数和视频格式 0x%X 的编解码器。\n"
 #define MSGTR_CannotInitVO "致命错误：无法初始化视频驱动！\n"
@@ -190,49 +189,49 @@ static const char help_text[]=
 
 // --- edit decision lists
 #define MSGTR_EdlOutOfMem "不能分配足够的内存来保持 EDL 数据。\n"
-#define MSGTR_EdlRecordsNo "读取 %d EDL 动作。\n"
-#define MSGTR_EdlQueueEmpty "没有 EDL 动作要处理。\n"
-#define MSGTR_EdlCantOpenForWrite "打不开 EDL 文件 [%s] 写入。\n"
-#define MSGTR_EdlCantOpenForRead "打不开 EDL 文件 [%s] 读取。\n"
-#define MSGTR_EdlNOsh_video "没有视频不能使用 EDL, 取消中。\n"
-#define MSGTR_EdlNOValidLine "无效 EDL 线: %s\n"
-#define MSGTR_EdlBadlyFormattedLine "错误格式的 EDL 线 [%d], 丢弃。\n"
-#define MSGTR_EdlBadLineOverlap "上次停止的位置是 [%f]; 下次开始的位置在 [%f]。\n"\
-"每一项必须按时间顺序, 不能重叠。 丢弃。\n"
-#define MSGTR_EdlBadLineBadStop "停止时间必须是在开始时间之后。\n"
-#define MSGTR_EdloutBadStop "EDL 跳跃已取消, 上次开始位置 > 停止位置\n"
-#define MSGTR_EdloutStartSkip "EDL 跳跃开始, 再按键 'i' 以停止。\n"
-#define MSGTR_EdloutEndSkip "EDL 跳跃结束, 线已写入。\n"
-#define MSGTR_MPEndposNoSizeBased "MPlayer 的选项 -endpos 还不支持大小单位。\n"
+#define MSGTR_EdlRecordsNo "读取 %d 个 EDL 行为。\n"
+#define MSGTR_EdlQueueEmpty "没有 EDL 行为要处理。\n"
+#define MSGTR_EdlCantOpenForWrite "无法打开并写入 EDL 文件 [%s]。\n"
+#define MSGTR_EdlCantOpenForRead "无法打开并读取 EDL 文件 [%s]。\n"
+#define MSGTR_EdlNOsh_video "无视频流时无法使用 EDL，禁用该功能。\n"
+#define MSGTR_EdlNOValidLine "无效的一行 EDL 文本：%s\n"
+#define MSGTR_EdlBadlyFormattedLine "格式错误的一行 EDL 文本 [%d]，丢弃该行。\n"
+#define MSGTR_EdlBadLineOverlap "上一个终止位置是 [%f]；下一个起始位置是 [%f]。\n"\
+"每一项内容必须按时间顺序排列，不能重叠。 丢弃该行。\n"
+#define MSGTR_EdlBadLineBadStop "终止时间必须位于起始时间之后。\n"
+#define MSGTR_EdloutBadStop "取消 EDL 跳跃，上一个开始位置 > 停止位置\n"
+#define MSGTR_EdloutStartSkip "开始 EDL 跳跃，再按键‘i’以指定跳过内容的结尾。\n"
+#define MSGTR_EdloutEndSkip "结束 EDL 跳跃，文本行已写入。\n"
+#define MSGTR_MPEndposNoSizeBased "MPlayer 的选项 -endpos 还不支持指定尺寸大小的单位。\n"
 
 // mplayer.c OSD
 #define MSGTR_OSDenabled "已启用"
 #define MSGTR_OSDdisabled "已停用"
-#define MSGTR_OSDAudio "音频: %s"
-#define MSGTR_OSDVideo "视频: %s"
-#define MSGTR_OSDChannel "频道: %s"
-#define MSGTR_OSDSubDelay "字幕延迟: %d 毫秒"
-#define MSGTR_OSDSpeed "速度: x %6.2f"
-#define MSGTR_OSDosd "OSD: %s"
-#define MSGTR_OSDChapter "章节: (%d) %s"
+#define MSGTR_OSDAudio "音频：%s"
+#define MSGTR_OSDVideo "视频：%s"
+#define MSGTR_OSDChannel "频道：%s"
+#define MSGTR_OSDSubDelay "字幕延迟：%d 毫秒"
+#define MSGTR_OSDSpeed "播放速度：x %6.2f"
+#define MSGTR_OSDosd "OSD：%s"
+#define MSGTR_OSDChapter "章节：（%d）%s"
 #define MSGTR_OSDAngle "视角：%d/%d"
 
 // property values
 #define MSGTR_Enabled "已启用"
-#define MSGTR_EnabledEdl "已启用 EDL"
+#define MSGTR_EnabledEdl "已启用（EDL）"
 #define MSGTR_Disabled "已停用"
-#define MSGTR_HardFrameDrop "强丢帧"
+#define MSGTR_HardFrameDrop "强制丢帧"
 #define MSGTR_Unknown "未知"
 #define MSGTR_Bottom "底部"
 #define MSGTR_Center "中部"
 #define MSGTR_Top "顶部"
 #define MSGTR_SubSourceFile "字幕文件"
 #define MSGTR_SubSourceVobsub "VOBSUB"
-#define MSGTR_SubSourceDemux "内嵌字幕"
+#define MSGTR_SubSourceDemux "附带字幕"
 
 // OSD bar names
 #define MSGTR_Volume "音量"
-#define MSGTR_Panscan "摇移"
+#define MSGTR_Panscan "全景模式"
 #define MSGTR_Gamma "伽玛值"
 #define MSGTR_Brightness "亮度"
 #define MSGTR_Contrast "对比度"
@@ -241,48 +240,48 @@ static const char help_text[]=
 #define MSGTR_Balance "均衡"
 
 // property state
-#define MSGTR_LoopStatus "循环方式: %s"
-#define MSGTR_MuteStatus "静音: %s"
+#define MSGTR_LoopStatus "循环模式：%s"
+#define MSGTR_MuteStatus "静音：%s"
 #define MSGTR_AVDelayStatus "A-V 延迟: %s"
-#define MSGTR_OnTopStatus "总在最前: %s"
-#define MSGTR_RootwinStatus "根窗口: %s"
-#define MSGTR_BorderStatus "边框: %s"
-#define MSGTR_FramedroppingStatus "丢帧: %s"
-#define MSGTR_VSyncStatus "视频同步: %s"
-#define MSGTR_SubSelectStatus "字幕: %s"
+#define MSGTR_OnTopStatus "保持在前面：%s"
+#define MSGTR_RootwinStatus "根窗口：%s"
+#define MSGTR_BorderStatus "边框：%s"
+#define MSGTR_FramedroppingStatus "丢帧：%s"
+#define MSGTR_VSyncStatus "垂直刷新同步：%s"
+#define MSGTR_SubSelectStatus "字幕：%s"
 #define MSGTR_SubSourceStatus "字幕来源：%s"
-#define MSGTR_SubPosStatus "字幕位置: %s/100"
-#define MSGTR_SubAlignStatus "字幕对齐: %s"
-#define MSGTR_SubDelayStatus "字幕延迟: %s"
-#define MSGTR_SubScale "字幕大小: %s"
-#define MSGTR_SubVisibleStatus "显示字幕: %s"
-#define MSGTR_SubForcedOnlyStatus "只用锁定的字幕: %s"
+#define MSGTR_SubPosStatus "字幕位置：%s/100"
+#define MSGTR_SubAlignStatus "字幕对齐方式：%s"
+#define MSGTR_SubDelayStatus "字幕延迟：%s"
+#define MSGTR_SubScale "字幕缩放：%s"
+#define MSGTR_SubVisibleStatus "显示字幕：%s"
+#define MSGTR_SubForcedOnlyStatus "只用强制使用的字幕：%s"
 
 // mencoder.c
-#define MSGTR_UsingPass3ControlFile "使用 pass3 控制文件: %s\n"
-#define MSGTR_MissingFilename "\n没有文件名。\n\n"
-#define MSGTR_CannotOpenFile_Device "打不开文件/设备。\n"
-#define MSGTR_CannotOpenDemuxer "打不开分路器。\n"
-#define MSGTR_NoAudioEncoderSelected "\n没有 (-oac) 所选的音频编码器。(参考 -oac help)选择一个或者使用 -nosound。\n"
-#define MSGTR_NoVideoEncoderSelected "\n没有 (-ovc) 所选的视频解码器。(参考 -ovc help)选择一个。\n"
-#define MSGTR_CannotOpenOutputFile "打不开输出文件 '%s'。\n"
+#define MSGTR_UsingPass3ControlFile "使用第三阶段的控制文件：%s\n"
+#define MSGTR_MissingFilename "\n没有指定文件名。\n\n"
+#define MSGTR_CannotOpenFile_Device "无法打开文件/设备。\n"
+#define MSGTR_CannotOpenDemuxer "无法打开流分离器。\n"
+#define MSGTR_NoAudioEncoderSelected "\n没有选择音频编码器（-oac）。请选择一个编码器（参见 -oac help）或者使用 -nosound。\n"
+#define MSGTR_NoVideoEncoderSelected "\n没有选择视频编码器（-ovc）。请选择一个编码器（参见 -ovc help）。\n"
+#define MSGTR_CannotOpenOutputFile "无法打开输出文件‘%s’。\n"
 #define MSGTR_EncoderOpenFailed "打开编码器失败。\n"
-#define MSGTR_MencoderWrongFormatAVI "\n警告: 输出文件格式是 _AVI_。请查看 -of help。\n"
-#define MSGTR_MencoderWrongFormatMPG "\n警告: 输出文件格式是 _MPEG_。请查看 -of help。\n"
-#define MSGTR_MissingOutputFilename "没有指定输出文件, 请查看 -o 选项。"
-#define MSGTR_ForcingOutputFourcc "锁定输出的 FourCC 为 %x [%.4s]。\n"
-#define MSGTR_ForcingOutputAudiofmtTag "锁定输出音频格式标签为 0x%x。\n"
-#define MSGTR_DuplicateFrames "\n%d 帧重复!\n"
-#define MSGTR_SkipFrame "\n跳帧中!\n"
-#define MSGTR_ResolutionDoesntMatch "\n新的视频文件的解析度或色彩空间和前一个不同。\n"
-#define MSGTR_FrameCopyFileMismatch "\n所有的视频文件必须要有同样的帧率, 解析度和编解码器才能使用 -ovc copy。\n"
-#define MSGTR_AudioCopyFileMismatch "\n所有的音频文件必须要有同样的音频编解码器和格式才能使用 -oac copy。\n"
-#define MSGTR_NoAudioFileMismatch "\n不能把只有视频的文件和音频视频文件混合。试试 -nosound。\n"
-#define MSGTR_NoSpeedWithFrameCopy "警告: -speed 不保证能和 -oac copy 一起正常工作!\n"\
-"你的编码可能失败!\n"
-#define MSGTR_ErrorWritingFile "%s: 写文件错误。\n"
-#define MSGTR_FlushingVideoFrames "\n清空(flush)视频帧。\n"
-#define MSGTR_FiltersHaveNotBeenConfiguredEmptyFile "过滤器尚未配置! 空文件?\n"
+#define MSGTR_MencoderWrongFormatAVI "\n警告：输出文件格式是 _AVI_。参见 -of help。\n"
+#define MSGTR_MencoderWrongFormatMPG "\n警告：输出文件格式是 _MPEG_。参见 -of help。\n"
+#define MSGTR_MissingOutputFilename "没有指定输出文件，请参见 -o 选项。"
+#define MSGTR_ForcingOutputFourcc "强制输出内容的 FourCC 为 %x [%.4s]。\n"
+#define MSGTR_ForcingOutputAudiofmtTag "强制输出音频的格式标签为 0x%x。\n"
+#define MSGTR_DuplicateFrames "\n%d 个重复的帧！\n"
+#define MSGTR_SkipFrame "\n跳帧中！\n"
+#define MSGTR_ResolutionDoesntMatch "\n新的视频文件和前一个文件的分辨率或色彩空间不同。\n"
+#define MSGTR_FrameCopyFileMismatch "\n所有的视频文件必须使用同样的帧率、分辨率和编解码器才能使用 -ovc copy。\n"
+#define MSGTR_AudioCopyFileMismatch "\n所有的音频文件必须使用同样的音频编解码器和格式才能使用 -oac copy。\n"
+#define MSGTR_NoAudioFileMismatch "\n无法把只有视频流的文件与含有音频和视频的文件混在一起使用。请尝试使用 -nosound。\n"
+#define MSGTR_NoSpeedWithFrameCopy "警告：不能保证 -speed 能和 -oac copy 一起正常工作！\n"\
+"你的编码过程可能会有错误！\n"
+#define MSGTR_ErrorWritingFile "%s：写入文件出错。\n"
+#define MSGTR_FlushingVideoFrames "\n立即输出视频帧缓冲中的内容。\n"
+#define MSGTR_FiltersHaveNotBeenConfiguredEmptyFile "过滤器尚未配置！文件为空？\n"
 #define MSGTR_RecommendedVideoBitrate "%s CD 推荐的视频比特率为: %d\n"
 #define MSGTR_VideoStreamResult "\n视频流: %8.3f kbit/s  (%d B/s)  大小: %"PRIu64" 字节  %5.3f 秒  %d 帧\n"
 #define MSGTR_AudioStreamResult "\n音频流: %8.3f kbit/s  (%d B/s)  大小: %"PRIu64" 字节  %5.3f 秒\n"
diff --git a/help/help_mp-zh_TW.h b/help/help_mp-zh_TW.h
index 928d35aff6..d1ad121d60 100644
--- a/help/help_mp-zh_TW.h
+++ b/help/help_mp-zh_TW.h
@@ -75,7 +75,6 @@ static const char help_text[]=
 #define MSGTR_FPSnotspecified "FPS 在文件頭中没有指定或者無效，用 -fps 選項。\n"
 #define MSGTR_TryForceAudioFmtStr "嘗試鎖定為音頻編解碼器驅動族 %s...\n"
 #define MSGTR_CantFindAudioCodec "找不到音頻格式 0x%X 的編解碼器。\n"
-#define MSGTR_RTFMCodecs "請閲讀 DOCS/zh/codecs.html!\n"
 #define MSGTR_TryForceVideoFmtStr "嘗試鎖定為視頻編解碼器驅動族 %s...\n"
 #define MSGTR_CantFindVideoCodec "找不到匹配 -vo 所選的和視頻格式 0x%X 的編解碼器。\n"
 #define MSGTR_CannotInitVO "致命錯誤: 無法初始化視頻驅動!\n"