Removed VDR < 1.6.0 support code

17 files changed, 403 insertions, 470 deletions

diff --git a/HISTORY b/HISTORY
index 623a5d5..d280983 100644
--- a/HISTORY
+++ b/HISTORY
@@ -30,7 +30,7 @@ VDR Plugin 'ttxtsubs' Revision History
     - Added manual page selection mode
 - switched completely to VDR 1.6's I18N system and removed the old crap - no
   more support for older VDR versions!
-
+- Removed VDR < 1.6.0 support code
 
 2004-05-31: Version 0.0.5
 
diff --git a/README b/README
index 948e692..d201a78 100644
--- a/README
+++ b/README
@@ -62,14 +62,14 @@ reworked a few times.
 
 Installation:
 
-This plugin is for VDR 1.2.5. It currently needs a few hooks in, and
+This plugin is for VDR >= 1.6.0. It currently needs a few hooks in, and
 changes to, VDR to work. A patch file is included. The patches should
 be harmless if you don't have the plugin loaded, so even if you patch
 VDR and later decide not to use this plugin you don't necessarily have
 to reinstall VDR. It is probably possible to build the plugin for
 other version of VDR, but don't count on it.
 
-Steps:
+Steps (version numbers may differ):
 
 As usual, unpack the plugin and make a link:
 	cd ..../vdr-1.2.6/PLUGINS/src
diff --git a/contrib/vdr-1.3.8-ttxtsubs-0.0.5pre2-charset_fix-custom_color.diff.README b/contrib/vdr-1.3.8-ttxtsubs-0.0.5pre2-charset_fix-custom_color.diff.README
deleted file mode 100644
index 334cdfc..0000000
--- a/contrib/vdr-1.3.8-ttxtsubs-0.0.5pre2-charset_fix-custom_color.diff.README
+++ /dev/null
@@ -1,4 +0,0 @@
-
-2004-05-28
-A test patch from Rolf Ahrenberg to make ttxtsubs work with the new
-OSD mechanism in VDR 1.3.8.
diff --git a/contrib/vdr-1.3.8-ttxtsubs-0.0.5pre2-charset_fix-custom_color.diff.gz b/contrib/vdr-1.3.8-ttxtsubs-0.0.5pre2-charset_fix-custom_color.diff.gz
deleted file mode 100644
index 461363c..0000000
--- a/contrib/vdr-1.3.8-ttxtsubs-0.0.5pre2-charset_fix-custom_color.diff.gz
+++ /dev/null
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 359e649..4b4f613 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: 2008-12-13 21:40+0100\n"
+"POT-Creation-Date: 2008-12-13 21: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"
@@ -21,199 +21,199 @@ msgstr ""
 msgid "Teletext subtitles"
 msgstr "Subtítols teletext"
 
-#: ttxtsubs.c:291
+#: ttxtsubs.c:279
 msgid "Hide teletext subtitles"
 msgstr "Amaga subtítols teletext"
 
-#: ttxtsubs.c:293
+#: ttxtsubs.c:281
 msgid "Display teletext subtitles"
 msgstr "Visualitza subtítols teletext"
 
-#: ttxtsubs.c:296
+#: ttxtsubs.c:284
 msgid "Position Teletext Subtitles for 4:3/Anamorph"
 msgstr "Posiciona subtítols teletext per a 4:3/anamòrfic"
 
-#: ttxtsubs.c:298
+#: ttxtsubs.c:286
 msgid "Position Teletext Subtitles for Letterbox"
 msgstr "Posiciona subtítols teletext per a Letterbox"
 
-#: ttxtsubs.c:300
+#: ttxtsubs.c:288
 msgid "Page Selection"
 msgstr "Selecció pàgina subtítols"
 
-#: ttxtsubs.c:630
+#: ttxtsubs.c:612
 msgid "Display on/off"
 msgstr "Visualitza si/no"
 
-#: ttxtsubs.c:631
+#: ttxtsubs.c:613
 msgid "4:3/Letterbox"
 msgstr "4:3/Letterbox"
 
-#: ttxtsubs.c:632
+#: ttxtsubs.c:614
 msgid "Page Mode"
 msgstr "Modalitat pàgina"
 
-#: ttxtsubs.c:635
+#: ttxtsubs.c:617
 msgid "Left"
 msgstr "Esquerra"
 
-#: ttxtsubs.c:636
+#: ttxtsubs.c:618
 msgid "Center"
 msgstr "Centre"
 
-#: ttxtsubs.c:637
+#: ttxtsubs.c:619
 msgid "Right"
 msgstr "Dreta"
 
-#: ttxtsubs.c:640
+#: ttxtsubs.c:622
 msgid "All"
 msgstr "Totes"
 
-#: ttxtsubs.c:641
+#: ttxtsubs.c:623
 msgid "Only DVB-S"
 msgstr "Només DVB-S"
 
-#: ttxtsubs.c:642
+#: ttxtsubs.c:624
 msgid "Only DVB-T"
 msgstr "Només DVB-T"
 
-#: ttxtsubs.c:643
+#: ttxtsubs.c:625
 msgid "Only DVB-C"
 msgstr "Només DVB-C"
 
-#: ttxtsubs.c:646
+#: ttxtsubs.c:628
 msgid "Black"
 msgstr "Negre"
 
-#: ttxtsubs.c:647
+#: ttxtsubs.c:629
 msgid "White"
 msgstr "Blanc"
 
-#: ttxtsubs.c:648
+#: ttxtsubs.c:630
 msgid "Red"
 msgstr "Vermell"
 
-#: ttxtsubs.c:649
+#: ttxtsubs.c:631
 msgid "Green"
 msgstr "Verd"
 
-#: ttxtsubs.c:650
+#: ttxtsubs.c:632
 msgid "Yellow"
 msgstr "Groc"
 
-#: ttxtsubs.c:651
+#: ttxtsubs.c:633
 msgid "Magenta"
 msgstr "Magenta"
 
-#: ttxtsubs.c:652
+#: ttxtsubs.c:634
 msgid "Blue"
 msgstr "Blau"
 
-#: ttxtsubs.c:653
+#: ttxtsubs.c:635
 msgid "Cyan"
 msgstr "Cian"
 
-#: ttxtsubs.c:654
+#: ttxtsubs.c:636
 msgid "Custom"
 msgstr "Personalitzat"
 
-#: ttxtsubs.c:655
+#: ttxtsubs.c:637
 msgid "Transparent"
 msgstr "Transparent"
 
-#: ttxtsubs.c:656
+#: ttxtsubs.c:638
 msgid "Grey"
 msgstr "Gris"
 
-#: ttxtsubs.c:680 ttxtsubspagemenu.c:35
+#: ttxtsubs.c:662 ttxtsubspagemenu.c:35
 msgid "Display Subtitles"
 msgstr "Visualitza subtítols"
 
-#: ttxtsubs.c:681
+#: ttxtsubs.c:663
 msgid "Record Subtitles"
 msgstr "Grava subtítols"
 
-#: ttxtsubs.c:682
+#: ttxtsubs.c:664
 msgid "Live Delay"
 msgstr "Retard en directe"
 
-#: ttxtsubs.c:683
+#: ttxtsubs.c:665
 msgid "Replay Delay"
 msgstr "Retard en reproducció"
 
-#: ttxtsubs.c:686
+#: ttxtsubs.c:668
 msgid "Main Menu Alternative"
 msgstr "Alternativa del menú principal"
 
-#: ttxtsubs.c:690
+#: ttxtsubs.c:672
 msgid "Text Horizontal Position"
 msgstr "Posició horitzontal del text "
 
-#: ttxtsubs.c:692
+#: ttxtsubs.c:674
 msgid "Text Vertical Position"
 msgstr "Posición vertical del text"
 
-#: ttxtsubs.c:693
+#: ttxtsubs.c:675
 msgid "4:3/Anamorph"
 msgstr "4:3/Anamòrfic"
 
-#: ttxtsubs.c:693
+#: ttxtsubs.c:675
 msgid "Letterbox"
 msgstr "Letterbox"
 
-#: ttxtsubs.c:694
+#: ttxtsubs.c:676
 msgid "Text Vertical Adjust"
 msgstr "Ajustament vertical del text"
 
-#: ttxtsubs.c:696
+#: ttxtsubs.c:678
 msgid "Line Spacing Adjust"
 msgstr "Ajustament distancia entre línies"
 
-#: ttxtsubs.c:698
+#: ttxtsubs.c:680
 msgid "Workaround for some French chns"
 msgstr "Correcció per a canals francesos"
 
-#: ttxtsubs.c:702
+#: ttxtsubs.c:684
 msgid "DVB Source Selection"
 msgstr "Selecció font DVB"
 
-#: ttxtsubs.c:705
+#: ttxtsubs.c:686
 msgid "Font Size (pixel)"
 msgstr ""
 
-#: ttxtsubs.c:709
+#: ttxtsubs.c:689
 msgid "Text Color"
 msgstr "Color del text"
 
-#: ttxtsubs.c:713
+#: ttxtsubs.c:693
 msgid "Background Color"
 msgstr "Color de fons"
 
-#: ttxtsubs.c:725
+#: ttxtsubs.c:705
 msgid "Custom Color"
 msgstr "Color personalitzat"
 
-#: ttxtsubs.c:730
+#: ttxtsubs.c:710
 msgid "Red Value"
 msgstr "Valor vermell"
 
-#: ttxtsubs.c:731
+#: ttxtsubs.c:711
 msgid "Green Value"
 msgstr "Valor vert"
 
-#: ttxtsubs.c:732
+#: ttxtsubs.c:712
 msgid "Blue Value"
 msgstr "Valor blau"
 
-#: ttxtsubs.c:733
+#: ttxtsubs.c:713
 msgid "Transparency Value"
 msgstr "Valor transparència"
 
-#: ttxtsubs.c:743 ttxtsubs.c:751
+#: ttxtsubs.c:723 ttxtsubs.c:731
 msgid "Language"
 msgstr "Idioma"
 
-#: ttxtsubs.c:751
+#: ttxtsubs.c:731
 msgid "Hearing Impaired"
 msgstr "Discapacitats auditius"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index eb796de..8e9bd4e 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: 2008-12-13 21:40+0100\n"
+"POT-Creation-Date: 2008-12-13 21:47+0100\n"
 "PO-Revision-Date: 2007-08-24 23:49+0300\n"
 "Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -19,199 +19,199 @@ msgstr ""
 msgid "Teletext subtitles"
 msgstr "Videotextuntertitel"
 
-#: ttxtsubs.c:291
+#: ttxtsubs.c:279
 msgid "Hide teletext subtitles"
 msgstr "Verstecke Videotextuntertitel"
 
-#: ttxtsubs.c:293
+#: ttxtsubs.c:281
 msgid "Display teletext subtitles"
 msgstr "Zeige Videotextuntertitel"
 
-#: ttxtsubs.c:296
+#: ttxtsubs.c:284
 msgid "Position Teletext Subtitles for 4:3/Anamorph"
 msgstr "Positioniere Videotext-Untertitel für 4:3/Anamorph"
 
-#: ttxtsubs.c:298
+#: ttxtsubs.c:286
 msgid "Position Teletext Subtitles for Letterbox"
 msgstr "Positioniere Videotext-Untertitel für Letterbox"
 
-#: ttxtsubs.c:300
+#: ttxtsubs.c:288
 msgid "Page Selection"
 msgstr "Seitenauswahl"
 
-#: ttxtsubs.c:630
+#: ttxtsubs.c:612
 msgid "Display on/off"
 msgstr "Anzeige ein/aus"
 
-#: ttxtsubs.c:631
+#: ttxtsubs.c:613
 msgid "4:3/Letterbox"
 msgstr "4:3/Letterbox"
 
-#: ttxtsubs.c:632
+#: ttxtsubs.c:614
 msgid "Page Mode"
 msgstr "Seitenmodus"
 
-#: ttxtsubs.c:635
+#: ttxtsubs.c:617
 msgid "Left"
 msgstr "Links"
 
-#: ttxtsubs.c:636
+#: ttxtsubs.c:618
 msgid "Center"
 msgstr "Mitte"
 
-#: ttxtsubs.c:637
+#: ttxtsubs.c:619
 msgid "Right"
 msgstr "Rechts"
 
-#: ttxtsubs.c:640
+#: ttxtsubs.c:622
 msgid "All"
 msgstr "Alle"
 
-#: ttxtsubs.c:641
+#: ttxtsubs.c:623
 msgid "Only DVB-S"
 msgstr "Nur DVB-S"
 
-#: ttxtsubs.c:642
+#: ttxtsubs.c:624
 msgid "Only DVB-T"
 msgstr "Nur DVB-T"
 
-#: ttxtsubs.c:643
+#: ttxtsubs.c:625
 msgid "Only DVB-C"
 msgstr "Nur DVB-C"
 
-#: ttxtsubs.c:646
+#: ttxtsubs.c:628
 msgid "Black"
 msgstr "Schwarz"
 
-#: ttxtsubs.c:647
+#: ttxtsubs.c:629
 msgid "White"
 msgstr "Weiss"
 
-#: ttxtsubs.c:648
+#: ttxtsubs.c:630
 msgid "Red"
 msgstr "Rot"
 
-#: ttxtsubs.c:649
+#: ttxtsubs.c:631
 msgid "Green"
 msgstr "Grün"
 
-#: ttxtsubs.c:650
+#: ttxtsubs.c:632
 msgid "Yellow"
 msgstr "Gelb"
 
-#: ttxtsubs.c:651
+#: ttxtsubs.c:633
 msgid "Magenta"
 msgstr "Magenta"
 
-#: ttxtsubs.c:652
+#: ttxtsubs.c:634
 msgid "Blue"
 msgstr "Blau"
 
-#: ttxtsubs.c:653
+#: ttxtsubs.c:635
 msgid "Cyan"
 msgstr "Türkis"
 
-#: ttxtsubs.c:654
+#: ttxtsubs.c:636
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
-#: ttxtsubs.c:655
+#: ttxtsubs.c:637
 msgid "Transparent"
 msgstr "Transparent"
 
-#: ttxtsubs.c:656
+#: ttxtsubs.c:638
 msgid "Grey"
 msgstr "Grau"
 
-#: ttxtsubs.c:680 ttxtsubspagemenu.c:35
+#: ttxtsubs.c:662 ttxtsubspagemenu.c:35
 msgid "Display Subtitles"
 msgstr "Zeige Untertitel"
 
-#: ttxtsubs.c:681
+#: ttxtsubs.c:663
 msgid "Record Subtitles"
 msgstr "Nimm Untertitel auf"
 
-#: ttxtsubs.c:682
+#: ttxtsubs.c:664
 msgid "Live Delay"
 msgstr "Live Verzögerung"
 
-#: ttxtsubs.c:683
+#: ttxtsubs.c:665
 msgid "Replay Delay"
 msgstr "Wiedergabe Verzögerung"
 
-#: ttxtsubs.c:686
+#: ttxtsubs.c:668
 msgid "Main Menu Alternative"
 msgstr "Hauptmenu Alternative"
 
-#: ttxtsubs.c:690
+#: ttxtsubs.c:672
 msgid "Text Horizontal Position"
 msgstr "Horizontale Textposition"
 
-#: ttxtsubs.c:692
+#: ttxtsubs.c:674
 msgid "Text Vertical Position"
 msgstr "Vertikale Textposition"
 
-#: ttxtsubs.c:693
+#: ttxtsubs.c:675
 msgid "4:3/Anamorph"
 msgstr "4:3/Anamorph"
 
-#: ttxtsubs.c:693
+#: ttxtsubs.c:675
 msgid "Letterbox"
 msgstr "Letterbox"
 
-#: ttxtsubs.c:694
+#: ttxtsubs.c:676
 msgid "Text Vertical Adjust"
 msgstr "Text vertikal verschieben"
 
-#: ttxtsubs.c:696
+#: ttxtsubs.c:678
 msgid "Line Spacing Adjust"
 msgstr "Zeilenabstand einstellen"
 
-#: ttxtsubs.c:698
+#: ttxtsubs.c:680
 msgid "Workaround for some French chns"
 msgstr "Workaround für französische Kanäle"
 
-#: ttxtsubs.c:702
+#: ttxtsubs.c:684
 msgid "DVB Source Selection"
 msgstr "DVB Quelle Auswahl"
 
-#: ttxtsubs.c:705
+#: ttxtsubs.c:686
 msgid "Font Size (pixel)"
 msgstr ""
 
-#: ttxtsubs.c:709
+#: ttxtsubs.c:689
 msgid "Text Color"
 msgstr "Textfarbe"
 
-#: ttxtsubs.c:713
+#: ttxtsubs.c:693
 msgid "Background Color"
 msgstr "Hintergrundfarbe"
 
-#: ttxtsubs.c:725
+#: ttxtsubs.c:705
 msgid "Custom Color"
 msgstr "Benutzerdefinierte Farbe"
 
-#: ttxtsubs.c:730
+#: ttxtsubs.c:710
 msgid "Red Value"
 msgstr "Roter Wert"
 
-#: ttxtsubs.c:731
+#: ttxtsubs.c:711
 msgid "Green Value"
 msgstr "Grüner Wert"
 
-#: ttxtsubs.c:732
+#: ttxtsubs.c:712
 msgid "Blue Value"
 msgstr "Blauer Wert"
 
-#: ttxtsubs.c:733
+#: ttxtsubs.c:713
 msgid "Transparency Value"
 msgstr "Transparenter Wert"
 
-#: ttxtsubs.c:743 ttxtsubs.c:751
+#: ttxtsubs.c:723 ttxtsubs.c:731
 msgid "Language"
 msgstr "Sprache"
 
-#: ttxtsubs.c:751
+#: ttxtsubs.c:731
 msgid "Hearing Impaired"
 msgstr "Gehörlose"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 024763e..5cc3069 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: 2008-12-13 21:40+0100\n"
+"POT-Creation-Date: 2008-12-13 21: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"
@@ -19,199 +19,199 @@ msgstr ""
 msgid "Teletext subtitles"
 msgstr "Subtítulos teletexto"
 
-#: ttxtsubs.c:291
+#: ttxtsubs.c:279
 msgid "Hide teletext subtitles"
 msgstr "Esconde subtítulos teletexto"
 
-#: ttxtsubs.c:293
+#: ttxtsubs.c:281
 msgid "Display teletext subtitles"
 msgstr "Visualiza subtítulos teletexto"
 
-#: ttxtsubs.c:296
+#: ttxtsubs.c:284
 msgid "Position Teletext Subtitles for 4:3/Anamorph"
 msgstr "Posiciona subtítulos teletexto para 4:3/anamórfico"
 
-#: ttxtsubs.c:298
+#: ttxtsubs.c:286
 msgid "Position Teletext Subtitles for Letterbox"
 msgstr "Posicióna subtítulos teletexto para Letterbox"
 
-#: ttxtsubs.c:300
+#: ttxtsubs.c:288
 msgid "Page Selection"
 msgstr "Selección página subtítulos"
 
-#: ttxtsubs.c:630
+#: ttxtsubs.c:612
 msgid "Display on/off"
 msgstr "Visualiza sí/no"
 
-#: ttxtsubs.c:631
+#: ttxtsubs.c:613
 msgid "4:3/Letterbox"
 msgstr "4:3/Letterbox"
 
-#: ttxtsubs.c:632
+#: ttxtsubs.c:614
 msgid "Page Mode"
 msgstr "Modo página"
 
-#: ttxtsubs.c:635
+#: ttxtsubs.c:617
 msgid "Left"
 msgstr "Izquierda"
 
-#: ttxtsubs.c:636
+#: ttxtsubs.c:618
 msgid "Center"
 msgstr "Centro"
 
-#: ttxtsubs.c:637
+#: ttxtsubs.c:619
 msgid "Right"
 msgstr "Derecha"
 
-#: ttxtsubs.c:640
+#: ttxtsubs.c:622
 msgid "All"
 msgstr "Todas"
 
-#: ttxtsubs.c:641
+#: ttxtsubs.c:623
 msgid "Only DVB-S"
 msgstr "Sólo DVB-S"
 
-#: ttxtsubs.c:642
+#: ttxtsubs.c:624
 msgid "Only DVB-T"
 msgstr "Sólo DVB-T"
 
-#: ttxtsubs.c:643
+#: ttxtsubs.c:625
 msgid "Only DVB-C"
 msgstr "Sólo DVB-C"
 
-#: ttxtsubs.c:646
+#: ttxtsubs.c:628
 msgid "Black"
 msgstr "Negro"
 
-#: ttxtsubs.c:647
+#: ttxtsubs.c:629
 msgid "White"
 msgstr "Blanco"
 
-#: ttxtsubs.c:648
+#: ttxtsubs.c:630
 msgid "Red"
 msgstr "Rojo"
 
-#: ttxtsubs.c:649
+#: ttxtsubs.c:631
 msgid "Green"
 msgstr "Verde"
 
-#: ttxtsubs.c:650
+#: ttxtsubs.c:632
 msgid "Yellow"
 msgstr "Amarillo"
 
-#: ttxtsubs.c:651
+#: ttxtsubs.c:633
 msgid "Magenta"
 msgstr "Magenta"
 
-#: ttxtsubs.c:652
+#: ttxtsubs.c:634
 msgid "Blue"
 msgstr "Azul"
 
-#: ttxtsubs.c:653
+#: ttxtsubs.c:635
 msgid "Cyan"
 msgstr "Cian"
 
-#: ttxtsubs.c:654
+#: ttxtsubs.c:636
 msgid "Custom"
 msgstr "Personalizado"
 
-#: ttxtsubs.c:655
+#: ttxtsubs.c:637
 msgid "Transparent"
 msgstr "Transparente"
 
-#: ttxtsubs.c:656
+#: ttxtsubs.c:638
 msgid "Grey"
 msgstr "Gris"
 
-#: ttxtsubs.c:680 ttxtsubspagemenu.c:35
+#: ttxtsubs.c:662 ttxtsubspagemenu.c:35
 msgid "Display Subtitles"
 msgstr "Visualiza subtítulos"
 
-#: ttxtsubs.c:681
+#: ttxtsubs.c:663
 msgid "Record Subtitles"
 msgstr "Graba subtítulos"
 
-#: ttxtsubs.c:682
+#: ttxtsubs.c:664
 msgid "Live Delay"
 msgstr "Retardo en directo"
 
-#: ttxtsubs.c:683
+#: ttxtsubs.c:665
 msgid "Replay Delay"
 msgstr "Retardo en reproducción"
 
-#: ttxtsubs.c:686
+#: ttxtsubs.c:668
 msgid "Main Menu Alternative"
 msgstr "Alternativa del menú principal"
 
-#: ttxtsubs.c:690
+#: ttxtsubs.c:672
 msgid "Text Horizontal Position"
 msgstr "´Posición horizontal del texto"
 
-#: ttxtsubs.c:692
+#: ttxtsubs.c:674
 msgid "Text Vertical Position"
 msgstr "Posición vertical del texto"
 
-#: ttxtsubs.c:693
+#: ttxtsubs.c:675
 msgid "4:3/Anamorph"
 msgstr "4:3/Anamórfico"
 
-#: ttxtsubs.c:693
+#: ttxtsubs.c:675
 msgid "Letterbox"
 msgstr "Letterbox"
 
-#: ttxtsubs.c:694
+#: ttxtsubs.c:676
 msgid "Text Vertical Adjust"
 msgstr "Ajuste vertical del texto"
 
-#: ttxtsubs.c:696
+#: ttxtsubs.c:678
 msgid "Line Spacing Adjust"
 msgstr "Ajuste distancia entre líneas"
 
-#: ttxtsubs.c:698
+#: ttxtsubs.c:680
 msgid "Workaround for some French chns"
 msgstr "Corrección para canales franceses"
 
-#: ttxtsubs.c:702
+#: ttxtsubs.c:684
 msgid "DVB Source Selection"
 msgstr "Selección fuente DVB"
 
-#: ttxtsubs.c:705
+#: ttxtsubs.c:686
 msgid "Font Size (pixel)"
 msgstr ""
 
-#: ttxtsubs.c:709
+#: ttxtsubs.c:689
 msgid "Text Color"
 msgstr "Color del texto"
 
-#: ttxtsubs.c:713
+#: ttxtsubs.c:693
 msgid "Background Color"
 msgstr "Color de fondo"
 
-#: ttxtsubs.c:725
+#: ttxtsubs.c:705
 msgid "Custom Color"
 msgstr "Color personalizado"
 
-#: ttxtsubs.c:730
+#: ttxtsubs.c:710
 msgid "Red Value"
 msgstr "Valor rojo"
 
-#: ttxtsubs.c:731
+#: ttxtsubs.c:711
 msgid "Green Value"
 msgstr "Valor verde"
 
-#: ttxtsubs.c:732
+#: ttxtsubs.c:712
 msgid "Blue Value"
 msgstr "Valor azul"
 
-#: ttxtsubs.c:733
+#: ttxtsubs.c:713
 msgid "Transparency Value"
 msgstr "Valor transparencia"
 
-#: ttxtsubs.c:743 ttxtsubs.c:751
+#: ttxtsubs.c:723 ttxtsubs.c:731
 msgid "Language"
 msgstr "Idioma"
 
-#: ttxtsubs.c:751
+#: ttxtsubs.c:731
 msgid "Hearing Impaired"
 msgstr "No oyente"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 401771c..17689b8 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: 2008-12-13 21:40+0100\n"
+"POT-Creation-Date: 2008-12-13 21: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"
@@ -22,199 +22,199 @@ msgstr ""
 msgid "Teletext subtitles"
 msgstr "Tekstitys (Teksti-TV)"
 
-#: ttxtsubs.c:291
+#: ttxtsubs.c:279
 msgid "Hide teletext subtitles"
 msgstr "Piilota tekstitys (Teksti-TV)"
 
-#: ttxtsubs.c:293
+#: ttxtsubs.c:281
 msgid "Display teletext subtitles"
 msgstr "Näytä tekstitys (Teksti-TV)"
 
-#: ttxtsubs.c:296
+#: ttxtsubs.c:284
 msgid "Position Teletext Subtitles for 4:3/Anamorph"
 msgstr "4:3/Anamorfinen tekstitys (Teksti-TV)"
 
-#: ttxtsubs.c:298
+#: ttxtsubs.c:286
 msgid "Position Teletext Subtitles for Letterbox"
 msgstr "Letterbox tekstitys (Teksti-TV)"
 
-#: ttxtsubs.c:300
+#: ttxtsubs.c:288
 msgid "Page Selection"
 msgstr "Tekstityssivun valinta"
 
-#: ttxtsubs.c:630
+#: ttxtsubs.c:612
 msgid "Display on/off"
 msgstr "aktivointi"
 
-#: ttxtsubs.c:631
+#: ttxtsubs.c:613
 msgid "4:3/Letterbox"
 msgstr "kuvasuhde"
 
-#: ttxtsubs.c:632
+#: ttxtsubs.c:614
 msgid "Page Mode"
 msgstr "sivun valinta"
 
-#: ttxtsubs.c:635
+#: ttxtsubs.c:617
 msgid "Left"
 msgstr "vasen"
 
-#: ttxtsubs.c:636
+#: ttxtsubs.c:618
 msgid "Center"
 msgstr "keskitä"
 
-#: ttxtsubs.c:637
+#: ttxtsubs.c:619
 msgid "Right"
 msgstr "oikea"
 
-#: ttxtsubs.c:640
+#: ttxtsubs.c:622
 msgid "All"
 msgstr "kaikki"
 
-#: ttxtsubs.c:641
+#: ttxtsubs.c:623
 msgid "Only DVB-S"
 msgstr "vain DVB-S"
 
-#: ttxtsubs.c:642
+#: ttxtsubs.c:624
 msgid "Only DVB-T"
 msgstr "vain DVB-T"
 
-#: ttxtsubs.c:643
+#: ttxtsubs.c:625
 msgid "Only DVB-C"
 msgstr "vain DVB-C"
 
-#: ttxtsubs.c:646
+#: ttxtsubs.c:628
 msgid "Black"
 msgstr "musta"
 
-#: ttxtsubs.c:647
+#: ttxtsubs.c:629
 msgid "White"
 msgstr "valkoinen"
 
-#: ttxtsubs.c:648
+#: ttxtsubs.c:630
 msgid "Red"
 msgstr "punainen"
 
-#: ttxtsubs.c:649
+#: ttxtsubs.c:631
 msgid "Green"
 msgstr "vihreä"
 
-#: ttxtsubs.c:650
+#: ttxtsubs.c:632
 msgid "Yellow"
 msgstr "keltainen"
 
-#: ttxtsubs.c:651
+#: ttxtsubs.c:633
 msgid "Magenta"
 msgstr "magenta"
 
-#: ttxtsubs.c:652
+#: ttxtsubs.c:634
 msgid "Blue"
 msgstr "sininen"
 
-#: ttxtsubs.c:653
+#: ttxtsubs.c:635
 msgid "Cyan"
 msgstr "syaani"
 
-#: ttxtsubs.c:654
+#: ttxtsubs.c:636
 msgid "Custom"
 msgstr "muokattava"
 
-#: ttxtsubs.c:655
+#: ttxtsubs.c:637
 msgid "Transparent"
 msgstr "läpinäkyvä"
 
-#: ttxtsubs.c:656
+#: ttxtsubs.c:638
 msgid "Grey"
 msgstr "harmaa"
 
-#: ttxtsubs.c:680 ttxtsubspagemenu.c:35
+#: ttxtsubs.c:662 ttxtsubspagemenu.c:35
 msgid "Display Subtitles"
 msgstr "Näytä tekstitykset"
 
-#: ttxtsubs.c:681
+#: ttxtsubs.c:663
 msgid "Record Subtitles"
 msgstr "Tallenna tekstitykset"
 
-#: ttxtsubs.c:682
+#: ttxtsubs.c:664
 msgid "Live Delay"
 msgstr "Viive Live-lähetyksessä"
 
-#: ttxtsubs.c:683
+#: ttxtsubs.c:665
 msgid "Replay Delay"
 msgstr "Viive toistossa"
 
-#: ttxtsubs.c:686
+#: ttxtsubs.c:668
 msgid "Main Menu Alternative"
 msgstr "Päävalikon toiminnot"
 
-#: ttxtsubs.c:690
+#: ttxtsubs.c:672
 msgid "Text Horizontal Position"
 msgstr "Vaakatasaus"
 
-#: ttxtsubs.c:692
+#: ttxtsubs.c:674
 msgid "Text Vertical Position"
 msgstr "Pystytasaus"
 
-#: ttxtsubs.c:693
+#: ttxtsubs.c:675
 msgid "4:3/Anamorph"
 msgstr "4:3/anamorfinen"
 
-#: ttxtsubs.c:693
+#: ttxtsubs.c:675
 msgid "Letterbox"
 msgstr "letterbox"
 
-#: ttxtsubs.c:694
+#: ttxtsubs.c:676
 msgid "Text Vertical Adjust"
 msgstr "Pystytasauksen hienosäätö"
 
-#: ttxtsubs.c:696
+#: ttxtsubs.c:678
 msgid "Line Spacing Adjust"
 msgstr "Rivivälin hienosäätö"
 
-#: ttxtsubs.c:698
+#: ttxtsubs.c:680
 msgid "Workaround for some French chns"
 msgstr "Ranskalainen silmänkääntötemppu"
 
-#: ttxtsubs.c:702
+#: ttxtsubs.c:684
 msgid "DVB Source Selection"
 msgstr "Tekstityslähteen valinta"
 
-#: ttxtsubs.c:705
+#: ttxtsubs.c:686
 msgid "Font Size (pixel)"
 msgstr "Kirjasintyypin koko (px)"
 
-#: ttxtsubs.c:709
+#: ttxtsubs.c:689
 msgid "Text Color"
 msgstr "Kirjasimen väri"
 
-#: ttxtsubs.c:713
+#: ttxtsubs.c:693
 msgid "Background Color"
 msgstr "Taustaväri"
 
-#: ttxtsubs.c:725
+#: ttxtsubs.c:705
 msgid "Custom Color"
 msgstr "Muokattava väri"
 
-#: ttxtsubs.c:730
+#: ttxtsubs.c:710
 msgid "Red Value"
 msgstr "Punainen"
 
-#: ttxtsubs.c:731
+#: ttxtsubs.c:711
 msgid "Green Value"
 msgstr "Vihreä"
 
-#: ttxtsubs.c:732
+#: ttxtsubs.c:712
 msgid "Blue Value"
 msgstr "Sininen"
 
-#: ttxtsubs.c:733
+#: ttxtsubs.c:713
 msgid "Transparency Value"
 msgstr "Läpinäkyvyys"
 
-#: ttxtsubs.c:743 ttxtsubs.c:751
+#: ttxtsubs.c:723 ttxtsubs.c:731
 msgid "Language"
 msgstr "Tekstityskieli"
 
-#: ttxtsubs.c:751
+#: ttxtsubs.c:731
 msgid "Hearing Impaired"
 msgstr "kuulorajoitteisille"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 5a576a2..33a42e6 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: 2008-12-13 21:40+0100\n"
+"POT-Creation-Date: 2008-12-13 21:47+0100\n"
 "PO-Revision-Date: 2007-08-24 23:49+0300\n"
 "Last-Translator: Nicolas Huillard <nhuillard@e-dition.fr>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -22,199 +22,199 @@ msgstr ""
 msgid "Teletext subtitles"
 msgstr "Sous-titrage télétexte"
 
-#: ttxtsubs.c:291
+#: ttxtsubs.c:279
 msgid "Hide teletext subtitles"
 msgstr "Masquer le sous-titrage"
 
-#: ttxtsubs.c:293
+#: ttxtsubs.c:281
 msgid "Display teletext subtitles"
 msgstr "Afficher le sous-titrage"
 
-#: ttxtsubs.c:296
+#: ttxtsubs.c:284
 msgid "Position Teletext Subtitles for 4:3/Anamorph"
 msgstr "Position du sous-titrage pour 4:3/Anamorph"
 
-#: ttxtsubs.c:298
+#: ttxtsubs.c:286
 msgid "Position Teletext Subtitles for Letterbox"
 msgstr "Position du sous-titrage pour Letterbox"
 
-#: ttxtsubs.c:300
+#: ttxtsubs.c:288
 msgid "Page Selection"
 msgstr "Page de sélection"
 
-#: ttxtsubs.c:630
+#: ttxtsubs.c:612
 msgid "Display on/off"
 msgstr "Affichage"
 
-#: ttxtsubs.c:631
+#: ttxtsubs.c:613
 msgid "4:3/Letterbox"
 msgstr "4:3/Letterbox"
 
-#: ttxtsubs.c:632
+#: ttxtsubs.c:614
 msgid "Page Mode"
 msgstr "Mode page"
 
-#: ttxtsubs.c:635
+#: ttxtsubs.c:617
 msgid "Left"
 msgstr "Gauche"
 
-#: ttxtsubs.c:636
+#: ttxtsubs.c:618
 msgid "Center"
 msgstr "Centre"
 
-#: ttxtsubs.c:637
+#: ttxtsubs.c:619
 msgid "Right"
 msgstr "Droite"
 
-#: ttxtsubs.c:640
+#: ttxtsubs.c:622
 msgid "All"
 msgstr "Tous"
 
-#: ttxtsubs.c:641
+#: ttxtsubs.c:623
 msgid "Only DVB-S"
 msgstr "Seulement DVB-S"
 
-#: ttxtsubs.c:642
+#: ttxtsubs.c:624
 msgid "Only DVB-T"
 msgstr "Seulement DVB-T"
 
-#: ttxtsubs.c:643
+#: ttxtsubs.c:625
 msgid "Only DVB-C"
 msgstr "Seulement DVB-C"
 
-#: ttxtsubs.c:646
+#: ttxtsubs.c:628
 msgid "Black"
 msgstr "Noir"
 
-#: ttxtsubs.c:647
+#: ttxtsubs.c:629
 msgid "White"
 msgstr "Blanc"
 
-#: ttxtsubs.c:648
+#: ttxtsubs.c:630
 msgid "Red"
 msgstr "Rouge"
 
-#: ttxtsubs.c:649
+#: ttxtsubs.c:631
 msgid "Green"
 msgstr "Vert"
 
-#: ttxtsubs.c:650
+#: ttxtsubs.c:632
 msgid "Yellow"
 msgstr "Jaune"
 
-#: ttxtsubs.c:651
+#: ttxtsubs.c:633
 msgid "Magenta"
 msgstr "Magenta"
 
-#: ttxtsubs.c:652
+#: ttxtsubs.c:634
 msgid "Blue"
 msgstr "Bleu"
 
-#: ttxtsubs.c:653
+#: ttxtsubs.c:635
 msgid "Cyan"
 msgstr "Cyan"
 
-#: ttxtsubs.c:654
+#: ttxtsubs.c:636
 msgid "Custom"
 msgstr "Personnalisé"
 
-#: ttxtsubs.c:655
+#: ttxtsubs.c:637
 msgid "Transparent"
 msgstr "Transparent"
 
-#: ttxtsubs.c:656
+#: ttxtsubs.c:638
 msgid "Grey"
 msgstr "Gris"
 
-#: ttxtsubs.c:680 ttxtsubspagemenu.c:35
+#: ttxtsubs.c:662 ttxtsubspagemenu.c:35
 msgid "Display Subtitles"
 msgstr "Afficher le sous-titrage"
 
-#: ttxtsubs.c:681
+#: ttxtsubs.c:663
 msgid "Record Subtitles"
 msgstr "Enregistrer le sous-titrage"
 
-#: ttxtsubs.c:682
+#: ttxtsubs.c:664
 msgid "Live Delay"
 msgstr ""
 
-#: ttxtsubs.c:683
+#: ttxtsubs.c:665
 msgid "Replay Delay"
 msgstr ""
 
-#: ttxtsubs.c:686
+#: ttxtsubs.c:668
 msgid "Main Menu Alternative"
 msgstr "Choix du menu principal"
 
-#: ttxtsubs.c:690
+#: ttxtsubs.c:672
 msgid "Text Horizontal Position"
 msgstr "Position horizontale du texte"
 
-#: ttxtsubs.c:692
+#: ttxtsubs.c:674
 msgid "Text Vertical Position"
 msgstr "Position verticale du texte"
 
-#: ttxtsubs.c:693
+#: ttxtsubs.c:675
 msgid "4:3/Anamorph"
 msgstr "4:3/Anamorph"
 
-#: ttxtsubs.c:693
+#: ttxtsubs.c:675
 msgid "Letterbox"
 msgstr "Letterbox"
 
-#: ttxtsubs.c:694
+#: ttxtsubs.c:676
 msgid "Text Vertical Adjust"
 msgstr "Ajustement vertical du texte"
 
-#: ttxtsubs.c:696
+#: ttxtsubs.c:678
 msgid "Line Spacing Adjust"
 msgstr "Espacement des lignes"
 
-#: ttxtsubs.c:698
+#: ttxtsubs.c:680
 msgid "Workaround for some French chns"
 msgstr "Contournement chaînes françaises"
 
-#: ttxtsubs.c:702
+#: ttxtsubs.c:684
 msgid "DVB Source Selection"
 msgstr "Sélection Source DVB"
 
-#: ttxtsubs.c:705
+#: ttxtsubs.c:686
 msgid "Font Size (pixel)"
 msgstr "Taille Police (pixel)"
 
-#: ttxtsubs.c:709
+#: ttxtsubs.c:689
 msgid "Text Color"
 msgstr "Couleur du texte"
 
-#: ttxtsubs.c:713
+#: ttxtsubs.c:693
 msgid "Background Color"
 msgstr "Couleur du fond"
 
-#: ttxtsubs.c:725
+#: ttxtsubs.c:705
 msgid "Custom Color"
 msgstr "Couleur personnalisée"
 
-#: ttxtsubs.c:730
+#: ttxtsubs.c:710
 msgid "Red Value"
 msgstr "Valeur Rouge"
 
-#: ttxtsubs.c:731
+#: ttxtsubs.c:711
 msgid "Green Value"
 msgstr "Valeur Vert"
 
-#: ttxtsubs.c:732
+#: ttxtsubs.c:712
 msgid "Blue Value"
 msgstr "Valeur Bleu"
 
-#: ttxtsubs.c:733
+#: ttxtsubs.c:713
 msgid "Transparency Value"
 msgstr "Valeur de transparence"
 
-#: ttxtsubs.c:743 ttxtsubs.c:751
+#: ttxtsubs.c:723 ttxtsubs.c:731
 msgid "Language"
 msgstr "Langues"
 
-#: ttxtsubs.c:751
+#: ttxtsubs.c:731
 msgid "Hearing Impaired"
 msgstr "Malentendant"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index f0c6354..48454cb 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: 2008-12-13 21:40+0100\n"
+"POT-Creation-Date: 2008-12-13 21:47+0100\n"
 "PO-Revision-Date: 2007-08-24 23:49+0300\n"
 "Last-Translator: Sean Carlos <seanc@libero.it>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -21,199 +21,199 @@ msgstr ""
 msgid "Teletext subtitles"
 msgstr "Sottotitoli televideo"
 
-#: ttxtsubs.c:291
+#: ttxtsubs.c:279
 msgid "Hide teletext subtitles"
 msgstr "Nascondi sottotitoli televideo"
 
-#: ttxtsubs.c:293
+#: ttxtsubs.c:281
 msgid "Display teletext subtitles"
 msgstr "Visualizza sottotitoli televideo"
 
-#: ttxtsubs.c:296
+#: ttxtsubs.c:284
 msgid "Position Teletext Subtitles for 4:3/Anamorph"
 msgstr "Posizionare sottotitoli per 4:3/anamorfico"
 
-#: ttxtsubs.c:298
+#: ttxtsubs.c:286
 msgid "Position Teletext Subtitles for Letterbox"
 msgstr "Posizionare sottotitoli per Letterbox"
 
-#: ttxtsubs.c:300
+#: ttxtsubs.c:288
 msgid "Page Selection"
 msgstr "Selezione pagina"
 
-#: ttxtsubs.c:630
+#: ttxtsubs.c:612
 msgid "Display on/off"
 msgstr "Visualizza sì/no"
 
-#: ttxtsubs.c:631
+#: ttxtsubs.c:613
 msgid "4:3/Letterbox"
 msgstr "4:3/Letterbox"
 
-#: ttxtsubs.c:632
+#: ttxtsubs.c:614
 msgid "Page Mode"
 msgstr "Modo pagina"
 
-#: ttxtsubs.c:635
+#: ttxtsubs.c:617
 msgid "Left"
 msgstr "Sinistra"
 
-#: ttxtsubs.c:636
+#: ttxtsubs.c:618
 msgid "Center"
 msgstr "Centro"
 
-#: ttxtsubs.c:637
+#: ttxtsubs.c:619
 msgid "Right"
 msgstr "Destra"
 
-#: ttxtsubs.c:640
+#: ttxtsubs.c:622
 msgid "All"
 msgstr "Tutte"
 
-#: ttxtsubs.c:641
+#: ttxtsubs.c:623
 msgid "Only DVB-S"
 msgstr "Solo DVB-S"
 
-#: ttxtsubs.c:642
+#: ttxtsubs.c:624
 msgid "Only DVB-T"
 msgstr "Solo DVB-T"
 
-#: ttxtsubs.c:643
+#: ttxtsubs.c:625
 msgid "Only DVB-C"
 msgstr "Solo DVB-C"
 
-#: ttxtsubs.c:646
+#: ttxtsubs.c:628
 msgid "Black"
 msgstr "Nero"
 
-#: ttxtsubs.c:647
+#: ttxtsubs.c:629
 msgid "White"
 msgstr "Bianco"
 
-#: ttxtsubs.c:648
+#: ttxtsubs.c:630
 msgid "Red"
 msgstr "Rosso"
 
-#: ttxtsubs.c:649
+#: ttxtsubs.c:631
 msgid "Green"
 msgstr "Verde"
 
-#: ttxtsubs.c:650
+#: ttxtsubs.c:632
 msgid "Yellow"
 msgstr "Giallo"
 
-#: ttxtsubs.c:651
+#: ttxtsubs.c:633
 msgid "Magenta"
 msgstr "Magenta"
 
-#: ttxtsubs.c:652
+#: ttxtsubs.c:634
 msgid "Blue"
 msgstr "Azzurro"
 
-#: ttxtsubs.c:653
+#: ttxtsubs.c:635
 msgid "Cyan"
 msgstr "Ciano"
 
-#: ttxtsubs.c:654
+#: ttxtsubs.c:636
 msgid "Custom"
 msgstr "Personalizzato"
 
-#: ttxtsubs.c:655
+#: ttxtsubs.c:637
 msgid "Transparent"
 msgstr "Trasparente"
 
-#: ttxtsubs.c:656
+#: ttxtsubs.c:638
 msgid "Grey"
 msgstr "Grigio"
 
-#: ttxtsubs.c:680 ttxtsubspagemenu.c:35
+#: ttxtsubs.c:662 ttxtsubspagemenu.c:35
 msgid "Display Subtitles"
 msgstr "Visualizza sottotitoli"
 
-#: ttxtsubs.c:681
+#: ttxtsubs.c:663
 msgid "Record Subtitles"
 msgstr "Registra sottotitoli"
 
-#: ttxtsubs.c:682
+#: ttxtsubs.c:664
 msgid "Live Delay"
 msgstr "Ritardo in diretta"
 
-#: ttxtsubs.c:683
+#: ttxtsubs.c:665
 msgid "Replay Delay"
 msgstr "Ritardo in riproduzione"
 
-#: ttxtsubs.c:686
+#: ttxtsubs.c:668
 msgid "Main Menu Alternative"
 msgstr "Alternativa menù principale"
 
-#: ttxtsubs.c:690
+#: ttxtsubs.c:672
 msgid "Text Horizontal Position"
 msgstr "Posizione testo orizzontale"
 
-#: ttxtsubs.c:692
+#: ttxtsubs.c:674
 msgid "Text Vertical Position"
 msgstr "Posizione testo verticale"
 
-#: ttxtsubs.c:693
+#: ttxtsubs.c:675
 msgid "4:3/Anamorph"
 msgstr "4:3/anamorfico"
 
-#: ttxtsubs.c:693
+#: ttxtsubs.c:675
 msgid "Letterbox"
 msgstr "Letterbox"
 
-#: ttxtsubs.c:694
+#: ttxtsubs.c:676
 msgid "Text Vertical Adjust"
 msgstr "Correzione testo verticale"
 
-#: ttxtsubs.c:696
+#: ttxtsubs.c:678
 msgid "Line Spacing Adjust"
 msgstr "Correzione interlinea"
 
-#: ttxtsubs.c:698
+#: ttxtsubs.c:680
 msgid "Workaround for some French chns"
 msgstr "Correzione per canali francesi"
 
-#: ttxtsubs.c:702
+#: ttxtsubs.c:684
 msgid "DVB Source Selection"
 msgstr "Selezione sorgente DVB"
 
-#: ttxtsubs.c:705
+#: ttxtsubs.c:686
 msgid "Font Size (pixel)"
 msgstr ""
 
-#: ttxtsubs.c:709
+#: ttxtsubs.c:689
 msgid "Text Color"
 msgstr "Colore testo"
 
-#: ttxtsubs.c:713
+#: ttxtsubs.c:693
 msgid "Background Color"
 msgstr "Colore sfondo"
 
-#: ttxtsubs.c:725
+#: ttxtsubs.c:705
 msgid "Custom Color"
 msgstr "Colore personalizzato"
 
-#: ttxtsubs.c:730
+#: ttxtsubs.c:710
 msgid "Red Value"
 msgstr "Valore rosso"
 
-#: ttxtsubs.c:731
+#: ttxtsubs.c:711
 msgid "Green Value"
 msgstr "Valore verde"
 
-#: ttxtsubs.c:732
+#: ttxtsubs.c:712
 msgid "Blue Value"
 msgstr "Valore azzurro"
 
-#: ttxtsubs.c:733
+#: ttxtsubs.c:713
 msgid "Transparency Value"
 msgstr "Valore trasparenza"
 
-#: ttxtsubs.c:743 ttxtsubs.c:751
+#: ttxtsubs.c:723 ttxtsubs.c:731
 msgid "Language"
 msgstr "Lingua"
 
-#: ttxtsubs.c:751
+#: ttxtsubs.c:731
 msgid "Hearing Impaired"
 msgstr "Non udente"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 9cee423..5429953 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: 2008-12-13 21:40+0100\n"
+"POT-Creation-Date: 2008-12-13 21:47+0100\n"
 "PO-Revision-Date: 2007-08-24 23:49+0300\n"
 "Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -19,199 +19,199 @@ msgstr ""
 msgid "Teletext subtitles"
 msgstr "ÂÕÛÕâÕÚáâ-áãÑâØâàë"
 
-#: ttxtsubs.c:291
+#: ttxtsubs.c:279
 msgid "Hide teletext subtitles"
 msgstr "ÁÚàëâì áãÑâØâàë"
 
-#: ttxtsubs.c:293
+#: ttxtsubs.c:281
 msgid "Display teletext subtitles"
 msgstr "¿ÞÚÐ×ëÒÐâì áãÑâØâàë"
 
-#: ttxtsubs.c:296
+#: ttxtsubs.c:284
 msgid "Position Teletext Subtitles for 4:3/Anamorph"
 msgstr "ÁãÑâØâàë Ò ÚÐÔàÕ 4:3"
 
-#: ttxtsubs.c:298
+#: ttxtsubs.c:286
 msgid "Position Teletext Subtitles for Letterbox"
 msgstr "ÁãÑâØâàë Ò ÚÐÔàÕ èØàÞÚÞíÚàÐÝÝÞÓÞ äØÛìÜÐ"
 
-#: ttxtsubs.c:300
+#: ttxtsubs.c:288
 msgid "Page Selection"
 msgstr ""
 
-#: ttxtsubs.c:630
+#: ttxtsubs.c:612
 msgid "Display on/off"
 msgstr "ÒÚÛîçØâì/ÒëÚÛîçØâì"
 
-#: ttxtsubs.c:631
+#: ttxtsubs.c:613
 msgid "4:3/Letterbox"
 msgstr "4:3/èØàÞÚØÙ íÚàÐÝ"
 
-#: ttxtsubs.c:632
+#: ttxtsubs.c:614
 msgid "Page Mode"
 msgstr ""
 
-#: ttxtsubs.c:635
+#: ttxtsubs.c:617
 msgid "Left"
 msgstr "áÛÕÒÐ"
 
-#: ttxtsubs.c:636
+#: ttxtsubs.c:618
 msgid "Center"
 msgstr "Ò æÕÝâàÕ"
 
-#: ttxtsubs.c:637
+#: ttxtsubs.c:619
 msgid "Right"
 msgstr "áßàÐÒÐ"
 
-#: ttxtsubs.c:640
+#: ttxtsubs.c:622
 msgid "All"
 msgstr ""
 
-#: ttxtsubs.c:641
+#: ttxtsubs.c:623
 msgid "Only DVB-S"
 msgstr ""
 
-#: ttxtsubs.c:642
+#: ttxtsubs.c:624
 msgid "Only DVB-T"
 msgstr ""
 
-#: ttxtsubs.c:643
+#: ttxtsubs.c:625
 msgid "Only DVB-C"
 msgstr ""
 
-#: ttxtsubs.c:646
+#: ttxtsubs.c:628
 msgid "Black"
 msgstr "çñàÝëÙ"
 
-#: ttxtsubs.c:647
+#: ttxtsubs.c:629
 msgid "White"
 msgstr "ÑÕÛëÙ"
 
-#: ttxtsubs.c:648
+#: ttxtsubs.c:630
 msgid "Red"
 msgstr "ÚàÐáÝëÙ"
 
-#: ttxtsubs.c:649
+#: ttxtsubs.c:631
 msgid "Green"
 msgstr "×ÕÛñÝëÙ"
 
-#: ttxtsubs.c:650
+#: ttxtsubs.c:632
 msgid "Yellow"
 msgstr "ÖñÛâëÙ"
 
-#: ttxtsubs.c:651
+#: ttxtsubs.c:633
 msgid "Magenta"
 msgstr "ßãàßãàÝëÙ"
 
-#: ttxtsubs.c:652
+#: ttxtsubs.c:634
 msgid "Blue"
 msgstr "áØÝØÙ"
 
-#: ttxtsubs.c:653
+#: ttxtsubs.c:635
 msgid "Cyan"
 msgstr "ÓÞÛãÑÞÙ"
 
-#: ttxtsubs.c:654
+#: ttxtsubs.c:636
 msgid "Custom"
 msgstr "ÝÐáâàÐØÒÐÕÜëÙ"
 
-#: ttxtsubs.c:655
+#: ttxtsubs.c:637
 msgid "Transparent"
 msgstr "ßàÞ×àÐçÝëÙ"
 
-#: ttxtsubs.c:656
+#: ttxtsubs.c:638
 msgid "Grey"
 msgstr "áÕàëÙ"
 
-#: ttxtsubs.c:680 ttxtsubspagemenu.c:35
+#: ttxtsubs.c:662 ttxtsubspagemenu.c:35
 msgid "Display Subtitles"
 msgstr "¿ÞÚÐ×ëÒÐâì áãÑâØâàë"
 
-#: ttxtsubs.c:681
+#: ttxtsubs.c:663
 msgid "Record Subtitles"
 msgstr "·ÐßØáëÒÐâì áãÑâØâàë"
 
-#: ttxtsubs.c:682
+#: ttxtsubs.c:664
 msgid "Live Delay"
 msgstr ""
 
-#: ttxtsubs.c:683
+#: ttxtsubs.c:665
 msgid "Replay Delay"
 msgstr ""
 
-#: ttxtsubs.c:686
+#: ttxtsubs.c:668
 msgid "Main Menu Alternative"
 msgstr "ºÞÜÐÝÔÐ Ò ÓÛÐÒÝÞÜ ÜÕÝî"
 
-#: ttxtsubs.c:690
+#: ttxtsubs.c:672
 msgid "Text Horizontal Position"
 msgstr "ÀÐ×ÜÕéÕÝØÕ âÕÚáâÐ ßÞ ÓÞàØ×ÞÝâÐÛØ"
 
-#: ttxtsubs.c:692
+#: ttxtsubs.c:674
 msgid "Text Vertical Position"
 msgstr "ÀÐ×ÜÕéÕÝØÕ âÕÚáâÐ ßÞ ÒÕàâØÚÐÛØ"
 
-#: ttxtsubs.c:693
+#: ttxtsubs.c:675
 msgid "4:3/Anamorph"
 msgstr "4:3"
 
-#: ttxtsubs.c:693
+#: ttxtsubs.c:675
 msgid "Letterbox"
 msgstr "èØàÞÚØÙ íÚàÐÝ"
 
-#: ttxtsubs.c:694
+#: ttxtsubs.c:676
 msgid "Text Vertical Adjust"
 msgstr "²ÕàâØÚÐÛìÝëÙ áÔÒØÓ âÕÚáâÐ"
 
-#: ttxtsubs.c:696
+#: ttxtsubs.c:678
 msgid "Line Spacing Adjust"
 msgstr "ÀÐááâÞïÝØÕ ÜÕÖÔã áâàÞÚÐÜØ"
 
-#: ttxtsubs.c:698
+#: ttxtsubs.c:680
 msgid "Workaround for some French chns"
 msgstr "ÁßÕæ. ÝÐáâàÞÙÚØ ÔÛï äàÐÝæ. ÚÐÝÐÛÞÒ"
 
-#: ttxtsubs.c:702
+#: ttxtsubs.c:684
 msgid "DVB Source Selection"
 msgstr ""
 
-#: ttxtsubs.c:705
+#: ttxtsubs.c:686
 msgid "Font Size (pixel)"
 msgstr ""
 
-#: ttxtsubs.c:709
+#: ttxtsubs.c:689
 msgid "Text Color"
 msgstr "ÆÒÕâ âÕÚáâÐ"
 
-#: ttxtsubs.c:713
+#: ttxtsubs.c:693
 msgid "Background Color"
 msgstr "ÆÒÕâ äÞÝÐ"
 
-#: ttxtsubs.c:725
+#: ttxtsubs.c:705
 msgid "Custom Color"
 msgstr "½ÐáâàÐØÒÐÕÜëÙ æÒÕâ"
 
-#: ttxtsubs.c:730
+#: ttxtsubs.c:710
 msgid "Red Value"
 msgstr "ÃàÞÒÕÝì ÚàÐáÝÞÓÞ"
 
-#: ttxtsubs.c:731
+#: ttxtsubs.c:711
 msgid "Green Value"
 msgstr "ÃàÞÒÕÝì ×ÕÛñÝÞÓÞ"
 
-#: ttxtsubs.c:732
+#: ttxtsubs.c:712
 msgid "Blue Value"
 msgstr "ÃàÞÒÕÝì áØÝÕÓÞ"
 
-#: ttxtsubs.c:733
+#: ttxtsubs.c:713
 msgid "Transparency Value"
 msgstr "ÁâÕßÕÝì ßàÞ×àÐçÝÞáâØ"
 
-#: ttxtsubs.c:743 ttxtsubs.c:751
+#: ttxtsubs.c:723 ttxtsubs.c:731
 msgid "Language"
 msgstr "Ï×ëÚ"
 
-#: ttxtsubs.c:751
+#: ttxtsubs.c:731
 msgid "Hearing Impaired"
 msgstr "ÔÛï áÛÐÑÞáÛëèÐéØå"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index d42ed02..510e9d6 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: 2008-12-13 21:40+0100\n"
+"POT-Creation-Date: 2008-12-13 21: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"
@@ -20,199 +20,199 @@ msgstr ""
 msgid "Teletext subtitles"
 msgstr "Textning (Text-TV)"
 
-#: ttxtsubs.c:291
+#: ttxtsubs.c:279
 msgid "Hide teletext subtitles"
 msgstr "Göm textning (Text-TV)"
 
-#: ttxtsubs.c:293
+#: ttxtsubs.c:281
 msgid "Display teletext subtitles"
 msgstr "Visa textning (Text-TV)"
 
-#: ttxtsubs.c:296
+#: ttxtsubs.c:284
 msgid "Position Teletext Subtitles for 4:3/Anamorph"
 msgstr "Textning för 4:3/anamorf (Text-TV)"
 
-#: ttxtsubs.c:298
+#: ttxtsubs.c:286
 msgid "Position Teletext Subtitles for Letterbox"
 msgstr "Textning för brevlådeformat (Text-TV)"
 
-#: ttxtsubs.c:300
+#: ttxtsubs.c:288
 msgid "Page Selection"
 msgstr ""
 
-#: ttxtsubs.c:630
+#: ttxtsubs.c:612
 msgid "Display on/off"
 msgstr "Visa textning på/av"
 
-#: ttxtsubs.c:631
+#: ttxtsubs.c:613
 msgid "4:3/Letterbox"
 msgstr "4:3/brevlådeformat"
 
-#: ttxtsubs.c:632
+#: ttxtsubs.c:614
 msgid "Page Mode"
 msgstr ""
 
-#: ttxtsubs.c:635
+#: ttxtsubs.c:617
 msgid "Left"
 msgstr "vänster"
 
-#: ttxtsubs.c:636
+#: ttxtsubs.c:618
 msgid "Center"
 msgstr "centrerad"
 
-#: ttxtsubs.c:637
+#: ttxtsubs.c:619
 msgid "Right"
 msgstr "höger"
 
-#: ttxtsubs.c:640
+#: ttxtsubs.c:622
 msgid "All"
 msgstr ""
 
-#: ttxtsubs.c:641
+#: ttxtsubs.c:623
 msgid "Only DVB-S"
 msgstr ""
 
-#: ttxtsubs.c:642
+#: ttxtsubs.c:624
 msgid "Only DVB-T"
 msgstr ""
 
-#: ttxtsubs.c:643
+#: ttxtsubs.c:625
 msgid "Only DVB-C"
 msgstr ""
 
-#: ttxtsubs.c:646
+#: ttxtsubs.c:628
 msgid "Black"
 msgstr "svart"
 
-#: ttxtsubs.c:647
+#: ttxtsubs.c:629
 msgid "White"
 msgstr "vit"
 
-#: ttxtsubs.c:648
+#: ttxtsubs.c:630
 msgid "Red"
 msgstr "röd"
 
-#: ttxtsubs.c:649
+#: ttxtsubs.c:631
 msgid "Green"
 msgstr "grön"
 
-#: ttxtsubs.c:650
+#: ttxtsubs.c:632
 msgid "Yellow"
 msgstr "gul"
 
-#: ttxtsubs.c:651
+#: ttxtsubs.c:633
 msgid "Magenta"
 msgstr "magenta"
 
-#: ttxtsubs.c:652
+#: ttxtsubs.c:634
 msgid "Blue"
 msgstr "blå"
 
-#: ttxtsubs.c:653
+#: ttxtsubs.c:635
 msgid "Cyan"
 msgstr "cyan"
 
-#: ttxtsubs.c:654
+#: ttxtsubs.c:636
 msgid "Custom"
 msgstr ""
 
-#: ttxtsubs.c:655
+#: ttxtsubs.c:637
 msgid "Transparent"
 msgstr "transparent"
 
-#: ttxtsubs.c:656
+#: ttxtsubs.c:638
 msgid "Grey"
 msgstr "grå"
 
-#: ttxtsubs.c:680 ttxtsubspagemenu.c:35
+#: ttxtsubs.c:662 ttxtsubspagemenu.c:35
 msgid "Display Subtitles"
 msgstr "Visa textning"
 
-#: ttxtsubs.c:681
+#: ttxtsubs.c:663
 msgid "Record Subtitles"
 msgstr "Spela in textning"
 
-#: ttxtsubs.c:682
+#: ttxtsubs.c:664
 msgid "Live Delay"
 msgstr ""
 
-#: ttxtsubs.c:683
+#: ttxtsubs.c:665
 msgid "Replay Delay"
 msgstr ""
 
-#: ttxtsubs.c:686
+#: ttxtsubs.c:668
 msgid "Main Menu Alternative"
 msgstr "Huvudmenyalternativ"
 
-#: ttxtsubs.c:690
+#: ttxtsubs.c:672
 msgid "Text Horizontal Position"
 msgstr "Horisontell position"
 
-#: ttxtsubs.c:692
+#: ttxtsubs.c:674
 msgid "Text Vertical Position"
 msgstr "Vertikal positon"
 
-#: ttxtsubs.c:693
+#: ttxtsubs.c:675
 msgid "4:3/Anamorph"
 msgstr "4:3/anamorf"
 
-#: ttxtsubs.c:693
+#: ttxtsubs.c:675
 msgid "Letterbox"
 msgstr "brevlådeformat"
 
-#: ttxtsubs.c:694
+#: ttxtsubs.c:676
 msgid "Text Vertical Adjust"
 msgstr "Vertikal justering"
 
-#: ttxtsubs.c:696
+#: ttxtsubs.c:678
 msgid "Line Spacing Adjust"
 msgstr "Radavstånd"
 
-#: ttxtsubs.c:698
+#: ttxtsubs.c:680
 msgid "Workaround for some French chns"
 msgstr "Fix för vissa franska kanaler"
 
-#: ttxtsubs.c:702
+#: ttxtsubs.c:684
 msgid "DVB Source Selection"
 msgstr ""
 
-#: ttxtsubs.c:705
+#: ttxtsubs.c:686
 msgid "Font Size (pixel)"
 msgstr ""
 
-#: ttxtsubs.c:709
+#: ttxtsubs.c:689
 msgid "Text Color"
 msgstr "Färg på text"
 
-#: ttxtsubs.c:713
+#: ttxtsubs.c:693
 msgid "Background Color"
 msgstr "Färg på bakgrund"
 
-#: ttxtsubs.c:725
+#: ttxtsubs.c:705
 msgid "Custom Color"
 msgstr ""
 
-#: ttxtsubs.c:730
+#: ttxtsubs.c:710
 msgid "Red Value"
 msgstr ""
 
-#: ttxtsubs.c:731
+#: ttxtsubs.c:711
 msgid "Green Value"
 msgstr ""
 
-#: ttxtsubs.c:732
+#: ttxtsubs.c:712
 msgid "Blue Value"
 msgstr ""
 
-#: ttxtsubs.c:733
+#: ttxtsubs.c:713
 msgid "Transparency Value"
 msgstr ""
 
-#: ttxtsubs.c:743 ttxtsubs.c:751
+#: ttxtsubs.c:723 ttxtsubs.c:731
 msgid "Language"
 msgstr "Språk"
 
-#: ttxtsubs.c:751
+#: ttxtsubs.c:731
 msgid "Hearing Impaired"
 msgstr "Nedsatt hörsel"
 
diff --git a/teletext.c b/teletext.c
index e3e48f4..768bdc8 100644
--- a/teletext.c
+++ b/teletext.c
@@ -119,14 +119,10 @@ uint16_t ttxt_laG0_la1_char(int Gtriplet, int natopts, uint8_t inchar)
   if(!laG0_nat_replace_map[c])
     return c;
   else
-#if defined(APIVERSNUM) && APIVERSNUM < 10503
-    return laG0_nat_opts[no][laG0_nat_replace_map[c]];
-#else
     if (cCharSetConv::SystemCharacterTable())
        return laG0_nat_opts[no][laG0_nat_replace_map[c]];
     else
        return laG0_nat_opts16[no][laG0_nat_replace_map[c]];
-#endif
 }
 
 /*
diff --git a/ttxtsubs.c b/ttxtsubs.c
index 53fc195..dcfc532 100644
--- a/ttxtsubs.c
+++ b/ttxtsubs.c
@@ -248,20 +248,8 @@ bool cPluginTtxtsubs::Start(void)
       globals.mHearingImpaireds[0][1] = mOldHearingImpaired;
     } else {
       // get lang from OSD lang
-#if defined(APIVERSNUM) && APIVERSNUM < 10507
-      int n = Setup.OSDLanguage + 1;
-      if(n > gNumLanguages) {
-	strncpy(globals.mLanguages[0][0], "eng", 4);
-      } else {
-	strncpy(globals.mLanguages[0][0], gLanguages[n][0], 4);
-	globals.mLanguages[0][0][3] = '\0';
-	strncpy(globals.mLanguages[0][1], gLanguages[n][1], 4);
-	globals.mLanguages[0][1][3] = '\0';
-      }
-#else
       strncpy(globals.mLanguages[0][0], Setup.OSDLanguage, 4);
       globals.mLanguages[0][0][3] = '\0';
-#endif
     }
   }
 
@@ -343,9 +331,7 @@ bool cPluginTtxtsubs::SetupParse(const char *Name, const char *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);
-#if defined(APIVERSNUM) && APIVERSNUM >= 10503
   else if(!strcasecmp(Name, "FontSize")) globals.mFontSize = atoi(Value);
-#endif
   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);
@@ -412,11 +398,7 @@ void cPluginTtxtsubs::Action(void)
                         globals.mI18nLanguage = i - 1;
                       }
                    }
-#if defined(APIVERSNUM) && APIVERSNUM < 10507
-                   if(globals.mI18nLanguage < 0 || globals.mI18nLanguage >= I18nNumLanguages)
-#else
                    if(globals.mI18nLanguage < 0 || globals.mI18nLanguage >= I18nLanguages()->Size())
-#endif
                      globals.mI18nLanguage = 0; // default to iso8859-1 if no predefined charset
                    StartTtxtLive(dev, c->GetChannelID(), pid, page);
                    FreeTtxtInfoData(&info);
@@ -701,9 +683,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));
-#if defined(APIVERSNUM) && APIVERSNUM >= 10503
   Add(new cMenuEditIntItem(tr("Font Size (pixel)"), &mConf.mFontSize, 10, MAXFONTSIZE));
-#endif
   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,
@@ -790,9 +770,7 @@ void cMenuSetupTtxtsubs::Store(void)
   SetupStore("MainMenuEntry", mConf.mMainMenuEntry);
   SetupStore("LineSpacing", mConf.mLineSpacing);
   SetupStore("DvbSources", mConf.mDvbSources);
-#if defined(APIVERSNUM) && APIVERSNUM >= 10503
   SetupStore("FontSize", mConf.mFontSize);
-#endif
   SetupStore("FgColor", mConf.mFgColor);
   SetupStore("BgColor", mConf.mBgColor);
   mConf.mCustomColor = (mBlue              ) | (mBlue         <<  4) |
diff --git a/ttxtsubsdisplay.c b/ttxtsubsdisplay.c
index 53c17b2..1212fd4 100644
--- a/ttxtsubsdisplay.c
+++ b/ttxtsubsdisplay.c
@@ -72,21 +72,15 @@ cTtxtSubsDisplay::cTtxtSubsDisplay(void)
   mPageState(invalid),
   mMag(0),
   mNo(0),
-#if defined(APIVERSNUM) && APIVERSNUM < 10509
-  mDoDisplay(0),
-#else
   mDoDisplay(1),
-#endif
   mOsd(NULL),
   mOsdLock(),
   mLastDataTime(NULL)
 {
   memset(&page.data, 0, sizeof(page.data));
   mLastDataTime = (struct timeval *) calloc(1, sizeof(*mLastDataTime));
-#if defined(APIVERSNUM) && APIVERSNUM >= 10503
   mOsdFont = cFont::CreateFont(Setup.FontOsd, globals.mFontSize);
   if (!mOsdFont || !mOsdFont->Height())
-#endif
      mOsdFont = cFont::GetFont(fontOsd);
 }
 
@@ -100,10 +94,8 @@ cTtxtSubsDisplay::~cTtxtSubsDisplay(void)
     mOsd = NULL;
     delete tmp;
   }
-#if defined(APIVERSNUM) && APIVERSNUM >= 10503
   if(mOsdFont && (mOsdFont != cFont::GetFont(fontOsd)))
     delete mOsdFont;
-#endif
 }
 
 
@@ -422,27 +414,12 @@ void cTtxtSubsDisplay::ShowOSD(void)
     delete tmp;
   }
 
-#if defined(APIVERSNUM) && APIVERSNUM < 10509
-  if (cOsd::IsOpen()) {
-     //dprint("NOT displaying subtitles because of other OSD activities!\n");
-     return;
-     }
-  else {
-     mOsd = cOsdProvider::NewOsd(SCREENLEFT, SCREENTOP);
-#else
      mOsd = cOsdProvider::NewOsd(SCREENLEFT, SCREENTOP, 20); // level 20
-#endif
      if(!mOsd) {
        //dprint("Error: cOsdProvider::NewOsd() returned NULL!\n");
        return;
        }
-#if defined(APIVERSNUM) && APIVERSNUM < 10509
-     }
-#endif
 
-#if defined(APIVERSNUM) && APIVERSNUM < 10503
-  cFont::SetCode(I18nCharSets()[globals.i18nLanguage()]);
-#endif
   if(rowcount > MAXTTXTROWS)
     rowcount = MAXTTXTROWS;
   y = bottom - SCREENTOP - ROWH - ((ROWINCR + globals.lineSpacing()) * (rowcount-1));
@@ -465,9 +442,6 @@ void cTtxtSubsDisplay::ShowOSD(void)
     y += (ROWINCR + globals.lineSpacing());
   }
   if (mOsd->CanHandleAreas(areas, numAreas) != oeOk) {
-#if defined(APIVERSNUM) && APIVERSNUM < 10503
-     cFont::SetCode(I18nCharSets()[Setup.OSDLanguage]);
-#endif
      dprint("ttxtsubs: OSD Cannot handle areas (error code: %d) - try to enlarge the line spacing!\n", mOsd->CanHandleAreas(areas, numAreas));
      }
   else {
@@ -492,9 +466,6 @@ void cTtxtSubsDisplay::ShowOSD(void)
       //dprint("%d/%d (%d,%d) (%d,%d): %s\n", i, rowcount-1, areas[i].x1, areas[i].y1, left + TEXTX, y + TEXTY, buf[i]);
       y += (ROWINCR + globals.lineSpacing());
       }
-#if defined(APIVERSNUM) && APIVERSNUM < 10503
-    cFont::SetCode(I18nCharSets()[Setup.OSDLanguage]);
-#endif
     mOsd->Flush();
     }
 }
diff --git a/ttxtsubsdisplayer.c b/ttxtsubsdisplayer.c
index 3501df8..402806c 100644
--- a/ttxtsubsdisplayer.c
+++ b/ttxtsubsdisplayer.c
@@ -75,11 +75,7 @@ void cTtxtSubsDisplayer::HideDisplay(void)
 
 cTtxtSubsLiveReceiver::cTtxtSubsLiveReceiver(tChannelID ChnId, int Pid, int textpage)
   :
-#if defined(APIVERSNUM) && APIVERSNUM < 10500
-  cReceiver(0, -1, Pid),
-#else
   cReceiver(ChnId, -1, Pid),
-#endif
   cTtxtSubsDisplayer(textpage)
 {
 }
diff --git a/ttxtsubsreceiver.c b/ttxtsubsreceiver.c
index 04eb582..64dda0e 100644
--- a/ttxtsubsreceiver.c
+++ b/ttxtsubsreceiver.c
@@ -19,11 +19,7 @@ struct ringBufItem {
 
 cTtxtSubsReceiver::cTtxtSubsReceiver(tChannelID ChnId, int Ca, struct ttxtpidinfo *PI)
   :
-#if defined(APIVERSNUM) && APIVERSNUM < 10500
-  cReceiver(Ca, -1, PI->pid),
-#else
   cReceiver(ChnId, -1, PI->pid),
-#endif
   mGetMutex(),
   mGetCond(),
   mRingBuf(sizeof(ringBufItem) * 500, true),