switched completely to VDR 1.6's I18N system and removed the old crap - no more support for older VDR versions!

13 files changed, 70 insertions, 546 deletions

diff --git a/HISTORY b/HISTORY
index d5a27ff..73be9a6 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,10 @@
 VDR Plugin 'osdteletext' Revision History
 -----------------------------------------
 
+2008-12-??: version 0.?.?
+- switched completely to VDR 1.6's I18N system and removed the old crap - no
+  more support for older VDR versions! (thx to Rolf Ahrenberg)
+
 2008-12-02: version 0.6.0
 - Moved installation of README and manpage from all to install target
 - Updated code for VDR 1.6.0
diff --git a/Makefile b/Makefile
index ff79770..5cafe3c 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -D_GNU_SOURCE
 
 ### The object files (add further files here):
 
-OBJS = $(PLUGIN).o menu.o txtfont.o i18n.o txtrecv.o txtrender.o displaybase.o display.o
+OBJS = $(PLUGIN).o menu.o txtfont.o txtrecv.o txtrender.o displaybase.o display.o
 
 ### Implicit rules:
 
diff --git a/i18n.c b/i18n.c
deleted file mode 100644
index 1d64b59..0000000
--- a/i18n.c
+++ /dev/null
@@ -1,445 +0,0 @@
-/*
- * i18n.c: Internationalization
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id: i18n.c 1.3 2002/06/23 13:05:59 kls Exp $
- */
-
-#include "i18n.h"
-
-const tI18nPhrase Phrases[] = {
-  { "Page",       //English               
-    "Seite",      //German
-    "",           //Slovenian
-    "Pagina",     //Italian
-    "",           //Dutch
-    "",           //Portuguese
-    "Page",       //French
-    "",           //Norwegian
-    "Sivua",      //Finnish
-    "",           //Polish
-    "Página",     //Spanish
-    "",           //Greek
-    "",           //Swedish
-    "",           //Romanian
-    "",           //Hugarian
-    "Pàgina",     //Catalan
-    "ÁâàÐÝØæÐ",   //Russian
-  },              
-  { "not found",      //English
-    "nicht gefunden", //German
-    "",               //Slovenian
-    "non trovata",    //Italian
-    "",               //Dutch
-    "",               //Portuguese
-    "pas trouvé",     //French
-    "",               //Norwegian
-    "ei löydy",       //Finnish
-    "",               //Polish
-    "no encontrada",  //Spanish
-    "",               //Greek
-    "",               //Swedish
-    "",               //Romanian
-    "",               //Hugarian
-    "no trobada",     //Catalan
-    "ÝÕ ÝÐÙÔÕÝÐ",     //Russian
-  },
-  { "Teletext (OSD)", //English
-    "Videotext (OSD)", //German
-    "",               //Slovenian
-    "Teletext (OSD)", //Italian
-    "",               //Dutch
-    "",               //Portuguese
-    "Teletext (OSD)", //French
-    "",               //Norwegian
-    "Teksti-TV",      //Finnish
-    "",               //Polish
-    "Teletexto (OSD)",//Spanish
-    "",               //Greek
-    "",               //Swedish
-    "",               //Romanian
-    "",               //Hugarian
-    "Teletext (OSD)", //Catalan
-    "ÂÕÛÕâÕÚáâ",      //Russian
-  },
-  { "Zoom",           //English
-    "Vergrößern",     //German
-    "",               //Slovenian
-    "Zoom",           //Italian
-    "",               //Dutch
-    "",               //Portuguese
-    "Zoom",           //French
-    "",               //Norwegian
-    "Suurenna",       //Finnish
-    "",               //Polish
-    "Zoom",           //Spanish
-    "",               //Greek
-    "",               //Swedish
-    "",               //Romanian
-    "",               //Hugarian
-    "Zoom",           //Catalan
-    "ãÒÕÛØçØâì",      //Russian
-  },
-  { "Half page",      //English
-    "Halbe Seite",    //German
-    "",               //Slovenian
-    "Mezza pagina",   //Italian
-    "",               //Dutch
-    "",               //Portuguese
-    "Demi-Page",      //French
-    "",               //Norwegian
-    "Puolikas sivu",  //Finnish
-    "",               //Polish
-    "Media página",   //Spanish
-    "",               //Greek
-    "",               //Swedish
-    "",               //Romanian
-    "",               //Hugarian
-    "Mitja pàgina",   //Catalan
-    "ßÞÛ-áâàÐÝØæë",   //Russian   
-  },
-  { "Change channel",    //English
-    "Kanal wechseln",    //German
-    "",                  //Slovenian
-    "Cambio canale",     //Italian
-    "",                  //Dutch
-    "",                  //Portuguese
-    "Changer la chaîne", //French
-    "",                  //Norwegian
-    "Vaihda kanavaa",    //Finnish
-    "",                  //Polish
-    "Cambio cadena",     //Spanish
-    "",                  //Greek
-    "",                  //Swedish
-    "",                  //Romanian
-    "",                  //Hugarian
-    "Canvi cadena",      //Catalan
-    "ßÕàÕÚÛîçØâì ÚÐÝÐÛ", //Russian
-  },
-  { "Jump to...",        //English
-    "Springe zu...",     //German
-    "",                  //Slovenian
-    "Salta a...",        //Italian
-    "",                  //Dutch
-    "",                  //Portuguese
-    "Aller à...",        //French
-    "",                  //Norwegian
-    "Siirry sivulle...", //Finnish
-    "",                  //Polish
-    "Salta a...",        //Spanish
-    "",                  //Greek
-    "",                  //Swedish
-    "",                  //Romanian
-    "",                  //Hugarian
-    "Salta a...",        //Catalan
-    "ßÕàÕÙâØ Ú...",      //Russian
-  },
-  { "Background transparency",   //English
-    "Hintergrund-Transparenz",   //German
-    "",                          //Slovenian
-    "Trasparenza dello sfondo",  //Italian
-    "",                          //Dutch
-    "",                          //Portuguese
-    "Fond transparent",          //French
-    "",                          //Norwegian
-    "Taustan läpinäkyvyys",      //Finnish
-    "",                          //Polish
-    "Transparencia del fondo",   //Spanish
-    "",                          //Greek
-    "",                          //Swedish
-    "",                          //Romanian
-    "",                          //Hugarian
-    "Transparència del fons",    //Catalan
-    "ÁâÕßÕÝì ßàÞ×àÐçÝÞáâØ äÞÝÐ", //Russian
-  },
-  { "Red key",            //English
-    "Rote Taste",         //German
-    "",                   //Slovenian
-    "Tasto Rosso",        //Italian
-    "",                   //Dutch
-    "",                   //Portuguese
-    "Touche rouge",       //French
-    "",                   //Norwegian
-    "Punainen näppäin",   //Finnish
-    "",                   //Polish
-    "Tecla roja",         //Spanish
-    "",                   //Greek
-    "",                   //Swedish
-    "",                   //Romanian
-    "",                   //Hugarian
-    "Tecla vermella",     //Catalan
-    "ºàÐáÝÐï ÚÝÞßÚÐ",     //Russian
-  },
-  { "  Page number",      //English
-    "  Seitenzahl",       //German
-    "",                   //Slovenian
-    "  Numero di pagina", //Italian
-    "",                   //Dutch
-    "",                   //Portuguese
-    "  Nombre de pages",  //French
-    "",                   //Norwegian
-    "  Sivunumero",       //Finnish
-    "",                   //Polish
-    "  Número de página", //Spanish
-    "",                   //Greek
-    "",                   //Swedish
-    "",                   //Romanian
-    "",                   //Hugarian
-    "  Nombre de pàgina", //Catalan
-    "  ½ÞÜÕà áâàÐÝØæë",   //Russian
-  },
-  { "Green key",          //English
-    "Grüne Taste",        //German
-    "",                   //Slovenian
-    "Tasto Verde",        //Italian
-    "",                   //Dutch
-    "",                   //Portuguese
-    "Touche verte",       //French
-    "",                   //Norwegian
-    "Vihreä näppäin",     //Finnish
-    "",                   //Polish
-    "Tecla verde",        //Spanish
-    "",                   //Greek
-    "",                   //Swedish
-    "",                   //Romanian
-    "",                   //Hugarian
-    "Tecla verda",        //Catalan
-    "·ÕÛñÝÐï ÚÝÞßÚÐ",     //Russian
-  },
-  { "Yellow key",         //English
-    "Gelbe Taste",        //German
-    "",                   //Slovenian
-    "Tasto Giallo",       //Italian
-    "",                   //Dutch
-    "",                   //Portuguese
-    "Touche jaune",       //French
-    "",                   //Norwegian
-    "Keltainen näppäin",  //Finnish
-    "",                   //Polish
-    "Tecla amarilla",     //Spanish
-    "",                   //Greek
-    "",                   //Swedish
-    "",                   //Romanian
-    "",                   //Hugarian
-    "Tecla groga",        //Catalan
-    "¶ñÛâÐï ÚÝÞßÚÐ",      //Russian
-  },
-  { "Blue key",           //English
-    "Blaue Taste",        //German
-    "",                   //Slovenian
-    "Tasto Blu",          //Italian
-    "",                   //Dutch
-    "",                   //Portuguese
-    "Touche bleue",       //French
-    "",                   //Norwegian
-    "Sininen näppäin",    //Finnish
-    "",                   //Polish
-    "Tecla azul",         //Spanish
-    "",                   //Greek
-    "",                   //Swedish
-    "",                   //Romanian
-    "",                   //Hugarian
-    "Tecla blava",        //Catalan
-    "ÁØÝïï ÚÝÞßÚÐ",       //Russian
-  },
-  { "Channel (press OK): ",        //English
-    "Sender (OK drücken): ",       //German
-    "",                            //Slovenian
-    "Canale (premere OK)",         //Italian
-    "",                            //Dutch
-    "",                            //Portuguese
-    "Chaine (Appuyer sur OK): ",   //French
-    "",                            //Norwegian
-    "Kanava (paina OK):",          //Finnish
-    "",                            //Polish
-    "Canal (pulse OK):",           //Spanish
-    "",                            //Greek
-    "",                            //Swedish
-    "",                            //Romanian
-    "",                            //Hugarian
-    "Canal (premi OK):",           //Catalan
-    "ºÐÝÐÛ (½ÐÖÜØâÕ ¾º)",          //Russian
-  },
-  { "Show clock",            //English
-    "Uhr anzeigen",          //German
-    "",                      //Slovenian
-    "Visualizza la hora",   //Italian
-    "",                      //Dutch
-    "",                      //Portuguese
-    "Afficher l'heure",      //French
-    "",                      //Norwegian
-    "Näytä kello",           //Finnish
-    "",                      //Polish
-    "Visualiza el reloj",    //Spanish
-    "",                      //Greek
-    "",                      //Swedish
-    "",                      //Romanian
-    "",                      //Hugarian
-    "Visualitza l'hora", //Catalan
-    "¿ÞÚÐ×ëÒÐâì çÐáë",       //Russian
-  },
-  { "Setup$Suspend receiving",    //English
-    "Empfang unterbrechen",       //German
-    "",                           //Slovenian
-    "Sospendi ricezione",         //Italian
-    "",                           //Dutch
-    "",                           //Portuguese
-    "Suspension de la réception", //French
-    "",                           //Norwegian
-    "Keskeytä vastaanottaminen",  //Finnish
-    "",                           //Polish
-    "Suspende la recepción",      //Spanish
-    "",                           //Greek
-    "",                           //Swedish
-    "",                           //Romanian
-    "",                           //Hugarian
-    "Suspèn la recepció",         //Catalan
-    "¿àØÞáâÐÝÞÒØâì ßàØñÜ",        //Russian
-  },
-  { "Suspend receiving",          //English
-    "Empfang unterbrechen",       //German
-    "",                           //Slovenian
-    "Sospendi ricezione",         //Italian
-    "",                           //Dutch
-    "",                           //Portuguese
-    "Suspension de la réception", //French
-    "",                           //Norwegian
-    "Keskeytä vastaanottaminen",  //Finnish
-    "",                           //Polish
-    "Suspende la recepción",      //Spanish
-    "",                           //Greek
-    "",                           //Swedish
-    "",                           //Romanian
-    "",                           //Hugarian
-    "Suspèn la recepció",         //Catalan
-    "ßàØÞáâÐÝÞÒØâì ßàØñÜ",        //Russian
-  },
-  { "Switch background",        //English
-    "Hintergrund ändern",       //German
-    "",                         //Slovenian
-    "Cambia sfondo",            //Italian
-    "",                         //Dutch
-    "",                         //Portuguese
-    "Change le fond d'écran",   //French
-    "",                         //Norwegian
-    "Vaihda tausta",            //Finnish
-    "",                         //Polish
-    "Cambia el fondo",          //Spanish
-    "",                         //Greek
-    "",                         //Swedish
-    "",                         //Romanian
-    "",                         //Hugarian
-    "Canvia el fons",           //Catalan
-    "ÝÕßàÞ×àÐçÝëÙ äÞÝ",         //Russian
-  },
-  { "Auto-update pages",                  //English
-    "Seiten aktualisieren",               //German
-    "",                                   //Slovenian
-    "Aggiornamento pagina automatico",    //Italian
-    "",                                   //Dutch
-    "",                                   //Portuguese
-    "Mise a jour des pages",              //French
-    "",                                   //Norwegian
-    "Automaattinen sivupäivitys",         //Finnish
-    "Actualización páginas automática",   //Polish
-    "",                                   //Spanish
-    "",                                   //Greek
-    "",                                   //Swedish
-    "",                                   //Romanian
-    "",                                   //Hugarian
-    "Actualització pàgines automàtica",   //Catalan
-    "°ÒâÞÞÑÝÞÒÛÕÝØÕ áâàÐÝØæ",             //Russian
-  },
-  { "OSD height",       //English
-    "OSD-Höhe",         //German
-    "",                 //Slovenian
-    "Altezza OSD",      //Italian
-    "",                 //Dutch
-    "",                 //Portuguese
-    "OSD Hauteur",      //French
-    "",                 //Norwegian
-    "Korkeus",          //Finnish
-    "",                 //Polish
-    "Altura OSD",       //Spanish
-    "",                 //Greek
-    "",                 //Swedish
-    "",                 //Romanian
-    "",                 //Hugarian
-    "Altura OSD",       //Catalan
-    "²ëáÞâÐ ÜÕÝî",      //Russian
-  },
-  { "OSD width",        //English
-    "OSD-Breite",       //German
-    "",                 //Slovenian
-    "Larghezza OSD",    //Italian
-    "",                 //Dutch
-    "",                 //Portuguese
-    "OSD Largeur",      //French
-    "",                 //Norwegian
-    "Leveys",           //Finnish
-    "",                 //Polish
-    "Anchura OSD",      //Spanish
-    "",                 //Greek
-    "",                 //Swedish
-    "",                 //Romanian
-    "",                 //Hugarian
-    "Amplària OSD",     //Catalan
-    "ÈØàØÝÐ ÜÕÝî",      //Russian
-  },
-  { "OSD horizontal align",      //English
-    "OSD horizontale Anordnung", //German
-    "",                          //Slovenian
-    "",                          //Italian
-    "",                          //Dutch
-    "",                          //Portuguese
-    "",                          //French
-    "",                          //Norwegian
-    "Pystykeskitys",             //Finnish
-    "",                          //Polish
-    "",                          //Spanish
-    "",                          //Greek
-    "",                          //Swedish
-    "",                          //Romanian
-    "",                          //Hugarian
-    "",                          //Catalan
-    "",                          //Russian
-  },
-  { "OSD vertical align",        //English
-    "OSD vertikale Anordnung",   //German
-    "",                          //Slovenian
-    "",                          //Italian
-    "",                          //Dutch
-    "",                          //Portuguese
-    "",                          //French
-    "",                          //Norwegian
-    "Vaakakeskitys",             //Finnish
-    "",                          //Polish
-    "",                          //Spanish
-    "",                          //Greek
-    "",                          //Swedish
-    "",                          //Romanian
-    "",                          //Hugarian
-    "",                          //Catalan
-    "",                          //Russian
-  },
-  { "Displays teletext on the OSD",           //English
-    "Zeigt den Videotext auf dem OSD an",     //German
-    "",                                       //Slovenian
-    "",                                       //Italian
-    "",                                       //Dutch
-    "",                                       //Portuguese
-    "",                                       //French
-    "",                                       //Norwegian
-    "Teksti-TV (OSD)",                        //Finnish
-    "",                                       //Polish
-    "Visualiza el teletexto en el OSD",       //Spanish
-    "",                                       //Greek
-    "",                                       //Swedish
-    "",                                       //Romanian
-    "",                                       //Hugarian
-    "Visualitza el teletext en l'OSD",        //Catalan
-    "¿ÞÚÐ× âÕÛÕâÕÚáâÐ Ò ÜÕÝî",                //Russian
-  },
-  { NULL }
-  };
diff --git a/i18n.h b/i18n.h
deleted file mode 100644
index 577628a..0000000
--- a/i18n.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * i18n.h: Internationalization
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id: i18n.h 1.2 2002/05/11 14:48:16 kls Exp $
- */
-
-#ifndef _I18N__H
-#define _I18N__H
-
-#include <vdr/i18n.h>
-
-extern const tI18nPhrase Phrases[];
-
-#endif //_I18N__H
diff --git a/menu.c b/menu.c
index be10632..d8ce487 100644
--- a/menu.c
+++ b/menu.c
@@ -12,7 +12,6 @@
 #include <time.h>
     
 #include <vdr/interface.h>
-#include <vdr/i18n.h>
 #include <vdr/config.h>
 
 #include "menu.h"
@@ -155,8 +154,7 @@ eOSState TeletextBrowser::ProcessKey(eKeys Key) {
                   ChannelSwitched(selectingChannelNumber);
                else {
                   needClearMessage=true;
-                  //string tranlated in VDR's i18n.c
-                  Display::DrawMessage(tr("*** Invalid Channel ***"));
+                  Display::DrawMessage(trVDR("*** Invalid Channel ***"));
                }
             } else {
                ShowPage();
diff --git a/osdteletext.c b/osdteletext.c
index 75f7c0b..52449c9 100644
--- a/osdteletext.c
+++ b/osdteletext.c
@@ -10,7 +10,6 @@
  ***************************************************************************/
 
 #include <vdr/plugin.h>
-#include <vdr/i18n.h>
 #include <vdr/keys.h>
 #include <vdr/config.h>
 
@@ -19,13 +18,16 @@
 using namespace std;
 
 #include "menu.h"
-#include "i18n.h"
 #include "txtrecv.h"
 #include "setup.h"
 
+#if defined(APIVERSNUM) && APIVERSNUM < 10600
+#error "VDR-1.6.0 API version or greater is required!"
+#endif
+
 static const char *VERSION        = "0.6.0";
-static const char *DESCRIPTION    = "Displays teletext on the OSD";
-static const char *MAINMENUENTRY  = "Teletext (OSD)";
+static const char *DESCRIPTION    = trNOOP("Displays teletext on the OSD");
+static const char *MAINMENUENTRY  = trNOOP("Teletext (OSD)");
 
 class cPluginTeletextosd : public cPlugin {
 private:
@@ -199,7 +201,6 @@ bool cPluginTeletextosd::Start(void)
 void cPluginTeletextosd::initTexts() {
    if (cTeletextSetupPage::actionKeyNames)
       return;
-   RegisterI18n(Phrases);
    //TODO: rewrite this in the xy[0].cd="fg"; form
    static const ActionKeyName st_actionKeyNames[] =
    {
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 8e6022b..93a221f 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: <nobody@nowhere.org>\n"
-"POT-Creation-Date: 2008-07-25 17:22+0200\n"
+"POT-Creation-Date: 2008-12-13 17:15+0200\n"
 "PO-Revision-Date: 2008-05-04 15:33+0200\n"
 "Last-Translator: Jordi Vilà <jvila@tinet.org>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -17,9 +17,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "*** Invalid Channel ***"
-msgstr ""
-
 msgid "Channel (press OK): "
 msgstr "Canal (premi OK):"
 
@@ -29,6 +26,12 @@ msgstr "Pàgina"
 msgid "not found"
 msgstr "no trobada"
 
+msgid "Displays teletext on the OSD"
+msgstr "Visualitza el teletext en l'OSD"
+
+msgid "Teletext (OSD)"
+msgstr "Teletext (OSD)"
+
 msgid "Red key"
 msgstr "Tecla vermella"
 
@@ -79,9 +82,3 @@ msgstr ""
 
 msgid "  Page number"
 msgstr "  Nombre de pàgina"
-
-#~ msgid "Displays teletext on the OSD"
-#~ msgstr "Visualitza el teletext en l'OSD"
-
-#~ msgid "Teletext (OSD)"
-#~ msgstr "Teletext (OSD)"
diff --git a/po/de_DE.po b/po/de_DE.po
index fcdaa7d..a54f429 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: <nobody@nowhere.org>\n"
-"POT-Creation-Date: 2008-07-25 17:26+0200\n"
+"POT-Creation-Date: 2008-12-13 17:15+0200\n"
 "PO-Revision-Date: 2008-05-04 15:33+0200\n"
 "Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,9 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "*** Invalid Channel ***"
-msgstr ""
-
 msgid "Channel (press OK): "
 msgstr "Sender (OK drücken): "
 
@@ -27,6 +24,12 @@ msgstr "Seite"
 msgid "not found"
 msgstr "nicht gefunden"
 
+msgid "Displays teletext on the OSD"
+msgstr "Zeigt den Videotext auf dem OSD an"
+
+msgid "Teletext (OSD)"
+msgstr "Videotext (OSD)"
+
 msgid "Red key"
 msgstr "Rote Taste"
 
@@ -77,9 +80,3 @@ msgstr "OSD vertikale Anordnung"
 
 msgid "  Page number"
 msgstr "  Seitenzahl"
-
-#~ msgid "Displays teletext on the OSD"
-#~ msgstr "Zeigt den Videotext auf dem OSD an"
-
-#~ msgid "Teletext (OSD)"
-#~ msgstr "Videotext (OSD)"
diff --git a/po/es_ES.po b/po/es_ES.po
index 33b315a..00988e4 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: <nobody@nowhere.org>\n"
-"POT-Creation-Date: 2008-07-25 17:26+0200\n"
+"POT-Creation-Date: 2008-12-13 17:15+0200\n"
 "PO-Revision-Date: 2008-05-04 15:33+0200\n"
 "Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,9 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "*** Invalid Channel ***"
-msgstr ""
-
 msgid "Channel (press OK): "
 msgstr "Canal (pulse OK):"
 
@@ -27,6 +24,12 @@ msgstr "Página"
 msgid "not found"
 msgstr "no encontrada"
 
+msgid "Displays teletext on the OSD"
+msgstr "Visualiza el teletexto en el OSD"
+
+msgid "Teletext (OSD)"
+msgstr "Teletexto (OSD)"
+
 msgid "Red key"
 msgstr "Tecla roja"
 
@@ -77,9 +80,3 @@ msgstr ""
 
 msgid "  Page number"
 msgstr "  Número de página"
-
-#~ msgid "Displays teletext on the OSD"
-#~ msgstr "Visualiza el teletexto en el OSD"
-
-#~ msgid "Teletext (OSD)"
-#~ msgstr "Teletexto (OSD)"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 63578ec..b558f1e 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -1,26 +1,20 @@
 # VDR plugin language source file.
 # Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
-# Hannu Savolainen <hannu@opensound.com>, 2002
-# Jaakko Hyvätti <jaakko@hyvatti.iki.fi>, 2002
-# Niko Tarnanen <niko.tarnanen@hut.fi>, 2003
 # Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2003
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <nobody@nowhere.org>\n"
-"POT-Creation-Date: 2008-07-25 17:26+0200\n"
+"POT-Creation-Date: 2008-12-13 17:15+0200\n"
 "PO-Revision-Date: 2008-05-04 15:33+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "*** Invalid Channel ***"
-msgstr ""
-
 msgid "Channel (press OK): "
 msgstr "Kanava (paina OK):"
 
@@ -28,19 +22,25 @@ msgid "Page"
 msgstr "Sivua"
 
 msgid "not found"
-msgstr "ei löydy"
+msgstr "ei löydy"
+
+msgid "Displays teletext on the OSD"
+msgstr "Teksti-TV (OSD)"
+
+msgid "Teletext (OSD)"
+msgstr "Teksti-TV"
 
 msgid "Red key"
-msgstr "Punainen näppäin"
+msgstr "Punainen näppäin"
 
 msgid "Green key"
-msgstr "Vihreä näppäin"
+msgstr "Vihreä näppäin"
 
 msgid "Yellow key"
-msgstr "Keltainen näppäin"
+msgstr "Keltainen näppäin"
 
 msgid "Blue key"
-msgstr "Sininen näppäin"
+msgstr "Sininen näppäin"
 
 msgid "Zoom"
 msgstr "Suurenna"
@@ -58,13 +58,13 @@ msgid "Jump to..."
 msgstr "Siirry sivulle..."
 
 msgid "Background transparency"
-msgstr "Taustan läpinäkyvyys"
+msgstr "Taustan läpinäkyvyys"
 
 msgid "Show clock"
-msgstr "Näytä kello"
+msgstr "Näytä kello"
 
 msgid "Auto-update pages"
-msgstr "Automaattinen sivupäivitys"
+msgstr "Automaattinen sivupäivitys"
 
 msgid "OSD height"
 msgstr "Korkeus"
@@ -80,9 +80,3 @@ msgstr "Vaakakeskitys"
 
 msgid "  Page number"
 msgstr "  Sivunumero"
-
-#~ msgid "Displays teletext on the OSD"
-#~ msgstr "Teksti-TV (OSD)"
-
-#~ msgid "Teletext (OSD)"
-#~ msgstr "Teksti-TV"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 7637599..216441c 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: <nobody@nowhere.org>\n"
-"POT-Creation-Date: 2008-07-25 17:26+0200\n"
+"POT-Creation-Date: 2008-12-13 17:15+0200\n"
 "PO-Revision-Date: 2008-05-04 15:33+0200\n"
 "Last-Translator: Nicolas Huillard <nhuillard@e-dition.fr>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -18,9 +18,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "*** Invalid Channel ***"
-msgstr ""
-
 msgid "Channel (press OK): "
 msgstr "Chaine (Appuyer sur OK): "
 
@@ -30,6 +27,12 @@ msgstr "Page"
 msgid "not found"
 msgstr "pas trouvé"
 
+msgid "Displays teletext on the OSD"
+msgstr ""
+
+msgid "Teletext (OSD)"
+msgstr "Teletext (OSD)"
+
 msgid "Red key"
 msgstr "Touche rouge"
 
@@ -80,6 +83,3 @@ msgstr ""
 
 msgid "  Page number"
 msgstr "  Nombre de pages"
-
-#~ msgid "Teletext (OSD)"
-#~ msgstr "Teletext (OSD)"
diff --git a/po/it_IT.po b/po/it_IT.po
index 5a34956..b9ede12 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: <nobody@nowhere.org>\n"
-"POT-Creation-Date: 2008-07-25 17:26+0200\n"
+"POT-Creation-Date: 2008-12-13 17:15+0200\n"
 "PO-Revision-Date: 2008-05-04 15:33+0200\n"
 "Last-Translator: Sean Carlos <seanc@libero.it>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -17,9 +17,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "*** Invalid Channel ***"
-msgstr ""
-
 msgid "Channel (press OK): "
 msgstr "Canale (premere OK)"
 
@@ -29,6 +26,12 @@ msgstr "Pagina"
 msgid "not found"
 msgstr "non trovata"
 
+msgid "Displays teletext on the OSD"
+msgstr ""
+
+msgid "Teletext (OSD)"
+msgstr "Teletext (OSD)"
+
 msgid "Red key"
 msgstr "Tasto Rosso"
 
@@ -79,6 +82,3 @@ msgstr ""
 
 msgid "  Page number"
 msgstr "  Numero di pagina"
-
-#~ msgid "Teletext (OSD)"
-#~ msgstr "Teletext (OSD)"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index a7ddcfa..90f7906 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: <nobody@nowhere.org>\n"
-"POT-Creation-Date: 2008-07-25 17:26+0200\n"
+"POT-Creation-Date: 2008-12-13 17:15+0200\n"
 "PO-Revision-Date: 2008-05-04 15:33+0200\n"
 "Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,9 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "*** Invalid Channel ***"
-msgstr ""
-
 msgid "Channel (press OK): "
 msgstr "ºÐÝÐÛ (½ÐÖÜØâÕ ¾º)"
 
@@ -27,6 +24,12 @@ msgstr "ÁâàÐÝØæÐ"
 msgid "not found"
 msgstr "ÝÕ ÝÐÙÔÕÝÐ"
 
+msgid "Displays teletext on the OSD"
+msgstr "¿ÞÚÐ× âÕÛÕâÕÚáâÐ Ò ÜÕÝî"
+
+msgid "Teletext (OSD)"
+msgstr "ÂÕÛÕâÕÚáâ"
+
 msgid "Red key"
 msgstr "ºàÐáÝÐï ÚÝÞßÚÐ"
 
@@ -77,9 +80,3 @@ msgstr ""
 
 msgid "  Page number"
 msgstr "  ½ÞÜÕà áâàÐÝØæë"
-
-#~ msgid "Displays teletext on the OSD"
-#~ msgstr "¿ÞÚÐ× âÕÛÕâÕÚáâÐ Ò ÜÕÝî"
-
-#~ msgid "Teletext (OSD)"
-#~ msgstr "ÂÕÛÕâÕÚáâ"