changeset 36543:ab3dbe1559d0

Prettify the dialog for subtitle encodings selection. Use the existing unicode encoding help message for the sake of consistency.
author ib
date Sun, 19 Jan 2014 15:00:09 +0000
parents 1163104c8adb
children cc8102c4ca83
files gui/dialog/preferences.c help/help_mp-bg.h help/help_mp-cs.h help/help_mp-de.h help/help_mp-dk.h help/help_mp-el.h help/help_mp-en.h help/help_mp-es.h help/help_mp-fr.h help/help_mp-hu.h help/help_mp-it.h help/help_mp-ja.h help/help_mp-ko.h help/help_mp-mk.h help/help_mp-nl.h help/help_mp-pl.h help/help_mp-pt_BR.h help/help_mp-ro.h help/help_mp-ru.h help/help_mp-sk.h help/help_mp-sv.h help/help_mp-tr.h help/help_mp-uk.h help/help_mp-zh_CN.h help/help_mp-zh_TW.h
diffstat 25 files changed, 1 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/gui/dialog/preferences.c	Sun Jan 19 14:46:33 2014 +0000
+++ b/gui/dialog/preferences.c	Sun Jan 19 15:00:09 2014 +0000
@@ -802,7 +802,7 @@
 
   CBSubOverlap=gtkAddCheckButton( MSGTR_PREFERENCES_SUB_Overlap,vbox9 );
   CBNoAutoSub=gtkAddCheckButton( MSGTR_PREFERENCES_SUB_AutoLoad,vbox9 );
-  CBSubUnicode=gtkAddCheckButton( MSGTR_PREFERENCES_SUB_Unicode,hbox3 );
+  CBSubUnicode=gtkAddCheckButton( MSGTR_PREFERENCES_FontEncoding1,hbox3 );
   CBDumpMPSub=gtkAddCheckButton( MSGTR_PREFERENCES_SUB_MPSUB,vbox9 );
   CBDumpSrt=gtkAddCheckButton( MSGTR_PREFERENCES_SUB_SRT,vbox9 );
 
--- a/help/help_mp-bg.h	Sun Jan 19 14:46:33 2014 +0000
+++ b/help/help_mp-bg.h	Sun Jan 19 15:00:09 2014 +0000
@@ -687,7 +687,6 @@
 #define MSGTR_PREFERENCES_SUB_FPS "FPS:"
 #define MSGTR_PREFERENCES_SUB_POS "Местоположение: "
 #define MSGTR_PREFERENCES_SUB_AutoLoad "Изключване на автоматичното зареждане на субтитри"
-#define MSGTR_PREFERENCES_SUB_Unicode "Субтитри с Unicode кодиране"
 #define MSGTR_PREFERENCES_SUB_MPSUB "Преобразуване на субтитрите в формата на MPlayer"
 #define MSGTR_PREFERENCES_SUB_SRT "Преобразуване на субтитрите в SubViewer (SRT) формат"
 #define MSGTR_PREFERENCES_SUB_Overlap "Препокриване на субтитрите"
--- a/help/help_mp-cs.h	Sun Jan 19 14:46:33 2014 +0000
+++ b/help/help_mp-cs.h	Sun Jan 19 15:00:09 2014 +0000
@@ -666,7 +666,6 @@
 #define MSGTR_PREFERENCES_SUB_FPS "FPS:"
 #define MSGTR_PREFERENCES_SUB_POS "Pozice: "
 #define MSGTR_PREFERENCES_SUB_AutoLoad "Vypnout automatické načtení titulků"
-#define MSGTR_PREFERENCES_SUB_Unicode "Titulky v UNICODE"
 #define MSGTR_PREFERENCES_SUB_MPSUB "Převést dané titulky do vlastního formátu MPlayeru"
 #define MSGTR_PREFERENCES_SUB_SRT "Převést dané titulky do časově orientovaného formátu SubViewer (SRT)"
 #define MSGTR_PREFERENCES_SUB_Overlap "Zapnout překrývání titulků"
--- a/help/help_mp-de.h	Sun Jan 19 14:46:33 2014 +0000
+++ b/help/help_mp-de.h	Sun Jan 19 15:00:09 2014 +0000
@@ -950,7 +950,6 @@
 #define MSGTR_PREFERENCES_SUB_FPS "FPS:"
 #define MSGTR_PREFERENCES_SUB_POS "Position: "
 #define MSGTR_PREFERENCES_SUB_AutoLoad "Automatisches Laden der Untertitel ausschalten"
-#define MSGTR_PREFERENCES_SUB_Unicode "Unicode-Untertitel"
 #define MSGTR_PREFERENCES_SUB_MPSUB "Konvertiere Untertitel in das MPlayer-Untertitelformat"
 #define MSGTR_PREFERENCES_SUB_SRT "Konvertiere Untertitel in das zeitbasierte SubViewer-Untertitelformat (SRT)"
 #define MSGTR_PREFERENCES_SUB_Overlap "Schalte Untertitelüberlappung ein/aus"
--- a/help/help_mp-dk.h	Sun Jan 19 14:46:33 2014 +0000
+++ b/help/help_mp-dk.h	Sun Jan 19 15:00:09 2014 +0000
@@ -457,7 +457,6 @@
 #define MSGTR_PREFERENCES_SUB_FPS "Billedfrekvens:"
 #define MSGTR_PREFERENCES_SUB_POS "Position: "
 #define MSGTR_PREFERENCES_SUB_AutoLoad "Deaktiver automatisk undertekster"
-#define MSGTR_PREFERENCES_SUB_Unicode "Unicode undertekst"
 #define MSGTR_PREFERENCES_SUB_MPSUB "Konverter en given undertekst til MPlayer's undertekst format"
 #define MSGTR_PREFERENCES_SUB_SRT "Konverter den angivne undertekst til et tidsbaseret SubViewer (SRT) format"
 #define MSGTR_PREFERENCES_SUB_Overlap "slå (til/fra) undertekst overlapning"
--- a/help/help_mp-el.h	Sun Jan 19 14:46:33 2014 +0000
+++ b/help/help_mp-el.h	Sun Jan 19 15:00:09 2014 +0000
@@ -464,7 +464,6 @@
 #define MSGTR_PREFERENCES_SUB_FPS "FPS:"
 #define MSGTR_PREFERENCES_SUB_POS "Θέση:"
 #define MSGTR_PREFERENCES_SUB_AutoLoad "Απενεργοποίηση αυτόματου φορτώματος υποτίτλων"
-#define MSGTR_PREFERENCES_SUB_Unicode "Unicode υπότιτλος"
 #define MSGTR_PREFERENCES_SUB_MPSUB "Μετατροπή εισαγόμενου υπότιτλου σε υπότιτλο τύπου MPlayer"
 #define MSGTR_PREFERENCES_SUB_SRT "Μετατροπή εισαγόμενου υπότιτλου σε υπότιτλο τύπο SubViewer(SRT)"
 #define MSGTR_PREFERENCES_SUB_Overlap "Εναλλαγή του overlapping υποτίτλου"
--- a/help/help_mp-en.h	Sun Jan 19 14:46:33 2014 +0000
+++ b/help/help_mp-en.h	Sun Jan 19 15:00:09 2014 +0000
@@ -743,7 +743,6 @@
 #define MSGTR_PREFERENCES_SUB_FPS "FPS:"
 #define MSGTR_PREFERENCES_SUB_POS "Position: "
 #define MSGTR_PREFERENCES_SUB_AutoLoad "Disable subtitle autoloading"
-#define MSGTR_PREFERENCES_SUB_Unicode "Unicode subtitle"
 #define MSGTR_PREFERENCES_SUB_MPSUB "Convert the given subtitle to MPlayer's subtitle format"
 #define MSGTR_PREFERENCES_SUB_SRT "Convert the given subtitle to the time based SubViewer (SRT) format"
 #define MSGTR_PREFERENCES_SUB_Overlap "Toggle subtitle overlapping"
--- a/help/help_mp-es.h	Sun Jan 19 14:46:33 2014 +0000
+++ b/help/help_mp-es.h	Sun Jan 19 15:00:09 2014 +0000
@@ -693,7 +693,6 @@
 #define MSGTR_PREFERENCES_SUB_FPS "FPS:"
 #define MSGTR_PREFERENCES_SUB_POS "Posición: "
 #define MSGTR_PREFERENCES_SUB_AutoLoad "Desactivar carga automática de subtítulos"
-#define MSGTR_PREFERENCES_SUB_Unicode "Subtítulo unicode"
 #define MSGTR_PREFERENCES_SUB_MPSUB "Convertir el subtítulo dado al formato de subtítulos de MPlayer"
 #define MSGTR_PREFERENCES_SUB_SRT "Convertir el subtítulo dado al formato basado en tiempo SubViewer (SRT)"
 #define MSGTR_PREFERENCES_SUB_Overlap "Superposición de subtitulos"
--- a/help/help_mp-fr.h	Sun Jan 19 14:46:33 2014 +0000
+++ b/help/help_mp-fr.h	Sun Jan 19 15:00:09 2014 +0000
@@ -830,7 +830,6 @@
 #define MSGTR_PREFERENCES_SUB_FPS "FPS :"
 #define MSGTR_PREFERENCES_SUB_POS "Position : "
 #define MSGTR_PREFERENCES_SUB_AutoLoad "Désactiver le chargement automatique des sous-titres"
-#define MSGTR_PREFERENCES_SUB_Unicode "Sous-titre en Unicode"
 #define MSGTR_PREFERENCES_SUB_MPSUB "Convertir le sous-titre au format MPlayer"
 #define MSGTR_PREFERENCES_SUB_SRT "Convertir le sous-titre au format SubViewer (SRT) basé sur le temps"
 #define MSGTR_PREFERENCES_SUB_Overlap "Bascule le recouvrement des sous-titres"
--- a/help/help_mp-hu.h	Sun Jan 19 14:46:33 2014 +0000
+++ b/help/help_mp-hu.h	Sun Jan 19 15:00:09 2014 +0000
@@ -679,7 +679,6 @@
 #define MSGTR_PREFERENCES_SUB_FPS "FPS:"
 #define MSGTR_PREFERENCES_SUB_POS "Pozíciója: "
 #define MSGTR_PREFERENCES_SUB_AutoLoad "Felirat automatikus betöltésének tiltása"
-#define MSGTR_PREFERENCES_SUB_Unicode "Unicode felirat"
 #define MSGTR_PREFERENCES_SUB_MPSUB "A film feliratának konvertálása MPlayer felirat formátumba"
 #define MSGTR_PREFERENCES_SUB_SRT "A film feliratának konvertálása SubViewer (SRT) formátumba"
 #define MSGTR_PREFERENCES_SUB_Overlap "Felirat átlapolás"
--- a/help/help_mp-it.h	Sun Jan 19 14:46:33 2014 +0000
+++ b/help/help_mp-it.h	Sun Jan 19 15:00:09 2014 +0000
@@ -676,7 +676,6 @@
 #define MSGTR_PREFERENCES_SUB_FPS "FPS:"
 #define MSGTR_PREFERENCES_SUB_POS "Posizione: "
 #define MSGTR_PREFERENCES_SUB_AutoLoad "Disattiva il caricamento automatico dei sottotitoli"
-#define MSGTR_PREFERENCES_SUB_Unicode "Sottotitoli unicode"
 #define MSGTR_PREFERENCES_SUB_MPSUB "Converti i sottotitoli nel formato sottotitolo di MPlayer"
 #define MSGTR_PREFERENCES_SUB_SRT "Converti i sottotitoli nel formato SubViewer (SRT) basato sul tempo"
 #define MSGTR_PREFERENCES_SUB_Overlap "Attiva/disattiva sovrapposizione sottotitoli"
--- a/help/help_mp-ja.h	Sun Jan 19 14:46:33 2014 +0000
+++ b/help/help_mp-ja.h	Sun Jan 19 15:00:09 2014 +0000
@@ -376,7 +376,6 @@
 #define MSGTR_PREFERENCES_SUB_FPS "FPS:"
 #define MSGTR_PREFERENCES_SUB_POS "位置: "
 #define MSGTR_PREFERENCES_SUB_AutoLoad "subtitle 自動読み込み無効"
-#define MSGTR_PREFERENCES_SUB_Unicode "Unicode サブタイトル"
 #define MSGTR_PREFERENCES_SUB_MPSUB "与えられたサブタイトルをMPLayerのサブタイトルフォーマットに変換"
 #define MSGTR_PREFERENCES_Font "フォント:"
 #define MSGTR_PREFERENCES_PostProcess "postprocessing 有効"
--- a/help/help_mp-ko.h	Sun Jan 19 14:46:33 2014 +0000
+++ b/help/help_mp-ko.h	Sun Jan 19 15:00:09 2014 +0000
@@ -457,7 +457,6 @@
 #define MSGTR_PREFERENCES_SUB_FPS "FPS:"
 #define MSGTR_PREFERENCES_SUB_POS "위치: "
 #define MSGTR_PREFERENCES_SUB_AutoLoad "자동으로 자막 열지 않기"
-#define MSGTR_PREFERENCES_SUB_Unicode "유니코드 자막"
 #define MSGTR_PREFERENCES_SUB_MPSUB "주어진 자막을 MPlayer용 자막 형식으로 바꿈"
 #define MSGTR_PREFERENCES_SUB_SRT "주어진 자막을 SRT 형식으로 바꿈"
 #define MSGTR_PREFERENCES_SUB_Overlap "자막 겹침 켜기"
--- a/help/help_mp-mk.h	Sun Jan 19 14:46:33 2014 +0000
+++ b/help/help_mp-mk.h	Sun Jan 19 15:00:09 2014 +0000
@@ -455,7 +455,6 @@
 #define MSGTR_PREFERENCES_SUB_FPS "FPS (Фрејмови Во Секунда):"
 #define MSGTR_PREFERENCES_SUB_POS "Позиција: "
 #define MSGTR_PREFERENCES_SUB_AutoLoad "Оневозможи го автоматското вчитување на преводот"
-#define MSGTR_PREFERENCES_SUB_Unicode "Повеќе-коден превод"
 #define MSGTR_PREFERENCES_SUB_MPSUB "Конвертирај ги дадените преводи во форматот за преводи на MPlayer"
 #define MSGTR_PREFERENCES_SUB_SRT "Конвертирај ги дадените преводи во форматот базиран на време SubViewer (SRT)"
 #define MSGTR_PREFERENCES_SUB_Overlap "Преместувај го преклопувањето на преводот"
--- a/help/help_mp-nl.h	Sun Jan 19 14:46:33 2014 +0000
+++ b/help/help_mp-nl.h	Sun Jan 19 15:00:09 2014 +0000
@@ -666,7 +666,6 @@
 #define MSGTR_PREFERENCES_SUB_FPS "FPS:"
 #define MSGTR_PREFERENCES_SUB_POS "Positie: "
 #define MSGTR_PREFERENCES_SUB_AutoLoad "Geen automatisch laden van ondertiteling"
-#define MSGTR_PREFERENCES_SUB_Unicode "Unicode ondertiteling"
 #define MSGTR_PREFERENCES_SUB_MPSUB "Converteer de gegeven ondertiteling naar MPlayer's ondertitelingsformaat"
 #define MSGTR_PREFERENCES_SUB_SRT "Converteer de gegeven ondertiteling naar het tijdsgebaseerde SubViewer(SRT) formaat"
 #define MSGTR_PREFERENCES_SUB_Overlap "Activeer/deactiveer ondertitel overlapping"
--- a/help/help_mp-pl.h	Sun Jan 19 14:46:33 2014 +0000
+++ b/help/help_mp-pl.h	Sun Jan 19 15:00:09 2014 +0000
@@ -799,7 +799,6 @@
 #define MSGTR_PREFERENCES_SUB_FPS "FPS:"
 #define MSGTR_PREFERENCES_SUB_POS "Pozycja: "
 #define MSGTR_PREFERENCES_SUB_AutoLoad "Wyłącz automatycznie wczytywanie napisów"
-#define MSGTR_PREFERENCES_SUB_Unicode "Napisy w Unicode"
 #define MSGTR_PREFERENCES_SUB_MPSUB "Konwertuj wybrane napisy na format MPlayer"
 #define MSGTR_PREFERENCES_SUB_SRT "Konwertuj wybrane napisy na oparty na czasie format SubViewer (SRT)"
 #define MSGTR_PREFERENCES_SUB_Overlap "Włącz nakładanie się napisów"
--- a/help/help_mp-pt_BR.h	Sun Jan 19 14:46:33 2014 +0000
+++ b/help/help_mp-pt_BR.h	Sun Jan 19 15:00:09 2014 +0000
@@ -460,7 +460,6 @@
 #define MSGTR_PREFERENCES_SUB_FPS "FPS:"
 #define MSGTR_PREFERENCES_SUB_POS "Posição: "
 #define MSGTR_PREFERENCES_SUB_AutoLoad "Desabilitar auto carregamento de legendas"
-#define MSGTR_PREFERENCES_SUB_Unicode "Legenda unicode"
 #define MSGTR_PREFERENCES_SUB_MPSUB "Converter a legenda dada para o formato de legenda do MPlayer"
 #define MSGTR_PREFERENCES_SUB_SRT "Converter a legenda dada para o formato baseado em tempo SubViewer (SRT)"
 #define MSGTR_PREFERENCES_SUB_Overlap "Sobreposição da legenda"
--- a/help/help_mp-ro.h	Sun Jan 19 14:46:33 2014 +0000
+++ b/help/help_mp-ro.h	Sun Jan 19 15:00:09 2014 +0000
@@ -403,7 +403,6 @@
 #define MSGTR_PREFERENCES_SUB_FPS "FPS:"
 #define MSGTR_PREFERENCES_SUB_POS "Pozitie: "
 #define MSGTR_PREFERENCES_SUB_AutoLoad "Fãrã auto-încãrcarea subtitrãrii"
-#define MSGTR_PREFERENCES_SUB_Unicode "Subtitrare Unicode"
 #define MSGTR_PREFERENCES_SUB_MPSUB "Converteºte subtitrarea datã la formatul MPlayer"
 #define MSGTR_PREFERENCES_SUB_SRT "Converteºte subtitrarea la formatul time based SubViewer (SRT)"
 #define MSGTR_PREFERENCES_SUB_Overlap "Alege suprapunerea subtitrarilor"
--- a/help/help_mp-ru.h	Sun Jan 19 14:46:33 2014 +0000
+++ b/help/help_mp-ru.h	Sun Jan 19 15:00:09 2014 +0000
@@ -668,7 +668,6 @@
 #define MSGTR_PREFERENCES_SUB_FPS "Кадр/сек:"
 #define MSGTR_PREFERENCES_SUB_POS "Позиция: "
 #define MSGTR_PREFERENCES_SUB_AutoLoad "Выключить автозагрузку субтитров"
-#define MSGTR_PREFERENCES_SUB_Unicode "Уникодовые субтитры"
 #define MSGTR_PREFERENCES_SUB_MPSUB "Конвертировать данные субтитры в MPlayer'овский формат субтитров"
 #define MSGTR_PREFERENCES_SUB_SRT "Конвертировать данные субтитры в основанный на времени SubViewer (SRT) формат"
 #define MSGTR_PREFERENCES_SUB_Overlap "Изменить перекрывание субтитров"
--- a/help/help_mp-sk.h	Sun Jan 19 14:46:33 2014 +0000
+++ b/help/help_mp-sk.h	Sun Jan 19 15:00:09 2014 +0000
@@ -783,7 +783,6 @@
 #define MSGTR_PREFERENCES_SUB_FPS "FPS:"
 #define MSGTR_PREFERENCES_SUB_POS "Pozícia: "
 #define MSGTR_PREFERENCES_SUB_AutoLoad "Zakázať automatické nahrávanie titulkov"
-#define MSGTR_PREFERENCES_SUB_Unicode "Titulky v Unicode"
 #define MSGTR_PREFERENCES_SUB_MPSUB "Konvertovať dané titulky do MPlayer formátu"
 #define MSGTR_PREFERENCES_SUB_SRT "Konvertovať dané titulky do časovo-určeného SubViewer (SRT) formátu"
 #define MSGTR_PREFERENCES_SUB_Overlap "Zapnúť prekrývanie titulkov"
--- a/help/help_mp-sv.h	Sun Jan 19 14:46:33 2014 +0000
+++ b/help/help_mp-sv.h	Sun Jan 19 15:00:09 2014 +0000
@@ -681,7 +681,6 @@
 #define MSGTR_PREFERENCES_SUB_FPS "FPS:"
 #define MSGTR_PREFERENCES_SUB_POS "Position: "
 #define MSGTR_PREFERENCES_SUB_AutoLoad "Deaktivera automatisk laddning av textning"
-#define MSGTR_PREFERENCES_SUB_Unicode "Unicodetextning"
 #define MSGTR_PREFERENCES_SUB_MPSUB "Konvertera given text till MPlayers egna textningsformat"
 #define MSGTR_PREFERENCES_SUB_SRT "Konvertera given text till det tidbaserade SubViewer (SRT) formatet"
 #define MSGTR_PREFERENCES_SUB_Overlap "Aktivera textningsöverlappning"
--- a/help/help_mp-tr.h	Sun Jan 19 14:46:33 2014 +0000
+++ b/help/help_mp-tr.h	Sun Jan 19 15:00:09 2014 +0000
@@ -844,7 +844,6 @@
 #define MSGTR_PREFERENCES_SUB_FPS "FPS:"
 #define MSGTR_PREFERENCES_SUB_POS "Konum: "
 #define MSGTR_PREFERENCES_SUB_AutoLoad "Altyazı otomatik yüklemesini kapat"
-#define MSGTR_PREFERENCES_SUB_Unicode "Unicode altyazı"
 #define MSGTR_PREFERENCES_SUB_MPSUB "Mevcut altyazıyı MPlayer'ın altyazı biçimine çevir"
 #define MSGTR_PREFERENCES_SUB_SRT "Mevcut altyazıyı zaman tabanlı SubViewer (SRT) biçimine çevir"
 #define MSGTR_PREFERENCES_SUB_Overlap "Altyazı bindirmesini sabitle"
--- a/help/help_mp-uk.h	Sun Jan 19 14:46:33 2014 +0000
+++ b/help/help_mp-uk.h	Sun Jan 19 15:00:09 2014 +0000
@@ -661,7 +661,6 @@
 #define MSGTR_PREFERENCES_SUB_FPS "к/c:"
 #define MSGTR_PREFERENCES_SUB_POS "Положення: "
 #define MSGTR_PREFERENCES_SUB_AutoLoad "Заборонити автозавантаження субтитрів"
-#define MSGTR_PREFERENCES_SUB_Unicode "Unicode субтитри"
 #define MSGTR_PREFERENCES_SUB_MPSUB "Перетворити вказані субтитри до формату MPlayer"
 #define MSGTR_PREFERENCES_SUB_SRT "Перетворити вказані субтитри до формату SubViewer (SRT)"
 #define MSGTR_PREFERENCES_SUB_Overlap "Дозволити/заборонити перекриття субтитрів"
--- a/help/help_mp-zh_CN.h	Sun Jan 19 14:46:33 2014 +0000
+++ b/help/help_mp-zh_CN.h	Sun Jan 19 15:00:09 2014 +0000
@@ -743,7 +743,6 @@
 #define MSGTR_PREFERENCES_SUB_FPS "帧率:"
 #define MSGTR_PREFERENCES_SUB_POS "位置:"
 #define MSGTR_PREFERENCES_SUB_AutoLoad "禁止自动装载字幕"
-#define MSGTR_PREFERENCES_SUB_Unicode "Unicode 字幕"
 #define MSGTR_PREFERENCES_SUB_MPSUB "转换给定的字幕为 MPlayer 字幕格式"
 #define MSGTR_PREFERENCES_SUB_SRT "转换给定的字幕为基于时间戳的 SubViewer (SRT) 格式"
 #define MSGTR_PREFERENCES_SUB_Overlap "开关字幕重叠模式"
--- a/help/help_mp-zh_TW.h	Sun Jan 19 14:46:33 2014 +0000
+++ b/help/help_mp-zh_TW.h	Sun Jan 19 15:00:09 2014 +0000
@@ -817,7 +817,6 @@
 #define MSGTR_PREFERENCES_SUB_FPS "幀率:"
 #define MSGTR_PREFERENCES_SUB_POS "位置: "
 #define MSGTR_PREFERENCES_SUB_AutoLoad "停用字幕自動裝載"
-#define MSGTR_PREFERENCES_SUB_Unicode "Unicode 字幕"
 #define MSGTR_PREFERENCES_SUB_MPSUB "轉換給定的字幕成為 MPlayer 的字幕文件"
 #define MSGTR_PREFERENCES_SUB_SRT "轉換給定的字幕成為基于時間的 SubViewer (SRT) 格式"
 #define MSGTR_PREFERENCES_SUB_Overlap "啟/停用字幕重疊"