Merge commit 'origin/bug_112_enable_extensions_manager' into experimental

Conflicts:
	lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py

2 files changed, 4 insertions, 6 deletions

diff --git a/lib/python/Screens/PluginBrowser.py b/lib/python/Screens/PluginBrowser.py
index 61bb7d0a..acb9dafb 100755
--- a/lib/python/Screens/PluginBrowser.py
+++ b/lib/python/Screens/PluginBrowser.py
@@ -22,18 +22,16 @@ class PluginBrowser(Screen):
 	def __init__(self, session):
 		Screen.__init__(self, session)
 		
-		self["red"] = Label(_("Remove Plugins"))
-		self["green"] = Label(_("Download Plugins"))
+		self["red"] = Label()
+		self["green"] = Label()
 		
 		self.list = []
 		self["list"] = PluginList(self.list)
 		
-		self["actions"] = ActionMap(["WizardActions", "ColorActions"],
+		self["actions"] = ActionMap(["WizardActions"],
 		{
 			"ok": self.save,
 			"back": self.close,
-			"red": self.delete,
-			"green": self.download
 		})
 		self.onFirstExecBegin.append(self.checkWarnings)
 		self.onShown.append(self.updateList)
@@ -47,7 +45,6 @@ class PluginBrowser(Screen):
 			self.session.open(MessageBox, text = text, type = MessageBox.TYPE_WARNING)
 
 	def save(self):
-		#self.close()
 		self.run()
 	
 	def run(self):
diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
index 42a3195c..d7ba73d7 100644
--- a/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@ -8,6 +8,7 @@ from Components.MenuList import MenuList
 from Components.Button import Button
 from Components.Label import Label
 from Components.Pixmap import Pixmap
+from Components.SystemInfo import SystemInfo
 from Components.UsageConfig import defaultMoviePath
 from Components.SystemInfo import SystemInfo
 from Screens.MovieSelection import getPreferredTagEditor