Dropped custom color settings

author: Tobias Grimm <git@e-tobi.net> 2010-02-07 13:35:29 +0100
committer: Tobias Grimm <git@e-tobi.net> 2010-02-08 02:01:01 +0100
commit: 64f69fddaa33fac5224a88b455b510ebb10ca79c (patch)
tree: e46dfa07b4fd98372a7d4f2a5803910eeb7b3001
parent: ea984be181e286c39677684f901cc2d1990f5c54 (diff)
download: vdr-plugin-ttxtsubs-64f69fddaa33fac5224a88b455b510ebb10ca79c.tar.gz
vdr-plugin-ttxtsubs-64f69fddaa33fac5224a88b455b510ebb10ca79c.tar.bz2
12 files changed, 290 insertions, 564 deletions
diff --git a/HISTORY b/HISTORY
index 43a6118..bb163fb 100644
--- a/HISTORY
+++ b/HISTORY
@@ -12,7 +12,7 @@ VDR Plugin 'ttxtsubs' Revision History
   in the channels.conf - patch provided by Rolf Ahrenberg (tpid-v2)
   (references #139)
 - Show colored subtitles if color information is provided e.g. for
-  different speakers (Closes #61)
+  different speakers and dropped custom color settings (Closes #61)
 - Position subtitles always centered at the bottom, independent of the
   OSD resolution (Closes #231)
 - Render subtitles outlined (Closes #51)
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 0aaf8f7..7d453e9 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: 2009-04-21 23:45+0300\n"
+"POT-Creation-Date: 2010-02-07 13:47+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"
@@ -65,39 +65,6 @@ msgstr "Només DVB-T"
 msgid "Only DVB-C"
 msgstr "Només DVB-C"
 
-msgid "Black"
-msgstr "Negre"
-
-msgid "White"
-msgstr "Blanc"
-
-msgid "Red"
-msgstr "Vermell"
-
-msgid "Green"
-msgstr "Verd"
-
-msgid "Yellow"
-msgstr "Groc"
-
-msgid "Magenta"
-msgstr "Magenta"
-
-msgid "Blue"
-msgstr "Blau"
-
-msgid "Cyan"
-msgstr "Cian"
-
-msgid "Custom"
-msgstr "Personalitzat"
-
-msgid "Transparent"
-msgstr "Transparent"
-
-msgid "Grey"
-msgstr "Gris"
-
 msgid "Display Subtitles"
 msgstr "Visualitza subtítols"
 
@@ -143,27 +110,6 @@ msgstr "Selecció font DVB"
 msgid "Font Size (pixel)"
 msgstr ""
 
-msgid "Text Color"
-msgstr "Color del text"
-
-msgid "Background Color"
-msgstr "Color de fons"
-
-msgid "Custom Color"
-msgstr "Color personalitzat"
-
-msgid "Red Value"
-msgstr "Valor vermell"
-
-msgid "Green Value"
-msgstr "Valor vert"
-
-msgid "Blue Value"
-msgstr "Valor blau"
-
-msgid "Transparency Value"
-msgstr "Valor transparència"
-
 msgid "Language"
 msgstr "Idioma"
 
@@ -187,3 +133,36 @@ msgstr "Modalitat subtítols"
 
 msgid "Manual Subtitle Page"
 msgstr "Pàgina manual subtítols"
+
+#~ msgid "Position Teletext Subtitles for 4:3/Anamorph"
+#~ msgstr "Posiciona subtítols teletext per a 4:3/anamòrfic"
+
+#~ msgid "Position Teletext Subtitles for Letterbox"
+#~ msgstr "Posiciona subtítols 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 "Posición vertical del text"
+
+#~ msgid "4:3/Anamorph"
+#~ msgstr "4:3/Anamòrfic"
+
+#~ msgid "Letterbox"
+#~ msgstr "Letterbox"
+
+#~ msgid "Text Vertical Adjust"
+#~ msgstr "Ajustament vertical del text"
+
+#~ msgid "Line Spacing Adjust"
+#~ msgstr "Ajustament distancia entre línies"
diff --git a/po/de_DE.po b/po/de_DE.po
index cc5bde7..3e0b7e9 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: 2009-04-21 23:45+0300\n"
+"POT-Creation-Date: 2010-02-07 13:47+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"
@@ -63,39 +63,6 @@ msgstr "Nur DVB-T"
 msgid "Only DVB-C"
 msgstr "Nur DVB-C"
 
-msgid "Black"
-msgstr "Schwarz"
-
-msgid "White"
-msgstr "Weiss"
-
-msgid "Red"
-msgstr "Rot"
-
-msgid "Green"
-msgstr "Grün"
-
-msgid "Yellow"
-msgstr "Gelb"
-
-msgid "Magenta"
-msgstr "Magenta"
-
-msgid "Blue"
-msgstr "Blau"
-
-msgid "Cyan"
-msgstr "Türkis"
-
-msgid "Custom"
-msgstr "Benutzerdefiniert"
-
-msgid "Transparent"
-msgstr "Transparent"
-
-msgid "Grey"
-msgstr "Grau"
-
 msgid "Display Subtitles"
 msgstr "Zeige Untertitel"
 
@@ -141,27 +108,6 @@ msgstr "DVB Quelle Auswahl"
 msgid "Font Size (pixel)"
 msgstr ""
 
-msgid "Text Color"
-msgstr "Textfarbe"
-
-msgid "Background Color"
-msgstr "Hintergrundfarbe"
-
-msgid "Custom Color"
-msgstr "Benutzerdefinierte Farbe"
-
-msgid "Red Value"
-msgstr "Roter Wert"
-
-msgid "Green Value"
-msgstr "Grüner Wert"
-
-msgid "Blue Value"
-msgstr "Blauer Wert"
-
-msgid "Transparency Value"
-msgstr "Transparenter Wert"
-
 msgid "Language"
 msgstr "Sprache"
 
@@ -185,3 +131,18 @@ msgstr "Untertitelmodus"
 
 msgid "Manual Subtitle Page"
 msgstr "Manuelle Untertitelseite"
+
+#~ msgid "Position Teletext Subtitles for 4:3/Anamorph"
+#~ msgstr "Positioniere Videotext-Untertitel für 4:3/Anamorph"
+
+#~ msgid "Position Teletext Subtitles for Letterbox"
+#~ msgstr "Positioniere Videotext-Untertitel für 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 0ec12e5..0e9f7a5 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: 2009-04-21 23:45+0300\n"
+"POT-Creation-Date: 2010-02-07 13:47+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"
@@ -63,39 +63,6 @@ msgstr "Sólo DVB-T"
 msgid "Only DVB-C"
 msgstr "Sólo DVB-C"
 
-msgid "Black"
-msgstr "Negro"
-
-msgid "White"
-msgstr "Blanco"
-
-msgid "Red"
-msgstr "Rojo"
-
-msgid "Green"
-msgstr "Verde"
-
-msgid "Yellow"
-msgstr "Amarillo"
-
-msgid "Magenta"
-msgstr "Magenta"
-
-msgid "Blue"
-msgstr "Azul"
-
-msgid "Cyan"
-msgstr "Cian"
-
-msgid "Custom"
-msgstr "Personalizado"
-
-msgid "Transparent"
-msgstr "Transparente"
-
-msgid "Grey"
-msgstr "Gris"
-
 msgid "Display Subtitles"
 msgstr "Visualiza subtítulos"
 
@@ -141,27 +108,6 @@ msgstr "Selección fuente DVB"
 msgid "Font Size (pixel)"
 msgstr ""
 
-msgid "Text Color"
-msgstr "Color del texto"
-
-msgid "Background Color"
-msgstr "Color de fondo"
-
-msgid "Custom Color"
-msgstr "Color personalizado"
-
-msgid "Red Value"
-msgstr "Valor rojo"
-
-msgid "Green Value"
-msgstr "Valor verde"
-
-msgid "Blue Value"
-msgstr "Valor azul"
-
-msgid "Transparency Value"
-msgstr "Valor transparencia"
-
 msgid "Language"
 msgstr "Idioma"
 
@@ -185,3 +131,36 @@ msgstr "Modo subtítulos"
 
 msgid "Manual Subtitle Page"
 msgstr "Página manual subtítulos"
+
+#~ msgid "Position Teletext Subtitles for 4:3/Anamorph"
+#~ msgstr "Posiciona subtítulos teletexto para 4:3/anamórfico"
+
+#~ msgid "Position Teletext Subtitles for Letterbox"
+#~ msgstr "Posicióna subtítulos teletexto para Letterbox"
+
+#~ msgid "Left"
+#~ msgstr "Izquierda"
+
+#~ msgid "Center"
+#~ msgstr "Centro"
+
+#~ msgid "Right"
+#~ msgstr "Derecha"
+
+#~ msgid "Text Horizontal Position"
+#~ msgstr "´Posición horizontal del texto"
+
+#~ msgid "Text Vertical Position"
+#~ msgstr "Posición vertical del texto"
+
+#~ msgid "4:3/Anamorph"
+#~ msgstr "4:3/Anamórfico"
+
+#~ msgid "Letterbox"
+#~ msgstr "Letterbox"
+
+#~ msgid "Text Vertical Adjust"
+#~ msgstr "Ajuste vertical del texto"
+
+#~ msgid "Line Spacing Adjust"
+#~ msgstr "Ajuste distancia entre líneas"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 715c211..1885676 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: 2009-04-21 23:45+0300\n"
+"POT-Creation-Date: 2010-02-07 13:47+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"
@@ -66,39 +66,6 @@ msgstr "vain DVB-T"
 msgid "Only DVB-C"
 msgstr "vain DVB-C"
 
-msgid "Black"
-msgstr "musta"
-
-msgid "White"
-msgstr "valkoinen"
-
-msgid "Red"
-msgstr "punainen"
-
-msgid "Green"
-msgstr "vihreä"
-
-msgid "Yellow"
-msgstr "keltainen"
-
-msgid "Magenta"
-msgstr "magenta"
-
-msgid "Blue"
-msgstr "sininen"
-
-msgid "Cyan"
-msgstr "syaani"
-
-msgid "Custom"
-msgstr "muokattava"
-
-msgid "Transparent"
-msgstr "läpinäkyvä"
-
-msgid "Grey"
-msgstr "harmaa"
-
 msgid "Display Subtitles"
 msgstr "Näytä tekstitykset"
 
@@ -144,27 +111,6 @@ msgstr "Tekstityslähteen valinta"
 msgid "Font Size (pixel)"
 msgstr "Kirjasintyypin koko (px)"
 
-msgid "Text Color"
-msgstr "Kirjasimen väri"
-
-msgid "Background Color"
-msgstr "Taustaväri"
-
-msgid "Custom Color"
-msgstr "Muokattava väri"
-
-msgid "Red Value"
-msgstr "Punainen"
-
-msgid "Green Value"
-msgstr "Vihreä"
-
-msgid "Blue Value"
-msgstr "Sininen"
-
-msgid "Transparency Value"
-msgstr "Läpinäkyvyys"
-
 msgid "Language"
 msgstr "Tekstityskieli"
 
@@ -188,3 +134,36 @@ 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 hienosäätö"
+
+#~ msgid "Line Spacing Adjust"
+#~ msgstr "Rivivälin hienosäätö"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 3243050..44dd4f0 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: 2009-04-21 23:45+0300\n"
+"POT-Creation-Date: 2010-02-07 13:47+0100\n"
 "PO-Revision-Date: 2009-01-04 19:05+0100\n"
 "Last-Translator: Nival MichaÃ«l\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
@@ -66,39 +66,6 @@ msgstr "Seulement DVB-T"
 msgid "Only DVB-C"
 msgstr "Seulement DVB-C"
 
-msgid "Black"
-msgstr "Noir"
-
-msgid "White"
-msgstr "Blanc"
-
-msgid "Red"
-msgstr "Rouge"
-
-msgid "Green"
-msgstr "Vert"
-
-msgid "Yellow"
-msgstr "Jaune"
-
-msgid "Magenta"
-msgstr "Magenta"
-
-msgid "Blue"
-msgstr "Bleu"
-
-msgid "Cyan"
-msgstr "Cyan"
-
-msgid "Custom"
-msgstr "PersonnalisÃ©"
-
-msgid "Transparent"
-msgstr "Transparent"
-
-msgid "Grey"
-msgstr "Gris"
-
 msgid "Display Subtitles"
 msgstr "Afficher le sous-titrage"
 
@@ -144,27 +111,6 @@ msgstr "SÃ©lection Source DVB"
 msgid "Font Size (pixel)"
 msgstr "Taille Police (pixel)"
 
-msgid "Text Color"
-msgstr "Couleur du texte"
-
-msgid "Background Color"
-msgstr "Couleur du fond"
-
-msgid "Custom Color"
-msgstr "Couleur personnalisÃ©e"
-
-msgid "Red Value"
-msgstr "Valeur Rouge"
-
-msgid "Green Value"
-msgstr "Valeur Vert"
-
-msgid "Blue Value"
-msgstr "Valeur Bleu"
-
-msgid "Transparency Value"
-msgstr "Valeur de transparence"
-
 msgid "Language"
 msgstr "Langues"
 
@@ -188,3 +134,36 @@ 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 ec158c5..21579fc 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: 2009-04-21 23:45+0300\n"
+"POT-Creation-Date: 2010-02-07 13:47+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"
@@ -67,39 +67,6 @@ msgstr "Solo DVB-T"
 msgid "Only DVB-C"
 msgstr "Solo DVB-C"
 
-msgid "Black"
-msgstr "Nero"
-
-msgid "White"
-msgstr "Bianco"
-
-msgid "Red"
-msgstr "Rosso"
-
-msgid "Green"
-msgstr "Verde"
-
-msgid "Yellow"
-msgstr "Giallo"
-
-msgid "Magenta"
-msgstr "Magenta"
-
-msgid "Blue"
-msgstr "Blu"
-
-msgid "Cyan"
-msgstr "Ciano"
-
-msgid "Custom"
-msgstr "Personalizzato"
-
-msgid "Transparent"
-msgstr "Trasparente"
-
-msgid "Grey"
-msgstr "Grigio"
-
 msgid "Display Subtitles"
 msgstr "Visualizza sottotitoli"
 
@@ -145,27 +112,6 @@ msgstr "Selezione sorgente DVB"
 msgid "Font Size (pixel)"
 msgstr "Dim. caratteri (pixel)"
 
-msgid "Text Color"
-msgstr "Colore testo"
-
-msgid "Background Color"
-msgstr "Colore sfondo"
-
-msgid "Custom Color"
-msgstr "Colore personalizzato"
-
-msgid "Red Value"
-msgstr "Valore rosso"
-
-msgid "Green Value"
-msgstr "Valore verde"
-
-msgid "Blue Value"
-msgstr "Valore blu"
-
-msgid "Transparency Value"
-msgstr "Valore trasparenza"
-
 msgid "Language"
 msgstr "Lingua"
 
@@ -189,3 +135,36 @@ 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 4fc5071..1dd559b 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: 2009-04-21 23:45+0300\n"
+"POT-Creation-Date: 2010-02-07 13:47+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"
@@ -63,39 +63,6 @@ msgstr "ÂÞÛìÚÞ  DVB-T"
 msgid "Only DVB-C"
 msgstr "ÂÞÛìÚÞ DVB-C"
 
-msgid "Black"
-msgstr "çñàÝëÙ"
-
-msgid "White"
-msgstr "ÑÕÛëÙ"
-
-msgid "Red"
-msgstr "ÚàÐáÝëÙ"
-
-msgid "Green"
-msgstr "×ÕÛñÝëÙ"
-
-msgid "Yellow"
-msgstr "ÖñÛâëÙ"
-
-msgid "Magenta"
-msgstr "ßãàßãàÝëÙ"
-
-msgid "Blue"
-msgstr "áØÝØÙ"
-
-msgid "Cyan"
-msgstr "ÓÞÛãÑÞÙ"
-
-msgid "Custom"
-msgstr "ÝÐáâàÐØÒÐÕÜëÙ"
-
-msgid "Transparent"
-msgstr "ßàÞ×àÐçÝëÙ"
-
-msgid "Grey"
-msgstr "áÕàëÙ"
-
 msgid "Display Subtitles"
 msgstr "¿ÞÚÐ×ëÒÐâì áãÑâØâàë"
 
@@ -141,27 +108,6 @@ msgstr "²ëÑÞà DVB ØáâÞçÝØÚÐ"
 msgid "Font Size (pixel)"
 msgstr "ÀÐ×ÜÕà äÞÝâÐ  (pixel)"
 
-msgid "Text Color"
-msgstr "ÆÒÕâ âÕÚáâÐ"
-
-msgid "Background Color"
-msgstr "ÆÒÕâ äÞÝÐ"
-
-msgid "Custom Color"
-msgstr "½ÐáâàÐØÒÐÕÜëÙ æÒÕâ"
-
-msgid "Red Value"
-msgstr "ÃàÞÒÕÝì ÚàÐáÝÞÓÞ"
-
-msgid "Green Value"
-msgstr "ÃàÞÒÕÝì ×ÕÛñÝÞÓÞ"
-
-msgid "Blue Value"
-msgstr "ÃàÞÒÕÝì áØÝÕÓÞ"
-
-msgid "Transparency Value"
-msgstr "ÁâÕßÕÝì ßàÞ×àÐçÝÞáâØ"
-
 msgid "Language"
 msgstr "Ï×ëÚ"
 
@@ -185,3 +131,36 @@ 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 ab219a9..1b82c40 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: 2009-04-21 23:45+0300\n"
+"POT-Creation-Date: 2010-02-07 13:47+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"
@@ -64,39 +64,6 @@ msgstr ""
 msgid "Only DVB-C"
 msgstr ""
 
-msgid "Black"
-msgstr "svart"
-
-msgid "White"
-msgstr "vit"
-
-msgid "Red"
-msgstr "röd"
-
-msgid "Green"
-msgstr "grön"
-
-msgid "Yellow"
-msgstr "gul"
-
-msgid "Magenta"
-msgstr "magenta"
-
-msgid "Blue"
-msgstr "blå"
-
-msgid "Cyan"
-msgstr "cyan"
-
-msgid "Custom"
-msgstr ""
-
-msgid "Transparent"
-msgstr "transparent"
-
-msgid "Grey"
-msgstr "grå"
-
 msgid "Display Subtitles"
 msgstr "Visa textning"
 
@@ -142,27 +109,6 @@ msgstr ""
 msgid "Font Size (pixel)"
 msgstr ""
 
-msgid "Text Color"
-msgstr "Färg på text"
-
-msgid "Background Color"
-msgstr "Färg på bakgrund"
-
-msgid "Custom Color"
-msgstr ""
-
-msgid "Red Value"
-msgstr ""
-
-msgid "Green Value"
-msgstr ""
-
-msgid "Blue Value"
-msgstr ""
-
-msgid "Transparency Value"
-msgstr ""
-
 msgid "Language"
 msgstr "Språk"
 
@@ -186,3 +132,36 @@ msgstr ""
 
 msgid "Manual Subtitle Page"
 msgstr ""
+
+#~ msgid "Position Teletext Subtitles for 4:3/Anamorph"
+#~ msgstr "Textning för 4:3/anamorf (Text-TV)"
+
+#~ msgid "Position Teletext Subtitles for Letterbox"
+#~ msgstr "Textning för brevlådeformat (Text-TV)"
+
+#~ msgid "Left"
+#~ msgstr "vänster"
+
+#~ msgid "Center"
+#~ msgstr "centrerad"
+
+#~ msgid "Right"
+#~ msgstr "höger"
+
+#~ 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 "brevlådeformat"
+
+#~ msgid "Text Vertical Adjust"
+#~ msgstr "Vertikal justering"
+
+#~ msgid "Line Spacing Adjust"
+#~ msgstr "Radavstånd"
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 9e682f6..d799b60 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -1,9 +1,8 @@
-
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <author>\n"
-"POT-Creation-Date: 2009-05-28 23:45+0300\n"
+"POT-Creation-Date: 2010-02-07 13:47+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"
@@ -59,39 +58,6 @@ msgstr "Ð¢Ñ–Ð»ÑŒÐºÐ¸  DVB-T"
 msgid "Only DVB-C"
 msgstr "Ð¢Ñ–Ð»ÑŒÐºÐ¸ DVB-C"
 
-msgid "Black"
-msgstr "Ð§Ð¾Ñ€Ð½Ð¸Ð¹"
-
-msgid "White"
-msgstr "Ð‘Ñ–Ð»Ð¸Ð¹"
-
-msgid "Red"
-msgstr "Ð§ÐµÑ€Ð²Ð½Ð¾Ð½Ð¸Ð¹"
-
-msgid "Green"
-msgstr "Ð—ÐµÐ»ÐµÐ½Ð¸Ð¹"
-
-msgid "Yellow"
-msgstr "Ð–Ð¾Ð²Ñ‚Ð¸Ð¹"
-
-msgid "Magenta"
-msgstr "ÐŸÑƒÑ€Ð¿ÑƒÑ€Ð¾Ð²Ð¸Ð¹"
-
-msgid "Blue"
-msgstr "Ð¡Ð¸Ð½Ñ–Ð¹"
-
-msgid "Cyan"
-msgstr "Ð“Ð¾Ð»ÑƒÐ±Ð¸Ð¹"
-
-msgid "Custom"
-msgstr "Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ°"
-
-msgid "Transparent"
-msgstr "Ð¿Ñ€Ð¾Ð·Ð¾Ñ€Ð¸Ð¹"
-
-msgid "Grey"
-msgstr "Ð¡Ñ–Ñ€Ð¸Ð¹"
-
 msgid "Display Subtitles"
 msgstr "ÐŸÐ¾ÐºÐ°Ð·ÑƒÐ²Ð°Ñ‚Ð¸ ÑÑƒÐ±Ñ‚Ð¸Ñ‚Ñ€Ð¸"
 
@@ -137,27 +103,6 @@ msgstr "Ð’Ð¸Ð±Ñ–Ñ€ DVB Ð´Ð¶ÐµÑ€ÐµÐ»Ð°"
 msgid "Font Size (pixel)"
 msgstr "Ð Ð°Ð·Ð¼Ñ–Ñ€ Ñ„Ð¾Ð½Ñ‚Ð° (Ð¿Ñ–ÐºÑÐµÐ»Ñ–)"
 
-msgid "Text Color"
-msgstr "ÐšÐ¾Ð»Ñ–Ñ€ Ñ‚ÐµÐºÑÑ‚Ñƒ"
-
-msgid "Background Color"
-msgstr "ÐšÐ¾Ð»Ñ–Ð¾ Ñ‚Ð»Ð°"
-
-msgid "Custom Color"
-msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° ÐºÐ¾Ð»ÑŒÐ¾Ñ€Ñƒ"
-
-msgid "Red Value"
-msgstr "Ð Ñ–Ð²ÐµÐ½ÑŒ Ñ‡ÐµÑ€Ð²Ð¾Ð½Ð¾Ð³Ð¾"
-
-msgid "Green Value"
-msgstr "Ð Ñ–Ð²ÐµÐ½ÑŒ Ð·ÐµÐ»ÐµÐ½Ð¾Ð³Ð¾"
-
-msgid "Blue Value"
-msgstr "Ð Ñ–Ð²ÐµÐ½ÑŒ ÑÐ¸Ð½ÑŒÐ¾Ð³Ð¾"
-
-msgid "Transparency Value"
-msgstr "Ð¡Ñ‚ÑƒÐ¿Ñ–Ð½ÑŒ Ð¿Ñ€Ð¾Ð·Ð¾Ñ€Ð¾ÑÑ‚Ñ–"
-
 msgid "Language"
 msgstr "ÐœÐ¾Ð²Ð°"
 
@@ -181,3 +126,36 @@ 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 bde2931..f91a544 100644
--- a/ttxtsubs.c
+++ b/ttxtsubs.c
@@ -189,10 +189,6 @@ class cMenuSetupTtxtsubs : public cMenuSetupPage {
   int mLangHI[MAXLANGUAGES];
   int mSavedFrenchSpecial;
   int mDoStore;
-  int mTransparency;
-  int mRed;
-  int mGreen;
-  int mBlue;
   cTtxtsubsConf mConf;
 };
 
@@ -345,9 +341,6 @@ bool cPluginTtxtsubs::SetupParse(const char *Name, const char *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, "FgColor")) globals.mFgColor = atoi(Value);
-  else if(!strcasecmp(Name, "BgColor")) globals.mBgColor = atoi(Value);
-  else if(!strcasecmp(Name, "CustomColor")) globals.mCustomColor = atoi(Value);
   else if(!strcasecmp(Name, "Languages")) parseLanguages(Value);
   else if(!strcasecmp(Name, "HearingImpaireds")) parseHIs(Value);
   // Handle old settings
@@ -604,8 +597,6 @@ void cMenuSetupTtxtsubsLanguages::Store(void)
 const char * mainMenuAlts[5] = {NULL, NULL, NULL, NULL, NULL};
 const char * textPosAlts[4];
 const char * dvbSources[5];
-const char * textColors[12];
-const char * const colorValues[17] = {"#00", "#11", "#22", "#33", "#44", "#55", "#66", "#77", "#88", "#99", "#AA", "#BB", "#CC", "#DD", "#EE", "#FF", NULL};
 
 cMenuSetupTtxtsubs::cMenuSetupTtxtsubs(cPluginTtxtsubs *ttxtsubs, int doStore)
   :
@@ -632,25 +623,10 @@ cMenuSetupTtxtsubs::cMenuSetupTtxtsubs(cPluginTtxtsubs *ttxtsubs, int doStore)
     dvbSources[2] = tr("Only DVB-T");
     dvbSources[3] = tr("Only DVB-C");
     dvbSources[4] = NULL;
-
-    textColors[0] = tr("Black");
-    textColors[1] = tr("White");
-    textColors[2] = tr("Red");
-    textColors[3] = tr("Green");
-    textColors[4] = tr("Yellow");
-    textColors[5] = tr("Magenta");
-    textColors[6] = tr("Blue");
-    textColors[7] = tr("Cyan");
-    textColors[8] = tr("Custom");
-    textColors[9] = tr("Transparent");
-    textColors[10] = tr("Grey");
-    textColors[11] = 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;
-  const int numTextColors = sizeof(textColors) / sizeof(textColors[0]) - 1;
-  const int numColorValues = sizeof(colorValues) / sizeof(colorValues[0]) - 1;
 
   mSavedFrenchSpecial = mConf.mFrenchSpecial;
 
@@ -692,33 +668,7 @@ cMenuSetupTtxtsubs::cMenuSetupTtxtsubs(cPluginTtxtsubs *ttxtsubs, int doStore)
     mConf.mDvbSources = 0;  // menu item segfaults if out of range
   Add(new cMenuEditStraItem(tr("DVB Source Selection"),
                           &mConf.mDvbSources, 4, dvbSources));
-  Add(new cMenuEditIntItem(tr("Font Size (pixel)"), &mConf.mFontSize, 10, MAXFONTSIZE));
-  if(mConf.mFgColor < 0 || mConf.mFgColor >= numTextColors)
-    mConf.mFgColor = 1;  // menu item segfaults if out of range
-  Add(new cMenuEditStraItem(tr("Text Color"), &mConf.mFgColor,
-			    numTextColors, textColors));
-  if(mConf.mBgColor < 0 || mConf.mBgColor >= numTextColors)
-    mConf.mBgColor = 0;  // menu item segfaults if out of range
-  Add(new cMenuEditStraItem(tr("Background Color"), &mConf.mBgColor,
-			    numTextColors, textColors));
-
-  // the color code is borrowed from AIO patches
-  mBlue = (mConf.mCustomColor & 0x0000000F);
-  if (mBlue < 0 || mBlue >= numColorValues) mBlue = 0;
-  mGreen = (mConf.mCustomColor & 0x00000F00) >>  8;
-  if (mGreen < 0 || mGreen >= numColorValues) mGreen = 0;
-  mRed = (mConf.mCustomColor & 0x000F0000) >> 16;
-  if (mRed < 0 || mRed >= numColorValues) mRed = 0;
-  mTransparency = (mConf.mCustomColor & 0x0F000000) >> 24;
-  if (mTransparency < 0 || mTransparency >= numColorValues) mTransparency = 0;
-  cString buf = cString::sprintf("%s: --------------------------------------------", tr("Custom Color"));
-  cOsdItem *item = new cOsdItem(buf);
-  item->SetSelectable(false);
-  Add(item);
-  Add(new cMenuEditStraItem(tr("Red Value"),          &mRed,          numColorValues, colorValues));
-  Add(new cMenuEditStraItem(tr("Green Value"),        &mGreen,        numColorValues, colorValues));
-  Add(new cMenuEditStraItem(tr("Blue Value"),         &mBlue,         numColorValues, colorValues));
-  Add(new cMenuEditStraItem(tr("Transparency Value"), &mTransparency, numColorValues, colorValues));
+  Add(new cMenuEditIntItem(tr("Font Size (pixel)"), &mConf.mFontSize, 10, MAXFONTSIZE * 2));
 
   for(int n = 0; n < MAXLANGUAGES; n++) {
     char str[100];
@@ -780,13 +730,6 @@ void cMenuSetupTtxtsubs::Store(void)
   SetupStore("LineSpacing", mConf.mLineSpacing);
   SetupStore("DvbSources", mConf.mDvbSources);
   SetupStore("FontSize", mConf.mFontSize);
-  SetupStore("FgColor", mConf.mFgColor);
-  SetupStore("BgColor", mConf.mBgColor);
-  mConf.mCustomColor = (mBlue              ) | (mBlue         <<  4) |
-                       (mGreen        <<  8) | (mGreen        << 12) |
-                       (mRed          << 16) | (mRed          << 20) |
-                       (mTransparency << 24) | (mTransparency << 28);
-  SetupStore("CustomColor", mConf.mCustomColor);
 
   char lstr[MAXLANGUAGES*2*4 + 1];
   char histr[MAXLANGUAGES*2 + 1];
diff --git a/ttxtsubsglobals.h b/ttxtsubsglobals.h
index 493852f..ad75d52 100644
--- a/ttxtsubsglobals.h
+++ b/ttxtsubsglobals.h
@@ -46,9 +46,6 @@ class cTtxtsubsConf {
       mLineSpacing = 0;
       mDvbSources = 0;
       mFontSize = 20;
-      mFgColor = 1;
-      mBgColor = 8;
-      mCustomColor = 0xBB333333;
       memset(mLanguages, 0, sizeof(mLanguages));
       memset(mHearingImpaireds, 0, sizeof(mHearingImpaireds));
       mI18nLanguage = 0;
@@ -68,9 +65,6 @@ class cTtxtsubsConf {
   int lineSpacing(void) {return mLineSpacing;}
   int dvbSources(void) {return mDvbSources;}
   int fontSize(void) {return mFontSize;}
-  int fgColor(void) {return mFgColor;}
-  int bgColor(void) {return mBgColor;}
-  int customColor(void) {return mCustomColor;}
   char (*languages(void))[MAXLANGUAGES][2][4] {return &mLanguages;}
   int (*hearingImpaireds(void))[MAXLANGUAGES][2] {return &mHearingImpaireds;}
 
@@ -92,9 +86,6 @@ class cTtxtsubsConf {
   int mLineSpacing;
   int mDvbSources;
   int mFontSize;
-  int mFgColor;
-  int mBgColor;
-  int mCustomColor;
   char mLanguages[MAXLANGUAGES][2][4];
   int mHearingImpaireds[MAXLANGUAGES][2];
   int mI18nLanguage;
author	Tobias Grimm <git@e-tobi.net>	2010-02-07 13:35:29 +0100
committer	Tobias Grimm <git@e-tobi.net>	2010-02-08 02:01:01 +0100
commit	64f69fddaa33fac5224a88b455b510ebb10ca79c (patch)
tree	e46dfa07b4fd98372a7d4f2a5803910eeb7b3001
parent	ea984be181e286c39677684f901cc2d1990f5c54 (diff)
download	vdr-plugin-ttxtsubs-64f69fddaa33fac5224a88b455b510ebb10ca79c.tar.gz vdr-plugin-ttxtsubs-64f69fddaa33fac5224a88b455b510ebb10ca79c.tar.bz2