Merge pull request #3748 from Dima73/locale

lib/python/Screens/ChannelSelection.py

@@ -1475,7 +1475,7 @@ def getServiceName(self, ref):
 				return _("Satellites")
 			if ') ORDER BY name' in pathstr:
 				return _("All")
-		return str
+		return str if config.usage.multibouquet.value else _("Favorites")
 
 	def buildTitleString(self):
 		self.servicetitle = ""
@@ -2343,6 +2343,10 @@ def cancel(self):
 					lastservice = ref
 				if lastservice.valid() and self.getCurrentSelection() != lastservice:
 					self.setCurrentSelection(lastservice)
+		elif self.revertMode == MODE_TV and self.mode == MODE_RADIO:
+			self.setModeTv()
+		elif self.revertMode == MODE_RADIO and self.mode == MODE_TV:
+			self.setModeRadio()
 		self.asciiOff()
 		self.zapBack()
 		self.correctChannelNumber()