Merge branch 'master' of git://git.opendreambox.org/git/acidburn/enigma2-master

6 files changed, 21 insertions, 19 deletions

diff --git a/lib/python/Plugins/SystemPlugins/CleanupWizard/meta/plugin_cleanupwizard.xml b/lib/python/Plugins/SystemPlugins/CleanupWizard/meta/plugin_cleanupwizard.xml
index 261eb497..10ccc73c 100755
--- a/lib/python/Plugins/SystemPlugins/CleanupWizard/meta/plugin_cleanupwizard.xml
+++ b/lib/python/Plugins/SystemPlugins/CleanupWizard/meta/plugin_cleanupwizard.xml
@@ -4,23 +4,23 @@
 	  </prerequisites>
           <info language="en">
                     <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
+                    <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>
           </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.
+                    <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>
           </info>
 	  <files type="package"> <!-- without version, without .ipk -->
-		<file type="package" name="enigma2-plugin-systemplugins-crashlogautosubmit" />
+		<file type="package" name="enigma2-plugin-systemplugins-cleanupwizard" />
 	  </files>
 </default>
diff --git a/lib/python/Screens/NetworkSetup.py b/lib/python/Screens/NetworkSetup.py
index db6b5f9c..aae7ef8c 100755
--- a/lib/python/Screens/NetworkSetup.py
+++ b/lib/python/Screens/NetworkSetup.py
@@ -824,7 +824,7 @@ class AdapterSetupConfiguration(Screen, HelpableScreen):
 		if self["menulist"].getCurrent()[1] == 'dns':
 			self["description"].setText(_("Edit the Nameserver configuration of your Dreambox.\n" ) + self.oktext )
 		if self["menulist"].getCurrent()[1] == 'scanwlan':
-			self["description"].setText(_("Scan your network for wireless Access Points and connect to them using your WLAN USB Stick\n" ) + self.oktext )
+			self["description"].setText(_("Scan your network for wireless Access Points and connect to them using your selected wireless device.\n" ) + self.oktext )
 		if self["menulist"].getCurrent()[1] == 'wlanstatus':
 			self["description"].setText(_("Shows the state of your wireless LAN connection.\n" ) + self.oktext )
 		if self["menulist"].getCurrent()[1] == 'lanrestart':
diff --git a/po/de.po b/po/de.po
index a4bf7671..6c02d378 100644..100755
--- a/po/de.po
+++ b/po/de.po
@@ -2942,8 +2942,12 @@ msgstr "Durchsuche US MID"
 msgid "Scan band US SUPER"
 msgstr "Durchsuche US SUPER"
 
-msgid "Scan your network for wireless Access Points and connect to them using your WLAN USB Stick\n"
-msgstr "Durchsucht Ihr Netzwerk nach WLAN-Zugangs-Punkten und stellt eine Verbindung mit Hilfe Ihres WLAN-USB-Sticks her\n"
+msgid ""
+"Scan your network for wireless Access Points and connect to them using your "
+"selected wireless device.\n"
+msgstr ""
+"Durchsucht Ihr Netzwerk nach WLAN Zugangspunkten und stellt eine Verbindung mit Hilfe Ihres "
+"gewählten WLAN Gerätes her.\n"
 
 msgid "Scans default lamedbs sorted by satellite with a connected dish positioner"
 msgstr ""
diff --git a/po/en.po b/po/en.po
index 2e240f5e..286f8f82 100644..100755
--- a/po/en.po
+++ b/po/en.po
@@ -2869,7 +2869,7 @@ msgstr ""
 
 msgid ""
 "Scan your network for wireless Access Points and connect to them using your "
-"WLAN USB Stick\n"
+"selected wireless device.\n"
 msgstr ""
 
 msgid ""
diff --git a/po/enigma2.pot b/po/enigma2.pot
index 7542d2e5..266151d6 100644..100755
--- a/po/enigma2.pot
+++ b/po/enigma2.pot
@@ -3853,10 +3853,9 @@ msgid "Scan band US SUPER"
 msgstr ""
 
 #: ../lib/python/Screens/NetworkSetup.py:827
-#: ../lib/python/Screens/NetworkSetup.py:826
 msgid ""
 "Scan your network for wireless Access Points and connect to them using your "
-"WLAN USB Stick\n"
+"selected wireless device.\n"
 msgstr ""
 
 #: ../lib/python/Plugins/SystemPlugins/DefaultServicesScanner/plugin.py:137
diff --git a/tools/genmetaindex.py b/tools/genmetaindex.py
index 9b62a7b1..82e79616 100755
--- a/tools/genmetaindex.py
+++ b/tools/genmetaindex.py
@@ -4,7 +4,6 @@ from xml.etree.ElementTree import ElementTree, Element
 
 language = sys.argv[1]
 
-
 root = Element("index")
 
 for file in sys.argv[2:]:
@@ -29,7 +28,7 @@ for file in sys.argv[2:]:
 			info.remove(i)
 
 	for i in info[:]:
-		package.set(str(i.tag), str(i.text))
+		package.set(i.tag, i.text)
 
 	root.append(package)