Added patch from freevdr for HD-OSD

32 files changed, 3738 insertions, 797 deletions

diff --git a/TVonscreen.h b/TVonscreen.h
index 1cf21d0..a362952 100644
--- a/TVonscreen.h
+++ b/TVonscreen.h
@@ -1,37 +1,37 @@
 /* XPM */
 static char *TVonscreen[] = {
 /* width height num_colors chars_per_pixel */
-"   104    27       3            1",
+(char *) "   104    27       3            1",
 /* colors */
-". c #ff0000",
-"l c #ffffff",
-"m c none",
+(char *) ". c #ff0000",
+(char *) "l c #ffffff",
+(char *) "m c none",
 /* pixels */
-"mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm.mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
-"mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm..mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
-"mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm..mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
-"mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm...mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
-"mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm..mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
-"mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm...mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
-"mmm.....................mmmmmmmmm...mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
-".........................mmmmmmm...mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
-"mmm.............mmmmm....mmmmmmm...mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
-"mmmmmmmmm....mmmmmmmm.....mmmmmm...mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
-"mmmmmmmmm...mmmmmmmmm.....mmmmm..llllllllmmmmmmmmmmmmmmllllllmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
-"mmmmmmm.....mmmmmmmmm.....mmmmm.ll.mmmmllmmmmmmmmmmmmmllmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
-"mmmmmmm.....mmmmmmmmm.....mmmmmll..mmmmmllmmllmmllmmmmllmmmmmmmmmllllmmmlmlllmmmlllmmmmmmllmmmmmllmmllmm",
-"mmmmmmm....mmmmmmmmmm......mm..ll..mmmmmllmmlllllllmmmmllmmmmmmmllllllmllllllmllllllmmmllllllmmmlllllllm",
-"mmmmmmm....mmmmmmmmmmm.....mm..ll.mmmmmmllmmlllmmmlmmmmllllmmmmllmmmmmmlllmmmmllmmmllmmlmmmmllmmlllmmllm",
-"mmmmmmm....mmmmmmmmmmm.....mm..ll.mmmmmmllmmlllmmmllmmmmmllllmmllmmmmmmllmmmmmlllllllmllllllllmmlllmmllm",
-"mmmmmm.....mmmmmmmmmmm.....m...ll.mmmmmmllmmlllmmmllmmmmmmlllmmllmmmmmmllmmmmmlllllllmllllllllmmlllmmllm",
-"mmmmmm....mmmmmmmmmmmm..........llmmmmmmllmmlllmmmllmmmmmmmllmmllmmmmmmllmmmmmllmmmmmmmlmmmmmmmmlllmmllm",
-"mmmmmm....mmmmmmmmmmmmmm.........llmmmmllmmmlllmmmllmmlmmmlllmmlllmmmmmllmmmmmllmmmmmmmllmmmmmmmlllmmllm",
-"mmmmmm....mmmmmmmmmmmmmm.........lllllllmmmmlllmmmllmmlllllllmmmllllllmllmmmmmmllllllmmmllllllmmlllmmllm",
-"mmmmmm....mmmmmmmmmmmmmm.........mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
-"mmmmmm...mmmmmmmmmmmmmmmm.......mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
-"mmmmmm...mmmmmmmmmmmmmmmm.......mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
-"mmmmmm...mmmmmmmmmmmmmmmm......mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
-"mmmmmm...mmmmmmmmmmmmmmmmmm.mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
-"mmmmmm...mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
-"mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm"
+(char *) "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm.mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
+(char *) "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm..mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
+(char *) "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm..mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
+(char *) "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm...mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
+(char *) "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm..mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
+(char *) "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm...mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
+(char *) "mmm.....................mmmmmmmmm...mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
+(char *) ".........................mmmmmmm...mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
+(char *) "mmm.............mmmmm....mmmmmmm...mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
+(char *) "mmmmmmmmm....mmmmmmmm.....mmmmmm...mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
+(char *) "mmmmmmmmm...mmmmmmmmm.....mmmmm..llllllllmmmmmmmmmmmmmmllllllmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
+(char *) "mmmmmmm.....mmmmmmmmm.....mmmmm.ll.mmmmllmmmmmmmmmmmmmllmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
+(char *) "mmmmmmm.....mmmmmmmmm.....mmmmmll..mmmmmllmmllmmllmmmmllmmmmmmmmmllllmmmlmlllmmmlllmmmmmmllmmmmmllmmllmm",
+(char *) "mmmmmmm....mmmmmmmmmm......mm..ll..mmmmmllmmlllllllmmmmllmmmmmmmllllllmllllllmllllllmmmllllllmmmlllllllm",
+(char *) "mmmmmmm....mmmmmmmmmmm.....mm..ll.mmmmmmllmmlllmmmlmmmmllllmmmmllmmmmmmlllmmmmllmmmllmmlmmmmllmmlllmmllm",
+(char *) "mmmmmmm....mmmmmmmmmmm.....mm..ll.mmmmmmllmmlllmmmllmmmmmllllmmllmmmmmmllmmmmmlllllllmllllllllmmlllmmllm",
+(char *) "mmmmmm.....mmmmmmmmmmm.....m...ll.mmmmmmllmmlllmmmllmmmmmmlllmmllmmmmmmllmmmmmlllllllmllllllllmmlllmmllm",
+(char *) "mmmmmm....mmmmmmmmmmmm..........llmmmmmmllmmlllmmmllmmmmmmmllmmllmmmmmmllmmmmmllmmmmmmmlmmmmmmmmlllmmllm",
+(char *) "mmmmmm....mmmmmmmmmmmmmm.........llmmmmllmmmlllmmmllmmlmmmlllmmlllmmmmmllmmmmmllmmmmmmmllmmmmmmmlllmmllm",
+(char *) "mmmmmm....mmmmmmmmmmmmmm.........lllllllmmmmlllmmmllmmlllllllmmmllllllmllmmmmmmllllllmmmllllllmmlllmmllm",
+(char *) "mmmmmm....mmmmmmmmmmmmmm.........mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
+(char *) "mmmmmm...mmmmmmmmmmmmmmmm.......mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
+(char *) "mmmmmm...mmmmmmmmmmmmmmmm.......mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
+(char *) "mmmmmm...mmmmmmmmmmmmmmmm......mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
+(char *) "mmmmmm...mmmmmmmmmmmmmmmmmm.mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
+(char *) "mmmmmm...mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
+(char *) "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm"
 };
diff --git a/anyfont.cpp b/anyfont.cpp
index c230cbc..45e516a 100644
--- a/anyfont.cpp
+++ b/anyfont.cpp
@@ -3,43 +3,23 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: anyfont.c,v 1.6 2004/07/08 13:46:38 schmitzj Exp $
- *
  */
 
 #include "anyfont.h"
 #include "magazine.h"
 
-#if VDRVERSNUM >= 10503
 anyFont::anyFont(cOsd *_osd,int fheight,int transparent)
-#elif VDRVERSNUM >= 10307
-anyFont::anyFont(cOsd *_osd,const cFont::tPixelData *fd,int fheight,int transparent)
-#else
-anyFont::anyFont(cOsdBase *_osd,const cFont::tPixelData *fd,int fheight,int transparent)
-#endif
+
 {
     osd=_osd;
-#if VDRVERSNUM >= 10503
-#if VDRVERSNUM >= 10504
     Font = cFont::CreateFont(Setup.FontOsd, fheight);
-#else
-    Font = new cFreetypeFont(*AddDirectory(FONTDIR, Setup.FontOsd, fheight);
-#endif
     if (!Font || !Font->Height())
         Font = cFont::GetFont(fontSml);
-#else
-    FontData=fd;
-    FontHeight=fheight;
-#endif
     trans=transparent;
 }
 int anyFont::Height(void)
 {
-#if VDRVERSNUM >= 10503
     return Font->Height();
-#else
-    return FontHeight-2-2;
-#endif
 }
 int anyFont::Width(const char *txt)
 {
@@ -55,107 +35,23 @@ int anyFont::LargeWidth(const char *txt)
 }
 int anyFont::Width(char c)
 {
-#if VDRVERSNUM >= 10503
     return Font->Width(c);
-#else
-    if ((int)FontData[(((unsigned char)c)-32)*(FontHeight)]>100)
-    {
-        mzlog(1," big letter error %c: %d",c,(int)FontData[(((unsigned char)c)-32)*(FontHeight)]);
-        return 100;
-    }
-    return (int)FontData[(((unsigned char)c)-32)*(FontHeight)];
-#endif
 }
 int anyFont::LargeWidth(char c)
 {
-#if VDRVERSNUM >= 10503
     return Font->Width(c);
-#else
-    if ((int)FontData[(((unsigned char)c)-32)*(FontHeight)]>100)
-    {
-        mzlog(1," big letter error %c: %d",c,(int)FontData[(((unsigned char)c)-32)*(FontHeight)]);
-        return 100;
-    }
-    return (int)FontData[(((unsigned char)c)-32)*(FontHeight)]*2;
-#endif
 }
-#if VDRVERSNUM >= 10307
 int anyFont::Text(int x, int y, const char *txt, tColor fg, tColor bg)
-#else
-int anyFont::Text(int x, int y, const char *txt, eDvbColor fg, eDvbColor bg, tWindowHandle wh)
-#endif
 {
-#if VDRVERSNUM >= 10503
     osd->DrawText(x, y, txt, fg, trans ? clrTransparent : bg, Font);
     return x += Font->Width(txt);
-#else
-    unsigned int pxl;
-    int row,col;
-
-    while (txt && *txt)
-    {
-        for (row=0; row<Height()+2; row++)
-        {
-            pxl = FontData[(((unsigned char)*txt)-32)*(FontHeight)+row+2];
-
-            // XXX maybe increment col before starting?
-            for (col=Width(*txt); col>=0; col--)
-            {
-                if (!trans || pxl&1)
-#if VDRVERSNUM >= 10307
-                    osd->DrawRectangle(x+col-1,y+row,x+col-1,y+row,(pxl&1) ? fg : bg);
-#else
-    osd->Fill         (x+col-1,y+row,x+col-1,y+row,(pxl&1) ? fg : bg,wh);
-#endif
-                pxl >>= 1;
-            }
-        }
-        x += Width(*txt++);
-    }
-    return x;
-#endif
 }
-#if VDRVERSNUM >= 10307
 int anyFont::LargeText(int x, int y, const char *txt, tColor fg, tColor bg)
-#else
-int anyFont::LargeText(int x, int y, const char *txt, eDvbColor fg, eDvbColor bg, tWindowHandle wh)
-#endif
 {
-#if VDRVERSNUM >= 10503
     osd->DrawText(x, y, txt, fg, trans ? clrTransparent : bg, Font);
     return x + Font->Width(txt);
-#else
-    unsigned int pxl;
-    int row,col;
-
-    while (txt && *txt)
-    {
-        for (row=0; row<Height(); row++)
-        {
-            pxl = FontData[(((unsigned char)*txt)-32)*(FontHeight)+row+2];
-
-            // XXX maybe increment col befor starting?
-            for (col=Width(*txt); col>=0; col--)
-            {
-                if (!trans || pxl&1)
-#if VDRVERSNUM >= 10307
-                    osd->DrawRectangle(x+(col-1)*2,y+row,x+(col-1)*2+1,y+row,(pxl&1) ? fg : bg);
-#else
-    osd->Fill         (x+(col-1)*2,y+row,x+(col-1)*2+1,y+row,(pxl&1) ? fg : bg,wh);
-#endif
-                pxl >>= 1;
-            }
-        }
-        x += LargeWidth(*txt++);
-    }
-    return x;
-#endif
 }
-#if VDRVERSNUM >= 10307
 int anyFont::Text(int x, int y, int w, int h, const char *txt, tColor fg, tColor bg)
-#else
-int anyFont::Text(int x, int y, int w, int h, const char *txt, eDvbColor fg, eDvbColor bg, tWindowHandle wh)
-#endif
 {
     if (txt==NULL)
         return x;
@@ -181,11 +77,7 @@ int anyFont::Text(int x, int y, int w, int h, const char *txt, eDvbColor fg, eDv
                 y0+=Height();
             }
             if (y0<h*Height())
-#if VDRVERSNUM >= 10307
                 x0+=Text(x+x0,y+y0,t2,fg,bg)   -x-x0+Width(c);
-#else
-                x0+=Text(x+x0,y+y0,t2,fg,bg,wh)-x-x0+Width(c);
-#endif
             *(mytxt)=c;
             t2=mytxt+1;
             if (c=='\t')
@@ -214,11 +106,7 @@ int anyFont::Text(int x, int y, int w, int h, const char *txt, eDvbColor fg, eDv
                 y0+=Height();
             }
             if (y0<h*Height())
-#if VDRVERSNUM >= 10307
                 x0+=Text(x+x0,y+y0,t2,fg,bg)   -x-x0;
-#else
-                x0+=Text(x+x0,y+y0,t2,fg,bg,wh)-x-x0;
-#endif
             *(mytxt+1)=c;
             t2=mytxt+1;
             break;
@@ -233,11 +121,7 @@ int anyFont::Text(int x, int y, int w, int h, const char *txt, eDvbColor fg, eDv
             y0+=Height();
         }
         if (y0<h*Height())
-#if VDRVERSNUM >= 10307
             x0+=Text(x+x0,y+y0,t2,fg,bg);
-#else
-            x0+=Text(x+x0,y+y0,t2,fg,bg,wh);
-#endif
     }
     free(memtxt);
     return y0/Height()+1;
diff --git a/anyfont.h b/anyfont.h
index b2e7fb2..1395581 100644
--- a/anyfont.h
+++ b/anyfont.h
@@ -3,8 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: anyfont.h,v 1.2 2004/07/06 13:02:14 schmitzj Exp $
- *
  */
 
 #ifndef ANYFONT_H
@@ -14,42 +12,20 @@
 
 class anyFont
 {
-#if VDRVERSNUM >= 10307
     cOsd *osd;
-#else
-    cOsdBase *osd;
-#endif
-#if VDRVERSNUM >= 10503
     const cFont *Font;
-#else
-    const cFont::tPixelData *FontData;
-    int FontHeight;
-#endif
     int trans;
+
 public:
-#if VDRVERSNUM >= 10503
     anyFont(cOsd *o,int fheight,int transparent=0);
-#elif VDRVERSNUM >= 10307
-    anyFont(cOsd *o,const cFont::tPixelData *fd,int fheight,int transparent=0);
-#else
-    anyFont(cOsdBase *o,const cFont::tPixelData *fd,int fheight,int transparent=0);
-#endif
     int Height(void);
     int Width(const char *txt);
     int LargeWidth(const char *txt);
     int Width(char c);
     int LargeWidth(char c);
-#if VDRVERSNUM >= 10307
     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);
-#else
-    int Text(int x, int y, const char *txt, eDvbColor fg, eDvbColor bg, tWindowHandle wh);
-    int LargeText(int x, int y, const char *txt, eDvbColor fg, eDvbColor bg, tWindowHandle wh);
-
-    int Text(int x, int y, int w, int h, const char *txt, eDvbColor fg, eDvbColor bg, tWindowHandle wh);
-#endif
     int TextHeight(int w, const char *txt);
 };
 
diff --git a/config.cpp b/config.cpp
index 92eca9e..fc85d8c 100644
--- a/config.cpp
+++ b/config.cpp
@@ -3,8 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: config.c,v 1.11 2005/01/02 12:19:32 schmitzj Exp $
- *
  */
 
 #include "config.h"
@@ -16,31 +14,13 @@
 
 tvonscreenConfig tvonscreenCfg;
 
-#if VDRVERSNUM < 10307
-class cMenuEditTimeItem : public cMenuEditItem
-{
-protected:
-    int *value;
-    int hh, mm;
-    int pos;
-    virtual void Set(void);
-public:
-    cMenuEditTimeItem(const char *Name, int *Value);
-    virtual eOSState ProcessKey(eKeys Key);
-};
-#endif
-
 tvonscreenConfig::tvonscreenConfig(void)
 {
     showLogos=false;
     XLfonts=true;
     noInfoLine=false;
     showChannels=true;
-#if VDRVERSNUM >= 10307
     bwlogos=false;
-#else
-    bwlogos=true;
-#endif
     colorworkaround=true;
 
     usertime1=1200;
@@ -76,9 +56,6 @@ bool tvonscreenConfig::SetupParse(const char *Name, const char *Value)
     else
         return false;
 
-#if VDRVERSNUM < 10307
-    bwlogos=true;
-#endif
     return true;
 }
 const char *tvonscreenConfig::CommandLineHelp(void)
@@ -94,7 +71,7 @@ bool tvonscreenConfig::ProcessArgs(int argc, char *argv[])
         { "logos",       required_argument, NULL, 'l'
         },
         { "vdradminfile",required_argument, NULL, 'v' },
-        { NULL }
+        { NULL, 0, NULL, 0 }
     };
 
     bool retval=true;
diff --git a/config.h b/config.h
index ce5c9aa..7dc9bbe 100644
--- a/config.h
+++ b/config.h
@@ -3,8 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: config.h,v 1.7 2004/11/23 14:21:24 schmitzj Exp $
- *
  */
 
 #ifndef TVONSCREEN_CONFIG_H
@@ -23,7 +21,6 @@ public:
     bool ProcessArgs(int argc, char *argv[]);
     const char *CommandLineHelp(void);
 
-//  char showChannels[];
     int showLogos;
     int XLfonts;
     int noInfoLine;
diff --git a/gfxtools.cpp b/gfxtools.cpp
index 7d12980..d76ef3a 100644
--- a/gfxtools.cpp
+++ b/gfxtools.cpp
@@ -3,8 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: gfxtools.c,v 1.8 2006/06/18 13:59:36 schmitzj Exp $
- *
  */
 
 #include <vdr/plugin.h>
@@ -99,11 +97,8 @@ bool DrawXpm(char *Xpm[], areaT *drawable,int x0,int y0,winhandleT winhand,bool
     }
 
     int NoneColorIndex = MAXNUMCOLORS;
-#if VDRVERSNUM >= 10307
     tColor cols[n];
-#else
-    eDvbColor cols[n];
-#endif
+
     for (int i = 0; i < n; i++)
     {
         const char *s = *++p;
@@ -132,16 +127,15 @@ bool DrawXpm(char *Xpm[], areaT *drawable,int x0,int y0,winhandleT winhand,bool
         unsigned int col=strtoul(++s, NULL, 16);
         if (blackwhite)
         {
-            int bwcol=(int)(0.299*(double)((col & 0xff0000) >> 16) + 0.587*(double)((col & 0xff00) >> 8) + 0.114*(double)(col & 0xff));
+            int bwcol=(int)(0.299*(double)((col & 0xff0000) >> 16) +
+                            0.587*(double)((col & 0xff00) >> 8) + 0.114*(double)(col & 0xff));
             if (bwcol>0xff) bwcol=0xff;
             bwcol&=(0xff-31);
             col=(bwcol<<16) | (bwcol<<8)| (bwcol);
         }
-#if VDRVERSNUM >= 10307
+
         cols[i] = col | 0xFF000000;
-#else
-        cols[i] = (eDvbColor)(((col & 0xff) << 16) | (col & 0xff00) | ((col & 0xff0000) >> 16) | 0xFF000000);
-#endif
+
     }
     for (int y = 0; y < h; y++)
     {
@@ -159,12 +153,7 @@ bool DrawXpm(char *Xpm[], areaT *drawable,int x0,int y0,winhandleT winhand,bool
                 {
                     if (i != NoneColorIndex)
                     {
-#if VDRVERSNUM >= 10307
                         drawable->DrawPixel(x0+x,y0+y, cols[i]);
-#else
-//						drawable->AddColor(cols[i],winhand);
-                        drawable->Fill(x0+x,y0+y,x0+x,y0+y,cols[i],winhand);
-#endif
                     }
                     break;
                 }
diff --git a/gfxtools.h b/gfxtools.h
index 9906542..e19c2d8 100644
--- a/gfxtools.h
+++ b/gfxtools.h
@@ -3,8 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: gfxtools.h,v 1.6 2004/07/07 15:14:23 schmitzj Exp $
- *
  */
 
 #ifndef GFXTOOLS_H
@@ -13,13 +11,8 @@
 #include <vdr/plugin.h>
 #include "anyfont.h"
 
-#if VDRVERSNUM >= 10307
 typedef cOsd areaT;
 typedef int winhandleT;
-#else
-typedef cOsdBase areaT;
-typedef tWindowHandle winhandleT;
-#endif
 
 bool DrawXpm(const char *FileName,areaT *drawable,int x0,int y0,winhandleT winhand=0,bool blackwhite=false);
 bool DrawXpm(char *Xpm[], areaT *drawable,int x0,int y0,winhandleT winhand=0,bool blackwhite=false);
diff --git a/i18n.cpp b/i18n.cpp
index 86292e8..da99f6c 100644
--- a/i18n.cpp
+++ b/i18n.cpp
@@ -3,8 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: i18n.c,v 1.15 2004/11/30 20:08:24 schmitzj Exp $
- *
  */
 
 #include "i18n.h"
@@ -27,18 +25,10 @@ const tI18nPhrase tvoPhrases[] =
         "", // Romaneste
         "", // Magyar
         "", // Catal�
-#if VDRVERSNUM >= 10302
         ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
         "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
         "", // Eesti
-#if VDRVERSNUM >= 10316
         "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "Shows the EPG info in form of a typical TV magazine", // English
       "", // Deutsch
@@ -56,18 +46,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "o'clock", // English
       "Uhr", // Deutsch
@@ -85,18 +67,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "%d-%m", // English
       "%d.%m.", // Deutsch
@@ -114,18 +88,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "Press 1 for help", // English
       "F�r Hilfe die 1 dr�cken", // Deutsch
@@ -143,18 +109,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "Timer conflict!", // English
       "Timer Konflikt!", // Deutsch
@@ -172,20 +130,11 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
-
 // Prefs
     { "show channel logos", // English
       "zeige Kanal-Logos", // Deutsch
@@ -203,18 +152,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "use XL fonts", // English
       "benutze XL Schrift", // Deutsch
@@ -232,18 +173,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "hide info line", // English
       "verstecke Info Zeile", // Deutsch
@@ -261,18 +194,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "show channel names", // English
       "zeige Kanal-Namen", // Deutsch
@@ -290,18 +215,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "show logos in black&white", // English
       "zeige Kanal-Logos in Schwarz/Wei�", // Deutsch
@@ -319,18 +236,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "enable color problem work around", // English
       "Farbproblem Umgehung aktivieren", // Deutsch
@@ -348,18 +257,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "user point in time 1 (Key 4)", // English
       "Anwenderzeitpunkt 1 (Taste 4)", // Deutsch
@@ -377,18 +278,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "user point in time 2 (Key 5)", // English
       "Anwenderzeitpunkt 2 (Taste 5)", // Deutsch
@@ -406,18 +299,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "user point in time 3 (Key 6)", // English
       "Anwenderzeitpunkt 3 (Taste 6)", // Deutsch
@@ -435,18 +320,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "jump to next day point if ago", // English
       "Gehe zum n�chsten Tag wenn vorbei", // Deutsch
@@ -464,18 +341,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "Show search item itself", // English
       "Zeige auch Suchbegriff", // Deutsch
@@ -493,18 +362,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
 
 // Help
@@ -524,18 +385,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "arrows\n\tmove view", // English
       "Pfeile\n\tAnsicht bewegen", // Deutsch
@@ -553,18 +406,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "back\n\tclose TV OnScreen", // English
       "back\n\tschlie�e TV OnScreen", // Deutsch
@@ -582,18 +427,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "red/blue\n\t-/+ one day", // English
       "rot/blau\n\t-/+ ein Tag", // Deutsch
@@ -611,18 +448,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "green/yellow\n\tone page left/right", // English
       "gr�n/gelb\n\teine Seite links/rechts", // Deutsch
@@ -640,18 +469,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "7/9\n\tone page left/right", // English
       "7/9\n\teine Seite links/rechts", // Deutsch
@@ -669,18 +490,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "8\n\tgoto current channel", // English
       "8\n\tgehe zum aktuellen Kanal", // Deutsch
@@ -698,18 +511,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "0\n\tgoto now", // English
       "0\n\tgehe zur aktuellen Zeit", // Deutsch
@@ -727,18 +532,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "4/5/6\n\tgoto configured time", // English
       "4/5/6\n\tgehe zu eingestellten Zeitpunkten", // Deutsch
@@ -756,18 +553,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "ok\n\tswitch to edit mode\n", // English
       "ok\n\taktiviere Editier-Modus\n", // Deutsch
@@ -785,18 +574,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "EDIT MODE:", // English
       "EDITIER MODUS:", // Deutsch
@@ -814,18 +595,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "back\n\tback to normal mode", // English
       "back\n\tzur�ck zum normalen Modus", // Deutsch
@@ -843,18 +616,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "arrows\n\tmove selected schedule", // English
       "Pfeile\n\tSendung ausw�hlen", // Deutsch
@@ -872,18 +637,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "record\n\tcreate timer", // English
       "record\n\terzeuge Timer", // Deutsch
@@ -901,18 +658,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "ok\n\tshow details", // English
       "ok\n\tzeige Sendungsdetails", // Deutsch
@@ -930,18 +679,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
 // End Help
 
@@ -962,18 +703,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "Search", // English
       "Suchen", // Deutsch
@@ -991,18 +724,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "AutoTimer", // English
       "AutoTimer", // Deutsch
@@ -1020,18 +745,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "Added AutoTimer to vdradmin.", // English
       "AutoTimer in vdradmin aufgenommen.", // Deutsch
@@ -1049,18 +766,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "Startoption 'vdradminfile' not set!", // English
       "Startoption 'vdradminfile' nicht gesetzt!", // Deutsch
@@ -1078,18 +787,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
 
 // Search
@@ -1109,18 +810,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "Searching...", // English
       "Suchen...", // Deutsch
@@ -1138,18 +831,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "Nothing found!", // English
       "Nichts gefunden!", // Deutsch
@@ -1167,18 +852,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "Back", // English
       "Zur�ck", // Deutsch
@@ -1196,18 +873,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "Details", // English
       "Details", // Deutsch
@@ -1225,18 +894,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
     { "in all", // English
       "in allen", // Deutsch
@@ -1254,18 +915,10 @@ const tI18nPhrase tvoPhrases[] =
       "", // Romaneste
       "", // Magyar
       "", // Catal�
-#if VDRVERSNUM >= 10302
       ""  // ������� (Russian)
-#if VDRVERSNUM >= 10307
       "", // Hrvatski (Croatian)
-#if VDRVERSNUM >= 10313
       "", // Eesti
-#if VDRVERSNUM >= 10316
       "", // Dansk
-#endif
-#endif
-#endif
-#endif
     },
 
     { NULL }
diff --git a/i18n.h b/i18n.h
index 61fd361..2425379 100755
--- a/i18n.h
+++ b/i18n.h
@@ -3,8 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: i18n.h,v 1.2 2004/11/23 21:42:55 schmitzj Exp $
- *
  */
 
 #ifndef _I18N__H
diff --git a/magazine.cpp b/magazine.cpp
index 0668bad..b2af77f 100644
--- a/magazine.cpp
+++ b/magazine.cpp
@@ -3,30 +3,96 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: magazine.c,v 1.34 2006/06/18 13:59:36 schmitzj Exp $
- *
  */
 
 #include "magazine.h"
 #include "TVonscreen.h"
+#include "math.h"
+#include <vdr/osd.h>
+#include <vdr/device.h>
 
 #define clrGrey       0xFF5F5F5F
 #define clrBackground clrGray50 // this should be tied somehow into current theme
 
+void GetOsdSize(int &Width, int &Height, double &Aspect)
+{
+#if (APIVERSNUM>10707)
+    cDevice::PrimaryDevice()->GetOsdSize(Width, Height, Aspect);
+#else
+    Width=720;
+    if (cDevice::PrimaryDevice()->GetVideoSystem()==vsPAL)
+    {
+        Height=576;
+    }
+    else
+    {
+        Height=480;
+    }
+    Aspect=1;
+#endif
+}
+
+int getTimelineWidth()
+{
+    int Width;
+    int Height;
+    int tWidth;
+    double Aspect;
+    GetOsdSize(Width, Height, Aspect);
+    tWidth = floor((((Width * 90) / 100) * 7) / 100);
+    return tWidth;
+}
+
+int getScheduleWidth()
+{
+    int Width;
+    int Height;
+    int sWidth;
+    double Aspect;
+    GetOsdSize(Width, Height, Aspect);
+    sWidth = floor((((Width * 90) / 100) * 31) / 100);
+    return sWidth;
+}
+
+int getScheduleHeight()
+{
+    int Width;
+    int Height;
+    int sHeight;
+    double Aspect;
+    GetOsdSize(Width, Height, Aspect);
+    sHeight = floor((((Height * 90) / 100) * 85) / 100);
+    return sHeight;
+}
+
+int getTL_YSTART()
+{
+    int Width;
+    int Height;
+    int TL_START;
+    double Aspect;
+    GetOsdSize(Width, Height, Aspect);
+//	TL_START = 1 + (47 * round(Height / 480));
+//	TL_START = round( 48 *(( Height / 480)*( Height / 480)));
+    TL_START = 37+((Height/480)*13.33333);
+    return TL_START;
+}
+
 static tArea Areas[NUMBER_OF_AREAS] =
 {
 #ifndef MULTINAMES
-    { 8+45,       0,               8+45 + 188*2+184 - 1,        0 + 48/*20*/ - 1,         8 }, // NAMES_AREA
+    { 0,0,0,0,8 }, // NAMES_AREA
 #else
-    { 8+45,       0,               8+45 + 184 - 1,              0 + 48/*20*/ - 1,         4 }, // NAME1_AREA
-    { 8+45+188,   0,               8+45+188 + 184 - 1,          0 + 48/*20*/ - 1,         4 }, // NAME2_AREA
-    { 8+45+188*2, 0,               8+45+188*2 + 184 - 1,        0 + 48/*20*/ - 1,         4 }, // NAME3_AREA
+    { 0,0,0,0,8 }, // NAME1_AREA
+    { 0,0,0,0,8 }, // NAME2_AREA
+    { 0,0,0,0,8 }, // NAME3_AREA
 #endif
-    { 0,          0,               0 + 8+40 - 1,                TL_YSTART + 384 - 1,      2 }, // TIMELINE_AREA
-    { 8+45,       TL_YSTART,       8+45 + 184 - 1,              TL_YSTART + 384 - 1,      2 }, // SCHED1_AREA
-    { 8+45+188,   TL_YSTART,       8+45+188 + 184 - 1,          TL_YSTART + 384 - 1,      2 }, // SCHED2_AREA
-    { 8+45+188*2, TL_YSTART,       8+45+188*2 + 184 - 1,        TL_YSTART + 384 - 1,      2 }, // SCHED3_AREA
-    { 50,         384+TL_YSTART+8, 50 + 8+45+188*2+184-101 - 1, 384+TL_YSTART+8 + 20 - 1, 2 }, // CONTROL_AREA
+    { 0,0,0,0,8 }, // TIMELINE_AREA
+    { 0,0,0,0,8 }, // SCHED1_AREA
+    { 0,0,0,0,8 }, // SCHED2_AREA
+    { 0,0,0,0,8 }, // SCHED3_AREA
+
+    { 0,0,0,0,4 }, // CONTROL_AREA
 };
 
 static int CompareSchedules(const void *p1, const void *p2)
@@ -46,7 +112,6 @@ static int CompareSchedules(const void *p1, const void *p2)
     return c1nr - c2nr;
 }
 
-
 magazine::magazine(class cPlugin *p)
 {
     parent=p;
@@ -59,6 +124,7 @@ magazine::magazine(class cPlugin *p)
     f2=NULL;
     f3=NULL;
     f4=NULL;
+    f5=NULL;
     me=NULL;
     met=NULL;
     mes=NULL;
@@ -111,6 +177,7 @@ magazine::magazine(class cPlugin *p)
             }
         }
     }
+
     ev1=NULL;
     ev2=NULL;
     ev3=NULL;
@@ -151,15 +218,17 @@ magazine::~magazine(void)
     delete f2;
     delete f3;
     delete f4;
+    delete f5;
 
     free(schedArray);
     delete osd;
 }
+
 void magazine::printLogo(const cSchedule *s,int p)
 {
     cChannel* channel;
     const char *txt;
-    int x=184*p+p*4;
+    int x=getScheduleWidth()*p+p*4;
     int currentChannel;
 
 #ifdef MULTINAMES
@@ -200,13 +269,15 @@ void magazine::printHead(const cSchedule *s,int p)
 {
     cChannel* channel;
     const char *txt;
-    int x=184*p+p*4;
+    int x=getScheduleWidth()*p+p*4;
     int currentChannel;
     int wmin=0,yoff=0;
 
     if (tvonscreenCfg.showLogos)
         wmin=64;
 
+    int gTL_YSTART = getTL_YSTART();
+
 #ifdef MULTINAMES
     int a;
     switch (p)
@@ -226,24 +297,27 @@ void magazine::printHead(const cSchedule *s,int p)
 #else
     int a=NAMES_AREA;
 #endif
-#if TL_YSTART == 48
-    yoff=28;
-    osd->DrawRectangle(x+Areas[a].x1,0+Areas[a].y1+0,x+Areas[a].x1+188,Areas[a].y1+48,clrTransparent);
-    osd->DrawEllipse(x+Areas[a].x1+182-28,0+Areas[a].y1,x+Areas[a].x1+182,Areas[a].y1+28,clrGrey,1);
-    osd->DrawEllipse(x+Areas[a].x1+182-28-2,0+Areas[a].y1+2,x+Areas[a].x1+182-2,Areas[a].y1+28+2,clrTransparent,1);
-
-    osd->DrawEllipse(x+Areas[a].x1,Areas[a].y1,x+Areas[a].x1+28,Areas[a].y1+28,clrGrey,2);
-    osd->DrawEllipse(x+Areas[a].x1+2,Areas[a].y1+2,x+Areas[a].x1+28+2,Areas[a].y1+28+2,clrTransparent,2);
+    if (gTL_YSTART>24)
+    {
 
-    osd->DrawRectangle(x+Areas[a].x1+28,0+Areas[a].y1,x+Areas[a].x1+182-28,Areas[a].y1+2,clrGrey);
-    osd->DrawRectangle(x+Areas[a].x1+182-2,0+Areas[a].y1+28,x+Areas[a].x1+182,Areas[a].y1+28+20,clrGrey);
-    osd->DrawRectangle(x+Areas[a].x1,0+Areas[a].y1+28,x+Areas[a].x1+2,Areas[a].y1+28+20,clrGrey); // nie zu sehen, au�er wenn kein Logo gefunden wird
+        yoff=28;
+        osd->DrawRectangle(x+Areas[a].x1+getScheduleWidth()-4,0+Areas[a].y1+28,x+Areas[a].x1+
+                           getScheduleWidth()-2,Areas[a].y1+28+20,clrGrey);
+        // nie zu sehen, ausser wenn kein Logo gefunden wird
+        osd->DrawRectangle(x+Areas[a].x1,0+Areas[a].y1+28,x+
+                           Areas[a].x1+2,Areas[a].y1+28+20,clrGrey);
 
-    if (p==2) DrawXpm(TVonscreen,osd,x+Areas[a].x1+182-110,0+Areas[a].y1);
+        if (p==2) DrawXpm(TVonscreen,osd,x+Areas[a].x1+getScheduleWidth()-112,0+Areas[a].y1);
 
-    if (tvonscreenCfg.showChannels || !tvonscreenCfg.showLogos)
-#endif
-        osd->DrawRectangle(x+Areas[a].x1,yoff+Areas[a].y1,x+Areas[a].x1+182,Areas[a].y1+20+yoff,clrBlue);
+        if (tvonscreenCfg.showChannels || !tvonscreenCfg.showLogos)
+            osd->DrawRectangle(x+Areas[a].x1,yoff+Areas[a].y1,x+Areas[a].x1+getScheduleWidth()-2,
+                               Areas[a].y1+gTL_YSTART-1,clrBlue);
+    }
+    else
+    {
+        osd->DrawRectangle(x+Areas[a].x1,yoff+Areas[a].y1,x+Areas[a].x1+getScheduleWidth()-2,
+                           Areas[a].y1+gTL_YSTART-1,clrBlue);
+    }
 
     if (tvonscreenCfg.showChannels || !tvonscreenCfg.showLogos)
     {
@@ -259,13 +333,16 @@ void magazine::printHead(const cSchedule *s,int p)
             }
             txt=channel->ShortName(true);
 
-            if (!tvonscreenCfg.XLfonts || f3->LargeWidth(txt)>=184-wmin)
-                f3->Text(wmin+x+Areas[a].x1+(184-wmin-f3->Width(txt))/2,Areas[a].y1+yoff-1,txt,col,clrBlue);
+            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,clrBlue);
             else
-                f3->LargeText(wmin+x+Areas[a].x1+(184-wmin-f3->LargeWidth(txt))/2,Areas[a].y1+yoff-1,txt,col,clrBlue);
+                f3->LargeText(wmin+x+Areas[a].x1+(getScheduleWidth()-wmin-f3->LargeWidth(txt))/2,
+                              Areas[a].y1+yoff-1,txt,col,clrBlue);
         }
     }
 }
+
 void magazine::showHeads(bool onlyBG)
 {
     const cSchedule *s1=NULL,*s2=NULL,*s3=NULL;
@@ -288,10 +365,13 @@ void magazine::showHeads(bool onlyBG)
         printLogo(s3,2);
     }
 }
+
 void magazine::showKeys(void)
 {
     char txt[100];
-    osd->DrawRectangle(Areas[CONTROL_AREA].x1, Areas[CONTROL_AREA].y1, Areas[CONTROL_AREA].x2+1, Areas[CONTROL_AREA].y2+1, clrTransparent);
+
+    osd->DrawRectangle(Areas[CONTROL_AREA].x1, Areas[CONTROL_AREA].y1, Areas[CONTROL_AREA].x2+1,
+                       Areas[CONTROL_AREA].y2+1, clrTransparent);
     if (tvonscreenCfg.noInfoLine)
         return;
 
@@ -300,8 +380,12 @@ void magazine::showKeys(void)
     {
         sprintf(txt,"%s",tr("Press 1 for help"));
     }
-    f4->Text(Areas[CONTROL_AREA].x1+(8+45+188*2+184-101-f4->Width(txt))/2,Areas[CONTROL_AREA].y1,txt,clrWhite,clrBackground);
+    f4->Text(Areas[CONTROL_AREA].x1+(8+getTimelineWidth()+(getScheduleWidth()+4)*2+
+                                     getScheduleWidth()-101-f4->Width(txt))/2,
+             Areas[CONTROL_AREA].y1,txt,
+             clrWhite,clrBackground);
 }
+
 void magazine::showTimeline(void)
 {
     int lh=-1;
@@ -314,47 +398,70 @@ void magazine::showTimeline(void)
     t1=currentFirstTime;
     localtime_r(&t1,&tm_r1);
 
-    osd->DrawRectangle(0+Areas[TIMELINE_AREA].x1,0+Areas[TIMELINE_AREA].y1,48,400+TL_YSTART,clrBlack);
+    int gTL_YSTART = getTL_YSTART();
+
+    osd->DrawRectangle(0+Areas[TIMELINE_AREA].x1,0+Areas[TIMELINE_AREA].y1,getTimelineWidth(),
+                       getScheduleHeight()+gTL_YSTART,clrBlack);
     for (int i=0;i<evnum;i++)
     {
-        int y=i*f1->Height()+TL_YSTART;
+        int y=i*f1->Height()+gTL_YSTART;
         if (lh!=fullHours[i] && fullHours[i]>=0)
         {
             lh=fullHours[i];
             lhc=lh&1;
         }
-        osd->DrawRectangle(0+Areas[TIMELINE_AREA].x1,y+Areas[TIMELINE_AREA].y1,48,y+f1->Height(),hgr[lhc]);
+        osd->DrawRectangle(0+Areas[TIMELINE_AREA].x1,y+Areas[TIMELINE_AREA].y1,
+                           getTimelineWidth(),y+f1->Height(),hgr[lhc]);
+    }
+
+    if (gTL_YSTART<=24)
+    {
+        strftime(dtxt,sizeof(dtxt),tr("%d-%m"),&tm_r1);
+        f5->Text((getTimelineWidth()-f5->Width(dtxt))/2+Areas[TIMELINE_AREA].x1,
+                 0+Areas[TIMELINE_AREA].y1,dtxt,clrWhite,clrBlack);
+    }
+    else
+    {
+
+        strcpy(dtxt,WeekDayName(tm_r1.tm_wday));
+        osd->DrawRectangle(0+Areas[TIMELINE_AREA].x1,0+Areas[TIMELINE_AREA].y1,
+                           Areas[TIMELINE_AREA].x1+getTimelineWidth(),
+                           Areas[TIMELINE_AREA].y1+f5->Height()*2,clrWhite);
+
+        osd->DrawRectangle(2+Areas[TIMELINE_AREA].x1,2+Areas[TIMELINE_AREA].y1,
+                           Areas[TIMELINE_AREA].x1+getTimelineWidth()-2,
+                           Areas[TIMELINE_AREA].y1+f5->Height(),clrBlack);
+
+        f5->Text((getTimelineWidth()-f5->Width(dtxt))/2+Areas[TIMELINE_AREA].x1,
+                 0+Areas[TIMELINE_AREA].y1+2,dtxt,clrWhite,clrBlack);
+
+        strftime(dtxt,sizeof(dtxt),tr("%d-%m"),&tm_r1);
+
+        f5->Text((getTimelineWidth()-f5->Width(dtxt))/2+Areas[TIMELINE_AREA].x1,
+                 0+Areas[TIMELINE_AREA].y1+f5->Height()+1,dtxt,clrBlack,clrWhite);
     }
 
-#if TL_YSTART == 24
-    strftime(dtxt,sizeof(dtxt),tr("%d-%m"),&tm_r1);
-    f1->Text((48-f1->Width(dtxt))/2+Areas[TIMELINE_AREA].x1,0+Areas[TIMELINE_AREA].y1,dtxt,clrWhite,clrBlack);
-#else
-    strcpy(dtxt,WeekDayName(tm_r1.tm_wday));
-    osd->DrawRectangle(0+Areas[TIMELINE_AREA].x1,0+Areas[TIMELINE_AREA].y1,Areas[TIMELINE_AREA].x1+48,Areas[TIMELINE_AREA].y1+f1->Height()*2,clrWhite);
-    osd->DrawRectangle(2+Areas[TIMELINE_AREA].x1,2+Areas[TIMELINE_AREA].y1,Areas[TIMELINE_AREA].x1+48-2,Areas[TIMELINE_AREA].y1+f1->Height(),clrBlack);
-    f1->Text((48-f1->Width(dtxt))/2+Areas[TIMELINE_AREA].x1,0+Areas[TIMELINE_AREA].y1,dtxt,clrWhite,clrBlack);
-    strftime(dtxt,sizeof(dtxt),tr("%d-%m"),&tm_r1);
-    f1->Text((48-f1->Width(dtxt))/2+Areas[TIMELINE_AREA].x1,0+Areas[TIMELINE_AREA].y1+f1->Height(),dtxt,clrBlack,clrWhite);
-#endif
     for (int i=0;i<evnum;i++)
     {
-        int y=i*f1->Height()+TL_YSTART;
+        int y=i*f1->Height()+gTL_YSTART;
         if (fullHours[i]>=0 && lh!=fullHours[i])
         {
             char txt[50];
             sprintf(txt,"%02d",fullHours[i]);
             lh=fullHours[i];
-            f1->Text((48-f1->Width(txt))/2+Areas[TIMELINE_AREA].x1,y+Areas[TIMELINE_AREA].y1,txt,clrWhite,clrBlack);
+            f1->Text((getTimelineWidth()-f1->Width(txt))/2+Areas[TIMELINE_AREA].x1,
+                     y+Areas[TIMELINE_AREA].y1,txt,clrWhite,clrBlack);
             if (i+1<evnum && (fullHours[i+1]==lh || fullHours[i+1]==-1))
             {
                 strcpy(txt,tr("o'clock"));
-                f2->Text((48-f2->Width(txt))/2+Areas[TIMELINE_AREA].x1,y+f1->Height()+Areas[TIMELINE_AREA].y1,txt,clrWhite,clrBlack);
+                f2->Text((getTimelineWidth()-f2->Width(txt))/2+Areas[TIMELINE_AREA].x1,
+                         y+f1->Height()+Areas[TIMELINE_AREA].y1,txt,clrWhite,clrBlack);
             }
         }
     }
 }
-void magazine::showSched(const cSchedule *s,cEvent **ev,tMagazineArea area)
+
+void magazine::showSched(cEvent **ev,tMagazineArea area)
 {
     cEvent *oldev=NULL,*cev=NULL;
 
@@ -377,7 +484,8 @@ void magazine::showSched(const cSchedule *s,cEvent **ev,tMagazineArea area)
             lh=fullHours[i];
             lhc=lh&1;
         }
-        osd->DrawRectangle(Areas[area].x1,Areas[area].y1+y,Areas[area].x1+184,Areas[area].y1+y+f1->Height(),hgr[lhc]);
+        osd->DrawRectangle(Areas[area].x1,Areas[area].y1+y,Areas[area].x1+getScheduleWidth(),
+                           Areas[area].y1+y+f1->Height(),hgr[lhc]);
     }
     for (int i=0;i<evnum;i++)
     {
@@ -390,10 +498,11 @@ void magazine::showSched(const cSchedule *s,cEvent **ev,tMagazineArea area)
                 if (oldev)
                 {
                     txt=oldev->ShortText();
-                    int cc=f2->TextHeight(184-f1->Width("00:0"),txt);
+                    int cc=f2->TextHeight(getScheduleWidth()-f1->Width("00:0"),txt);
                     if (cc<=i-j)
                     {
-                        f2->Text(f1->Width("00:0")+Areas[area].x1,(j)*f1->Height()+Areas[area].y1,184-f1->Width("00:0"),i-j,txt,col,clrBackground);
+                        f2->Text(f1->Width("00:0")+Areas[area].x1,(j)*f1->Height()+Areas[area].y1,
+                                 getScheduleWidth()-f1->Width("00:0"),i-j,txt,col,clrBackground);
                     }
                 }
                 col=clrWhite;
@@ -407,7 +516,9 @@ void magazine::showSched(const cSchedule *s,cEvent **ev,tMagazineArea area)
                 if (i+f1->TextHeight(f1->Width("00:00 ")+Areas[area].x1,txt)>=evnum)
                     break;
                 f1->Text(Areas[area].x1,y+Areas[area].y1,timetxt,col,clrBackground);
-                j=i+f1->Text(f1->Width("00:00 ")+Areas[area].x1,y+Areas[area].y1,184-f1->Width("00:00 "),20,txt,col,clrBackground);
+                j=i+f1->Text(f1->Width("00:00 ")+Areas[area].x1,
+                             y+Areas[area].y1,getScheduleWidth()-f1->Width("00:00 "),
+                             20,txt,col,clrBackground);
                 oldev=cev;
             }
         }
@@ -416,7 +527,8 @@ void magazine::showSched(const cSchedule *s,cEvent **ev,tMagazineArea area)
     {
         txt=oldev->ShortText();
         if (j+f2->TextHeight(f1->Width("00:00")+Areas[area].x1,txt)>=evnum)
-            f2->Text(f1->Width("00:0")+Areas[area].x1,j*f1->Height()+Areas[area].y1,184-f1->Width("00:0"),evnum-j,txt,col,clrBackground);
+            f2->Text(f1->Width("00:0")+Areas[area].x1,j*f1->Height()+Areas[area].y1,
+                     getScheduleWidth()-f1->Width("00:0"),evnum-j,txt,col,clrBackground);
     }
     if (!EDIT_curEvent)
     {
@@ -426,41 +538,45 @@ void magazine::showSched(const cSchedule *s,cEvent **ev,tMagazineArea area)
             cPlugin *p = cPluginManager::GetPlugin("timeline");
             if (p)
             {
-                char *args[]={"timeline_command_interface","conflicts"};
+                char *args[]={(char *) "timeline_command_interface",(char *) "conflicts"};
                 timeline_found_conflict=p->ProcessArgs(1,args);
             }
         }
         if (timeline_found_conflict)
         {
-            osd->DrawRectangle(Areas[area].x1,Areas[area].y2-f2->Height()-6,Areas[area].x1+184,Areas[area].y2+1,clrWhite);
-            osd->DrawRectangle(Areas[area].x1,Areas[area].y2-f2->Height()-4,Areas[area].x1+184,Areas[area].y2+1,clrYellow);
+            osd->DrawRectangle(Areas[area].x1,Areas[area].y2-f2->Height()-6,
+                               Areas[area].x1+getScheduleWidth(),Areas[area].y2+1,clrWhite);
+            osd->DrawRectangle(Areas[area].x1,Areas[area].y2-f2->Height()-4,
+                               Areas[area].x1+getScheduleWidth(),Areas[area].y2+1,clrYellow);
             const char *txt=tr("Timer conflict!");
-            int x=(184-f2->Width(txt))/2;
+            int x=(getScheduleWidth()-f2->Width(txt))/2;
             f2->Text(x+Areas[area].x1,Areas[area].y2-f2->Height()-4,txt,clrBackground,clrYellow);
         }
     }
 }
+
 void magazine::showScheds()
 {
     const cSchedule *s1=schedArrayNum>currentFirst?schedArray[currentFirst]:NULL;
     const cSchedule *s2=schedArrayNum>currentFirst+1?schedArray[currentFirst+1]:NULL;
     const cSchedule *s3=schedArrayNum>currentFirst+2?schedArray[currentFirst+2]:NULL;
 
-    if (s1!=NULL)
+    if (s1)
     {
-        showSched(s1,ev1,SCHED1_AREA);
+        showSched(ev1,SCHED1_AREA);
     }
 
-    if (s2!=NULL)
+    if (s2)
     {
-        showSched(s2,ev2,SCHED2_AREA);
+        showSched(ev2,SCHED2_AREA);
     }
 
-    if (s3!=NULL)
+    if (s3)
     {
-        showSched(s3,ev3,SCHED3_AREA);
+        showSched(ev3,SCHED3_AREA);
     }
 }
+
 const cEvent *magazine::getNext(const cSchedule *s,const cEvent *e)
 {
     if (e == NULL)
@@ -486,9 +602,11 @@ const cEvent *magazine::getNext(const cSchedule *s,const cEvent *e)
     }
     return pe;
 }
+
 const cEvent *magazine::getPrev(const cSchedule *s,const cEvent *e)
 {
     if (e == NULL)
+
         return NULL;
 
     const cEvent *pe = NULL;
@@ -512,6 +630,7 @@ const cEvent *magazine::getPrev(const cSchedule *s,const cEvent *e)
     }
     return pe;
 }
+
 void magazine::calcSched(const cSchedule *s,cEvent **ev)
 {
     const cEvent *cev=NULL;
@@ -527,7 +646,7 @@ void magazine::calcSched(const cSchedule *s,cEvent **ev)
             cev2=NULL;
             if (cev)
             {
-                cc=f1->TextHeight(184-f1->Width("00:00 "),cev->Title());
+                cc=f1->TextHeight(getScheduleWidth()-f1->Width("00:00 "),cev->Title());
                 time_t t=cev->StartTime();
                 struct tm tm_r;
                 localtime_r(&t,&tm_r);
@@ -546,7 +665,7 @@ void magazine::calcSched(const cSchedule *s,cEvent **ev)
                     cev=cev2;
                     cev2=NULL;
 
-                    cc=f1->TextHeight(184-f1->Width("00:00 "),cev->Title());
+                    cc=f1->TextHeight(getScheduleWidth()-f1->Width("00:00 "),cev->Title());
                     time_t t=cev->StartTime();
 
                     struct tm tm_r;
@@ -558,6 +677,7 @@ void magazine::calcSched(const cSchedule *s,cEvent **ev)
         ev[i]=(cEvent *)cev;
     }
 }
+
 void magazine::calcScheds()
 {
     const cSchedule *s1=schedArrayNum>currentFirst?schedArray[currentFirst]:NULL;
@@ -622,21 +742,17 @@ void magazine::calcScheds()
             fullHours[i]=fullHours_tmp3[i];
     }
 }
+
 void magazine::output(void)
 {
-    /*	for (int i=0; i < (int)(sizeof(Areas)/sizeof(tArea)); i++)
-    	{
-    		cBitmap *b=osd->GetBitmap(i);
-    		if (b)
-    			b->Reset();
-    	} */
     cBitmap *b=osd->GetBitmap(NAMES_AREA);
     if (b)
     {
         b->Reset();
         if (tvonscreenCfg.colorworkaround)
         {
-            // This is an ugly work around for color problems with DVB driver or hardware or vdr handling, who knows
+            // This is an ugly work around for color problems with
+            //  DVB driver or hardware or vdr handling, who knows
             b->SetColor(0,clrTransparent);
             b->SetColor(1,clrBlue);
             b->SetColor(2,clrWhite);
@@ -650,13 +766,6 @@ void magazine::output(void)
             // End work around
         }
     }
-    /*	for(int i=0; i < (int)(sizeof(Areas)/sizeof(tArea)); i++)
-    	{
-    		cBitmap *b=osd->GetBitmap(i);
-    		int col;
-    		b->Colors(col);
-    		mzlog(5," 1. NumColors(%d):%d",i,col);
-    	} */
 
     showHeads();
     showKeys();
@@ -664,38 +773,19 @@ void magazine::output(void)
     showScheds();
     showTimeline();
 
-    /*	for (int i=0; i < (int)(sizeof(Areas)/sizeof(tArea)); i++)
-    	{
-    		cBitmap *b=osd->GetBitmap(i);
-    		int col;
-    		const tColor *tc=b->Colors(col);
-    		mzlog(5," 2. NumColors(%d):%d",i,col);
-    		if (i==NAMES_AREA)
-    		{
-    			for(int j=0;j<col;j++)
-    			{
-    				mzlog(5," Col(%d): %x",j,tc[j]);
-    			}
-    		}
-    	} */
-
     osd->Flush();
 }
+
 void magazine::outputLR(void)
 {
-    /*	for (int i=0; i < (int)(sizeof(Areas)/sizeof(tArea)); i++)
-    	{
-    		cBitmap *b=osd->GetBitmap(i);
-    		if (b)
-    			b->Reset();
-    	} */
     cBitmap *b=osd->GetBitmap(NAMES_AREA);
     if (b)
     {
         b->Reset();
         if (tvonscreenCfg.colorworkaround)
         {
-            // This is an ugly work around for color problems with DVB driver or hardware or vdr handling, who knows
+            // This is an ugly work around for color problems with
+            // DVB driver or hardware or vdr handling, who knows
             b->SetColor(0,clrTransparent);
             b->SetColor(1,clrBlue);
             b->SetColor(2,clrWhite);
@@ -735,46 +825,57 @@ void magazine::gotoUsertime(int u)
     }
     output();
 }
+
 void magazine::showHelp()
 {
     anyFont *usef=f2;
     int j=0;
     const char *txt;
-    int lines=384/usef->Height();
-    int width=184;
+    int lines=getScheduleHeight()/usef->Height();
+    int width=getScheduleWidth();
 
     char *helptext[]=
     {
-        "NORMAL MODE:",
-        "arrows\n\tmove view",
-        "back\n\tclose TV OnScreen",
-        "red/blue\n\t-/+ one day",
-        "green/yellow\n\tone page left/right",
-        "7/9\n\tone page left/right",
-        "8\n\tgoto current channel",
-        "0\n\tgoto now",
-        "4/5/6\n\tgoto configured time",
-        "ok\n\tswitch to edit mode\n",
-        "EDIT MODE:",
-        "back\n\tback to normal mode",
-        "arrows\n\tmove selected schedule",
-        "record\n\tcreate timer",
-        "ok\n\tshow details",
-        "|\n(c) 2004 J�rgen Schmitz\n\thttp://www.js-home.org/vdr",
+        trNOOP((char *) "NORMAL MODE:"),
+        trNOOP((char *) "arrows\n\tmove view"),
+        trNOOP((char *) "back\n\tclose TV OnScreen"),
+        trNOOP((char *) "red/blue\n\t-/+ one day"),
+        trNOOP((char *) "green/yellow\n\tone page left/right"),
+        trNOOP((char *) "7/9\n\tone page left/right"),
+        trNOOP((char *) "8\n\tgoto current channel"),
+        trNOOP((char *) "0\n\tgoto now"),
+        trNOOP((char *) "4/5/6\n\tgoto configured time"),
+        trNOOP((char *) "ok\n\tswitch to edit mode\n"),
+        trNOOP((char *) "EDIT MODE:"),
+        trNOOP((char *) "back\n\tback to normal mode"),
+        trNOOP((char *) "arrows\n\tmove selected schedule"),
+        trNOOP((char *) "record\n\tcreate timer"),
+        trNOOP((char *) "ok\n\tshow details"),
+        (char *) "|\n(c) 2004 Juergen Schmitz\n\thttp://www.js-home.org/vdr",
         NULL
     };
 
     int area=SCHED1_AREA;
 
-    osd->DrawRectangle(Areas[SCHED1_AREA].x1, Areas[SCHED1_AREA].y1+1, Areas[SCHED1_AREA].x2+1, Areas[SCHED1_AREA].y2+1, clrGrey);
-    osd->DrawRectangle(Areas[SCHED2_AREA].x1, Areas[SCHED2_AREA].y1+1, Areas[SCHED2_AREA].x2+1, Areas[SCHED2_AREA].y2+1, clrGrey);
-    osd->DrawRectangle(Areas[SCHED3_AREA].x1, Areas[SCHED3_AREA].y1+1, Areas[SCHED3_AREA].x2+1, Areas[SCHED3_AREA].y2+1, clrGrey);
-
-    osd->DrawRectangle(Areas[SCHED1_AREA].x1+2, Areas[SCHED1_AREA].y1, Areas[SCHED1_AREA].x2+1-3, Areas[SCHED1_AREA].y2+1-3, clrGray50);
-    osd->DrawRectangle(Areas[SCHED2_AREA].x1+2, Areas[SCHED2_AREA].y1, Areas[SCHED2_AREA].x2+1-3, Areas[SCHED2_AREA].y2+1-3, clrGray50);
-    osd->DrawRectangle(Areas[SCHED3_AREA].x1+2, Areas[SCHED3_AREA].y1, Areas[SCHED3_AREA].x2+1-3, Areas[SCHED3_AREA].y2+1-3, clrGray50);
-
-    osd->DrawRectangle(0+Areas[TIMELINE_AREA].x1,0+Areas[TIMELINE_AREA].y1+TL_YSTART,Areas[TIMELINE_AREA].x1+48,Areas[TIMELINE_AREA].y1+400+TL_YSTART,clrBlack);
+    int gTL_YSTART = getTL_YSTART();
+
+    osd->DrawRectangle(Areas[SCHED1_AREA].x1, Areas[SCHED1_AREA].y1+1,
+                       Areas[SCHED1_AREA].x2+1, Areas[SCHED1_AREA].y2+1, clrGrey);
+    osd->DrawRectangle(Areas[SCHED2_AREA].x1, Areas[SCHED2_AREA].y1+1,
+                       Areas[SCHED2_AREA].x2+1, Areas[SCHED2_AREA].y2+1, clrGrey);
+    osd->DrawRectangle(Areas[SCHED3_AREA].x1, Areas[SCHED3_AREA].y1+1,
+                       Areas[SCHED3_AREA].x2+1, Areas[SCHED3_AREA].y2+1, clrGrey);
+
+    osd->DrawRectangle(Areas[SCHED1_AREA].x1+2, Areas[SCHED1_AREA].y1,
+                       Areas[SCHED1_AREA].x2+1-3, Areas[SCHED1_AREA].y2+1-3, clrGray50);
+    osd->DrawRectangle(Areas[SCHED2_AREA].x1+2, Areas[SCHED2_AREA].y1,
+                       Areas[SCHED2_AREA].x2+1-3, Areas[SCHED2_AREA].y2+1-3, clrGray50);
+    osd->DrawRectangle(Areas[SCHED3_AREA].x1+2, Areas[SCHED3_AREA].y1,
+                       Areas[SCHED3_AREA].x2+1-3, Areas[SCHED3_AREA].y2+1-3, clrGray50);
+
+    osd->DrawRectangle(0+Areas[TIMELINE_AREA].x1,0+Areas[TIMELINE_AREA].y1+gTL_YSTART,
+                       Areas[TIMELINE_AREA].x1+getTimelineWidth(),
+                       Areas[TIMELINE_AREA].y1+getScheduleHeight()+gTL_YSTART,clrBlack);
     showHeads(true);
 //	osd->Flush();
 
@@ -824,13 +925,6 @@ void magazine::autoTimer(const class cEvent *cev)
     }
 }
 
-#if VDRVERSNUM < 10503
-#include "fontosd/fontosd-arial18.c"
-#include "fontosd/fontosd-verdana16.c"
-#include "fontosd/fontosd-tahoma16.c"
-#include "fontosd/fontosd-timesNewRoman16.c"
-#endif
-
 void magazine::Show(void)
 {
     mzlog(10," magazine::Show()");
@@ -850,8 +944,58 @@ void magazine::Show(void)
         delete mes;
         mes=NULL;
     }
+    GetOsdSize(Width, Height, Aspect);
+    osd = cOsdProvider::NewOsd(((Width-((Width * 90) / 100)) / 2), ((Height-((Height * 90) / 100)) / 2));
+
+    int gTL_YSTART = getTL_YSTART();
+
+    Areas[TIMELINE_AREA].x1 = 0;
+    Areas[TIMELINE_AREA].x2 = (2+getTimelineWidth());
+    Areas[TIMELINE_AREA].y1 = 0;
+    Areas[TIMELINE_AREA].y2 = (gTL_YSTART+getScheduleHeight()-1);
+
+    Areas[SCHED1_AREA].x1 = (8+getTimelineWidth());
+    Areas[SCHED1_AREA].x2 = (7+getTimelineWidth()+getScheduleWidth());
+    Areas[SCHED1_AREA].y1 = gTL_YSTART;
+    Areas[SCHED1_AREA].y2 = (gTL_YSTART+getScheduleHeight()-1);
+
+    Areas[SCHED2_AREA].x1 = (12+getTimelineWidth()+getScheduleWidth());
+    Areas[SCHED2_AREA].x2 = (11+getTimelineWidth()+(2*getScheduleWidth()));
+    Areas[SCHED2_AREA].y1 = gTL_YSTART;
+    Areas[SCHED2_AREA].y2 = (gTL_YSTART+getScheduleHeight()-1);
+
+    Areas[SCHED3_AREA].x1 = (16+getTimelineWidth()+(2*getScheduleWidth()));
+    Areas[SCHED3_AREA].x2 = (15+getTimelineWidth()+(3*getScheduleWidth()));
+    Areas[SCHED3_AREA].y1 = gTL_YSTART;
+    Areas[SCHED3_AREA].y2 = (gTL_YSTART+getScheduleHeight()-1);
+
+    Areas[CONTROL_AREA].x1 = 50;
+    Areas[CONTROL_AREA].x2 = (getTimelineWidth()+(2*(4+getScheduleWidth()))+getScheduleWidth()-43);
+    Areas[CONTROL_AREA].y1 = (8+gTL_YSTART+getScheduleHeight());
+    Areas[CONTROL_AREA].y2 = (27+gTL_YSTART+getScheduleHeight()-1);
+
+#ifndef MULTINAMES
+    Areas[NAMES_AREA].x1 = (8+getTimelineWidth());
+    Areas[NAMES_AREA].x2 = (7+getTimelineWidth()+((4+getScheduleWidth())*2)+getScheduleWidth());
+    Areas[NAMES_AREA].y1 = 0;
+    Areas[NAMES_AREA].y2 = (gTL_YSTART-1);
+#else
+    Areas[NAME1_AREA].x1 = (8+getTimelineWidth());
+    Areas[NAME1_AREA].x2 = (7+getTimelineWidth()+getScheduleWidth());
+    Areas[NAME1_AREA].y1 = 0;
+    Areas[NAME1_AREA].y2 = (gTL_YSTART-1);
+
+    Areas[NAME2_AREA].x1 = (12+getTimelineWidth()+getScheduleWidth());
+    Areas[NAME2_AREA].x2 = (11+getTimelineWidth()+(2*getScheduleWidth()));
+    Areas[NAME2_AREA].y1 = 0;
+    Areas[NAME2_AREA].y2 = (gTL_YSTART-1);
+
+    Areas[NAME3_AREA].x1 = (8+getTimelineWidth()+(2*(getScheduleWidth()+4)));
+    Areas[NAME3_AREA].x2 = (7+getTimelineWidth()+((4+getScheduleWidth())*2)+getScheduleWidth());
+    Areas[NAME3_AREA].y1 = 0;
+    Areas[NAME3_AREA].y2 = (gTL_YSTART-1);
+#endif
 
-    osd = cOsdProvider::NewOsd(((Setup.OSDWidth - 612) / 2) + Setup.OSDLeft, ((Setup.OSDHeight - 436) / 2) + Setup.OSDTop);
     if (osd && !osd->SetAreas(Areas, sizeof(Areas)/sizeof(tArea)))
     {
         delete [] fullHours;
@@ -863,23 +1007,16 @@ void magazine::Show(void)
         delete f2;
         delete f3;
         delete f4;
+        delete f5;
+
+        f1=new anyFont(osd,(round(12*Width) / 720),1);	// Sendung
+        f2=new anyFont(osd,(round(11*Width) / 720),1);	// Extra-Info
+        f3=new anyFont(osd,(round(12*Width) / 720),1);	// Sender
+        f4=new anyFont(osd,(round(11*Width) / 720));	// Tasten
+        f5=new anyFont(osd,(round(11*Width) / 720));	// Datum
 
-#if VDRVERSNUM >= 10503
-        f1=new anyFont(osd,18,1);		// Sendung
-        f2=new anyFont(osd,16,1);	// Extra-Info
-        f3=new anyFont(osd,20,1);	// Sender
-        f4=new anyFont(osd,16);	// Tasten
-#else
-        f1=new anyFont(osd,(cFont::tPixelData *)fontosd_arial18,FONTOSD_ARIAL18,1);		// Sendung
-        f2=new anyFont(osd,(cFont::tPixelData *)fontosd_verdana16,FONTOSD_VERDANA16,1);	// Extra-Info
-        f3=new anyFont(osd,(cFont::tPixelData *)fontosd_tahoma16,FONTOSD_TAHOMA16,1);	// Sender
-        f4=new anyFont(osd,(cFont::tPixelData *)fontosd_newroman16,FONTOSD_NEWROMAN16);	// Tasten
-#endif
         for (int i=0; i < (int)(sizeof(Areas)/sizeof(tArea)); i++)
         {
-//			cBitmap *b=osd->GetBitmap(i);
-//			if (b)
-//				b->Reset();
             osd->DrawRectangle(Areas[i].x1, Areas[i].y1, Areas[i].x2+1, Areas[i].y2+1, clrGray50);
         }
         evnum=(Areas[SCHED1_AREA].y2-Areas[SCHED1_AREA].y1)/f1->Height();
@@ -896,6 +1033,7 @@ void magazine::Show(void)
         output();
     }
 }
+
 cEvent **magazine::ev4ch(int p)
 {
     cEvent **ev=NULL;
@@ -907,6 +1045,7 @@ cEvent **magazine::ev4ch(int p)
         ev=ev3;
     return ev;
 }
+
 void magazine::searchcEvt(void)
 {
     cEvent **ev=ev4ch(EDIT_curChannel);
@@ -919,6 +1058,7 @@ void magazine::searchcEvt(void)
         }
     }
 }
+
 eOSState magazine::ProcessKey(eKeys Key)
 {
     //mzlog(10," ProcessKey(%d)",Key);
@@ -1205,22 +1345,6 @@ eOSState magazine::ProcessKey(eKeys Key)
                 case k6: // usertime3
                     gotoUsertime(tvonscreenCfg.usertime3);
                     break;
-                    /*			case k0:
-                    				break;
-                    			case k1:
-                    				break;
-                    			case k2:
-                    				break;
-                    			case k3:
-                    				break;
-                    			case k4:
-                    				break;
-                    			case k5:
-                    				break;
-                    			case k6:
-                    				break;
-                    			case k8:
-                    				break;			*/
                 default:
                     return state;
                 }
@@ -1345,34 +1469,6 @@ eOSState magazine::ProcessKey(eKeys Key)
                     output();
                 }
                 break;
-                /*					case kRed:
-                						break;
-                					case kBlue:
-                						break;
-                					case kGreen:
-                						break;
-                					case kYellow:
-                						break;			*/
-                /*			case k0:
-                				break;
-                			case k1:
-                				break;
-                			case k2:
-                				break;
-                			case k3:
-                				break;
-                			case k4:
-                				break;
-                			case k5:
-                				break;
-                			case k6:
-                				break;
-                			case k7:
-                				break;
-                			case k8:
-                				break;
-                			case k9:
-                				break;			*/
                 case kRecord:
                 {
                     cEvent **ev=ev4ch(EDIT_curChannel);
diff --git a/magazine.h b/magazine.h
index aaf76e8..1d1ef8e 100644
--- a/magazine.h
+++ b/magazine.h
@@ -3,8 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: magazine.h,v 1.16 2006/06/18 13:59:36 schmitzj Exp $
- *
  */
 
 #ifndef MAGAZINE_H
@@ -19,11 +17,6 @@
 #include "search.h"
 
 void mzlog(int level, const char *fmt, ...);
-#define TL_YSTART 	48
-// else
-//#define TL_YSTART	24
-
-// #define MULTINAMES
 
 typedef enum
 {
@@ -51,7 +44,7 @@ class magazine : public cOsdObject
     class cMenuEditTimer *met;
     class cSearchMenu *mes;
 
-    anyFont *f1,*f2,*f3,*f4;
+    anyFont *f1,*f2,*f3,*f4,*f5;
 
     cSchedulesLock _schedulesLock;
     const cSchedule** schedArray;
@@ -71,13 +64,17 @@ class magazine : public cOsdObject
     enum modes {SHOW,EDIT};
     enum modes curmode;
 
-    int EDIT_curEvent;
+    unsigned short EDIT_curEvent;
     int EDIT_curChannel;
     int EDIT_curEVI;
 
     bool timeline_tested;
     bool timeline_found_conflict;
 
+    int Width;
+    int Height;
+    double Aspect;
+
 public:
     static const class cEvent *getNext(const cSchedule *s,const cEvent *e);
     static const class cEvent *getPrev(const cSchedule *s,const cEvent *e);
@@ -91,7 +88,7 @@ private:
     void showTimeline(void);
     void showHeads(bool onlyBG=false);
     void showScheds(void);
-    void showSched(const cSchedule *s,cEvent **ev, tMagazineArea area);
+    void showSched(cEvent **ev, tMagazineArea area);
     void calcSched(const cSchedule *s,cEvent **ev);
     void calcScheds(void);
 
diff --git a/po/ca_ES.po b/po/ca_ES.po
new file mode 100644
index 0000000..0a6a569
--- /dev/null
+++ b/po/ca_ES.po
@@ -0,0 +1,174 @@
+# 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.
+# Marc Rovira Vall <tm05462@salleURL.edu>, 2003
+# Ramon Roca <ramon.roca@xcombo.com>, 2003
+# Jordi Vilà <jvila@tinet.org>, 2003
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.6.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-08-02 15:03+0200\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "show channel logos"
+msgstr ""
+
+msgid "show channel names"
+msgstr ""
+
+msgid "show logos in black&white"
+msgstr ""
+
+msgid "enable color problem work around"
+msgstr ""
+
+msgid "use XL fonts"
+msgstr ""
+
+msgid "hide info line"
+msgstr ""
+
+msgid "user point in time 1 (Key 4)"
+msgstr ""
+
+msgid "user point in time 2 (Key 5)"
+msgstr ""
+
+msgid "user point in time 3 (Key 6)"
+msgstr ""
+
+msgid "jump to next day point if ago"
+msgstr ""
+
+msgid "Show search item itself"
+msgstr ""
+
+msgid "Press 1 for help"
+msgstr ""
+
+#, c-format
+msgid "%d-%m"
+msgstr ""
+
+msgid "o'clock"
+msgstr ""
+
+msgid "Timer conflict!"
+msgstr ""
+
+msgid "NORMAL MODE:"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove view"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tclose TV OnScreen"
+msgstr ""
+
+msgid ""
+"red/blue\n"
+"\t-/+ one day"
+msgstr ""
+
+msgid ""
+"green/yellow\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"7/9\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"8\n"
+"\tgoto current channel"
+msgstr ""
+
+msgid ""
+"0\n"
+"\tgoto now"
+msgstr ""
+
+msgid ""
+"4/5/6\n"
+"\tgoto configured time"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tswitch to edit mode\n"
+msgstr ""
+
+msgid "EDIT MODE:"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tback to normal mode"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove selected schedule"
+msgstr ""
+
+msgid ""
+"record\n"
+"\tcreate timer"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tshow details"
+msgstr ""
+
+msgid "Added AutoTimer to vdradmin."
+msgstr ""
+
+msgid "Startoption 'vdradminfile' not set!"
+msgstr ""
+
+msgid "Search"
+msgstr ""
+
+msgid "Search for"
+msgstr ""
+
+msgid "Searching..."
+msgstr ""
+
+msgid "Record"
+msgstr ""
+
+msgid "Details"
+msgstr ""
+
+msgid "in all"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
+msgid "Nothing found!"
+msgstr ""
+
+msgid "AutoTimer"
+msgstr ""
+
+msgid "Shows the EPG info in form of a typical TV magazine"
+msgstr ""
+
+msgid "TV-OnScreen"
+msgstr ""
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
new file mode 100644
index 0000000..6ad2f60
--- /dev/null
+++ b/po/cs_CZ.po
@@ -0,0 +1,172 @@
+# 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.
+# Vladimír Bárta <vladimir.barta@k2atmitec.cz>, 2006
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.6.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-08-02 15:03+0200\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "show channel logos"
+msgstr ""
+
+msgid "show channel names"
+msgstr ""
+
+msgid "show logos in black&white"
+msgstr ""
+
+msgid "enable color problem work around"
+msgstr ""
+
+msgid "use XL fonts"
+msgstr ""
+
+msgid "hide info line"
+msgstr ""
+
+msgid "user point in time 1 (Key 4)"
+msgstr ""
+
+msgid "user point in time 2 (Key 5)"
+msgstr ""
+
+msgid "user point in time 3 (Key 6)"
+msgstr ""
+
+msgid "jump to next day point if ago"
+msgstr ""
+
+msgid "Show search item itself"
+msgstr ""
+
+msgid "Press 1 for help"
+msgstr ""
+
+#, c-format
+msgid "%d-%m"
+msgstr ""
+
+msgid "o'clock"
+msgstr ""
+
+msgid "Timer conflict!"
+msgstr ""
+
+msgid "NORMAL MODE:"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove view"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tclose TV OnScreen"
+msgstr ""
+
+msgid ""
+"red/blue\n"
+"\t-/+ one day"
+msgstr ""
+
+msgid ""
+"green/yellow\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"7/9\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"8\n"
+"\tgoto current channel"
+msgstr ""
+
+msgid ""
+"0\n"
+"\tgoto now"
+msgstr ""
+
+msgid ""
+"4/5/6\n"
+"\tgoto configured time"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tswitch to edit mode\n"
+msgstr ""
+
+msgid "EDIT MODE:"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tback to normal mode"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove selected schedule"
+msgstr ""
+
+msgid ""
+"record\n"
+"\tcreate timer"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tshow details"
+msgstr ""
+
+msgid "Added AutoTimer to vdradmin."
+msgstr ""
+
+msgid "Startoption 'vdradminfile' not set!"
+msgstr ""
+
+msgid "Search"
+msgstr ""
+
+msgid "Search for"
+msgstr ""
+
+msgid "Searching..."
+msgstr ""
+
+msgid "Record"
+msgstr ""
+
+msgid "Details"
+msgstr ""
+
+msgid "in all"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
+msgid "Nothing found!"
+msgstr ""
+
+msgid "AutoTimer"
+msgstr ""
+
+msgid "Shows the EPG info in form of a typical TV magazine"
+msgstr ""
+
+msgid "TV-OnScreen"
+msgstr ""
diff --git a/po/da_DK.po b/po/da_DK.po
new file mode 100644
index 0000000..30856a6
--- /dev/null
+++ b/po/da_DK.po
@@ -0,0 +1,172 @@
+# 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.
+# Mogens Elneff <mogens@elneff.dk>, 2004
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.6.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-08-02 15:03+0200\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "show channel logos"
+msgstr ""
+
+msgid "show channel names"
+msgstr ""
+
+msgid "show logos in black&white"
+msgstr ""
+
+msgid "enable color problem work around"
+msgstr ""
+
+msgid "use XL fonts"
+msgstr ""
+
+msgid "hide info line"
+msgstr ""
+
+msgid "user point in time 1 (Key 4)"
+msgstr ""
+
+msgid "user point in time 2 (Key 5)"
+msgstr ""
+
+msgid "user point in time 3 (Key 6)"
+msgstr ""
+
+msgid "jump to next day point if ago"
+msgstr ""
+
+msgid "Show search item itself"
+msgstr ""
+
+msgid "Press 1 for help"
+msgstr ""
+
+#, c-format
+msgid "%d-%m"
+msgstr ""
+
+msgid "o'clock"
+msgstr ""
+
+msgid "Timer conflict!"
+msgstr ""
+
+msgid "NORMAL MODE:"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove view"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tclose TV OnScreen"
+msgstr ""
+
+msgid ""
+"red/blue\n"
+"\t-/+ one day"
+msgstr ""
+
+msgid ""
+"green/yellow\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"7/9\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"8\n"
+"\tgoto current channel"
+msgstr ""
+
+msgid ""
+"0\n"
+"\tgoto now"
+msgstr ""
+
+msgid ""
+"4/5/6\n"
+"\tgoto configured time"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tswitch to edit mode\n"
+msgstr ""
+
+msgid "EDIT MODE:"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tback to normal mode"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove selected schedule"
+msgstr ""
+
+msgid ""
+"record\n"
+"\tcreate timer"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tshow details"
+msgstr ""
+
+msgid "Added AutoTimer to vdradmin."
+msgstr ""
+
+msgid "Startoption 'vdradminfile' not set!"
+msgstr ""
+
+msgid "Search"
+msgstr ""
+
+msgid "Search for"
+msgstr ""
+
+msgid "Searching..."
+msgstr ""
+
+msgid "Record"
+msgstr ""
+
+msgid "Details"
+msgstr ""
+
+msgid "in all"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
+msgid "Nothing found!"
+msgstr ""
+
+msgid "AutoTimer"
+msgstr ""
+
+msgid "Shows the EPG info in form of a typical TV magazine"
+msgstr ""
+
+msgid "TV-OnScreen"
+msgstr ""
diff --git a/po/de_DE.po b/po/de_DE.po
index 8b5ef4a..a49788b 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -1,15 +1,18 @@
-# This file is distributed under the same license as the tvonscreen package.
+# 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.
+# Klaus Schmidinger <kls@cadsoft.de>, 2000
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-08-01 13:08+0200\n"
-"PO-Revision-Date: 2010-07-31 19:58+0200\n"
-"Last-Translator: Jochen Dolze <vdr@dolze.de>\n"
+"POT-Creation-Date: 2010-08-02 15:03+0200\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"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "show channel logos"
@@ -19,7 +22,7 @@ msgid "show channel names"
 msgstr "zeige Kanal-Namen"
 
 msgid "show logos in black&white"
-msgstr "zeige Kanal-Logos in Schwarz/Weiß"
+msgstr "zeige Kanal-Logos in Schwarz/Weiß"
 
 msgid "enable color problem work around"
 msgstr "Farbproblem Umgehung aktivieren"
@@ -40,17 +43,17 @@ msgid "user point in time 3 (Key 6)"
 msgstr "Anwenderzeitpunkt 3 (Taste 6)"
 
 msgid "jump to next day point if ago"
-msgstr "Gehe zum nächsten Tag wenn vorbei"
+msgstr "Gehe zum nächsten Tag wenn vorbei"
 
 msgid "Show search item itself"
 msgstr "Zeige auch Suchbegriff"
 
 msgid "Press 1 for help"
-msgstr "Für Hilfe die 1 drücken"
+msgstr "Für Hilfe die 1 drücken"
 
 #, c-format
 msgid "%d-%m"
-msgstr "%d-%m"
+msgstr "%d.%m."
 
 msgid "o'clock"
 msgstr "Uhr"
@@ -58,8 +61,105 @@ msgstr "Uhr"
 msgid "Timer conflict!"
 msgstr "Timer Konflikt!"
 
+msgid "NORMAL MODE:"
+msgstr "NORMALER MODUS:"
+
+msgid ""
+"arrows\n"
+"\tmove view"
+msgstr ""
+"Pfeile\n"
+"\tAnsicht bewegen"
+
+msgid ""
+"back\n"
+"\tclose TV OnScreen"
+msgstr ""
+"back\n"
+"\tschließe TV OnScreen"
+
+msgid ""
+"red/blue\n"
+"\t-/+ one day"
+msgstr ""
+"rot/blau\n"
+"\t-/+ ein Tag"
+
+msgid ""
+"green/yellow\n"
+"\tone page left/right"
+msgstr ""
+"grün/gelb\n"
+"\teine Seite links/rechts"
+
+msgid ""
+"7/9\n"
+"\tone page left/right"
+msgstr ""
+"7/9\n"
+"\teine Seite links/rechts"
+
+msgid ""
+"8\n"
+"\tgoto current channel"
+msgstr ""
+"8\n"
+"\tgehe zum aktuellen Kanal"
+
+msgid ""
+"0\n"
+"\tgoto now"
+msgstr ""
+"0\n"
+"\tgehe zur aktuellen Zeit"
+
+msgid ""
+"4/5/6\n"
+"\tgoto configured time"
+msgstr ""
+"4/5/6\n"
+"\tgehe zu eingestellten Zeitpunkten"
+
+msgid ""
+"ok\n"
+"\tswitch to edit mode\n"
+msgstr ""
+"ok\n"
+"\taktiviere Editier-Modus\n"
+
+msgid "EDIT MODE:"
+msgstr "EDITIER MODUS:"
+
+msgid ""
+"back\n"
+"\tback to normal mode"
+msgstr ""
+"back\n"
+"\tzurück zum normalen Modus"
+
+msgid ""
+"arrows\n"
+"\tmove selected schedule"
+msgstr ""
+"Pfeile\n"
+"\tSendung auswählen"
+
+msgid ""
+"record\n"
+"\tcreate timer"
+msgstr ""
+"record\n"
+"\terzeuge Timer"
+
+msgid ""
+"ok\n"
+"\tshow details"
+msgstr ""
+"ok\n"
+"\tzeige Sendungsdetails"
+
 msgid "Added AutoTimer to vdradmin."
-msgstr "AutoTimer in vdradmin aufgenommen"
+msgstr "AutoTimer in vdradmin aufgenommen."
 
 msgid "Startoption 'vdradminfile' not set!"
 msgstr "Startoption 'vdradminfile' nicht gesetzt!"
@@ -83,7 +183,7 @@ msgid "in all"
 msgstr "in allen"
 
 msgid "Back"
-msgstr "Zurück"
+msgstr "Zurück"
 
 msgid "Nothing found!"
 msgstr "Nichts gefunden!"
@@ -92,7 +192,7 @@ msgid "AutoTimer"
 msgstr "AutoTimer"
 
 msgid "Shows the EPG info in form of a typical TV magazine"
-msgstr "Zeigt EPG Infos in Form einer TV Zeitschrift"
+msgstr "Zeigt EPG als TV-Magazin"
 
 msgid "TV-OnScreen"
-msgstr "TV-OnScreen"
+msgstr "TV Magazin"
diff --git a/po/el_GR.po b/po/el_GR.po
new file mode 100644
index 0000000..2e9cc27
--- /dev/null
+++ b/po/el_GR.po
@@ -0,0 +1,172 @@
+# 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.
+# Dimitrios Dimitrakos <mail@dimitrios.de>, 2002
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.6.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-08-02 15:03+0200\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-7\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "show channel logos"
+msgstr ""
+
+msgid "show channel names"
+msgstr ""
+
+msgid "show logos in black&white"
+msgstr ""
+
+msgid "enable color problem work around"
+msgstr ""
+
+msgid "use XL fonts"
+msgstr ""
+
+msgid "hide info line"
+msgstr ""
+
+msgid "user point in time 1 (Key 4)"
+msgstr ""
+
+msgid "user point in time 2 (Key 5)"
+msgstr ""
+
+msgid "user point in time 3 (Key 6)"
+msgstr ""
+
+msgid "jump to next day point if ago"
+msgstr ""
+
+msgid "Show search item itself"
+msgstr ""
+
+msgid "Press 1 for help"
+msgstr ""
+
+#, c-format
+msgid "%d-%m"
+msgstr ""
+
+msgid "o'clock"
+msgstr ""
+
+msgid "Timer conflict!"
+msgstr ""
+
+msgid "NORMAL MODE:"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove view"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tclose TV OnScreen"
+msgstr ""
+
+msgid ""
+"red/blue\n"
+"\t-/+ one day"
+msgstr ""
+
+msgid ""
+"green/yellow\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"7/9\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"8\n"
+"\tgoto current channel"
+msgstr ""
+
+msgid ""
+"0\n"
+"\tgoto now"
+msgstr ""
+
+msgid ""
+"4/5/6\n"
+"\tgoto configured time"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tswitch to edit mode\n"
+msgstr ""
+
+msgid "EDIT MODE:"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tback to normal mode"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove selected schedule"
+msgstr ""
+
+msgid ""
+"record\n"
+"\tcreate timer"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tshow details"
+msgstr ""
+
+msgid "Added AutoTimer to vdradmin."
+msgstr ""
+
+msgid "Startoption 'vdradminfile' not set!"
+msgstr ""
+
+msgid "Search"
+msgstr ""
+
+msgid "Search for"
+msgstr ""
+
+msgid "Searching..."
+msgstr ""
+
+msgid "Record"
+msgstr ""
+
+msgid "Details"
+msgstr ""
+
+msgid "in all"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
+msgid "Nothing found!"
+msgstr ""
+
+msgid "AutoTimer"
+msgstr ""
+
+msgid "Shows the EPG info in form of a typical TV magazine"
+msgstr ""
+
+msgid "TV-OnScreen"
+msgstr ""
diff --git a/po/es_ES.po b/po/es_ES.po
new file mode 100644
index 0000000..8349af3
--- /dev/null
+++ b/po/es_ES.po
@@ -0,0 +1,172 @@
+# 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.
+# Ruben Nunez Francisco <ruben.nunez@tang-it.com>, 2002
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.6.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-08-02 15:03+0200\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "show channel logos"
+msgstr ""
+
+msgid "show channel names"
+msgstr ""
+
+msgid "show logos in black&white"
+msgstr ""
+
+msgid "enable color problem work around"
+msgstr ""
+
+msgid "use XL fonts"
+msgstr ""
+
+msgid "hide info line"
+msgstr ""
+
+msgid "user point in time 1 (Key 4)"
+msgstr ""
+
+msgid "user point in time 2 (Key 5)"
+msgstr ""
+
+msgid "user point in time 3 (Key 6)"
+msgstr ""
+
+msgid "jump to next day point if ago"
+msgstr ""
+
+msgid "Show search item itself"
+msgstr ""
+
+msgid "Press 1 for help"
+msgstr ""
+
+#, c-format
+msgid "%d-%m"
+msgstr ""
+
+msgid "o'clock"
+msgstr ""
+
+msgid "Timer conflict!"
+msgstr ""
+
+msgid "NORMAL MODE:"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove view"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tclose TV OnScreen"
+msgstr ""
+
+msgid ""
+"red/blue\n"
+"\t-/+ one day"
+msgstr ""
+
+msgid ""
+"green/yellow\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"7/9\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"8\n"
+"\tgoto current channel"
+msgstr ""
+
+msgid ""
+"0\n"
+"\tgoto now"
+msgstr ""
+
+msgid ""
+"4/5/6\n"
+"\tgoto configured time"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tswitch to edit mode\n"
+msgstr ""
+
+msgid "EDIT MODE:"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tback to normal mode"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove selected schedule"
+msgstr ""
+
+msgid ""
+"record\n"
+"\tcreate timer"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tshow details"
+msgstr ""
+
+msgid "Added AutoTimer to vdradmin."
+msgstr ""
+
+msgid "Startoption 'vdradminfile' not set!"
+msgstr ""
+
+msgid "Search"
+msgstr ""
+
+msgid "Search for"
+msgstr ""
+
+msgid "Searching..."
+msgstr ""
+
+msgid "Record"
+msgstr ""
+
+msgid "Details"
+msgstr ""
+
+msgid "in all"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
+msgid "Nothing found!"
+msgstr ""
+
+msgid "AutoTimer"
+msgstr ""
+
+msgid "Shows the EPG info in form of a typical TV magazine"
+msgstr ""
+
+msgid "TV-OnScreen"
+msgstr ""
diff --git a/po/et_EE.po b/po/et_EE.po
new file mode 100644
index 0000000..59345c2
--- /dev/null
+++ b/po/et_EE.po
@@ -0,0 +1,172 @@
+# 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.
+# Arthur Konovalov <kasjas@hot.ee>, 2004
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.6.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-08-02 15:03+0200\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-13\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "show channel logos"
+msgstr ""
+
+msgid "show channel names"
+msgstr ""
+
+msgid "show logos in black&white"
+msgstr ""
+
+msgid "enable color problem work around"
+msgstr ""
+
+msgid "use XL fonts"
+msgstr ""
+
+msgid "hide info line"
+msgstr ""
+
+msgid "user point in time 1 (Key 4)"
+msgstr ""
+
+msgid "user point in time 2 (Key 5)"
+msgstr ""
+
+msgid "user point in time 3 (Key 6)"
+msgstr ""
+
+msgid "jump to next day point if ago"
+msgstr ""
+
+msgid "Show search item itself"
+msgstr ""
+
+msgid "Press 1 for help"
+msgstr ""
+
+#, c-format
+msgid "%d-%m"
+msgstr ""
+
+msgid "o'clock"
+msgstr ""
+
+msgid "Timer conflict!"
+msgstr ""
+
+msgid "NORMAL MODE:"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove view"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tclose TV OnScreen"
+msgstr ""
+
+msgid ""
+"red/blue\n"
+"\t-/+ one day"
+msgstr ""
+
+msgid ""
+"green/yellow\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"7/9\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"8\n"
+"\tgoto current channel"
+msgstr ""
+
+msgid ""
+"0\n"
+"\tgoto now"
+msgstr ""
+
+msgid ""
+"4/5/6\n"
+"\tgoto configured time"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tswitch to edit mode\n"
+msgstr ""
+
+msgid "EDIT MODE:"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tback to normal mode"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove selected schedule"
+msgstr ""
+
+msgid ""
+"record\n"
+"\tcreate timer"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tshow details"
+msgstr ""
+
+msgid "Added AutoTimer to vdradmin."
+msgstr ""
+
+msgid "Startoption 'vdradminfile' not set!"
+msgstr ""
+
+msgid "Search"
+msgstr ""
+
+msgid "Search for"
+msgstr ""
+
+msgid "Searching..."
+msgstr ""
+
+msgid "Record"
+msgstr ""
+
+msgid "Details"
+msgstr ""
+
+msgid "in all"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
+msgid "Nothing found!"
+msgstr ""
+
+msgid "AutoTimer"
+msgstr ""
+
+msgid "Shows the EPG info in form of a typical TV magazine"
+msgstr ""
+
+msgid "TV-OnScreen"
+msgstr ""
diff --git a/po/fr_FR.po b/po/fr_FR.po
new file mode 100644
index 0000000..2bb9d83
--- /dev/null
+++ b/po/fr_FR.po
@@ -0,0 +1,175 @@
+# 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.
+# Jean-Claude Repetto <jc@repetto.org>, 2001
+# Olivier Jacques <jacquesolivier@hotmail.com>, 2003
+# Gregoire Favre <greg@magma.unil.ch>, 2003
+# Nicolas Huillard <nhuillard@e-dition.fr>, 2005
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.6.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-08-02 15:03+0200\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "show channel logos"
+msgstr ""
+
+msgid "show channel names"
+msgstr ""
+
+msgid "show logos in black&white"
+msgstr ""
+
+msgid "enable color problem work around"
+msgstr ""
+
+msgid "use XL fonts"
+msgstr ""
+
+msgid "hide info line"
+msgstr ""
+
+msgid "user point in time 1 (Key 4)"
+msgstr ""
+
+msgid "user point in time 2 (Key 5)"
+msgstr ""
+
+msgid "user point in time 3 (Key 6)"
+msgstr ""
+
+msgid "jump to next day point if ago"
+msgstr ""
+
+msgid "Show search item itself"
+msgstr ""
+
+msgid "Press 1 for help"
+msgstr ""
+
+#, c-format
+msgid "%d-%m"
+msgstr ""
+
+msgid "o'clock"
+msgstr ""
+
+msgid "Timer conflict!"
+msgstr ""
+
+msgid "NORMAL MODE:"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove view"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tclose TV OnScreen"
+msgstr ""
+
+msgid ""
+"red/blue\n"
+"\t-/+ one day"
+msgstr ""
+
+msgid ""
+"green/yellow\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"7/9\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"8\n"
+"\tgoto current channel"
+msgstr ""
+
+msgid ""
+"0\n"
+"\tgoto now"
+msgstr ""
+
+msgid ""
+"4/5/6\n"
+"\tgoto configured time"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tswitch to edit mode\n"
+msgstr ""
+
+msgid "EDIT MODE:"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tback to normal mode"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove selected schedule"
+msgstr ""
+
+msgid ""
+"record\n"
+"\tcreate timer"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tshow details"
+msgstr ""
+
+msgid "Added AutoTimer to vdradmin."
+msgstr ""
+
+msgid "Startoption 'vdradminfile' not set!"
+msgstr ""
+
+msgid "Search"
+msgstr ""
+
+msgid "Search for"
+msgstr ""
+
+msgid "Searching..."
+msgstr ""
+
+msgid "Record"
+msgstr ""
+
+msgid "Details"
+msgstr ""
+
+msgid "in all"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
+msgid "Nothing found!"
+msgstr ""
+
+msgid "AutoTimer"
+msgstr ""
+
+msgid "Shows the EPG info in form of a typical TV magazine"
+msgstr ""
+
+msgid "TV-OnScreen"
+msgstr ""
diff --git a/po/hr_HR.po b/po/hr_HR.po
new file mode 100644
index 0000000..0362d2d
--- /dev/null
+++ b/po/hr_HR.po
@@ -0,0 +1,173 @@
+# 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.
+# Drazen Dupor <drazen.dupor@dupor.com>, 2004
+# Dino Ravnic <dino.ravnic@fer.hr>, 2004
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.6.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-08-02 15:03+0200\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "show channel logos"
+msgstr ""
+
+msgid "show channel names"
+msgstr ""
+
+msgid "show logos in black&white"
+msgstr ""
+
+msgid "enable color problem work around"
+msgstr ""
+
+msgid "use XL fonts"
+msgstr ""
+
+msgid "hide info line"
+msgstr ""
+
+msgid "user point in time 1 (Key 4)"
+msgstr ""
+
+msgid "user point in time 2 (Key 5)"
+msgstr ""
+
+msgid "user point in time 3 (Key 6)"
+msgstr ""
+
+msgid "jump to next day point if ago"
+msgstr ""
+
+msgid "Show search item itself"
+msgstr ""
+
+msgid "Press 1 for help"
+msgstr ""
+
+#, c-format
+msgid "%d-%m"
+msgstr ""
+
+msgid "o'clock"
+msgstr ""
+
+msgid "Timer conflict!"
+msgstr ""
+
+msgid "NORMAL MODE:"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove view"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tclose TV OnScreen"
+msgstr ""
+
+msgid ""
+"red/blue\n"
+"\t-/+ one day"
+msgstr ""
+
+msgid ""
+"green/yellow\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"7/9\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"8\n"
+"\tgoto current channel"
+msgstr ""
+
+msgid ""
+"0\n"
+"\tgoto now"
+msgstr ""
+
+msgid ""
+"4/5/6\n"
+"\tgoto configured time"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tswitch to edit mode\n"
+msgstr ""
+
+msgid "EDIT MODE:"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tback to normal mode"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove selected schedule"
+msgstr ""
+
+msgid ""
+"record\n"
+"\tcreate timer"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tshow details"
+msgstr ""
+
+msgid "Added AutoTimer to vdradmin."
+msgstr ""
+
+msgid "Startoption 'vdradminfile' not set!"
+msgstr ""
+
+msgid "Search"
+msgstr ""
+
+msgid "Search for"
+msgstr ""
+
+msgid "Searching..."
+msgstr ""
+
+msgid "Record"
+msgstr ""
+
+msgid "Details"
+msgstr ""
+
+msgid "in all"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
+msgid "Nothing found!"
+msgstr ""
+
+msgid "AutoTimer"
+msgstr ""
+
+msgid "Shows the EPG info in form of a typical TV magazine"
+msgstr ""
+
+msgid "TV-OnScreen"
+msgstr ""
diff --git a/po/hu_HU.po b/po/hu_HU.po
new file mode 100644
index 0000000..5b60c1c
--- /dev/null
+++ b/po/hu_HU.po
@@ -0,0 +1,173 @@
+# 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.
+# Istvan Koenigsberger <istvnko@hotmail.com>, 2002
+# Guido Josten <guido.josten@t-online.de>, 2002
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.6.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-08-02 15:03+0200\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "show channel logos"
+msgstr ""
+
+msgid "show channel names"
+msgstr ""
+
+msgid "show logos in black&white"
+msgstr ""
+
+msgid "enable color problem work around"
+msgstr ""
+
+msgid "use XL fonts"
+msgstr ""
+
+msgid "hide info line"
+msgstr ""
+
+msgid "user point in time 1 (Key 4)"
+msgstr ""
+
+msgid "user point in time 2 (Key 5)"
+msgstr ""
+
+msgid "user point in time 3 (Key 6)"
+msgstr ""
+
+msgid "jump to next day point if ago"
+msgstr ""
+
+msgid "Show search item itself"
+msgstr ""
+
+msgid "Press 1 for help"
+msgstr ""
+
+#, c-format
+msgid "%d-%m"
+msgstr ""
+
+msgid "o'clock"
+msgstr ""
+
+msgid "Timer conflict!"
+msgstr ""
+
+msgid "NORMAL MODE:"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove view"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tclose TV OnScreen"
+msgstr ""
+
+msgid ""
+"red/blue\n"
+"\t-/+ one day"
+msgstr ""
+
+msgid ""
+"green/yellow\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"7/9\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"8\n"
+"\tgoto current channel"
+msgstr ""
+
+msgid ""
+"0\n"
+"\tgoto now"
+msgstr ""
+
+msgid ""
+"4/5/6\n"
+"\tgoto configured time"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tswitch to edit mode\n"
+msgstr ""
+
+msgid "EDIT MODE:"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tback to normal mode"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove selected schedule"
+msgstr ""
+
+msgid ""
+"record\n"
+"\tcreate timer"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tshow details"
+msgstr ""
+
+msgid "Added AutoTimer to vdradmin."
+msgstr ""
+
+msgid "Startoption 'vdradminfile' not set!"
+msgstr ""
+
+msgid "Search"
+msgstr ""
+
+msgid "Search for"
+msgstr ""
+
+msgid "Searching..."
+msgstr ""
+
+msgid "Record"
+msgstr ""
+
+msgid "Details"
+msgstr ""
+
+msgid "in all"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
+msgid "Nothing found!"
+msgstr ""
+
+msgid "AutoTimer"
+msgstr ""
+
+msgid "Shows the EPG info in form of a typical TV magazine"
+msgstr ""
+
+msgid "TV-OnScreen"
+msgstr ""
diff --git a/po/it_IT.po b/po/it_IT.po
new file mode 100644
index 0000000..1e9f81b
--- /dev/null
+++ b/po/it_IT.po
@@ -0,0 +1,174 @@
+# 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.
+# Alberto Carraro <bertocar@tin.it>, 2001
+# Antonio Ospite <ospite@studenti.unina.it>, 2003
+# Sean Carlos <seanc@libero.it>, 2005
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.6.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-08-02 15:03+0200\n"
+"PO-Revision-Date: 2008-12-22 18:10+0000\n"
+"Last-Translator: Sean Carlos <seanc@libero.it>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "show channel logos"
+msgstr ""
+
+msgid "show channel names"
+msgstr ""
+
+msgid "show logos in black&white"
+msgstr ""
+
+msgid "enable color problem work around"
+msgstr ""
+
+msgid "use XL fonts"
+msgstr ""
+
+msgid "hide info line"
+msgstr ""
+
+msgid "user point in time 1 (Key 4)"
+msgstr ""
+
+msgid "user point in time 2 (Key 5)"
+msgstr ""
+
+msgid "user point in time 3 (Key 6)"
+msgstr ""
+
+msgid "jump to next day point if ago"
+msgstr ""
+
+msgid "Show search item itself"
+msgstr ""
+
+msgid "Press 1 for help"
+msgstr ""
+
+#, c-format
+msgid "%d-%m"
+msgstr ""
+
+msgid "o'clock"
+msgstr ""
+
+msgid "Timer conflict!"
+msgstr ""
+
+msgid "NORMAL MODE:"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove view"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tclose TV OnScreen"
+msgstr ""
+
+msgid ""
+"red/blue\n"
+"\t-/+ one day"
+msgstr ""
+
+msgid ""
+"green/yellow\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"7/9\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"8\n"
+"\tgoto current channel"
+msgstr ""
+
+msgid ""
+"0\n"
+"\tgoto now"
+msgstr ""
+
+msgid ""
+"4/5/6\n"
+"\tgoto configured time"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tswitch to edit mode\n"
+msgstr ""
+
+msgid "EDIT MODE:"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tback to normal mode"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove selected schedule"
+msgstr ""
+
+msgid ""
+"record\n"
+"\tcreate timer"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tshow details"
+msgstr ""
+
+msgid "Added AutoTimer to vdradmin."
+msgstr ""
+
+msgid "Startoption 'vdradminfile' not set!"
+msgstr ""
+
+msgid "Search"
+msgstr ""
+
+msgid "Search for"
+msgstr ""
+
+msgid "Searching..."
+msgstr ""
+
+msgid "Record"
+msgstr ""
+
+msgid "Details"
+msgstr ""
+
+msgid "in all"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
+msgid "Nothing found!"
+msgstr ""
+
+msgid "AutoTimer"
+msgstr ""
+
+msgid "Shows the EPG info in form of a typical TV magazine"
+msgstr ""
+
+msgid "TV-OnScreen"
+msgstr ""
diff --git a/po/nl_NL.po b/po/nl_NL.po
new file mode 100644
index 0000000..0736b6b
--- /dev/null
+++ b/po/nl_NL.po
@@ -0,0 +1,174 @@
+# 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.
+# Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>, 2001
+# Hans Dingemans <hans.dingemans@tacticalops.nl>, 2003
+# Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>, 2005
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.6.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-08-02 15:03+0200\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "show channel logos"
+msgstr ""
+
+msgid "show channel names"
+msgstr ""
+
+msgid "show logos in black&white"
+msgstr ""
+
+msgid "enable color problem work around"
+msgstr ""
+
+msgid "use XL fonts"
+msgstr ""
+
+msgid "hide info line"
+msgstr ""
+
+msgid "user point in time 1 (Key 4)"
+msgstr ""
+
+msgid "user point in time 2 (Key 5)"
+msgstr ""
+
+msgid "user point in time 3 (Key 6)"
+msgstr ""
+
+msgid "jump to next day point if ago"
+msgstr ""
+
+msgid "Show search item itself"
+msgstr ""
+
+msgid "Press 1 for help"
+msgstr ""
+
+#, c-format
+msgid "%d-%m"
+msgstr ""
+
+msgid "o'clock"
+msgstr ""
+
+msgid "Timer conflict!"
+msgstr ""
+
+msgid "NORMAL MODE:"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove view"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tclose TV OnScreen"
+msgstr ""
+
+msgid ""
+"red/blue\n"
+"\t-/+ one day"
+msgstr ""
+
+msgid ""
+"green/yellow\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"7/9\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"8\n"
+"\tgoto current channel"
+msgstr ""
+
+msgid ""
+"0\n"
+"\tgoto now"
+msgstr ""
+
+msgid ""
+"4/5/6\n"
+"\tgoto configured time"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tswitch to edit mode\n"
+msgstr ""
+
+msgid "EDIT MODE:"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tback to normal mode"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove selected schedule"
+msgstr ""
+
+msgid ""
+"record\n"
+"\tcreate timer"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tshow details"
+msgstr ""
+
+msgid "Added AutoTimer to vdradmin."
+msgstr ""
+
+msgid "Startoption 'vdradminfile' not set!"
+msgstr ""
+
+msgid "Search"
+msgstr ""
+
+msgid "Search for"
+msgstr ""
+
+msgid "Searching..."
+msgstr ""
+
+msgid "Record"
+msgstr ""
+
+msgid "Details"
+msgstr ""
+
+msgid "in all"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
+msgid "Nothing found!"
+msgstr ""
+
+msgid "AutoTimer"
+msgstr ""
+
+msgid "Shows the EPG info in form of a typical TV magazine"
+msgstr ""
+
+msgid "TV-OnScreen"
+msgstr ""
diff --git a/po/nn_NO.po b/po/nn_NO.po
new file mode 100644
index 0000000..fa4f378
--- /dev/null
+++ b/po/nn_NO.po
@@ -0,0 +1,173 @@
+# 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.
+# Jørgen Tvedt <pjtvedt@online.no>, 2001
+# Truls Slevigen <truls@slevigen.no>, 2002
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.6.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-08-02 15:03+0200\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "show channel logos"
+msgstr ""
+
+msgid "show channel names"
+msgstr ""
+
+msgid "show logos in black&white"
+msgstr ""
+
+msgid "enable color problem work around"
+msgstr ""
+
+msgid "use XL fonts"
+msgstr ""
+
+msgid "hide info line"
+msgstr ""
+
+msgid "user point in time 1 (Key 4)"
+msgstr ""
+
+msgid "user point in time 2 (Key 5)"
+msgstr ""
+
+msgid "user point in time 3 (Key 6)"
+msgstr ""
+
+msgid "jump to next day point if ago"
+msgstr ""
+
+msgid "Show search item itself"
+msgstr ""
+
+msgid "Press 1 for help"
+msgstr ""
+
+#, c-format
+msgid "%d-%m"
+msgstr ""
+
+msgid "o'clock"
+msgstr ""
+
+msgid "Timer conflict!"
+msgstr ""
+
+msgid "NORMAL MODE:"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove view"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tclose TV OnScreen"
+msgstr ""
+
+msgid ""
+"red/blue\n"
+"\t-/+ one day"
+msgstr ""
+
+msgid ""
+"green/yellow\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"7/9\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"8\n"
+"\tgoto current channel"
+msgstr ""
+
+msgid ""
+"0\n"
+"\tgoto now"
+msgstr ""
+
+msgid ""
+"4/5/6\n"
+"\tgoto configured time"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tswitch to edit mode\n"
+msgstr ""
+
+msgid "EDIT MODE:"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tback to normal mode"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove selected schedule"
+msgstr ""
+
+msgid ""
+"record\n"
+"\tcreate timer"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tshow details"
+msgstr ""
+
+msgid "Added AutoTimer to vdradmin."
+msgstr ""
+
+msgid "Startoption 'vdradminfile' not set!"
+msgstr ""
+
+msgid "Search"
+msgstr ""
+
+msgid "Search for"
+msgstr ""
+
+msgid "Searching..."
+msgstr ""
+
+msgid "Record"
+msgstr ""
+
+msgid "Details"
+msgstr ""
+
+msgid "in all"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
+msgid "Nothing found!"
+msgstr ""
+
+msgid "AutoTimer"
+msgstr ""
+
+msgid "Shows the EPG info in form of a typical TV magazine"
+msgstr ""
+
+msgid "TV-OnScreen"
+msgstr ""
diff --git a/po/pl_PL.po b/po/pl_PL.po
new file mode 100644
index 0000000..3020112
--- /dev/null
+++ b/po/pl_PL.po
@@ -0,0 +1,172 @@
+# 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.
+# Michael Rakowski <mrak@gmx.de>, 2002
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.6.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-08-02 15:03+0200\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "show channel logos"
+msgstr ""
+
+msgid "show channel names"
+msgstr ""
+
+msgid "show logos in black&white"
+msgstr ""
+
+msgid "enable color problem work around"
+msgstr ""
+
+msgid "use XL fonts"
+msgstr ""
+
+msgid "hide info line"
+msgstr ""
+
+msgid "user point in time 1 (Key 4)"
+msgstr ""
+
+msgid "user point in time 2 (Key 5)"
+msgstr ""
+
+msgid "user point in time 3 (Key 6)"
+msgstr ""
+
+msgid "jump to next day point if ago"
+msgstr ""
+
+msgid "Show search item itself"
+msgstr ""
+
+msgid "Press 1 for help"
+msgstr ""
+
+#, c-format
+msgid "%d-%m"
+msgstr ""
+
+msgid "o'clock"
+msgstr ""
+
+msgid "Timer conflict!"
+msgstr ""
+
+msgid "NORMAL MODE:"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove view"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tclose TV OnScreen"
+msgstr ""
+
+msgid ""
+"red/blue\n"
+"\t-/+ one day"
+msgstr ""
+
+msgid ""
+"green/yellow\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"7/9\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"8\n"
+"\tgoto current channel"
+msgstr ""
+
+msgid ""
+"0\n"
+"\tgoto now"
+msgstr ""
+
+msgid ""
+"4/5/6\n"
+"\tgoto configured time"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tswitch to edit mode\n"
+msgstr ""
+
+msgid "EDIT MODE:"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tback to normal mode"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove selected schedule"
+msgstr ""
+
+msgid ""
+"record\n"
+"\tcreate timer"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tshow details"
+msgstr ""
+
+msgid "Added AutoTimer to vdradmin."
+msgstr ""
+
+msgid "Startoption 'vdradminfile' not set!"
+msgstr ""
+
+msgid "Search"
+msgstr ""
+
+msgid "Search for"
+msgstr ""
+
+msgid "Searching..."
+msgstr ""
+
+msgid "Record"
+msgstr ""
+
+msgid "Details"
+msgstr ""
+
+msgid "in all"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
+msgid "Nothing found!"
+msgstr "Ei löydetty!"
+
+msgid "AutoTimer"
+msgstr ""
+
+msgid "Shows the EPG info in form of a typical TV magazine"
+msgstr ""
+
+msgid "TV-OnScreen"
+msgstr ""
diff --git a/po/pt_PT.po b/po/pt_PT.po
new file mode 100644
index 0000000..4b7f4a5
--- /dev/null
+++ b/po/pt_PT.po
@@ -0,0 +1,172 @@
+# 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.
+# Paulo Lopes <pmml@netvita.pt>, 2001
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.6.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-08-02 15:03+0200\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "show channel logos"
+msgstr ""
+
+msgid "show channel names"
+msgstr ""
+
+msgid "show logos in black&white"
+msgstr ""
+
+msgid "enable color problem work around"
+msgstr ""
+
+msgid "use XL fonts"
+msgstr ""
+
+msgid "hide info line"
+msgstr ""
+
+msgid "user point in time 1 (Key 4)"
+msgstr ""
+
+msgid "user point in time 2 (Key 5)"
+msgstr ""
+
+msgid "user point in time 3 (Key 6)"
+msgstr ""
+
+msgid "jump to next day point if ago"
+msgstr ""
+
+msgid "Show search item itself"
+msgstr ""
+
+msgid "Press 1 for help"
+msgstr ""
+
+#, c-format
+msgid "%d-%m"
+msgstr ""
+
+msgid "o'clock"
+msgstr ""
+
+msgid "Timer conflict!"
+msgstr ""
+
+msgid "NORMAL MODE:"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove view"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tclose TV OnScreen"
+msgstr ""
+
+msgid ""
+"red/blue\n"
+"\t-/+ one day"
+msgstr ""
+
+msgid ""
+"green/yellow\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"7/9\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"8\n"
+"\tgoto current channel"
+msgstr ""
+
+msgid ""
+"0\n"
+"\tgoto now"
+msgstr ""
+
+msgid ""
+"4/5/6\n"
+"\tgoto configured time"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tswitch to edit mode\n"
+msgstr ""
+
+msgid "EDIT MODE:"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tback to normal mode"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove selected schedule"
+msgstr ""
+
+msgid ""
+"record\n"
+"\tcreate timer"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tshow details"
+msgstr ""
+
+msgid "Added AutoTimer to vdradmin."
+msgstr ""
+
+msgid "Startoption 'vdradminfile' not set!"
+msgstr ""
+
+msgid "Search"
+msgstr ""
+
+msgid "Search for"
+msgstr ""
+
+msgid "Searching..."
+msgstr ""
+
+msgid "Record"
+msgstr ""
+
+msgid "Details"
+msgstr ""
+
+msgid "in all"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
+msgid "Nothing found!"
+msgstr ""
+
+msgid "AutoTimer"
+msgstr ""
+
+msgid "Shows the EPG info in form of a typical TV magazine"
+msgstr ""
+
+msgid "TV-OnScreen"
+msgstr ""
diff --git a/po/ro_RO.po b/po/ro_RO.po
new file mode 100644
index 0000000..19a7dda
--- /dev/null
+++ b/po/ro_RO.po
@@ -0,0 +1,173 @@
+# 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.
+# Paul Lacatus <paul@campina.iiruc.ro>, 2002
+# Lucian Muresan <lucianm@users.sourceforge.net>, 2004
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.6.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-08-02 15:03+0200\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "show channel logos"
+msgstr ""
+
+msgid "show channel names"
+msgstr ""
+
+msgid "show logos in black&white"
+msgstr ""
+
+msgid "enable color problem work around"
+msgstr ""
+
+msgid "use XL fonts"
+msgstr ""
+
+msgid "hide info line"
+msgstr ""
+
+msgid "user point in time 1 (Key 4)"
+msgstr ""
+
+msgid "user point in time 2 (Key 5)"
+msgstr ""
+
+msgid "user point in time 3 (Key 6)"
+msgstr ""
+
+msgid "jump to next day point if ago"
+msgstr ""
+
+msgid "Show search item itself"
+msgstr ""
+
+msgid "Press 1 for help"
+msgstr ""
+
+#, c-format
+msgid "%d-%m"
+msgstr ""
+
+msgid "o'clock"
+msgstr ""
+
+msgid "Timer conflict!"
+msgstr ""
+
+msgid "NORMAL MODE:"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove view"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tclose TV OnScreen"
+msgstr ""
+
+msgid ""
+"red/blue\n"
+"\t-/+ one day"
+msgstr ""
+
+msgid ""
+"green/yellow\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"7/9\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"8\n"
+"\tgoto current channel"
+msgstr ""
+
+msgid ""
+"0\n"
+"\tgoto now"
+msgstr ""
+
+msgid ""
+"4/5/6\n"
+"\tgoto configured time"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tswitch to edit mode\n"
+msgstr ""
+
+msgid "EDIT MODE:"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tback to normal mode"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove selected schedule"
+msgstr ""
+
+msgid ""
+"record\n"
+"\tcreate timer"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tshow details"
+msgstr ""
+
+msgid "Added AutoTimer to vdradmin."
+msgstr ""
+
+msgid "Startoption 'vdradminfile' not set!"
+msgstr ""
+
+msgid "Search"
+msgstr ""
+
+msgid "Search for"
+msgstr ""
+
+msgid "Searching..."
+msgstr ""
+
+msgid "Record"
+msgstr ""
+
+msgid "Details"
+msgstr ""
+
+msgid "in all"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
+msgid "Nothing found!"
+msgstr ""
+
+msgid "AutoTimer"
+msgstr ""
+
+msgid "Shows the EPG info in form of a typical TV magazine"
+msgstr ""
+
+msgid "TV-OnScreen"
+msgstr ""
diff --git a/po/ru_RU.po b/po/ru_RU.po
new file mode 100644
index 0000000..99f0e73
--- /dev/null
+++ b/po/ru_RU.po
@@ -0,0 +1,172 @@
+# 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.
+# Vyacheslav Dikonov <sdiconov@mail.ru>, 2004
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.6.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-08-02 15:03+0200\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-5\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "show channel logos"
+msgstr ""
+
+msgid "show channel names"
+msgstr ""
+
+msgid "show logos in black&white"
+msgstr ""
+
+msgid "enable color problem work around"
+msgstr ""
+
+msgid "use XL fonts"
+msgstr ""
+
+msgid "hide info line"
+msgstr ""
+
+msgid "user point in time 1 (Key 4)"
+msgstr ""
+
+msgid "user point in time 2 (Key 5)"
+msgstr ""
+
+msgid "user point in time 3 (Key 6)"
+msgstr ""
+
+msgid "jump to next day point if ago"
+msgstr ""
+
+msgid "Show search item itself"
+msgstr ""
+
+msgid "Press 1 for help"
+msgstr ""
+
+#, c-format
+msgid "%d-%m"
+msgstr ""
+
+msgid "o'clock"
+msgstr ""
+
+msgid "Timer conflict!"
+msgstr ""
+
+msgid "NORMAL MODE:"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove view"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tclose TV OnScreen"
+msgstr ""
+
+msgid ""
+"red/blue\n"
+"\t-/+ one day"
+msgstr ""
+
+msgid ""
+"green/yellow\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"7/9\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"8\n"
+"\tgoto current channel"
+msgstr ""
+
+msgid ""
+"0\n"
+"\tgoto now"
+msgstr ""
+
+msgid ""
+"4/5/6\n"
+"\tgoto configured time"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tswitch to edit mode\n"
+msgstr ""
+
+msgid "EDIT MODE:"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tback to normal mode"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove selected schedule"
+msgstr ""
+
+msgid ""
+"record\n"
+"\tcreate timer"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tshow details"
+msgstr ""
+
+msgid "Added AutoTimer to vdradmin."
+msgstr ""
+
+msgid "Startoption 'vdradminfile' not set!"
+msgstr ""
+
+msgid "Search"
+msgstr ""
+
+msgid "Search for"
+msgstr ""
+
+msgid "Searching..."
+msgstr ""
+
+msgid "Record"
+msgstr ""
+
+msgid "Details"
+msgstr ""
+
+msgid "in all"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
+msgid "Nothing found!"
+msgstr ""
+
+msgid "AutoTimer"
+msgstr ""
+
+msgid "Shows the EPG info in form of a typical TV magazine"
+msgstr ""
+
+msgid "TV-OnScreen"
+msgstr ""
diff --git a/po/sl_SI.po b/po/sl_SI.po
new file mode 100644
index 0000000..7594f14
--- /dev/null
+++ b/po/sl_SI.po
@@ -0,0 +1,173 @@
+# 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.
+# Miha Setina <mihasetina@softhome.net>, 2000
+# Matjaz Thaler <matjaz.thaler@guest.arnes.si>, 2003
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.6.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-08-02 15:03+0200\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "show channel logos"
+msgstr ""
+
+msgid "show channel names"
+msgstr ""
+
+msgid "show logos in black&white"
+msgstr ""
+
+msgid "enable color problem work around"
+msgstr ""
+
+msgid "use XL fonts"
+msgstr ""
+
+msgid "hide info line"
+msgstr ""
+
+msgid "user point in time 1 (Key 4)"
+msgstr ""
+
+msgid "user point in time 2 (Key 5)"
+msgstr ""
+
+msgid "user point in time 3 (Key 6)"
+msgstr ""
+
+msgid "jump to next day point if ago"
+msgstr ""
+
+msgid "Show search item itself"
+msgstr ""
+
+msgid "Press 1 for help"
+msgstr ""
+
+#, c-format
+msgid "%d-%m"
+msgstr ""
+
+msgid "o'clock"
+msgstr ""
+
+msgid "Timer conflict!"
+msgstr ""
+
+msgid "NORMAL MODE:"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove view"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tclose TV OnScreen"
+msgstr ""
+
+msgid ""
+"red/blue\n"
+"\t-/+ one day"
+msgstr ""
+
+msgid ""
+"green/yellow\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"7/9\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"8\n"
+"\tgoto current channel"
+msgstr ""
+
+msgid ""
+"0\n"
+"\tgoto now"
+msgstr ""
+
+msgid ""
+"4/5/6\n"
+"\tgoto configured time"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tswitch to edit mode\n"
+msgstr ""
+
+msgid "EDIT MODE:"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tback to normal mode"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove selected schedule"
+msgstr ""
+
+msgid ""
+"record\n"
+"\tcreate timer"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tshow details"
+msgstr ""
+
+msgid "Added AutoTimer to vdradmin."
+msgstr ""
+
+msgid "Startoption 'vdradminfile' not set!"
+msgstr ""
+
+msgid "Search"
+msgstr ""
+
+msgid "Search for"
+msgstr ""
+
+msgid "Searching..."
+msgstr ""
+
+msgid "Record"
+msgstr ""
+
+msgid "Details"
+msgstr ""
+
+msgid "in all"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
+msgid "Nothing found!"
+msgstr ""
+
+msgid "AutoTimer"
+msgstr ""
+
+msgid "Shows the EPG info in form of a typical TV magazine"
+msgstr ""
+
+msgid "TV-OnScreen"
+msgstr ""
diff --git a/po/sv_SE.po b/po/sv_SE.po
new file mode 100644
index 0000000..29d4fba
--- /dev/null
+++ b/po/sv_SE.po
@@ -0,0 +1,173 @@
+# 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.
+# Tomas Prybil <tomas@prybil.se>, 2002
+# Jan Ekholm <chakie@infa.abo.fi>, 2003
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.6.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-08-02 15:03+0200\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "show channel logos"
+msgstr ""
+
+msgid "show channel names"
+msgstr ""
+
+msgid "show logos in black&white"
+msgstr ""
+
+msgid "enable color problem work around"
+msgstr ""
+
+msgid "use XL fonts"
+msgstr ""
+
+msgid "hide info line"
+msgstr ""
+
+msgid "user point in time 1 (Key 4)"
+msgstr ""
+
+msgid "user point in time 2 (Key 5)"
+msgstr ""
+
+msgid "user point in time 3 (Key 6)"
+msgstr ""
+
+msgid "jump to next day point if ago"
+msgstr ""
+
+msgid "Show search item itself"
+msgstr ""
+
+msgid "Press 1 for help"
+msgstr ""
+
+#, c-format
+msgid "%d-%m"
+msgstr ""
+
+msgid "o'clock"
+msgstr ""
+
+msgid "Timer conflict!"
+msgstr ""
+
+msgid "NORMAL MODE:"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove view"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tclose TV OnScreen"
+msgstr ""
+
+msgid ""
+"red/blue\n"
+"\t-/+ one day"
+msgstr ""
+
+msgid ""
+"green/yellow\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"7/9\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"8\n"
+"\tgoto current channel"
+msgstr ""
+
+msgid ""
+"0\n"
+"\tgoto now"
+msgstr ""
+
+msgid ""
+"4/5/6\n"
+"\tgoto configured time"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tswitch to edit mode\n"
+msgstr ""
+
+msgid "EDIT MODE:"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tback to normal mode"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove selected schedule"
+msgstr ""
+
+msgid ""
+"record\n"
+"\tcreate timer"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tshow details"
+msgstr ""
+
+msgid "Added AutoTimer to vdradmin."
+msgstr ""
+
+msgid "Startoption 'vdradminfile' not set!"
+msgstr ""
+
+msgid "Search"
+msgstr ""
+
+msgid "Search for"
+msgstr ""
+
+msgid "Searching..."
+msgstr ""
+
+msgid "Record"
+msgstr ""
+
+msgid "Details"
+msgstr ""
+
+msgid "in all"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
+msgid "Nothing found!"
+msgstr ""
+
+msgid "AutoTimer"
+msgstr ""
+
+msgid "Shows the EPG info in form of a typical TV magazine"
+msgstr ""
+
+msgid "TV-OnScreen"
+msgstr ""
diff --git a/po/tr_TR.po b/po/tr_TR.po
new file mode 100644
index 0000000..a5af96d
--- /dev/null
+++ b/po/tr_TR.po
@@ -0,0 +1,172 @@
+# 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.
+# Oktay Yolgeçen <oktay_73@yahoo.de>, 2007
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.6.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-08-02 15:03+0200\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-9\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "show channel logos"
+msgstr ""
+
+msgid "show channel names"
+msgstr ""
+
+msgid "show logos in black&white"
+msgstr ""
+
+msgid "enable color problem work around"
+msgstr ""
+
+msgid "use XL fonts"
+msgstr ""
+
+msgid "hide info line"
+msgstr ""
+
+msgid "user point in time 1 (Key 4)"
+msgstr ""
+
+msgid "user point in time 2 (Key 5)"
+msgstr ""
+
+msgid "user point in time 3 (Key 6)"
+msgstr ""
+
+msgid "jump to next day point if ago"
+msgstr ""
+
+msgid "Show search item itself"
+msgstr ""
+
+msgid "Press 1 for help"
+msgstr ""
+
+#, c-format
+msgid "%d-%m"
+msgstr ""
+
+msgid "o'clock"
+msgstr ""
+
+msgid "Timer conflict!"
+msgstr ""
+
+msgid "NORMAL MODE:"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove view"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tclose TV OnScreen"
+msgstr ""
+
+msgid ""
+"red/blue\n"
+"\t-/+ one day"
+msgstr ""
+
+msgid ""
+"green/yellow\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"7/9\n"
+"\tone page left/right"
+msgstr ""
+
+msgid ""
+"8\n"
+"\tgoto current channel"
+msgstr ""
+
+msgid ""
+"0\n"
+"\tgoto now"
+msgstr ""
+
+msgid ""
+"4/5/6\n"
+"\tgoto configured time"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tswitch to edit mode\n"
+msgstr ""
+
+msgid "EDIT MODE:"
+msgstr ""
+
+msgid ""
+"back\n"
+"\tback to normal mode"
+msgstr ""
+
+msgid ""
+"arrows\n"
+"\tmove selected schedule"
+msgstr ""
+
+msgid ""
+"record\n"
+"\tcreate timer"
+msgstr ""
+
+msgid ""
+"ok\n"
+"\tshow details"
+msgstr ""
+
+msgid "Added AutoTimer to vdradmin."
+msgstr ""
+
+msgid "Startoption 'vdradminfile' not set!"
+msgstr ""
+
+msgid "Search"
+msgstr ""
+
+msgid "Search for"
+msgstr ""
+
+msgid "Searching..."
+msgstr ""
+
+msgid "Record"
+msgstr ""
+
+msgid "Details"
+msgstr ""
+
+msgid "in all"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
+msgid "Nothing found!"
+msgstr ""
+
+msgid "AutoTimer"
+msgstr ""
+
+msgid "Shows the EPG info in form of a typical TV magazine"
+msgstr ""
+
+msgid "TV-OnScreen"
+msgstr ""
diff --git a/tvonscreen.cpp b/tvonscreen.cpp
index 47e56ba..6353c21 100644
--- a/tvonscreen.cpp
+++ b/tvonscreen.cpp
@@ -3,8 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: tvonscreen.c,v 1.15 2006/06/18 13:59:36 schmitzj Exp $
- *
  */
 
 #include <vdr/plugin.h>
@@ -12,7 +10,7 @@
 #include "config.h"
 #include "i18n.h"
 
-static const char *VERSION        = "1.0.141";
+static const char *VERSION        = "1.1.141";
 static const char *DESCRIPTION    = trNOOP("Shows the EPG info in form of a typical TV magazine");
 static const char *MAINMENUENTRY  = trNOOP("TV-OnScreen");