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

2 files changed, 12 insertions, 12 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':