From 834926ea17f0489f857e6cfbd886171740928d6f Mon Sep 17 00:00:00 2001 From: Stefan Pluecken Date: Fri, 6 Jan 2006 22:20:37 +0000 Subject: [PATCH] make epg toggling configurable (default set to unusable epg on INFO key) --- data/menu.xml | 2 +- data/setup.xml | 3 +- lib/python/Components/Makefile.am | 2 +- lib/python/Components/UsageConfig.py | 7 + lib/python/Screens/EpgSelection.py | 17 +- lib/python/Screens/InfoBarGenerics.py | 10 +- mytest.py | 3 + po/de.po | 299 +++++++++++++------------- 8 files changed, 189 insertions(+), 154 deletions(-) create mode 100644 lib/python/Components/UsageConfig.py diff --git a/data/menu.xml b/data/menu.xml index cf17421e..ad73da7e 100644 --- a/data/menu.xml +++ b/data/menu.xml @@ -47,7 +47,7 @@ - + diff --git a/data/setup.xml b/data/setup.xml index 51945cfa..7fe595d4 100644 --- a/data/setup.xml +++ b/data/setup.xml @@ -15,8 +15,9 @@ config.av.defaultac3 config.av.vcrswitch - + config.recording.asktozap + config.usage.epgtoggle config.network.dhcp diff --git a/lib/python/Components/Makefile.am b/lib/python/Components/Makefile.am index a5058cf9..9826daab 100644 --- a/lib/python/Components/Makefile.am +++ b/lib/python/Components/Makefile.am @@ -11,4 +11,4 @@ install_PYTHON = \ AVSwitch.py Network.py RFmod.py DiskInfo.py NimManager.py Lcd.py \ EpgList.py ScrollLabel.py Timezones.py Language.py HelpMenuList.py \ BlinkingPixmap.py Pixmap.py ConditionalWidget.py Slider.py LanguageList.py \ - PluginList.py PluginComponent.py RecordingConfig.py About.py + PluginList.py PluginComponent.py RecordingConfig.py About.py UsageConfig.py diff --git a/lib/python/Components/UsageConfig.py b/lib/python/Components/UsageConfig.py new file mode 100644 index 00000000..8b4a2960 --- /dev/null +++ b/lib/python/Components/UsageConfig.py @@ -0,0 +1,7 @@ +from config import * +import os +from enigma import * + +def InitUsageConfig(): + config.usage = ConfigSubsection(); + config.usage.epgtoggle = configElement("config.usage.epgtoggle", configSelection, 1, (("yes", _("yes")), ("no", _("no"))) ); \ No newline at end of file diff --git a/lib/python/Screens/EpgSelection.py b/lib/python/Screens/EpgSelection.py index 64be16b7..ec461e2f 100644 --- a/lib/python/Screens/EpgSelection.py +++ b/lib/python/Screens/EpgSelection.py @@ -9,6 +9,7 @@ from RecordTimer import RecordTimerEntry, parseEvent from TimerEdit import TimerEditList from TimerEntry import TimerEntry from ServiceReference import ServiceReference +from Components.config import config, currentConfigSelectionElement import xml.dom.minidom @@ -38,22 +39,26 @@ class EPGSelection(Screen): self["actions"] = ChannelActionMap(["EPGSelectActions", "OkCancelActions"], { - "cancel": self.closeClose, + "cancel": self.closeScreen, "ok": self.eventSelected, "timerAdd": self.timerAdd, "yellow": self.yellowButtonPressed, "blue": self.blueButtonPressed, - "info": self.closeClose + "info": self.infoKeyPressed }) self["actions"].csel = self self.onLayoutFinish.append(self.onCreate) - def closeClose(self): + def infoKeyPressed(self): + if currentConfigSelectionElement(config.usage.epgtoggle) == "yes": + self.close(True) + else: + self.close(False) + + def closeScreen(self): self.close(False) - - def closeInfo(self): - self.close(True) + #just used in multipeg def onCreate(self): diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py index 921dd587..10a810cf 100644 --- a/lib/python/Screens/InfoBarGenerics.py +++ b/lib/python/Screens/InfoBarGenerics.py @@ -33,6 +33,8 @@ from enigma import * import time import os +from Components.config import config, currentConfigSelectionElement + # hack alert! from Menu import MainMenu, mdom @@ -358,9 +360,15 @@ class InfoBarEPG: def __init__(self): self["EPGActions"] = HelpableActionMap(self, "InfobarEPGActions", { - "showEPGList": (self.showEPGList, _("show EPG...")), + "showEPGList": (self.showEPG, _("show EPG...")), }) + def showEPG(self): + if currentConfigSelectionElement(config.usage.epgtoggle) == "yes": + self.openSingleServiceEPG() + else: + self.showEPGList() + def showEPGList(self): bouquets = self.servicelist.getBouquetList() if bouquets is None: diff --git a/mytest.py b/mytest.py index 573a0072..b5bf0a4d 100644 --- a/mytest.py +++ b/mytest.py @@ -227,6 +227,9 @@ Components.AVSwitch.InitAVSwitch() import Components.RecordingConfig Components.RecordingConfig.InitRecordingConfig() +import Components.UsageConfig +Components.UsageConfig.InitUsageConfig() + import Components.Network Components.Network.InitNetwork() diff --git a/po/de.po b/po/de.po index b04581d4..d82bbdda 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: 2006-01-03 14:15+0100\n" +"POT-Creation-Date: 2006-01-06 23:18+0100\n" "PO-Revision-Date: 2005-12-14 03:29+0100\n" "Last-Translator: Stefan Pluecken \n" "Language-Team: none\n" @@ -34,23 +34,23 @@ msgstr "" msgid "%s (%s, %d MB free)" msgstr "%s (%s, %d MB frei)" -#: ../lib/python/Components/NimManager.py:667 +#: ../lib/python/Components/NimManager.py:673 msgid "0 V" msgstr "" -#: ../lib/python/Components/NimManager.py:670 +#: ../lib/python/Components/NimManager.py:676 msgid "1.0" msgstr "" -#: ../lib/python/Components/NimManager.py:670 +#: ../lib/python/Components/NimManager.py:676 msgid "1.1" msgstr "" -#: ../lib/python/Components/NimManager.py:670 +#: ../lib/python/Components/NimManager.py:676 msgid "1.2" msgstr "" -#: ../lib/python/Components/NimManager.py:667 +#: ../lib/python/Components/NimManager.py:673 msgid "12 V" msgstr "" @@ -58,15 +58,15 @@ msgstr "" msgid "12V Output" msgstr "" -#: ../lib/python/Components/NimManager.py:654 +#: ../lib/python/Components/NimManager.py:660 msgid "13 V" msgstr "" -#: ../lib/python/Components/NimManager.py:654 +#: ../lib/python/Components/NimManager.py:660 msgid "18 V" msgstr "" -#: ../lib/python/Components/NimManager.py:669 +#: ../lib/python/Components/NimManager.py:675 msgid "A" msgstr "" @@ -78,11 +78,11 @@ msgstr "" "Timeraufnahme fehlgeschlagen.\n" "Fernsehprogramm ändern und erneut versuchen?\n" -#: ../lib/python/Components/NimManager.py:671 +#: ../lib/python/Components/NimManager.py:677 msgid "AA" msgstr "" -#: ../lib/python/Components/NimManager.py:671 +#: ../lib/python/Components/NimManager.py:677 msgid "AB" msgstr "" @@ -90,12 +90,12 @@ msgstr "" msgid "Add" msgstr "Hinzufügen" -#: ../lib/python/Screens/EpgSelection.py:20 +#: ../lib/python/Screens/EpgSelection.py:21 msgid "Add timer" msgstr "Timer setzen" -#: ../lib/python/Components/NimManager.py:603 -#: ../lib/python/Components/NimManager.py:605 +#: ../lib/python/Components/NimManager.py:609 +#: ../lib/python/Components/NimManager.py:611 msgid "Advanced" msgstr "" @@ -103,12 +103,11 @@ msgstr "" msgid "All" msgstr "Alle" -#: ../lib/python/Screens/ScanSetup.py:170 -#: ../lib/python/Screens/ScanSetup.py:173 -#: ../lib/python/Screens/ScanSetup.py:177 +#: ../lib/python/Screens/ScanSetup.py:171 +#: ../lib/python/Screens/ScanSetup.py:174 #: ../lib/python/Screens/ScanSetup.py:178 #: ../lib/python/Screens/ScanSetup.py:179 -#: ../lib/python/Screens/ScanSetup.py:184 +#: ../lib/python/Screens/ScanSetup.py:180 #: ../lib/python/Screens/ScanSetup.py:185 #: ../lib/python/Screens/ScanSetup.py:186 #: ../lib/python/Screens/ScanSetup.py:187 @@ -116,30 +115,31 @@ msgstr "Alle" #: ../lib/python/Screens/ScanSetup.py:189 #: ../lib/python/Screens/ScanSetup.py:190 #: ../lib/python/Screens/ScanSetup.py:191 +#: ../lib/python/Screens/ScanSetup.py:192 msgid "Auto" msgstr "" -#: ../lib/python/Screens/ScanSetup.py:381 ../data/ +#: ../lib/python/Screens/ScanSetup.py:384 ../data/ msgid "Automatic Scan" msgstr "Automatische Suche" -#: ../lib/python/Components/NimManager.py:669 +#: ../lib/python/Components/NimManager.py:675 msgid "B" msgstr "" -#: ../lib/python/Components/NimManager.py:671 +#: ../lib/python/Components/NimManager.py:677 msgid "BA" msgstr "" -#: ../lib/python/Components/NimManager.py:671 +#: ../lib/python/Components/NimManager.py:677 msgid "BB" msgstr "" -#: ../lib/python/Components/NimManager.py:655 +#: ../lib/python/Components/NimManager.py:661 msgid "Band" msgstr "" -#: ../lib/python/Screens/ScanSetup.py:126 +#: ../lib/python/Screens/ScanSetup.py:127 msgid "Bandwidth" msgstr "Bandbreite" @@ -147,7 +147,7 @@ msgstr "Bandbreite" msgid "Bus: " msgstr "" -#: ../lib/python/Components/NimManager.py:663 +#: ../lib/python/Components/NimManager.py:669 msgid "C-Band" msgstr "" @@ -167,11 +167,11 @@ msgstr "Kapazität: " msgid "Channel" msgstr "Kanal" -#: ../lib/python/Screens/ChannelSelection.py:66 ../data/ +#: ../lib/python/Screens/ChannelSelection.py:69 ../data/ msgid "Channel Selection" msgstr "Kanalliste" -#: ../lib/python/Screens/InfoBarGenerics.py:181 +#: ../lib/python/Screens/InfoBarGenerics.py:183 msgid "Channel:" msgstr "Kanal:" @@ -179,11 +179,11 @@ msgstr "Kanal:" msgid "Classic" msgstr "klassisch" -#: ../lib/python/Screens/ScanSetup.py:127 +#: ../lib/python/Screens/ScanSetup.py:128 msgid "Code rate high" msgstr "" -#: ../lib/python/Screens/ScanSetup.py:128 +#: ../lib/python/Screens/ScanSetup.py:129 msgid "Code rate low" msgstr "" @@ -223,11 +223,11 @@ msgstr "Erkannte Festplatten" msgid "Detected NIMs:" msgstr "Erkannte Tuner:" -#: ../lib/python/Components/NimManager.py:620 +#: ../lib/python/Components/NimManager.py:626 msgid "DiSEqC A/B" msgstr "DiSEqC A/B" -#: ../lib/python/Components/NimManager.py:620 +#: ../lib/python/Components/NimManager.py:626 msgid "DiSEqC A/B/C/D" msgstr "DiSEqC A/B/C/D" @@ -244,7 +244,7 @@ msgid "DiSEqC repeats" msgstr "" #: ../lib/python/Screens/ScanSetup.py:104 -#: ../lib/python/Screens/ScanSetup.py:377 ../lib/python/Components/Lcd.py:31 +#: ../lib/python/Screens/ScanSetup.py:380 ../lib/python/Components/Lcd.py:31 #: ../lib/python/Components/SetupDevices.py:38 #: ../lib/python/Components/SetupDevices.py:39 #: ../lib/python/Components/SetupDevices.py:43 @@ -259,7 +259,7 @@ msgstr "Aus" msgid "Do you really want to delete this recording?" msgstr "Wollen Sie diese Aufnahme wirklich löschen?" -#: ../lib/python/Screens/InfoBarGenerics.py:786 +#: ../lib/python/Screens/InfoBarGenerics.py:798 msgid "" "Do you want to stop the current\n" "(instant) recording?" @@ -267,7 +267,7 @@ msgstr "" "Die aktuelle Direktaufnahme\n" "abbrechen?" -#: ../lib/python/Plugins/update.py:31 +#: ../lib/python/Plugins/update.py:33 msgid "" "Do you want to update your Dreambox?\n" "After pressing OK, please wait!" @@ -275,7 +275,7 @@ msgstr "" "Möchten Sie Ihre Dreambox updaten?\n" "Nach dem Druck auf OK bitte warten!" -#: ../lib/python/Screens/ChannelSelection.py:334 +#: ../lib/python/Screens/ChannelSelection.py:368 msgid "E" msgstr "O" @@ -284,13 +284,13 @@ msgstr "O" msgid "ERROR - failed to scan (%s)!" msgstr "FEHLER - Suche fehlgeschlagen (%s)!" -#: ../lib/python/Components/NimManager.py:627 -#: ../lib/python/Components/NimManager.py:682 +#: ../lib/python/Components/NimManager.py:633 +#: ../lib/python/Components/NimManager.py:688 msgid "East" msgstr "Ost" #: ../lib/python/Screens/ScanSetup.py:104 -#: ../lib/python/Screens/ScanSetup.py:377 ../lib/python/Components/Lcd.py:31 +#: ../lib/python/Screens/ScanSetup.py:380 ../lib/python/Components/Lcd.py:31 #: ../lib/python/Components/SetupDevices.py:38 #: ../lib/python/Components/SetupDevices.py:39 #: ../lib/python/Components/SetupDevices.py:43 @@ -316,7 +316,7 @@ msgid "English" msgstr "Englisch" #: ../lib/python/Screens/ScanSetup.py:91 -#: ../lib/python/Screens/ScanSetup.py:118 +#: ../lib/python/Screens/ScanSetup.py:119 msgid "FEC" msgstr "" @@ -329,8 +329,8 @@ msgid "Favourites" msgstr "Favoriten" #: ../lib/python/Screens/ScanSetup.py:87 -#: ../lib/python/Screens/ScanSetup.py:114 -#: ../lib/python/Screens/ScanSetup.py:124 +#: ../lib/python/Screens/ScanSetup.py:115 +#: ../lib/python/Screens/ScanSetup.py:125 #: ../lib/python/Screens/TimerEntry.py:141 msgid "Frequency" msgstr "Frequenz" @@ -349,11 +349,11 @@ msgstr "" msgid "German" msgstr "Deutsch" -#: ../lib/python/Screens/ScanSetup.py:131 +#: ../lib/python/Screens/ScanSetup.py:132 msgid "Guard interval mode" msgstr "" -#: ../lib/python/Screens/ScanSetup.py:132 +#: ../lib/python/Screens/ScanSetup.py:133 msgid "Hierarchy mode" msgstr "" @@ -378,8 +378,8 @@ msgid "Initializing Harddisk..." msgstr "Initialisiere Festplatte..." #: ../lib/python/Screens/ScanSetup.py:88 -#: ../lib/python/Screens/ScanSetup.py:115 -#: ../lib/python/Screens/ScanSetup.py:125 +#: ../lib/python/Screens/ScanSetup.py:116 +#: ../lib/python/Screens/ScanSetup.py:126 msgid "Inversion" msgstr "" @@ -413,7 +413,7 @@ msgstr "Breitengrad" msgid "Longitude" msgstr "Längengrad" -#: ../lib/python/Components/NimManager.py:605 +#: ../lib/python/Components/NimManager.py:611 msgid "Loopthrough to Socket A" msgstr "Verbunden mit Tuner A" @@ -421,8 +421,8 @@ msgstr "Verbunden mit Tuner A" msgid "Model: " msgstr "Modell:" -#: ../lib/python/Screens/ScanSetup.py:117 -#: ../lib/python/Screens/ScanSetup.py:129 +#: ../lib/python/Screens/ScanSetup.py:118 +#: ../lib/python/Screens/ScanSetup.py:130 msgid "Modulation" msgstr "" @@ -455,42 +455,42 @@ msgstr "" msgid "Netmask" msgstr "Netzmaske" -#: ../lib/python/Screens/EpgSelection.py:30 +#: ../lib/python/Screens/EpgSelection.py:31 msgid "Next" msgstr "" -#: ../lib/python/Components/NimManager.py:656 -#: ../lib/python/Components/NimManager.py:668 -#: ../lib/python/Components/NimManager.py:672 -#: ../lib/python/Components/NimManager.py:673 -#: ../lib/python/Components/NimManager.py:685 +#: ../lib/python/Components/NimManager.py:662 +#: ../lib/python/Components/NimManager.py:674 +#: ../lib/python/Components/NimManager.py:678 +#: ../lib/python/Components/NimManager.py:679 +#: ../lib/python/Components/NimManager.py:691 msgid "No" msgstr "Nein" -#: ../lib/python/Screens/InfoBarGenerics.py:782 +#: ../lib/python/Screens/InfoBarGenerics.py:794 msgid "No HDD found or HDD not initialized!" msgstr "" "Keine Festplatte gefunden oder\n" "Festplatte nicht initialisiert." -#: ../lib/python/Screens/ScanSetup.py:173 -#: ../lib/python/Screens/ScanSetup.py:179 -#: ../lib/python/Screens/ScanSetup.py:186 +#: ../lib/python/Screens/ScanSetup.py:174 +#: ../lib/python/Screens/ScanSetup.py:180 #: ../lib/python/Screens/ScanSetup.py:187 -#: ../lib/python/Screens/ScanSetup.py:191 -#: ../lib/python/Components/NimManager.py:669 -#: ../lib/python/Components/NimManager.py:670 -#: ../lib/python/Components/NimManager.py:671 -#: ../lib/python/Components/NimManager.py:680 +#: ../lib/python/Screens/ScanSetup.py:188 +#: ../lib/python/Screens/ScanSetup.py:192 +#: ../lib/python/Components/NimManager.py:675 +#: ../lib/python/Components/NimManager.py:676 +#: ../lib/python/Components/NimManager.py:677 +#: ../lib/python/Components/NimManager.py:686 msgid "None" msgstr "Keins" -#: ../lib/python/Components/NimManager.py:629 -#: ../lib/python/Components/NimManager.py:684 +#: ../lib/python/Components/NimManager.py:635 +#: ../lib/python/Components/NimManager.py:690 msgid "North" msgstr "Nord" -#: ../lib/python/Components/NimManager.py:605 +#: ../lib/python/Components/NimManager.py:611 msgid "Nothing connected" msgstr "Nichts angeschlossen" @@ -498,19 +498,19 @@ msgstr "Nichts angeschlossen" msgid "OK" msgstr "" -#: ../lib/python/Components/NimManager.py:655 +#: ../lib/python/Components/NimManager.py:661 msgid "Off" msgstr "Auf" -#: ../lib/python/Components/NimManager.py:655 +#: ../lib/python/Components/NimManager.py:661 msgid "On" msgstr "An" -#: ../lib/python/Components/NimManager.py:680 +#: ../lib/python/Components/NimManager.py:686 msgid "One" msgstr "Eins" -#: ../lib/python/Screens/InfoBar.py:36 +#: ../lib/python/Screens/InfoBar.py:37 msgid "Play recorded movies..." msgstr "Aufgenommene Filme abspielen..." @@ -526,7 +526,7 @@ msgstr "Bitte warten... Liste wird geladen..." msgid "Polarity" msgstr "Polarität" -#: ../lib/python/Components/NimManager.py:654 +#: ../lib/python/Components/NimManager.py:660 msgid "Polarization" msgstr "" @@ -546,7 +546,7 @@ msgstr "" msgid "Port D" msgstr "" -#: ../lib/python/Components/NimManager.py:620 +#: ../lib/python/Components/NimManager.py:626 msgid "Positioner" msgstr "Rotor" @@ -558,7 +558,7 @@ msgstr "Rotorart" msgid "Press OK to activate the settings." msgstr "OK drücken zum aktivieren" -#: ../lib/python/Screens/ScanSetup.py:382 +#: ../lib/python/Screens/ScanSetup.py:385 msgid "Press OK to scan" msgstr "Zum Starten der Suche OK drücken." @@ -566,7 +566,7 @@ msgstr "Zum Starten der Suche OK drücken." msgid "Press OK to start the scan" msgstr "Zum Starten der Suche OK drücken." -#: ../lib/python/Screens/EpgSelection.py:29 +#: ../lib/python/Screens/EpgSelection.py:30 msgid "Prev" msgstr "" @@ -574,11 +574,11 @@ msgstr "" msgid "Provider" msgstr "Provider" -#: ../lib/python/Screens/ChannelSelection.py:324 +#: ../lib/python/Screens/ChannelSelection.py:358 msgid "Providers" msgstr "Anbieter" -#: ../lib/python/Screens/InfoBarGenerics.py:835 +#: ../lib/python/Screens/InfoBarGenerics.py:847 msgid "Record" msgstr "Aufnahme" @@ -608,20 +608,24 @@ msgstr "Kanal auswahlen, von dem aufgenommen werden soll" msgid "Sequence repeat" msgstr "" -#: ../lib/python/Screens/ChannelSelection.py:326 +#: ../lib/python/Screens/ChannelSelection.py:360 msgid "Services" msgstr "Kanäle" -#: ../lib/python/Components/NimManager.py:603 -#: ../lib/python/Components/NimManager.py:605 +#: ../lib/python/Screens/InfoBar.py:38 +msgid "Show the radio player..." +msgstr "" + +#: ../lib/python/Components/NimManager.py:609 +#: ../lib/python/Components/NimManager.py:611 msgid "Simple" msgstr "Einfach" -#: ../lib/python/Components/NimManager.py:620 +#: ../lib/python/Components/NimManager.py:626 msgid "Single" msgstr "Einzeln" -#: ../lib/python/Components/NimManager.py:633 +#: ../lib/python/Components/NimManager.py:639 msgid "Slot " msgstr "" @@ -629,8 +633,8 @@ msgstr "" msgid "Socket " msgstr "Sockel " -#: ../lib/python/Components/NimManager.py:629 -#: ../lib/python/Components/NimManager.py:684 +#: ../lib/python/Components/NimManager.py:635 +#: ../lib/python/Components/NimManager.py:690 msgid "South" msgstr "Süd" @@ -638,7 +642,7 @@ msgstr "Süd" msgid "Start" msgstr "" -#: ../lib/python/Screens/InfoBarGenerics.py:788 +#: ../lib/python/Screens/InfoBarGenerics.py:800 msgid "Start recording?" msgstr "Aufnahme beginnen?" @@ -650,7 +654,7 @@ msgstr "Startzeit" msgid "Step " msgstr "Schritt " -#: ../lib/python/Screens/InfoBar.py:78 +#: ../lib/python/Screens/InfoBar.py:85 msgid "Stop playing this movie?" msgstr "Das Abspielen dieses Films beenden?" @@ -658,7 +662,7 @@ msgstr "Das Abspielen dieses Films beenden?" msgid "Stored position" msgstr "" -#: ../lib/python/Screens/InfoBarGenerics.py:840 ../data/ +#: ../lib/python/Screens/InfoBarGenerics.py:852 ../data/ msgid "Subservices" msgstr "Unterkanäle" @@ -668,7 +672,7 @@ msgid "Sunday" msgstr "Sonntag" #: ../lib/python/Screens/ScanSetup.py:89 -#: ../lib/python/Screens/ScanSetup.py:116 +#: ../lib/python/Screens/ScanSetup.py:117 msgid "Symbol Rate" msgstr "Symbolrate" @@ -676,7 +680,7 @@ msgstr "Symbolrate" msgid "Terrestrial provider" msgstr "Region" -#: ../lib/python/Components/NimManager.py:680 +#: ../lib/python/Components/NimManager.py:686 msgid "Three" msgstr "" @@ -701,11 +705,11 @@ msgstr "" msgid "Toneburst" msgstr "" -#: ../lib/python/Components/NimManager.py:620 +#: ../lib/python/Components/NimManager.py:626 msgid "Toneburst A/B" msgstr "Toneburst A/B" -#: ../lib/python/Screens/ScanSetup.py:130 +#: ../lib/python/Screens/ScanSetup.py:131 msgid "Transmission mode" msgstr "Übertragungstyp" @@ -715,21 +719,21 @@ msgid "Tuesday" msgstr "Dienstag" #: ../lib/python/Screens/ScanSetup.py:74 -#: ../lib/python/Screens/ScanSetup.py:149 +#: ../lib/python/Screens/ScanSetup.py:150 msgid "Tuner" msgstr "" -#: ../lib/python/Components/NimManager.py:680 +#: ../lib/python/Components/NimManager.py:686 msgid "Two" msgstr "" #: ../lib/python/Screens/ScanSetup.py:77 ../lib/python/Screens/ScanSetup.py:79 #: ../lib/python/Screens/ScanSetup.py:81 -#: ../lib/python/Screens/ScanSetup.py:147 +#: ../lib/python/Screens/ScanSetup.py:148 msgid "Type of scan" msgstr "Art der Suche" -#: ../lib/python/Components/NimManager.py:625 +#: ../lib/python/Components/NimManager.py:631 msgid "USALS" msgstr "USALS" @@ -747,15 +751,15 @@ msgstr "" msgid "Uncommitted DiSEqC command" msgstr "" -#: ../lib/python/Components/NimManager.py:663 +#: ../lib/python/Components/NimManager.py:669 msgid "Universal LNB" msgstr "" -#: ../lib/python/Plugins/update.py:38 +#: ../lib/python/Plugins/update.py:42 msgid "Updating finished. Here is the result:" msgstr "Aktualisierung beendet. Hier das Ergebnis:" -#: ../lib/python/Plugins/update.py:43 +#: ../lib/python/Plugins/update.py:48 msgid "Updating... Please wait... This can take some minutes..." msgstr "" "Update wird durchgeführt. Bitte warten. Der Vorgang kann einige Minuten " @@ -769,7 +773,7 @@ msgstr "Adresse automatisch beziehen (DHCP)" msgid "Use usals for this sat" msgstr "USALS für diesen Sat benutzen" -#: ../lib/python/Components/NimManager.py:663 +#: ../lib/python/Components/NimManager.py:669 msgid "User defined" msgstr "Benutzerdefiniert" @@ -777,7 +781,7 @@ msgstr "Benutzerdefiniert" msgid "Voltage mode" msgstr "" -#: ../lib/python/Screens/ChannelSelection.py:332 +#: ../lib/python/Screens/ChannelSelection.py:366 msgid "W" msgstr "" @@ -790,16 +794,16 @@ msgstr "Mittwoch" msgid "Weekday" msgstr "Wochentag" -#: ../lib/python/Components/NimManager.py:627 -#: ../lib/python/Components/NimManager.py:682 +#: ../lib/python/Components/NimManager.py:633 +#: ../lib/python/Components/NimManager.py:688 msgid "West" msgstr "" -#: ../lib/python/Components/NimManager.py:656 -#: ../lib/python/Components/NimManager.py:668 -#: ../lib/python/Components/NimManager.py:672 -#: ../lib/python/Components/NimManager.py:673 -#: ../lib/python/Components/NimManager.py:685 +#: ../lib/python/Components/NimManager.py:662 +#: ../lib/python/Components/NimManager.py:674 +#: ../lib/python/Components/NimManager.py:678 +#: ../lib/python/Components/NimManager.py:679 +#: ../lib/python/Components/NimManager.py:691 msgid "Yes" msgstr "Ja" @@ -807,44 +811,44 @@ msgstr "Ja" msgid "You cannot delete this!" msgstr "Sie können dies nicht löschen." -#: ../lib/python/Screens/ChannelSelection.py:136 +#: ../lib/python/Screens/ChannelSelection.py:139 msgid "[bouquet edit]" msgstr "" -#: ../lib/python/Screens/ChannelSelection.py:138 +#: ../lib/python/Screens/ChannelSelection.py:141 msgid "[favourite edit]" msgstr "" -#: ../lib/python/Screens/ChannelSelection.py:215 +#: ../lib/python/Screens/ChannelSelection.py:218 msgid "[move mode]" msgstr "" -#: ../lib/python/Screens/ChannelSelection.py:59 +#: ../lib/python/Screens/ChannelSelection.py:62 msgid "abort bouquet edit" msgstr "Bouqueteditieren abbrechen" -#: ../lib/python/Screens/ChannelSelection.py:62 +#: ../lib/python/Screens/ChannelSelection.py:65 msgid "abort favourites edit" msgstr "Favoriteneditor abbrechen" -#: ../lib/python/Screens/ChannelSelection.py:39 +#: ../lib/python/Screens/ChannelSelection.py:42 msgid "add service to bouquet" msgstr "Zu Bouquet hinzufügen" -#: ../lib/python/Screens/ChannelSelection.py:41 +#: ../lib/python/Screens/ChannelSelection.py:44 msgid "add service to favourites" msgstr "Kanal zu Favoriten hinzufügen" #: ../lib/python/Screens/MovieSelection.py:21 -#: ../lib/python/Screens/ChannelSelection.py:64 +#: ../lib/python/Screens/ChannelSelection.py:67 msgid "back" msgstr "zurück" -#: ../lib/python/Screens/ScanSetup.py:172 +#: ../lib/python/Screens/ScanSetup.py:173 msgid "circular left" msgstr "" -#: ../lib/python/Screens/ScanSetup.py:172 +#: ../lib/python/Screens/ScanSetup.py:173 msgid "circular right" msgstr "" @@ -856,7 +860,7 @@ msgstr "täglich" msgid "delete..." msgstr "löschen..." -#: ../lib/python/Screens/ChannelSelection.py:55 +#: ../lib/python/Screens/ChannelSelection.py:58 msgid "disable move mode" msgstr "Verschiebemodus ausschalten" @@ -864,23 +868,23 @@ msgstr "Verschiebemodus ausschalten" msgid "empty/unknown" msgstr "leer/unbekannt" -#: ../lib/python/Screens/ChannelSelection.py:51 +#: ../lib/python/Screens/ChannelSelection.py:54 msgid "enable bouquet edit" msgstr "Bouqueteditieren anschalten" -#: ../lib/python/Screens/ChannelSelection.py:53 +#: ../lib/python/Screens/ChannelSelection.py:56 msgid "enable favourite edit" msgstr "Favoriteneditor anschalten" -#: ../lib/python/Screens/ChannelSelection.py:48 +#: ../lib/python/Screens/ChannelSelection.py:51 msgid "enable move mode" msgstr "Verschiebemodus aktivieren" -#: ../lib/python/Screens/ChannelSelection.py:58 +#: ../lib/python/Screens/ChannelSelection.py:61 msgid "end bouquet edit" msgstr "Bouqueteditieren beenden" -#: ../lib/python/Screens/ChannelSelection.py:61 +#: ../lib/python/Screens/ChannelSelection.py:64 msgid "end favourites edit" msgstr "Favoriteneditor beenden" @@ -888,7 +892,7 @@ msgstr "Favoriteneditor beenden" msgid "free diskspace" msgstr "freier Festplattenspeicher" -#: ../lib/python/Screens/ScanSetup.py:172 +#: ../lib/python/Screens/ScanSetup.py:173 msgid "horizontal" msgstr "" @@ -896,19 +900,19 @@ msgstr "" msgid "init module" msgstr "Modul initialisieren" -#: ../lib/python/Screens/InfoBar.py:66 +#: ../lib/python/Screens/InfoBar.py:73 msgid "leave movie player..." msgstr "Abspielmodus verlassen..." -#: ../lib/python/Components/NimManager.py:625 +#: ../lib/python/Components/NimManager.py:631 msgid "manual" msgstr "manuell" -#: ../lib/python/Screens/InfoBarGenerics.py:318 +#: ../lib/python/Screens/InfoBarGenerics.py:320 msgid "next channel" msgstr "nächster Kanal" -#: ../lib/python/Screens/ScanSetup.py:196 +#: ../lib/python/Screens/ScanSetup.py:197 #: ../lib/python/Screens/TimerEntry.py:99 #: ../lib/python/Components/Network.py:146 #: ../lib/python/Components/RecordingConfig.py:7 @@ -927,15 +931,15 @@ msgstr "Kein Modul gefunden" msgid "none" msgstr "keins" -#: ../lib/python/Screens/ScanSetup.py:170 -#: ../lib/python/Screens/ScanSetup.py:177 -#: ../lib/python/Screens/ScanSetup.py:184 +#: ../lib/python/Screens/ScanSetup.py:171 +#: ../lib/python/Screens/ScanSetup.py:178 +#: ../lib/python/Screens/ScanSetup.py:185 msgid "off" msgstr "aus" -#: ../lib/python/Screens/ScanSetup.py:170 -#: ../lib/python/Screens/ScanSetup.py:177 -#: ../lib/python/Screens/ScanSetup.py:184 +#: ../lib/python/Screens/ScanSetup.py:171 +#: ../lib/python/Screens/ScanSetup.py:178 +#: ../lib/python/Screens/ScanSetup.py:185 msgid "on" msgstr "an" @@ -943,11 +947,11 @@ msgstr "an" msgid "once" msgstr "einmalig" -#: ../lib/python/Screens/InfoBarGenerics.py:319 +#: ../lib/python/Screens/InfoBarGenerics.py:321 msgid "previous channel" msgstr "vorheriger Kanal" -#: ../lib/python/Screens/ChannelSelection.py:43 +#: ../lib/python/Screens/ChannelSelection.py:46 msgid "remove service" msgstr "Kanal löschen" @@ -993,7 +997,7 @@ msgstr "" msgid "scan state" msgstr "Status" -#: ../lib/python/Screens/InfoBarGenerics.py:361 +#: ../lib/python/Screens/InfoBarGenerics.py:363 msgid "show EPG..." msgstr "zeige EPG..." @@ -1009,7 +1013,7 @@ msgstr "unbekannter Service" msgid "user defined" msgstr "benutzerdefiniert" -#: ../lib/python/Screens/ScanSetup.py:172 +#: ../lib/python/Screens/ScanSetup.py:173 msgid "vertical" msgstr "vertikal" @@ -1017,7 +1021,7 @@ msgstr "vertikal" msgid "weekly" msgstr "wöchentlich" -#: ../lib/python/Screens/ScanSetup.py:196 +#: ../lib/python/Screens/ScanSetup.py:197 #: ../lib/python/Screens/TimerEntry.py:99 #: ../lib/python/Components/Network.py:146 #: ../lib/python/Components/RecordingConfig.py:7 @@ -1044,6 +1048,10 @@ msgstr "Fehlerfenster verstecken" msgid "help..." msgstr "Hilfe..." +#: ../data/ +msgid "Usage" +msgstr "Bedienung" + #: ../data/ msgid "BER:" msgstr "" @@ -1105,8 +1113,8 @@ msgid "This is step number 2." msgstr "" #: ../data/ -msgid "Recording" -msgstr "Aufnahmen" +msgid "Use wizard to set up basic features" +msgstr "Grundeinstellungen jetzt vornehmen" #: ../data/ msgid "Sat / Dish Setup" @@ -1367,6 +1375,10 @@ msgstr "" msgid "Exit wizard" msgstr "Assistenten beenden" +#: ../data/ +msgid "Toggle EPG type with INFO button" +msgstr "EPG-Typen durch Druck auf INFO wechseln" + #: ../data/ msgid "Serviceinfo" msgstr "" @@ -1510,10 +1522,6 @@ msgstr "" msgid "Do you want to do a service scan?" msgstr "Jetzt nach Kanälen suchen?" -#: ../data/ -msgid "Use wizard to set up basic features" -msgstr "Grundeinstellungen jetzt vornehmen" - #: ../data/ msgid "Seek" msgstr "" @@ -1522,5 +1530,8 @@ msgstr "" msgid "Satelliteconfig" msgstr "Satelliteneinstellungen" +#~ msgid "Recording" +#~ msgstr "Aufnahmen" + #~ msgid "Plugins" #~ msgstr "Erweiterungen" -- 2.30.2