30 files changed, 820 insertions, 3919 deletions

diff --git a/HISTORY b/HISTORY
index 20a909f..f4e6c01 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,9 @@
 VDR Plugin 'dvdswitch' Revision History
 ---------------------------------------
 
+2009-10-03: Version 0.1.4
+- Update to vdr 1.6.0
+
 2006-06-26: Version 0.1.3
 - FIX: Verstecken des Hauptmenüeintrages funktioniert nun (Dank an kilroy
 und wilderigel)
diff --git a/Makefile b/Makefile
index 6513acb..8e0a14e 100644
--- a/Makefile
+++ b/Makefile
@@ -45,8 +45,7 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ### The object files (add further files here):
 
-#OBJS = $(PLUGIN).o i18n.o menu-item.o menu.o dvdlist-item.o dvdlist.o dvdplugin.o setup.o setup-itypes.o imagelist.o imagelist-item.o commands.o helpers.o debug.o
-OBJS = $(PLUGIN).o i18n.o debug.o helpers.o tools.o imagelist-item.o imagelist.o dvdlist-item.o dvdlist.o dvdplugin.o menu-item.o menu.o setup.o setup-itypes.o commands.o
+OBJS = $(PLUGIN).o helpers.o tools.o imagelist-item.o imagelist.o dvdlist-item.o dvdlist.o dvdplugin.o menu-item.o menu.o setup.o setup-itypes.o commands.o
 
 ### Implicit rules:
 
@@ -62,9 +61,34 @@ $(DEPFILE): Makefile
 
 -include $(DEPFILE)
 
+### Internationalization (I18N):
+
+PODIR     = po
+LOCALEDIR = $(VDRDIR)/locale
+I18Npo    = $(wildcard $(PODIR)/*.po)
+I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+I18Npot   = $(PODIR)/$(PLUGIN).pot
+
+%.mo: %.po
+	msgfmt -c -o $@ $<
+
+$(I18Npot): $(wildcard *.c)
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address=' ' -o $@ $^
+
+%.po: $(I18Npot)
+	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
+	@touch $@
+
+$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+	@mkdir -p $(dir $@)
+	cp $< $@
+
+.PHONY: i18n
+i18n: $(I18Nmsgs) $(I18Npot)
+
 ### Targets:
 
-all: libvdr-$(PLUGIN).so
+all: libvdr-$(PLUGIN).so i18n
 
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
diff --git a/commands.c b/commands.c
index 59357c3..7c9d54f 100644
--- a/commands.c
+++ b/commands.c
@@ -1,10 +1,10 @@
 #include <unistd.h>
 #include <vdr/tools.h>
 #include "commands.h"
+#include "imagelist.h"
 #include "setup.h"
 #include "tools.h"
 #include "menu-item.h"
-#include "imagelist.h"
 #include "dvdplugin.h"
 #include "setup-itypes.h"
 
@@ -13,9 +13,9 @@
 eOSState cCMD::Play(cMainMenuItem *item)
 {
   if(item)
-    DEBUG("Play Image %s, %i", item->FileName(), item->Type());
+    dsyslog("Play Image %s, %i", item->FileName(), item->Type());
   else
-    DEBUG("Play Image: Kein Image angegeben");
+    dsyslog("Play Image: Kein Image angegeben");
 
   if(!item || item->Type() == iDevice)
     cDVDPlugin::Start();
@@ -29,9 +29,9 @@ eOSState cCMD::Eject(bool close)
 {
   char *cmd = NULL;
   asprintf(&cmd, "eject %s %s", close ? "-t" : "", DVDSwitchSetup.DVDLinkOrg);
-  DEBUG("Eject: %i - %s", close, cmd);
+  dsyslog("Eject: %i - %s", close, cmd);
   int rc = system(cmd);
-  DEBUG("Eject-Rückgabe: %i", rc);
+  dsyslog("Eject-Rückgabe: %i", rc);
   free(cmd);
 
   return osContinue;
@@ -39,8 +39,9 @@ eOSState cCMD::Eject(bool close)
 
 // --- cCMDMenu -------------------------------------------------------------
 
-cCMDMenu::cCMDMenu(cMainMenuItem *item, cMainMenu *osdobject)
+cCMDMenu::cCMDMenu(cImageList &imagelist, cMainMenuItem *item, cMainMenu *osdobject)
   : cOsdMenu(tr("Commands"))
+  , ImageList(imagelist)
 {
   iItem = item;
   OsdObject = osdobject;
@@ -116,7 +117,7 @@ eOSState cCMDMenu::ProcessKey(eKeys Key)
         switch(cmd)
         {
           case cmdDirManage:
-            return AddSubMenu(new cCMDDir(OsdObject));
+            return AddSubMenu(new cCMDDir(ImageList, OsdObject));
             break;
           case cmdDVDopen:
             return cCMD::Eject(false);
@@ -134,7 +135,7 @@ eOSState cCMDMenu::ProcessKey(eKeys Key)
             return osBack;
             break;
           case cmdImgMove:
-            return AddSubMenu(new cCMDMove(iItem->FileName(), OsdObject, false));
+            return AddSubMenu(new cCMDMove(ImageList, iItem->FileName(), OsdObject, false));
             break;
           case cmdImgDelete:
             CMDImage = new cCMDImage(OsdObject);
@@ -149,7 +150,7 @@ eOSState cCMDMenu::ProcessKey(eKeys Key)
             return ret;
             break;
           case cmdImgRead:
-            return AddSubMenu(new cCMDImageRead);
+            return AddSubMenu(new cCMDImageRead(ImageList));
             break;
           default:
             break;
@@ -165,10 +166,11 @@ eOSState cCMDMenu::ProcessKey(eKeys Key)
 
 // --- cCMDDir ------------------------------------------------------------
 
-cCMDDir::cCMDDir(cMainMenu *osdobject, bool select, char *buffer)
+cCMDDir::cCMDDir(cImageList &imagelist, cMainMenu *osdobject, bool select, char *buffer)
   : cOsdMenu(tr("Directory Management"))
+  , ImageList(imagelist)
 {
-  DEBUG("Verzeichnis Management");
+  dsyslog("Verzeichnis Management");
   ImageDir(DVDSwitchSetup.ImageDir);
   CurrentDir(DVDSwitchSetup.ImageDir);
   ParentDir(DVDSwitchSetup.ImageDir);
@@ -211,7 +213,7 @@ void cCMDDir::SetHelp(void)
 
 void cCMDDir::Build(char *dir)
 {
-  DEBUG("Erstelle Verzeichnisliste %s", dir);
+  dsyslog("Erstelle Verzeichnisliste %s", dir);
   if(!dir)
     dir = CurrentDir();
 
@@ -223,7 +225,7 @@ void cCMDDir::Build(char *dir)
   }
 
   cDirHandling *DirHand = new cDirHandling(this, this);
-  SetCurrent(Get(DirHand->Build(dir, true)));
+  SetCurrent(Get(DirHand->Build(dir, true, ImageList)));
   delete(DirHand);
 
   Display();
@@ -259,9 +261,9 @@ eOSState cCMDDir::ProcessKey(eKeys Key)
             info = new cFileInfo(mItem->FileName());
             if(!info->isExecutable() || !info->isReadable())
             {
-              DEBUG("Verzeichniswechsel: Keine Rechte");
+              esyslog("Can't access to directory!");
               DELETENULL(info);
-              OSD_ERRMSG(tr("no Rights!"));
+              OsdMsg(mtError,tr("No rights to change inside this directory!"));
               return osContinue;
               break;
             }
@@ -279,16 +281,16 @@ eOSState cCMDDir::ProcessKey(eKeys Key)
             return New();
             break;
           case kYellow:
-            if(mItem->Type() == iDir && Interface->Confirm(tr("really delete?")))
+            if(mItem->Type() == iDir && Interface->Confirm(tr("Really delete?")))
             {
-              DEBUG("Verzeichnis löschen");
+              dsyslog("Confirm delete directory");
               if(cFileCMD::DirIsEmpty(mItem->FileName()) ||
-                 (!cFileCMD::DirIsEmpty(mItem->FileName()) && Interface->Confirm(tr("Directory not empty. however delete?"))))
+                 (!cFileCMD::DirIsEmpty(mItem->FileName()) && Interface->Confirm(tr("Directory not empty! However delete?"))))
               {
                 cFileDelThread *del = new cFileDelThread(mItem->FileName());
                 if(del->OK())
                 {
-                  DEBUG("Verzeichnis löschen gestartet");
+                  dsyslog("Start delete directory");
                   del->Start();
                   Build();
                   OsdObject->SetState(mmsReInit);
@@ -304,12 +306,12 @@ eOSState cCMDDir::ProcessKey(eKeys Key)
             {
               if(Select)
               {
-                DEBUG("Verzeichnis gewählt: %s", mItem->FileName());
+                dsyslog("Directory selected: %s", mItem->FileName());
                 info = new cFileInfo(mItem->FileName());
                 if(!info->isExecutable() || !info->isReadable())
                 {
-                  DEBUG("Verzeichnis: Keine Rechte");
-                  OSD_ERRMSG(tr("no Rights!"));
+                  esyslog("Can't access to directory!");
+                  OsdMsg(mtError,tr("No rights to change inside this directory!"));
                 }
                 else
                 {
@@ -325,7 +327,7 @@ eOSState cCMDDir::ProcessKey(eKeys Key)
                 return osContinue;
               }
               else
-                return AddSubMenu(new cCMDMove(mItem->FileName(), OsdObject));
+                return AddSubMenu(new cCMDMove(ImageList, mItem->FileName(), OsdObject));
             }
             break;
           default:
@@ -361,12 +363,12 @@ eOSState cCMDDir::ProcessKey(eKeys Key)
 
 eOSState cCMDDir::New(void)
 {
-  DEBUG("Verzeichnis: Neu");
+  dsyslog("Directory: Create");
   cFileInfo *info = new cFileInfo(CurrentDir());
   if(!info->isWriteable())
   {
-    DEBUG("Verzeichnis: Neu: Keine Berechtigung in %s", CurrentDir());
-    OSD_ERRMSG(tr("no Rights to create"));
+    esyslog("Can't create directory, missing rights for %s", CurrentDir());
+    OsdMsg(mtError,tr("Missing rights to create directory!"));
   }
   else
   {
@@ -400,19 +402,19 @@ eOSState cCMDDir::New(eKeys Key)
       {
         char *buffer = NULL;
         asprintf(&buffer, "%s/%s", CurrentDir(), stripspace(Dir));
-        DEBUG("Verzeichnis: Neu: Anlegen: %s", buffer);
+        dsyslog("Create new directory: %s", buffer);
         cFileInfo *info = new cFileInfo(buffer);
         if(info->isExists())
         {
-          DEBUG("Verzeichnis existiert bereits");
-          OSD_WARNMSG(tr("Directory exists"));
+          esyslog("Directory still exists");
+          OsdMsg(mtWarning,tr("Directory exists"));
           FREENULL(buffer);
           DELETENULL(info);
           return osContinue;
         }
         if(cFileCMD::Mkdir(buffer))
         {
-          DEBUG("Verzeichnis anlegen erfolgreich");
+          dsyslog("Directory successfully created");
           LastSelDir(buffer);
           if(!Select)
             OsdObject->SetState(mmsReInit);
@@ -434,7 +436,7 @@ eOSState cCMDDir::New(eKeys Key)
 
 eOSState cCMDDir::Edit(cMainMenuItem *mItem)
 {
-  DEBUG("Verzeichnis: Edit: %s", mItem->FileName());
+  dsyslog("Directory edit: %s", mItem->FileName());
   cFileInfo *info = new cFileInfo(mItem->FileName());
   if(!info->isWriteable())
   {
@@ -442,8 +444,8 @@ eOSState cCMDDir::Edit(cMainMenuItem *mItem)
     info = new cFileInfo(CurrentDir());
     if(!info->isWriteable())
     {
-      DEBUG("Verzeichnis: Edit: Keine Rechte");
-      OSD_ERRMSG(tr("no Rights to rename"));
+      esyslog("Missing proper rights to rename");
+      OsdMsg(mtError,tr("Missing rights to rename!"));
       DELETENULL(info);
       return osContinue;
     }
@@ -462,7 +464,7 @@ eOSState cCMDDir::Edit(cMainMenuItem *mItem)
   {
     if(!strcasecmp(mItem->FileName(), LastSelDir()))
     {
-      DEBUG("Verzeichnis: Edit: Item gefunden: %s", mItem->FileName());
+      dsyslog("Directory: Edit: Item found: %s", mItem->FileName());
       Ins(new cMenuEditStrItem(tr("Rename:"), Dir, MaxFileName, tr(" abcdefghijklmnopqrstuvwxyz0123456789-_.#~")),
           true,
           mItem);
@@ -489,19 +491,19 @@ eOSState cCMDDir::Edit(eKeys Key)
       {
         char *buffer = NULL;
         asprintf(&buffer, "%s/%s", CurrentDir(), stripspace(Dir));
-        DEBUG("Verzeichnis: Edit: OK: %s", buffer);
+        dsyslog("Directory: Edit: OK: %s", buffer);
         cFileInfo *info = new cFileInfo(buffer);
         if(info->isExists())
         {
-          DEBUG("Verzeichnis: Edit: Existiert schon");
-          OSD_WARNMSG(tr("Directory exists"));
+          dsyslog("Directory: Edit: exists");
+          OsdMsg(mtWarning,tr("Directory exists"));
           FREENULL(buffer);
           DELETENULL(info);
           return osUnknown;
         }
         if(cFileCMD::Rn(LastSelDir(), buffer))
         {
-          DEBUG("Verzeichnis: Edit: Rename OK");
+          dsyslog("Directory: Edit: Rename OK");
           LastSelDir(buffer);
           OsdObject->SetState(mmsReInit);
         }
@@ -522,10 +524,11 @@ eOSState cCMDDir::Edit(eKeys Key)
 
 // --- cCMDMove -------------------------------------------------------------
 
-cCMDMove::cCMDMove(char *file, cMainMenu *osdobject, bool dir, bool direct)
+cCMDMove::cCMDMove(cImageList &imagelist, const char *file, cMainMenu *osdobject, bool dir, bool direct)
   : cOsdMenu(tr("Move"))
+  , ImageList(imagelist)
 {
-  DEBUG("Verzeichnis: Move: %s");
+  dsyslog("Directory: Move: %s", file);
   File = file ? strdup(file) : NULL;
   OsdObject = osdobject;
   Dir = dir;
@@ -546,14 +549,14 @@ void cCMDMove::SetHelp(void)
 
 void cCMDMove::Build(char *dir)
 {
-  DEBUG("Verzeichnis: Move: Erstelle Verzeichnisliste: %s", dir);
+  dsyslog("Directory: Move: create list: %s", dir);
   if(!dir)
     dir = CurrentDir();
 
   Clear();
 
   cDirHandling *DirHand = new cDirHandling(this, this);
-  SetCurrent(Get(DirHand->Build(dir, true)));
+  SetCurrent(Get(DirHand->Build(dir, true, ImageList)));
   delete(DirHand);
 
   if(Count())
@@ -600,11 +603,11 @@ eOSState cCMDMove::ProcessKey(eKeys Key)
       Build();
       break;
     case kBlue:
-      DEBUG("Verzeichnis: Move: Verschiede in: %s", CurrentDir());
+      dsyslog("Directory: Move to: %s", CurrentDir());
       move = new cFileMoveThread(File, CurrentDir());
       if(move->OK())
       {
-        DEBUG("Verzeichnis: Move: Erfolgreich");
+        dsyslog("Directory: Move successful");
         move->Start();
         cCondWait::SleepMs(1 * 500);
         OsdObject->SetState(mmsReInit);
@@ -626,7 +629,7 @@ eOSState cCMDMove::ProcessKey(eKeys Key)
 
 cCMDImage::cCMDImage(cMainMenu *osdobject)
 {
-  DEBUG("CMDImage");
+  dsyslog("CMDImage");
   File = NULL;
   strcpy(NewFile, "\0");
   OsdObject = osdobject;
@@ -638,9 +641,9 @@ cCMDImage::~cCMDImage(void)
     free(File);
 }
 
-char* cCMDImage::Rename(char *file)
+char* cCMDImage::Rename(const char *file)
 {
-  DEBUG("CMDImage Rename");
+  dsyslog("CMDImage Rename");
   if(file)
   {
     FREENULL(File);
@@ -650,17 +653,17 @@ char* cCMDImage::Rename(char *file)
   return File;
 }
 
-eOSState cCMDImage::Delete(char *file)
+eOSState cCMDImage::Delete(const char *file)
 {
-  DEBUG("lösche DVD '%s'", file);
+  dsyslog("Remove dvd image '%s'", file);
   if(file)
   {
-    if(Interface->Confirm(tr("really delete?")))
+    if(Interface->Confirm(tr("Really delete?")))
     {
       cFileDelThread *del = new cFileDelThread(file);
       if(del->OK())
       {
-        DEBUG("löschen OK");
+        dsyslog("löschen OK");
         del->Start();
         OsdObject->SetState(mmsReInitCur);
       }
@@ -672,24 +675,24 @@ eOSState cCMDImage::Delete(char *file)
   return osBack;
 }
 
-eOSState cCMDImage::Burn(char *file)
+eOSState cCMDImage::Burn(const char *file)
 {
-  DEBUG("DVD Schreiben '%s'", file);
+  dsyslog("Write dvd image '%s'", file);
 
   cFileInfo *info = new cFileInfo(DVDSwitchSetup.DVDWriteScript);
 
   if(!info->isExists())
   {
-    DEBUG("Writescript existiert nicht");
+    esyslog("Missing script to write dvd");
     DELETENULL(info);
-    OSD_ERRMSG(tr("Specified Writescript not exist!"));
+    OsdMsg(mtError,tr("Specified Writescript not exist!"));
     return osContinue;
   }
   if(!info->isExecutable())
   {
-    DEBUG("Writescript lässt sich nicht ausführen");
+    esyslog("Can't execute script to write dvd");
     DELETENULL(info);
-    OSD_ERRMSG(tr("Cannot execute Writescript!"));
+    OsdMsg(mtError,tr("Cannot execute Writescript!"));
     return osContinue;
   }
   
@@ -699,7 +702,7 @@ eOSState cCMDImage::Burn(char *file)
 
   if(Interface->Confirm(tr("Burn Now?")))
   {
-    DEBUG("Starte Burn-Thread");
+    dsyslog("Start Burn-Thread");
     cCMDImageBurnThread *burn = new cCMDImageBurnThread(file, info->Type());
     burn->Start();
   }
@@ -709,25 +712,26 @@ eOSState cCMDImage::Burn(char *file)
 
 // --- cCmdDVDRead ------------------------------------------------------------
 
-cCMDImageRead::cCMDImageRead(void)
+cCMDImageRead::cCMDImageRead(cImageList &imagelist)
   : cOsdMenu(tr("Read DVD"), 14)
+  , ImageList(imagelist)
 {
-  DEBUG("lese DVD");
+  dsyslog("Read DVD Image");
 
   cFileInfo *info = new cFileInfo(DVDSwitchSetup.DVDReadScript);
 
   if(!info->isExists())
   {
-    DEBUG("Readscript existiert nicht");
+    esyslog("Missing script to read dvd");
     DELETENULL(info);
-    OSD_ERRMSG(tr("Specified Readscript not exist!"));
+    OsdMsg(mtError,tr("Specified Readscript not exist!"));
     cRemote::Put(kBack);
   }
   else if(!info->isExecutable())
   {
-    DEBUG("Readscript lässt sich nicht ausführen");
+    esyslog("Can't execute script to write dvd");
     DELETENULL(info);
-    OSD_ERRMSG(tr("Cannot execute Readscript!"));
+    OsdMsg(mtError,tr("Cannot execute Readscript!"));
     cRemote::Put(kBack);
   }
   else
@@ -749,7 +753,7 @@ cCMDImageRead::cCMDImageRead(void)
 
 cCMDImageRead::~cCMDImageRead(void)
 {
-  DEBUG("lesen DVD beendet");
+  dsyslog("Read DVD Image stopped");
 }
 
 void cCMDImageRead::SetHelp(void)
@@ -793,12 +797,12 @@ eOSState cCMDImageRead::ProcessKey(eKeys Key)
       case kRed:
         if(isempty(File))
         {
-          OSD_ERRMSG(tr("invalid file name for DVD-Image"));
+          OsdMsg(mtError,tr("invalid file name for DVD-Image"));
           return osContinue;
         }
         if(ImgType < 0)
         {
-          OSD_ERRMSG(tr("No Imagetype selected"));
+          OsdMsg(mtError,tr("No Imagetype selected"));
           return osContinue;
         }
         if(isempty(Dir))
@@ -820,8 +824,8 @@ eOSState cCMDImageRead::ProcessKey(eKeys Key)
           }
           if(buffer[strlen(buffer)-1] == '/')
             buffer[strlen(buffer)-1] = '\0';
-          DEBUG("ReadThread wird gestartet");
-          cCMDImageReadThread *read = new cCMDImageReadThread(File, buffer, ImgType);
+          dsyslog("ReadThread wird gestartet");
+          cCMDImageReadThread *read = new cCMDImageReadThread(File, buffer, ImgType, ImageList);
           FREENULL(buffer);
           read->Start();
           return osBack;
@@ -831,10 +835,10 @@ eOSState cCMDImageRead::ProcessKey(eKeys Key)
         switch(Current())
         {
           case 1:
-            return AddSubMenu(new cCMDDir(NULL, true, &Dir[0]));
+            return AddSubMenu(new cCMDDir(ImageList, NULL, true, &Dir[0]));
             break;
           case 2:
-            return AddSubMenu(new cMenuSetupDSITypes(true, &ImgType, &ImgTypeTxt[0]));
+            return AddSubMenu(new cMenuSetupDSITypes(ImageList, true, &ImgType, &ImgTypeTxt[0]));
             break;
           default:
             break;
diff --git a/commands.h b/commands.h
index 3d53f1a..6871815 100644
--- a/commands.h
+++ b/commands.h
@@ -2,8 +2,8 @@
 #define __COMMANDS_DVDSWITCH_H
 
 #include <vdr/plugin.h>
-#include "menu.h"
 #include "imagelist.h"
+#include "menu.h"
 #include "setup.h"
 #include <stdlib.h>
 
@@ -45,8 +45,9 @@ class cCMDMenu : public cOsdMenu
   private:
     cMainMenuItem *iItem;
     cMainMenu *OsdObject;
+    cImageList &ImageList;
   public:
-    cCMDMenu(cMainMenuItem *item, cMainMenu *osdobject);
+    cCMDMenu(cImageList &ImageList, cMainMenuItem *item, cMainMenu *osdobject);
     virtual eOSState ProcessKey(eKeys Key);
 };
 
@@ -58,6 +59,7 @@ class cCMDDir : public cOsdMenu, private cDirHandlingOpt
     cMainMenu *OsdObject;
     bool Select;
     char *Buffer;
+    cImageList &ImageList;
 
     void Build(char *dir = NULL);
     void SetDir(char *value = NULL)
@@ -73,7 +75,7 @@ class cCMDDir : public cOsdMenu, private cDirHandlingOpt
     eOSState Edit(cMainMenuItem *mItem);
     eOSState Edit(eKeys Key);
   public:
-    cCMDDir(cMainMenu *osdobject = NULL, bool select = false, char *buffer = NULL);
+    cCMDDir(cImageList &ImageList, cMainMenu *osdobject = NULL, bool select = false, char *buffer = NULL);
 
     virtual eOSState ProcessKey(eKeys Key);
     void SetHelp(void);
@@ -86,10 +88,11 @@ class cCMDMove : public cOsdMenu, private cDirHandlingOpt
     cMainMenu *OsdObject;
     bool Dir;
     bool Direct;
+    cImageList &ImageList;
 
     void Build(char *dir = NULL);
   public:
-    cCMDMove(char *file, cMainMenu *osdobject, bool dir = true, bool direct = false);
+    cCMDMove(cImageList &ImageList, const char *file, cMainMenu *osdobject, bool dir = true, bool direct = false);
     ~cCMDMove(void) { free(File); }
 
     virtual eOSState ProcessKey(eKeys Key);
@@ -109,9 +112,9 @@ class cCMDImage
     cCMDImage(cMainMenu *osdobject = NULL);
     ~cCMDImage(void);
 
-    char* Rename(char *file = NULL);
-    eOSState Delete(char *file = NULL);
-    eOSState Burn(char *file);
+    char* Rename(const char *file = NULL);
+    eOSState Delete(const char *file = NULL);
+    eOSState Burn(const char *file);
 };
 
 class cCMDImageRead : public cOsdMenu
@@ -121,8 +124,10 @@ class cCMDImageRead : public cOsdMenu
     char Dir[MaxFileName];
     char ImgTypeTxt[MaxFileName];
     int ImgType;
+    cImageList &ImageList;
+
   public:
-    cCMDImageRead(void);
+    cCMDImageRead(cImageList &ImageList);
     ~cCMDImageRead(void);
 
     void SetHelp(void);
@@ -138,10 +143,10 @@ class cCMDImageReadThread : public cThread
   protected:
     virtual void Action(void)
     {
-      DEBUG("ReadThread gestartet");
+      dsyslog("ReadThread started");
       if(File && Dir && FileType != tNone)
       {
-        DEBUG("Aktion wird ausgeführt");
+        dsyslog("ReadThread executed");
         char *cmd = NULL;
         char *output = NULL;
         char *mountpoint = NULL;
@@ -156,7 +161,7 @@ class cCMDImageReadThread : public cThread
           asprintf(&cmd,
                    "cat /etc/fstab | grep -e \"%s\" | grep -e \"^[^#]\"",
                    step == 1 ? DVDSwitchSetup.DVDLinkOrg : buffer);
-          DEBUG("Commando: %s", cmd);
+          dsyslog("ReadThread call: %s", cmd);
 
           FILE *p = popen(cmd, "r");
           if(p)
@@ -170,8 +175,10 @@ class cCMDImageReadThread : public cThread
             pclose(p);
           }
           token = new cTokenizer(output, " ");
-          if(token->Count() > 1)
-            mountpoint = strdup(stripspace(token->GetToken(2)));
+          if(token->Count() > 1) {
+            char* s = strdup(token->GetToken(2));
+            mountpoint = stripspace(s);
+          }
           DELETENULL(token);
         }
         FREENULL(cmd);
@@ -183,18 +190,18 @@ class cCMDImageReadThread : public cThread
                   buffer,
                   mountpoint,
                   (FileType == tFile) ? "IMAGE" : "DIR");
-        DEBUG("Aufruf: %s", cmd);
+        dsyslog("ReadThread call: %s", cmd);
         int rc = system(cmd);
-        DEBUG("Rückgabe Aufruf: %i", rc);
+        dsyslog("ReadThread return value: %i", rc);
         FREENULL(cmd);
         FREENULL(mountpoint);
       }
       delete(this);
     };
   public:
-    cCMDImageReadThread(char *file, char *dir, int imgtype)
+    cCMDImageReadThread(char *file, char *dir, int imgtype, cImageList &ImageList)
     {
-      DEBUG("ReadThread created");
+      dsyslog("ReadThread created");
       File = NULL;
       Dir = NULL;
       FileType = tNone;
@@ -225,27 +232,27 @@ class cCMDImageBurnThread : public cThread
   protected:
     virtual void Action(void)
     {
-      DEBUG("BurnThread gestartet");
+      dsyslog("BurnThread started");
       if(File && FileType != tNone)
       {
-        DEBUG("Aktion wird ausgeführt");
+        dsyslog("BurnThread executed");
         char *cmd;
         asprintf(&cmd,
                   "'%s' '%s' '%s'",
                   DVDSwitchSetup.DVDWriteScript,
                   File,
                   FileType == tFile ? "IMAGE" : "DIR");
-        DEBUG("Aufruf: %s", &cmd);
+        dsyslog("BurnThread call: %s", cmd);
         int rc = system(cmd);
-        DEBUG("Rückgabe Aufruf: %i", rc);
+        dsyslog("BurnThread return value: %i", rc);
         FREENULL(cmd);
       }
         delete(this);
     };
   public:
-    cCMDImageBurnThread(char *file, eFileInfo type)
+    cCMDImageBurnThread(const char *file, eFileInfo type)
     {
-      DEBUG("BurnThread created");
+      dsyslog("BurnThread created");
       File = NULL;
       FileType = tNone;
 
diff --git a/debug.c b/debug.c
deleted file mode 100644
index 3727028..0000000
--- a/debug.c
+++ /dev/null
@@ -1,68 +0,0 @@
-#include <vdr/plugin.h>
-#include <stdarg.h>
-#include "debug.h"
-
-// --- cDebugLog -------------------------------------------------------
-
-cDebugLog DebugLog;
-
-cDebugLog::cDebugLog(void)
-{
-  FileName = NULL;
-  File = NULL;
-}
-
-cDebugLog::~ cDebugLog(void)
-{
-  Close();
-  free(FileName);
-}
-
-bool cDebugLog::Open(void)
-{
-  File = fopen(FileName, "a");
-  if(File)
-  {
-    DEBUG("---------");
-    DEBUG("Neuer Log");
-    DEBUG("---------");
-    return true;
-  }
-
-  return false;
-}
-
-void cDebugLog::Close(void)
-{
-  if(File)
-    fclose(File);
-}
-
-bool cDebugLog::SetLogFile(char *filename)
-{
-  if(filename)
-    FileName = strdup(filename);
-
-  return Open();
-}
-
-void cDebugLog::WriteLine(char *file, int line, char *format, ...)
-{
-  if(File)
-  {
-    char *fmt;
-    asprintf(&fmt, "DVDSWITCH(%s,%d): %s", file, line, format);
-    va_list ap;
-    va_start(ap, format);
-    vfprintf(File, fmt, ap);
-    va_end(ap);
-    fprintf(File, "\n");
-    fflush(File);
-    free(fmt);
-  }
-}
-
-void cDebugLog::End(void)
-{
-  Close();
-}
diff --git a/debug.h b/debug.h
deleted file mode 100644
index f7a7f7f..0000000
--- a/debug.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef __DEBUG_DVDSWITCH_H
-#define __DEBUG_DVDSWITCH_H
-
-#include <stdio.h>
-
-#define DEBUG(a...) DebugLog.WriteLine(__FILE__, __LINE__, a)
-
-class cDebugLog
-{
-  private:
-    char *FileName;
-    FILE *File;
-    
-
-    bool Open(void);
-    void Close(void);
-  public:
-    cDebugLog(void);
-    ~cDebugLog(void);
-
-    bool SetLogFile(char *filename);
-    void WriteLine(char *file, int line, char *format, ...);
-    void End(void);
-};
-
-extern cDebugLog DebugLog;
-
-#endif // __DEBUG_DVDSWITCH_H
diff --git a/dvdlist-item.c b/dvdlist-item.c
index 2c820c7..4019a89 100644
--- a/dvdlist-item.c
+++ b/dvdlist-item.c
@@ -5,7 +5,6 @@
 
 cDVDListItem::cDVDListItem(char* file)
 {
-  DEBUG("Neues DVDItem -> %s", file);
   File = file ? strdup(file) : NULL;
 }
 
diff --git a/dvdlist.c b/dvdlist.c
index 396eb48..bc37e97 100644
--- a/dvdlist.c
+++ b/dvdlist.c
@@ -1,14 +1,10 @@
-#include <vdr/tools.h>
 #include "dvdlist.h"
-#include "setup.h"
-#include "helpers.h"
-#include "imagelist.h"
 
 // --- cDVDList ------------------------------------------------------------------
 
-bool cDVDList::Create(char *dir, char *exts, char *dirs, eFileList smode, bool sub)
+bool cDVDList::Create(const char *dir, const char *exts, const char *dirs, eFileList smode, bool sub)
 {
-  DEBUG("DVDList: %s, %s", exts, dirs);
+  dsyslog("DVDList: %s, %s", exts, dirs);
 
   Clear();
   FREENULL(DVDExts);
@@ -23,9 +19,9 @@ bool cDVDList::Create(char *dir, char *exts, char *dirs, eFileList smode, bool s
   return Load(dir, smode, sub);
 }
 
-bool cDVDList::Load(char *dir, eFileList smode, bool sub)
+bool cDVDList::Load(const char *dir, eFileList smode, bool sub)
 {
-  DEBUG("DVDList: Load");
+  dsyslog("DVDList: Load");
   bool ret = false;
   int i = 0;
 
@@ -61,8 +57,8 @@ bool cDVDList::Load(char *dir, eFileList smode, bool sub)
   while(fItem)
   {
     fInfo = new cFileInfo(fItem->Value());
-    if(fInfo->Type() == tFile ||
-       fInfo->Type() == tDir && fList->DirIsIn(fItem, DVDDirs))
+    if((fInfo->Type() == tFile) ||
+       (fInfo->Type() == tDir && fList->DirIsIn(fItem, DVDDirs)))
       Add(new cDVDListItem(fItem->Value()));
     DELETENULL(fInfo);
     fItem = fList->Next(fItem);
diff --git a/dvdlist.h b/dvdlist.h
index ef539ef..b386bc4 100644
--- a/dvdlist.h
+++ b/dvdlist.h
@@ -1,5 +1,4 @@
 #include <vdr/tools.h>
-#include <vdr/i18n.h>
 #include "dvdlist-item.h"
 #include "helpers.h"
 
@@ -9,7 +8,7 @@ class cDVDList : public cList<cDVDListItem>
     char *DVDExts;
     char *DVDDirs;
 
-    bool Load(char *dir, eFileList smode, bool sub);
+    bool Load(const char *dir, eFileList smode, bool sub);
   public:
     cDVDList(void)
     {
@@ -21,8 +20,7 @@ class cDVDList : public cList<cDVDListItem>
       free(DVDExts);
       free(DVDDirs);
     }
-    //bool Create(char *dir, DVDType dtype = dtAll, DLSortMode smode = dlAsc, bool subdirs = false);
-    bool Create(char *dir, char *exts, char *dirs, eFileList smode = sNone, bool sub = false);
+    bool Create(const char *dir, const char *exts, const char *dirs, eFileList smode = sNone, bool sub = false);
     
 };
 
diff --git a/dvdplugin.c b/dvdplugin.c
index 950ba00..c68d89f 100644
--- a/dvdplugin.c
+++ b/dvdplugin.c
@@ -2,19 +2,19 @@
 #include <vdr/plugin.h>
 #include <vdr/player.h>
 #include <unistd.h>
+#include "imagelist.h"
 #include "dvdplugin.h"
-#include "debug.h"
 
 cDVDPluginThread::cDVDPluginThread(char *image)
   :cThread("DVDPluginThread")
 {
-  DEBUG("Neuer DVD Thread angelegt");
+  dsyslog("Create new DVD Thread");
   Image = image ? strdup(image) : NULL;
 }
 
 cDVDPluginThread::~cDVDPluginThread(void)
 {
-  DEBUG("DVD Thread beendet");
+  dsyslog("DVD Thread stopped");
 
   free(Image);
   Cancel();
@@ -22,7 +22,7 @@ cDVDPluginThread::~cDVDPluginThread(void)
 
 void cDVDPluginThread::Action(void)
 {
-  DEBUG("DVD Thread gestartet");
+  dsyslog("DVD Thread started");
   if(Image)
     cDVDPlugin::ChangeLink(Image);
 
@@ -32,27 +32,27 @@ void cDVDPluginThread::Action(void)
   if(plugin)
   {
     plugin->MainMenuAction();
-    DEBUG("DVD MainMenuAction gestartet");
+    dsyslog("DVD MainMenuAction called");
   }
 #else
   cRemote::CallPlugin("dvd");
-  DEBUG("DVD Plugin gestaret");
+  dsyslog("DVD Plugin called");
 #endif
 
   cCondWait::SleepMs(2 * 1000);
   cControl *control = cControl::Control();
-  DEBUG(control ? (char*)"Control gefunden" : (char*)"Control nicht gefunden");
+  dsyslog(control ? "DVD control found" : "DVD control not found");
   while(control)
   {
     cCondWait::SleepMs(5 * 1000);
     control = cControl::Control();
   }
-  DEBUG("Control wurde geschlossen");
+  dsyslog("DVD control closed");
 
   if(Image)
     cDVDPlugin::ChangeLink(DVDSwitchSetup.DVDLinkOrg);
 
-  DEBUG("Beende thread");
+  dsyslog("DVD Thread closed");
   cDVDPlugin::Exit();
 }
 
@@ -62,13 +62,13 @@ cDVDPluginThread *cDVDPlugin::thread = NULL;
 
 void cDVDPlugin::DetectDevice(void)
 {
-  DEBUG("Scan nach DVD Device");
+  dsyslog("Scan nach DVD Device");
   char *cmd = NULL;
   char *output = NULL;
   char *dvd = NULL;
 
   asprintf(&cmd, "ps -p %i -o cmd --no-header", getpid());
-  DEBUG("Commando: %s", cmd);
+  dsyslog("Commando: %s", cmd);
 
   FILE *p = popen(cmd, "r");
   if(p)
@@ -108,12 +108,12 @@ void cDVDPlugin::DetectDevice(void)
   
   if(dvd)
   {
-    DEBUG("Erkanntes DVD Device: %s", dvd);
+    isyslog("Used DVD Device: %s", dvd);
     DVDSwitchSetup.SetDVDDevice(dvd);
   }
   else
   {
-    DEBUG("Nehme Standard-DVD Device");
+    isyslog("Use Default-DVD Device /dev/dvd");
     DVDSwitchSetup.SetDVDDevice("/dev/dvd");
   }
 
@@ -165,9 +165,9 @@ void cDVDPlugin::ChangeLink(char *target)
     int rc = 0;
 
     asprintf(&cmd, LINK, target, DVDSwitchSetup.DVDLink);
-    DEBUG("Ändere link: %s", cmd);
+    dsyslog("Change link: %s", cmd);
     rc = system(cmd);
-    DEBUG("Rückgabe Änderung: %i", rc);
+    dsyslog("Change link got: %i", rc);
     free(cmd);
   }
 }
diff --git a/dvdswitch.c b/dvdswitch.c
index f039dd7..40c0d70 100644
--- a/dvdswitch.c
+++ b/dvdswitch.c
@@ -9,23 +9,27 @@
 #include <getopt.h>
 #include <unistd.h>
 #include <vdr/plugin.h>
-#include "i18n.h"
 #include "helpers.h"
+#include "imagelist.h"
 #include "setup.h"
 #include "menu.h"
 #include "dvdplugin.h"
-#include "imagelist.h"
-//#include "dvdlist.h"
 
-static const char *VERSION        = "0.1.3";
-static const char *DESCRIPTION    = "allowed to play DVD-Images";
-//static const char *MAINMENUENTRY  = "DVDSwitch";
+#if defined(APIVERSNUM) && APIVERSNUM < 10600
+#error "VDR-1.6.0 API version or greater is required!"
+#endif
+
+static const char *VERSION        = "0.1.4";
+static const char *DESCRIPTION    = tr("Allowed to play DVD-Images");
+//static const char *MAINMENUENTRY  = tr("DVDSwitch");
 
 class cPluginDvdswitch : public cPlugin {
 private:
   // Add any member variables or functions you may need here.
   bool CheckError(void);
 public:
+  cImageList ImageList;
+
   cPluginDvdswitch(void);
   virtual ~cPluginDvdswitch();
   virtual const char *Version(void) { return VERSION; }
@@ -36,7 +40,6 @@ public:
   virtual bool Start(void);
   virtual void Stop(void);
   virtual void Housekeeping(void);
-  //virtual const char *MainMenuEntry(void) { return tr(MAINMENUENTRY); }
   virtual const char *MainMenuEntry(void) { return DVDSwitchSetup.HideMenuEntry ? NULL : DVDSwitchSetup.MenuName; }
   virtual cOsdObject *MainMenuAction(void);
   virtual cMenuSetupPage *SetupMenu(void);
@@ -57,14 +60,12 @@ cPluginDvdswitch::~cPluginDvdswitch()
 {
   // Clean up after yourself!
   cDVDPlugin::Finish();
-  DebugLog.End();
 }
 
 const char *cPluginDvdswitch::CommandLineHelp(void)
 {
      //12345678901234567890123456789012345678901234567890123456789012345678901234567890|
   return
-      "  -D LOGFILE,    --debug=LOGFILE       write Debug-Info's in LOGFILE\n"
       "  -r SCRIPT,     --readscript=SCRIPT   SCRIPT = scriptname with path for reading"
       "                                       DVD as a ISO Image File"
       "  -w SCRIPT,     --writescript=SCRIPT  SCRIPT = scriptname with path to writing"
@@ -76,7 +77,6 @@ const char *cPluginDvdswitch::CommandLineHelp(void)
 bool cPluginDvdswitch::ProcessArgs(int argc, char *argv[])
 {
   static struct option long_options[] = {
-    { "debug",        required_argument, NULL, 'D' },
     { "readscript",   required_argument, NULL, 'r' },
     { "writescript",  required_argument, NULL, 'w' },
     { "imagedir",     required_argument, NULL, 'i' },
@@ -86,25 +86,22 @@ bool cPluginDvdswitch::ProcessArgs(int argc, char *argv[])
   int c = 0;
   optind = 1; //default for getopt
 
-  while((c = getopt_long(argc, argv, "D:r:w:i:", long_options, NULL)) != -1)
+  while((c = getopt_long(argc, argv, "r:w:i:", long_options, NULL)) != -1)
   {
     switch(c)
     {
-      case 'D':
-        DebugLog.SetLogFile(optarg);
-        break;
       case 'r':
-        strn0cpy(DVDSwitchSetup.DVDReadScript, optarg, MaxFileName);
+        strn0cpy(DVDSwitchSetup.DVDReadScript, optarg, memberof(DVDSwitchSetup.DVDReadScript));
         break;
       case 'w':
-        strn0cpy(DVDSwitchSetup.DVDWriteScript, optarg, MaxFileName);
+        strn0cpy(DVDSwitchSetup.DVDWriteScript, optarg, memberof(DVDSwitchSetup.DVDWriteScript));
         break;
       case 'i':
-        strn0cpy(DVDSwitchSetup.ImageDir, optarg, MaxFileName);
+        strn0cpy(DVDSwitchSetup.ImageDir, optarg, memberof(DVDSwitchSetup.ImageDir));
         DVDSwitchSetup.ImageDirPerParam = true;
         break;
       default:
-        esyslog("DVDSwitch: unknown Parameter: %c", c);
+        esyslog("DVDSwitch: unknown parameter: %c", c);
         break;
     }
   }
@@ -115,10 +112,9 @@ bool cPluginDvdswitch::ProcessArgs(int argc, char *argv[])
 bool cPluginDvdswitch::Initialize(void)
 {
   // Initialize any background activities the plugin shall perform.
-  DEBUG("Plugin wird initialisiert");
-  RegisterI18n(Phrases);
+  dsyslog("Initialize plugin");
 
-  DVDSwitchSetup.SetConfDir((char*)ConfigDirectory(Name()));
+  DVDSwitchSetup.SetConfDir(ConfigDirectory(Name()));
   cDVDPlugin::Init();
   ImageList.Init();
   DVDSwitchSetup.Init();
@@ -145,26 +141,24 @@ void cPluginDvdswitch::Housekeeping(void)
 cOsdObject *cPluginDvdswitch::MainMenuAction(void)
 {
   // Perform the action when selected from the main VDR menu.
-  DEBUG("MainMenuAction");
   if (CheckError())
   {
-    DEBUG("Fehler entdeckt. Keine OSDOBJECT Rueckgabe");
     return NULL;
   }
   else
-    return new cMainMenu();
+    return new cMainMenu(ImageList);
 }
 
 cMenuSetupPage *cPluginDvdswitch::SetupMenu(void)
 {
   // Return a setup menu in case the plugin supports one.
-  return new cMenuSetupDVDSwitch();
+  return new cMenuSetupDVDSwitch(ImageList);
 }
 
 bool cPluginDvdswitch::SetupParse(const char *Name, const char *Value)
 {
   // Parse your own setup parameters and store their values.
-  return DVDSwitchSetup.SetupParse(Name, Value);
+  return DVDSwitchSetup.SetupParse(Name, Value, ImageList);
 }
 
 bool cPluginDvdswitch::Service(const char *Id, void *Data)
@@ -187,20 +181,19 @@ cString cPluginDvdswitch::SVDRPCommand(const char *Command, const char *Option,
 
 bool cPluginDvdswitch::CheckError(void)
 {
-  DEBUG("Fehlercheck");
-  DEBUG("Check ImageDir");
+  dsyslog("Check ImageDir");
   if(!DirectoryOk(DVDSwitchSetup.ImageDir))
   {
-    DEBUG("ImageDir '%s' ist nicht lesbar oder existiert nicht", DVDSwitchSetup.ImageDir);
-    OSD_ERRMSG(tr("Image Directory not readable or not exist"));
+    esyslog("Image Directory  '%s' not readable", DVDSwitchSetup.ImageDir);
+    OsdMsg(mtError,tr("Image Directory not readable or not exist"));
     return true;
   }
 
-  DEBUG("Check DVD Plugin");
+  dsyslog("Check DVD Plugin");
   if(!cPluginManager::GetPlugin("dvd"))
   {
-    DEBUG("DVDPlugin wurde nicht gefunden!");
-    OSD_INFOMSG(tr("DVD-Plugin not found! Function deactivated!"));
+    esyslog("DVD-Plugin not found! Function deactivated!");
+    OsdMsg(mtInfo,tr("DVD-Plugin not found! Function deactivated!"));
   } else
     DVDSwitchSetup.DVDPluginExist = true;
 
diff --git a/helpers.c b/helpers.c
index 65cbd94..fbd7c4f 100644
--- a/helpers.c
+++ b/helpers.c
@@ -40,13 +40,13 @@ void ChangeChars(char *name, char *chars)
   }
 }
 
-void StrRepeat(char *input, int count, char *dest)
+void StrRepeat(const char *input, int count, char *dest)
 {
   for(int i = 0; i < count; i++)
     strcat(dest, input);
 }
 
-bool RegIMatch(char *string, char *pattern)
+bool RegIMatch(const char *string, const char *pattern)
 {
   if(!string || !pattern)
     return false;
@@ -70,7 +70,7 @@ bool RegIMatch(char *string, char *pattern)
 void cTokenizer::Tokenize(bool trim)
 {
   Clear();
-  DEBUG("String wird in Token zerlegt");
+  dsyslog("String wird in Token zerlegt");
   char *buffer = NULL;
   char *token = NULL;
   char *tok_pointer;
@@ -83,7 +83,7 @@ void cTokenizer::Tokenize(bool trim)
       token;
       token = strtok_r(NULL, Delim, &tok_pointer))
   {
-    DEBUG("Token gefunden: %s", token);
+    dsyslog("Token gefunden: %s", token);
     if(!trim)
       Add(new cToken(token));
     else
@@ -95,9 +95,9 @@ void cTokenizer::Tokenize(bool trim)
 
 // --- cFileInfo ---------------------------------------------
 
-cFileInfo::cFileInfo(char *file)
+cFileInfo::cFileInfo(const char *file)
 {
-  DEBUG("FileInfo: %s", file);
+  dsyslog("FileInfo: %s", file);
   File = (file && !isempty(file)) ? strdup(file) : NULL;
 
   if(File && File[strlen(File) - 1] == '/')
@@ -129,7 +129,7 @@ char *cFileInfo::Path(void)
     strn0cpy(buffer, File, len);
   }
 
-  DEBUG("FileInfo: Pfad: %s", buffer);
+  dsyslog("FileInfo: Pfad: %s", buffer);
 
   return buffer;
 }
@@ -145,7 +145,7 @@ char *cFileInfo::FileName(void)
     buffer = strdup(p);
   }
 
-  DEBUG("FileInfo: FileName: %s", buffer);
+  dsyslog("FileInfo: FileName: %s", buffer);
 
   return buffer;
 
@@ -175,7 +175,7 @@ char *cFileInfo::FileNameWithoutExt(void)
   free(ext);
   free(filename);
 
-  DEBUG("FileInfo: FileNameWithoutExt: %s", buffer);
+  dsyslog("FileInfo: FileNameWithoutExt: %s", buffer);
 
   return buffer;
 }
@@ -193,7 +193,7 @@ char *cFileInfo::Extension(bool withPoint)
       buffer = strdup(p);
   }
 
-  DEBUG("FileInfo: Extension: %s", buffer);
+  dsyslog("FileInfo: Extension: %s", buffer);
   
   return buffer;
 }
@@ -364,7 +364,7 @@ bool cFileInfo::isExists(void)
 
 // --- cFileCMD -------------------------------------------------
 
-bool cFileCMD::Del(char *file)
+bool cFileCMD::Del(const char *file)
 {
   cFileInfo *info = new cFileInfo(file);
   cFileList *list = NULL;
@@ -406,7 +406,7 @@ bool cFileCMD::Del(char *file)
   return ret;
 }
 
-bool cFileCMD::DirIsEmpty(char *file)
+bool cFileCMD::DirIsEmpty(const char *file)
 {
   bool ret = false;
 
@@ -420,7 +420,7 @@ bool cFileCMD::DirIsEmpty(char *file)
 
 // --- cFileList -------------------------------
 
-cFileListItem::cFileListItem(char *dir, char *file)
+cFileListItem::cFileListItem(const char *dir, const char *file)
 {
   if(file && !isempty(file) && dir && !isempty(dir))
   {
@@ -436,7 +436,7 @@ cFileListItem::cFileListItem(char *dir, char *file)
     File[strlen(File) - 1] = '\0';
 }
 
-cFileListItem::cFileListItem(char *file)
+cFileListItem::cFileListItem(const char *file)
 {
   File = file ? strdup(file) : NULL;
 
@@ -470,7 +470,7 @@ cFileList::~cFileList(void)
   }
 }
 
-bool cFileList::Load(char *dir, bool withsub)
+bool cFileList::Load(const char *dir, bool withsub)
 {
   if(dir && isempty(dir))
     return false;
@@ -494,7 +494,7 @@ bool cFileList::Load(char *dir, bool withsub)
   return Read(Dir, Sub);
 }
 
-bool cFileList::Read(char *dir, bool withsub)
+bool cFileList::Read(const char *dir, bool withsub)
 {
   bool ret = false;
   char *buffer = NULL;
@@ -525,7 +525,7 @@ bool cFileList::Read(char *dir, bool withsub)
   return ret;
 }
 
-void cFileList::SortIn(char *dir, char *file)
+void cFileList::SortIn(const char *dir, const char *file)
 {
   cFileListItem *Item = First();
   cFileInfo *ItemInfo = NULL;
@@ -575,7 +575,7 @@ void cFileList::SortIn(char *dir, char *file)
   free(NewItem);
 }
 
-bool cFileList::CheckIncludes(char *dir, char *file)
+bool cFileList::CheckIncludes(const char *dir, const char *file)
 {
   if(!Includes)
     return true;
@@ -592,7 +592,7 @@ bool cFileList::CheckIncludes(char *dir, char *file)
   return false;
 }
 
-bool cFileList::CheckExcludes(char *dir, char *file)
+bool cFileList::CheckExcludes(const char *dir, const char *file)
 {
   if(!Excludes)
     return false;
@@ -609,7 +609,7 @@ bool cFileList::CheckExcludes(char *dir, char *file)
   return false;
 }
 
-bool cFileList::CheckType(char *dir, char *file, eFileInfo type)
+bool cFileList::CheckType(const char *dir, const char *file, eFileInfo type)
 {
   if(type == tNone)
     return true;
@@ -656,7 +656,7 @@ bool cFileList::DirIsEmpty(cFileListItem *item)
   return ret;
 }
 
-bool cFileList::DirIsIn(char *file, char *strings)
+bool cFileList::DirIsIn(const char *file, const char *strings)
 {
   bool ret = false;
 
diff --git a/helpers.h b/helpers.h
index b5d7185..9935593 100644
--- a/helpers.h
+++ b/helpers.h
@@ -13,18 +13,12 @@
 #include <vdr/interface.h>
 #include <vdr/thread.h>
 
-#include "debug.h"
-
-#define OSD_ERRMSG(msg)   OsdMsg(mtError, msg)
-#define OSD_WARNMSG(msg)  OsdMsg(mtWarning, msg)
-#define OSD_INFOMSG(msg)  OsdMsg(mtInfo, msg)
-
 #define FREENULL(p) (free(p), p = NULL)
 
 void OsdMsg(eMessageType Type, const char *Msg);
 void ChangeChars(char *name, char *chars);
-void StrRepeat(char *input, int count, char *dest);
-bool RegIMatch(char *string, char *pattern);
+void StrRepeat(const char *input, int count, char *dest);
+bool RegIMatch(const char *string,const char *pattern);
 
 // --- cStringValue -------------------------------------
 
@@ -33,7 +27,7 @@ class cStringValue
   private:
     char *String;
 
-    void Init(char *string)
+    void Init(const char *string)
     {
       FREENULL(String);
       String = string ? strdup(string) : NULL;
@@ -42,12 +36,12 @@ class cStringValue
     cStringValue(void) { String = NULL; }
     ~cStringValue(void) { free(String); }
 
-    cStringValue &operator= (char *string)
+    cStringValue &operator= (const char *string)
     {
       Init(string);
       return *this;
     }
-    cStringValue &operator+= (char *string)
+    cStringValue &operator+= (const char *string)
     {
       if(String && string)
       {
@@ -61,7 +55,7 @@ class cStringValue
     }
     char *operator& (void) { return String; }
 
-    int len(void) { return String ? strlen(String) : 0; }
+    int len(void) const { return String ? strlen(String) : 0; }
 };
 
 // --- cStringList --------------------------------------
@@ -71,7 +65,7 @@ class cStringListItem : public cListObject
   private:
     char *String;
   public:
-    cStringListItem(char *string)
+    cStringListItem(const char *string)
     {
       String = string ? strdup(string) : NULL;
     }
@@ -80,7 +74,7 @@ class cStringListItem : public cListObject
     char *Value(void) { return String; }
 };
 
-class cStringList : public cList<cStringListItem> {};
+//class cStringList : public cList<cStringListItem> {};
 
 // --- cTokenizer ---------------------------------------
 
@@ -90,7 +84,6 @@ class cToken : public cListObject
     char *String;
   public:
     cToken(char *string) {
-      DEBUG("Neuer Token: %s", string);
       String = string ? strdup(string) : NULL;
     }
     ~cToken(void) { free(String); }
@@ -105,9 +98,8 @@ class cTokenizer : public cList<cToken>
 
     void Tokenize(bool trim);
   public:
-    cTokenizer(char *string, char *delim, bool trim = false)
+    cTokenizer(const char *string,const char *delim, bool trim = false)
     {
-      DEBUG("neuer Tokenizer wird initialisiert: %s, %s", string, delim);
       String = string ? strdup(string) : NULL;
       Delim = delim ? strdup(delim) : NULL;
       if(String && Delim)
@@ -115,11 +107,10 @@ class cTokenizer : public cList<cToken>
     }
     ~cTokenizer(void)
     {
-      DEBUG("Tokenizer wird gelöscht");
       free(String);
       free(Delim);
     }
-    char *GetToken(int index) { return index > 0 && index <= Count() ? Get(index - 1)->Value() : NULL; }
+    const char *GetToken(int index) const { return index > 0 && index <= Count() ? Get(index - 1)->Value() : NULL; }
 };
 
 // --- cFileInfo ----------------------------------------
@@ -141,7 +132,7 @@ class cFileInfo
     unsigned long long int size;
 
   public:
-    cFileInfo(char *file);
+    cFileInfo(const char *file);
     ~cFileInfo(void);
 
     char *Path(void);
@@ -164,10 +155,10 @@ class cFileInfo
 class cFileCMD
 {
   public:
-    static bool Del(char *file);
-    static bool Mkdir(char *dir) { return MakeDirs(dir, true); }
-    static bool Rn(char *oldfile, char *newfile) { return !rename(oldfile, newfile); }
-    static bool DirIsEmpty(char *file);
+    static bool Del(const char *file);
+    static bool Mkdir(const char *dir) { return MakeDirs(dir, true); }
+    static bool Rn(const char *oldfile, const char *newfile) { return !rename(oldfile, newfile); }
+    static bool DirIsEmpty(const char *file);
 };
 
 // --- cFileList -------------------------------
@@ -185,7 +176,7 @@ class cFileOptListItem : public cListObject
     char *RegEx;
     eFileInfo Type;
   public:
-    cFileOptListItem(char *regex, eFileInfo type = tNone)
+    cFileOptListItem(const char *regex, eFileInfo type = tNone)
     {
       RegEx = (regex && !isempty(regex)) ? strdup(regex) : NULL;
       Type = type;
@@ -206,8 +197,8 @@ class cFileListItem : public cListObject
   private:
     char *File;
   public:
-    cFileListItem(char *dir, char *file);
-    cFileListItem(char *file);
+    cFileListItem(const char *dir, const char *file);
+    cFileListItem(const char *file);
     ~cFileListItem(void) { free(File); }
     char *Value(void) { return File; }
 };
@@ -226,18 +217,18 @@ class cFileList : public cList<cFileListItem>
     bool SortToFilename;
     eFileInfo Type;
 
-    bool Read(char *dir, bool withsub);
-    void SortIn(char *dir, char *file);
+    bool Read(const char *dir, bool withsub);
+    void SortIn(const char *dir, const char *file);
 
-    bool CheckIncludes(char *dir, char *file);
-    bool CheckExcludes(char *dir, char *file);
-    bool CheckType(char *dir, char *file, eFileInfo type);
+    bool CheckIncludes(const char *dir, const char *file);
+    bool CheckExcludes(const char *dir, const char *file);
+    bool CheckType(const char *dir, const char *file, eFileInfo type);
   public:
     cFileList(void);
     ~cFileList(void);
 
-    bool Load(char *dir = NULL, bool withsub = false);
-    void OptInclude(char *include, eFileInfo type = tNone)
+    bool Load(const char *dir = NULL, bool withsub = false);
+    void OptInclude(const char *include, eFileInfo type = tNone)
     {
       if(!Includes)
         Includes = new cFileOptList();
@@ -246,7 +237,7 @@ class cFileList : public cList<cFileListItem>
       else
         Includes->Add(new cFileOptListItem(include, type));
     }
-    void OptExclude(char *exclude,  eFileInfo type = tNone)
+    void OptExclude(const char *exclude,  eFileInfo type = tNone)
     {
       if(!Excludes)
         Excludes = new cFileOptList();
@@ -263,8 +254,8 @@ class cFileList : public cList<cFileListItem>
     void OptFilterType(eFileInfo type) { Type = type; }
 
     bool DirIsEmpty(cFileListItem *item);
-    static bool DirIsIn(char *file, char *strings);
-    static bool DirIsIn(cFileListItem *item, char *strings) { return DirIsIn(item->Value(), strings); }
+    static bool DirIsIn(const char *file, const char *strings);
+    static bool DirIsIn(cFileListItem *item, const char *strings) { return DirIsIn(item->Value(), strings); }
 };
 
 #endif // __HELPERS_DVDSWITCH_H
diff --git a/i18n.c b/i18n.c
deleted file mode 100644
index 246371a..0000000
--- a/i18n.c
+++ /dev/null
@@ -1,3351 +0,0 @@
-/*
- * i18n.c: Internationalization
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id: i18n.c 1.3 2002/06/23 13:05:59 kls Exp $
- */
-
-#include "i18n.h"
-
-const tI18nPhrase Phrases[] = {
-
-  { "DVDSwitch",// eng,dos
-    "DVDSwitch",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "allowed to play DVD-Images",// eng,dos
-    "ermöglicht DVD-Images abzuspielen",//deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { " abcdefghijklmnopqrstuvwxyz0123456789-.#~",// eng,dos
-    " abcdefghijklmnopqrstuvwxyz0123456789-.#~",//deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Generic Settings",// eng,dos
-    "Allgemeine Einstellungen",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Display Settings",// eng,dos
-    "Anzeige Einstellungen",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Special Display Settings",// eng,dos
-    "Detailierte Anzeige Einstellungen",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Navigation",// eng,dos
-    "Navigation",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tHide Mainmenu Entry",// eng,dos
-    "\tVerstecke Hauptmenüeintrag",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\t  Name",// eng,dos
-    "\t  Name",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tImage Dir.",// eng,dos
-    "\tImage Verz.",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tView free DiskSpace",// eng,dos
-    "\tZeige freien Plattenplatz",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tImagetypes",// eng,dos
-    "\tImagetypen",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "to adjust",// eng,dos
-    "Einstellen",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Imagetypes",// eng,dos
-    "Imagetypen",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Description:",// eng,dos
-    "Beschreibung:",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Type-Title:",// eng,dos
-    "Typ-Bezeichnung:",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Image Type",// eng,dos
-    "Image Typ",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Directory contains:",// eng,dos
-    "Verzeichnis enthält:",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "File Extension:",// eng,dos
-    "Datei-Erweiterung:",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Hide Extension",// eng,dos
-    "Erweiterung ausblenden",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Directory with 'VIDEO_TS' Folder",// eng,dos
-    "Verzeichnis mit 'VIDEO_TS' Ordner",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "File with '.iso' Extension",// eng,dos
-    "Datei mit '.iso' Extension",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Iso-Image",// eng,dos
-    "Iso-Image",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Directory",// eng,dos
-    "Verzeichnis",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "File",// eng,dos
-    "Datei",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tDisplay Mode",// eng,dos
-    "\tAnzeige Modus",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "All Images",// eng,dos
-    "Alle Images",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "All with Cat.",// eng,dos
-    "Alle mit Kat.",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Directories",// eng,dos
-    "Verzeichnisse",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\t  Category Type",// eng,dos
-    "\t  Art der Kategorie",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Image-Type",// eng,dos
-    "Image-Typ",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Directories",// eng,dos
-    "Verzeichnisse",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "File-Type",// eng,dos
-    "Datei-Typ",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Image-File",// eng,dos
-    "Image-Datei",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Image-Directory",// eng,dos
-    "Image-Verzeichnis",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-
-  { "\t  invisible empty Dir's/Cat.",// eng,dos
-    "\t  Blende leere Verz./Kat. aus",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tAlphabetic Sort",// eng,dos
-    "\talphabetische Sortierung",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "none",// eng,dos
-    "Keine",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "ascending",// eng,dos
-    "Aufsteigend",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "descending",// eng,dos
-    "Absteigend",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tvisible DVD-Drive",// eng,dos
-    "\tDVD-LW einblenden",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tISO Images first",// eng,dos
-    "\tISO Images zuerst",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tinvisible Extension",// eng,dos
-    "\tBlende Erweiterung aus",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tisible Image-Type Col",// eng,dos
-    "\tZeige Image-Typ Spalte",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\t  Width for Image-Col",// eng,dos
-    "\t  Breite für Image-Spalte",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tchar for Cat.Line",// eng,dos
-    "\tZeichen für Kat.Linie",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\t  Count before Cat.Name",// eng,dos
-    "\t  Anzahl vorm Kat.Namen",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tSpaces before/after Cat.Name",// eng,dos
-    "\tLeerzeichen vor/nach Kat.Name",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tCutText for Subcat",// eng,dos
-    "\tTrenntext für Subkat.",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tchange Character",// eng,dos
-    "\tZeichen ändern",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tCat.Jump by Left/Right",// eng,dos
-    "\tKat.sprung bei Links/Rechts",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "without Catergory",// eng,dos
-    "ohne Kategorie",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "DVD-Drive",// eng,dos
-    "DVD-Laufwerk",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Image Directory not readable or not exist",// eng,dos
-    "Image Verzeichnis ist nicht lesbar oder existiert nicht",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "DVD-Plugin not found! Function deactivated!",// eng,dos
-    "DVD Plugin nicht gefunden! Funktion deaktiviert!",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "No Writescript specified",// eng,dos
-    "Es wurde kein Writescript angegeben",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Specified Writescript not exist!",// eng,dos
-    "Angegebenes Writescript existiert nicht!",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Cannot execute Writescript!",// eng,dos
-    "Kann Writescript nicht ausführen!",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "No Readscript specified",// eng,dos
-    "Es wurde kein Readscript angegeben",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Specified Readscript not exist!",// eng,dos
-    "Angegebenes Readscript existiert nicht!",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Cannot execute Readscript!",// eng,dos
-    "Kann Readscript nicht ausführen!",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "invalid file name for DVD-Image",// eng,dos
-    "ungültiger Dateiname für das DVD-Image",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "'Description' must not empty!",// eng,dos
-    "'Beschreibung' darf nicht leer sein!",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "'Type-Title' must not empty!",// eng,dos
-    "'Typ Bezeichnung' darf nicht leer sein!",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "'Directory contains' must not empty!",// eng,dos
-    "'Verzeichnis enthält' darf nicht leer sein!",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "'File Extension' must not empty!",// eng,dos
-    "'Datei Erweiterung' darf nicht leer sein!",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "really delete Entry?",// eng,dos
-    "Eintrag wirklich löschen?",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "really delete DVD?",// eng,dos
-    "DVD wirklich löschen?",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "to change",// eng,dos
-    "Wechseln",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Play",// eng,dos
-    "Wiedergabe",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Read DVD",// eng,dos
-    "Lies DVD",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Write DVD",// eng,dos
-    "Schreibe DVD",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Read DVD",// eng,dos
-    "Lies DVD",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Imagename:",// eng,dos
-    "Image-Name:",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Imagetype:",// eng,dos
-    "Image-Typ:",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "read in",// eng,dos
-    "Einlesen",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "no Rights to move",// eng,dos
-    "keine Berechtigung zum Verschieben",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "no Rights to delete",// eng,dos
-    "keine Berechtigung zum Löschen",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "no Rights to write",// eng,dos
-    "keine Berechtigung zum Schreiben",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "no Rights to create",// eng,dos
-    "keine Berechtigung zum Erstellen",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "no Rights to rename",// eng,dos
-    "keine Berechtigung zum schreiben",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "no Rights!",// eng,dos
-    "keine Berechtigung!",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "really delete?",// eng,dos
-    "Wirklich löschen?",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Directory not empty. however delete?",// eng,dos
-    "Verzeichnis ist nicht leer. Dennoch löschen?",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Commands",// eng,dos
-    "Befehle",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Directory Management",// eng,dos
-    "Verzeichnis Management",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "DVD-Tray open",// eng,dos
-    "DVD Schublade öffnen",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "DVD-Tray close",// eng,dos
-    "DVD Schublade schließen",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Image rename",// eng,dos
-    "Image umbenennen",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Image move",// eng,dos
-    "Image verschieben",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Image delete",// eng,dos
-    "Image löschen",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Image burn",// eng,dos
-    "Image brennen",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Image to create from DVD",// eng,dos
-    "Image von DVD erstellen",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Select",// eng,dos
-    "Auswählen",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Rename",// eng,dos
-    "Umbenennen",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Move",// eng,dos
-    "Verschieben",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Edit Directories",// eng,dos
-    "Verzeichnisse bearbeiten",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "New:",// eng,dos
-    "Neu:",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Directory exists",// eng,dos
-    "Verzeichnis existiert bereits",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Rename:",// eng,dos
-    "Umbenenen:",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Burn Now?",// eng,dos
-    "Jetzt brennen?",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Name:",// eng,dos
-    "Name:",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Directory:",// eng,dos
-    "Verzeichnis:",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Imagetype:",// eng,dos
-    "ImageTyp:",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "No Imagetype selected",// eng,dos
-    "Es wurde kein Imagetyp ausgewählt!",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "No Directory selected. Use Standard?",// eng,dos
-    "Es wurde kein Verzeichnis ausgewählt. Standard benutzen?",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Now Read?",// eng,dos
-    "Jetzt einlesen?",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Select Directory",// eng,dos
-    "Verzeichnis auswählen",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "File exists in Directory",// eng,dos
-    "Datei existiert bereits im Verzeichnis",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "none Function",// eng,dos
-    "keine Funktion",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Dir. Management",// eng,dos
-    "Verz. Management",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Tray open",// eng,dos
-    "DVD öffnen",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Tray close",// eng,dos
-    "DVD schließen",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Image create",// eng,dos
-    "Image erstellen",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Dir.Mgmt.",// eng,dos
-    "Verz.Mgmt.",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Close",// eng,dos
-    "Schließen",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Burn",// eng,dos
-    "Brennen",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Create",// eng,dos
-    "Erstellen",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Key allocation",// eng,dos
-    "Tastenbelegung",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tKey 1",// eng,dos
-    "\tTaste 1",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tKey 2",// eng,dos
-    "\tTaste 2",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tKey 3",// eng,dos
-    "\tTaste 3",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tKey 4",// eng,dos
-    "\tTaste 4",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tKey 5",// eng,dos
-    "\tTaste 5",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tKey 6",// eng,dos
-    "\tTaste 6",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tKey 7",// eng,dos
-    "\tTaste 7",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tKey 8",// eng,dos
-    "\tTaste 8",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tKey 9",// eng,dos
-    "\tTaste 9",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tKey 0",// eng,dos
-    "\tTaste 0",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tKey Red",// eng,dos
-    "\tTaste Rot",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tKey Yellow",// eng,dos
-    "\tTaste Gelb",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tKey Green",// eng,dos
-    "\tTaste Grün",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tKey Blue",// eng,dos
-    "\tTaste Blau",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tKey OK",// eng,dos
-    "\tTaste OK",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tvisible Image-Size Col",// eng,dos
-    "\tZeige Spalte Image Größe",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "\tvisible Image-Type Col",// eng,dos
-    "\tZeige Spalte Image-Typ",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Insert",// eng,dos
-    "Einfügen",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "New",// eng,dos
-    "Neu",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { "Delete",// eng,dos
-    "Löschen",// deu,ger
-    "",// slv,slo
-    "",// ita
-    "",// dut,nla,nld
-    "",// por
-    "",// fra,fre
-    "",// nor
-    "",// fin,smi
-    "",// pol
-    "",// esl,spa
-    "",// ell,gre
-    "",// sve,swe
-    "",// rom,rum
-    "",// hun
-    "",// cat,cln
-    "",// rus
-    "",// hrv
-    "",// est
-    "",// dan
-#if VDRVERSNUM >= 10342
-    "",// cze,ces
-#endif
-  },
-  { NULL }
-  };
diff --git a/i18n.h b/i18n.h
deleted file mode 100644
index 577628a..0000000
--- a/i18n.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * i18n.h: Internationalization
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id: i18n.h 1.2 2002/05/11 14:48:16 kls Exp $
- */
-
-#ifndef _I18N__H
-#define _I18N__H
-
-#include <vdr/i18n.h>
-
-extern const tI18nPhrase Phrases[];
-
-#endif //_I18N__H
diff --git a/imagelist-item.c b/imagelist-item.c
index 95a2cb2..4201c4a 100644
--- a/imagelist-item.c
+++ b/imagelist-item.c
@@ -1,6 +1,6 @@
 #include "imagelist-item.h"
 
-cImageListItem::cImageListItem(char *lname, char *sname, eFileInfo type, char *value, bool hide)
+cImageListItem::cImageListItem(const char *lname, const char *sname, eFileInfo type, const char *value, bool hide)
 {
   LName = NULL;
   SName = NULL;
@@ -9,7 +9,7 @@ cImageListItem::cImageListItem(char *lname, char *sname, eFileInfo type, char *v
 
   Edit(lname, sname, type, value, hide);
 
-  Debug();
+  debug();
 }
 
 cImageListItem::~ cImageListItem(void)
@@ -20,10 +20,10 @@ cImageListItem::~ cImageListItem(void)
   free(SString);
 }
 
-void cImageListItem::Edit(char *lname, char *sname, eFileInfo type, char *value, bool hide)
+void cImageListItem::Edit(const char *lname, const char *sname, eFileInfo type, const char *value, bool hide)
 {
-  DEBUG("New/Edit ImageListItem");
-  Debug();
+  dsyslog("New/Edit ImageListItem");
+  debug();
 
   free(LName);
   free(SName);
@@ -42,16 +42,16 @@ void cImageListItem::Edit(char *lname, char *sname, eFileInfo type, char *value,
 
   MakeSetupString();
 
-  Debug();
+  debug();
 }
 
-void cImageListItem::Debug(void)
+void cImageListItem::debug(void)
 {
-  DEBUG("Items:");
-  DEBUG("  LongName: %s", LName);
-  DEBUG("  ShortName: %s", SName);
-  DEBUG("  FileType: %i", (int)fType);
-  DEBUG("  Value: %s", Value);
-  DEBUG("  Hide: %s", HideExt ? "TRUE" : "FALSE");
-  DEBUG("  SaveString: %s", SString);
+  dsyslog("Items:");
+  dsyslog("  LongName: %s", LName);
+  dsyslog("  ShortName: %s", SName);
+  dsyslog("  FileType: %i", (int)fType);
+  dsyslog("  Value: %s", Value);
+  dsyslog("  Hide: %s", HideExt ? "TRUE" : "FALSE");
+  dsyslog("  SaveString: %s", SString);
 }
diff --git a/imagelist-item.h b/imagelist-item.h
index 95e986b..3ff10cf 100644
--- a/imagelist-item.h
+++ b/imagelist-item.h
@@ -17,17 +17,17 @@ class cImageListItem : public cListObject
 
     void MakeSetupString(void)
     {
-      DEBUG("Neuer SetupString");
+      dsyslog("Neuer SetupString");
       FREENULL(SString);
       asprintf(&SString, "%s|%s|%i|%s|%i", LName, SName, (int)fType, Value, HideExt);
-      DEBUG("...%s", SString);
+      dsyslog("...%s", SString);
     };
 
-    void Debug(void);
+    void debug(void);
   public:
-    cImageListItem(char *lname, char *sname, eFileInfo type, char *value, bool hide);
+    cImageListItem(const char *lname, const char *sname, eFileInfo type,const char *value, bool hide);
     ~cImageListItem(void);
-    void Edit(char *lname, char *shortname, eFileInfo type, char *value, bool hide);
+    void Edit(const char *lname,const char *shortname, eFileInfo type,const char *value, bool hide);
 
     char *GetLName(void) { return LName; };
     char *GetSName(void) { return SName; };
diff --git a/imagelist.c b/imagelist.c
index fd387ff..c605b32 100644
--- a/imagelist.c
+++ b/imagelist.c
@@ -1,6 +1,6 @@
 #include "imagelist.h"
 
-cImageList ImageList;
+//cImageList ImageList;
 
 cImageList::cImageList(void)
 {
@@ -13,25 +13,25 @@ cImageList::~ cImageList(void)
 
 void cImageList::Init(void)
 {
-  DEBUG("Init ImageList");
+  dsyslog("Init ImageList");
   if(!Setup)
   {
-    Add(new cImageListItem((char*)tr("Directory with 'VIDEO_TS' Folder"),
-                           (char*)tr("Directory"),
+    Add(new cImageListItem(tr("Directory with 'VIDEO_TS' Folder"),
+                           tr("Directory"),
                            tDir,
                            "video_ts",
                            true));
-    Add(new cImageListItem((char*)tr("File with '.iso' Extension"),
-                           (char*)tr("Iso-Image"),
+    Add(new cImageListItem(tr("File with '.iso' Extension"),
+                           tr("Iso-Image"),
                            tFile,
                            ".iso",
                            true));
   }
 }
 
-void cImageList::AddItem(char *item)
+void cImageList::AddItem(const char *item)
 {
-  DEBUG("Neues Item soll hinzugefügt werden: %s", item);
+  dsyslog("Neues Item soll hinzugefügt werden: %s", item);
 
   if (!isempty(item))
   {
@@ -46,9 +46,9 @@ void cImageList::AddItem(char *item)
   }
 }
 
-void cImageList::AddSetup(char *value)
+void cImageList::AddSetup(const char *value)
 {
-  DEBUG("Erhalte SetupString: %s",value);
+  dsyslog("Erhalte SetupString: %s",value);
 
   Setup = true;
   Clear();
@@ -64,14 +64,14 @@ void cImageList::AddSetup(char *value)
 
 char *cImageList::GetSetupString(void)
 {
-  DEBUG("Erstelle SetupString");
+  dsyslog("Erstelle SetupString");
 
   SString = NULL;
   cImageListItem *item = First();
 
   while(item)
   {
-    DEBUG("Füge hinzu: %s", item->SaveString());
+    dsyslog("Füge hinzu: %s", item->SaveString());
     SString += item->SaveString();
     SString += "@";
     item = Next(item);
@@ -82,17 +82,17 @@ char *cImageList::GetSetupString(void)
 
 char *cImageList::GetExtensions(void)
 {
-  DEBUG("Erstelle Liste aller Extensions");
+  dsyslog("Erstelle Liste aller Extensions");
 
   Ext = NULL;
   cImageListItem *item = First();
 
   while(item)
   {
-    DEBUG("Item ist vom Type: %i", (int) item->GetFType());
+    dsyslog("Item ist vom Type: %i", (int) item->GetFType());
     if(item->GetFType() == tFile)
     {
-      DEBUG("Item wird hinzugefügt: %s", item->GetValue());
+      dsyslog("Item wird hinzugefügt: %s", item->GetValue());
       Ext += item->GetValue();
       Ext += "@";
     }
@@ -104,17 +104,17 @@ char *cImageList::GetExtensions(void)
 
 char *cImageList::GetHideExtensions(void)
 {
-  DEBUG("Erstelle Liste aller Extensions die ausgeblendet werden sollen");
+  dsyslog("Erstelle Liste aller Extensions die ausgeblendet werden sollen");
 
   HideExt = NULL;
   cImageListItem *item = First();
 
   while(item)
   {
-    DEBUG("Item ist vom Type: %i", (int) item->GetFType());
+    dsyslog("Item ist vom Type: %i", (int) item->GetFType());
     if(item->GetFType() == tFile && item->IsHide())
     {
-      DEBUG("Item wird hinzugefügt: %s", item->GetValue());
+      dsyslog("Item wird hinzugefügt: %s", item->GetValue());
       HideExt += item->GetValue();
       HideExt += "@";
     }
@@ -126,17 +126,17 @@ char *cImageList::GetHideExtensions(void)
 
 char *cImageList::GetDirContains(void)
 {
-  DEBUG("Erstelle Liste aller Verzeichnisinhalte");
+  dsyslog("Erstelle Liste aller Verzeichnisinhalte");
 
   DirIn = NULL;
   cImageListItem *item = First();
 
   while(item)
   {
-    DEBUG("Item ist vom Type: %i", (int) item->GetFType());
+    dsyslog("Item ist vom Type: %i", (int) item->GetFType());
     if(item->GetFType() == tDir)
     {
-      DEBUG("Item wird hinzugefügt: %s", item->GetValue());
+      dsyslog("Item wird hinzugefügt: %s", item->GetValue());
       DirIn += item->GetValue();
       DirIn += "@";
     }
@@ -146,9 +146,9 @@ char *cImageList::GetDirContains(void)
   return stripspace(&DirIn);
 }
 
-char *cImageList::GetShortName(char *file)
+char *cImageList::GetShortName(const char *file)
 {
-  DEBUG("Shortname wird gesucht: %s", file);
+  dsyslog("Shortname wird gesucht: %s", file);
 
   Short = NULL;
   cImageListItem *item = First();
@@ -185,7 +185,7 @@ char *cImageList::GetShortName(char *file)
   return &Short;
 }
 
-bool cImageList::IsHide(char *ext)
+bool cImageList::IsHide(const char *ext)
 {
   if(!ext)
     return false;
diff --git a/imagelist.h b/imagelist.h
index 6458149..363cf2d 100644
--- a/imagelist.h
+++ b/imagelist.h
@@ -16,22 +16,20 @@ class cImageList : public cList<cImageListItem>
 
     bool Setup;
 
-    void AddItem(char *item);
+    void AddItem(const char *item);
   public:
     cImageList(void);
-    ~cImageList(void);
+    virtual ~cImageList(void);
 
     void Init(void);
-    void AddSetup(char *value);
+    void AddSetup(const char *value);
 
     char *GetSetupString(void);
     char *GetExtensions(void);
     char *GetHideExtensions(void);
     char *GetDirContains(void);
-    char *GetShortName(char *file);
-    bool IsHide(char *ext);
+    char *GetShortName(const char *file);
+    bool IsHide(const char *ext);
 };
 
-extern cImageList ImageList;
-
 #endif //__IMAGELIST_DVDSWITCH_H
diff --git a/menu-item.c b/menu-item.c
index edfd24a..5e7b7c9 100644
--- a/menu-item.c
+++ b/menu-item.c
@@ -1,24 +1,25 @@
+
+#include "imagelist.h"
 #include "menu.h"
 #include "menu-item.h"
 #include "setup.h"
-#include "imagelist.h"
 
 // --- cMainMenuItem -----------------------------------------------------
 
-cMainMenuItem::cMainMenuItem(eMainMenuItem itype, char *file)
+cMainMenuItem::cMainMenuItem(eMainMenuItem itype, cImageList &ImageList, const char *file)
 {
-  DEBUG("Neues MainMenuItem: %i, %s", (int)itype, file);
+  dsyslog("Neues MainMenuItem: %i, %s", (int)itype, file);
 
   iType = itype;
   File = file ? strdup(file) : NULL;
 
-  OSD = cMainMenu::CreateOSDName(iType, File);
+  OSD = cMainMenu::CreateOSDName(iType, ImageList, File);
 
   SetText(OSD, true);
   if(iType == iCat)
     SetSelectable(false);
 
-  DEBUG("OSDName: %s", OSD);
+  dsyslog("OSDName: %s", OSD);
 }
 
 cMainMenuItem::~ cMainMenuItem()
diff --git a/menu-item.h b/menu-item.h
index cb102a3..6522e88 100644
--- a/menu-item.h
+++ b/menu-item.h
@@ -20,7 +20,7 @@ class cMainMenuItem : public cOsdItem
     char *File;
     char *OSD;
   public:
-    cMainMenuItem(eMainMenuItem itype, char *file = NULL);
+    cMainMenuItem(eMainMenuItem itype, cImageList &ImageList, const char *file = NULL);
     ~cMainMenuItem(void);
 
     eMainMenuItem Type(void) { return iType; };
diff --git a/menu.c b/menu.c
index cf5dbd7..8540212 100644
--- a/menu.c
+++ b/menu.c
@@ -1,17 +1,18 @@
 #include <vdr/plugin.h>
+#include "imagelist.h"
 #include "menu.h"
 #include "tools.h"
 #include "setup.h"
 #include "dvdplugin.h"
 #include "commands.h"
-#include "imagelist.h"
 
 cDirHandlingOpt MainMenuOptions;
 
 // --- cMainMenu ------------------------------------------------------------------------
 
-cMainMenu::cMainMenu(void)
+cMainMenu::cMainMenu(cImageList &imagelist)
   : cOsdMenu(DVDSwitchSetup.MenuName, DVDSwitchSetup.CountTypCol, 10)
+  , ImageList(imagelist)
 {
   FirstSelectable = -1;
   CMDImg = NULL;
@@ -57,9 +58,9 @@ void cMainMenu::SetMenuTitle(void)
   free(title);
 }
 
-void cMainMenu::Build(char *dir)
+void cMainMenu::Build(const char *dir)
 {
-  DEBUG("Build MainMenu von %s", dir);
+  dsyslog("Build MainMenu von %s", dir);
 
   SetMenuTitle();
   if(!DVDSwitchSetup.HideImgSizeCol)
@@ -84,7 +85,7 @@ void cMainMenu::Build(char *dir)
       break;
   }
 
-  DEBUG("First Selectable ist: %i", FirstSelectable);
+  dsyslog("First Selectable ist: %i", FirstSelectable);
 
   if(FirstSelectable >= 0)
   {
@@ -98,17 +99,17 @@ void cMainMenu::Build(char *dir)
   SetHelp();
 }
 
-void cMainMenu::BuildDisp0(char *dir)
+void cMainMenu::BuildDisp0(const char *dir)
 {
-  DEBUG("Bilde Menu nach DisplayMode 0");
+  dsyslog("Bilde Menu nach DisplayMode 0");
 
   cDVDList *DVDList = new cDVDList;
   cMainMenuItem *mItem = NULL;
 
   if(DVDSwitchSetup.DisplayDVDDevice)
   {
-    DEBUG("Füge Eintrag für das DVD-Device hinzu");
-    Add(new cMainMenuItem(iDevice));
+    dsyslog("Füge Eintrag für das DVD-Device hinzu");
+    Add(new cMainMenuItem(iDevice,ImageList));
     if(!MainMenuOptions.getLastSelectItemName() && MainMenuOptions.LastSelectItemType() == iDevice)
       FirstSelectable = 0;
   }
@@ -119,11 +120,11 @@ void cMainMenu::BuildDisp0(char *dir)
                      (eFileList)DVDSwitchSetup.SortMode,
                      true))
   {
-    DEBUG("DVDList erstellt");
+    dsyslog("DVDList erstellt");
     cDVDListItem *item = DVDList->First();
     while(item)
     {
-      Add(new cMainMenuItem(iDVD, item->FileName()));
+      Add(new cMainMenuItem(iDVD, ImageList, item->FileName()));
       if(MainMenuOptions.getLastSelectItemName() &&
          !strcasecmp(item->FileName(), MainMenuOptions.getLastSelectItemName()))
       {
@@ -141,7 +142,7 @@ void cMainMenu::BuildDisp0(char *dir)
   delete(DVDList);
 }
 
-void cMainMenu::BuildDisp1(char *dir)
+void cMainMenu::BuildDisp1(const char *dir)
 {
   cImageListItem *iItem = NULL;
   cDVDList *DVDList = new cDVDList;
@@ -155,9 +156,9 @@ void cMainMenu::BuildDisp1(char *dir)
     case 0: // Image-Type
       if(DVDSwitchSetup.DisplayDVDDevice)
       {
-        DEBUG("Füge Eintrag für das DVD-Device hinzu");
-        Add(new cMainMenuItem(iCat, dir));
-        Add(new cMainMenuItem(iDevice));
+        dsyslog("Füge Eintrag für das DVD-Device hinzu");
+        Add(new cMainMenuItem(iCat, ImageList, dir));
+        Add(new cMainMenuItem(iDevice, ImageList));
         if(!MainMenuOptions.getLastSelectItemName() && MainMenuOptions.LastSelectItemType() == iDevice)
           FirstSelectable = 1;
       }
@@ -171,11 +172,11 @@ void cMainMenu::BuildDisp1(char *dir)
                            true) &&
            (DVDList->Count() || !DVDSwitchSetup.HideEmptyDirs))
         {
-          Add(new cMainMenuItem(iCat, iItem->GetSName()));
+          Add(new cMainMenuItem(iCat, ImageList, iItem->GetSName()));
           dItem = DVDList->First();
           while(dItem)
           {
-            Add(new cMainMenuItem(iDVD, dItem->FileName()));
+            Add(new cMainMenuItem(iDVD, ImageList, dItem->FileName()));
             if(MainMenuOptions.getLastSelectItemName() &&
                !strcasecmp(dItem->FileName(), MainMenuOptions.getLastSelectItemName()))
             {
@@ -197,18 +198,18 @@ void cMainMenu::BuildDisp1(char *dir)
                          false) &&
          (DVDList->Count() || !DVDSwitchSetup.HideEmptyDirs || DVDSwitchSetup.DisplayDVDDevice))
       {
-        Add(new cMainMenuItem(iCat, dir));
+        Add(new cMainMenuItem(iCat, ImageList, dir));
         if(DVDSwitchSetup.DisplayDVDDevice)
         {
-          DEBUG("Füge Eintrag für das DVD-Device hinzu");
-          Add(new cMainMenuItem(iDevice));
+          dsyslog("Füge Eintrag für das DVD-Device hinzu");
+          Add(new cMainMenuItem(iDevice, ImageList));
           if(!MainMenuOptions.getLastSelectItemName() && MainMenuOptions.LastSelectItemType() == iDevice)
             FirstSelectable = 1;
         }
         dItem = DVDList->First();
         while(dItem)
         {
-          Add(new cMainMenuItem(iDVD, dItem->FileName()));
+          Add(new cMainMenuItem(iDVD, ImageList, dItem->FileName()));
           if(MainMenuOptions.getLastSelectItemName() &&
              !strcasecmp(dItem->FileName(), MainMenuOptions.getLastSelectItemName()))
           {
@@ -219,7 +220,7 @@ void cMainMenu::BuildDisp1(char *dir)
           dItem = DVDList->Next(dItem);
         }
       }
-      DirList = new cDirList();
+      DirList = new cDirList(ImageList);
       if(DirList->Load(dir, true))
       {
         fItem = DirList->First();
@@ -233,11 +234,11 @@ void cMainMenu::BuildDisp1(char *dir)
                              false) &&
              (DVDList->Count() || !DVDSwitchSetup.HideEmptyDirs))
           {
-            Add(new cMainMenuItem(iCat, fItem->Value()));
+            Add(new cMainMenuItem(iCat, ImageList, fItem->Value()));
             dItem = DVDList->First();
             while(dItem)
             {
-              Add(new cMainMenuItem(iDVD, dItem->FileName()));
+              Add(new cMainMenuItem(iDVD, ImageList, dItem->FileName()));
               if(MainMenuOptions.getLastSelectItemName() &&
                  !strcasecmp(dItem->FileName(), MainMenuOptions.getLastSelectItemName()))
               {
@@ -256,9 +257,9 @@ void cMainMenu::BuildDisp1(char *dir)
     case 2: // FileType
       if(DVDSwitchSetup.DisplayDVDDevice)
       {
-        DEBUG("Füge Eintrag für das DVD-Device hinzu");
-        Add(new cMainMenuItem(iCat, dir));
-        Add(new cMainMenuItem(iDevice));
+        dsyslog("Füge Eintrag für das DVD-Device hinzu");
+        Add(new cMainMenuItem(iCat, ImageList, dir));
+        Add(new cMainMenuItem(iDevice, ImageList));
         if(!MainMenuOptions.getLastSelectItemName() && MainMenuOptions.LastSelectItemType() == iDevice)
           FirstSelectable = 1;
       }
@@ -269,11 +270,11 @@ void cMainMenu::BuildDisp1(char *dir)
          true) &&
          (DVDList->Count() || !DVDSwitchSetup.HideEmptyDirs))
       {
-        Add(new cMainMenuItem(iCat, (char*)tr("Image-File")));
+        Add(new cMainMenuItem(iCat, ImageList, tr("Image-File")));
         dItem = DVDList->First();
         while(dItem)
         {
-          Add(new cMainMenuItem(iDVD, dItem->FileName()));
+          Add(new cMainMenuItem(iDVD, ImageList, dItem->FileName()));
           if(MainMenuOptions.getLastSelectItemName() &&
              !strcasecmp(dItem->FileName(), MainMenuOptions.getLastSelectItemName()))
           {
@@ -291,11 +292,11 @@ void cMainMenu::BuildDisp1(char *dir)
          true) &&
          (DVDList->Count() || !DVDSwitchSetup.HideEmptyDirs))
       {
-        Add(new cMainMenuItem(iCat, (char*)tr("Image-Directory")));
+        Add(new cMainMenuItem(iCat, ImageList, tr("Image-Directory")));
         dItem = DVDList->First();
         while(dItem)
         {
-          Add(new cMainMenuItem(iDVD, dItem->FileName()));
+          Add(new cMainMenuItem(iDVD, ImageList, dItem->FileName()));
           if(MainMenuOptions.getLastSelectItemName() &&
              !strcasecmp(dItem->FileName(), MainMenuOptions.getLastSelectItemName()))
           {
@@ -311,7 +312,7 @@ void cMainMenu::BuildDisp1(char *dir)
       break;
   }
 
-  DEBUG("Ermittle FirstSelectable");
+  dsyslog("Ermittle FirstSelectable");
   mItem = (cMainMenuItem*)First();
   if(mItem && FirstSelectable < 0)
   {
@@ -325,20 +326,20 @@ void cMainMenu::BuildDisp1(char *dir)
   delete(DirList);
 }
 
-void cMainMenu::BuildDisp2(char *dir)
+void cMainMenu::BuildDisp2(const char *dir)
 {
   cMainMenuItem *mItem = NULL;
   cDVDList *DVDList = new cDVDList;
   cDVDListItem *dItem = NULL;
 
   cDirHandling *DirHand = new cDirHandling(this, &MainMenuOptions);
-  FirstSelectable = DirHand->Build(dir, !DVDSwitchSetup.HideEmptyDirs);
+  FirstSelectable = DirHand->Build(dir, !DVDSwitchSetup.HideEmptyDirs, ImageList);
   delete(DirHand);
 
   if(DVDSwitchSetup.DisplayDVDDevice && !strcasecmp(dir, MainMenuOptions.ImageDir()))
   {
-    DEBUG("Füge Eintrag für das DVD-Device hinzu");
-    Add(new cMainMenuItem(iDevice));
+    dsyslog("Füge Eintrag für das DVD-Device hinzu");
+    Add(new cMainMenuItem(iDevice, ImageList));
     if(!MainMenuOptions.getLastSelectItemName() && MainMenuOptions.LastSelectItemType() == iDevice)
     {
       mItem = (cMainMenuItem*)Last();
@@ -355,7 +356,7 @@ void cMainMenu::BuildDisp2(char *dir)
     dItem = DVDList->First();
     while(dItem)
     {
-      Add(new cMainMenuItem(iDVD, dItem->FileName()));
+      Add(new cMainMenuItem(iDVD, ImageList, dItem->FileName()));
       if(MainMenuOptions.getLastSelectItemName() &&
          !strcasecmp(dItem->FileName(), MainMenuOptions.getLastSelectItemName()))
       {
@@ -547,7 +548,7 @@ eOSState cMainMenu::ProcessKey(eKeys Key)
                   MainMenuOptions.setLastSelectItemName(buffer);
               }
               else
-                OSD_WARNMSG(tr("File exists in Directory"));
+                OsdMsg(mtWarning,tr("File exists in Directory"));
               FREENULL(buffer);
               FREENULL(buffer2);
               DELETENULL(info);
@@ -777,7 +778,7 @@ eOSState cMainMenu::SelectItem(void)
         if(!info->isExecutable() || !info->isReadable())
         {
           DELETENULL(info);
-          OSD_ERRMSG(tr("no Rights!"));
+          OsdMsg(mtError,tr("No rights to change inside this directory!"));
           return osContinue;
           break;
         }
@@ -861,7 +862,7 @@ eOSState cMainMenu::Commands(eKeys Key)
     switch(cmd)
     {
       case cmdDirManage:
-        return AddSubMenu(new cCMDDir(this));
+        return AddSubMenu(new cCMDDir(ImageList, this));
         break;
       case cmdDVDopen:
         return cCMD::Eject(false);
@@ -881,7 +882,7 @@ eOSState cMainMenu::Commands(eKeys Key)
         }
         break;
       case cmdImgMove:
-        return AddSubMenu(new cCMDMove(mItem->FileName(), this, false, true));
+        return AddSubMenu(new cCMDMove(ImageList, mItem->FileName(), this, false, true));
         break;
       case cmdImgDelete:
         if(mItem && mItem->Type() == iDVD)
@@ -902,10 +903,10 @@ eOSState cMainMenu::Commands(eKeys Key)
         }
         break;
       case cmdImgRead:
-        return AddSubMenu(new cCMDImageRead());
+        return AddSubMenu(new cCMDImageRead(ImageList));
         break;
       case cmdCommands:
-        return AddSubMenu(new cCMDMenu(mItem, this));
+        return AddSubMenu(new cCMDMenu(ImageList, mItem, this));
       default:
         break;
     }
@@ -914,7 +915,7 @@ eOSState cMainMenu::Commands(eKeys Key)
   return cOsdMenu::ProcessKey(Key);
 }
 
-char *cMainMenu::CreateOSDName(eMainMenuItem itype, char *file)
+char *cMainMenu::CreateOSDName(eMainMenuItem itype, cImageList &ImageList, const char *file)
 {
   cStringValue buffer;
   cStringValue tmpOSD;
@@ -931,16 +932,18 @@ char *cMainMenu::CreateOSDName(eMainMenuItem itype, char *file)
         buffer = file;
       else
       {
-        char *p = &file[strlen(MainMenuOptions.ImageDir())];
+        const char *p = &file[strlen(MainMenuOptions.ImageDir())];
         if(p[0] == '/')
           p++;
         cTokenizer *token = new cTokenizer(p, "/");
         for (i = 1; i <= token->Count(); i++)
         {
-          ChangeChars(token->GetToken(i), DVDSwitchSetup.ChangeCharsOSDName);
-          buffer += token->GetToken(i);
+          char * s = strdup(token->GetToken(i));
+          ChangeChars(s, DVDSwitchSetup.ChangeCharsOSDName);
+          buffer += s;
           if(i != token->Count())
             buffer += DVDSwitchSetup.SubCatCutter;
+          free(s);
         }
         DELETENULL(token);
       }
@@ -950,7 +953,7 @@ char *cMainMenu::CreateOSDName(eMainMenuItem itype, char *file)
       if(DVDSwitchSetup.SpacesBeforeAfterCat)
         tmpOSD += " ";
       if(isempty(&buffer))
-        tmpOSD += (char*)tr("without Catergory");
+        tmpOSD += tr("without category");
       else
         tmpOSD += &buffer;
       if(DVDSwitchSetup.SpacesBeforeAfterCat)
@@ -997,7 +1000,7 @@ char *cMainMenu::CreateOSDName(eMainMenuItem itype, char *file)
       break;
     case iDevice:
       tmpOSD = "--> (";
-      tmpOSD += (char*)tr("DVD-Drive");
+      tmpOSD += tr("DVD-Drive");
       tmpOSD += ") <--";
       break;
     default:
@@ -1043,7 +1046,7 @@ void cMainMenu::SetState(eMainMenuState state)
         info = new cFileInfo(MainMenuOptions.CurrentDir());
         if(!info->isWriteable())
         {
-          OSD_ERRMSG(tr("no Rights to rename"));
+          OsdMsg(mtError,tr("Missing rights to rename!"));
           SetState(mmsNone);
           DELETENULL(info);
           break;
@@ -1095,16 +1098,16 @@ cDirHandling::cDirHandling(cOsdMenu *osdobject, cDirHandlingOpt *dirobject)
   DirObject = dirobject;
 }
 
-int cDirHandling::Build(char *dir, bool emptydirs)
+int cDirHandling::Build(const char *dir, bool emptydirs, cImageList &ImageList)
 {
   int ret = -1;
   cMainMenuItem *mItem = NULL;
 
-  cDirList *DirList = new cDirList();
+  cDirList *DirList = new cDirList(ImageList);
   if(DirList->Load(dir, false))
   {
     if(DirObject->isParent(dir))
-      OsdObject->Add(new cMainMenuItem(iParent, DirObject->ParentDir()));
+      OsdObject->Add(new cMainMenuItem(iParent, ImageList, DirObject->ParentDir()));
 
     cFileListItem *fItem = DirList->First();
     while(fItem)
@@ -1112,7 +1115,7 @@ int cDirHandling::Build(char *dir, bool emptydirs)
       if(!DirList->DirIsIn(fItem, ImageList.GetDirContains()) &&
           (!DirList->DirIsEmpty(fItem) || emptydirs))
       {
-        OsdObject->Add(new cMainMenuItem(iDir, fItem->Value()));
+        OsdObject->Add(new cMainMenuItem(iDir, ImageList, fItem->Value()));
         mItem = (cMainMenuItem*)OsdObject->Last();
         if(mItem &&
            DirObject->getLastSelectItemName() &&
diff --git a/menu.h b/menu.h
index 002bad8..d3bce58 100644
--- a/menu.h
+++ b/menu.h
@@ -21,23 +21,24 @@ class cMainMenu : public cOsdMenu
     int FirstSelectable;
     eMainMenuState State;
     cCMDImage *CMDImg;
+    cImageList &ImageList;
 
     void Init(void);
     void SetMenuTitle(void);
-    void Build(char *dir);
-    void BuildDisp0(char *dir);
-    void BuildDisp1(char *dir);
-    void BuildDisp2(char *dir);
+    void Build(const char *dir);
+    void BuildDisp0(const char *dir);
+    void BuildDisp1(const char *dir);
+    void BuildDisp2(const char *dir);
     eOSState MenuMove(eKeys Key);
     eOSState SelectItem(void);
     eOSState Commands(eKeys Key);
   public:
-    cMainMenu(void);
+    cMainMenu(cImageList &ImageList);
     ~cMainMenu(void);
     void SetHelp(void);
     virtual eOSState ProcessKey(eKeys Key);
 
-    static char *CreateOSDName(eMainMenuItem itype, char *file = NULL);
+    static char *CreateOSDName(eMainMenuItem itype, cImageList &ImageList, const char *file = NULL);
     void SetState(eMainMenuState state);
     eMainMenuState GetState(void) { return State; };
 };
@@ -69,7 +70,7 @@ class cDirHandlingOpt
       free(LSDir);
       free(LSItemName);
     }
-    char *ImageDir(char *dir = NULL)
+    char *ImageDir(const char *dir = NULL)
     {
       if(dir)
       {
@@ -78,7 +79,7 @@ class cDirHandlingOpt
       }
       return IDir;
     }
-    char *CurrentDir(char *dir = NULL)
+    char *CurrentDir(const char *dir = NULL)
     {
       if(dir)
       {
@@ -87,7 +88,7 @@ class cDirHandlingOpt
       }
       return CDir;
     }
-    char *ParentDir(char *dir = NULL)
+    char *ParentDir(const char *dir = NULL)
     {
       if(dir)
       {
@@ -96,7 +97,7 @@ class cDirHandlingOpt
       }
       return PDir;
     }
-    char *LastSelDir(char *dir = NULL)
+    char *LastSelDir(const char *dir = NULL)
     {
       if(dir)
       {
@@ -105,19 +106,19 @@ class cDirHandlingOpt
       }
       return LSDir;
     }
-    bool isParent(char *dir)
+    bool isParent(const char *dir)
     {
       if(dir && PDir && strcasecmp(dir, PDir))
         return true;
       return false;
     }
-    bool isLastSel(char *dir)
+    bool isLastSel(const char *dir)
     {
       if(dir && LSDir && !strcasecmp(dir, LSDir))
         return true;
       return false;
     }
-    void setLastSelectItemName(char *filename = NULL)
+    void setLastSelectItemName(const char *filename = NULL)
     {
       FREENULL(LSItemName);
       if(filename)
@@ -140,7 +141,7 @@ class cDirHandling
   public:
     cDirHandling(cOsdMenu *osdobject, cDirHandlingOpt *dirobject);
 
-    int Build(char *dir, bool emptydirs);
+    int Build(const char *dir, bool emptydirs, cImageList &ImageList);
     void ProcessKey(cMainMenuItem *mItem);
 };
 
diff --git a/po/de_DE.po b/po/de_DE.po
new file mode 100644
index 0000000..7b4c20c
--- /dev/null
+++ b/po/de_DE.po
@@ -0,0 +1,395 @@
+# vdr-dvdswitch-plugin plugin language source file.
+# This file is distributed under the same license as the vdr-dvdswitch-plugin package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vdr-dvdswitch-plugin 0.1.4\n"
+"Report-Msgid-Bugs-To:  \n"
+"POT-Creation-Date: 2009-10-03 15:57+0200\n"
+"PO-Revision-Date: 2009-10-03 14:03+0200\n"
+"Last-Translator:\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 "Commands"
+msgstr "Befehle"
+
+msgid "Directory Management"
+msgstr "Verzeichnis Management"
+
+msgid "DVD-Tray open"
+msgstr "DVD Schublade öffnen"
+
+msgid "DVD-Tray close"
+msgstr "DVD Schublade schließen"
+
+msgid "Play"
+msgstr "Wiedergabe"
+
+msgid "Image rename"
+msgstr "Image umbenennen"
+
+msgid "Image move"
+msgstr "Image verschieben"
+
+msgid "Image delete"
+msgstr "Image löschen"
+
+msgid "Image burn"
+msgstr "Image brennen"
+
+msgid "Image to create from DVD"
+msgstr "Image von DVD erstellen"
+
+msgid "Select Directory"
+msgstr "Verzeichnis auswählen"
+
+msgid "New"
+msgstr "Neu"
+
+msgid "Select"
+msgstr "Auswählen"
+
+msgid "Rename"
+msgstr "Umbenennen"
+
+msgid "Delete"
+msgstr "Löschen"
+
+msgid "Move"
+msgstr "Verschieben"
+
+msgid "Edit Directories"
+msgstr "Verzeichnisse bearbeiten"
+
+msgid "No rights to change inside this directory!"
+msgstr "Keine Berechtigung zum Wechseln in dieses Verzeichnis!"
+
+msgid "Really delete?"
+msgstr "Wirklich löschen?"
+
+msgid "Directory not empty! However delete?"
+msgstr "Verzeichnis ist nicht leer! Dennoch löschen?"
+
+msgid "Missing rights to create directory!"
+msgstr "Keine Berechtigung zum erstellen des Verzeichnis!"
+
+msgid "New:"
+msgstr "Neu:"
+
+msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~"
+msgstr " abcdefghijklmnopqrstuvwxyzäöüß0123456789-.#~"
+
+msgid "Directory exists"
+msgstr "Verzeichnis existiert bereits"
+
+msgid "Missing rights to rename!"
+msgstr "Keine Berechtigung zum umbennen!"
+
+msgid "Rename:"
+msgstr "Umbenenen:"
+
+msgid " abcdefghijklmnopqrstuvwxyz0123456789-_.#~"
+msgstr " abcdefghijklmnopqrstuvwxyzäöüß0123456789-_.#~"
+
+msgid "Insert"
+msgstr "Einfügen"
+
+msgid "Specified Writescript not exist!"
+msgstr "Angegebenes Writescript existiert nicht!"
+
+msgid "Cannot execute Writescript!"
+msgstr "Kann Writescript nicht ausführen!"
+
+msgid "Burn Now?"
+msgstr "Jetzt brennen?"
+
+msgid "Read DVD"
+msgstr "Lies DVD"
+
+msgid "Specified Readscript not exist!"
+msgstr "Angegebenes Readscript existiert nicht!"
+
+msgid "Cannot execute Readscript!"
+msgstr "Kann Readscript nicht ausführen!"
+
+msgid "Name:"
+msgstr "Name:"
+
+msgid "Directory:"
+msgstr "Verzeichnis:"
+
+msgid "Imagetype:"
+msgstr "ImageTyp:"
+
+msgid "read in"
+msgstr "Einlesen"
+
+msgid "invalid file name for DVD-Image"
+msgstr "ungültiger Dateiname für das DVD-Image"
+
+msgid "No Imagetype selected"
+msgstr "Es wurde kein Imagetyp ausgewählt!"
+
+msgid "No Directory selected. Use Standard?"
+msgstr "Es wurde kein Verzeichnis ausgewählt. Standard benutzen?"
+
+msgid "Now Read?"
+msgstr "Jetzt einlesen?"
+
+msgid "Allowed to play DVD-Images"
+msgstr "Erlaubt das Abspielen von DVD-Abbildern"
+
+msgid "Image Directory not readable or not exist"
+msgstr "Image Verzeichnis ist nicht lesbar oder existiert nicht"
+
+msgid "DVD-Plugin not found! Function deactivated!"
+msgstr "DVD Plugin nicht gefunden! Funktion deaktiviert!"
+
+msgid "Directory with 'VIDEO_TS' Folder"
+msgstr "Verzeichnis mit 'VIDEO_TS' Ordner"
+
+msgid "Directory"
+msgstr "Verzeichnis"
+
+msgid "File with '.iso' Extension"
+msgstr "Datei mit '.iso' Extension"
+
+msgid "Iso-Image"
+msgstr "Iso-Image"
+
+msgid "Image-File"
+msgstr "Image-Datei"
+
+msgid "Image-Directory"
+msgstr "Image-Verzeichnis"
+
+msgid "to change"
+msgstr "Wechseln"
+
+msgid "File exists in Directory"
+msgstr "Datei existiert bereits im Verzeichnis"
+
+msgid "without category"
+msgstr "ohne Kategorie"
+
+msgid "DVD-Drive"
+msgstr "DVD-Laufwerk"
+
+msgid "All Images"
+msgstr "Alle Images"
+
+msgid "All with Cat."
+msgstr "Alle mit Kat."
+
+msgid "Directories"
+msgstr "Verzeichnisse"
+
+msgid "Image-Type"
+msgstr "Image-Typ"
+
+msgid "File-Type"
+msgstr "Datei-Typ"
+
+msgid "none"
+msgstr "Keine"
+
+msgid "ascending"
+msgstr "Aufsteigend"
+
+msgid "descending"
+msgstr "Absteigend"
+
+msgid "none Function"
+msgstr "keine Funktion"
+
+msgid "Dir. Management"
+msgstr "Verz. Management"
+
+msgid "Tray open"
+msgstr "DVD öffnen"
+
+msgid "Tray close"
+msgstr "DVD schließen"
+
+msgid "Image create"
+msgstr "Image erstellen"
+
+msgid "Dir.Mgmt."
+msgstr "Verz.Mgmt."
+
+msgid "Open"
+msgstr "Öffnen"
+
+msgid "Close"
+msgstr "Schließen"
+
+msgid "Burn"
+msgstr "Brennen"
+
+msgid "Create"
+msgstr "Erstellen"
+
+msgid "Generic Settings"
+msgstr "Allgemeine Einstellungen"
+
+msgid "\tHide Mainmenu Entry"
+msgstr "\tVerstecke Hauptmenüeintrag"
+
+msgid "\t  Name"
+msgstr "\t  Name"
+
+msgid "\tImage Dir."
+msgstr "\tImage Verz."
+
+msgid "\tImagetypes"
+msgstr "\tImagetypen"
+
+msgid "\tView free DiskSpace"
+msgstr "\tZeige freien Plattenplatz"
+
+msgid "Display Settings"
+msgstr "Anzeige Einstellungen"
+
+msgid "\tDisplay Mode"
+msgstr "\tAnzeige Modus"
+
+msgid "\t  Category Type"
+msgstr "\t  Art der Kategorie"
+
+msgid "\t  invisible empty Dir's/Cat."
+msgstr "\t  Blende leere Verz./Kat. aus"
+
+msgid "\tAlphabetic Sort"
+msgstr "\talphabetische Sortierung"
+
+msgid "\tvisible DVD-Drive"
+msgstr "\tDVD-LW einblenden"
+
+msgid "Special Display Settings"
+msgstr "Detailierte Anzeige Einstellungen"
+
+msgid "\tvisible Image-Type Col"
+msgstr "\tZeige Spalte Image-Typ"
+
+msgid "\t  Width for Image-Col"
+msgstr "\t  Breite für Image-Spalte"
+
+msgid "\tvisible Image-Size Col"
+msgstr "\tZeige Spalte Image Größe"
+
+msgid "\tchange Character"
+msgstr "\tZeichen ändern"
+
+msgid "\tchar for Cat.Line"
+msgstr "\tZeichen für Kat.Linie"
+
+msgid "\t  Count before Cat.Name"
+msgstr "\t  Anzahl vorm Kat.Namen"
+
+msgid "\tSpaces before/after Cat.Name"
+msgstr "\tLeerzeichen vor/nach Kat.Name"
+
+msgid "\tCutText for Subcat"
+msgstr "\tTrenntext für Subkat."
+
+msgid "Navigation"
+msgstr "Navigation"
+
+msgid "\tCat.Jump by Left/Right"
+msgstr "\tKat.sprung bei Links/Rechts"
+
+msgid "Key allocation"
+msgstr "Tastenbelegung"
+
+msgid "\tKey 1"
+msgstr "\tTaste 1"
+
+msgid "\tKey 2"
+msgstr "\tTaste 2"
+
+msgid "\tKey 3"
+msgstr "\tTaste 3"
+
+msgid "\tKey 4"
+msgstr "\tTaste 4"
+
+msgid "\tKey 5"
+msgstr "\tTaste 5"
+
+msgid "\tKey 6"
+msgstr "\tTaste 6"
+
+msgid "\tKey 7"
+msgstr "\tTaste 7"
+
+msgid "\tKey 8"
+msgstr "\tTaste 8"
+
+msgid "\tKey 9"
+msgstr "\tTaste 9"
+
+msgid "\tKey 0"
+msgstr "\tTaste 0"
+
+msgid "\tKey Red"
+msgstr "\tTaste Rot"
+
+msgid "\tKey Green"
+msgstr "\tTaste Grün"
+
+msgid "\tKey Yellow"
+msgstr "\tTaste Gelb"
+
+msgid "\tKey Blue"
+msgstr "\tTaste Blau"
+
+msgid "\tKey OK"
+msgstr "\tTaste OK"
+
+msgid "to adjust"
+msgstr "Einstellen"
+
+msgid "Imagetypes"
+msgstr "Imagetypen"
+
+msgid "Edit"
+msgstr ""
+
+msgid "really delete Entry?"
+msgstr "Eintrag wirklich löschen?"
+
+msgid "File"
+msgstr "Datei"
+
+msgid "Description:"
+msgstr "Beschreibung:"
+
+msgid "Type-Title:"
+msgstr "Typ-Bezeichnung:"
+
+msgid "Image Type"
+msgstr "Image Typ"
+
+msgid "Directory contains:"
+msgstr "Verzeichnis enthält:"
+
+msgid "File Extension:"
+msgstr "Datei-Erweiterung:"
+
+msgid "Hide Extension"
+msgstr "Erweiterung ausblenden"
+
+msgid "'Description' must not empty!"
+msgstr "'Beschreibung' darf nicht leer sein!"
+
+msgid "'Type-Title' must not empty!"
+msgstr "'Typ Bezeichnung' darf nicht leer sein!"
+
+msgid "'Directory contains' must not empty!"
+msgstr "'Verzeichnis enthält' darf nicht leer sein!"
+
+msgid "'File Extension' must not empty!"
+msgstr "'Datei Erweiterung' darf nicht leer sein!"
diff --git a/setup-itypes.c b/setup-itypes.c
index e66da77..f7638b1 100644
--- a/setup-itypes.c
+++ b/setup-itypes.c
@@ -1,19 +1,17 @@
 #include <vdr/plugin.h>
 #include "setup-itypes.h"
-#include "i18n.h"
+#include "setup.h"
 
-cMenuSetupDSITypes::cMenuSetupDSITypes(bool select, int* retindex, char *buffer)
+cMenuSetupDSITypes::cMenuSetupDSITypes(cImageList &imagelist, bool select, int* retindex, char *buffer)
   : cOsdMenu(tr("Imagetypes"))
+  , ImageList(imagelist)
 {
-  DEBUG("Ermitlle ersten Setup-Eintrag");
+  dsyslog("Ermitlle ersten Setup-Eintrag");
   cSetupLine *item = Setup.First();
   Select = select;
   RetIndex = retindex;
   Buffer = buffer;
-
-  if(item)
-    DEBUG("OK");
-  
+ 
   while(item)
   {
     if(item->Plugin() &&
@@ -74,10 +72,10 @@ eOSState cMenuSetupDSITypes::ProcessKey(eKeys Key)
     switch(Key)
     {
       case kRed:
-        state = AddSubMenu(new cMenuSetupDSITypesItem(Current()));
+        state = AddSubMenu(new cMenuSetupDSITypesItem(ImageList, Current()));
         break;
       case kGreen:
-        state = AddSubMenu(new cMenuSetupDSITypesItem(ImageList.Count()));
+        state = AddSubMenu(new cMenuSetupDSITypesItem(ImageList, ImageList.Count()));
         break;
       case kYellow:
         if(Interface->Confirm(tr("really delete Entry?")))
@@ -115,17 +113,17 @@ eOSState cMenuSetupDSITypes::ProcessKey(eKeys Key)
         {
           if(SetupLine)
           {
-            DEBUG("Lösche SetupLine");
+            dsyslog("Lösche SetupLine");
             Setup.Del(SetupLine);
           }
-          DEBUG("Hole SetupString");
+          dsyslog("Hole SetupString");
           if(ImageList.GetSetupString())
             SetupLine = new cSetupLine("ImageTypes", ImageList.GetSetupString(), "dvdswitch");
           else
             SetupLine = new cSetupLine("ImageTypes", "", "dvdswitch");
-          DEBUG("neue SetupLine erstellt");
+          dsyslog("neue SetupLine erstellt");
           Setup.Add(SetupLine);
-          DEBUG("neue SetupLine hinzugefügt");
+          dsyslog("neue SetupLine hinzugefügt");
           return osBack;
         }
         break;
@@ -139,17 +137,18 @@ eOSState cMenuSetupDSITypes::ProcessKey(eKeys Key)
 
 // --- cMenuSetupDSITypesItem -----------------------------------
 
-cMenuSetupDSITypesItem::cMenuSetupDSITypesItem(int itemindex)
+cMenuSetupDSITypesItem::cMenuSetupDSITypesItem(cImageList &imagelist, int itemindex)
   : cOsdMenu(tr("New"), 22)
+  , ImageList(imagelist)
 {
   if(itemindex < ImageList.Count())
   {
     SetTitle(tr("Edit"));
     Item = ImageList.Get(itemindex);
-    strn0cpy(LongName, Item->GetLName(), 50);
-    strn0cpy(ShortName, Item->GetSName(), 20);
+    strn0cpy(LongName, Item->GetLName(), memberof(LongName));
+    strn0cpy(ShortName, Item->GetSName(), memberof(ShortName));
     FileType = (int)Item->GetFType() - 1;
-    strn0cpy(Extension, Item->GetValue(), 20);
+    strn0cpy(Extension, Item->GetValue(), memberof(Extension));
     HideExtension = Item->IsHide();
   } else
   {
@@ -212,20 +211,20 @@ eOSState cMenuSetupDSITypesItem::ProcessKey(eKeys Key)
       case kOk:
         if(isempty(LongName))
         {
-          OSD_WARNMSG(tr("'Description' must not empty!"));
+          OsdMsg(mtWarning,tr("'Description' must not empty!"));
           return osContinue;
         }
         if(isempty(ShortName))
         {
-          OSD_WARNMSG(tr("'Type-Title' must not empty!"));
+          OsdMsg(mtWarning,tr("'Type-Title' must not empty!"));
           return osContinue;
         }
         if(isempty(Extension))
         {
           if(!FileType)
-            OSD_WARNMSG(tr("'Directory contains' must not empty!"));
+            OsdMsg(mtWarning,tr("'Directory contains' must not empty!"));
           else
-            OSD_WARNMSG(tr("'File Extension' must not empty!"));
+            OsdMsg(mtWarning,tr("'File Extension' must not empty!"));
           return osContinue;
         }
         if(!Item)
diff --git a/setup-itypes.h b/setup-itypes.h
index ff646e4..e0c9f1d 100644
--- a/setup-itypes.h
+++ b/setup-itypes.h
@@ -8,13 +8,14 @@ class cMenuSetupDSITypes : public cOsdMenu
 {
   private:
     cSetupLine *SetupLine;
+    cImageList &ImageList;
     bool Select;
     int *RetIndex;
     char *Buffer;
  
     void Set(void);
   public:
-    cMenuSetupDSITypes(bool select = false, int* retindex = NULL, char *buffer = NULL);
+    cMenuSetupDSITypes(cImageList &ImageList, bool select = false, int* retindex = NULL, char *buffer = NULL);
     void SetHelp(void);
   protected:
     virtual eOSState ProcessKey(eKeys Key);
@@ -30,10 +31,11 @@ class cMenuSetupDSITypesItem : public cOsdMenu
     const char *FileTypes[2];
     char Extension[20];
     int HideExtension;
+    cImageList &ImageList; 
 
     void Set(void);
   public:
-    cMenuSetupDSITypesItem(int itemindex);
+    cMenuSetupDSITypesItem(cImageList &ImageList, int itemindex);
     virtual eOSState ProcessKey(eKeys Key);
 };
 
diff --git a/setup.c b/setup.c
index 15f5928..1ff4bf5 100644
--- a/setup.c
+++ b/setup.c
@@ -1,6 +1,6 @@
+#include "imagelist.h"
 #include "setup.h"
 #include "menu.h"
-#include "i18n.h"
 #include "dvdplugin.h"
 #include "setup-itypes.h"
 
@@ -11,9 +11,9 @@ cDVDSwitchSetup DVDSwitchSetup;
 cDVDSwitchSetup::cDVDSwitchSetup(void)
 {
   HideMenuEntry = 0;
-  strcpy(MenuName, "DVDSwitch");
+  strncpy(MenuName, "DVDSwitch", memberof(MenuName));
   CustomMenuName = false;
-  strcpy(ImageDir, "/video/dvd");
+  strncpy(ImageDir, "/video/dvd", memberof(ImageDir));
   ImageDirPerParam = false;
   ViewFreeDiskSpace = 1;
 
@@ -30,8 +30,8 @@ cDVDSwitchSetup::cDVDSwitchSetup(void)
   CatLineChar = CatLineChars[0];
   CharCountBeforeCat = 3;
   SpacesBeforeAfterCat = 1;
-  strcpy(SubCatCutter, ">");
-  strcpy(ChangeCharsOSDName, "_ +&");
+  strncpy(SubCatCutter, ">",memberof(SubCatCutter));
+  strncpy(ChangeCharsOSDName, "_ +&",memberof(ChangeCharsOSDName));
 
   JumpCatByKey = 0;
 
@@ -52,8 +52,8 @@ cDVDSwitchSetup::cDVDSwitchSetup(void)
   kOk = 4;
 
   DVDPluginExist = false;
-  strcpy(DVDReadScript, "/usr/local/bin/dvdswitch_readdvd.sh");
-  strcpy(DVDWriteScript, "/usr/local/bin/dvdswitch_writedvd.sh");
+  strncpy(DVDReadScript, "/usr/local/bin/dvdswitch_readdvd.sh",memberof(DVDReadScript));
+  strncpy(DVDWriteScript, "/usr/local/bin/dvdswitch_writedvd.sh",memberof(DVDWriteScript));
 }
 
 cDVDSwitchSetup::~ cDVDSwitchSetup(void)
@@ -63,7 +63,7 @@ cDVDSwitchSetup::~ cDVDSwitchSetup(void)
 void cDVDSwitchSetup::Init(void)
 {
   if (!CustomMenuName)
-    strcpy(MenuName, tr(MenuName));
+    strncpy(MenuName, tr(MenuName),memberof(MenuName));
 
   MaxDModes = 3;
   DModes[0] = tr("All Images");
@@ -104,11 +104,9 @@ void cDVDSwitchSetup::Init(void)
   CommandsShortName[8] = tr("Burn");
   CommandsShortName[9] = tr("Create");
   CommandsShortName[10] = tr("Commands");
-
-  Debug();
 }
 
-bool cDVDSwitchSetup::SetupParse(const char *Name, const char *Value)
+bool cDVDSwitchSetup::SetupParse(const char *Name, const char *Value, cImageList &ImageList)
 {
   if (!strcasecmp(Name, "HideMenuEntry")) HideMenuEntry = atoi(Value);
   if (!strcasecmp(Name, "MenuName"))
@@ -116,8 +114,8 @@ bool cDVDSwitchSetup::SetupParse(const char *Name, const char *Value)
     strn0cpy(MenuName, Value, 50);
     CustomMenuName = true;
   }
-  if (!strcasecmp(Name, "ImageDir") && !ImageDirPerParam) strn0cpy(ImageDir, Value, MaxFileName);
-  if (!strcasecmp(Name, "ImageTypes")) ImageList.AddSetup((char*)Value);
+  if (!strcasecmp(Name, "ImageDir") && !ImageDirPerParam) strn0cpy(ImageDir, Value, memberof(ImageDir));
+  if (!strcasecmp(Name, "ImageTypes")) ImageList.AddSetup(Value);
   if (!strcasecmp(Name, "ViewFreeDiskSpace")) ViewFreeDiskSpace = atoi(Value);
 
   if (!strcasecmp(Name, "DisplayMode")) DisplayMode = atoi(Value);
@@ -139,8 +137,8 @@ bool cDVDSwitchSetup::SetupParse(const char *Name, const char *Value)
   }
   if (!strcasecmp(Name, "CharCountBeforeCat")) CharCountBeforeCat = atoi(Value);
   if (!strcasecmp(Name, "SpacesBeforeAfterCat")) SpacesBeforeAfterCat = atoi(Value);
-  if (!strcasecmp(Name, "SubCatCutter")) strn0cpy(SubCatCutter, Value, 7);
-  if (!strcasecmp(Name, "ChangeCharsOSDName")) strn0cpy(ChangeCharsOSDName, Value, 20);
+  if (!strcasecmp(Name, "SubCatCutter")) strn0cpy(SubCatCutter, Value, memberof(SubCatCutter));
+  if (!strcasecmp(Name, "ChangeCharsOSDName")) strn0cpy(ChangeCharsOSDName, Value, memberof(ChangeCharsOSDName));
 
   if (!strcasecmp(Name, "JumpCatByKey")) JumpCatByKey = atoi(Value);
 
@@ -163,58 +161,10 @@ bool cDVDSwitchSetup::SetupParse(const char *Name, const char *Value)
   return true;
 }
 
-void cDVDSwitchSetup::Debug(void)
-{
-  DEBUG("SetupParameter:");
-  DEBUG("  HideMenuEntry: %i", HideMenuEntry);
-  DEBUG("  MenuName: %s", MenuName);
-  DEBUG("  ImageDir: %s", ImageDir);
-  DEBUG("  ImageDirPerParam: %s", ImageDirPerParam ? "TRUE" : "FALSE");
-  DEBUG("  ViewFreeDiskSpace: %s", ViewFreeDiskSpace ? "TRUE" : "FALSE");
-
-  DEBUG("  DisplayMode: %i", DisplayMode);
-  DEBUG("  CategorieType: %i", CategorieType);
-  DEBUG("  HideEmptyDirs: %i", HideEmptyDirs);
-  DEBUG("  SortMode: %i", SortMode);
-  DEBUG("  DisplayDVDDevice: %s", DisplayDVDDevice ? "TRUE" : "FALSE");
-
-  //DEBUG("  ISOFirst: %i", ISOFirst);
-  DEBUG("  HideTypeCol: %i", HideTypeCol);
-  DEBUG("  CountTypCol: %i", CountTypCol);
-  DEBUG("  HideImgSizeCol: %i", HideImgSizeCol);
-  DEBUG("  CatLineChar, %i", CatLineChar);
-  DEBUG("  CharCountBeforeCat: %i", CharCountBeforeCat);
-  DEBUG("  SpacesBeforeAfterCat: %i", SpacesBeforeAfterCat);
-  DEBUG("  SubCatCutter: %s", SubCatCutter);
-  DEBUG("  ChangeCharsOSDName: %s", ChangeCharsOSDName);
-
-  DEBUG("  JumpCatByKey: %i", JumpCatByKey);
-
-  DEBUG("  DVDLink: %s", DVDLink);
-  DEBUG("  DVDLinkOrg: %s", DVDLinkOrg);
-  DEBUG("  DVDReadScript: %s", DVDReadScript);
-  DEBUG("  DVDWriteScript: %s", DVDWriteScript);
-
-  DEBUG("  k1: %i", k1);
-  DEBUG("  k2: %i", k2);
-  DEBUG("  k3: %i", k3);
-  DEBUG("  k4: %i", k4);
-  DEBUG("  k5: %i", k5);
-  DEBUG("  k6: %i", k6);
-  DEBUG("  k7: %i", k7);
-  DEBUG("  k8: %i", k8);
-  DEBUG("  k9: %i", k9);
-  DEBUG("  k0: %i", k0);
-  DEBUG("  kRed: %i", kRed);
-  DEBUG("  kGreen: %i", kGreen);
-  DEBUG("  kYellow: %i", kYellow);
-  DEBUG("  kBlue: %i", kBlue);
-  DEBUG("  kOk: %i", kOk);
-}
-
 // --- cMenuSetupDVDSwitch -------------------------------------------
 
-cMenuSetupDVDSwitch::cMenuSetupDVDSwitch(void)
+cMenuSetupDVDSwitch::cMenuSetupDVDSwitch(cImageList &imagelist)
+    : ImageList(imagelist)
 {
   data = DVDSwitchSetup;
 
@@ -435,7 +385,7 @@ eOSState cMenuSetupDVDSwitch::ProcessKey(eKeys Key)
         break;
       case kBlue:
         if(strstr(ItemText, tr("\tImagetypes")) == ItemText)
-          return AddSubMenu(new cMenuSetupDSITypes());
+          return AddSubMenu(new cMenuSetupDSITypes(ImageList));
         break;
       default:
         state = cMenuSetupPage::ProcessKey(Key);
@@ -450,9 +400,8 @@ eOSState cMenuSetupDVDSwitch::ProcessKey(eKeys Key)
 
 void cMenuSetupDVDSwitch::Store(void)
 {
-  DEBUG("STORE Setup");
+  dsyslog("STORE Setup");
 
-  DEBUG("SWITCH data");
   DVDSwitchSetup = data;
 
   SetupStore("HideMenuEntry",           DVDSwitchSetup.HideMenuEntry);
@@ -493,8 +442,6 @@ void cMenuSetupDVDSwitch::Store(void)
   SetupStore("kYellow",                 DVDSwitchSetup.kYellow);
   SetupStore("kBlue",                   DVDSwitchSetup.kBlue);
   SetupStore("kOk",                     DVDSwitchSetup.kOk);
-
-  DVDSwitchSetup.Debug();
 }
 
 // --- cMenuEditCatItem ------------------------------------------------------
@@ -503,11 +450,11 @@ cMenuEditCatItem::cMenuEditCatItem(const char *name, bool view)
 {
   Name = (char*) malloc(120);
   if(view)
-    strcpy(Name, "-\t");
+    strncpy(Name, "-\t", 119);
   else
-    strcpy(Name, "+\t");
-  strcat(Name, name);
-  //strcat(Name, " ");
+    strncpy(Name, "+\t", 119);
+  strncat(Name, name, 119);
+  //strncat(Name, " ", memberof(Name));
   //StrRepeat("_", (119 - strlen(Name)), Name);
   SetText(Name);
 }
diff --git a/setup.h b/setup.h
index d089a08..e0e6063 100644
--- a/setup.h
+++ b/setup.h
@@ -3,6 +3,8 @@
 
 #include <vdr/menuitems.h>
 
+#define memberof(x) (sizeof(x)/sizeof(*x))
+
 class cDVDSwitchSetup
 {
   public:
@@ -66,16 +68,15 @@ class cDVDSwitchSetup
     cDVDSwitchSetup(void);
     ~cDVDSwitchSetup(void);
     void Init(void);
-    bool SetupParse(const char *Name, const char *Value);
-    void Debug(void);
+    bool SetupParse(const char *Name, const char *Value, cImageList &ImageList);
 
-    void SetConfDir(char *value)
+    void SetConfDir(const char *value)
     {
-      strcpy(ConfigDirectory, value);
-      strcpy(DVDLink, ConfigDirectory);
-      strcat(DVDLink, "/dvdlink");
+      strncpy(ConfigDirectory, value, memberof(ConfigDirectory));
+      strncpy(DVDLink, ConfigDirectory, memberof(DVDLink));
+      strncat(DVDLink, "/dvdlink", memberof(DVDLink));
     }
-    void SetDVDDevice(char *value) { strcpy(DVDLinkOrg, value); }
+    void SetDVDDevice(const char *value) { strncpy(DVDLinkOrg, value, memberof(DVDLinkOrg)); }
 };
 
 class cMenuSetupDVDSwitch : public cMenuSetupPage
@@ -92,12 +93,13 @@ class cMenuSetupDVDSwitch : public cMenuSetupPage
     int ViewNavPos;
     bool ViewKey;
     int ViewKeyPos;
+    cImageList &ImageList;
   protected:
     void Set(void);
     virtual void Store(void);
     virtual eOSState ProcessKey(eKeys Key);
   public:
-    cMenuSetupDVDSwitch(void);
+    cMenuSetupDVDSwitch(cImageList &ImageList);
 };
 
 class cMenuEditCatItem : public cOsdItem
diff --git a/tools.c b/tools.c
index 35ca8e2..06cfd34 100644
--- a/tools.c
+++ b/tools.c
@@ -1,8 +1,9 @@
-#include "tools.h"
+
 #include "imagelist.h"
+#include "tools.h"
 #include "setup.h"
 
-cDirList::cDirList(void)
+cDirList::cDirList(cImageList &ImageList)
 {
   char *buffer = NULL;
 
diff --git a/tools.h b/tools.h
index d81eb02..443f74b 100644
--- a/tools.h
+++ b/tools.h
@@ -6,7 +6,7 @@
 class cDirList : public cFileList
 {
   public:
-    cDirList(void);
+    cDirList(cImageList &ImageList);
 };
 
 class cFileDelThread : public cThread
@@ -15,7 +15,7 @@ class cFileDelThread : public cThread
     char *File;
     bool Ok;
 
-    bool RightCheck(char *value)
+    bool RightCheck(const char *value)
     {
       bool ret = false;
       if(value)
@@ -34,13 +34,13 @@ class cFileDelThread : public cThread
       delete(this);
     };
   public:
-    cFileDelThread(char *file)
+    cFileDelThread(const char *file)
     {
       File = NULL;
       Ok = false;
       
       if(!RightCheck(file))
-        OSD_ERRMSG(tr("no Rights to delete"));
+        OsdMsg(mtError,tr("no Rights to delete"));
       else
       {
         Ok = true;
@@ -63,7 +63,7 @@ class cFileMoveThread : public cThread
     char *Dest;
     bool Ok;
 
-    bool RightCheck(char *value)
+    bool RightCheck(const char *value)
     {
       bool ret = false;
       if(value)
@@ -87,7 +87,7 @@ class cFileMoveThread : public cThread
       delete(this);
     };
   public:
-    cFileMoveThread(char *file, char *dest)
+    cFileMoveThread(const char *file, char *dest)
     {
       FileName = NULL;
       File = NULL;
@@ -95,7 +95,7 @@ class cFileMoveThread : public cThread
       Ok = false;
 
       if(!RightCheck(file) || !RightCheck(dest))
-        OSD_ERRMSG(tr("no Rights to move"));
+        OsdMsg(mtError,tr("no Rights to move"));
       else
       {
         Ok = true;