X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/55bd830d52a2961ec57a6dec5969e8e7c0294c35..cbdae9732240da8ae902936fd8819ffbbae2f1cf:/lib/python/Screens/Menu.py

diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index 9eefddf7..0abc1735 100644
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -87,14 +87,14 @@ class Menu(Screen):
 		self.session.open(Setup, dialog)
 
 	def addMenu(self, destList, node):
-		MenuTitle = getValbyAttr(node, "text")
+		MenuTitle = _(getValbyAttr(node, "text"))
 		if MenuTitle != "":																	#check for title
 			a = boundFunction(self.session.open, Menu, node, node.childNodes)
 			#TODO add check if !empty(node.childNodes)
 			destList.append((MenuTitle, a))
 		
 	def addItem(self, destList, node):
-		ItemText = getValbyAttr(node, "text")
+		ItemText = _(getValbyAttr(node, "text"))
 		if ItemText != "":																	#check for name
 			for x in node.childNodes:
 				if x.nodeType != xml.dom.minidom.Element.nodeType:
@@ -139,15 +139,16 @@ class Menu(Screen):
 
 		self["menu"] = MenuList(list)	
 							
-		self["actions"] = ActionMap(["OkCancelActions"], 
+		self["actions"] = ActionMap(["OkCancelActions", "MenuActions"], 
 			{
 				"ok": self.okbuttonClick,
-				"cancel": self.close
+				"cancel": self.close,
+				"menu": self.close
 			})
 		
 		a = getValbyAttr(parent, "title")
 		if a == "":														#if empty use name
-			a = getValbyAttr(parent, "text")
+			a = _(getValbyAttr(parent, "text"))
 		self["title"] = Header(a)
 
 class MainMenu(Menu):