Dropped XLFont option, code cleanup

29 files changed, 47 insertions, 123 deletions

diff --git a/Makefile b/Makefile
index d3492a7..c2f30dd 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $PLUGIN.cpp | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Wextra -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -fPIC -g -O2 -Wall -pedantic -Wextra -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
diff --git a/anyfont.cpp b/anyfont.cpp
index 45e516a..4e8f826 100644
--- a/anyfont.cpp
+++ b/anyfont.cpp
@@ -27,30 +27,15 @@ int anyFont::Width(const char *txt)
     while (txt && *txt) w += Width(*txt++);
     return w;
 }
-int anyFont::LargeWidth(const char *txt)
-{
-    int w = 0;
-    while (txt && *txt) w += Width(*txt++);
-    return w*2;
-}
 int anyFont::Width(char c)
 {
     return Font->Width(c);
 }
-int anyFont::LargeWidth(char c)
-{
-    return Font->Width(c);
-}
 int anyFont::Text(int x, int y, const char *txt, tColor fg, tColor bg)
 {
     osd->DrawText(x, y, txt, fg, trans ? clrTransparent : bg, Font);
     return x += Font->Width(txt);
 }
-int anyFont::LargeText(int x, int y, const char *txt, tColor fg, tColor bg)
-{
-    osd->DrawText(x, y, txt, fg, trans ? clrTransparent : bg, Font);
-    return x + Font->Width(txt);
-}
 int anyFont::Text(int x, int y, int w, int h, const char *txt, tColor fg, tColor bg)
 {
     if (txt==NULL)
diff --git a/anyfont.h b/anyfont.h
index 1395581..9955caf 100644
--- a/anyfont.h
+++ b/anyfont.h
@@ -20,11 +20,8 @@ public:
     anyFont(cOsd *o,int fheight,int transparent=0);
     int Height(void);
     int Width(const char *txt);
-    int LargeWidth(const char *txt);
     int Width(char c);
-    int LargeWidth(char c);
     int Text(int x, int y, const char *txt, tColor fg, tColor bg);
-    int LargeText(int x, int y, const char *txt, tColor fg, tColor bg);
     int Text(int x, int y, int w, int h, const char *txt, tColor fg, tColor bg);
     int TextHeight(int w, const char *txt);
 };
diff --git a/config.cpp b/config.cpp
index 942ae72..37879dc 100644
--- a/config.cpp
+++ b/config.cpp
@@ -19,7 +19,6 @@ tvonscreenConfig tvonscreenCfg;
 tvonscreenConfig::tvonscreenConfig(void)
 {
     showLogos=false;
-    XLfonts=true;
     noInfoLine=false;
     showChannels=true;
     bwlogos=false;
@@ -40,7 +39,6 @@ tvonscreenConfig::tvonscreenConfig(void)
 bool tvonscreenConfig::SetupParse(const char *Name, const char *Value)
 {
     if      (strcmp(Name,"showLogos")==0) showLogos = atoi(Value);
-    else if (strcmp(Name,"XLfonts")==0) XLfonts = atoi(Value);
     else if (strcmp(Name,"noInfoLine")==0) noInfoLine = atoi(Value);
     else if (strcmp(Name,"showChannels")==0) showChannels = atoi(Value);
     else if (strcmp(Name,"bwlogos")==0) bwlogos = atoi(Value);
@@ -118,8 +116,6 @@ tvonscreenConfigPage::tvonscreenConfigPage(void) : cMenuSetupPage()
         Add(new cMenuEditBoolItem(tr("enable color problem work around"),
                                   &m_NewConfig.colorworkaround));
     }
-    Add(new cMenuEditBoolItem(tr("use XL fonts"),
-                              &m_NewConfig.XLfonts));
     Add(new cMenuEditBoolItem(tr("hide info line"),
                               &m_NewConfig.noInfoLine));
 
@@ -144,7 +140,6 @@ tvonscreenConfigPage::~tvonscreenConfigPage()
 void tvonscreenConfigPage::Store(void)
 {
     SetupStore("showLogos", m_NewConfig.showLogos);
-    SetupStore("XLfonts", m_NewConfig.XLfonts);
     SetupStore("noInfoLine", m_NewConfig.noInfoLine);
     SetupStore("showChannels", m_NewConfig.showChannels);
     SetupStore("bwlogos", m_NewConfig.bwlogos);
diff --git a/config.h b/config.h
index 1fcda14..77956f1 100644
--- a/config.h
+++ b/config.h
@@ -21,7 +21,6 @@ public:
     const char *CommandLineHelp(void);
 
     int showLogos;
-    int XLfonts;
     int noInfoLine;
     int showChannels;
     int bwlogos;
diff --git a/gfxtools.cpp b/gfxtools.cpp
index d76ef3a..ef53b7a 100644
--- a/gfxtools.cpp
+++ b/gfxtools.cpp
@@ -97,7 +97,8 @@ bool DrawXpm(char *Xpm[], areaT *drawable,int x0,int y0,winhandleT winhand,bool
     }
 
     int NoneColorIndex = MAXNUMCOLORS;
-    tColor cols[n];
+    tColor *cols = new tColor[n];
+    if (!cols) return false;
 
     for (int i = 0; i < n; i++)
     {
@@ -105,12 +106,14 @@ bool DrawXpm(char *Xpm[], areaT *drawable,int x0,int y0,winhandleT winhand,bool
         if (int(strlen(s)) < c)
         {
             esyslog("ERROR: faulty 'colors' line in XPM: '%s'", s);
+            delete [] cols;
             return false;
         }
         s = skipspace(s + c);
         if (*s != 'c')
         {
             esyslog("ERROR: unknown color key in XPM: '%c'", *s);
+            delete [] cols;
             return false;
         }
         s = skipspace(s + 1);
@@ -122,6 +125,7 @@ bool DrawXpm(char *Xpm[], areaT *drawable,int x0,int y0,winhandleT winhand,bool
         if (*s != '#')
         {
             esyslog("ERROR: unknown color code in XPM: '%c'", *s);
+            delete [] cols;
             return false;
         }
         unsigned int col=strtoul(++s, NULL, 16);
@@ -143,6 +147,7 @@ bool DrawXpm(char *Xpm[], areaT *drawable,int x0,int y0,winhandleT winhand,bool
         if (int(strlen(s)) != w * c)
         {
             esyslog("ERROR: faulty pixel line in XPM: %d '%s'", y, s);
+            delete [] cols;
             return false;
         }
         for (int x = 0; x < w; x++)
@@ -161,5 +166,6 @@ bool DrawXpm(char *Xpm[], areaT *drawable,int x0,int y0,winhandleT winhand,bool
             s += c;
         }
     }
+    delete [] cols;
     return true;
 }
diff --git a/magazine.cpp b/magazine.cpp
index 7ba42d3..7da8913 100644
--- a/magazine.cpp
+++ b/magazine.cpp
@@ -112,12 +112,12 @@ static int CompareSchedules(const void *p1, const void *p2)
     return c1nr - c2nr;
 }
 
-void magazine::setTransparency(int *color)
+void magazine::setTransparency(unsigned int *color)
 {
     if (!color) return;
     if (tvonscreenCfg.transparency==100) return;
 
-    int alpha,delta,value;
+    unsigned int alpha,delta,value;
 
     alpha=(*color & 0xFF000000)>>24;
     delta=255-alpha;
@@ -255,7 +255,6 @@ void magazine::printLogo(const cSchedule *s,int p)
 {
     cChannel* channel;
     const char *txt;
-    int x=getScheduleWidth()*p+p*4;
     int currentChannel;
 
 #ifdef MULTINAMES
@@ -273,9 +272,10 @@ void magazine::printLogo(const cSchedule *s,int p)
         a=NAME3_AREA;
         break;
     }
-    x=0;
+    int x=0;
 #else
     int a=NAMES_AREA;
+    int x=getScheduleWidth()*p+p*4;
 #endif
     if (s!=NULL)
     {
@@ -290,6 +290,7 @@ void magazine::printLogo(const cSchedule *s,int p)
         char *fname=new char[strlen(ConfigDirectory) + 1 + strlen(txt) + strlen(".xpm") + 1];
         sprintf(fname,"%s/%s.xpm",ConfigDirectory,txt);
         DrawXpm(fname,osd,x+Areas[a].x1,Areas[a].y1,0,tvonscreenCfg.bwlogos);
+        delete fname;
     }
 }
 void magazine::printHead(const cSchedule *s,int p)
@@ -360,12 +361,8 @@ void magazine::printHead(const cSchedule *s,int p)
             }
             txt=channel->ShortName(true);
 
-            if (!tvonscreenCfg.XLfonts || f3->LargeWidth(txt)>=getScheduleWidth()-wmin)
-                f3->Text(wmin+x+Areas[a].x1+(getScheduleWidth()-wmin-f3->Width(txt))/2,
-                         Areas[a].y1+yoff-1,txt,col,clrTimeline1);
-            else
-                f3->LargeText(wmin+x+Areas[a].x1+(getScheduleWidth()-wmin-f3->LargeWidth(txt))/2,
-                              Areas[a].y1+yoff-1,txt,col,clrTimeline1);
+            f3->Text(wmin+x+Areas[a].x1+(getScheduleWidth()-wmin-f3->Width(txt))/2,
+                     Areas[a].y1+yoff-1,txt,col,clrTimeline1);
         }
     }
 }
diff --git a/magazine.h b/magazine.h
index 499bcb3..75049d0 100644
--- a/magazine.h
+++ b/magazine.h
@@ -21,6 +21,7 @@ void mzlog(int level, const char *fmt, ...);
 typedef enum
 {
 #ifdef MULTINAMES
+    NAMES_AREA = 0,
     NAME1_AREA = 0,
     NAME2_AREA,
     NAME3_AREA,
@@ -32,7 +33,7 @@ typedef enum
     SCHED2_AREA,
     SCHED3_AREA,
     CONTROL_AREA,
-    NUMBER_OF_AREAS,
+    NUMBER_OF_AREAS
 } tMagazineArea;
 
 class magazine : public cOsdObject
@@ -101,11 +102,11 @@ private:
 
     void autoTimer(const class cEvent *EventInfo);
 
-    void setTransparency(int *color);
-    int clrSched1;
-    int clrSched2;
-    int clrTimeline1;
-    int clrTimeline2;
+    void setTransparency(unsigned int *color);
+    unsigned int clrSched1;
+    unsigned int clrSched2;
+    unsigned int clrTimeline1;
+    unsigned int clrTimeline2;
 
 public:
     magazine(class cPlugin *);
diff --git a/po/ca_ES.po b/po/ca_ES.po
index c2a9cb6..5a59de6 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-11-09 20:45+0100\n"
+"POT-Creation-Date: 2010-11-12 09:41+0100\n"
 "PO-Revision-Date: 2008-12-22 18:10+0000\n"
 "Last-Translator: Jordi Vilà <jvila@tinet.org>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -35,9 +35,6 @@ msgstr ""
 msgid "enable color problem work around"
 msgstr ""
 
-msgid "use XL fonts"
-msgstr ""
-
 msgid "hide info line"
 msgstr ""
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 5a5f8c7..34e6364 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-11-09 20:45+0100\n"
+"POT-Creation-Date: 2010-11-12 09:41+0100\n"
 "PO-Revision-Date: 2008-12-22 18:10+0000\n"
 "Last-Translator: Vladimír Bárta <vladimir.barta@k2atmitec.cz>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -33,9 +33,6 @@ msgstr ""
 msgid "enable color problem work around"
 msgstr ""
 
-msgid "use XL fonts"
-msgstr ""
-
 msgid "hide info line"
 msgstr ""
 
diff --git a/po/da_DK.po b/po/da_DK.po
index cfb5d15..bc69197 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-11-09 20:45+0100\n"
+"POT-Creation-Date: 2010-11-12 09:41+0100\n"
 "PO-Revision-Date: 2008-12-22 18:10+0000\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -33,9 +33,6 @@ msgstr ""
 msgid "enable color problem work around"
 msgstr ""
 
-msgid "use XL fonts"
-msgstr ""
-
 msgid "hide info line"
 msgstr ""
 
diff --git a/po/de_DE.po b/po/de_DE.po
index cf108a7..d37ba84 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-11-09 20:45+0100\n"
+"POT-Creation-Date: 2010-11-12 09:41+0100\n"
 "PO-Revision-Date: 2008-12-22 18:10+0000\n"
 "Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -33,9 +33,6 @@ msgstr "zeige Kanal-Logos in Schwarz/Weiß"
 msgid "enable color problem work around"
 msgstr "Farbproblem Umgehung aktivieren"
 
-msgid "use XL fonts"
-msgstr "benutze XL Schrift"
-
 msgid "hide info line"
 msgstr "verstecke Info Zeile"
 
@@ -202,3 +199,4 @@ msgstr "Zeigt EPG als TV-Magazin"
 
 msgid "TV-OnScreen"
 msgstr "TV Magazin"
+
diff --git a/po/el_GR.po b/po/el_GR.po
index 1aee866..4f977f6 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-11-09 20:45+0100\n"
+"POT-Creation-Date: 2010-11-12 09:41+0100\n"
 "PO-Revision-Date: 2008-12-22 18:10+0000\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -33,9 +33,6 @@ msgstr ""
 msgid "enable color problem work around"
 msgstr ""
 
-msgid "use XL fonts"
-msgstr ""
-
 msgid "hide info line"
 msgstr ""
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 5ba4cc4..6b86fbb 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-11-09 20:45+0100\n"
+"POT-Creation-Date: 2010-11-12 09:41+0100\n"
 "PO-Revision-Date: 2008-12-22 18:10+0000\n"
 "Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -33,9 +33,6 @@ msgstr ""
 msgid "enable color problem work around"
 msgstr ""
 
-msgid "use XL fonts"
-msgstr ""
-
 msgid "hide info line"
 msgstr ""
 
diff --git a/po/et_EE.po b/po/et_EE.po
index 062cd3b..474a1b5 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-11-09 20:45+0100\n"
+"POT-Creation-Date: 2010-11-12 09:41+0100\n"
 "PO-Revision-Date: 2008-12-22 18:10+0000\n"
 "Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -33,9 +33,6 @@ msgstr ""
 msgid "enable color problem work around"
 msgstr ""
 
-msgid "use XL fonts"
-msgstr ""
-
 msgid "hide info line"
 msgstr ""
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 8f873da..bb07928 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-11-09 20:45+0100\n"
+"POT-Creation-Date: 2010-11-12 09:41+0100\n"
 "PO-Revision-Date: 2008-12-22 18:10+0000\n"
 "Last-Translator: Nicolas Huillard <nhuillard@e-dition.fr>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -36,9 +36,6 @@ msgstr ""
 msgid "enable color problem work around"
 msgstr ""
 
-msgid "use XL fonts"
-msgstr ""
-
 msgid "hide info line"
 msgstr ""
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index f25459b..a234003 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-11-09 20:45+0100\n"
+"POT-Creation-Date: 2010-11-12 09:41+0100\n"
 "PO-Revision-Date: 2008-12-22 18:10+0000\n"
 "Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -34,9 +34,6 @@ msgstr ""
 msgid "enable color problem work around"
 msgstr ""
 
-msgid "use XL fonts"
-msgstr ""
-
 msgid "hide info line"
 msgstr ""
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 87721e2..c2f7c2a 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-11-09 20:45+0100\n"
+"POT-Creation-Date: 2010-11-12 09:41+0100\n"
 "PO-Revision-Date: 2008-12-22 18:10+0000\n"
 "Last-Translator: Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -34,9 +34,6 @@ msgstr ""
 msgid "enable color problem work around"
 msgstr ""
 
-msgid "use XL fonts"
-msgstr ""
-
 msgid "hide info line"
 msgstr ""
 
diff --git a/po/it_IT.po b/po/it_IT.po
index c872b5a..d42152d 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-11-09 20:45+0100\n"
+"POT-Creation-Date: 2010-11-12 09:41+0100\n"
 "PO-Revision-Date: 2010-08-09 19:08+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
@@ -38,9 +38,6 @@ msgstr "Mostra loghi in bianco e nero"
 msgid "enable color problem work around"
 msgstr "Abilita correz. problema colore"
 
-msgid "use XL fonts"
-msgstr "Utilizza caratteri grandi"
-
 msgid "hide info line"
 msgstr "Nascondi riga informazioni"
 
@@ -207,3 +204,6 @@ msgstr "Mostra informazioni EPG in forma di un tipico magazine TV"
 
 msgid "TV-OnScreen"
 msgstr "TV OnScreen"
+
+#~ msgid "use XL fonts"
+#~ msgstr "Utilizza caratteri grandi"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index ad33169..4b6e21c 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-11-09 20:45+0100\n"
+"POT-Creation-Date: 2010-11-12 09:41+0100\n"
 "PO-Revision-Date: 2008-12-22 18:10+0000\n"
 "Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -35,9 +35,6 @@ msgstr ""
 msgid "enable color problem work around"
 msgstr ""
 
-msgid "use XL fonts"
-msgstr ""
-
 msgid "hide info line"
 msgstr ""
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 4a06e1c..72c2fcc 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-11-09 20:45+0100\n"
+"POT-Creation-Date: 2010-11-12 09:41+0100\n"
 "PO-Revision-Date: 2008-12-22 18:10+0000\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -34,9 +34,6 @@ msgstr ""
 msgid "enable color problem work around"
 msgstr ""
 
-msgid "use XL fonts"
-msgstr ""
-
 msgid "hide info line"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 7d5b12a..b434a37 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-11-09 20:45+0100\n"
+"POT-Creation-Date: 2010-11-12 09:41+0100\n"
 "PO-Revision-Date: 2008-12-22 18:10+0000\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -33,9 +33,6 @@ msgstr ""
 msgid "enable color problem work around"
 msgstr ""
 
-msgid "use XL fonts"
-msgstr ""
-
 msgid "hide info line"
 msgstr ""
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 873947b..ebe926c 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-11-09 20:45+0100\n"
+"POT-Creation-Date: 2010-11-12 09:41+0100\n"
 "PO-Revision-Date: 2008-12-22 18:10+0000\n"
 "Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -33,9 +33,6 @@ msgstr ""
 msgid "enable color problem work around"
 msgstr ""
 
-msgid "use XL fonts"
-msgstr ""
-
 msgid "hide info line"
 msgstr ""
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index d544553..9774054 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-11-09 20:45+0100\n"
+"POT-Creation-Date: 2010-11-12 09:41+0100\n"
 "PO-Revision-Date: 2008-12-22 18:10+0000\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -34,9 +34,6 @@ msgstr ""
 msgid "enable color problem work around"
 msgstr ""
 
-msgid "use XL fonts"
-msgstr ""
-
 msgid "hide info line"
 msgstr ""
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 8acda37..926a6ac 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-11-09 20:45+0100\n"
+"POT-Creation-Date: 2010-11-12 09:41+0100\n"
 "PO-Revision-Date: 2008-12-22 18:10+0000\n"
 "Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -33,9 +33,6 @@ msgstr ""
 msgid "enable color problem work around"
 msgstr ""
 
-msgid "use XL fonts"
-msgstr ""
-
 msgid "hide info line"
 msgstr ""
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 0be2b12..e947b75 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-11-09 20:45+0100\n"
+"POT-Creation-Date: 2010-11-12 09:41+0100\n"
 "PO-Revision-Date: 2008-12-22 18:10+0000\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -34,9 +34,6 @@ msgstr ""
 msgid "enable color problem work around"
 msgstr ""
 
-msgid "use XL fonts"
-msgstr ""
-
 msgid "hide info line"
 msgstr ""
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index f1bb1f6..24e3742 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-11-09 20:45+0100\n"
+"POT-Creation-Date: 2010-11-12 09:41+0100\n"
 "PO-Revision-Date: 2008-12-22 18:10+0000\n"
 "Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -34,9 +34,6 @@ msgstr ""
 msgid "enable color problem work around"
 msgstr ""
 
-msgid "use XL fonts"
-msgstr ""
-
 msgid "hide info line"
 msgstr ""
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index de34676..5b4fdd1 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-11-09 20:45+0100\n"
+"POT-Creation-Date: 2010-11-12 09:41+0100\n"
 "PO-Revision-Date: 2008-12-22 18:10+0000\n"
 "Last-Translator: Oktay Yolgeçen <oktay_73@yahoo.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -33,9 +33,6 @@ msgstr ""
 msgid "enable color problem work around"
 msgstr ""
 
-msgid "use XL fonts"
-msgstr ""
-
 msgid "hide info line"
 msgstr ""
 
diff --git a/tvonscreen.cpp b/tvonscreen.cpp
index 35cd102..3c43bdf 100644
--- a/tvonscreen.cpp
+++ b/tvonscreen.cpp
@@ -105,4 +105,4 @@ bool cPluginTvOnscreen::SetupParse(const char *Name, const char *Value)
     return tvonscreenCfg.SetupParse(Name,Value);
 }
 
-VDRPLUGINCREATOR(cPluginTvOnscreen); // Don't touch this!
+VDRPLUGINCREATOR(cPluginTvOnscreen) // Don't touch this!
\ No newline at end of file