Merge commit 'origin/bug_578_translateable_meta_descriptions'
authoracid-burn <acid-burn@opendreambox.org>
Tue, 5 Oct 2010 11:00:54 +0000 (13:00 +0200)
committeracid-burn <acid-burn@opendreambox.org>
Tue, 5 Oct 2010 11:00:54 +0000 (13:00 +0200)
Conflicts:
lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml

37 files changed:
Makefile.am
configure.ac
lib/python/Components/DreamInfoHandler.py
lib/python/Plugins/Extensions/CutListEditor/meta/plugin_cutlisteditor.xml
lib/python/Plugins/Extensions/DVDBurn/meta/plugin_dvdburn.xml
lib/python/Plugins/Extensions/DVDPlayer/meta/plugin_dvdplayer.xml
lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml
lib/python/Plugins/Extensions/MediaPlayer/meta/plugin_mediaplayer.xml
lib/python/Plugins/Extensions/MediaScanner/meta/plugin_mediascanner.xml
lib/python/Plugins/Extensions/PicturePlayer/meta/plugin_pictureplayer.xml
lib/python/Plugins/Extensions/SocketMMI/meta/plugin_socketmmi.xml [changed mode: 0644->0755]
lib/python/Plugins/Extensions/TuxboxPlugins/meta/plugin_tuxboxplugins.xml [changed mode: 0644->0755]
lib/python/Plugins/SystemPlugins/CleanupWizard/meta/plugin_cleanupwizard.xml
lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/meta/plugin_commoninterfaceassignment.xml
lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/meta/plugin_crashlogautosubmit.xml
lib/python/Plugins/SystemPlugins/DefaultServicesScanner/meta/plugin_defaultservicesscanner.xml
lib/python/Plugins/SystemPlugins/DiseqcTester/meta/plugin_diseqctester.xml
lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/plugin_frontprocessorupgrade.xml [changed mode: 0644->0755]
lib/python/Plugins/SystemPlugins/Hotplug/meta/plugin_hotplug.xml [changed mode: 0644->0755]
lib/python/Plugins/SystemPlugins/NFIFlash/meta/plugin_nfiflash.xml
lib/python/Plugins/SystemPlugins/NetworkWizard/meta/plugin_networkwizard.xml
lib/python/Plugins/SystemPlugins/PositionerSetup/meta/plugin_positionersetup.xml
lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/meta/plugin_satelliteequipmentcontrol.xml
lib/python/Plugins/SystemPlugins/Satfinder/meta/plugin_satfinder.xml
lib/python/Plugins/SystemPlugins/SkinSelector/meta/plugin_skinselector.xml
lib/python/Plugins/SystemPlugins/SoftwareManager/SoftwareTools.py
lib/python/Plugins/SystemPlugins/SoftwareManager/meta/plugin_softwaremanager.xml
lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
lib/python/Plugins/SystemPlugins/TempFanControl/LICENSE [new file with mode: 0755]
lib/python/Plugins/SystemPlugins/TempFanControl/Makefile.am [changed mode: 0644->0755]
lib/python/Plugins/SystemPlugins/TempFanControl/meta/Makefile.am [new file with mode: 0755]
lib/python/Plugins/SystemPlugins/TempFanControl/meta/plugin_tempfancontrol.xml [new file with mode: 0755]
lib/python/Plugins/SystemPlugins/VideoEnhancement/meta/plugin_videoenhancement.xml
lib/python/Plugins/SystemPlugins/VideoTune/meta/plugin_videotune.xml
lib/python/Plugins/SystemPlugins/Videomode/meta/plugin_videomode.xml
lib/python/Plugins/SystemPlugins/WirelessLan/meta/plugin_wirelesslan.xml
tools/genmetaindex.py

index c517d9c..bc1770b 100755 (executable)
@@ -7,12 +7,8 @@ install_PYTHON = \
        keyids.py keymapparser.py mytest.py skin.py timer.py tools.py GlobalActions.py \
        e2reactor.py
 
-LANGS := $(shell cat $(srcdir)/po/LINGUAS)
-
 install-exec-hook:
-       for lang in $(LANGS); do \
-               $(PYTHON) $(srcdir)/tools/genmetaindex.py $$lang $(DESTDIR)$(datadir)/meta/plugin_*.xml > $(DESTDIR)$(datadir)/meta/index-enigma2_$$lang.xml; \
-       done
+               $(PYTHON) $(srcdir)/tools/genmetaindex.py $(DESTDIR)$(datadir)/meta/plugin_*.xml > $(DESTDIR)$(datadir)/meta/index-enigma2.xml
 
 uninstall-hook:
-       $(RM) $(DESTDIR)$(datadir)/meta/index-enigma2_*.xml
+       $(RM) $(DESTDIR)$(datadir)/meta/index-enigma2.xml
index d1b1d27..9a61622 100755 (executable)
@@ -158,6 +158,7 @@ lib/python/Plugins/SystemPlugins/Hotplug/Makefile
 lib/python/Plugins/SystemPlugins/Hotplug/meta/Makefile
 lib/python/Plugins/SystemPlugins/Makefile
 lib/python/Plugins/SystemPlugins/TempFanControl/Makefile
+lib/python/Plugins/SystemPlugins/TempFanControl/meta/Makefile
 lib/python/Plugins/SystemPlugins/NetworkWizard/Makefile
 lib/python/Plugins/SystemPlugins/NetworkWizard/meta/Makefile
 lib/python/Plugins/SystemPlugins/NFIFlash/Makefile
index 85e2b53..03d5215 100755 (executable)
@@ -16,7 +16,7 @@ class InfoHandlerParseError(Exception):
                return repr(self.value)
 
 class InfoHandler(xml.sax.ContentHandler):
-       def __init__(self, prerequisiteMet, directory, language = None):
+       def __init__(self, prerequisiteMet, directory):
                self.attributes = {}
                self.directory = directory
                self.list = []
@@ -26,9 +26,6 @@ class InfoHandler(xml.sax.ContentHandler):
                self.validFileTypes = ["skin", "config", "services", "favourites", "package"]
                self.prerequisitesMet = prerequisiteMet
                self.data = ""
-               self.language = language
-               self.translatedPackageInfos = {}
-               self.foundTranslation = None
 
        def printError(self, error):
                print "Error in defaults xml files:", error
@@ -52,15 +49,6 @@ class InfoHandler(xml.sax.ContentHandler):
                if name == "info":
                        self.foundTranslation = None
                        self.data = ""
-                       if not attrs.has_key("language"):
-                                       print "info tag with no language attribute"
-                       else:
-                               if attrs["language"] == 'en': # read default translations
-                                       self.foundTranslation = False
-                                       self.data = ""
-                               elif attrs["language"] == self.language:
-                                       self.foundTranslation = True
-                                       self.data = ""
 
                if name == "files":
                        if attrs.has_key("type"):
@@ -91,20 +79,17 @@ class InfoHandler(xml.sax.ContentHandler):
                        if attrs.has_key("details"):
                                self.attributes["details"] = str(attrs["details"])
                        if attrs.has_key("name"):
-                               self.attributes["name"] = str(attrs["name"].encode("utf-8"))
+                               self.attributes["name"] = str(attrs["name"])
                        if attrs.has_key("packagename"):
-                               self.attributes["packagename"] = str(attrs["packagename"].encode("utf-8"))
+                               self.attributes["packagename"] = str(attrs["packagename"])
                        if attrs.has_key("packagetype"):
-                               self.attributes["packagetype"] = str(attrs["packagetype"].encode("utf-8"))
+                               self.attributes["packagetype"] = str(attrs["packagetype"])
                        if attrs.has_key("shortdescription"):
-                               self.attributes["shortdescription"] = str(attrs["shortdescription"].encode("utf-8"))
+                               self.attributes["shortdescription"] = str(attrs["shortdescription"])
 
                if name == "screenshot":
                        if attrs.has_key("src"):
-                               if self.foundTranslation is False:
-                                       self.attributes["screenshot"] = str(attrs["src"])
-                               elif self.foundTranslation is True:
-                                       self.translatedPackageInfos["screenshot"] = str(attrs["src"])
+                               self.attributes["screenshot"] = str(attrs["src"])
 
        def endElement(self, name):
                #print "endElement", name
@@ -124,7 +109,7 @@ class InfoHandler(xml.sax.ContentHandler):
                                self.attributes[self.filetype].append({ "name": str(self.fileattrs["name"]), "directory": directory })
 
                if name in ( "default", "package" ):
-                       self.list.append({"attributes": self.attributes, 'prerequisites': self.globalprerequisites ,"translation": self.translatedPackageInfos})
+                       self.list.append({"attributes": self.attributes, 'prerequisites': self.globalprerequisites})
                        self.attributes = {}
                        self.globalprerequisites = {}
 
@@ -133,30 +118,13 @@ class InfoHandler(xml.sax.ContentHandler):
                        self.attributes["author"] = str(data)
                if self.elements[-1] == "name":
                        self.attributes["name"] = str(data)
-               if self.foundTranslation is False:
-                       if self.elements[-1] == "author":
-                               self.attributes["author"] = str(data)
-                       if self.elements[-1] == "name":
-                               self.attributes["name"] = str(data)
-                       if self.elements[-1] == "packagename":
-                               self.attributes["packagename"] = str(data.encode("utf-8"))
-                       if self.elements[-1] == "shortdescription":
-                               self.attributes["shortdescription"] = str(data.encode("utf-8"))
-                       if self.elements[-1] == "description":
-                               self.data += data.strip()
-                               self.attributes["description"] = str(self.data.encode("utf-8"))
-               elif self.foundTranslation is True:
-                       if self.elements[-1] == "author":
-                               self.translatedPackageInfos["author"] = str(data)
-                       if self.elements[-1] == "name":
-                               self.translatedPackageInfos["name"] = str(data)
-                       if self.elements[-1] == "description":
-                               self.data += data.strip()
-                               self.translatedPackageInfos["description"] = str(self.data.encode("utf-8"))
-                       if self.elements[-1] == "name":
-                               self.translatedPackageInfos["name"] = str(data.encode("utf-8"))
-                       if self.elements[-1] == "shortdescription":
-                               self.translatedPackageInfos["shortdescription"] = str(data.encode("utf-8"))
+               if self.elements[-1] == "packagename":
+                       self.attributes["packagename"] = str(data)
+               if self.elements[-1] == "shortdescription":
+                       self.attributes["shortdescription"] = str(data)
+               if self.elements[-1] == "description":
+                       self.data += data.strip()
+                       self.attributes["description"] = str(self.data)
                #print "characters", data
 
 
@@ -166,13 +134,12 @@ class DreamInfoHandler:
        STATUS_ERROR = 2
        STATUS_INIT = 4
 
-       def __init__(self, statusCallback, blocking = False, neededTag = None, neededFlag = None, language = None):
+       def __init__(self, statusCallback, blocking = False, neededTag = None, neededFlag = None):
                self.hardware_info = HardwareInfo()
                self.directory = "/"
 
                self.neededTag = neededTag
                self.neededFlag = neededFlag
-               self.language = language
 
                # caution: blocking should only be used, if further execution in enigma2 depends on the outcome of
                # the installer!
@@ -203,8 +170,8 @@ class DreamInfoHandler:
                #print handler.list
 
        def readIndex(self, directory, file):
-               print "Reading .xml meta index file", file
-               handler = InfoHandler(self.prerequisiteMet, directory, self.language)
+               print "Reading .xml meta index file", directory, file
+               handler = InfoHandler(self.prerequisiteMet, directory)
                try:
                        xml.sax.parse(file, handler)
                        for entry in handler.list:
@@ -216,7 +183,7 @@ class DreamInfoHandler:
        def readDetails(self, directory, file):
                self.packageDetails = []
                print "Reading .xml meta details file", file
-               handler = InfoHandler(self.prerequisiteMet, directory, self.language)
+               handler = InfoHandler(self.prerequisiteMet, directory)
                try:
                        xml.sax.parse(file, handler)
                        for entry in handler.list:
@@ -225,7 +192,6 @@ class DreamInfoHandler:
                        print "file", file, "ignored due to errors in the file"
                #print handler.list
 
-
        # prerequisites = True: give only packages matching the prerequisites
        def fillPackagesList(self, prerequisites = True):
                self.packageslist = []
@@ -254,20 +220,16 @@ class DreamInfoHandler:
                        self.directory = [self.directory]
 
                for indexfile in os.listdir(self.directory[0]):
-                       if indexfile.startswith("index"):
-                               if indexfile.endswith("_en.xml"): #we first catch all english indexfiles
-                                       indexfileList.append(os.path.splitext(indexfile)[0][:-3])
-
+                       if indexfile.startswith("index-"):
+                               if indexfile.endswith(".xml"):
+                                       if indexfile[-7:-6] == "_":
+                                               continue
+                                       indexfileList.append(indexfile)
                if len(indexfileList):
                        for file in indexfileList:
                                neededFile = self.directory[0] + "/" + file
-                               if self.language is not None:
-                                       if os.path.exists(neededFile + '_' + self.language + '.xml' ):
-                                               #print "translated index file found",neededFile + '_' + self.language + '.xml'
-                                               self.readIndex(self.directory[0] + "/", neededFile + '_' + self.language + '.xml')
-                                       else:
-                                               #print "reading original index file"
-                                               self.readIndex(self.directory[0] + "/", neededFile + '_en.xml')
+                               if os.path.isfile(neededFile):
+                                       self.readIndex(self.directory[0] + "/" , neededFile)
 
                if prerequisites:
                        for package in self.packagesIndexlist[:]:
index 1431caf..7132ba0 100755 (executable)
@@ -2,23 +2,14 @@
          <prerequisites>
                     <tag type="Recording" />
          </prerequisites>
-          <info language="en">
+          <info>
                     <author>Dream Multimedia</author>
                     <name>CutListEditor</name>
                     <packagename>enigma2-plugin-extensions-cutlisteditor</packagename>
-                    <shortdescription>CutListEditor allows you to edit your movies.</shortdescription>
+                    <shortdescription>CutListEditor allows you to edit your movies</shortdescription>
                     <description>CutListEditor allows you to edit your movies.\nSeek to the start of the stuff you want to cut away. Press OK, select 'start cut'.\nThen seek to the end, press OK, select 'end cut'. That's it.</description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_cutlisteditor.jpg" />
           </info>
-          <info language="de">
-                    <author>Dream Multimedia</author>
-                    <name>Schnitteditor</name>
-                    <packagename>enigma2-plugin-extensions-cutlisteditor</packagename>
-                    <shortdescription>Mit dem Schnitteditor können Sie Ihre Aufnahmen schneiden.</shortdescription>
-                    <description>Mit dem Schnitteditor können Sie Ihre Aufnahmen schneiden.\nSpulen Sie zum Anfang des zu schneidenden Teils der Aufnahme. Drücken Sie dann OK und wählen Sie: 'start cut'.\nDann spulen Sie zum Ende, drücken OK und wählen 'end cut'. Das ist alles.
-                    </description>
-                    <screenshot src="http://www.dreamboxupdate.com/preview/plugin_cutlisteditor.jpg" />
-          </info>
          <files type="package"> <!-- without version, without .ipk -->
                <file type="package" name="enigma2-plugin-extensions-cutlisteditor" />
          </files>
index 647d1cf..c1e202a 100755 (executable)
@@ -3,22 +3,17 @@
                     <tag type="Recording" />
                     <tag type="Software" />
          </prerequisites>
-          <info language="en">
+          <info>
                     <author>Dream Multimedia</author>
                     <name>DVDBurn</name>
                     <packagename>enigma2-plugin-extensions-dvdburn</packagename>
-                    <shortdescription>With DVDBurn you can burn your recordings to a dvd.</shortdescription>
-                    <description>With DVDBurn you can burn your recordings to a dvd.\nArchive all your favorite movies to recordable dvds with menus if wanted.</description>
+                    <shortdescription>Burn your recordings to DVD</shortdescription>
+                    <description>With DVDBurn you can make compilations of records from your Dreambox hard drive.\n
+                   Optionally you can add customizable menus. You can record the compilation to a standard-compliant DVD that can be played on conventinal DVD players.\n
+                   HDTV recordings can only be burned in proprietary dreambox format.</description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_dvdburn_en.jpg" />
           </info>
-          <info language="de">
-                    <author>Dream Multimedia</author>
-                    <name>DVDBurn</name>
-                    <packagename>enigma2-plugin-extensions-dvdburn</packagename>
-                    <shortdescription>Mit DVDBurn brennen Sie ihre Aufnahmen auf DVD.</shortdescription>
-                    <description>Mit DVDBurn brennen Sie ihre Aufnahmen auf DVD.\nArchivieren Sie Ihre Liblingsfilme auf DVD mit Menus wenn Sie es wünschen.</description>
-                    <screenshot src="http://www.dreamboxupdate.com/preview/plugin_dvdburn_de.jpg" />
-          </info>
+
          <files type="package"> <!-- without version, without .ipk -->
                <file type="package" name="enigma2-plugin-extensions-dvdburn" />
          </files>
index 1353f7d..6fc5a6f 100755 (executable)
@@ -2,23 +2,14 @@
          <prerequisites>
                     <tag type="Multimedia" />
          </prerequisites>
-          <info language="en">
+          <info>
                     <author>Dream Multimedia</author>
                     <name>DVDPlayer</name>
                     <packagename>enigma2-plugin-extensions-dvdplayer</packagename>
-                    <shortdescription>DVDPlayer plays your DVDs on your Dreambox.</shortdescription>
+                    <shortdescription>DVDPlayer plays your DVDs on your Dreambox</shortdescription>
                     <description>DVDPlayer plays your DVDs on your Dreambox.\nWith the DVDPlayer you can play your DVDs on your Dreambox from a DVD or even from an iso file or video_ts folder on your harddisc or network.</description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_dvdplayer.jpg" />
           </info>
-          <info language="de">
-                    <author>Dream Multimedia</author>
-                    <name>DVDPlayer</name>
-                    <packagename>enigma2-plugin-extensions-dvdplayer</packagename>
-                    <shortdescription>Spielen Sie Ihre DVDs mit dem DVDPlayer auf Ihrer Dreambox ab.</shortdescription>
-                    <description>Spielen Sie Ihre DVDs mit dem DVDPlayer auf Ihrer Dreambox ab.\nMit dem DVDPlayer können Sie Ihre DVDs auf Ihrer Dreambox abspielen. Dabei ist es egal ob Sie von DVD, iso-Datei oder sogar direkt von einer video_ts Ordnerstruktur von Ihrer Festplatte oder dem Netzwerk abspielen.
-                    </description>
-                    <screenshot src="http://www.dreamboxupdate.com/preview/plugin_dvdplayer.jpg" />
-          </info>
          <files type="package"> <!-- without version, without .ipk -->
                <file type="package" name="enigma2-plugin-extensions-dvdplayer" />
          </files>
index 3e2a3f6..37d0988 100755 (executable)
@@ -3,23 +3,14 @@
                     <tag type="EPG" />
                     <tag type="Recording" />
          </prerequisites>
-          <info language="en">
+          <info>
                     <author>Dream Multimedia</author>
                     <name>GraphMultiEPG</name>
                     <packagename>enigma2-plugin-extensions-graphmultiepg</packagename>
-                    <shortdescription>GraphMultiEPG shows a graphical timeline EPG.</shortdescription>
+                    <shortdescription>GraphMultiEPG shows a graphical timeline EPG</shortdescription>
                     <description>GraphMultiEPG shows a graphical timeline EPG.\nShows a nice overview of all running und upcoming tv shows.</description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_graphmultiepg_en.jpg" />
           </info>
-          <info language="de">
-                    <author>Dream Multimedia</author>
-                    <name>GraphMultiEPG</name>
-                    <packagename>enigma2-plugin-extensions-graphmultiepg</packagename>
-                    <shortdescription>Zeigt ein grafisches Zeitlinien-EPG.</shortdescription>
-                    <description>Zeigt ein grafisches Zeitlinien-EPG.\nZeigt eine grafische Übersicht aller laufenden und kommenden Sendungen.
-                    </description>
-                    <screenshot src="http://www.dreamboxupdate.com/preview/plugin_graphmultiepg_de.jpg" />
-          </info>
          <files type="package"> <!-- without version, without .ipk -->
                <file type="package" name="enigma2-plugin-extensions-graphmultiepg" />
          </files>
index 2f9f22b..ffbb8e8 100755 (executable)
@@ -2,23 +2,14 @@
          <prerequisites>
                     <tag type="Multimedia" />
          </prerequisites>
-          <info language="en">
+          <info>
                     <author>Dream Multimedia</author>
                     <name>MediaPlayer</name>
                     <packagename>enigma2-plugin-extensions-mediaplayer</packagename>
-                    <shortdescription>Mediaplayer plays your favorite music and videos.</shortdescription>
+                    <shortdescription>Plays your favorite music and videos</shortdescription>
                     <description>Mediaplayer plays your favorite music and videos.\nPlay all your favorite music and video files, organize them in playlists, view cover and album information.</description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_mediaplayer_en.jpg" />
           </info>
-          <info language="de">
-                    <author>Dream Multimedia</author>
-                    <name>MediaPlayer</name>
-                    <packagename>enigma2-plugin-extensions-mediaplayer</packagename>
-                    <shortdescription>Mediaplayer spielt Ihre Musik und Videos.</shortdescription>
-                    <description>Mediaplayer spielt Ihre Musik und Videos.\nSie können all Ihre Musik- und Videodateien abspielen, in Playlisten organisieren, Cover und Albuminformationen abrufen.
-                    </description>
-                    <screenshot src="http://www.dreamboxupdate.com/preview/plugin_mediaplayer_de.jpg" />
-          </info>
          <files type="package"> <!-- without version, without .ipk -->
                <file type="package" name="enigma2-plugin-extensions-mediaplayer" />
          </files>
index eced924..eb9de1b 100755 (executable)
@@ -1,25 +1,15 @@
 <default>
          <prerequisites>
-                    <tag type="Multimedia" />
                     <tag type="System" />
          </prerequisites>
-          <info language="en">
+          <info>
                     <author>Dream Multimedia</author>
                     <name>MediaScanner</name>
                     <packagename>enigma2-plugin-extensions-mediascanner</packagename>
-                    <shortdescription>MediaScanner scans devices for playable media files.</shortdescription>
+                    <shortdescription>Scan devices for playable media files</shortdescription>
                     <description>MediaScanner scans devices for playable media files and displays a menu with possible actions like viewing pictures or playing movies.</description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_mediascanner_en.jpg" />
           </info>
-          <info language="de">
-                    <author>Dream Multimedia</author>
-                    <name>MediaScanner</name>
-                    <packagename>enigma2-plugin-extensions-mediascanner</packagename>
-                    <shortdescription>MediaScanner durchsucht Geräte nach Mediendateien.</shortdescription>
-                    <description>MediaScanner durchsucht Geräte nach Mediendateien  und bietet Ihnen die dazu passenden Aktionen an wie z.B. Bilder betrachten oder Videos abspielen.
-                    </description>
-                    <screenshot src="http://www.dreamboxupdate.com/preview/plugin_mediascanner_en.jpg" />
-          </info>
          <files type="package"> <!-- without version, without .ipk -->
                <file type="package" name="enigma2-plugin-extensions-mediascanner" />
          </files>
index faff978..16e2ec9 100755 (executable)
@@ -2,23 +2,14 @@
          <prerequisites>
                     <tag type="Multimedia" />
          </prerequisites>
-          <info language="en">
+          <info>
                     <author>Dream Multimedia</author>
                     <name>PicturePlayer</name>
                     <packagename>enigma2-plugin-extensions-pictureplayer</packagename>
-                    <shortdescription>PicturePlayer displays your photos on the TV.</shortdescription>
+                    <shortdescription>Display your photos on the TV</shortdescription>
                     <description>The PicturePlayer displays your photos on the TV.\nYou can view them as thumbnails or slideshow.</description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_pictureplayer.jpg" />
           </info>
-          <info language="de">
-                    <author>Dream Multimedia</author>
-                    <name>Bildbetrachter</name>
-                    <packagename>enigma2-plugin-extensions-pictureplayer</packagename>
-                    <shortdescription>Der Bildbetrachter zeigt Ihre Bilder auf dem Fernseher an.</shortdescription>
-                    <description>Der Bildbetrachter zeigt Ihre Bilder auf dem Fernseher an.\nSie können sich Ihre Bilder als Thumbnails, einzeln oder als Slideshow anzeigen lassen.
-                    </description>
-                    <screenshot src="http://www.dreamboxupdate.com/preview/plugin_pictureplayer.jpg" />
-          </info>
          <files type="package"> <!-- without version, without .ipk -->
                <file type="package" name="enigma2-plugin-extensions-pictureplayer" />
          </files>
old mode 100644 (file)
new mode 100755 (executable)
index acf8374..3eaf8fc
@@ -2,20 +2,13 @@
          <prerequisites>
                     <tag type="System" />
          </prerequisites>
-          <info language="en">
+          <info>
                     <author>Dream Multimedia</author>
                     <name>SocketMMI</name>
                     <packagename>enigma2-plugin-extensions-socketmmi</packagename>
-                    <shortdescription>Python frontend for /tmp/mmi.socket.</shortdescription>
+                    <shortdescription>Frontend for /tmp/mmi.socket</shortdescription>
                     <description>Python frontend for /tmp/mmi.socket.</description>
           </info>
-          <info language="de">
-                    <author>Dream Multimedia</author>
-                    <name>SocketMMI</name>
-                    <packagename>enigma2-plugin-extensions-socketmmi</packagename>
-                    <shortdescription>Python frontend für /tmp/mmi.socket.</shortdescription>
-                    <description>Python frontend für /tmp/mmi.socket.</description>
-          </info>
          <files type="package"> <!-- without version, without .ipk -->
                <file type="package" name="enigma2-plugin-extensions-socketmmi" />
          </files>
old mode 100644 (file)
new mode 100755 (executable)
index 734c48f..7ca1082
@@ -2,20 +2,13 @@
          <prerequisites>
                     <tag type="System" />
          </prerequisites>
-          <info language="en">
+          <info>
                     <author>Dream Multimedia</author>
                     <name>TuxboxPlugins</name>
                     <packagename>TuxboxPlugins</packagename>
-                    <shortdescription>Allows the execution of TuxboxPlugins.</shortdescription>
+                    <shortdescription>Execute TuxboxPlugins</shortdescription>
                     <description>Allows the execution of TuxboxPlugins.</description>
           </info>
-          <info language="de">
-                    <author>Dream Multimedia</author>
-                    <name>TuxboxPlugins</name>
-                    <packagename>enigma2-plugin-extensions-tuxboxplugins</packagename>
-                    <shortdescription>Erlaubt das Ausführen von TuxboxPlugins.</shortdescription>
-                    <description>Erlaubt das Ausführen von TuxboxPlugins.</description>
-          </info>
          <files type="package"> <!-- without version, without .ipk -->
                <file type="package" name="enigma2-plugin-extensions-tuxboxplugins" />
          </files>
index 99add3d..d0781af 100755 (executable)
@@ -2,26 +2,16 @@
          <prerequisites>
                     <tag type="System" />
          </prerequisites>
-          <info language="en">
+          <info>
                     <author>Dream Multimedia</author>
                     <name>CleanupWizard</name>
                     <packagename>enigma2-plugin-systemplugins-cleanupwizard</packagename>
                     <shortdescription>Automatically informs you on low internal memory</shortdescription>
-                    <description>The CleanupWizard informs you when your internal free memory of your dreambox has droppen under 2MB.
-                   You can use this wizard to remove some extensions.
-                    </description>
+                    <description>The CleanupWizard informs you when the internal free memory of your dreambox has dropped below a definable threshold.
+                   You can use this wizard to remove some plugins. </description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_cleanupwizard_en.jpg" />
           </info>
-          <info language="de">
-                    <author>Dream Multimedia</author>
-                    <name>CleanupWizard</name>
-                    <packagename>enigma2-plugin-systemplugins-cleanupwizard</packagename>
-                    <shortdescription>Informiert Sie automatisch wenn der interne Speicher Ihrer Dreambox voll wird.</shortdescription>
-                    <description>Der CleanupWizard informiert Sie, wenn der interne freie Speicher Ihrer Dreambox unter 2MB fällt.
-                   Sie können dann einige Erweiterungen deinstallieren um wieder Platz zu schaffen.
-                    </description>
-                    <screenshot src="http://www.dreamboxupdate.com/preview/plugin_cleanupwizard_de.jpg" />
-          </info>
+
          <files type="package"> <!-- without version, without .ipk -->
                <file type="package" name="enigma2-plugin-systemplugins-cleanupwizard" />
          </files>
index 9abc598..f34f0a3 100755 (executable)
@@ -4,28 +4,17 @@
                     <tag type="CI" />
                     <tag type="System" />
          </prerequisites>
-          <info language="en">
+          <info>
                     <author>Dream Multimedia</author>
                     <name>CommonInterfaceAssignment</name>
                     <packagename>enigma2-plugin-systemplugins-commoninterfaceassignment</packagename>
-                    <shortdescription>Assigning providers/services/caids to a dedicated CI module</shortdescription>
-                    <description>With the CommonInterfaceAssignment extension it is possible to use different CI modules
-                    in your Dreambox and assign to each of them dedicated providers/services or caids.\n
-                    So it is then possible to watch a scrambled service while recording another one.
-                    </description>
-                    <screenshot src="http://www.dreamboxupdate.com/preview/plugin_ciassignment.jpg" />
-          </info>
-          <info language="de">
-                    <author>Dream Multimedia</author>
-                    <name>CommonInterfaceAssignment</name>
-                    <packagename>enigma2-plugin-systemplugins-commoninterfaceassignment</packagename>
-                    <shortdescription>Zuweisen von Providern/Services/CAIDs an ein CI Modul</shortdescription>
-                    <description>Mit der CommonInterfaceAssignment Erweiterung ist es möglich jedem CI Modul bestimmte Provider/Services/CAIDs zuzuweisen.\n
-                    So ist es möglich mit einem CI einen Sender aufzunehmen\n
-                    und mit einem anderen einen Sender zu schauen.
-                    </description>
+                    <shortdescription>Assigning providers/services/caids to a CI module</shortdescription>
+                    <description>With the CommonInterfaceAssignment plugin it is possible to use different
+                   CI modules in your Dreambox and assign dedicated providers/services or caids to each of them.\n
+                   This allows watching a scrambled service while recording another one.</description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_ciassignment.jpg" />
           </info>
+
          <files type="package"> <!-- without version, without .ipk -->
                <file type="package" name="enigma2-plugin-systemplugins-commoninterfaceassignment" />
          </files>
index a118ed7..3140b15 100755 (executable)
@@ -2,26 +2,17 @@
          <prerequisites>
                     <tag type="System" />
          </prerequisites>
-          <info language="en">
+          <info>
                     <author>Dream Multimedia</author>
                     <name>CrashlogAutoSubmit</name>
                     <packagename>enigma2-plugin-systemplugins-crashlogautosubmit</packagename>
                     <shortdescription>Automatically send crashlogs to Dream Multimedia</shortdescription>
-                    <description>With the CrashlogAutoSubmit extension it is possible to automatically send crashlogs
-                   found on your Harddrive to Dream Multimedia
+                    <description>With the CrashlogAutoSubmit plugin it is possible to automatically
+                   mail crashlogs found on your hard drive to Dream Multimedia.
                     </description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_crashlogautosubmit_en.jpg" />
           </info>
-          <info language="de">
-                    <author>Dream Multimedia</author>
-                    <name>CrashlogAutoSubmit</name>
-                    <packagename>enigma2-plugin-systemplugins-crashlogautosubmit</packagename>
-                    <shortdescription>Automatisches versenden von Crashlogs an Dream Multimedia</shortdescription>
-                    <description>Mit dem CrashlogAutoSubmit Plugin ist es möglich auf Ihrer Festplatte
-                   gefundene Crashlogs automatisch an Dream Multimedia zu versenden.
-                    </description>
-                    <screenshot src="http://www.dreamboxupdate.com/preview/plugin_crashlogautosubmit_de.jpg" />
-          </info>
+
          <files type="package"> <!-- without version, without .ipk -->
                <file type="package" name="enigma2-plugin-systemplugins-crashlogautosubmit" />
          </files>
index 41d41ed..74b7886 100755 (executable)
@@ -1,26 +1,18 @@
 <default>
          <prerequisites>
                     <tag type="SAT" />
-                    <tag type="System" />
+                    <tag type="Default" />
          </prerequisites>
           <info language="en">
                     <author>Dream Multimedia</author>
                     <name>DefaultServicesScanner</name>
                     <packagename>enigma2-plugin-systemplugins-defaultservicesscanner</packagename>
-                    <shortdescription>Scans default lamedbs sorted by satellite with a connected dish positioner.</shortdescription>
-                    <description>With the DefaultServicesScanner extension you can scan default lamedbs sorted by satellite with a connected dish positioner.
-                    </description>
-                    <screenshot src="http://www.dreamboxupdate.com/preview/plugin_defaultservicescanner.jpg" />
-          </info>
-          <info language="de">
-                    <author>Dream Multimedia</author>
-                    <name>DefaultServicesScanner</name>
-                    <packagename>enigma2-plugin-systemplugins-defaultservicesscanner</packagename>
-                    <shortdescription>Standard Sendersuche nach Satellit mit einem Rotor.</shortdescription>
-                    <description>Mit der DefaultServicesScanner Erweiterung können Sie eine standard Sendersuche nach Satellit mit einem angeschlossenen Rotor durchführen.
+                    <shortdescription>Scans default lamedbs sorted by satellite</shortdescription>
+                    <description>With the DefaultServicesScanner plugin you can scan default lamedbs sorted by satellite with a connected dish positioner.
                     </description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_defaultservicescanner.jpg" />
           </info>
+
          <files type="package"> <!-- without version, without .ipk -->
                <file type="package" name="enigma2-plugin-systemplugins-defaultservicesscanner" />
          </files>
index 33808b3..567618b 100755 (executable)
@@ -3,24 +3,16 @@
                     <tag type="SAT" />
                     <tag type="System" />
          </prerequisites>
-          <info language="en">
+          <info>
                     <author>Dream Multimedia</author>
                     <name>DiseqcTester</name>
                     <packagename>enigma2-plugin-systemplugins-diseqctester</packagename>
-                    <shortdescription>Test your Diseqc equipment.</shortdescription>
-                    <description>With the DiseqcTester extension you can test your satellite equipment for Diseqc compatibility and errors.
+                    <shortdescription>Test your DiSEqC equipment</shortdescription>
+                    <description>With the DiseqcTester plugin you can test your satellite equipment for DiSEqC compatibility and errors.
                     </description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_diseqctester_en.jpg" />
           </info>
-          <info language="de">
-                    <author>Dream Multimedia</author>
-                    <name>DiseqcTester</name>
-                    <packagename>enigma2-plugin-systemplugins-diseqctester</packagename>
-                    <shortdescription>Testet Ihr Diseqc Equipment.</shortdescription>
-                    <description>Mit der DiseqcTester Erweiterung können Sie Ihr Satelliten-Equipment nach Diseqc-Kompatibilität und Fehlern überprüfen.
-                    </description>
-                    <screenshot src="http://www.dreamboxupdate.com/preview/plugin_diseqctester_de.jpg" />
-          </info>
+
          <files type="package"> <!-- without version, without .ipk -->
                <file type="package" name="enigma2-plugin-systemplugins-diseqctester" />
          </files>
old mode 100644 (file)
new mode 100755 (executable)
index 1763f67..7b6fdca
@@ -3,24 +3,16 @@
                     <hardware type="dm8000" />
                     <tag type="System" />
          </prerequisites>
-          <info language="en">
+          <info>
                     <author>Dream Multimedia</author>
                     <name>FrontprocessorUpgrade</name>
                     <packagename>enigma2-plugin-systemplugins-frontprocessorupgrade</packagename>
                    <packagetype>internal</packagetype> <!-- internal/public , public is default, internal metas are not displayed inside plugin manager -->
-                    <shortdescription>Internal firmware updater.</shortdescription>
+                    <shortdescription>Internal firmware updater</shortdescription>
                     <description>This system tool is internally used to program the hardware with firmware updates.
                     </description>
          </info>
-          <info language="de">
-                    <author>Dream Multimedia</author>
-                    <name>FrontprocessorUpgrade</name>
-                    <packagename>enigma2-plugin-systemplugins-frontprocessorupgrade</packagename>
-                   <packagetype>internal</packagetype> <!-- internal/public , public is default, internal metas are not displayed inside plugin manager -->
-                    <shortdescription>Interner Firmware-Upgrader.</shortdescription>
-                    <description>Dieses Systemtool wird intern benutzt um Firmware-Upgrades für die Hardware aufzuspielen.
-                    </description>
-          </info>
+
          <files type="package"> <!-- without version, without .ipk -->
                <file type="package" name="enigma2-plugin-systemplugins-frontprocessorupgrade" />
        </files>
old mode 100644 (file)
new mode 100755 (executable)
index 6c2824c..610dfee
@@ -2,22 +2,15 @@
          <prerequisites>
                     <tag type="System" />
          </prerequisites>
-          <info language="en">
+          <info>
                     <author>Dream Multimedia</author>
                     <name>Hotplug</name>
                     <packagename>enigma2-plugin-systemplugins-hotplug</packagename>
-                    <shortdescription>Hotplugging for removeable devices.</shortdescription>
-                    <description>The Hotplug extension notifies your system of newly added or removed devices.
-                    </description>
-          </info>
-          <info language="de">
-                    <author>Dream Multimedia</author>
-                    <name>Hotplug</name>
-                    <packagename>enigma2-plugin-systemplugins-hotplug</packagename>
-                    <shortdescription>Hotplugging für entfernbare Geräte.</shortdescription>
-                    <description>Mit der Hotplug-Erweiterung wird Ihr System über neu angeschlossene oder entfernte Geräte informiert.
+                    <shortdescription>Hotplugging for removeable devices</shortdescription>
+                    <description>The Hotplug plugin notifies your system of newly added or removed devices.
                     </description>
           </info>
+
          <files type="package"> <!-- without version, without .ipk -->
                <file type="package" name="enigma2-plugin-systemplugins-hotplug" />
        </files>
index c81f4ca..f93f5c5 100755 (executable)
@@ -2,28 +2,18 @@
          <prerequisites>
                     <hardware type="dm8000" />
                     <tag type="System" />
-                    <tag type="Software" />
          </prerequisites>
-          <info language="en">
+          <info>
                     <author>Dream Multimedia</author>
                     <name>NFIFlash</name>
                     <packagename>enigma2-plugin-systemplugins-nfiflash</packagename>
-                    <shortdescription>Restore your Dreambox with a USB stick.</shortdescription>
-                    <description>With the NFIFlash extension it is possible to prepare a USB stick with an Dreambox image.\n
+                    <shortdescription>Restore your Dreambox with a USB stick</shortdescription>
+                    <description>With the NFIFlash plugin it is possible to prepare a USB stick with an Dreambox image.\n
                     It is then possible to flash your Dreambox with the image on that stick.
                     </description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_nfiflash_en.jpg" />
           </info>
-          <info language="de">
-                    <author>Dream Multimedia</author>
-                    <name>NFIFlash</name>
-                    <packagename>enigma2-plugin-systemplugins-nfiflash</packagename>
-                    <shortdescription>Wiederherstellen Ihrer Dreambox mittels USB-Stick.</shortdescription>
-                    <description>Mit der NFIFlash Erweiterung können Sie ein Dreambox Image auf einen USB-Stick laden.\
-                    Mit diesem USB-Stick ist es dann möglich Ihre Dreambox zu flashen.
-                    </description>
-                    <screenshot src="http://www.dreamboxupdate.com/preview/plugin_nfiflash_de.jpg" />
-          </info>
+
          <files type="package"> <!-- without version, without .ipk -->
                <file type="package" name="enigma2-plugin-systemplugins-nfiflash" />
          </files>
index 4d3adcb..423365f 100755 (executable)
@@ -1,26 +1,18 @@
 <default>
          <prerequisites>
+                    <tag type="Network" />
                     <tag type="System" />
          </prerequisites>
-          <info language="en">
+          <info>
                     <author>Dream Multimedia</author>
                     <name>NetworkWizard</name>
                     <packagename>enigma2-plugin-systemplugins-networkwizard</packagename>
                     <shortdescription>Step by step network configuration</shortdescription>
-                    <description>With the NetworkWizard you can easy configure your network step by step.
+                    <description>With the NetworkWizard you can easily configure your network step by step.
                     </description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_networkwizard_en.jpg" />
           </info>
-          <info language="de">
-                    <author>Dream Multimedia</author>
-                    <name>NetzwerkWizard</name>
-                    <packagename>enigma2-plugin-systemplugins-networkwizard</packagename>
-                    <shortdescription>Schritt für Schritt Netzwerk konfiguration</shortdescription>
-                    <description>Mit dem NetzwerkWizard können Sie Ihr Netzwerk konfigurieren. Sie werden Schritt
-                       für Schritt durch die Konfiguration geleitet.
-                    </description>
-                    <screenshot src="http://www.dreamboxupdate.com/preview/plugin_networkwizard_de.jpg" />
-          </info>
+
          <files type="package"> <!-- without version, without .ipk -->
                <file type="package" name="enigma2-plugin-systemplugins-networkwizard" />
          </files>
index 2cb47c0..5e1db7b 100755 (executable)
@@ -3,25 +3,16 @@
                     <tag type="SAT" />
                     <tag type="System" />
          </prerequisites>
-          <info language="en">
+          <info>
                     <author>Dream Multimedia</author>
                     <name>PositionerSetup</name>
                     <packagename>enigma2-plugin-systemplugins-positionersetup</packagename>
-                    <shortdescription>PositionerSetup helps you installing a motorized dish.</shortdescription>
-                    <description>With the PositionerSetup extension it is easy to install and configure a motorized dish.
-                    </description>
-                    <screenshot src="http://www.dreamboxupdate.com/preview/plugin_positionersetup.jpg" />
-          </info>
-          <info language="de">
-                    <author>Dream Multimedia</author>
-                    <name>PositionerSetup</name>
-                    <packagename>enigma2-plugin-systemplugins-positionersetup</packagename>
-                    <shortdescription>Unterstützt Sie beim installieren eines Rotors.</shortdescription>
-                    <description>Die PositionerSetup Erweiterung unterstützt Sie beim einrichten
-                    und konfigurieren einer motorgesteuerten Satellitenantenne.
+                    <shortdescription>PositionerSetup helps you installing a motorized dish</shortdescription>
+                    <description>With the PositionerSetup plugin it is easy to install and configure a motorized dish.
                     </description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_positionersetup.jpg" />
           </info>
+
          <files type="package"> <!-- without version, without .ipk -->
                <file type="package" name="enigma2-plugin-systemplugins-positionersetup" />
        </files>
index 4c0c7af..904f9a2 100755 (executable)
@@ -3,25 +3,17 @@
                     <tag type="SAT" />
                     <tag type="System" />
          </prerequisites>
-          <info language="en">
+          <info>
                     <author>Dream Multimedia</author>
                     <name>SatelliteEquipmentControl</name>
                     <name_de>SatelliteEquipmentControl</name_de>
                     <packagename>enigma2-plugin-systemplugins-satelliteequipmentcontrol</packagename>
-                    <shortdescription>SatelliteEquipmentControl allows you to fine-tune DiSEqC-settings.</shortdescription>
-                    <description>With the SatelliteEquipmentControl extension it is possible to fine-tune DiSEqC-settings.
-                    </description>
-                    <screenshot src="http://www.dreamboxupdate.com/preview/plugin_satcontrol.jpg" />
-          </info>
-          <info language="de">
-                    <author>Dream Multimedia</author>
-                    <name>SatelliteEquipmentControl</name>
-                    <packagename>enigma2-plugin-systemplugins-satelliteequipmentcontrol</packagename>
-                    <shortdescription>Fein-Einstellungen für DiSEqC</shortdescription>
-                    <description>Die SatelliteEquipmentControl-Erweiterung unterstützt Sie beim Feintuning der DiSEqC Einstellungen.
+                    <shortdescription>SatelliteEquipmentControl allows you to fine-tune DiSEqC-settings</shortdescription>
+                    <description>With the SatelliteEquipmentControl plugin it is possible to fine-tune DiSEqC-settings.
                     </description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_satcontrol.jpg" />
           </info>
+
          <files type="package"> <!-- without version, without .ipk -->
                <file type="package" name="enigma2-plugin-systemplugins-satelliteequipmentcontrol" />
          </files>
index e9453de..fe0c901 100755 (executable)
@@ -1,28 +1,18 @@
 <default>
          <prerequisites>
                     <tag type="SAT" />
-                    <tag type="Software" />
+                    <tag type="System" />
          </prerequisites>
-          <info language="en">
+          <info>
                     <author>Dream Multimedia</author>
                     <name>Satfinder</name>
                     <packagename>enigma2-plugin-systemplugins-satfinder</packagename>
-                    <shortdescription>Satfinder helps you to align your dish.</shortdescription>
-                    <description>The Satfinder extension helps you to align your dish.\n
+                    <shortdescription>Satfinder helps you to align your dish</shortdescription>
+                    <description>The Satfinder plugin helps you to align your dish.\n
                     It shows you informations about signal rate and errors.
                     </description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_satfinder.jpg" />
           </info>
-          <info language="de">
-                    <author>Dream Multimedia</author>
-                    <name>Satfinder</name>
-                    <packagename>enigma2-plugin-systemplugins-satfinder</packagename>
-                    <shortdescription>Satfinder unterstützt Sie beim ausrichten ihrer Satellitenanlage.</shortdescription>
-                    <description>Die Satfinder-Erweiterung unterstützt Sie beim Ausrichten ihrer Satellitenanlage.\n
-                    Es zeigt Ihnen Daten wie Signalstärke und Fehlerrate an.
-                    </description>
-                    <screenshot src="http://www.dreamboxupdate.com/preview/plugin_satfinder.jpg" />
-          </info>
          <files type="package"> <!-- without version, without .ipk -->
                <file type="package" name="enigma2-plugin-systemplugins-satfinder" />
        </files>
index 717f732..73544a5 100755 (executable)
@@ -1,28 +1,19 @@
 <default>
          <prerequisites>
                     <tag type="Display" />
-                    <tag type="System" />
+                    <tag type="Skin" />
          </prerequisites>
           <info language="en">
                     <author>Dream Multimedia</author>
                     <name>SkinSelector</name>
                     <packagename>enigma2-plugin-systemplugins-skinselector</packagename>
-                    <shortdescription>SkinSelector shows a menu with selectable skins.</shortdescription>
+                    <shortdescription>SkinSelector shows a menu with selectable skins</shortdescription>
                     <description>The SkinSelector shows a menu with selectable skins.\n
                     It's now easy to change the look and feel of your Dreambox.
                     </description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_skinselector_en.jpg" />
           </info>
-          <info language="de">
-                    <author>Dream Multimedia</author>
-                    <name>SkinSelector</name>
-                    <packagename>enigma2-plugin-systemplugins-skinselector</packagename>
-                    <shortdescription>Der SkinSelector zeigt Ihnen ein Menu mit auswählbaren Skins.</shortdescription>
-                    <description>Die SkinSelector Erweiterung zeigt Ihnen ein Menu mit auswählbaren Skins.\n
-                    Sie können nun einfach das Aussehen der grafischen Oberfläche Ihrer Dreambox verändern.
-                    </description>
-                    <screenshot src="http://www.dreamboxupdate.com/preview/plugin_skinselector_de.jpg" />
-          </info>
+
          <files type="package"> <!-- without version, without .ipk -->
                <file type="package" name="enigma2-plugin-systemplugins-skinselector" />
          </files>
index a29a5e9..879bec1 100755 (executable)
@@ -69,7 +69,7 @@ class SoftwareTools(DreamInfoHandler):
                else:
                        self.ImageVersion = 'Stable'
                self.language = language.getLanguage()[:2] # getLanguage returns e.g. "fi_FI" for "language_country"
-               DreamInfoHandler.__init__(self, self.statusCallback, blocking = False, neededTag = 'ALL_TAGS', neededFlag = self.ImageVersion, language = self.language)
+               DreamInfoHandler.__init__(self, self.statusCallback, blocking = False, neededTag = 'ALL_TAGS', neededFlag = self.ImageVersion)
                self.directory = resolveFilename(SCOPE_METADIR)
                self.hardware_info = HardwareInfo()
                self.list = List([])
index cd425c3..4135a21 100755 (executable)
@@ -3,27 +3,17 @@
                     <tag type="Software" />
                     <tag type="System" />
          </prerequisites>
-          <info language="en">
+          <info>
                     <author>Dream Multimedia</author>
                     <name>SoftwareManager</name>
                     <packagename>enigma2-plugin-systemplugins-softwaremanager</packagename>
-                    <shortdescription>SoftwareManager manages your Dreambox software.</shortdescription>
+                    <shortdescription>SoftwareManager manages your Dreambox software</shortdescription>
                     <description>The SoftwareManager manages your Dreambox software.\n
-                    It's easy to update your receiver's software, install or remove extensions or even backup and restore your system settings.
+                   It's easy to update your receiver's software, install or remove plugins or even backup and restore your system settings.
                     </description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_softwaremanager_en.jpg" />
           </info>
-          <info language="de">
-                    <author>Dream Multimedia</author>
-                    <name>SoftwareManager</name>
-                    <packagename>enigma2-plugin-systemplugins-softwaremanager</packagename>
-                    <shortdescription>Der SoftwareManager verwaltet Ihre Dreambox Software.</shortdescription>
-                    <description>Der SoftwareManager verwaltet Ihre Dreambox Software.\n
-                    Sie können nun einfach Ihre Dreambox-Software aktualisieren, neue Erweiterungen installieren oder entfernen,
-                    oder ihre Einstellungen sichern und wiederherstellen.
-                    </description>
-                    <screenshot src="http://www.dreamboxupdate.com/preview/plugin_softwaremanager_de.jpg" />
-          </info>
+
          <files type="package"> <!-- without version, without .ipk -->
                <file type="package" name="enigma2-plugin-systemplugins-softwaremanager" />
          </files>
index 9983767..0cc5777 100755 (executable)
@@ -789,13 +789,13 @@ class PluginManager(Screen, DreamInfoHandler):
                                                status = "remove"
                                        else:
                                                status = "installed"
-                                       self.list.append(self.buildEntryComponent(name, details, description, packagename, status, selected = selectState))
+                                       self.list.append(self.buildEntryComponent(name, _(details), _(description), packagename, status, selected = selectState))
                                else:
                                        if selectState == True:
                                                status = "install"
                                        else:
                                                status = "installable"
-                                       self.list.append(self.buildEntryComponent(name, details, description, packagename, status, selected = selectState))
+                                       self.list.append(self.buildEntryComponent(name, _(details), _(description), packagename, status, selected = selectState))
                        if len(self.list):
                                self.list.sort(key=lambda x: x[0])
                        self["list"].style = "default"
@@ -1104,8 +1104,7 @@ class PluginDetails(Screen, DreamInfoHandler):
                self.skin_path = plugin_path
                self.language = language.getLanguage()[:2] # getLanguage returns e.g. "fi_FI" for "language_country"
                self.attributes = None
-               self.translatedAttributes = None
-               DreamInfoHandler.__init__(self, self.statusCallback, blocking = False, language = self.language)
+               DreamInfoHandler.__init__(self, self.statusCallback, blocking = False)
                self.directory = resolveFilename(SCOPE_METADIR)
                if packagedata:
                        self.pluginname = packagedata[0]
@@ -1143,8 +1142,6 @@ class PluginDetails(Screen, DreamInfoHandler):
                self.package = self.packageDetails[0]
                if self.package[0].has_key("attributes"):
                        self.attributes = self.package[0]["attributes"]
-               if self.package[0].has_key("translation"):
-                       self.translatedAttributes = self.package[0]["translation"]
 
                self.cmdList = []
                self.oktext = _("\nAfter pressing OK, please wait!")
@@ -1154,7 +1151,7 @@ class PluginDetails(Screen, DreamInfoHandler):
                self.onLayoutFinish.append(self.setInfos)
 
        def setWindowTitle(self):
-               self.setTitle(_("Details for extension: " + self.pluginname))
+               self.setTitle(_("Details for plugin: ") + self.pluginname )
 
        def exit(self):
                self.close(False)
@@ -1169,34 +1166,26 @@ class PluginDetails(Screen, DreamInfoHandler):
                pass
 
        def setInfos(self):
-               if self.translatedAttributes.has_key("name"):
-                       self.pluginname = self.translatedAttributes["name"]
-               elif self.attributes.has_key("name"):
+               if self.attributes.has_key("screenshot"):
+                       self.loadThumbnail(self.attributes)
+
+               if self.attributes.has_key("name"):
                        self.pluginname = self.attributes["name"]
                else:
                        self.pluginname = _("unknown")
 
-               if self.translatedAttributes.has_key("author"):
-                       self.author = self.translatedAttributes["author"]
-               elif self.attributes.has_key("author"):
+               if self.attributes.has_key("author"):
                        self.author = self.attributes["author"]
                else:
                        self.author = _("unknown")
 
-               if self.translatedAttributes.has_key("description"):
-                       self.description = self.translatedAttributes["description"]
-               elif self.attributes.has_key("description"):
-                       self.description = self.attributes["description"]
+               if self.attributes.has_key("description"):
+                       self.description = _(self.attributes["description"].replace("\\n", "\n"))
                else:
                        self.description = _("No description available.")
 
-               if self.translatedAttributes.has_key("screenshot"):
-                       self.loadThumbnail(self.translatedAttributes)
-               else:
-                       self.loadThumbnail(self.attributes)
-
                self["author"].setText(_("Author: ") + self.author)
-               self["detailtext"].setText(self.description.strip())
+               self["detailtext"].setText(_(self.description))
                if self.pluginstate in ('installable', 'install'):
                        self["key_green"].setText(_("Install"))
                else:
@@ -1206,6 +1195,10 @@ class PluginDetails(Screen, DreamInfoHandler):
                thumbnailUrl = None
                if entry.has_key("screenshot"):
                        thumbnailUrl = entry["screenshot"]
+                       if self.language == "de":
+                               if thumbnailUrl[-7:] == "_en.jpg":
+                                       thumbnailUrl = thumbnailUrl[:-7] + "_de.jpg"
+
                if thumbnailUrl is not None:
                        self.thumbnail = "/tmp/" + thumbnailUrl.split('/')[-1]
                        print "[PluginDetails] downloading screenshot " + thumbnailUrl + " to " + self.thumbnail
diff --git a/lib/python/Plugins/SystemPlugins/TempFanControl/LICENSE b/lib/python/Plugins/SystemPlugins/TempFanControl/LICENSE
new file mode 100755 (executable)
index 0000000..9970059
--- /dev/null
@@ -0,0 +1,12 @@
+This plugin is licensed under the Creative Commons 
+Attribution-NonCommercial-ShareAlike 3.0 Unported 
+License. To view a copy of this license, visit
+http://creativecommons.org/licenses/by-nc-sa/3.0/ or send a letter to Creative
+Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.
+
+Alternatively, this plugin may be distributed and executed on hardware which
+is licensed by Dream Multimedia GmbH.
+
+This plugin is NOT free software. It is open source, you are allowed to
+modify it (if you keep the license), but it may not be commercially 
+distributed other than under the conditions noted above.
old mode 100644 (file)
new mode 100755 (executable)
index 78ff11c..cfdeb65
@@ -1,5 +1,9 @@
 installdir = $(LIBDIR)/enigma2/python/Plugins/SystemPlugins/TempFanControl
 
+SUBDIRS = meta
+
 install_PYTHON = \
        __init__.py \
        plugin.py
+
+dist_install_DATA = LICENSE
\ No newline at end of file
diff --git a/lib/python/Plugins/SystemPlugins/TempFanControl/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/TempFanControl/meta/Makefile.am
new file mode 100755 (executable)
index 0000000..da7be24
--- /dev/null
@@ -0,0 +1,3 @@
+installdir = $(datadir)/meta
+
+dist_install_DATA = plugin_tempfancontrol.xml
diff --git a/lib/python/Plugins/SystemPlugins/TempFanControl/meta/plugin_tempfancontrol.xml b/lib/python/Plugins/SystemPlugins/TempFanControl/meta/plugin_tempfancontrol.xml
new file mode 100755 (executable)
index 0000000..a0bb5fa
--- /dev/null
@@ -0,0 +1,18 @@
+<default>
+         <prerequisites>
+                    <hardware type="dm8000" />
+                    <hardware type="dm500hd" />
+                    <tag type="System" />
+         </prerequisites>
+          <info>
+                    <author>Dream Multimedia</author>
+                    <name>TempFanControl</name>
+                    <packagename>enigma2-plugin-systemplugins-tempfancontrol</packagename>
+                    <shortdescription>Control your system fan</shortdescription>
+                    <description>Control your internal system fan.</description>
+          </info>
+
+         <files type="package"> <!-- without version, without .ipk -->
+               <file type="package" name="enigma2-plugin-systemplugins-tempfancontrol" />
+       </files>
+</default>
index 208c7e0..11b0c59 100755 (executable)
@@ -6,22 +6,14 @@
                     <tag type="Display" />
                     <tag type="System" />
          </prerequisites>
-          <info language="en">
+          <info>
                     <author>Dream Multimedia</author>
                     <name>VideoEnhancement</name>
                     <packagename>enigma2-plugin-systemplugins-videoenhancement</packagename>
-                    <shortdescription>VideoEnhancement provides advanced video enhancement settings.</shortdescription>
-                    <description>The VideoEnhancement extension provides advanced video enhancement settings.</description>
+                    <shortdescription>VideoEnhancement provides advanced video enhancement settings</shortdescription>
+                    <description>The VideoEnhancement plugin provides advanced video enhancement settings.</description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_videoenhancement_en.jpg" />
           </info>
-          <info language="de">
-                    <author>Dream Multimedia</author>
-                    <name>Erweiterte A/V Einstellungen</name>
-                    <packagename>enigma2-plugin-systemplugins-videoenhancement</packagename>
-                    <shortdescription>Erweiterte A/V Einstellungen für Ihre Dreambox.</shortdescription>
-                    <description>Erweiterte A/V Einstellungen für Ihre Dreambox.</description>
-                    <screenshot src="http://www.dreamboxupdate.com/preview/plugin_videoenhancement_de.jpg" />
-          </info>
 
          <files type="package"> <!-- without version, without .ipk -->
                <file type="package" name="enigma2-plugin-systemplugins-videoenhancement" />
index c460943..78b170a 100755 (executable)
@@ -3,23 +3,14 @@
                     <tag type="Display" />
                     <tag type="System" />
          </prerequisites>
-          <info language="en">
+          <info>
                     <author>Dream Multimedia</author>
                     <name>VideoTune</name>
                     <packagename>enigma2-plugin-systemplugins-videotune</packagename>
-                    <shortdescription>VideoTune helps fine-tuning your tv display.</shortdescription>
+                    <shortdescription>VideoTune helps fine-tuning your tv display</shortdescription>
                     <description>The VideoTune helps fine-tuning your tv display.\nYou can control brightness and contrast of your tv.</description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_videotune.jpg" />
           </info>
-          <info language="de">
-                    <author>Dream Multimedia - DE</author>
-                    <name>VideoTune - DE </name>
-                    <packagename>enigma2-plugin-systemplugins-videotune</packagename>
-                    <shortdescription>VideoTune hilft beim fein-einstellen des Fernsehers.</shortdescription>
-                    <description>VideoTune hilf beim fein-einstellen des Fernsehers.\nSie können Kontrast und Helligkeit fein-einstellen.
-                    </description>
-                    <screenshot src="http://www.dreamboxupdate.com/preview/plugin_videotune.jpg" />
-          </info>
          <files type="package"> <!-- ohne versionsnummer, ohne .ipkg -->
                <file type="package" name="enigma2-plugin-systemplugins-videotune" />
          </files>
index fbb6e3f..e16a7dc 100755 (executable)
@@ -3,22 +3,14 @@
                     <tag type="Display" />
                     <tag type="System" />
          </prerequisites>
-          <info language="en">
+          <info>
                     <author>Dream Multimedia</author>
                     <name>Videomode</name>
                     <packagename>enigma2-plugin-systemplugins-videomode</packagename>
-                    <shortdescription>Videomode provides advanced video modes.</shortdescription>
-                    <description>The Videomode extension provides advanced video modes.</description>
+                    <shortdescription>Videomode provides advanced video mode settings</shortdescription>
+                    <description>The Videomode plugin provides advanced video mode settings.</description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_videomode_en.jpg" />
           </info>
-          <info language="de">
-                    <author>Dream Multimedia</author>
-                    <name>Videomode</name>
-                    <packagename>enigma2-plugin-systemplugins-videomode</packagename>
-                    <shortdescription>Videomode bietet erweiterte Video Einstellungen.</shortdescription>
-                    <description>Die Videomode-Erweiterung bietet erweiterte Video-Einstellungen.</description>
-                    <screenshot src="http://www.dreamboxupdate.com/preview/plugin_videomode_de.jpg" />
-          </info>
 
          <files type="package"> <!-- without version, without .ipk -->
                <file type="package" name="enigma2-plugin-systemplugins-videomode" />
index 1f882b3..eca6c0f 100755 (executable)
@@ -3,22 +3,14 @@
                     <tag type="Network" />
                     <tag type="System" />
          </prerequisites>
-          <info language="en">
+          <info>
                     <author>Dream Multimedia</author>
                     <name>WirelessLan</name>
                     <packagename>enigma2-plugin-systemplugins-wirelesslan</packagename>
                     <shortdescription>Configure your WLAN network interface</shortdescription>
-                    <description>The WirelessLan extensions helps you configuring your WLAN network interface.</description>
+                    <description>The WirelessLan plugin helps you configuring your WLAN network interface.</description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_wirelesslan_en.jpg" />
           </info>
-          <info language="de">
-                    <author>Dream Multimedia</author>
-                    <name>WirelessLan</name>
-                    <packagename>enigma2-plugin-systemplugins-wirelesslan</packagename>
-                    <shortdescription>Konfigurieren Sie Ihr WLAN Netzwerk.</shortdescription>
-                    <description>Die WirelessLan Erweiterung hilft Ihnen beim konfigurieren Ihres WLAN Netzwerkes..</description>
-                    <screenshot src="http://www.dreamboxupdate.com/preview/plugin_wirelesslan_de.jpg" />
-          </info>
 
          <files type="package"> <!-- without version, without .ipk -->
                <file type="package" name="enigma2-plugin-systemplugins-wirelesslan" />
index f7dc5b9..f42cefc 100755 (executable)
@@ -1,25 +1,23 @@
-# usage: genmetaindex.py <language> <xml-files>  > index.xml
+# usage: genmetaindex.py <xml-files>  > index.xml
 import sys, os
 from xml.etree.ElementTree import ElementTree, Element
 
-language = sys.argv[1]
-
 root = Element("index")
 
-for file in sys.argv[2:]:
+for file in sys.argv[1:]:
        p = ElementTree()
        p.parse(file)
        
        package = Element("package")
        package.set("details", os.path.basename(file))
        
-       # we need all prerequisuited
+       # we need all prerequisites
        package.append(p.find("prerequisites"))
        
        info = None
-       # we need some of the info, but only our locale
+       # we need some of the info, but not all
        for i in p.findall("info"):
-               if not info or i.get("language") == language:
+               if not info:
                        info = i
        assert info