Merge branch 'experimental' into vuplus_experimental

Conflicts:

	lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py

diff --cc lib/dvb/frontend.cpp
index cf36eb0,abbb8d2..843a518
mode 100755,100644..100755
--- 1/lib/dvb/frontend.cpp
--- 2/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp

diff --cc lib/gdi/lcd.cpp
index 9cb657c,a7dc22d..9f43e35
mode 100755,100644..100755
--- 1/lib/gdi/lcd.cpp
--- 2/lib/gdi/lcd.cpp
+++ b/lib/gdi/lcd.cpp

diff --cc lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
index 04147bf,9983767..9c3b35c
--- 1/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
--- 2/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
@@@ -112,11 -124,12 +124,12 @@@ class UpdatePluginMenu(Screen)
                self.text = ""
                self.backupdirs = ' '.join( config.plugins.configurationbackup.backupdirs.value )
                if self.menu == 0:
 -                      self.list.append(("install-extensions", _("Manage extensions"), _("\nManage extensions or plugins for your Dreambox" ) + self.oktext, None))
 -                      self.list.append(("software-update", _("Software update"), _("\nOnline update of your Dreambox software." ) + self.oktext, None))
 -                      self.list.append(("software-restore", _("Software restore"), _("\nRestore your Dreambox with a new firmware." ) + self.oktext, None))
 -                      self.list.append(("system-backup", _("Backup system settings"), _("\nBackup your Dreambox settings." ) + self.oktext + "\n\n" + self.infotext, None))
 -                      self.list.append(("system-restore",_("Restore system settings"), _("\nRestore your Dreambox settings." ) + self.oktext, None))
+                       print "building menu entries"
-                       self.list.append(("system-backup", _("Backup system settings"), _("\nBackup your STB settings." ) + self.oktext, None))
 +                      self.list.append(("install-extensions", _("Manage extensions"), _("\nManage extensions or plugins for your STB" ) + self.oktext, None))
 +                      self.list.append(("software-update", _("Software update"), _("\nOnline update of your STB software." ) + self.oktext, None))
 +                      self.list.append(("software-restore", _("Software restore"), _("\nRestore your STB with a new firmware." ) + self.oktext, None))
++                      self.list.append(("system-backup", _("Backup system settings"), _("\nBackup your STB settings." ) + self.oktext + "\n\n" + self.infotext, None))
 +                      self.list.append(("system-restore",_("Restore system settings"), _("\nRestore your STB settings." ) + self.oktext, None))
                        self.list.append(("ipkg-install", _("Install local extension"),  _("\nScan for local extensions and install them." ) + self.oktext, None))
                        for p in plugins.getPlugins(PluginDescriptor.WHERE_SOFTWAREMANAGER):
                                if p.__call__.has_key("SoftwareSupported"):