Merge remote-tracking branch 'origin/obi/master-20110412'

diff --combined lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py
index bfe28b468673b4511ac7c7e5e5eff7adda664d2d,3db6e82d96e9a0e946be91cd61b6bb8ac84262c0..c7c143f2b937df38d98a839d93177f47baf1a590
--- 1/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py
--- 2/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py
+++ b/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py
@@@ -17,9 -17,10 +17,9 @@@ from os import popen, path, makedirs, l
  from time import gmtime, strftime, localtime
  from datetime import date
  
 -
  config.plugins.configurationbackup = ConfigSubsection()
  config.plugins.configurationbackup.backuplocation = ConfigText(default = '/media/hdd/', visible_width = 50, fixed_size = False)
 -config.plugins.configurationbackup.backupdirs = ConfigLocations(default=[eEnv.resolve('${sysconfdir}/enigma2/'), '/etc/network/interfaces', '/etc/wpa_supplicant.conf', '/etc/resolv.conf', '/etc/default_gw', '/etc/hostname'])
 +config.plugins.configurationbackup.backupdirs = ConfigLocations(default=[eEnv.resolve('${sysconfdir}/enigma2/'), '/etc/network/interfaces', '/etc/wpa_supplicant.conf', '/etc/wpa_supplicant.ath0.conf', '/etc/wpa_supplicant.wlan0.conf', '/etc/resolv.conf', '/etc/default_gw', '/etc/hostname'])
  
  def getBackupPath():
        backuppath = config.plugins.configurationbackup.backuplocation.value
@@@ -267,7 -268,7 +267,7 @@@ class RestoreMenu(Screen)
                        self.sel = self["filelist"].getCurrent()
                        if self.sel:
                                self.val = self.path + "/" + self.sel
-                               self.session.openWithCallback(self.startDelete, MessageBox, _("Are you sure you want to delete\nfollowing backup:\n" + self.sel ))
+                               self.session.openWithCallback(self.startDelete, MessageBox, _("Are you sure you want to delete\nfollowing backup:\n") + self.sel)
  
        def startDelete(self, ret = False):
                if (ret == True):