From acd40cc383d3a485dbb1b1d9369dc4de93b949aa Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Tue, 12 Apr 2011 14:48:47 +0200 Subject: BackupRestore.py: Fix untranslatable string (Patch by Benny De Tandt) --- lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py b/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py index 01649bb3..3db6e82d 100755 --- a/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py +++ b/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py @@ -268,7 +268,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): -- cgit v1.2.3 From 8ea52b04edc7f04d2c5d8a05156cbe0810f03612 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Tue, 12 Apr 2011 15:06:59 +0200 Subject: Scanner.py: Add MIME types for mka and mkv (Patch by Stephan Reichholf) --- lib/python/Components/Scanner.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/python/Components/Scanner.py b/lib/python/Components/Scanner.py index 813c09f8..e01c61fd 100644 --- 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) -- cgit v1.2.3