make some composite strings translatable, changed color.keys to be more standard...

diff --git a/ac3lipsync/src/AC3main.py b/ac3lipsync/src/AC3main.py
index 57f8b40..446f151 100644 (file)
--- a/ac3lipsync/src/AC3main.py
+++ b/ac3lipsync/src/AC3main.py
@@ -89,11 +89,11 @@ class AC3LipSync(Screen,InfoBarAudioSelection):
         self.setChannelInfoText()
 
         # Buttons
+        self["key_red"] = Label(_("Switch audio"))
         if self.AC3delay.bIsRecording == True:
-            self["key_red"] = Label(_(" "))
+            self["key_green"] = Label(_(" "))
         else:
-            self["key_red"] = Label(_("Save"))
-        self["key_green"] = Label(_("Switch audio"))
+            self["key_green"] = Label(_("Save"))
         self["key_yellow"] = Label(_("Set user delay"))
         self["key_blue"] = Label(self.whichKeyText[self.whichKeys])
 
@@ -116,8 +116,8 @@ class AC3LipSync(Screen,InfoBarAudioSelection):
             "right": self.keyRight,
             "up": self.keyUp,
             "down": self.keyDown,
-            "red": self.keySaveToLamedb,
-            "green": self.keyAudioSelection,
+            "red": self.keyAudioSelection,
+            "green": self.keySaveToLamedb,
             "yellow": self.keySaveDelayToKey,
             "blue": self.keySwitchKeyValues,
             "1": self.keyNumberGlobal,

diff --git a/ac3lipsync/src/AC3setup.py b/ac3lipsync/src/AC3setup.py
index 1fb1b51..523f3fd 100644 (file)
--- a/ac3lipsync/src/AC3setup.py
+++ b/ac3lipsync/src/AC3setup.py
@@ -44,7 +44,7 @@ class AC3LipSyncSetup(ConfigListScreen, Screen):
             getConfigListEntry(_("Step in ms for arrow keys"), config.plugins.AC3LipSync.arrowStepSize)
         ]
         for i in range(1 , 10):
-            self.list.append(getConfigListEntry(_("Step in ms for key %i" %i), config.plugins.AC3LipSync.keySteps[i].stepSize))
+            self.list.append(getConfigListEntry(_("Step in ms for key %s" %(str(i))), config.plugins.AC3LipSync.keySteps[i].stepSize))
 
         ConfigListScreen.__init__(self, self.list)