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

diff --git a/lib/python/Components/Scanner.py b/lib/python/Components/Scanner.py
index 813c09f..e01c61f 100644 (file)
--- a/lib/python/Components/Scanner.py
+++ b/lib/python/Components/Scanner.py
@@ -11,6 +11,8 @@ add_type("application/x-dream-package", ".dmpkg")
 add_type("application/x-dream-image", ".nfi")
 add_type("video/MP2T", ".ts")
 add_type("video/x-dvd-iso", ".iso")
+add_type("video/x-matroska", ".mkv")
+add_type("audio/x-matroska", ".mka")
 
 def getType(file):
        (type, _) = guess_type(file)

diff --git a/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py b/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py
index bfe28b4..c7c143f 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py
+++ b/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py
@@ -267,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):