diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2011-09-07 12:25:04 +0200 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2011-09-07 12:25:04 +0200 |
| commit | 64d399c3d183fa3f7d02fb73e474e42583538def (patch) | |
| tree | c0b04b91f1083256ee9c1cebd063a46d4f3ce086 /lib | |
| parent | 71dd5b32ca9f94f1a35ff6e82671d89642fec23b (diff) | |
| parent | 8ea52b04edc7f04d2c5d8a05156cbe0810f03612 (diff) | |
| download | enigma2-64d399c3d183fa3f7d02fb73e474e42583538def.tar.gz enigma2-64d399c3d183fa3f7d02fb73e474e42583538def.zip | |
Merge remote-tracking branch 'origin/obi/master-20110412'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/python/Components/Scanner.py | 2 | ||||
| -rwxr-xr-x | lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py | 2 |
2 files changed, 3 insertions, 1 deletions
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) diff --git a/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py b/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py index bfe28b46..c7c143f2 100755 --- 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): |