Change some title translations, to avoid add a new very similar and repeating
authorTaapat <taapat@gmail.com>
Fri, 4 Dec 2015 21:14:04 +0000 (23:14 +0200)
committerErik Slagter <erik@openpli.org>
Fri, 11 Dec 2015 11:18:25 +0000 (12:18 +0100)
(cherry picked from commit e81080b5481090c2bf9421ef4b781d83d926b689)
Signed-off-by: Erik Slagter <erik@openpli.org>

lib/python/Plugins/SystemPlugins/HdmiCEC/plugin.py
lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py
lib/python/Screens/EpgSelection.py
lib/python/Screens/ServiceInfo.py

index 9dc708b..5161d73 100644 (file)
@@ -5,7 +5,7 @@ from Components.Sources.StaticText import StaticText
 
 class HdmiCECSetupScreen(Screen, ConfigListScreen):
        skin = """
-       <screen position="c-300,c-250" size="600,500" title="HDMI CEC setup">
+       <screen position="c-300,c-250" size="600,500" title="HDMI-CEC setup">
                <widget name="config" position="25,25" size="550,350" />
                <widget source="current_address" render="Label" position="25,375" size="550,30" zPosition="10" font="Regular;21" halign="left" valign="center" />
                <widget source="fixed_address" render="Label" position="25,405" size="550,30" zPosition="10" font="Regular;21" halign="left" valign="center" />
@@ -23,7 +23,7 @@ class HdmiCECSetupScreen(Screen, ConfigListScreen):
                self.skin = HdmiCECSetupScreen.skin
                Screen.__init__(self, session)
 
-               self.setTitle(_("HDMI CEC setup"))
+               self.setTitle(_("HDMI-CEC setup"))
 
                from Components.ActionMap import ActionMap
                from Components.Button import Button
index f27b4c0..2fa7092 100644 (file)
@@ -101,7 +101,7 @@ class SkinSelector(Screen):
 
                print "Skinselector: Selected Skin: "+self.root+self.skinfile
                restartbox = self.session.openWithCallback(self.restartGUI,MessageBox,_("GUI needs a restart to apply a new skin\nDo you want to restart the GUI now?"), MessageBox.TYPE_YESNO)
-               restartbox.setTitle(_("Restart GUI"))
+               restartbox.setTitle(_("Restart GUI now?"))
 
        def loadPreview(self):
                if self["SkinList"].getCurrent() == DEFAULTSKIN:
@@ -129,9 +129,9 @@ def SkinSelMain(session, **kwargs):
 
 def SkinSelSetup(menuid, **kwargs):
        if menuid == "system":
-               return [(_("Skin selector"), SkinSelMain, "skin_selector", None)]
+               return [(_("Skin"), SkinSelMain, "skin_selector", None)]
        else:
                return []
 
 def Plugins(**kwargs):
-       return PluginDescriptor(name="Skin selector", description= _("Select your Skin"), where = PluginDescriptor.WHERE_MENU, needsRestart = False, fnc=SkinSelSetup)
+       return PluginDescriptor(name="Skin", description= _("Select your Skin"), where = PluginDescriptor.WHERE_MENU, needsRestart = False, fnc=SkinSelSetup)
index e57ec81..5460641 100644 (file)
@@ -36,7 +36,7 @@ class EPGSelection(Screen):
 
        def __init__(self, session, service, zapFunc=None, eventid=None, bouquetChangeCB=None, serviceChangeCB=None):
                Screen.__init__(self, session)
-               self.setTitle(_("EPG Selection"))
+               self.setTitle(_("EPG selection"))
                self.bouquetChangeCB = bouquetChangeCB
                self.serviceChangeCB = serviceChangeCB
                self.ask_time = -1 #now
index d046257..1711edc 100644 (file)
@@ -69,7 +69,7 @@ class ServiceInfo(Screen):
        def __init__(self, session, serviceref=None):
                Screen.__init__(self, session)
 
-               self.setTitle(_("Service Info"))
+               self.setTitle(_("Service info"))
 
                self["actions"] = ActionMap(["OkCancelActions", "ColorActions"],
                {