X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1019bd83746ace3233f7409c0dbd307e4ab5fb66..1e1c01fece5a4a86a762af265e382da5dbb2d8cb:/lib/python/Screens/ChannelSelection.py

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 6db9c521..b98df0f3 100644
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -34,25 +34,25 @@ class ChannelContextMenu(FixedMenu):
 
 		if not csel.bouquet_mark_edit and not csel.movemode and not inBouquetRootList:
 			if (csel.getCurrentSelection().type & eServiceReference.flagDirectory) != eServiceReference.flagDirectory:
-				menu.append(("add service to bouquet", self.addServiceToBouquetSelected))
+				menu.append((_("add service to bouquet"), self.addServiceToBouquetSelected))
 			if inBouquet:
-				menu.append(("remove service", self.removeCurrentService))
+				menu.append((_("remove service"), self.removeCurrentService))
 
 		if inBouquet: # current list is editable?
 			if not csel.bouquet_mark_edit:
 				if not csel.movemode:
-					menu.append(("enable move mode", self.toggleMoveMode))
+					menu.append((_("enable move mode"), self.toggleMoveMode))
 					if not inBouquetRootList:
-						menu.append(("enable bouquet edit", self.bouquetMarkStart))
+						menu.append((_("enable bouquet edit"), self.bouquetMarkStart))
 				else:
-					menu.append(("disable move mode", self.toggleMoveMode))
+					menu.append((_("disable move mode"), self.toggleMoveMode))
 			elif not inBouquetRootList:
-				menu.append(("end bouquet edit", self.bouquetMarkEnd))
-				menu.append(("abort bouquet edit", self.bouquetMarkAbort))
+				menu.append((_("end bouquet edit"), self.bouquetMarkEnd))
+				menu.append((_("abort bouquet edit"), self.bouquetMarkAbort))
 
-		menu.append(("back", self.close))
+		menu.append((_("back"), self.close))
 
-		FixedMenu.__init__(self, session, "Channel Selection", menu)
+		FixedMenu.__init__(self, session, _("Channel Selection"), menu)
 		self.skinName = "Menu"
 
 	def addServiceToBouquetSelected(self):
@@ -217,13 +217,13 @@ class ChannelSelectionBase(Screen):
 
 		self.service_types = self.service_types_tv
 
-		self.bouquet_root = eServiceReference('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "bouquets.tv" ORDER BY bouquet')
-		#self.bouquet_root = eServiceReference('%s FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet'%(self.service_types))
+		#self.bouquet_root = eServiceReference('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "bouquets.tv" ORDER BY bouquet')
+		self.bouquet_root = eServiceReference('%s FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet'%(self.service_types))
 
-		self["key_red"] = Button("All")
-		self["key_green"] = Button("Satellites")
-		self["key_yellow"] = Button("Provider")
-		self["key_blue"] = Button("Favourites")
+		self["key_red"] = Button(_("All"))
+		self["key_green"] = Button(_("Satellites"))
+		self["key_yellow"] = Button(_("Provider"))
+		self["key_blue"] = Button(_("Favourites"))
 
 		self["list"] = ServiceList()
 		self.servicelist = self["list"]
@@ -360,7 +360,6 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit):
 		self.lastChannelRootTimer.start(100,True)
 
 	def onCreate(self):
-		self.lastChannelRootTimer = None
 		lastroot=eServiceReference(config.tv.lastroot.value)
 		if lastroot.valid():
 			self.setRoot(lastroot)