translations

usals-setup

diff --git a/data/skin.xml b/data/skin.xml
index 80337c93b68be5f5d32c80c15d549b3e05dec3be..33a5fc0eefe8e32a84ffb8c4c30dc931a89db8c8 100644 (file)
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -81,8 +81,8 @@
                        <widget name="entries" position="20,70" size="320,150" />
                        <widget name="bottom" position="20,230" size="320,25" font="Arial;23" />
                </screen>
-               <screen name="NimSetup" position="140,165" size="360,180" title="Satconfig">
-                       <widget name="config" position="20,10" size="320,150" />
+               <screen name="NimSetup" position="140,165" size="360,250" title="Satconfig">
+                       <widget name="config" position="20,10" size="320,220" />
                </screen>
                <screen name="Satconfig" position="140,125" size="460,280" title="Satconfig">
                        <widget name="config" position="10,50" size="420,150" />

diff --git a/lib/dvb_ci/dvbci.cpp b/lib/dvb_ci/dvbci.cpp
index 59425bbccd063217b18e062ebb486ec028aee1bf..e3fd93849b9fe41e49272cc4d0eb25cccb77d0fd 100644 (file)
--- a/lib/dvb_ci/dvbci.cpp
+++ b/lib/dvb_ci/dvbci.cpp
@@ -199,11 +199,11 @@ void eDVBCIInterfaces::gotPMT(eDVBServicePMTHandler *pmthandler)
                        // HACK this assigns ALL RUNNING SERVICES to the first free CI !!!
                        for (eSmartPtrList<eDVBCISlot>::iterator ci_it(m_slots.begin()); ci_it != m_slots.end(); ++ci_it)
                        {
-                               eDVBCISlot **usedby = &it->usedby;
+/*                             eDVBCISlot **usedby = &it->usedby;
                                *usedby = ci_it;
                                (*usedby)->resetPrevSentCAPMTVersion();
                                break;
-                               
+                               */
                        }
                }
                if (it->usedby)

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 31c09446a53f4c48171366474aa9b6c443297d2b..5a18a454fa8715cec5448e2878e805b76e8bb959 100644 (file)
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -375,15 +375,17 @@ def InitNimManager(nimmgr):
                nim = config.Nims[x]
                
                if slot.nimType == nimmgr.nimType["DVB-S"]:
-                       nim.configMode = configElement(cname + "configMode", configSelection, 0, (_("Simple"), _("Linked tuner"))) # _("Advanced")));
+                       nim.configMode = configElement(cname + "configMode", configSelection, 0, (_("Simple"), _("Linked tuner"))) # "Advanced"));
                        nim.diseqcMode = configElement(cname + "diseqcMode", configSelection, 2, (_("Single"), _("Toneburst A/B"), _("DiSEqC A/B"), _("DiSEqC A/B/C/D"), _("Positioner")));
                        nim.diseqcA = configElement(cname + "diseqcA", configSatlist, 192, nimmgr.satList);
                        nim.diseqcB = configElement(cname + "diseqcB", configSatlist, 130, nimmgr.satList);
                        nim.diseqcC = configElement(cname + "diseqcC", configSatlist, 0, nimmgr.satList);
                        nim.diseqcD = configElement(cname + "diseqcD", configSatlist, 0, nimmgr.satList);
-                       nim.longitude = configElement(cname + "longitude", configSequence, [0,0], configsequencearg.get("FLOAT", [(0,90),(0,999)]));
-                       nim.latitude = configElement(cname + "latitude", configSequence, [0,0], configsequencearg.get("FLOAT", [(0,90),(0,999)]));
-                       
+                       nim.positionerMode = configElement(cname + "positionerMode", configSelection, 0, (_("USALS"), _("manual")));
+                       nim.longitude = configElement(cname + "longitude", configSequence, [5,100], configsequencearg.get("FLOAT", [(0,90),(0,999)]));
+                       nim.longitudeOrientation = configElement(cname + "longitudeOrientation", configSelection, 0, (_("East"), _("West")))
+                       nim.latitude = configElement(cname + "latitude", configSequence, [50,767], configsequencearg.get("FLOAT", [(0,90),(0,999)]));
+                       nim.latitudeOrientation = configElement(cname + "latitudeOrientation", configSelection, 0, (_("North"), _("South")))
                        satNimList = nimmgr.getNimListOfType(nimmgr.nimType["DVB-S"], slot.slotid)
                        satNimListNames = []
                        for x in satNimList:

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 30e2d5d50f9a9307f19455275739e277c6e5955c..c1a6d5b7ec0b9edfd10aef4c8daac587dd1f0f77 100644 (file)
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -19,10 +19,16 @@ class NimSetup(Screen):
                        if mode >= 3:           # > 2 Sats
                                list.append(getConfigListEntry(_("Port C"), config.Nims[nim.slotid].diseqcC))
                                list.append(getConfigListEntry(_("Port D"), config.Nims[nim.slotid].diseqcD))
+       
        def createPositionerSetup(self, nim, list):
-               list.append(getConfigListEntry(_("Longitude"), config.Nims[nim.slotid].longitude))
-               list.append(getConfigListEntry(_("Latitude"), config.Nims[nim.slotid].latitude))
-               pass
+               list.append(getConfigListEntry(_("Positioner mode"), config.Nims[nim.slotid].positionerMode))
+               if (config.Nims[nim.slotid].positionerMode.value == 0): # USALS
+                       list.append(getConfigListEntry(_("Longitude"), config.Nims[nim.slotid].longitude))
+                       list.append(getConfigListEntry("", config.Nims[nim.slotid].longitudeOrientation))
+                       list.append(getConfigListEntry(_("Latitude"), config.Nims[nim.slotid].latitude))
+                       list.append(getConfigListEntry("", config.Nims[nim.slotid].latitudeOrientation))
+               elif (config.Nims[nim.slotid].positionerMode.value == 1): # manual
+                       pass
        
        def createSetup(self):
                self.list = [ ]

diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
index a03435ee847013c886048c2652715a2b2d374919..e649666f5acf083bccde6f23f8e89c38460caafd 100644 (file)
--- a/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@ -76,22 +76,22 @@ class TimerEntry(Screen):
                                type = 0
                                repeated = 0
                        
-                       config.timerentry.type = configElement_nonSave("config.timerentry.type", configSelection, type, ("once", "repeated"))
+                       config.timerentry.type = configElement_nonSave("config.timerentry.type", configSelection, type, (_("once"), _("repeated")))
                        config.timerentry.description = configElement_nonSave("config.timerentry.description", configText, self.timer.description, (configText.extendableSize, self.keyRightCallback))
 
-                       config.timerentry.repeated = configElement_nonSave("config.timerentry.repeated", configSelection, repeated, ("daily", "weekly", "Mon-Fri", "user-defined"))
+                       config.timerentry.repeated = configElement_nonSave("config.timerentry.repeated", configSelection, repeated, (_("daily"), _("weekly"), _("Mon-Fri"), _("user-defined")))
 
-                       config.timerentry.startdate = configElement_nonSave("config.timerentry.startdate", configDateTime, self.timer.begin, ("%d.%B %Y", 86400))
+                       config.timerentry.startdate = configElement_nonSave("config.timerentry.startdate", configDateTime, self.timer.begin, (_("%d.%B %Y"), 86400))
                        config.timerentry.starttime = configElement_nonSave("config.timerentry.starttime", configSequence, [int(time.strftime("%H", time.localtime(self.timer.begin))), int(time.strftime("%M", time.localtime(self.timer.begin)))], configsequencearg.get("CLOCK"))
 
-                       config.timerentry.enddate = configElement_nonSave("config.timerentry.enddate", configDateTime, self.timer.end, ("%d.%B %Y", 86400))
+                       config.timerentry.enddate = configElement_nonSave("config.timerentry.enddate", configDateTime, self.timer.end, (_("%d.%B %Y"), 86400))
                        config.timerentry.endtime = configElement_nonSave("config.timerentry.endtime", configSequence, [int(time.strftime("%H", time.localtime(self.timer.end))), int(time.strftime("%M", time.localtime(self.timer.end)))], configsequencearg.get("CLOCK"))
 
-                       config.timerentry.weekday = configElement_nonSave("config.timerentry.weekday", configSelection, weekday, ("Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"))
+                       config.timerentry.weekday = configElement_nonSave("config.timerentry.weekday", configSelection, weekday, (_("Monday"), _("Tuesday"), _("Wednesday"), _("Thursday"), _("Friday"), _("Saturday"), _("Sunday")))
 
                        config.timerentry.day = []
                        for x in range(0,7):
-                               config.timerentry.day.append(configElement_nonSave("config.timerentry.day[" + str(x) + "]", configSelection, day[x], ("yes", "no")))
+                               config.timerentry.day.append(configElement_nonSave("config.timerentry.day[" + str(x) + "]", configSelection, day[x], (_("yes"), _("no"))))
 
 
                        # FIXME some service-chooser needed here
@@ -114,38 +114,42 @@ class TimerEntry(Screen):
 
        def createSetup(self):
                self.list = []
-               self.list.append(getConfigListEntry("Description", config.timerentry.description))
-               self.list.append(getConfigListEntry("TimerType", config.timerentry.type))
+               self.list.append(getConfigListEntry(_("Description"), config.timerentry.description))
+               self.list.append(getConfigListEntry(_("TimerType"), config.timerentry.type))
 
                if (config.timerentry.type.value == 0): # once
                        pass
                else: # repeated
-                       self.list.append(getConfigListEntry("Frequency", config.timerentry.repeated))
+                       self.list.append(getConfigListEntry(_("Frequency"), config.timerentry.repeated))
                        if (config.timerentry.repeated.value == 0): # daily
                                pass
                        if (config.timerentry.repeated.value == 2): # Mon-Fri
                                pass
                        if (config.timerentry.repeated.value == 1): # weekly
-                               self.list.append(getConfigListEntry("Weekday", config.timerentry.weekday))
+                               self.list.append(getConfigListEntry(_("Weekday"), config.timerentry.weekday))
 
                        if (config.timerentry.repeated.value == 3): # user-defined
-                               self.list.append(getConfigListEntry("Monday", config.timerentry.day[0]))
-                               self.list.append(getConfigListEntry("Tuesday", config.timerentry.day[1]))
-                               self.list.append(getConfigListEntry("Wednesday", config.timerentry.day[2]))
-                               self.list.append(getConfigListEntry("Thursday", config.timerentry.day[3]))
-                               self.list.append(getConfigListEntry("Friday", config.timerentry.day[4]))
-                               self.list.append(getConfigListEntry("Saturday", config.timerentry.day[5]))
-                               self.list.append(getConfigListEntry("Sunday", config.timerentry.day[6]))
+                               self.list.append(getConfigListEntry(_("Monday"), config.timerentry.day[0]))
+                               self.list.append(getConfigListEntry(_("Tuesday"), config.timerentry.day[1]))
+                               self.list.append(getConfigListEntry(_("Wednesday"), config.timerentry.day[2]))
+                               self.list.append(getConfigListEntry(_("Thursday"), config.timerentry.day[3]))
+                               self.list.append(getConfigListEntry(_("Friday"), config.timerentry.day[4]))
+                               self.list.append(getConfigListEntry(_("Saturday"), config.timerentry.day[5]))
+                               self.list.append(getConfigListEntry(_("Sunday"), config.timerentry.day[6]))
 
                        #self.list.append(getConfigListEntry("StartDate", config.timerentry.startdate))
 #              self.list.append(getConfigListEntry("Weekday", config.timerentry.weekday))
 
                if (config.timerentry.type.value == 0): # once
-                       self.list.append(getConfigListEntry("StartDate", config.timerentry.startdate))
-               self.list.append(getConfigListEntry("StartTime", config.timerentry.starttime))
+                       self.list.append(getConfigListEntry(_("Start"), config.timerentry.startdate))
+                       self.list.append(getConfigListEntry("", config.timerentry.starttime))
+               else:
+                       self.list.append(getConfigListEntry(_("StartTime"), config.timerentry.starttime))
                if (config.timerentry.type.value == 0): # once
-                       self.list.append(getConfigListEntry("EndDate", config.timerentry.enddate))
-               self.list.append(getConfigListEntry("EndTime", config.timerentry.endtime))
+                       self.list.append(getConfigListEntry(_("End"), config.timerentry.enddate))
+                       self.list.append(getConfigListEntry("", config.timerentry.endtime))
+               else:
+                       self.list.append(getConfigListEntry(_("EndTime"), config.timerentry.endtime))
 
                self.list.append(getConfigListEntry(_("Channel"), config.timerentry.service))
 
@@ -154,9 +158,9 @@ class TimerEntry(Screen):
 
        def newConfig(self):
                print self["config"].getCurrent()
-               if self["config"].getCurrent()[0] == "TimerType":
+               if self["config"].getCurrent()[0] == _("TimerType"):
                        self.createSetup()
-               if self["config"].getCurrent()[0] == "Frequency":
+               if self["config"].getCurrent()[0] == _("Frequency"):
                        self.createSetup()
 
        def keyLeft(self):

diff --git a/po/Makefile b/po/Makefile
index 2f169a246ce569c74b4caba4bd54b107801d71c0..dfbb70046c98ac3b6edbd6d8dcc4f4939db348e6 100644 (file)
--- a/po/Makefile
+++ b/po/Makefile
@@ -34,6 +34,7 @@ enigma2.pot:
                        ../lib/python/Screens/HarddiskSetup.py \
                        ../lib/python/Screens/InfoBar.py \
                        ../lib/python/Screens/TimerEdit.py \
+                       ../lib/python/Screens/TimerEntry.py \
                        ../lib/python/Screens/Wizard.py \
                        ../lib/python/Screens/ServiceScan.py \
                        ../lib/python/Components/ServiceScan.py \

diff --git a/po/de.po b/po/de.po
index 99303ff0b2ea84e54ec52a29dfd97cb429d24b04..c05cc7f1793c42757a6d2f1be62b43f8eb72eaae 100644 (file)
--- 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 00:56+0100\n"
+"POT-Creation-Date: 2005-11-23 12:33+0100\n"
 "PO-Revision-Date: 2005-11-17 20:53+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -21,6 +21,11 @@ msgstr ""
 msgid "%d min"
 msgstr ""
 
+#: ../lib/python/Screens/TimerEntry.py:84
+#: ../lib/python/Screens/TimerEntry.py:87
+msgid "%d.%B %Y"
+msgstr ""
+
 #: ../lib/python/Screens/About.py:25
 #, python-format
 msgid "%s (%s, %d MB free)"
@@ -57,7 +62,7 @@ msgstr ""
 msgid "Bus: "
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:46
+#: ../lib/python/Screens/Satconfig.py:52
 msgid "Cable provider"
 msgstr "Kabelanbieter"
 
@@ -65,6 +70,11 @@ msgstr "Kabelanbieter"
 msgid "Capacity: "
 msgstr "Kapazitaet"
 
+#: ../lib/python/Screens/TimerEntry.py:154
+#: ../lib/python/Screens/TimerEntry.py:181 ../data/
+msgid "Channel"
+msgstr "Kanal"
+
 #: ../lib/python/Components/SetupDevices.py:21
 msgid "Classic"
 msgstr "klassisch"
@@ -81,7 +91,7 @@ msgstr ""
 msgid "Code rate low"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:31 ../lib/python/Screens/Satconfig.py:57
+#: ../lib/python/Screens/Satconfig.py:37 ../lib/python/Screens/Satconfig.py:63
 #: ../data/
 msgid "Configmode"
 msgstr "Konfigurationsmodus"
@@ -94,6 +104,10 @@ msgstr "Standard"
 msgid "Delete"
 msgstr "Loeschen"
 
+#: ../lib/python/Screens/TimerEntry.py:117
+msgid "Description"
+msgstr "Beschreibung"
+
 #: ../lib/python/Screens/About.py:22
 msgid "Detected HDD:"
 msgstr "Erkannte Festplatten"
@@ -102,11 +116,11 @@ msgstr "Erkannte Festplatten"
 msgid "Detected NIMs:"
 msgstr "Erkannte Tuner:"
 
-#: ../lib/python/Components/NimManager.py:370
+#: ../lib/python/Components/NimManager.py:379
 msgid "DiSEqC A/B"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:370
+#: ../lib/python/Components/NimManager.py:379
 msgid "DiSEqC A/B/C/D"
 msgstr ""
 
@@ -122,7 +136,7 @@ msgstr ""
 msgid "Disable"
 msgstr "Aus"
 
-#: ../lib/python/Screens/Satconfig.py:34 ../lib/python/Screens/Satconfig.py:55
+#: ../lib/python/Screens/Satconfig.py:40 ../lib/python/Screens/Satconfig.py:61
 msgid "Diseqcmode"
 msgstr "Diseqcmodus"
 
@@ -131,6 +145,10 @@ msgstr "Diseqcmodus"
 msgid "ERROR - failed to scan (%s)!"
 msgstr "FEHLER - Suche fehlgeschlagen (%s)!"
 
+#: ../lib/python/Components/NimManager.py:386
+msgid "East"
+msgstr "Ost"
+
 #: ../lib/python/Screens/ScanSetup.py:104
 #: ../lib/python/Screens/ScanSetup.py:360 ../lib/python/Components/Lcd.py:32
 #: ../lib/python/Components/SetupDevices.py:38
@@ -143,6 +161,14 @@ msgstr "FEHLER - Suche fehlgeschlagen (%s)!"
 msgid "Enable"
 msgstr "Ein"
 
+#: ../lib/python/Screens/TimerEntry.py:149
+msgid "End"
+msgstr "Ende"
+
+#: ../lib/python/Screens/TimerEntry.py:152
+msgid "EndTime"
+msgstr "Endzeit"
+
 #: ../lib/python/Components/SetupDevices.py:24
 #: ../lib/python/Components/Language.py:9
 msgid "English"
@@ -156,9 +182,16 @@ msgstr ""
 #: ../lib/python/Screens/ScanSetup.py:87
 #: ../lib/python/Screens/ScanSetup.py:114
 #: ../lib/python/Screens/ScanSetup.py:124
+#: ../lib/python/Screens/TimerEntry.py:123
+#: ../lib/python/Screens/TimerEntry.py:163
 msgid "Frequency"
 msgstr "Frequenz"
 
+#: ../lib/python/Screens/TimerEntry.py:90
+#: ../lib/python/Screens/TimerEntry.py:136
+msgid "Friday"
+msgstr "Freitag"
+
 #: ../lib/python/Screens/NetworkSetup.py:44 ../data/
 msgid "Gateway"
 msgstr ""
@@ -194,19 +227,19 @@ msgstr "Initialisiere Festplatte..."
 msgid "Inversion"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:24 ../data/
+#: ../lib/python/Screens/Satconfig.py:28 ../data/
 msgid "Latitude"
 msgstr "Breitengrad"
 
-#: ../lib/python/Screens/Satconfig.py:41
+#: ../lib/python/Screens/Satconfig.py:47
 msgid "Linked to"
 msgstr "Verbunden mit"
 
-#: ../lib/python/Components/NimManager.py:369
+#: ../lib/python/Components/NimManager.py:378
 msgid "Linked tuner"
 msgstr "Verbundene Tuner"
 
-#: ../lib/python/Screens/Satconfig.py:23 ../data/
+#: ../lib/python/Screens/Satconfig.py:26 ../data/
 msgid "Longitude"
 msgstr "Laengengrad"
 
@@ -219,6 +252,15 @@ msgstr "Modell:"
 msgid "Modulation"
 msgstr ""
 
+#: ../lib/python/Screens/TimerEntry.py:82
+msgid "Mon-Fri"
+msgstr "Montag bis Freitag"
+
+#: ../lib/python/Screens/TimerEntry.py:90
+#: ../lib/python/Screens/TimerEntry.py:132
+msgid "Monday"
+msgstr "Montag"
+
 #: ../lib/python/Components/NimManager.py:236
 msgid "N/A"
 msgstr "Nicht verfuegbar"
@@ -238,9 +280,13 @@ msgstr "Netzmaske"
 msgid "None"
 msgstr "Keins"
 
+#: ../lib/python/Components/NimManager.py:388
+msgid "North"
+msgstr "Nord"
+
 #: ../lib/python/Screens/ScanSetup.py:90
 msgid "Polarity"
-msgstr ""
+msgstr "Polaritaet"
 
 #: ../lib/python/Screens/Satconfig.py:15
 msgid "Port A"
@@ -258,10 +304,14 @@ msgstr ""
 msgid "Port D"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:370
+#: ../lib/python/Components/NimManager.py:379
 msgid "Positioner"
 msgstr "Motor"
 
+#: ../lib/python/Screens/Satconfig.py:24
+msgid "Positioner mode"
+msgstr ""
+
 #: ../lib/python/Screens/ScanSetup.py:365
 msgid "Press OK to scan"
 msgstr "Zum Starten der Suche OK druecken."
@@ -275,15 +325,24 @@ msgstr "Zum Starten der Suche OK druecken."
 msgid "Satellite"
 msgstr "Satellit"
 
-#: ../lib/python/Components/NimManager.py:369
+#: ../lib/python/Screens/TimerEntry.py:90
+#: ../lib/python/Screens/TimerEntry.py:137
+msgid "Saturday"
+msgstr "Samstag"
+
+#: ../lib/python/Screens/TimerEntry.py:182
+msgid "Select channel to record from"
+msgstr "Kanal auswahlen, von dem aufgenommen werden soll"
+
+#: ../lib/python/Components/NimManager.py:378
 msgid "Simple"
 msgstr "Einfach"
 
-#: ../lib/python/Components/NimManager.py:370
+#: ../lib/python/Components/NimManager.py:379
 msgid "Single"
 msgstr "Einzeln"
 
-#: ../lib/python/Components/NimManager.py:381
+#: ../lib/python/Components/NimManager.py:392
 msgid "Slot "
 msgstr ""
 
@@ -291,20 +350,47 @@ msgstr ""
 msgid "Socket "
 msgstr "Sockel "
 
+#: ../lib/python/Components/NimManager.py:388
+msgid "South"
+msgstr "Sued"
+
+#: ../lib/python/Screens/TimerEntry.py:144
+msgid "Start"
+msgstr ""
+
+#: ../lib/python/Screens/TimerEntry.py:147
+msgid "StartTime"
+msgstr "Startzeit"
+
 #: ../lib/python/Screens/InfoBar.py:72
 msgid "Stop playing this movie?"
 msgstr "Das Abspielen dieses Films beenden?"
 
+#: ../lib/python/Screens/TimerEntry.py:90
+#: ../lib/python/Screens/TimerEntry.py:138
+msgid "Sunday"
+msgstr "Sonntag"
+
 #: ../lib/python/Screens/ScanSetup.py:89
 #: ../lib/python/Screens/ScanSetup.py:116
 msgid "Symbolrate"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:48
+#: ../lib/python/Screens/Satconfig.py:54
 msgid "Terrestrial provider"
 msgstr "Region"
 
-#: ../lib/python/Components/NimManager.py:370
+#: ../lib/python/Screens/TimerEntry.py:90
+#: ../lib/python/Screens/TimerEntry.py:135
+msgid "Thursday"
+msgstr "Donnerstag"
+
+#: ../lib/python/Screens/TimerEntry.py:118
+#: ../lib/python/Screens/TimerEntry.py:161
+msgid "TimerType"
+msgstr "Timer-Art"
+
+#: ../lib/python/Components/NimManager.py:379
 msgid "Toneburst A/B"
 msgstr ""
 
@@ -312,6 +398,11 @@ msgstr ""
 msgid "Transmission mode"
 msgstr ""
 
+#: ../lib/python/Screens/TimerEntry.py:90
+#: ../lib/python/Screens/TimerEntry.py:133
+msgid "Tuesday"
+msgstr "Dienstag"
+
 #: ../lib/python/Screens/ScanSetup.py:74
 #: ../lib/python/Screens/ScanSetup.py:149
 msgid "Tuner"
@@ -323,11 +414,24 @@ msgstr ""
 msgid "Type of scan"
 msgstr "Art der Suche"
 
+#: ../lib/python/Components/NimManager.py:384
+msgid "USALS"
+msgstr ""
+
 #: ../lib/python/Screens/NetworkSetup.py:40
 #: ../lib/python/Screens/NetworkSetup.py:52 ../data/
 msgid "Use DHCP"
 msgstr "Adresse automatisch beziehen (DHCP)"
 
+#: ../lib/python/Screens/TimerEntry.py:90
+#: ../lib/python/Screens/TimerEntry.py:134
+msgid "Wednesday"
+msgstr "Mittwoch"
+
+#: ../lib/python/Screens/TimerEntry.py:129
+msgid "Weekday"
+msgstr "Wochentag"
+
 #: ../lib/python/Screens/Wizard.py:24
 msgid ""
 "Welcome!\n"
@@ -342,6 +446,10 @@ msgstr ""
 "\n"
 "Bitte zuerst eine Kanalsuche durchfuehren!"
 
+#: ../lib/python/Components/NimManager.py:386
+msgid "West"
+msgstr ""
+
 #: ../lib/python/Screens/ScanSetup.py:172
 msgid "circular left"
 msgstr ""
@@ -350,6 +458,10 @@ msgstr ""
 msgid "circular right"
 msgstr ""
 
+#: ../lib/python/Screens/TimerEntry.py:82
+msgid "daily"
+msgstr "taeglich"
+
 #: ../lib/python/Components/NimManager.py:299
 msgid "empty/unknown"
 msgstr "leer/unbekannt"
@@ -358,7 +470,12 @@ msgstr "leer/unbekannt"
 msgid "horizontal"
 msgstr ""
 
+#: ../lib/python/Components/NimManager.py:384
+msgid "manual"
+msgstr "manuell"
+
 #: ../lib/python/Screens/ScanSetup.py:196
+#: ../lib/python/Screens/TimerEntry.py:94
 #: ../lib/python/Components/Network.py:134
 msgid "no"
 msgstr "nein"
@@ -383,6 +500,14 @@ msgstr "aus"
 msgid "on"
 msgstr "an"
 
+#: ../lib/python/Screens/TimerEntry.py:79
+msgid "once"
+msgstr "einmalig"
+
+#: ../lib/python/Screens/TimerEntry.py:79
+msgid "repeated"
+msgstr "wiederholend"
+
 #: ../lib/python/Components/ServiceScan.py:32
 msgid "scan done!"
 msgstr "Suche beendet."
@@ -404,6 +529,10 @@ msgstr "Status"
 msgid "unknown service"
 msgstr "unbekannter Service"
 
+#: ../lib/python/Screens/TimerEntry.py:82
+msgid "user-defined"
+msgstr "benutzerdefiniert"
+
 #: ../lib/python/Screens/ScanSetup.py:172
 msgid "vertical"
 msgstr "vertikal"
@@ -412,7 +541,12 @@ msgstr "vertikal"
 msgid "waiting for event data..."
 msgstr "warte auf Programmdaten..."
 
+#: ../lib/python/Screens/TimerEntry.py:82
+msgid "weekly"
+msgstr "woechentlich"
+
 #: ../lib/python/Screens/ScanSetup.py:196
+#: ../lib/python/Screens/TimerEntry.py:94
 #: ../lib/python/Components/Network.py:15
 #: ../lib/python/Components/Network.py:134
 msgid "yes"
@@ -742,10 +876,6 @@ msgstr "Hauptmenue"
 msgid "Volume"
 msgstr "Lautstaerke"
 
-#: ../data/
-msgid "Channel"
-msgstr "Kanal"
-
 #: ../data/
 msgid "Alpha"
 msgstr ""