From: Torsten Link Date: Wed, 4 Mar 2009 23:38:36 +0000 (+0000) Subject: Added menu and moved functions for user-defined keys to menu. Moved save back to... X-Git-Url: http://code.vuplus.com/gitweb/?a=commitdiff_plain;h=7134681999afe7d22068a499e57d815bed16469d;p=vuplus_dvbapp-plugin Added menu and moved functions for user-defined keys to menu. Moved save back to blue key, green to ok and cancel to red key. Moved Audio- Select to yellow key --- diff --git a/ac3lipsync/CONTROL/control b/ac3lipsync/CONTROL/control index 288f38b..7f20718 100644 --- a/ac3lipsync/CONTROL/control +++ b/ac3lipsync/CONTROL/control @@ -1,5 +1,5 @@ Package: enigma2-plugin-extensions-ac3lipsync -Version: 0.5-20090301-r0 +Version: 0.6-20090305-r0 Description: Set AC3/PCM delay Architecture: mipsel Section: extra diff --git a/ac3lipsync/po/AC3LipSync.pot b/ac3lipsync/po/AC3LipSync.pot index 6b5a712..8ea8597 100644 --- a/ac3lipsync/po/AC3LipSync.pot +++ b/ac3lipsync/po/AC3LipSync.pot @@ -1,146 +1,159 @@ msgid "" msgstr "" -"Project-Id-Version: AC3-LipSync-pot\n" +"Project-Id-Version: enigma2 - AC3lipsync\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-28 13:48+0100\n" +"POT-Creation-Date: 2009-03-05 00:27+0100\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Basepath: L:\\Dreambox\\Plugins\\AC3LipSync\\locale\\pot\n" -"X-Poedit-SearchPath-0: ..\\..\\src\n" +"X-Poedit-Basepath: .\n" +"X-Poedit-SearchPath-0: L:\\Dreambox\\Eclipse\\enigma2-plugins\\ac3lipsync\\src\n" -#: ..\..\src/plugin.py:29 -#: ..\..\src/plugin.py:33 -#: ..\..\src/plugin.py:35 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/plugin.py:30 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/plugin.py:34 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/plugin.py:36 msgid "AC3 Lip Sync" msgstr "" -#: ..\..\src/plugin.py:33 -#: ..\..\src/plugin.py:35 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/plugin.py:34 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/plugin.py:36 msgid "sets the AC3 audio Delay (LipSync)" msgstr "" -#: ..\..\src/plugin.py:34 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/plugin.py:35 msgid "AC3 Lip Sync Setup" msgstr "" -#: ..\..\src/plugin.py:34 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/plugin.py:35 msgid "Setup for the AC3 Lip Sync Plugin" msgstr "" -#: ..\..\src/AC3main.py:74 -msgid "Use user delays" +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:72 +msgid "Switch to user key- delays" msgstr "" -#: ..\..\src/AC3main.py:75 -msgid "Use calc. delays" +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:73 +msgid "Switch to calculated key- delays" msgstr "" -#: ..\..\src/AC3main.py:82 -#: ..\..\src/AC3main.py:85 -#: ..\..\src/AC3main.py:136 -#: ..\..\src/AC3main.py:261 -#: ..\..\src/AC3main.py:262 -msgid "ms" +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:81 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:84 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:141 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:305 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:309 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:310 +#, python-format +msgid "%i ms" msgstr "" -#: ..\..\src/AC3main.py:83 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:82 #, python-format msgid "%s delay:" msgstr "" -#: ..\..\src/AC3main.py:84 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:83 #, python-format msgid "%s:" msgstr "" -#: ..\..\src/AC3main.py:88 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:87 msgid "Channel audio:" msgstr "" -#: ..\..\src/AC3main.py:94 -#: ..\..\src/AC3setup.py:56 -msgid " " +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:92 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3setup.py:58 +msgid "Cancel" msgstr "" -#: ..\..\src/AC3main.py:96 -#: ..\..\src/AC3setup.py:54 -msgid "Save" +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:93 +msgid "OK" msgstr "" -#: ..\..\src/AC3main.py:97 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:94 msgid "Switch audio" msgstr "" -#: ..\..\src/AC3main.py:98 -msgid "Set user delay" +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:98 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3setup.py:59 +msgid "Save" msgstr "" -#: ..\..\src/AC3main.py:205 -#: ..\..\src/AC3main.py:206 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:215 +#, python-format +msgid "Save current %(audio)s delay of %(delay)i ms to key" +msgstr "" + +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:219 +msgid "Menu" +msgstr "" + +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:228 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:288 +msgid "Invalid selection" +msgstr "" + +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:247 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:248 #, python-format msgid "Save %s delay" msgstr "" -#: ..\..\src/AC3main.py:207 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:249 msgid "Save both delays" msgstr "" -#: ..\..\src/AC3main.py:209 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:252 msgid "Which delays do you want to set" msgstr "" -#: ..\..\src/AC3main.py:244 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:284 #, python-format msgid "Saved %(audio)s value: %(delay)i ms" msgstr "" -#: ..\..\src/AC3main.py:248 -msgid "Invalid selection" -msgstr "" - -#: ..\..\src/AC3main.py:291 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:326 msgid "Select the key you want to set" msgstr "" -#: ..\..\src/AC3main.py:296 -msgid "Key" +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:332 +#, python-format +msgid "Key %(key)i (current value: %(value)i ms)" msgstr "" -#: ..\..\src/AC3main.py:301 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:337 msgid "Setting key canceled" msgstr "" -#: ..\..\src/AC3main.py:305 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:341 #, python-format msgid "%(Key)s successfully set to %(delay)i ms" msgstr "" -#: ..\..\src/AC3setup.py:42 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3setup.py:42 msgid "Minimum delay" msgstr "" -#: ..\..\src/AC3setup.py:43 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3setup.py:43 msgid "Maximum delay" msgstr "" -#: ..\..\src/AC3setup.py:44 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3setup.py:44 msgid "Step in ms for arrow keys" msgstr "" -#: ..\..\src/AC3setup.py:46 -#, python-format -msgid "Step in ms for key %i" +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3setup.py:45 +msgid "Wait time in ms before activation:" msgstr "" -#: ..\..\src/AC3setup.py:53 -msgid "Cancel" +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3setup.py:49 +#, python-format +msgid "Step in ms for key %i" msgstr "" -#: ..\..\src/AC3setup.py:55 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3setup.py:60 msgid "Recalculate..." msgstr "" diff --git a/ac3lipsync/po/de.po b/ac3lipsync/po/de.po index 60afd84..a2ddf0f 100644 --- a/ac3lipsync/po/de.po +++ b/ac3lipsync/po/de.po @@ -1,11 +1,11 @@ msgid "" msgstr "" -"Project-Id-Version: AC3LipSync-0.5\n" +"Project-Id-Version: enigma2 - AC3lipsync\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-04 23:28+0100\n" +"POT-Creation-Date: 2009-03-05 00:33+0100\n" "PO-Revision-Date: \n" "Last-Translator: \n" -"Language-Team: \n" +"Language-Team: Tode \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -35,19 +35,19 @@ msgid "Setup for the AC3 Lip Sync Plugin" msgstr "Setup für das AC3 Lip Sync Plugin" #: ..\src/AC3main.py:72 -msgid "Use user delays" -msgstr "Benutzer Verz." +msgid "Switch to user key- delays" +msgstr "Verwende benutzerdefinierte Werte für Zahlentasten" #: ..\src/AC3main.py:73 -msgid "Use calc. delays" -msgstr "autom. Verz." +msgid "Switch to calculated key- delays" +msgstr "Verwende berechnete Werte für Zahlentasten" #: ..\src/AC3main.py:81 #: ..\src/AC3main.py:84 -#: ..\src/AC3main.py:140 -#: ..\src/AC3main.py:271 -#: ..\src/AC3main.py:275 -#: ..\src/AC3main.py:276 +#: ..\src/AC3main.py:141 +#: ..\src/AC3main.py:305 +#: ..\src/AC3main.py:309 +#: ..\src/AC3main.py:310 #, python-format msgid "%i ms" msgstr "%i ms" @@ -67,54 +67,71 @@ msgid "Channel audio:" msgstr "Tonspur Sender: " #: ..\src/AC3main.py:92 +#: ..\src/AC3setup.py:58 +msgid "Cancel" +msgstr "Abbrechen" + +#: ..\src/AC3main.py:93 +msgid "OK" +msgstr "OK" + +#: ..\src/AC3main.py:94 msgid "Switch audio" msgstr "Tonspur ..." -#: ..\src/AC3main.py:96 +#: ..\src/AC3main.py:98 #: ..\src/AC3setup.py:59 msgid "Save" msgstr "Speichern" -#: ..\src/AC3main.py:97 -msgid "Set user delay" -msgstr "Setze Ben. Verz." +#: ..\src/AC3main.py:215 +#, python-format +msgid "Save current %(audio)s delay of %(delay)i ms to key" +msgstr "Aktuelle %(audio)s Verzögerung (%(delay)i ms) auf Taste legen" + +#: ..\src/AC3main.py:219 +msgid "Menu" +msgstr "Menu" + +#: ..\src/AC3main.py:228 +#: ..\src/AC3main.py:288 +msgid "Invalid selection" +msgstr "Ungültige Auswahl" -#: ..\src/AC3main.py:213 -#: ..\src/AC3main.py:214 +#: ..\src/AC3main.py:247 +#: ..\src/AC3main.py:248 #, python-format msgid "Save %s delay" msgstr "%s Delay speichern" -#: ..\src/AC3main.py:215 +#: ..\src/AC3main.py:249 msgid "Save both delays" msgstr "Beide Verzögerungen speichern" -#: ..\src/AC3main.py:218 +#: ..\src/AC3main.py:252 msgid "Which delays do you want to set" msgstr "Wählen Sie, was Sie speichern wollen" -#: ..\src/AC3main.py:250 +#: ..\src/AC3main.py:284 #, python-format msgid "Saved %(audio)s value: %(delay)i ms" msgstr "Gespeicherter %(audio)s Wert: %(delay)i ms" -#: ..\src/AC3main.py:254 -msgid "Invalid selection" -msgstr "Ungültige Auswahl" - -#: ..\src/AC3main.py:304 -msgid "Select the key you want to set" -msgstr "Wählen Sie die Taste, die Sie belegen wollen" +#: ..\src/AC3main.py:326 +#, python-format +msgid "Select the key you want to set to %i ms" +msgstr "Wählen Sie die Taste, die Sie mit %i ms belegen wollen" -#: ..\src/AC3main.py:309 -msgid "Key" -msgstr "Taste" +#: ..\src/AC3main.py:332 +#, python-format +msgid "Key %(key)i (current value: %(value)i ms)" +msgstr "Taste %(key)i (aktueller Wert: %(value)i ms)" -#: ..\src/AC3main.py:314 +#: ..\src/AC3main.py:337 msgid "Setting key canceled" msgstr "Setzen der Taste abgebrochen" -#: ..\src/AC3main.py:318 +#: ..\src/AC3main.py:341 #, python-format msgid "%(Key)s successfully set to %(delay)i ms" msgstr "%(Key)s erfolgreich auf %(delay)i ms gesetzt" @@ -140,20 +157,20 @@ msgstr "Wartezeit in ms vor Aktivierung" msgid "Step in ms for key %i" msgstr "Schrittweite in ms für Taste %i" -#: ..\src/AC3setup.py:58 -msgid "Cancel" -msgstr "Abbrechen" - #: ..\src/AC3setup.py:60 msgid "Recalculate..." msgstr "Neuberechnen" +#~ msgid "Use user delays" +#~ msgstr "Benutzer Verz." +#~ msgid "Use calc. delays" +#~ msgstr "autom. Verz." +#~ msgid "Key" +#~ msgstr "Taste" #~ msgid " " #~ msgstr " " #~ msgid "ms" #~ msgstr "ms" -#~ msgid "OK" -#~ msgstr "OK" #~ msgid "Bitstream delay:" #~ msgstr "Bitstream Verzögerung:" #~ msgid "lamedb..." diff --git a/ac3lipsync/po/it.po b/ac3lipsync/po/it.po index ba343e6..6d581c6 100644 --- a/ac3lipsync/po/it.po +++ b/ac3lipsync/po/it.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: enigma2 - AC3lipsync\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-28 13:48+0100\n" -"PO-Revision-Date: 2009-03-04 23:29+0100\n" +"POT-Creation-Date: 2009-03-05 00:34+0100\n" +"PO-Revision-Date: 2009-03-05 00:34+0100\n" "Last-Translator: \n" "Language-Team: www.linsat.net - Italy \n" "MIME-Version: 1.0\n" @@ -13,136 +13,163 @@ msgstr "" "X-Poedit-Country: ITALY\n" "X-Poedit-SourceCharset: iso-8859-1\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Poedit-Basepath: .\n" -#: ..\..\src/plugin.py:29 -#: ..\..\src/plugin.py:33 -#: ..\..\src/plugin.py:35 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/plugin.py:30 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/plugin.py:34 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/plugin.py:36 msgid "AC3 Lip Sync" msgstr "AC3 Lip Sync" -#: ..\..\src/plugin.py:33 -#: ..\..\src/plugin.py:35 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/plugin.py:34 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/plugin.py:36 msgid "sets the AC3 audio Delay (LipSync)" msgstr "Configurare Ritardo Audio AC3 (LipSync)" -#: ..\..\src/plugin.py:34 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/plugin.py:35 msgid "AC3 Lip Sync Setup" msgstr "Configurazione AC3 Lip Sync" -#: ..\..\src/plugin.py:34 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/plugin.py:35 msgid "Setup for the AC3 Lip Sync Plugin" msgstr "Configurazione Plugin AC3 Lip Sync" -#: ..\..\src/AC3main.py:74 -msgid "Use user delays" -msgstr "Usare Ritardi Pers." +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:72 +#, fuzzy +msgid "Switch to user key- delays" +msgstr "Conf. Ritardo Pers." -#: ..\..\src/AC3main.py:75 -msgid "Use calc. delays" -msgstr "Usare Ritardi Calc." +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:73 +msgid "Switch to calculated key- delays" +msgstr "" -#: ..\..\src/AC3main.py:82 -#: ..\..\src/AC3main.py:85 -#: ..\..\src/AC3main.py:136 -#: ..\..\src/AC3main.py:261 -#: ..\..\src/AC3main.py:262 -msgid "ms" -msgstr "ms" +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:81 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:84 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:141 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:305 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:309 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:310 +#, python-format +msgid "%i ms" +msgstr "" -#: ..\..\src/AC3main.py:83 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:82 #, python-format msgid "%s delay:" msgstr "Ritardo %s: " -#: ..\..\src/AC3main.py:84 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:83 #, python-format msgid "%s:" msgstr "%s: " -#: ..\..\src/AC3main.py:88 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:87 msgid "Channel audio:" msgstr "Canale Audio: " -#: ..\..\src/AC3main.py:94 -#: ..\..\src/AC3setup.py:56 -msgid " " -msgstr " " +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:92 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3setup.py:58 +msgid "Cancel" +msgstr "Annullare" -#: ..\..\src/AC3main.py:96 -#: ..\..\src/AC3setup.py:54 -msgid "Save" -msgstr "Salvare" +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:93 +msgid "OK" +msgstr "" -#: ..\..\src/AC3main.py:97 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:94 msgid "Switch audio" msgstr "Cambiare Audio" -#: ..\..\src/AC3main.py:98 -msgid "Set user delay" -msgstr "Conf. Ritardo Pers." +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:98 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3setup.py:59 +msgid "Save" +msgstr "Salvare" + +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:215 +#, fuzzy, python-format +msgid "Save current %(audio)s delay of %(delay)i ms to key" +msgstr "Salvare Ritardo %s" + +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:219 +msgid "Menu" +msgstr "" + +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:228 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:288 +msgid "Invalid selection" +msgstr "Selezione non valida!" -#: ..\..\src/AC3main.py:205 -#: ..\..\src/AC3main.py:206 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:247 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:248 #, python-format msgid "Save %s delay" msgstr "Salvare Ritardo %s" -#: ..\..\src/AC3main.py:207 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:249 msgid "Save both delays" msgstr "Salvare entrambi i Ritardi" -#: ..\..\src/AC3main.py:209 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:252 msgid "Which delays do you want to set" msgstr "Quale Ritardo Configurare" -#: ..\..\src/AC3main.py:244 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:284 #, python-format msgid "Saved %(audio)s value: %(delay)i ms" msgstr " Valore %(audio)s salvato: %(delay)i ms" -#: ..\..\src/AC3main.py:248 -msgid "Invalid selection" -msgstr "Selezione non valida!" - -#: ..\..\src/AC3main.py:291 -msgid "Select the key you want to set" +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:326 +#, fuzzy, python-format +msgid "Select the key you want to set to %i ms" msgstr "Selezionare il tasto da configurare" -#: ..\..\src/AC3main.py:296 -msgid "Key" -msgstr "Tasto" +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:332 +#, python-format +msgid "Key %(key)i (current value: %(value)i ms)" +msgstr "" -#: ..\..\src/AC3main.py:301 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:337 msgid "Setting key canceled" msgstr "Configurazione Tasto cancellata!" -#: ..\..\src/AC3main.py:305 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3main.py:341 #, python-format msgid "%(Key)s successfully set to %(delay)i ms" msgstr "%(Key)s configurato con successo a %(delay)i ms" -#: ..\..\src/AC3setup.py:42 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3setup.py:42 msgid "Minimum delay" msgstr "Ritardo Minimo" -#: ..\..\src/AC3setup.py:43 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3setup.py:43 msgid "Maximum delay" msgstr "Ritardo massimo" -#: ..\..\src/AC3setup.py:44 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3setup.py:44 msgid "Step in ms for arrow keys" msgstr "Passo in ms Tasti Cursore" -#: ..\..\src/AC3setup.py:46 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3setup.py:45 +msgid "Wait time in ms before activation:" +msgstr "" + +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3setup.py:49 #, python-format msgid "Step in ms for key %i" msgstr "Passo in ms per tasto %i" -#: ..\..\src/AC3setup.py:53 -msgid "Cancel" -msgstr "Annullare" - -#: ..\..\src/AC3setup.py:55 +#: L:\Dreambox\Eclipse\enigma2-plugins\ac3lipsync\src/AC3setup.py:60 msgid "Recalculate..." msgstr "Ricalcolare..." +#~ msgid "Use user delays" +#~ msgstr "Usare Ritardi Pers." +#~ msgid "Use calc. delays" +#~ msgstr "Usare Ritardi Calc." +#~ msgid "ms" +#~ msgstr "ms" +#~ msgid " " +#~ msgstr " " +#~ msgid "Key" +#~ msgstr "Tasto" + diff --git a/ac3lipsync/src/AC3delay.py b/ac3lipsync/src/AC3delay.py index a75d304..fc4b0c8 100644 --- a/ac3lipsync/src/AC3delay.py +++ b/ac3lipsync/src/AC3delay.py @@ -121,7 +121,6 @@ class AC3delay: self.iAudioDelay.setAC3Delay(iDelay) else: self.iAudioDelay.setPCMDelay(iDelay) - #self.activateDelay() def setFileDelay(self, sAudio, iDelay, bDelayStart): hDelay = dec2hex(iDelay*90) diff --git a/ac3lipsync/src/AC3main.py b/ac3lipsync/src/AC3main.py index 1822c2d..0f89177 100644 --- a/ac3lipsync/src/AC3main.py +++ b/ac3lipsync/src/AC3main.py @@ -28,9 +28,9 @@ class AC3LipSync(Screen,InfoBarAudioSelection): - + - + @@ -69,8 +69,8 @@ class AC3LipSync(Screen,InfoBarAudioSelection): #Which Values do the number keys use self.whichKeys = "Computed" # Computed = computed Values of keys, User = User set values of keys self.whichKeyText = {} - self.whichKeyText["Computed"] = _("Use user delays") - self.whichKeyText["User"] = _("Use calc. delays") + self.whichKeyText["Computed"] = _("Switch to user key- delays") + self.whichKeyText["User"] = _("Switch to calculated key- delays") #Screen elements @@ -89,13 +89,13 @@ class AC3LipSync(Screen,InfoBarAudioSelection): self.setChannelInfoText() # Buttons - self["key_red"] = Label(_("Switch audio")) + self["key_red"] = Label(_("Cancel")) + self["key_green"] = Label(_("OK")) + self["key_yellow"] = Label(_("Switch audio")) if self.AC3delay.bIsRecording == True: - self["key_green"] = Label("") + self["key_blue"] = Label("") else: - self["key_green"] = Label(_("Save")) - self["key_yellow"] = Label(_("Set user delay")) - self["key_blue"] = Label(self.whichKeyText[self.whichKeys]) + self["key_blue"] = Label(_("Save")) # Last saved values self.savedValue = {} @@ -108,18 +108,19 @@ class AC3LipSync(Screen,InfoBarAudioSelection): self.currentValue[PCM] = 0 # Actions - self["actions"] = NumberActionMap(["WizardActions", "NumberActions", "ColorActions"], + self["actions"] = NumberActionMap(["WizardActions", "NumberActions", "ColorActions", "MenuActions"], { + "menu": self.keyMenu, "ok": self.keyOk, "back": self.keyCancel, "left": self.keyLeft, "right": self.keyRight, "up": self.keyUp, "down": self.keyDown, - "red": self.keyAudioSelection, - "green": self.keySaveToLamedb, - "yellow": self.keySaveDelayToKey, - "blue": self.keySwitchKeyValues, + "red": self.keyCancel, + "green": self.keyOk, + "yellow": self.keyAudioSelection, + "blue": self.keySaveToLamedb, "1": self.keyNumberGlobal, "2": self.keyNumberGlobal, "3": self.keyNumberGlobal, @@ -203,10 +204,43 @@ class AC3LipSync(Screen,InfoBarAudioSelection): for sAudio in lFileDelay.keys(): iSliderValue = self.currentValue[sAudio] if iSliderValue <> self.savedValue[sAudio]: - self.whichAudio = sAudio + self.AC3delay.whichAudio = sAudio self.AC3delay.setFileDelay(sAudio, self.savedValue[sAudio], False) self.close() + def keyMenu(self): + sAudio = self.AC3delay.whichAudio + iDelay = self.savedValue[sAudio] + keyList = [ + (_("Save current %(audio)s delay of %(delay)i ms to key") %dict(audio=sAudio , delay=iDelay),"1"), + (self.whichKeyText[self.whichKeys],"2") + ] + + self.session.openWithCallback(self.DoShowMenu,ChoiceBox,_("Menu"),keyList) + + def DoShowMenu(self, answer): + if answer is not None: + if answer[1] == "1": + self.menuSaveDelayToKey() + elif answer[1] == "2": + self.menuSwitchKeyValues() + else: + sResponse = _("Invalid selection") + iType = MessageBox.TYPE_ERROR + self.session.open(MessageBox, sResponse , iType) + + def menuSwitchKeyValues(self): + if self.whichKeys == "Computed": + self.whichKeys = "User" + else: + self.whichKeys = "Computed" + self["key_blue"].setText(self.whichKeyText[self.whichKeys]) + + def menuSaveDelayToKey(self): + sAudio = self.AC3delay.whichAudio + iDelay = self[sAudio+"Slider"].getValue()+self.lowerBound + AC3SetCustomValue(self.session,iDelay) + def keySaveToLamedb(self): if self.AC3delay.bIsRecording == False: keyList = [ @@ -279,18 +313,6 @@ class AC3LipSync(Screen,InfoBarAudioSelection): self["AC3DelayInfo"].setText(sBitstreamDelay) self["PCMDelayInfo"].setText(sPCMDelay) - def keySwitchKeyValues(self): - if self.whichKeys == "Computed": - self.whichKeys = "User" - else: - self.whichKeys = "Computed" - self["key_blue"].setText(self.whichKeyText[self.whichKeys]) - - def keySaveDelayToKey(self): - sAudio = self.AC3delay.whichAudio - iDelay = self[sAudio+"Slider"].getValue()+self.lowerBound - AC3SetCustomValue(self.session,iDelay) - def audioSelected(self, audio): InfoBarAudioSelection.audioSelected(self, audio) if audio is not None: @@ -301,12 +323,13 @@ class AC3SetCustomValue: def __init__(self, session, iDelay): self.session = session self.iDelay = iDelay - self.session.openWithCallback(self.DoSetCustomValue,ChoiceBox,_("Select the key you want to set"),self.getKeyList()) + self.session.openWithCallback(self.DoSetCustomValue,ChoiceBox,_("Select the key you want to set to %i ms") %(iDelay),self.getKeyList()) def getKeyList(self): keyList = [] for i in range(1, 10): - keyList.append((_("Key")+" "+str(i),str(i))) + iValue = int(config.plugins.AC3LipSync.keySteps[i].stepSize.getValue()) + keyList.append((_("Key %(key)i (current value: %(value)i ms)") %dict(key=i, value=iValue),str(i))) return keyList def DoSetCustomValue(self,answer): diff --git a/ac3lipsync/src/AC3setup.py b/ac3lipsync/src/AC3setup.py index bc630b1..a9ac009 100644 --- a/ac3lipsync/src/AC3setup.py +++ b/ac3lipsync/src/AC3setup.py @@ -75,7 +75,7 @@ class AC3LipSyncSetup(ConfigListScreen, Screen): iUpperBound = int(config.plugins.AC3LipSync.upperBound.getValue()) iStepSize = (iUpperBound - iLowerBound)/9 for i in range(1 , 10): - config.plugins.AC3LipSync.keySteps[i].stepSize.setValue(i*iStepSize) + config.plugins.AC3LipSync.keySteps[i].stepSize.setValue(i*iStepSize+iLowerBound) self["config"].setList(self.list) def save(self):