From 3d05da66ac0fb10d27409fc8b8f5cd99aedf939b Mon Sep 17 00:00:00 2001 From: Stefan Pluecken Date: Thu, 24 Nov 2005 02:45:08 +0000 Subject: [PATCH 1/1] make messagebox look better and translate it --- data/keymap.xml | 5 ++- data/skin.xml | 11 ++++-- lib/python/Screens/InfoBarGenerics.py | 4 +-- lib/python/Screens/MessageBox.py | 6 ++++ po/Makefile | 1 + po/de.po | 68 ++++++++++++++++++++++++----------- 6 files changed, 70 insertions(+), 25 deletions(-) diff --git a/data/keymap.xml b/data/keymap.xml index c6160b2..1275e2a 100644 --- a/data/keymap.xml +++ b/data/keymap.xml @@ -157,9 +157,12 @@ - + + + + diff --git a/data/skin.xml b/data/skin.xml index d19e0fa..66bcd20 100644 --- a/data/skin.xml +++ b/data/skin.xml @@ -225,7 +225,9 @@ - + + + # this should be factored out into some helper code, but currently demonstrates applets. from enigma import eSize, ePoint @@ -236,7 +238,12 @@ textsize = self["text"].getSize() # y size still must be fixed in font stuff... textsize = (textsize[0], textsize[1] + 50) -wsize = (textsize[0] + 50, textsize[1] + 50) +wsizex = textsize[0] + 50 +wsizey = textsize[1] + 50 +if (280 > wsizex): + wsizex = 280 +wsize = (wsizex, wsizey) + # resize self.instance.resize(eSize(*wsize)) diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py index a9f7754..18ae105 100644 --- a/lib/python/Screens/InfoBarGenerics.py +++ b/lib/python/Screens/InfoBarGenerics.py @@ -430,9 +430,9 @@ class InfoBarInstantRecord: return if self.recording != None: - self.session.openWithCallback(self.recordQuestionCallback, MessageBox, "Do you want to stop the current\n(instant) recording?") + self.session.openWithCallback(self.recordQuestionCallback, MessageBox, _("Do you want to stop the current\n(instant) recording?")) else: - self.session.openWithCallback(self.recordQuestionCallback, MessageBox, "Start recording?") + self.session.openWithCallback(self.recordQuestionCallback, MessageBox, _("Start recording?")) from Screens.AudioSelection import AudioSelection diff --git a/lib/python/Screens/MessageBox.py b/lib/python/Screens/MessageBox.py index bde31e8..8729965 100644 --- a/lib/python/Screens/MessageBox.py +++ b/lib/python/Screens/MessageBox.py @@ -1,18 +1,24 @@ from Screen import Screen from Components.ActionMap import ActionMap from Components.Label import Label +from Components.Button import Button +from enigma import eSize, ePoint class MessageBox(Screen): def __init__(self, session, text): Screen.__init__(self, session) self["text"] = Label(text) + + self["key_green"] = Button("OK") + self["key_red"] = Button("Exit") self["actions"] = ActionMap(["OkCancelActions"], { "cancel": self.cancel, "ok": self.ok }) + def cancel(self): self.close(False) diff --git a/po/Makefile b/po/Makefile index dfbb700..9aabdeb 100644 --- a/po/Makefile +++ b/po/Makefile @@ -37,6 +37,7 @@ enigma2.pot: ../lib/python/Screens/TimerEntry.py \ ../lib/python/Screens/Wizard.py \ ../lib/python/Screens/ServiceScan.py \ + ../lib/python/Screens/InfoBarGenerics.py \ ../lib/python/Components/ServiceScan.py \ ../lib/python/Components/Lcd.py \ ../lib/python/Components/SetupDevices.py \ diff --git a/po/de.po b/po/de.po index c05cc7f..749b899 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tuxbox-enigma 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 12:33+0100\n" +"POT-Creation-Date: 2005-11-24 03:42+0100\n" "PO-Revision-Date: 2005-11-17 20:53+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../lib/python/Screens/EventView.py:58 +#: ../lib/python/Screens/EventView.py:89 #, python-format msgid "%d min" msgstr "" @@ -75,6 +75,10 @@ msgstr "Kapazitaet" msgid "Channel" msgstr "Kanal" +#: ../lib/python/Screens/InfoBarGenerics.py:164 +msgid "Channel:" +msgstr "Kanal:" + #: ../lib/python/Components/SetupDevices.py:21 msgid "Classic" msgstr "klassisch" @@ -116,11 +120,11 @@ msgstr "Erkannte Festplatten" msgid "Detected NIMs:" msgstr "Erkannte Tuner:" -#: ../lib/python/Components/NimManager.py:379 +#: ../lib/python/Components/NimManager.py:386 msgid "DiSEqC A/B" msgstr "" -#: ../lib/python/Components/NimManager.py:379 +#: ../lib/python/Components/NimManager.py:386 msgid "DiSEqC A/B/C/D" msgstr "" @@ -140,12 +144,20 @@ msgstr "Aus" msgid "Diseqcmode" msgstr "Diseqcmodus" +#: ../lib/python/Screens/InfoBarGenerics.py:433 +msgid "" +"Do you want to stop the current\n" +"(instant) recording?" +msgstr "" +"Die aktuelle Direktaufnahme\n" +"abbrechen?" + #: ../lib/python/Components/ServiceScan.py:35 #, python-format msgid "ERROR - failed to scan (%s)!" msgstr "FEHLER - Suche fehlgeschlagen (%s)!" -#: ../lib/python/Components/NimManager.py:386 +#: ../lib/python/Components/NimManager.py:393 msgid "East" msgstr "Ost" @@ -235,7 +247,7 @@ msgstr "Breitengrad" msgid "Linked to" msgstr "Verbunden mit" -#: ../lib/python/Components/NimManager.py:378 +#: ../lib/python/Components/NimManager.py:385 msgid "Linked tuner" msgstr "Verbundene Tuner" @@ -261,7 +273,7 @@ msgstr "Montag bis Freitag" msgid "Monday" msgstr "Montag" -#: ../lib/python/Components/NimManager.py:236 +#: ../lib/python/Components/NimManager.py:243 msgid "N/A" msgstr "Nicht verfuegbar" @@ -280,7 +292,7 @@ msgstr "Netzmaske" msgid "None" msgstr "Keins" -#: ../lib/python/Components/NimManager.py:388 +#: ../lib/python/Components/NimManager.py:395 msgid "North" msgstr "Nord" @@ -304,7 +316,7 @@ msgstr "" msgid "Port D" msgstr "" -#: ../lib/python/Components/NimManager.py:379 +#: ../lib/python/Components/NimManager.py:386 msgid "Positioner" msgstr "Motor" @@ -334,23 +346,23 @@ msgstr "Samstag" msgid "Select channel to record from" msgstr "Kanal auswahlen, von dem aufgenommen werden soll" -#: ../lib/python/Components/NimManager.py:378 +#: ../lib/python/Components/NimManager.py:385 msgid "Simple" msgstr "Einfach" -#: ../lib/python/Components/NimManager.py:379 +#: ../lib/python/Components/NimManager.py:386 msgid "Single" msgstr "Einzeln" -#: ../lib/python/Components/NimManager.py:392 +#: ../lib/python/Components/NimManager.py:399 msgid "Slot " msgstr "" -#: ../lib/python/Components/NimManager.py:297 +#: ../lib/python/Components/NimManager.py:304 msgid "Socket " msgstr "Sockel " -#: ../lib/python/Components/NimManager.py:388 +#: ../lib/python/Components/NimManager.py:395 msgid "South" msgstr "Sued" @@ -358,6 +370,10 @@ msgstr "Sued" msgid "Start" msgstr "" +#: ../lib/python/Screens/InfoBarGenerics.py:435 +msgid "Start recording?" +msgstr "Aufnahme beginnen?" + #: ../lib/python/Screens/TimerEntry.py:147 msgid "StartTime" msgstr "Startzeit" @@ -390,7 +406,7 @@ msgstr "Donnerstag" msgid "TimerType" msgstr "Timer-Art" -#: ../lib/python/Components/NimManager.py:379 +#: ../lib/python/Components/NimManager.py:386 msgid "Toneburst A/B" msgstr "" @@ -414,7 +430,7 @@ msgstr "" msgid "Type of scan" msgstr "Art der Suche" -#: ../lib/python/Components/NimManager.py:384 +#: ../lib/python/Components/NimManager.py:391 msgid "USALS" msgstr "" @@ -446,7 +462,7 @@ msgstr "" "\n" "Bitte zuerst eine Kanalsuche durchfuehren!" -#: ../lib/python/Components/NimManager.py:386 +#: ../lib/python/Components/NimManager.py:393 msgid "West" msgstr "" @@ -462,7 +478,7 @@ msgstr "" msgid "daily" msgstr "taeglich" -#: ../lib/python/Components/NimManager.py:299 +#: ../lib/python/Components/NimManager.py:306 msgid "empty/unknown" msgstr "leer/unbekannt" @@ -470,10 +486,14 @@ msgstr "leer/unbekannt" msgid "horizontal" msgstr "" -#: ../lib/python/Components/NimManager.py:384 +#: ../lib/python/Components/NimManager.py:391 msgid "manual" msgstr "manuell" +#: ../lib/python/Screens/InfoBarGenerics.py:260 +msgid "next channel" +msgstr "n?chster Kanal" + #: ../lib/python/Screens/ScanSetup.py:196 #: ../lib/python/Screens/TimerEntry.py:94 #: ../lib/python/Components/Network.py:134 @@ -504,6 +524,10 @@ msgstr "an" msgid "once" msgstr "einmalig" +#: ../lib/python/Screens/InfoBarGenerics.py:261 +msgid "previous channel" +msgstr "vorheriger Kanal" + #: ../lib/python/Screens/TimerEntry.py:79 msgid "repeated" msgstr "wiederholend" @@ -525,7 +549,11 @@ msgstr "" msgid "scan state" msgstr "Status" -#: ../lib/python/Screens/EventView.py:43 +#: ../lib/python/Screens/InfoBarGenerics.py:303 +msgid "show EPG..." +msgstr "zeige EPG..." + +#: ../lib/python/Screens/EventView.py:73 msgid "unknown service" msgstr "unbekannter Service" -- 2.7.4