Merge commit 'dm/experimental' into test branch

Conflicts:
	lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
	lib/python/Screens/NetworkSetup.py

diff --cc lib/python/Plugins/SystemPlugins/SoftwareManager/SoftwareTools.py
Simple merge

diff --cc lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
index b71656f,12fd609..2090aee
--- 1/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
--- 2/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
@@@ -924,11 -926,11 +926,11 @@@ class PluginManager(Screen, DreamInfoHa
  
        def runExecuteFinished(self):
                self.reloadPluginlist()
-               restartRequired = plugins.restartRequired
-               if restartRequired:
+               if plugins.restartRequired or self.restartRequired:
 -                      self.session.openWithCallback(self.ExecuteReboot, MessageBox, _("Install or remove finished.") +" "+_("Do you want to reboot your Dreambox?"), MessageBox.TYPE_YESNO)
 +                      self.session.openWithCallback(self.ExecuteReboot, MessageBox, _("Install or remove finished.") +" "+_("Do you want to reboot your STB?"), MessageBox.TYPE_YESNO)
                else:
                        self.selectedFiles = []
+                       self.restartRequired = False
                        self.detailsClosed(True)
  
        def ExecuteReboot(self, result):
@@@ -1293,9 -1298,8 +1298,8 @@@ class PluginDetails(Screen, DreamInfoHa
  
        def runUpgradeFinished(self):
                self.reloadPluginlist()
-               restartRequired = plugins.restartRequired
-               if restartRequired:
+               if plugins.restartRequired or self.restartRequired:
 -                      self.session.openWithCallback(self.UpgradeReboot, MessageBox, _("Installation finished.") +" "+_("Do you want to reboot your Dreambox?"), MessageBox.TYPE_YESNO)
 +                      self.session.openWithCallback(self.UpgradeReboot, MessageBox, _("Installation finished.") +" "+_("Do you want to reboot your STB?"), MessageBox.TYPE_YESNO)
                else:
                        self.close(True)
        def UpgradeReboot(self, result):

diff --cc lib/python/Screens/AudioSelection.py
Simple merge

diff --cc lib/python/Screens/NetworkSetup.py
index 908a615,4b15ee0..32b9f54
--- 1/lib/python/Screens/NetworkSetup.py
--- 2/lib/python/Screens/NetworkSetup.py
+++ b/lib/python/Screens/NetworkSetup.py
@@@ -702,8 -667,9 +667,9 @@@ class AdapterSetupConfiguration(Screen
                self["statuspic"].hide()
                
                self.oktext = _("Press OK on your remote control to continue.")
 -              self.reboottext = _("Your Dreambox will restart after pressing OK on your remote control.")
 +              self.reboottext = _("Your STB will restart after pressing OK on your remote control.")
-               self.errortext = _("No working wireless network interface found.\n Please verify that you have attached a compatible WLAN device or enable your local network interface.")      
+               self.errortext = _("No working wireless network interface found.\n Please verify that you have attached a compatible WLAN device or enable your local network interface.")
+               self.missingwlanplugintxt = _("The wireless LAN plugin is not installed!\nPlease install it.")
                
                self["WizardActions"] = HelpableActionMap(self, "WizardActions",
                        {