summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Grimm <git@e-tobi.net>2010-02-07 14:05:42 +0100
committerTobias Grimm <git@e-tobi.net>2010-02-08 02:01:01 +0100
commit2f957273a189408077e1c2ceb26aa4491d89677c (patch)
tree90c1f4cc4d19e253c5fbff7cb4adc9113ab3c769
parent64f69fddaa33fac5224a88b455b510ebb10ca79c (diff)
downloadvdr-plugin-ttxtsubs-2f957273a189408077e1c2ceb26aa4491d89677c.tar.gz
vdr-plugin-ttxtsubs-2f957273a189408077e1c2ceb26aa4491d89677c.tar.bz2
Dropped text position settings
-rw-r--r--HISTORY2
-rw-r--r--po/ca_ES.po72
-rw-r--r--po/de_DE.po54
-rw-r--r--po/es_ES.po72
-rw-r--r--po/fi_FI.po72
-rw-r--r--po/fr_FR.po72
-rw-r--r--po/it_IT.po72
-rw-r--r--po/ru_RU.po72
-rw-r--r--po/sv_SE.po72
-rw-r--r--po/uk_UA.po72
-rw-r--r--ttxtsubs.c37
-rw-r--r--ttxtsubsglobals.h12
12 files changed, 49 insertions, 632 deletions
diff --git a/HISTORY b/HISTORY
index bb163fb..a965ca6 100644
--- a/HISTORY
+++ b/HISTORY
@@ -14,7 +14,7 @@ VDR Plugin 'ttxtsubs' Revision History
- Show colored subtitles if color information is provided e.g. for
different speakers and dropped custom color settings (Closes #61)
- Position subtitles always centered at the bottom, independent of the
- OSD resolution (Closes #231)
+ OSD resolution and dropped custom text position settings (Closes #231)
- Render subtitles outlined (Closes #51)
2009-04-26: Version 0.1.0
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 7d453e9..c94bf07 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <author>\n"
-"POT-Creation-Date: 2010-02-07 13:47+0100\n"
+"POT-Creation-Date: 2010-02-07 14:01+0100\n"
"PO-Revision-Date: 2007-08-24 23:49+0300\n"
"Last-Translator: Jordi Vil <jvila@tinet.org>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -26,11 +26,8 @@ msgstr "Amaga subttols teletext"
msgid "Display teletext subtitles"
msgstr "Visualitza subttols teletext"
-msgid "Position Teletext Subtitles for 4:3/Anamorph"
-msgstr "Posiciona subttols teletext per a 4:3/anamrfic"
-
-msgid "Position Teletext Subtitles for Letterbox"
-msgstr "Posiciona subttols teletext per a Letterbox"
+msgid "deprecated"
+msgstr ""
msgid "Page Selection"
msgstr "Selecci pgina subttols"
@@ -38,21 +35,13 @@ msgstr "Selecci pgina subttols"
msgid "Display on/off"
msgstr "Visualitza si/no"
-msgid "4:3/Letterbox"
+#, fuzzy
+msgid "4:3/Letterbox (deprecated)"
msgstr "4:3/Letterbox"
msgid "Page Mode"
msgstr "Modalitat pgina"
-msgid "Left"
-msgstr "Esquerra"
-
-msgid "Center"
-msgstr "Centre"
-
-msgid "Right"
-msgstr "Dreta"
-
msgid "All"
msgstr "Totes"
@@ -83,24 +72,6 @@ msgstr "Retard en reproducci (TS)"
msgid "Main Menu Alternative"
msgstr "Alternativa del men principal"
-msgid "Text Horizontal Position"
-msgstr "Posici horitzontal del text "
-
-msgid "Text Vertical Position"
-msgstr "Posicin vertical del text"
-
-msgid "4:3/Anamorph"
-msgstr "4:3/Anamrfic"
-
-msgid "Letterbox"
-msgstr "Letterbox"
-
-msgid "Text Vertical Adjust"
-msgstr "Ajustament vertical del text"
-
-msgid "Line Spacing Adjust"
-msgstr "Ajustament distancia entre lnies"
-
msgid "Workaround for some French chns"
msgstr "Correcci per a canals francesos"
@@ -133,36 +104,3 @@ msgstr "Modalitat subttols"
msgid "Manual Subtitle Page"
msgstr "Pgina manual subttols"
-
-#~ msgid "Position Teletext Subtitles for 4:3/Anamorph"
-#~ msgstr "Posiciona subttols teletext per a 4:3/anamrfic"
-
-#~ msgid "Position Teletext Subtitles for Letterbox"
-#~ msgstr "Posiciona subttols teletext per a Letterbox"
-
-#~ msgid "Left"
-#~ msgstr "Esquerra"
-
-#~ msgid "Center"
-#~ msgstr "Centre"
-
-#~ msgid "Right"
-#~ msgstr "Dreta"
-
-#~ msgid "Text Horizontal Position"
-#~ msgstr "Posici horitzontal del text "
-
-#~ msgid "Text Vertical Position"
-#~ msgstr "Posicin vertical del text"
-
-#~ msgid "4:3/Anamorph"
-#~ msgstr "4:3/Anamrfic"
-
-#~ msgid "Letterbox"
-#~ msgstr "Letterbox"
-
-#~ msgid "Text Vertical Adjust"
-#~ msgstr "Ajustament vertical del text"
-
-#~ msgid "Line Spacing Adjust"
-#~ msgstr "Ajustament distancia entre lnies"
diff --git a/po/de_DE.po b/po/de_DE.po
index 3e0b7e9..1591b56 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <author>\n"
-"POT-Creation-Date: 2010-02-07 13:47+0100\n"
+"POT-Creation-Date: 2010-02-07 14:01+0100\n"
"PO-Revision-Date: 2007-08-24 23:49+0300\n"
"Last-Translator: Klaus Schmidinger <Klaus.Schmidinger@tvdr.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -24,11 +24,8 @@ msgstr "Verstecke Videotextuntertitel"
msgid "Display teletext subtitles"
msgstr "Zeige Videotextuntertitel"
-msgid "Position Teletext Subtitles for 4:3/Anamorph"
-msgstr "Positioniere Videotext-Untertitel fr 4:3/Anamorph"
-
-msgid "Position Teletext Subtitles for Letterbox"
-msgstr "Positioniere Videotext-Untertitel fr Letterbox"
+msgid "deprecated"
+msgstr ""
msgid "Page Selection"
msgstr "Seitenauswahl"
@@ -36,21 +33,13 @@ msgstr "Seitenauswahl"
msgid "Display on/off"
msgstr "Anzeige ein/aus"
-msgid "4:3/Letterbox"
+#, fuzzy
+msgid "4:3/Letterbox (deprecated)"
msgstr "4:3/Letterbox"
msgid "Page Mode"
msgstr "Seitenmodus"
-msgid "Left"
-msgstr "Links"
-
-msgid "Center"
-msgstr "Mitte"
-
-msgid "Right"
-msgstr "Rechts"
-
msgid "All"
msgstr "Alle"
@@ -81,24 +70,6 @@ msgstr "Wiedergabe Verzgerung (TS)"
msgid "Main Menu Alternative"
msgstr "Hauptmenu Alternative"
-msgid "Text Horizontal Position"
-msgstr "Horizontale Textposition"
-
-msgid "Text Vertical Position"
-msgstr "Vertikale Textposition"
-
-msgid "4:3/Anamorph"
-msgstr "4:3/Anamorph"
-
-msgid "Letterbox"
-msgstr "Letterbox"
-
-msgid "Text Vertical Adjust"
-msgstr "Text vertikal verschieben"
-
-msgid "Line Spacing Adjust"
-msgstr "Zeilenabstand einstellen"
-
msgid "Workaround for some French chns"
msgstr "Workaround fr franzsische Kanle"
@@ -131,18 +102,3 @@ msgstr "Untertitelmodus"
msgid "Manual Subtitle Page"
msgstr "Manuelle Untertitelseite"
-
-#~ msgid "Position Teletext Subtitles for 4:3/Anamorph"
-#~ msgstr "Positioniere Videotext-Untertitel fr 4:3/Anamorph"
-
-#~ msgid "Position Teletext Subtitles for Letterbox"
-#~ msgstr "Positioniere Videotext-Untertitel fr Letterbox"
-
-#~ msgid "Left"
-#~ msgstr "Links"
-
-#~ msgid "Center"
-#~ msgstr "Mitte"
-
-#~ msgid "Right"
-#~ msgstr "Rechts"
diff --git a/po/es_ES.po b/po/es_ES.po
index 0e9f7a5..b2bc4eb 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <author>\n"
-"POT-Creation-Date: 2010-02-07 13:47+0100\n"
+"POT-Creation-Date: 2010-02-07 14:01+0100\n"
"PO-Revision-Date: 2007-08-24 23:49+0300\n"
"Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -24,11 +24,8 @@ msgstr "Esconde subttulos teletexto"
msgid "Display teletext subtitles"
msgstr "Visualiza subttulos teletexto"
-msgid "Position Teletext Subtitles for 4:3/Anamorph"
-msgstr "Posiciona subttulos teletexto para 4:3/anamrfico"
-
-msgid "Position Teletext Subtitles for Letterbox"
-msgstr "Posicina subttulos teletexto para Letterbox"
+msgid "deprecated"
+msgstr ""
msgid "Page Selection"
msgstr "Seleccin pgina subttulos"
@@ -36,21 +33,13 @@ msgstr "Seleccin pgina subttulos"
msgid "Display on/off"
msgstr "Visualiza s/no"
-msgid "4:3/Letterbox"
+#, fuzzy
+msgid "4:3/Letterbox (deprecated)"
msgstr "4:3/Letterbox"
msgid "Page Mode"
msgstr "Modo pgina"
-msgid "Left"
-msgstr "Izquierda"
-
-msgid "Center"
-msgstr "Centro"
-
-msgid "Right"
-msgstr "Derecha"
-
msgid "All"
msgstr "Todas"
@@ -81,24 +70,6 @@ msgstr "Retardo en reproduccin (TS)"
msgid "Main Menu Alternative"
msgstr "Alternativa del men principal"
-msgid "Text Horizontal Position"
-msgstr "Posicin horizontal del texto"
-
-msgid "Text Vertical Position"
-msgstr "Posicin vertical del texto"
-
-msgid "4:3/Anamorph"
-msgstr "4:3/Anamrfico"
-
-msgid "Letterbox"
-msgstr "Letterbox"
-
-msgid "Text Vertical Adjust"
-msgstr "Ajuste vertical del texto"
-
-msgid "Line Spacing Adjust"
-msgstr "Ajuste distancia entre lneas"
-
msgid "Workaround for some French chns"
msgstr "Correccin para canales franceses"
@@ -131,36 +102,3 @@ msgstr "Modo subttulos"
msgid "Manual Subtitle Page"
msgstr "Pgina manual subttulos"
-
-#~ msgid "Position Teletext Subtitles for 4:3/Anamorph"
-#~ msgstr "Posiciona subttulos teletexto para 4:3/anamrfico"
-
-#~ msgid "Position Teletext Subtitles for Letterbox"
-#~ msgstr "Posicina subttulos teletexto para Letterbox"
-
-#~ msgid "Left"
-#~ msgstr "Izquierda"
-
-#~ msgid "Center"
-#~ msgstr "Centro"
-
-#~ msgid "Right"
-#~ msgstr "Derecha"
-
-#~ msgid "Text Horizontal Position"
-#~ msgstr "Posicin horizontal del texto"
-
-#~ msgid "Text Vertical Position"
-#~ msgstr "Posicin vertical del texto"
-
-#~ msgid "4:3/Anamorph"
-#~ msgstr "4:3/Anamrfico"
-
-#~ msgid "Letterbox"
-#~ msgstr "Letterbox"
-
-#~ msgid "Text Vertical Adjust"
-#~ msgstr "Ajuste vertical del texto"
-
-#~ msgid "Line Spacing Adjust"
-#~ msgstr "Ajuste distancia entre lneas"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 1885676..ea89541 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <author>\n"
-"POT-Creation-Date: 2010-02-07 13:47+0100\n"
+"POT-Creation-Date: 2010-02-07 14:01+0100\n"
"PO-Revision-Date: 2007-08-24 23:49+0300\n"
"Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -27,11 +27,8 @@ msgstr "Piilota tekstitys (Teksti-TV)"
msgid "Display teletext subtitles"
msgstr "Nyt tekstitys (Teksti-TV)"
-msgid "Position Teletext Subtitles for 4:3/Anamorph"
-msgstr "4:3/Anamorfinen tekstitys (Teksti-TV)"
-
-msgid "Position Teletext Subtitles for Letterbox"
-msgstr "Letterbox tekstitys (Teksti-TV)"
+msgid "deprecated"
+msgstr ""
msgid "Page Selection"
msgstr "Tekstityssivun valinta"
@@ -39,21 +36,13 @@ msgstr "Tekstityssivun valinta"
msgid "Display on/off"
msgstr "aktivointi"
-msgid "4:3/Letterbox"
+#, fuzzy
+msgid "4:3/Letterbox (deprecated)"
msgstr "kuvasuhde"
msgid "Page Mode"
msgstr "sivun valinta"
-msgid "Left"
-msgstr "vasen"
-
-msgid "Center"
-msgstr "keskit"
-
-msgid "Right"
-msgstr "oikea"
-
msgid "All"
msgstr "kaikki"
@@ -84,24 +73,6 @@ msgstr "Viive toistossa (TS)"
msgid "Main Menu Alternative"
msgstr "Pvalikon toiminnot"
-msgid "Text Horizontal Position"
-msgstr "Vaakatasaus"
-
-msgid "Text Vertical Position"
-msgstr "Pystytasaus"
-
-msgid "4:3/Anamorph"
-msgstr "4:3/anamorfinen"
-
-msgid "Letterbox"
-msgstr "letterbox"
-
-msgid "Text Vertical Adjust"
-msgstr "Pystytasauksen hienost"
-
-msgid "Line Spacing Adjust"
-msgstr "Rivivlin hienost"
-
msgid "Workaround for some French chns"
msgstr "Ranskalainen silmnknttemppu"
@@ -134,36 +105,3 @@ msgstr "Tekstitystapa"
msgid "Manual Subtitle Page"
msgstr "Asetettu tekstityssivu"
-
-#~ msgid "Position Teletext Subtitles for 4:3/Anamorph"
-#~ msgstr "4:3/Anamorfinen tekstitys (Teksti-TV)"
-
-#~ msgid "Position Teletext Subtitles for Letterbox"
-#~ msgstr "Letterbox tekstitys (Teksti-TV)"
-
-#~ msgid "Left"
-#~ msgstr "vasen"
-
-#~ msgid "Center"
-#~ msgstr "keskit"
-
-#~ msgid "Right"
-#~ msgstr "oikea"
-
-#~ msgid "Text Horizontal Position"
-#~ msgstr "Vaakatasaus"
-
-#~ msgid "Text Vertical Position"
-#~ msgstr "Pystytasaus"
-
-#~ msgid "4:3/Anamorph"
-#~ msgstr "4:3/anamorfinen"
-
-#~ msgid "Letterbox"
-#~ msgstr "letterbox"
-
-#~ msgid "Text Vertical Adjust"
-#~ msgstr "Pystytasauksen hienost"
-
-#~ msgid "Line Spacing Adjust"
-#~ msgstr "Rivivlin hienost"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 44dd4f0..642f8b4 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <author>\n"
-"POT-Creation-Date: 2010-02-07 13:47+0100\n"
+"POT-Creation-Date: 2010-02-07 14:01+0100\n"
"PO-Revision-Date: 2009-01-04 19:05+0100\n"
"Last-Translator: Nival Michaël\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -27,11 +27,8 @@ msgstr "Masquer le sous-titrage"
msgid "Display teletext subtitles"
msgstr "Afficher le sous-titrage"
-msgid "Position Teletext Subtitles for 4:3/Anamorph"
-msgstr "Position du sous-titrage pour 4:3/Anamorph"
-
-msgid "Position Teletext Subtitles for Letterbox"
-msgstr "Position du sous-titrage pour Letterbox"
+msgid "deprecated"
+msgstr ""
msgid "Page Selection"
msgstr "Page de sélection"
@@ -39,21 +36,13 @@ msgstr "Page de sélection"
msgid "Display on/off"
msgstr "Affichage"
-msgid "4:3/Letterbox"
+#, fuzzy
+msgid "4:3/Letterbox (deprecated)"
msgstr "4:3/Letterbox"
msgid "Page Mode"
msgstr "Mode page"
-msgid "Left"
-msgstr "Gauche"
-
-msgid "Center"
-msgstr "Centre"
-
-msgid "Right"
-msgstr "Droite"
-
msgid "All"
msgstr "Tous"
@@ -84,24 +73,6 @@ msgstr "Delai à la lecture (TS)"
msgid "Main Menu Alternative"
msgstr "Choix du menu principal"
-msgid "Text Horizontal Position"
-msgstr "Position horizontale du texte"
-
-msgid "Text Vertical Position"
-msgstr "Position verticale du texte"
-
-msgid "4:3/Anamorph"
-msgstr "4:3/Anamorph"
-
-msgid "Letterbox"
-msgstr "Letterbox"
-
-msgid "Text Vertical Adjust"
-msgstr "Ajustement vertical du texte"
-
-msgid "Line Spacing Adjust"
-msgstr "Espacement des lignes"
-
msgid "Workaround for some French chns"
msgstr "Contournement chaînes françaises"
@@ -134,36 +105,3 @@ msgstr "Mode de sous-titres TXT"
msgid "Manual Subtitle Page"
msgstr "Page des sous-titres"
-
-#~ msgid "Position Teletext Subtitles for 4:3/Anamorph"
-#~ msgstr "Position du sous-titrage pour 4:3/Anamorph"
-
-#~ msgid "Position Teletext Subtitles for Letterbox"
-#~ msgstr "Position du sous-titrage pour Letterbox"
-
-#~ msgid "Left"
-#~ msgstr "Gauche"
-
-#~ msgid "Center"
-#~ msgstr "Centre"
-
-#~ msgid "Right"
-#~ msgstr "Droite"
-
-#~ msgid "Text Horizontal Position"
-#~ msgstr "Position horizontale du texte"
-
-#~ msgid "Text Vertical Position"
-#~ msgstr "Position verticale du texte"
-
-#~ msgid "4:3/Anamorph"
-#~ msgstr "4:3/Anamorph"
-
-#~ msgid "Letterbox"
-#~ msgstr "Letterbox"
-
-#~ msgid "Text Vertical Adjust"
-#~ msgstr "Ajustement vertical du texte"
-
-#~ msgid "Line Spacing Adjust"
-#~ msgstr "Espacement des lignes"
diff --git a/po/it_IT.po b/po/it_IT.po
index 21579fc..e7f8966 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <author>\n"
-"POT-Creation-Date: 2010-02-07 13:47+0100\n"
+"POT-Creation-Date: 2010-02-07 14:01+0100\n"
"PO-Revision-Date: 2008-12-20 19:51+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -28,11 +28,8 @@ msgstr "Nascondi sottotitoli teletext"
msgid "Display teletext subtitles"
msgstr "Visualizza sottotitoli teletext"
-msgid "Position Teletext Subtitles for 4:3/Anamorph"
-msgstr "Posizione sottotitoli per 4:3/Anamorfico"
-
-msgid "Position Teletext Subtitles for Letterbox"
-msgstr "Posizione sottotitoli per Letterbox"
+msgid "deprecated"
+msgstr ""
msgid "Page Selection"
msgstr "Selezione pagina"
@@ -40,21 +37,13 @@ msgstr "Selezione pagina"
msgid "Display on/off"
msgstr "Visualizza sì/no"
-msgid "4:3/Letterbox"
+#, fuzzy
+msgid "4:3/Letterbox (deprecated)"
msgstr "4:3/Letterbox"
msgid "Page Mode"
msgstr "Mod. pagina"
-msgid "Left"
-msgstr "Sinistra"
-
-msgid "Center"
-msgstr "Centro"
-
-msgid "Right"
-msgstr "Destra"
-
msgid "All"
msgstr "Tutte"
@@ -85,24 +74,6 @@ msgstr "Ritardo mod. riproduzione (TS)"
msgid "Main Menu Alternative"
msgstr "Voci alternative menu princ."
-msgid "Text Horizontal Position"
-msgstr "Posizione testo orizzontale"
-
-msgid "Text Vertical Position"
-msgstr "Posizione testo verticale"
-
-msgid "4:3/Anamorph"
-msgstr "4:3/anamorfico"
-
-msgid "Letterbox"
-msgstr "Letterbox"
-
-msgid "Text Vertical Adjust"
-msgstr "Correzione testo verticale"
-
-msgid "Line Spacing Adjust"
-msgstr "Correzione interlinea"
-
msgid "Workaround for some French chns"
msgstr "Correzione per canali francesi"
@@ -135,36 +106,3 @@ msgstr "Mod. sottotitoli"
msgid "Manual Subtitle Page"
msgstr "Pagina manuale sottotitoli"
-
-#~ msgid "Position Teletext Subtitles for 4:3/Anamorph"
-#~ msgstr "Posizione sottotitoli per 4:3/Anamorfico"
-
-#~ msgid "Position Teletext Subtitles for Letterbox"
-#~ msgstr "Posizione sottotitoli per Letterbox"
-
-#~ msgid "Left"
-#~ msgstr "Sinistra"
-
-#~ msgid "Center"
-#~ msgstr "Centro"
-
-#~ msgid "Right"
-#~ msgstr "Destra"
-
-#~ msgid "Text Horizontal Position"
-#~ msgstr "Posizione testo orizzontale"
-
-#~ msgid "Text Vertical Position"
-#~ msgstr "Posizione testo verticale"
-
-#~ msgid "4:3/Anamorph"
-#~ msgstr "4:3/anamorfico"
-
-#~ msgid "Letterbox"
-#~ msgstr "Letterbox"
-
-#~ msgid "Text Vertical Adjust"
-#~ msgstr "Correzione testo verticale"
-
-#~ msgid "Line Spacing Adjust"
-#~ msgstr "Correzione interlinea"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 1dd559b..52ee99b 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <author>\n"
-"POT-Creation-Date: 2010-02-07 13:47+0100\n"
+"POT-Creation-Date: 2010-02-07 14:01+0100\n"
"PO-Revision-Date: 2008-12-30 14:05+0100\n"
"Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -24,11 +24,8 @@ msgstr " "
msgid "Display teletext subtitles"
msgstr " "
-msgid "Position Teletext Subtitles for 4:3/Anamorph"
-msgstr " 4:3"
-
-msgid "Position Teletext Subtitles for Letterbox"
-msgstr " "
+msgid "deprecated"
+msgstr ""
msgid "Page Selection"
msgstr " "
@@ -36,21 +33,13 @@ msgstr " "
msgid "Display on/off"
msgstr "/"
-msgid "4:3/Letterbox"
+#, fuzzy
+msgid "4:3/Letterbox (deprecated)"
msgstr "4:3/ "
msgid "Page Mode"
msgstr " "
-msgid "Left"
-msgstr ""
-
-msgid "Center"
-msgstr " "
-
-msgid "Right"
-msgstr ""
-
msgid "All"
msgstr ""
@@ -81,24 +70,6 @@ msgstr " (TS)"
msgid "Main Menu Alternative"
msgstr " "
-msgid "Text Horizontal Position"
-msgstr " "
-
-msgid "Text Vertical Position"
-msgstr " "
-
-msgid "4:3/Anamorph"
-msgstr "4:3"
-
-msgid "Letterbox"
-msgstr " "
-
-msgid "Text Vertical Adjust"
-msgstr " "
-
-msgid "Line Spacing Adjust"
-msgstr " "
-
msgid "Workaround for some French chns"
msgstr ". . "
@@ -131,36 +102,3 @@ msgstr " "
msgid "Manual Subtitle Page"
msgstr " "
-
-#~ msgid "Position Teletext Subtitles for 4:3/Anamorph"
-#~ msgstr " 4:3"
-
-#~ msgid "Position Teletext Subtitles for Letterbox"
-#~ msgstr " "
-
-#~ msgid "Left"
-#~ msgstr ""
-
-#~ msgid "Center"
-#~ msgstr " "
-
-#~ msgid "Right"
-#~ msgstr ""
-
-#~ msgid "Text Horizontal Position"
-#~ msgstr " "
-
-#~ msgid "Text Vertical Position"
-#~ msgstr " "
-
-#~ msgid "4:3/Anamorph"
-#~ msgstr "4:3"
-
-#~ msgid "Letterbox"
-#~ msgstr " "
-
-#~ msgid "Text Vertical Adjust"
-#~ msgstr " "
-
-#~ msgid "Line Spacing Adjust"
-#~ msgstr " "
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 1b82c40..c71db0c 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <author>\n"
-"POT-Creation-Date: 2010-02-07 13:47+0100\n"
+"POT-Creation-Date: 2010-02-07 14:01+0100\n"
"PO-Revision-Date: 2007-08-24 23:49+0300\n"
"Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -25,11 +25,8 @@ msgstr "Gm textning (Text-TV)"
msgid "Display teletext subtitles"
msgstr "Visa textning (Text-TV)"
-msgid "Position Teletext Subtitles for 4:3/Anamorph"
-msgstr "Textning fr 4:3/anamorf (Text-TV)"
-
-msgid "Position Teletext Subtitles for Letterbox"
-msgstr "Textning fr brevldeformat (Text-TV)"
+msgid "deprecated"
+msgstr ""
msgid "Page Selection"
msgstr ""
@@ -37,21 +34,13 @@ msgstr ""
msgid "Display on/off"
msgstr "Visa textning p/av"
-msgid "4:3/Letterbox"
+#, fuzzy
+msgid "4:3/Letterbox (deprecated)"
msgstr "4:3/brevldeformat"
msgid "Page Mode"
msgstr ""
-msgid "Left"
-msgstr "vnster"
-
-msgid "Center"
-msgstr "centrerad"
-
-msgid "Right"
-msgstr "hger"
-
msgid "All"
msgstr ""
@@ -82,24 +71,6 @@ msgstr ""
msgid "Main Menu Alternative"
msgstr "Huvudmenyalternativ"
-msgid "Text Horizontal Position"
-msgstr "Horisontell position"
-
-msgid "Text Vertical Position"
-msgstr "Vertikal positon"
-
-msgid "4:3/Anamorph"
-msgstr "4:3/anamorf"
-
-msgid "Letterbox"
-msgstr "brevldeformat"
-
-msgid "Text Vertical Adjust"
-msgstr "Vertikal justering"
-
-msgid "Line Spacing Adjust"
-msgstr "Radavstnd"
-
msgid "Workaround for some French chns"
msgstr "Fix fr vissa franska kanaler"
@@ -132,36 +103,3 @@ msgstr ""
msgid "Manual Subtitle Page"
msgstr ""
-
-#~ msgid "Position Teletext Subtitles for 4:3/Anamorph"
-#~ msgstr "Textning fr 4:3/anamorf (Text-TV)"
-
-#~ msgid "Position Teletext Subtitles for Letterbox"
-#~ msgstr "Textning fr brevldeformat (Text-TV)"
-
-#~ msgid "Left"
-#~ msgstr "vnster"
-
-#~ msgid "Center"
-#~ msgstr "centrerad"
-
-#~ msgid "Right"
-#~ msgstr "hger"
-
-#~ msgid "Text Horizontal Position"
-#~ msgstr "Horisontell position"
-
-#~ msgid "Text Vertical Position"
-#~ msgstr "Vertikal positon"
-
-#~ msgid "4:3/Anamorph"
-#~ msgstr "4:3/anamorf"
-
-#~ msgid "Letterbox"
-#~ msgstr "brevldeformat"
-
-#~ msgid "Text Vertical Adjust"
-#~ msgstr "Vertikal justering"
-
-#~ msgid "Line Spacing Adjust"
-#~ msgstr "Radavstnd"
diff --git a/po/uk_UA.po b/po/uk_UA.po
index d799b60..2e2ab25 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <author>\n"
-"POT-Creation-Date: 2010-02-07 13:47+0100\n"
+"POT-Creation-Date: 2010-02-07 14:01+0100\n"
"PO-Revision-Date: 2009-05-28 14:05+0100\n"
"Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -19,11 +19,8 @@ msgstr "Сховати субтитри"
msgid "Display teletext subtitles"
msgstr "Показувати субтитри"
-msgid "Position Teletext Subtitles for 4:3/Anamorph"
-msgstr "Субтитри для кадру 4:3"
-
-msgid "Position Teletext Subtitles for Letterbox"
-msgstr "Субтитри для широкого екрану"
+msgid "deprecated"
+msgstr ""
msgid "Page Selection"
msgstr "Вибір сторінки"
@@ -31,21 +28,13 @@ msgstr "Вибір сторінки"
msgid "Display on/off"
msgstr "включити/виключити"
-msgid "4:3/Letterbox"
+#, fuzzy
+msgid "4:3/Letterbox (deprecated)"
msgstr "4:3/широкий екран"
msgid "Page Mode"
msgstr "Режим сторінки"
-msgid "Left"
-msgstr "Зліва"
-
-msgid "Center"
-msgstr "по центру"
-
-msgid "Right"
-msgstr "справа"
-
msgid "All"
msgstr "Всі"
@@ -76,24 +65,6 @@ msgstr "Затримка Програвання (TS)"
msgid "Main Menu Alternative"
msgstr "Команда в головному меню"
-msgid "Text Horizontal Position"
-msgstr "Положення тексту по горизонталі"
-
-msgid "Text Vertical Position"
-msgstr "Положення тексту по вертикалі"
-
-msgid "4:3/Anamorph"
-msgstr "4:3"
-
-msgid "Letterbox"
-msgstr "Широкий екран"
-
-msgid "Text Vertical Adjust"
-msgstr "Вертикальний зсув тексту"
-
-msgid "Line Spacing Adjust"
-msgstr "Відстань між стрічками"
-
msgid "Workaround for some French chns"
msgstr "Спец. настройки для франц. каналів"
@@ -126,36 +97,3 @@ msgstr "Режим субтитрів"
msgid "Manual Subtitle Page"
msgstr "Ручной вибір сторінки"
-
-#~ msgid "Position Teletext Subtitles for 4:3/Anamorph"
-#~ msgstr "Субтитри для кадру 4:3"
-
-#~ msgid "Position Teletext Subtitles for Letterbox"
-#~ msgstr "Субтитри для широкого екрану"
-
-#~ msgid "Left"
-#~ msgstr "Зліва"
-
-#~ msgid "Center"
-#~ msgstr "по центру"
-
-#~ msgid "Right"
-#~ msgstr "справа"
-
-#~ msgid "Text Horizontal Position"
-#~ msgstr "Положення тексту по горизонталі"
-
-#~ msgid "Text Vertical Position"
-#~ msgstr "Положення тексту по вертикалі"
-
-#~ msgid "4:3/Anamorph"
-#~ msgstr "4:3"
-
-#~ msgid "Letterbox"
-#~ msgstr "Широкий екран"
-
-#~ msgid "Text Vertical Adjust"
-#~ msgstr "Вертикальний зсув тексту"
-
-#~ msgid "Line Spacing Adjust"
-#~ msgstr "Відстань між стрічками"
diff --git a/ttxtsubs.c b/ttxtsubs.c
index f91a544..f7731db 100644
--- a/ttxtsubs.c
+++ b/ttxtsubs.c
@@ -288,10 +288,7 @@ const char *cPluginTtxtsubs::MainMenuEntry(void)
else
return tr("Display teletext subtitles");
case 2:
- if(globals.mBottomLB)
- return tr("Position Teletext Subtitles for 4:3/Anamorph");
- else
- return tr("Position Teletext Subtitles for Letterbox");
+ return tr("deprecated");
case 3:
if (haveChannel) return tr("Page Selection");
default:
@@ -309,9 +306,6 @@ cOsdObject *cPluginTtxtsubs::MainMenuAction(void)
case 1:
globals.mRealDoDisplay = globals.mRealDoDisplay ? 0 : 1;
return NULL;
- case 2:
- globals.mBottomLB = globals.mBottomLB ? 0 : 1;
- return NULL;
case 3:
return new cTtxtsubsPageMenu();
default:
@@ -334,11 +328,7 @@ bool cPluginTtxtsubs::SetupParse(const char *Name, const char *Value)
else if(!strcasecmp(Name, "ReplayDelay")) globals.mReplayDelay = atoi(Value);
else if(!strcasecmp(Name, "ReplayTsDelay")) globals.mReplayTsDelay = atoi(Value);
else if(!strcasecmp(Name, "MainMenuEntry")) globals.mMainMenuEntry = atoi(Value);
- else if(!strcasecmp(Name, "TextPos")) globals.mTextPos = atoi(Value);
- else if(!strcasecmp(Name, "BottomLB")) globals.mBottomLB = atoi(Value);
- else if(!strcasecmp(Name, "BottomAdj")) globals.mBottomAdj = atoi(Value);
else if(!strcasecmp(Name, "FrenchSpecial")) globals.mFrenchSpecial = atoi(Value);
- else if(!strcasecmp(Name, "LineSpacing")) globals.mLineSpacing = atoi(Value);
else if(!strcasecmp(Name, "DvbSources")) globals.mDvbSources = atoi(Value);
else if(!strcasecmp(Name, "FontSize")) globals.mFontSize = atoi(Value);
else if(!strcasecmp(Name, "Languages")) parseLanguages(Value);
@@ -595,7 +585,6 @@ void cMenuSetupTtxtsubsLanguages::Store(void)
}
const char * mainMenuAlts[5] = {NULL, NULL, NULL, NULL, NULL};
-const char * textPosAlts[4];
const char * dvbSources[5];
cMenuSetupTtxtsubs::cMenuSetupTtxtsubs(cPluginTtxtsubs *ttxtsubs, int doStore)
@@ -604,27 +593,21 @@ cMenuSetupTtxtsubs::cMenuSetupTtxtsubs(cPluginTtxtsubs *ttxtsubs, int doStore)
mDoStore(doStore),
mConf(globals)
{
- //static char *mainMenuAlts[] = {"off", "Display on/off", "4:3/Letterbox", "This menu"};
+ //static char *mainMenuAlts[] = {"off", "Display on/off", "This menu"};
// can't get it to store changes in file
if(mainMenuAlts[0] == NULL) {
mainMenuAlts[0] = trVDR("off");
mainMenuAlts[1] = tr("Display on/off");
- mainMenuAlts[2] = tr("4:3/Letterbox");
+ mainMenuAlts[2] = tr("4:3/Letterbox (deprecated)");
mainMenuAlts[3] = tr("Page Mode");
mainMenuAlts[4] = NULL;
- textPosAlts[0] = tr("Left");
- textPosAlts[1] = tr("Center");
- textPosAlts[2] = tr("Right");
- textPosAlts[3] = NULL;
-
dvbSources[0] = tr("All");
dvbSources[1] = tr("Only DVB-S");
dvbSources[2] = tr("Only DVB-T");
dvbSources[3] = tr("Only DVB-C");
dvbSources[4] = NULL;
}
- const int numTextPosAlts = sizeof(textPosAlts) / sizeof(textPosAlts[0]) - 1;
const int numMainMenuAlts = sizeof(mainMenuAlts) / sizeof(mainMenuAlts[0]) - 1;
const int numDvbSources = sizeof(dvbSources) / sizeof(dvbSources[0]) - 1;
@@ -652,16 +635,6 @@ cMenuSetupTtxtsubs::cMenuSetupTtxtsubs(cPluginTtxtsubs *ttxtsubs, int doStore)
mConf.mMainMenuEntry = 0; // menu item segfaults if out of range
Add(new cMenuEditStraItem(tr("Main Menu Alternative"), &mConf.mMainMenuEntry,
numMainMenuAlts, mainMenuAlts));
- if(mConf.mTextPos < 0 || mConf.mTextPos >= numTextPosAlts)
- mConf.mTextPos = 0; // menu item segfaults if out of range
- Add(new cMenuEditStraItem(tr("Text Horizontal Position"), &mConf.mTextPos,
- numTextPosAlts, textPosAlts));
- Add(new cMenuEditBoolItem(tr("Text Vertical Position"),
- &mConf.mBottomLB, tr("4:3/Anamorph"), tr("Letterbox")));
- Add(new cMenuEditIntItem(tr("Text Vertical Adjust"),
- &mConf.mBottomAdj, -100, 45));
- Add(new cMenuEditIntItem( tr("Line Spacing Adjust"),
- &mConf.mLineSpacing, -25, 25));
Add(new cMenuEditBoolItem(tr("Workaround for some French chns"),
&mConf.mFrenchSpecial));
if(mConf.mDvbSources < 0 || mConf.mDvbSources >= numDvbSources)
@@ -722,12 +695,8 @@ void cMenuSetupTtxtsubs::Store(void)
SetupStore("LiveDelay", mConf.mLiveDelay);
SetupStore("ReplayDelay", mConf.mReplayDelay);
SetupStore("ReplayTsDelay", mConf.mReplayTsDelay);
- SetupStore("TextPos", mConf.mTextPos);
- SetupStore("BottomLB", mConf.mBottomLB);
- SetupStore("BottomAdj", mConf.mBottomAdj);
SetupStore("FrenchSpecial", mConf.mFrenchSpecial);
SetupStore("MainMenuEntry", mConf.mMainMenuEntry);
- SetupStore("LineSpacing", mConf.mLineSpacing);
SetupStore("DvbSources", mConf.mDvbSources);
SetupStore("FontSize", mConf.mFontSize);
diff --git a/ttxtsubsglobals.h b/ttxtsubsglobals.h
index ad75d52..093103a 100644
--- a/ttxtsubsglobals.h
+++ b/ttxtsubsglobals.h
@@ -39,11 +39,7 @@ class cTtxtsubsConf {
mRealDoDisplay =1;
mDoRecord = 1;
mMainMenuEntry = 0;
- mTextPos = 0;
- mBottomLB = 0;
- mBottomAdj = 0;
mFrenchSpecial = 0;
- mLineSpacing = 0;
mDvbSources = 0;
mFontSize = 20;
memset(mLanguages, 0, sizeof(mLanguages));
@@ -58,11 +54,7 @@ class cTtxtsubsConf {
int doDisplay(void) {return mRealDoDisplay;}
int doRecord(void) {return mDoRecord;}
int mainMenuEntry(void) {return mMainMenuEntry;}
- int textPos(void) {return mTextPos;}
- int bottomLB(void) {return mBottomLB;}
- int bottomAdj(void) {return mBottomAdj;}
int frenchSpecial(void) {return mFrenchSpecial;}
- int lineSpacing(void) {return mLineSpacing;}
int dvbSources(void) {return mDvbSources;}
int fontSize(void) {return mFontSize;}
char (*languages(void))[MAXLANGUAGES][2][4] {return &mLanguages;}
@@ -79,11 +71,7 @@ class cTtxtsubsConf {
int mRealDoDisplay;
int mDoRecord;
int mMainMenuEntry;
- int mTextPos;
- int mBottomLB;
- int mBottomAdj;
int mFrenchSpecial;
- int mLineSpacing;
int mDvbSources;
int mFontSize;
char mLanguages[MAXLANGUAGES][2][4];