fix translations

diff --git a/po/ar.po b/po/ar.po
index 5893ed6..0d23348 100755 (executable)
--- a/po/ar.po
+++ b/po/ar.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-25 02:01+0100\n"
+"POT-Creation-Date: 2006-01-28 00:36+0100\n"
 "PO-Revision-Date: 2006-01-10 01:17+0300\n"
 "Last-Translator: hazem <moustafagamal@hotmail.com>\n"
 "Language-Team: Arabic <moustafagamal@hotmail.com>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Poedit-Country: EGYPT\n"
 "X-Poedit-SourceCharset: iso-8859-15\n"
 
-#: ../lib/python/Screens/EventView.py:76
+#: ../lib/python/Screens/EventView.py:80
 #, python-format
 msgid "%d min"
 msgstr ""
@@ -34,43 +34,43 @@ msgstr ""
 msgid "%s (%s, %d MB free)"
 msgstr "%s (%s, %d MB frei)"
 
-#: ../lib/python/Components/NimManager.py:682
+#: ../lib/python/Components/NimManager.py:685
 msgid "0 V"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:685
+#: ../lib/python/Components/NimManager.py:688
 msgid "1.0"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:685
+#: ../lib/python/Components/NimManager.py:688
 msgid "1.1"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:685
+#: ../lib/python/Components/NimManager.py:688
 msgid "1.2"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:682
+#: ../lib/python/Components/NimManager.py:685
 msgid "12 V"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:107
+#: ../lib/python/Screens/Satconfig.py:140
 msgid "12V Output"
 msgstr "مخرج 12 فولت"
 
-#: ../lib/python/Components/NimManager.py:669
+#: ../lib/python/Components/NimManager.py:672
 msgid "13 V"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:669
+#: ../lib/python/Components/NimManager.py:672
 msgid "18 V"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:684
+#: ../lib/python/Components/NimManager.py:687
 msgid "A"
 msgstr "أ"
 
-#: ../RecordTimer.py:126
+#: ../RecordTimer.py:127
 msgid ""
 "A timer failed to record!\n"
 "Disable TV and try again?\n"
@@ -78,28 +78,32 @@ msgstr ""
 "فشل عمليه التسجيل بالمؤقت\n"
 "حاول مره ثانيه؟\n"
 
-#: ../lib/python/Components/NimManager.py:686
+#: ../lib/python/Components/NimManager.py:689
 msgid "AA"
 msgstr "أأ"
 
-#: ../lib/python/Components/NimManager.py:686
+#: ../lib/python/Components/NimManager.py:689
 msgid "AB"
 msgstr "أب"
 
-#: ../lib/python/Screens/TimerEdit.py:25
+#: ../lib/python/Screens/TimerEdit.py:28
 msgid "Add"
 msgstr "أضف"
 
-#: ../lib/python/Screens/EpgSelection.py:21
+#: ../lib/python/Screens/EventView.py:21
+msgid "Add Timer"
+msgstr ""
+
+#: ../lib/python/Screens/EpgSelection.py:48
 msgid "Add timer"
 msgstr "أضف مؤقت"
 
-#: ../lib/python/Components/NimManager.py:612
-#: ../lib/python/Components/NimManager.py:620
+#: ../lib/python/Components/NimManager.py:615
+#: ../lib/python/Components/NimManager.py:623
 msgid "Advanced"
 msgstr "متقدم"
 
-#: ../lib/python/Screens/ChannelSelection.py:359
+#: ../lib/python/Screens/ChannelSelection.py:370
 msgid "All"
 msgstr "الكل"
 
@@ -127,19 +131,19 @@ msgstr "آلـى"
 msgid "Automatic Scan"
 msgstr "بحث آلـى"
 
-#: ../lib/python/Components/NimManager.py:684
+#: ../lib/python/Components/NimManager.py:687
 msgid "B"
 msgstr "ب"
 
-#: ../lib/python/Components/NimManager.py:686
+#: ../lib/python/Components/NimManager.py:689
 msgid "BA"
 msgstr "ب أ"
 
-#: ../lib/python/Components/NimManager.py:686
+#: ../lib/python/Components/NimManager.py:689
 msgid "BB"
 msgstr "ب ب"
 
-#: ../lib/python/Components/NimManager.py:670
+#: ../lib/python/Components/NimManager.py:673
 msgid "Band"
 msgstr ""
 
@@ -151,11 +155,11 @@ msgstr ""
 msgid "Bus: "
 msgstr "الناقل"
 
-#: ../lib/python/Components/NimManager.py:678
+#: ../lib/python/Components/NimManager.py:681
 msgid "C-Band"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:110
+#: ../lib/python/Screens/Satconfig.py:66
 msgid "Cable provider"
 msgstr "مقدم خدمه الكابل"
 
@@ -171,11 +175,11 @@ msgstr "السعه:"
 msgid "Channel"
 msgstr "قناه"
 
-#: ../lib/python/Screens/ChannelSelection.py:78 ../data/
+#: ../lib/python/Screens/ChannelSelection.py:89 ../data/
 msgid "Channel Selection"
 msgstr "إختيار القناه"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:125
+#: ../lib/python/Screens/InfoBarGenerics.py:135
 msgid "Channel:"
 msgstr "قناه:"
 
@@ -183,7 +187,7 @@ msgstr "قناه:"
 msgid "Classic"
 msgstr "كلاسيك"
 
-#: ../lib/python/Screens/TimerEdit.py:27
+#: ../lib/python/Screens/TimerEdit.py:30
 msgid "Cleanup"
 msgstr ""
 
@@ -199,11 +203,12 @@ msgstr ""
 msgid "Code rate low"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:87 ../lib/python/Screens/Satconfig.py:89
+#: ../lib/python/Screens/Satconfig.py:120
+#: ../lib/python/Screens/Satconfig.py:122
 msgid "Command order"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:83
+#: ../lib/python/Screens/Satconfig.py:116
 msgid "Committed DiSEqC command"
 msgstr ""
 
@@ -211,11 +216,15 @@ msgstr ""
 msgid "Configuration Mode"
 msgstr "وضع التهيئه"
 
+#: ../lib/python/Screens/TimerEdit.py:195
+msgid "Conflicting timer"
+msgstr ""
+
 #: ../lib/python/Components/SetupDevices.py:21
 msgid "Default"
 msgstr "المعتاد"
 
-#: ../lib/python/Screens/TimerEdit.py:24
+#: ../lib/python/Screens/TimerEdit.py:27
 msgid "Delete"
 msgstr "أمسح"
 
@@ -239,11 +248,11 @@ msgstr "موجود قرص صلب:"
 msgid "Detected NIMs:"
 msgstr "موجود تيونر:"
 
-#: ../lib/python/Components/NimManager.py:634
+#: ../lib/python/Components/NimManager.py:637
 msgid "DiSEqC A/B"
 msgstr "دايزك أ/ب"
 
-#: ../lib/python/Components/NimManager.py:634
+#: ../lib/python/Components/NimManager.py:637
 msgid "DiSEqC A/B/C/D"
 msgstr "دايزك أ/ب/ج/د"
 
@@ -251,17 +260,17 @@ msgstr "دايزك أ/ب/ج/د"
 msgid "DiSEqC Mode"
 msgstr "وضع الدايزك"
 
-#: ../lib/python/Screens/Satconfig.py:79
+#: ../lib/python/Screens/Satconfig.py:112
 msgid "DiSEqC mode"
 msgstr "وضعيـه الدايزك"
 
-#: ../lib/python/Screens/Satconfig.py:91
+#: ../lib/python/Screens/Satconfig.py:124
 msgid "DiSEqC repeats"
 msgstr ""
 
 #: ../lib/python/Screens/ScanSetup.py:104
 #: ../lib/python/Screens/ScanSetup.py:375
-#: ../lib/python/Screens/TimerEdit.py:72 ../lib/python/Components/Lcd.py:31
+#: ../lib/python/Screens/TimerEdit.py:75 ../lib/python/Components/Lcd.py:31
 #: ../lib/python/Components/SetupDevices.py:38
 #: ../lib/python/Components/SetupDevices.py:39
 #: ../lib/python/Components/SetupDevices.py:43
@@ -276,7 +285,7 @@ msgstr "إبطال"
 msgid "Do you really want to delete this recording?"
 msgstr "هل تريد مسح هذا التسجيل؟"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:956
+#: ../lib/python/Screens/InfoBarGenerics.py:964
 msgid ""
 "Do you want to stop the current\n"
 "(instant) recording?"
@@ -297,7 +306,7 @@ msgstr ""
 msgid "Dutch"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:577
+#: ../lib/python/Screens/ChannelSelection.py:588
 msgid "E"
 msgstr "O"
 
@@ -306,14 +315,14 @@ msgstr "O"
 msgid "ERROR - failed to scan (%s)!"
 msgstr "خطأ - فشل البحث (%s)!"
 
-#: ../lib/python/Components/NimManager.py:641
-#: ../lib/python/Components/NimManager.py:697
+#: ../lib/python/Components/NimManager.py:644
+#: ../lib/python/Components/NimManager.py:700
 msgid "East"
 msgstr "شرق"
 
 #: ../lib/python/Screens/ScanSetup.py:104
 #: ../lib/python/Screens/ScanSetup.py:375
-#: ../lib/python/Screens/TimerEdit.py:70 ../lib/python/Components/Lcd.py:31
+#: ../lib/python/Screens/TimerEdit.py:73 ../lib/python/Components/Lcd.py:31
 #: ../lib/python/Components/SetupDevices.py:38
 #: ../lib/python/Components/SetupDevices.py:39
 #: ../lib/python/Components/SetupDevices.py:43
@@ -338,7 +347,7 @@ msgstr " إنتهاء الوقت"
 msgid "English"
 msgstr "إنجليزى"
 
-#: ../lib/python/Components/NimManager.py:615
+#: ../lib/python/Components/NimManager.py:618
 msgid "Equal to Socket A"
 msgstr ""
 
@@ -347,11 +356,11 @@ msgstr ""
 msgid "FEC"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:84
+#: ../lib/python/Screens/Satconfig.py:117
 msgid "Fast DiSEqC"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:362
+#: ../lib/python/Screens/ChannelSelection.py:373
 msgid "Favourites"
 msgstr "المفضله"
 
@@ -362,6 +371,7 @@ msgstr "المفضله"
 msgid "Frequency"
 msgstr "التردد"
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Fri"
 msgstr ""
@@ -392,7 +402,7 @@ msgstr ""
 msgid "IP Address"
 msgstr "عنوان IP"
 
-#: ../lib/python/Screens/Satconfig.py:108
+#: ../lib/python/Screens/Satconfig.py:141
 msgid "Increased voltage"
 msgstr "فولت زائد"
 
@@ -414,19 +424,19 @@ msgstr "تفعيل القرص الصلب"
 msgid "Inversion"
 msgstr "عكـس"
 
-#: ../lib/python/Screens/Satconfig.py:76
+#: ../lib/python/Screens/Satconfig.py:109
 msgid "LNB"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:101
+#: ../lib/python/Screens/Satconfig.py:134
 msgid "LOF"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:105
+#: ../lib/python/Screens/Satconfig.py:138
 msgid "LOF/H"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:104
+#: ../lib/python/Screens/Satconfig.py:137
 msgid "LOF/L"
 msgstr ""
 
@@ -434,17 +444,17 @@ msgstr ""
 msgid "Language selection"
 msgstr "إختيار اللغه"
 
-#: ../lib/python/Screens/Satconfig.py:28 ../lib/python/Screens/Satconfig.py:95
-#: ../data/
+#: ../lib/python/Screens/Satconfig.py:28
+#: ../lib/python/Screens/Satconfig.py:128 ../data/
 msgid "Latitude"
 msgstr "خط العرض"
 
-#: ../lib/python/Screens/Satconfig.py:26 ../lib/python/Screens/Satconfig.py:93
-#: ../data/
+#: ../lib/python/Screens/Satconfig.py:26
+#: ../lib/python/Screens/Satconfig.py:126 ../data/
 msgid "Longitude"
 msgstr "خط الطول"
 
-#: ../lib/python/Components/NimManager.py:616
+#: ../lib/python/Components/NimManager.py:619
 msgid "Loopthrough to Socket A"
 msgstr ""
 
@@ -457,6 +467,7 @@ msgstr "موديل :"
 msgid "Modulation"
 msgstr ""
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Mon"
 msgstr ""
@@ -474,7 +485,11 @@ msgstr "الاثنين"
 msgid "Movie Menu"
 msgstr "قائمه الافلام"
 
-#: ../lib/python/Components/NimManager.py:471
+#: ../lib/python/Screens/EventView.py:100
+msgid "Multi EPG"
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:474
 msgid "N/A"
 msgstr "غير موجود"
 
@@ -490,19 +505,19 @@ msgstr "اسم السيرفر"
 msgid "Netmask"
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:31
+#: ../lib/python/Screens/EpgSelection.py:34
 msgid "Next"
 msgstr "التالى"
 
-#: ../lib/python/Components/NimManager.py:671
-#: ../lib/python/Components/NimManager.py:683
-#: ../lib/python/Components/NimManager.py:687
-#: ../lib/python/Components/NimManager.py:688
-#: ../lib/python/Components/NimManager.py:700
+#: ../lib/python/Components/NimManager.py:674
+#: ../lib/python/Components/NimManager.py:686
+#: ../lib/python/Components/NimManager.py:690
+#: ../lib/python/Components/NimManager.py:691
+#: ../lib/python/Components/NimManager.py:703
 msgid "No"
 msgstr "لا"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:952
+#: ../lib/python/Screens/InfoBarGenerics.py:960
 msgid "No HDD found or HDD not initialized!"
 msgstr ""
 "لا يوجد قرص صلب\n"
@@ -513,19 +528,19 @@ msgstr ""
 #: ../lib/python/Screens/ScanSetup.py:187
 #: ../lib/python/Screens/ScanSetup.py:188
 #: ../lib/python/Screens/ScanSetup.py:192
-#: ../lib/python/Components/NimManager.py:684
-#: ../lib/python/Components/NimManager.py:685
-#: ../lib/python/Components/NimManager.py:686
-#: ../lib/python/Components/NimManager.py:695
+#: ../lib/python/Components/NimManager.py:687
+#: ../lib/python/Components/NimManager.py:688
+#: ../lib/python/Components/NimManager.py:689
+#: ../lib/python/Components/NimManager.py:698
 msgid "None"
 msgstr "لاشيئ"
 
-#: ../lib/python/Components/NimManager.py:643
-#: ../lib/python/Components/NimManager.py:699
+#: ../lib/python/Components/NimManager.py:646
+#: ../lib/python/Components/NimManager.py:702
 msgid "North"
 msgstr "شمال"
 
-#: ../lib/python/Components/NimManager.py:617
+#: ../lib/python/Components/NimManager.py:620
 msgid "Nothing connected"
 msgstr "لاشيئ متصل"
 
@@ -533,15 +548,15 @@ msgstr "لاشيئ متصل"
 msgid "OK"
 msgstr "موافق"
 
-#: ../lib/python/Components/NimManager.py:670
+#: ../lib/python/Components/NimManager.py:673
 msgid "Off"
 msgstr "لا يعمل"
 
-#: ../lib/python/Components/NimManager.py:670
+#: ../lib/python/Components/NimManager.py:673
 msgid "On"
 msgstr "يعمل"
 
-#: ../lib/python/Components/NimManager.py:695
+#: ../lib/python/Components/NimManager.py:698
 msgid "One"
 msgstr "واحد"
 
@@ -561,7 +576,7 @@ msgstr "انتظر من فضلك ...يتم تحميل القائمه..."
 msgid "Polarity"
 msgstr "القطبيه"
 
-#: ../lib/python/Components/NimManager.py:669
+#: ../lib/python/Components/NimManager.py:672
 msgid "Polarization"
 msgstr "الاستقطاب"
 
@@ -581,7 +596,7 @@ msgstr "مدخل ج"
 msgid "Port D"
 msgstr "مدخل د"
 
-#: ../lib/python/Components/NimManager.py:634
+#: ../lib/python/Components/NimManager.py:637
 msgid "Positioner"
 msgstr "الموتور"
 
@@ -601,23 +616,23 @@ msgstr "اضغط موافق للبحث"
 msgid "Press OK to start the scan"
 msgstr "اضغط موافق لبدأ البحث"
 
-#: ../lib/python/Screens/EpgSelection.py:30
+#: ../lib/python/Screens/EpgSelection.py:33
 msgid "Prev"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:361
+#: ../lib/python/Screens/ChannelSelection.py:372
 msgid "Provider"
 msgstr "مقدم الخدمه"
 
-#: ../lib/python/Screens/ChannelSelection.py:567
+#: ../lib/python/Screens/ChannelSelection.py:578
 msgid "Providers"
 msgstr "مقدمو الخدمه"
 
-#: ../lib/python/Screens/TimerEdit.py:92
+#: ../lib/python/Screens/TimerEdit.py:95
 msgid "Really delete done timers?"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1005
+#: ../lib/python/Screens/InfoBarGenerics.py:1013
 msgid "Record"
 msgstr "تسجيل"
 
@@ -625,16 +640,18 @@ msgstr "تسجيل"
 msgid "Reset"
 msgstr "إعاده الضبط"
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Sat"
 msgstr ""
 
 #: ../lib/python/Screens/ScanSetup.py:86 ../lib/python/Screens/ScanSetup.py:95
-#: ../lib/python/Screens/Satconfig.py:13 ../lib/python/Screens/Satconfig.py:62
+#: ../lib/python/Screens/Satconfig.py:13 ../lib/python/Screens/Satconfig.py:61
+#: ../lib/python/Screens/Satconfig.py:145
 msgid "Satellite"
 msgstr "قمر صناعى"
 
-#: ../lib/python/Screens/ChannelSelection.py:360
+#: ../lib/python/Screens/ChannelSelection.py:371
 msgid "Satellites"
 msgstr "اقمار صناعيه"
 
@@ -643,7 +660,7 @@ msgstr "اقمار صناعيه"
 msgid "Saturday"
 msgstr "السبت"
 
-#: ../lib/python/Components/NimManager.py:618
+#: ../lib/python/Components/NimManager.py:621
 msgid "Secondary cable from Rotor-LNB"
 msgstr ""
 
@@ -651,11 +668,11 @@ msgstr ""
 msgid "Select channel to record from"
 msgstr "اختار القناه التى تريد ان تسجل منها"
 
-#: ../lib/python/Screens/Satconfig.py:85
+#: ../lib/python/Screens/Satconfig.py:118
 msgid "Sequence repeat"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:569
+#: ../lib/python/Screens/ChannelSelection.py:580
 msgid "Services"
 msgstr "القنوات/الخدمات"
 
@@ -663,25 +680,29 @@ msgstr "القنوات/الخدمات"
 msgid "Show the radio player..."
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:612
-#: ../lib/python/Components/NimManager.py:619
+#: ../lib/python/Components/NimManager.py:615
+#: ../lib/python/Components/NimManager.py:622
 msgid "Simple"
 msgstr "بسيطه"
 
-#: ../lib/python/Components/NimManager.py:634
+#: ../lib/python/Components/NimManager.py:637
 msgid "Single"
 msgstr "مفرد"
 
-#: ../lib/python/Components/NimManager.py:647
+#: ../lib/python/Screens/EventView.py:99
+msgid "Single EPG"
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:650
 msgid "Slot "
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:534
+#: ../lib/python/Components/NimManager.py:537
 msgid "Socket "
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:643
-#: ../lib/python/Components/NimManager.py:699
+#: ../lib/python/Components/NimManager.py:646
+#: ../lib/python/Components/NimManager.py:702
 msgid "South"
 msgstr "جنوب"
 
@@ -693,7 +714,7 @@ msgstr ""
 msgid "Start"
 msgstr "أبـدأ"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:958
+#: ../lib/python/Screens/InfoBarGenerics.py:966
 msgid "Start recording?"
 msgstr "أبـدأ التسجيل؟"
 
@@ -709,14 +730,15 @@ msgstr "خطوه "
 msgid "Stop playing this movie?"
 msgstr "إيقاف عرض هذا الفيلم؟"
 
-#: ../lib/python/Screens/Satconfig.py:73
+#: ../lib/python/Screens/Satconfig.py:106
 msgid "Stored position"
 msgstr "الوضع المخزن"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1010 ../data/
+#: ../lib/python/Screens/InfoBarGenerics.py:1018 ../data/
 msgid "Subservices"
 msgstr "الخدمات الفرعيه"
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Sun"
 msgstr ""
@@ -731,18 +753,19 @@ msgstr "الاحد"
 msgid "Symbol Rate"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:112
+#: ../lib/python/Screens/Satconfig.py:68
 msgid "Terrestrial provider"
 msgstr "Region"
 
-#: ../lib/python/Components/NimManager.py:695
+#: ../lib/python/Components/NimManager.py:698
 msgid "Three"
 msgstr "ثلاثه"
 
-#: ../lib/python/Screens/Satconfig.py:106
+#: ../lib/python/Screens/Satconfig.py:139
 msgid "Threshold"
 msgstr ""
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Thu"
 msgstr ""
@@ -756,19 +779,23 @@ msgstr "الخميس"
 msgid "Timer Type"
 msgstr "نوع المؤقت"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:801
+#: ../lib/python/Screens/InfoBarGenerics.py:809
 msgid "Timeshift not possible!"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:68
+#: ../lib/python/Screens/EpgSelection.py:198
+msgid "Today"
+msgstr ""
+
+#: ../lib/python/Screens/Satconfig.py:101
 msgid "Tone mode"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:82
+#: ../lib/python/Screens/Satconfig.py:115
 msgid "Toneburst"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:634
+#: ../lib/python/Components/NimManager.py:637
 msgid "Toneburst A/B"
 msgstr "Toneburst A/B"
 
@@ -776,6 +803,7 @@ msgstr "Toneburst A/B"
 msgid "Transmission mode"
 msgstr "وضع النقل"
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Tue"
 msgstr ""
@@ -790,7 +818,7 @@ msgstr "الثلاثاء"
 msgid "Tuner"
 msgstr "التيونر(الموالف)"
 
-#: ../lib/python/Components/NimManager.py:695
+#: ../lib/python/Components/NimManager.py:698
 msgid "Two"
 msgstr "اثنين"
 
@@ -800,7 +828,7 @@ msgstr "اثنين"
 msgid "Type of scan"
 msgstr "نوع البحث"
 
-#: ../lib/python/Components/NimManager.py:639
+#: ../lib/python/Components/NimManager.py:642
 msgid "USALS"
 msgstr "USALS"
 
@@ -814,11 +842,11 @@ msgstr ""
 "من فضلك راجع تعليمات التشغيل\n"
 "خطـأ .. "
 
-#: ../lib/python/Screens/Satconfig.py:90
+#: ../lib/python/Screens/Satconfig.py:123
 msgid "Uncommitted DiSEqC command"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:678
+#: ../lib/python/Components/NimManager.py:681
 msgid "Universal LNB"
 msgstr ""
 
@@ -836,22 +864,23 @@ msgstr "جارى التحديث ..انتظر..قد يستغرق بعض الوق
 msgid "Use DHCP"
 msgstr "استخدمDHCP"
 
-#: ../lib/python/Screens/Satconfig.py:70
+#: ../lib/python/Screens/Satconfig.py:103
 msgid "Use usals for this sat"
 msgstr "USALS für diesen Sat benutzen"
 
-#: ../lib/python/Components/NimManager.py:678
+#: ../lib/python/Components/NimManager.py:681
 msgid "User defined"
 msgstr "يحددها المستخدم"
 
-#: ../lib/python/Screens/Satconfig.py:67
+#: ../lib/python/Screens/Satconfig.py:100
 msgid "Voltage mode"
 msgstr "وضعيه الفولت"
 
-#: ../lib/python/Screens/ChannelSelection.py:575
+#: ../lib/python/Screens/ChannelSelection.py:586
 msgid "W"
 msgstr ""
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Wed"
 msgstr ""
@@ -865,16 +894,16 @@ msgstr "الاربعاء"
 msgid "Weekday"
 msgstr "يوم الاسبوع"
 
-#: ../lib/python/Components/NimManager.py:641
-#: ../lib/python/Components/NimManager.py:697
+#: ../lib/python/Components/NimManager.py:644
+#: ../lib/python/Components/NimManager.py:700
 msgid "West"
 msgstr "غرب"
 
-#: ../lib/python/Components/NimManager.py:671
-#: ../lib/python/Components/NimManager.py:683
-#: ../lib/python/Components/NimManager.py:687
-#: ../lib/python/Components/NimManager.py:688
-#: ../lib/python/Components/NimManager.py:700
+#: ../lib/python/Components/NimManager.py:674
+#: ../lib/python/Components/NimManager.py:686
+#: ../lib/python/Components/NimManager.py:690
+#: ../lib/python/Components/NimManager.py:691
+#: ../lib/python/Components/NimManager.py:703
 msgid "Yes"
 msgstr "نعم"
 
@@ -882,36 +911,36 @@ msgstr "نعم"
 msgid "You cannot delete this!"
 msgstr "لايمكنك مسح هذه !"
 
-#: ../lib/python/Screens/ChannelSelection.py:246
+#: ../lib/python/Screens/ChannelSelection.py:257
 msgid "[bouquet edit]"
 msgstr "تحرير الباقه"
 
-#: ../lib/python/Screens/ChannelSelection.py:248
+#: ../lib/python/Screens/ChannelSelection.py:259
 msgid "[favourite edit]"
 msgstr "تحرير المفضله"
 
-#: ../lib/python/Screens/ChannelSelection.py:327
+#: ../lib/python/Screens/ChannelSelection.py:338
 msgid "[move mode]"
 msgstr "وضع التحريك"
 
-#: ../lib/python/Screens/ChannelSelection.py:71
+#: ../lib/python/Screens/ChannelSelection.py:82
 msgid "abort bouquet edit"
 msgstr "الغاء تحرير الباقه"
 
-#: ../lib/python/Screens/ChannelSelection.py:74
+#: ../lib/python/Screens/ChannelSelection.py:85
 msgid "abort favourites edit"
 msgstr "الغاء تحرير المفضله"
 
-#: ../lib/python/Screens/ChannelSelection.py:46
+#: ../lib/python/Screens/ChannelSelection.py:57
 msgid "add service to bouquet"
 msgstr "إضافه القناه الى الباقه"
 
-#: ../lib/python/Screens/ChannelSelection.py:48
+#: ../lib/python/Screens/ChannelSelection.py:59
 msgid "add service to favourites"
 msgstr "إضافه القناه الى المفضله"
 
 #: ../lib/python/Screens/MovieSelection.py:21
-#: ../lib/python/Screens/ChannelSelection.py:76
+#: ../lib/python/Screens/ChannelSelection.py:87
 msgid "back"
 msgstr "للخلف"
 
@@ -923,7 +952,7 @@ msgstr "دائرى يسار"
 msgid "circular right"
 msgstr "دائرى يمين"
 
-#: ../lib/python/Screens/ChannelSelection.py:51
+#: ../lib/python/Screens/ChannelSelection.py:62
 msgid "copy to favourites"
 msgstr ""
 
@@ -935,31 +964,31 @@ msgstr "يومى"
 msgid "delete..."
 msgstr "مسح ..."
 
-#: ../lib/python/Screens/ChannelSelection.py:67
+#: ../lib/python/Screens/ChannelSelection.py:78
 msgid "disable move mode"
 msgstr "ألغاء وضع التحريك"
 
-#: ../lib/python/Components/NimManager.py:536
+#: ../lib/python/Components/NimManager.py:539
 msgid "empty/unknown"
 msgstr "فارغ/غير معروف"
 
-#: ../lib/python/Screens/ChannelSelection.py:63
+#: ../lib/python/Screens/ChannelSelection.py:74
 msgid "enable bouquet edit"
 msgstr "تفعيل تحرير الباقه"
 
-#: ../lib/python/Screens/ChannelSelection.py:65
+#: ../lib/python/Screens/ChannelSelection.py:76
 msgid "enable favourite edit"
 msgstr "تفعيل تحرير المفضله"
 
-#: ../lib/python/Screens/ChannelSelection.py:60
+#: ../lib/python/Screens/ChannelSelection.py:71
 msgid "enable move mode"
 msgstr "تفعيل وضع التحريك"
 
-#: ../lib/python/Screens/ChannelSelection.py:70
+#: ../lib/python/Screens/ChannelSelection.py:81
 msgid "end bouquet edit"
 msgstr "إنتهاء تحرير الباقه"
 
-#: ../lib/python/Screens/ChannelSelection.py:73
+#: ../lib/python/Screens/ChannelSelection.py:84
 msgid "end favourites edit"
 msgstr "إنتهاء تحرير المفضله"
 
@@ -979,11 +1008,11 @@ msgstr "تفعيل الكـام"
 msgid "leave movie player..."
 msgstr "اترك عارض الافلام .."
 
-#: ../lib/python/Components/NimManager.py:639
+#: ../lib/python/Components/NimManager.py:642
 msgid "manual"
 msgstr "يدوى"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:265
+#: ../lib/python/Screens/InfoBarGenerics.py:274
 msgid "next channel"
 msgstr "القناه التاليه"
 
@@ -1026,15 +1055,15 @@ msgstr "مره واحده"
 msgid "please press OK when ready"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:266
+#: ../lib/python/Screens/InfoBarGenerics.py:275
 msgid "previous channel"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:55
+#: ../lib/python/Screens/ChannelSelection.py:66
 msgid "remove bouquet"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:53
+#: ../lib/python/Screens/ChannelSelection.py:64
 msgid "remove service"
 msgstr "حذف القناه"
 
@@ -1080,7 +1109,7 @@ msgstr ""
 msgid "scan state"
 msgstr "حاله البحث"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:308
+#: ../lib/python/Screens/InfoBarGenerics.py:315
 msgid "show EPG..."
 msgstr "إظهار دليل البرامج الالكترونى"
 
@@ -1088,7 +1117,7 @@ msgstr "إظهار دليل البرامج الالكترونى"
 msgid "text"
 msgstr ""
 
-#: ../lib/python/Screens/EventView.py:60
+#: ../lib/python/Screens/EventView.py:64
 msgid "unknown service"
 msgstr "قناه غير معروفه"
 
@@ -1156,6 +1185,10 @@ msgid "#ffffff"
 msgstr ""
 
 #: ../data/
+msgid "NEXT"
+msgstr ""
+
+#: ../data/
 msgid "Deep Standby"
 msgstr "وضع الاستعداد"
 
@@ -1416,12 +1449,8 @@ msgid "Network Setup"
 msgstr "ضبط الشبـكة"
 
 #: ../data/
-msgid "Thanks for using the wizard. Your box is now ready to use."
-msgstr "شكرا، الرسيفر جاهز للاستخدام الان"
-
-#: ../data/
-msgid "Parental Lock"
-msgstr "الاغلاق الابـوى"
+msgid "#ffffffff"
+msgstr ""
 
 #: ../data/
 msgid "Restart"
@@ -1456,7 +1485,7 @@ msgid "Exit wizard"
 msgstr "خـروج"
 
 #: ../data/
-msgid "Toggle EPG type with INFO button"
+msgid "Timer sanity error"
 msgstr ""
 
 #: ../data/
@@ -1476,10 +1505,18 @@ msgid "Skip confirmations"
 msgstr "تخطى التأكيد"
 
 #: ../data/
+msgid "Choose bouquet"
+msgstr ""
+
+#: ../data/
 msgid "Yes, scan now"
 msgstr "نعم : ابحث الان"
 
 #: ../data/
+msgid "MORE"
+msgstr ""
+
+#: ../data/
 msgid "Information"
 msgstr "معلومات"
 
@@ -1496,6 +1533,12 @@ msgid "Please set up tuner B"
 msgstr "من فضلك أضبط التيونر ب"
 
 #: ../data/
+msgid ""
+"Thank you for using the wizard. Your box is now ready to use.\n"
+"Please press OK to start using you Dreambox."
+msgstr ""
+
+#: ../data/
 msgid "Delay"
 msgstr "تأخير"
 
@@ -1504,10 +1547,6 @@ msgid "Select HDD"
 msgstr "اختار القرص الصلب"
 
 #: ../data/
-msgid "#ffffffff"
-msgstr ""
-
-#: ../data/
 msgid "Setup Lock"
 msgstr "إغلاق الضبط"
 
@@ -1614,6 +1653,10 @@ msgid "Do you want to do a service scan?"
 msgstr "هل تريد عمل بحث"
 
 #: ../data/
+msgid "NOW"
+msgstr ""
+
+#: ../data/
 msgid "Seek"
 msgstr "بحـث"
 
@@ -1621,6 +1664,13 @@ msgstr "بحـث"
 msgid "Satelliteconfig"
 msgstr "ضبط الاقمـر"
 
+#: ../data/
+msgid "Parental Lock"
+msgstr "الاغلاق الابـوى"
+
+#~ msgid "Thanks for using the wizard. Your box is now ready to use."
+#~ msgstr "شكرا، الرسيفر جاهز للاستخدام الان"
+
 #~ msgid "القناه السابقه"
 #~ msgstr "vorheriger Kanal"
 

diff --git a/po/de.po b/po/de.po
index a15f026..83674ca 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: 2006-01-25 02:01+0100\n"
+"POT-Creation-Date: 2006-01-28 00:36+0100\n"
 "PO-Revision-Date: 2005-12-14 03:29+0100\n"
 "Last-Translator: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>\n"
 "Language-Team: none\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Poedit-Country: GERMANY\n"
 "X-Poedit-SourceCharset: iso-8859-15\n"
 
-#: ../lib/python/Screens/EventView.py:76
+#: ../lib/python/Screens/EventView.py:80
 #, python-format
 msgid "%d min"
 msgstr ""
@@ -34,43 +34,43 @@ msgstr ""
 msgid "%s (%s, %d MB free)"
 msgstr "%s (%s, %d MB frei)"
 
-#: ../lib/python/Components/NimManager.py:682
+#: ../lib/python/Components/NimManager.py:685
 msgid "0 V"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:685
+#: ../lib/python/Components/NimManager.py:688
 msgid "1.0"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:685
+#: ../lib/python/Components/NimManager.py:688
 msgid "1.1"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:685
+#: ../lib/python/Components/NimManager.py:688
 msgid "1.2"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:682
+#: ../lib/python/Components/NimManager.py:685
 msgid "12 V"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:107
+#: ../lib/python/Screens/Satconfig.py:140
 msgid "12V Output"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:669
+#: ../lib/python/Components/NimManager.py:672
 msgid "13 V"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:669
+#: ../lib/python/Components/NimManager.py:672
 msgid "18 V"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:684
+#: ../lib/python/Components/NimManager.py:687
 msgid "A"
 msgstr ""
 
-#: ../RecordTimer.py:126
+#: ../RecordTimer.py:127
 msgid ""
 "A timer failed to record!\n"
 "Disable TV and try again?\n"
@@ -78,28 +78,32 @@ msgstr ""
 "Timeraufnahme fehlgeschlagen.\n"
 "Fernsehprogramm ändern und erneut versuchen?\n"
 
-#: ../lib/python/Components/NimManager.py:686
+#: ../lib/python/Components/NimManager.py:689
 msgid "AA"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:686
+#: ../lib/python/Components/NimManager.py:689
 msgid "AB"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEdit.py:25
+#: ../lib/python/Screens/TimerEdit.py:28
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: ../lib/python/Screens/EpgSelection.py:21
+#: ../lib/python/Screens/EventView.py:21
+msgid "Add Timer"
+msgstr ""
+
+#: ../lib/python/Screens/EpgSelection.py:48
 msgid "Add timer"
 msgstr "Timer setzen"
 
-#: ../lib/python/Components/NimManager.py:612
-#: ../lib/python/Components/NimManager.py:620
+#: ../lib/python/Components/NimManager.py:615
+#: ../lib/python/Components/NimManager.py:623
 msgid "Advanced"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:359
+#: ../lib/python/Screens/ChannelSelection.py:370
 msgid "All"
 msgstr "Alle"
 
@@ -127,19 +131,19 @@ msgstr ""
 msgid "Automatic Scan"
 msgstr "Automatische Suche"
 
-#: ../lib/python/Components/NimManager.py:684
+#: ../lib/python/Components/NimManager.py:687
 msgid "B"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:686
+#: ../lib/python/Components/NimManager.py:689
 msgid "BA"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:686
+#: ../lib/python/Components/NimManager.py:689
 msgid "BB"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:670
+#: ../lib/python/Components/NimManager.py:673
 msgid "Band"
 msgstr ""
 
@@ -151,11 +155,11 @@ msgstr "Bandbreite"
 msgid "Bus: "
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:678
+#: ../lib/python/Components/NimManager.py:681
 msgid "C-Band"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:110
+#: ../lib/python/Screens/Satconfig.py:66
 msgid "Cable provider"
 msgstr "Kabelanbieter"
 
@@ -171,11 +175,11 @@ msgstr "Kapazität: "
 msgid "Channel"
 msgstr "Kanal"
 
-#: ../lib/python/Screens/ChannelSelection.py:78 ../data/
+#: ../lib/python/Screens/ChannelSelection.py:89 ../data/
 msgid "Channel Selection"
 msgstr "Kanalliste"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:125
+#: ../lib/python/Screens/InfoBarGenerics.py:135
 msgid "Channel:"
 msgstr "Kanal:"
 
@@ -183,7 +187,7 @@ msgstr "Kanal:"
 msgid "Classic"
 msgstr "klassisch"
 
-#: ../lib/python/Screens/TimerEdit.py:27
+#: ../lib/python/Screens/TimerEdit.py:30
 msgid "Cleanup"
 msgstr "Aufräumen"
 
@@ -199,11 +203,12 @@ msgstr ""
 msgid "Code rate low"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:87 ../lib/python/Screens/Satconfig.py:89
+#: ../lib/python/Screens/Satconfig.py:120
+#: ../lib/python/Screens/Satconfig.py:122
 msgid "Command order"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:83
+#: ../lib/python/Screens/Satconfig.py:116
 msgid "Committed DiSEqC command"
 msgstr ""
 
@@ -211,11 +216,15 @@ msgstr ""
 msgid "Configuration Mode"
 msgstr "Konfiguration"
 
+#: ../lib/python/Screens/TimerEdit.py:195
+msgid "Conflicting timer"
+msgstr ""
+
 #: ../lib/python/Components/SetupDevices.py:21
 msgid "Default"
 msgstr "Standard"
 
-#: ../lib/python/Screens/TimerEdit.py:24
+#: ../lib/python/Screens/TimerEdit.py:27
 msgid "Delete"
 msgstr "Löschen"
 
@@ -239,11 +248,11 @@ msgstr "Erkannte Festplatten"
 msgid "Detected NIMs:"
 msgstr "Erkannte Tuner:"
 
-#: ../lib/python/Components/NimManager.py:634
+#: ../lib/python/Components/NimManager.py:637
 msgid "DiSEqC A/B"
 msgstr "DiSEqC A/B"
 
-#: ../lib/python/Components/NimManager.py:634
+#: ../lib/python/Components/NimManager.py:637
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
@@ -251,17 +260,17 @@ msgstr "DiSEqC A/B/C/D"
 msgid "DiSEqC Mode"
 msgstr "DiSEqC-Modus"
 
-#: ../lib/python/Screens/Satconfig.py:79
+#: ../lib/python/Screens/Satconfig.py:112
 msgid "DiSEqC mode"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:91
+#: ../lib/python/Screens/Satconfig.py:124
 msgid "DiSEqC repeats"
 msgstr ""
 
 #: ../lib/python/Screens/ScanSetup.py:104
 #: ../lib/python/Screens/ScanSetup.py:375
-#: ../lib/python/Screens/TimerEdit.py:72 ../lib/python/Components/Lcd.py:31
+#: ../lib/python/Screens/TimerEdit.py:75 ../lib/python/Components/Lcd.py:31
 #: ../lib/python/Components/SetupDevices.py:38
 #: ../lib/python/Components/SetupDevices.py:39
 #: ../lib/python/Components/SetupDevices.py:43
@@ -276,7 +285,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:956
+#: ../lib/python/Screens/InfoBarGenerics.py:964
 msgid ""
 "Do you want to stop the current\n"
 "(instant) recording?"
@@ -297,7 +306,7 @@ msgstr ""
 msgid "Dutch"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:577
+#: ../lib/python/Screens/ChannelSelection.py:588
 msgid "E"
 msgstr "O"
 
@@ -306,14 +315,14 @@ msgstr "O"
 msgid "ERROR - failed to scan (%s)!"
 msgstr "FEHLER - Suche fehlgeschlagen (%s)!"
 
-#: ../lib/python/Components/NimManager.py:641
-#: ../lib/python/Components/NimManager.py:697
+#: ../lib/python/Components/NimManager.py:644
+#: ../lib/python/Components/NimManager.py:700
 msgid "East"
 msgstr "Ost"
 
 #: ../lib/python/Screens/ScanSetup.py:104
 #: ../lib/python/Screens/ScanSetup.py:375
-#: ../lib/python/Screens/TimerEdit.py:70 ../lib/python/Components/Lcd.py:31
+#: ../lib/python/Screens/TimerEdit.py:73 ../lib/python/Components/Lcd.py:31
 #: ../lib/python/Components/SetupDevices.py:38
 #: ../lib/python/Components/SetupDevices.py:39
 #: ../lib/python/Components/SetupDevices.py:43
@@ -338,7 +347,7 @@ msgstr "Endzeit"
 msgid "English"
 msgstr "Englisch"
 
-#: ../lib/python/Components/NimManager.py:615
+#: ../lib/python/Components/NimManager.py:618
 msgid "Equal to Socket A"
 msgstr ""
 
@@ -347,11 +356,11 @@ msgstr ""
 msgid "FEC"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:84
+#: ../lib/python/Screens/Satconfig.py:117
 msgid "Fast DiSEqC"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:362
+#: ../lib/python/Screens/ChannelSelection.py:373
 msgid "Favourites"
 msgstr "Favoriten"
 
@@ -362,6 +371,7 @@ msgstr "Favoriten"
 msgid "Frequency"
 msgstr "Frequenz"
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Fri"
 msgstr "Fr"
@@ -392,7 +402,7 @@ msgstr ""
 msgid "IP Address"
 msgstr "IP-Adresse"
 
-#: ../lib/python/Screens/Satconfig.py:108
+#: ../lib/python/Screens/Satconfig.py:141
 msgid "Increased voltage"
 msgstr ""
 
@@ -414,19 +424,19 @@ msgstr "Initialisiere Festplatte..."
 msgid "Inversion"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:76
+#: ../lib/python/Screens/Satconfig.py:109
 msgid "LNB"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:101
+#: ../lib/python/Screens/Satconfig.py:134
 msgid "LOF"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:105
+#: ../lib/python/Screens/Satconfig.py:138
 msgid "LOF/H"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:104
+#: ../lib/python/Screens/Satconfig.py:137
 msgid "LOF/L"
 msgstr ""
 
@@ -434,17 +444,17 @@ msgstr ""
 msgid "Language selection"
 msgstr "Sprachauswahl"
 
-#: ../lib/python/Screens/Satconfig.py:28 ../lib/python/Screens/Satconfig.py:95
-#: ../data/
+#: ../lib/python/Screens/Satconfig.py:28
+#: ../lib/python/Screens/Satconfig.py:128 ../data/
 msgid "Latitude"
 msgstr "Breitengrad"
 
-#: ../lib/python/Screens/Satconfig.py:26 ../lib/python/Screens/Satconfig.py:93
-#: ../data/
+#: ../lib/python/Screens/Satconfig.py:26
+#: ../lib/python/Screens/Satconfig.py:126 ../data/
 msgid "Longitude"
 msgstr "Längengrad"
 
-#: ../lib/python/Components/NimManager.py:616
+#: ../lib/python/Components/NimManager.py:619
 msgid "Loopthrough to Socket A"
 msgstr "Verbunden mit Tuner A"
 
@@ -457,6 +467,7 @@ msgstr "Modell:"
 msgid "Modulation"
 msgstr ""
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Mon"
 msgstr "Mo"
@@ -474,7 +485,11 @@ msgstr "Montag"
 msgid "Movie Menu"
 msgstr "Filmauswahl"
 
-#: ../lib/python/Components/NimManager.py:471
+#: ../lib/python/Screens/EventView.py:100
+msgid "Multi EPG"
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:474
 msgid "N/A"
 msgstr "Nicht verfügbar"
 
@@ -490,19 +505,19 @@ msgstr ""
 msgid "Netmask"
 msgstr "Netzmaske"
 
-#: ../lib/python/Screens/EpgSelection.py:31
+#: ../lib/python/Screens/EpgSelection.py:34
 msgid "Next"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:671
-#: ../lib/python/Components/NimManager.py:683
-#: ../lib/python/Components/NimManager.py:687
-#: ../lib/python/Components/NimManager.py:688
-#: ../lib/python/Components/NimManager.py:700
+#: ../lib/python/Components/NimManager.py:674
+#: ../lib/python/Components/NimManager.py:686
+#: ../lib/python/Components/NimManager.py:690
+#: ../lib/python/Components/NimManager.py:691
+#: ../lib/python/Components/NimManager.py:703
 msgid "No"
 msgstr "Nein"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:952
+#: ../lib/python/Screens/InfoBarGenerics.py:960
 msgid "No HDD found or HDD not initialized!"
 msgstr ""
 "Keine Festplatte gefunden oder\n"
@@ -513,19 +528,19 @@ msgstr ""
 #: ../lib/python/Screens/ScanSetup.py:187
 #: ../lib/python/Screens/ScanSetup.py:188
 #: ../lib/python/Screens/ScanSetup.py:192
-#: ../lib/python/Components/NimManager.py:684
-#: ../lib/python/Components/NimManager.py:685
-#: ../lib/python/Components/NimManager.py:686
-#: ../lib/python/Components/NimManager.py:695
+#: ../lib/python/Components/NimManager.py:687
+#: ../lib/python/Components/NimManager.py:688
+#: ../lib/python/Components/NimManager.py:689
+#: ../lib/python/Components/NimManager.py:698
 msgid "None"
 msgstr "Keins"
 
-#: ../lib/python/Components/NimManager.py:643
-#: ../lib/python/Components/NimManager.py:699
+#: ../lib/python/Components/NimManager.py:646
+#: ../lib/python/Components/NimManager.py:702
 msgid "North"
 msgstr "Nord"
 
-#: ../lib/python/Components/NimManager.py:617
+#: ../lib/python/Components/NimManager.py:620
 msgid "Nothing connected"
 msgstr "Nichts angeschlossen"
 
@@ -533,15 +548,15 @@ msgstr "Nichts angeschlossen"
 msgid "OK"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:670
+#: ../lib/python/Components/NimManager.py:673
 msgid "Off"
 msgstr "Aus"
 
-#: ../lib/python/Components/NimManager.py:670
+#: ../lib/python/Components/NimManager.py:673
 msgid "On"
 msgstr "An"
 
-#: ../lib/python/Components/NimManager.py:695
+#: ../lib/python/Components/NimManager.py:698
 msgid "One"
 msgstr "Eins"
 
@@ -561,7 +576,7 @@ msgstr "Bitte warten... Liste wird geladen..."
 msgid "Polarity"
 msgstr "Polarität"
 
-#: ../lib/python/Components/NimManager.py:669
+#: ../lib/python/Components/NimManager.py:672
 msgid "Polarization"
 msgstr ""
 
@@ -581,7 +596,7 @@ msgstr ""
 msgid "Port D"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:634
+#: ../lib/python/Components/NimManager.py:637
 msgid "Positioner"
 msgstr "Rotor"
 
@@ -601,23 +616,23 @@ 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:30
+#: ../lib/python/Screens/EpgSelection.py:33
 msgid "Prev"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:361
+#: ../lib/python/Screens/ChannelSelection.py:372
 msgid "Provider"
 msgstr "Provider"
 
-#: ../lib/python/Screens/ChannelSelection.py:567
+#: ../lib/python/Screens/ChannelSelection.py:578
 msgid "Providers"
 msgstr "Anbieter"
 
-#: ../lib/python/Screens/TimerEdit.py:92
+#: ../lib/python/Screens/TimerEdit.py:95
 msgid "Really delete done timers?"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1005
+#: ../lib/python/Screens/InfoBarGenerics.py:1013
 msgid "Record"
 msgstr "Aufnahme"
 
@@ -625,16 +640,18 @@ msgstr "Aufnahme"
 msgid "Reset"
 msgstr "Zurücksetzen"
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Sat"
 msgstr "Sa"
 
 #: ../lib/python/Screens/ScanSetup.py:86 ../lib/python/Screens/ScanSetup.py:95
-#: ../lib/python/Screens/Satconfig.py:13 ../lib/python/Screens/Satconfig.py:62
+#: ../lib/python/Screens/Satconfig.py:13 ../lib/python/Screens/Satconfig.py:61
+#: ../lib/python/Screens/Satconfig.py:145
 msgid "Satellite"
 msgstr "Satellit"
 
-#: ../lib/python/Screens/ChannelSelection.py:360
+#: ../lib/python/Screens/ChannelSelection.py:371
 msgid "Satellites"
 msgstr "Satelliten"
 
@@ -643,7 +660,7 @@ msgstr "Satelliten"
 msgid "Saturday"
 msgstr "Samstag"
 
-#: ../lib/python/Components/NimManager.py:618
+#: ../lib/python/Components/NimManager.py:621
 msgid "Secondary cable from Rotor-LNB"
 msgstr ""
 
@@ -651,11 +668,11 @@ msgstr ""
 msgid "Select channel to record from"
 msgstr "Kanal auswahlen, von dem aufgenommen werden soll"
 
-#: ../lib/python/Screens/Satconfig.py:85
+#: ../lib/python/Screens/Satconfig.py:118
 msgid "Sequence repeat"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:569
+#: ../lib/python/Screens/ChannelSelection.py:580
 msgid "Services"
 msgstr "Kanäle"
 
@@ -663,25 +680,29 @@ msgstr "Kanäle"
 msgid "Show the radio player..."
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:612
-#: ../lib/python/Components/NimManager.py:619
+#: ../lib/python/Components/NimManager.py:615
+#: ../lib/python/Components/NimManager.py:622
 msgid "Simple"
 msgstr "Einfach"
 
-#: ../lib/python/Components/NimManager.py:634
+#: ../lib/python/Components/NimManager.py:637
 msgid "Single"
 msgstr "Einzeln"
 
-#: ../lib/python/Components/NimManager.py:647
+#: ../lib/python/Screens/EventView.py:99
+msgid "Single EPG"
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:650
 msgid "Slot "
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:534
+#: ../lib/python/Components/NimManager.py:537
 msgid "Socket "
 msgstr "Sockel "
 
-#: ../lib/python/Components/NimManager.py:643
-#: ../lib/python/Components/NimManager.py:699
+#: ../lib/python/Components/NimManager.py:646
+#: ../lib/python/Components/NimManager.py:702
 msgid "South"
 msgstr "Süd"
 
@@ -693,7 +714,7 @@ msgstr ""
 msgid "Start"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:958
+#: ../lib/python/Screens/InfoBarGenerics.py:966
 msgid "Start recording?"
 msgstr "Aufnahme beginnen?"
 
@@ -709,14 +730,15 @@ msgstr "Schritt "
 msgid "Stop playing this movie?"
 msgstr "Das Abspielen dieses Films beenden?"
 
-#: ../lib/python/Screens/Satconfig.py:73
+#: ../lib/python/Screens/Satconfig.py:106
 msgid "Stored position"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1010 ../data/
+#: ../lib/python/Screens/InfoBarGenerics.py:1018 ../data/
 msgid "Subservices"
 msgstr "Unterkanäle"
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Sun"
 msgstr "So"
@@ -731,18 +753,19 @@ msgstr "Sonntag"
 msgid "Symbol Rate"
 msgstr "Symbolrate"
 
-#: ../lib/python/Screens/Satconfig.py:112
+#: ../lib/python/Screens/Satconfig.py:68
 msgid "Terrestrial provider"
 msgstr "Region"
 
-#: ../lib/python/Components/NimManager.py:695
+#: ../lib/python/Components/NimManager.py:698
 msgid "Three"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:106
+#: ../lib/python/Screens/Satconfig.py:139
 msgid "Threshold"
 msgstr ""
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Thu"
 msgstr "Do"
@@ -756,19 +779,23 @@ msgstr "Donnerstag"
 msgid "Timer Type"
 msgstr "Timer-Art"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:801
+#: ../lib/python/Screens/InfoBarGenerics.py:809
 msgid "Timeshift not possible!"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:68
+#: ../lib/python/Screens/EpgSelection.py:198
+msgid "Today"
+msgstr ""
+
+#: ../lib/python/Screens/Satconfig.py:101
 msgid "Tone mode"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:82
+#: ../lib/python/Screens/Satconfig.py:115
 msgid "Toneburst"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:634
+#: ../lib/python/Components/NimManager.py:637
 msgid "Toneburst A/B"
 msgstr "Toneburst A/B"
 
@@ -776,6 +803,7 @@ msgstr "Toneburst A/B"
 msgid "Transmission mode"
 msgstr "Übertragungstyp"
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Tue"
 msgstr "Di"
@@ -790,7 +818,7 @@ msgstr "Dienstag"
 msgid "Tuner"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:695
+#: ../lib/python/Components/NimManager.py:698
 msgid "Two"
 msgstr ""
 
@@ -800,7 +828,7 @@ msgstr ""
 msgid "Type of scan"
 msgstr "Art der Suche"
 
-#: ../lib/python/Components/NimManager.py:639
+#: ../lib/python/Components/NimManager.py:642
 msgid "USALS"
 msgstr "USALS"
 
@@ -814,11 +842,11 @@ msgstr ""
 "Bitte lesen Sie im Handbuch nach.\n"
 "Fehler: "
 
-#: ../lib/python/Screens/Satconfig.py:90
+#: ../lib/python/Screens/Satconfig.py:123
 msgid "Uncommitted DiSEqC command"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:678
+#: ../lib/python/Components/NimManager.py:681
 msgid "Universal LNB"
 msgstr ""
 
@@ -838,22 +866,23 @@ msgstr ""
 msgid "Use DHCP"
 msgstr "Adresse automatisch beziehen (DHCP)"
 
-#: ../lib/python/Screens/Satconfig.py:70
+#: ../lib/python/Screens/Satconfig.py:103
 msgid "Use usals for this sat"
 msgstr "USALS für diesen Sat benutzen"
 
-#: ../lib/python/Components/NimManager.py:678
+#: ../lib/python/Components/NimManager.py:681
 msgid "User defined"
 msgstr "Benutzerdefiniert"
 
-#: ../lib/python/Screens/Satconfig.py:67
+#: ../lib/python/Screens/Satconfig.py:100
 msgid "Voltage mode"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:575
+#: ../lib/python/Screens/ChannelSelection.py:586
 msgid "W"
 msgstr ""
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Wed"
 msgstr "Mi"
@@ -867,16 +896,16 @@ msgstr "Mittwoch"
 msgid "Weekday"
 msgstr "Wochentag"
 
-#: ../lib/python/Components/NimManager.py:641
-#: ../lib/python/Components/NimManager.py:697
+#: ../lib/python/Components/NimManager.py:644
+#: ../lib/python/Components/NimManager.py:700
 msgid "West"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:671
-#: ../lib/python/Components/NimManager.py:683
-#: ../lib/python/Components/NimManager.py:687
-#: ../lib/python/Components/NimManager.py:688
-#: ../lib/python/Components/NimManager.py:700
+#: ../lib/python/Components/NimManager.py:674
+#: ../lib/python/Components/NimManager.py:686
+#: ../lib/python/Components/NimManager.py:690
+#: ../lib/python/Components/NimManager.py:691
+#: ../lib/python/Components/NimManager.py:703
 msgid "Yes"
 msgstr "Ja"
 
@@ -884,36 +913,36 @@ msgstr "Ja"
 msgid "You cannot delete this!"
 msgstr "Sie können dies nicht löschen."
 
-#: ../lib/python/Screens/ChannelSelection.py:246
+#: ../lib/python/Screens/ChannelSelection.py:257
 msgid "[bouquet edit]"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:248
+#: ../lib/python/Screens/ChannelSelection.py:259
 msgid "[favourite edit]"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:327
+#: ../lib/python/Screens/ChannelSelection.py:338
 msgid "[move mode]"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:71
+#: ../lib/python/Screens/ChannelSelection.py:82
 msgid "abort bouquet edit"
 msgstr "Bouqueteditieren abbrechen"
 
-#: ../lib/python/Screens/ChannelSelection.py:74
+#: ../lib/python/Screens/ChannelSelection.py:85
 msgid "abort favourites edit"
 msgstr "Favoriteneditor abbrechen"
 
-#: ../lib/python/Screens/ChannelSelection.py:46
+#: ../lib/python/Screens/ChannelSelection.py:57
 msgid "add service to bouquet"
 msgstr "Zu Bouquet hinzufügen"
 
-#: ../lib/python/Screens/ChannelSelection.py:48
+#: ../lib/python/Screens/ChannelSelection.py:59
 msgid "add service to favourites"
 msgstr "Kanal zu Favoriten hinzufügen"
 
 #: ../lib/python/Screens/MovieSelection.py:21
-#: ../lib/python/Screens/ChannelSelection.py:76
+#: ../lib/python/Screens/ChannelSelection.py:87
 msgid "back"
 msgstr "zurück"
 
@@ -925,7 +954,7 @@ msgstr ""
 msgid "circular right"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:51
+#: ../lib/python/Screens/ChannelSelection.py:62
 msgid "copy to favourites"
 msgstr ""
 
@@ -937,31 +966,31 @@ msgstr "täglich"
 msgid "delete..."
 msgstr "löschen..."
 
-#: ../lib/python/Screens/ChannelSelection.py:67
+#: ../lib/python/Screens/ChannelSelection.py:78
 msgid "disable move mode"
 msgstr "Verschiebemodus ausschalten"
 
-#: ../lib/python/Components/NimManager.py:536
+#: ../lib/python/Components/NimManager.py:539
 msgid "empty/unknown"
 msgstr "leer/unbekannt"
 
-#: ../lib/python/Screens/ChannelSelection.py:63
+#: ../lib/python/Screens/ChannelSelection.py:74
 msgid "enable bouquet edit"
 msgstr "Bouqueteditieren anschalten"
 
-#: ../lib/python/Screens/ChannelSelection.py:65
+#: ../lib/python/Screens/ChannelSelection.py:76
 msgid "enable favourite edit"
 msgstr "Favoriteneditor anschalten"
 
-#: ../lib/python/Screens/ChannelSelection.py:60
+#: ../lib/python/Screens/ChannelSelection.py:71
 msgid "enable move mode"
 msgstr "Verschiebemodus aktivieren"
 
-#: ../lib/python/Screens/ChannelSelection.py:70
+#: ../lib/python/Screens/ChannelSelection.py:81
 msgid "end bouquet edit"
 msgstr "Bouqueteditieren beenden"
 
-#: ../lib/python/Screens/ChannelSelection.py:73
+#: ../lib/python/Screens/ChannelSelection.py:84
 msgid "end favourites edit"
 msgstr "Favoriteneditor beenden"
 
@@ -981,11 +1010,11 @@ msgstr "Modul initialisieren"
 msgid "leave movie player..."
 msgstr "Abspielmodus verlassen..."
 
-#: ../lib/python/Components/NimManager.py:639
+#: ../lib/python/Components/NimManager.py:642
 msgid "manual"
 msgstr "manuell"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:265
+#: ../lib/python/Screens/InfoBarGenerics.py:274
 msgid "next channel"
 msgstr "nächster Kanal"
 
@@ -1028,15 +1057,15 @@ msgstr "einmalig"
 msgid "please press OK when ready"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:266
+#: ../lib/python/Screens/InfoBarGenerics.py:275
 msgid "previous channel"
 msgstr "vorheriger Kanal"
 
-#: ../lib/python/Screens/ChannelSelection.py:55
+#: ../lib/python/Screens/ChannelSelection.py:66
 msgid "remove bouquet"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:53
+#: ../lib/python/Screens/ChannelSelection.py:64
 msgid "remove service"
 msgstr "Kanal löschen"
 
@@ -1082,7 +1111,7 @@ msgstr ""
 msgid "scan state"
 msgstr "Status"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:308
+#: ../lib/python/Screens/InfoBarGenerics.py:315
 msgid "show EPG..."
 msgstr "zeige EPG..."
 
@@ -1090,7 +1119,7 @@ msgstr "zeige EPG..."
 msgid "text"
 msgstr ""
 
-#: ../lib/python/Screens/EventView.py:60
+#: ../lib/python/Screens/EventView.py:64
 msgid "unknown service"
 msgstr "unbekannter Service"
 
@@ -1158,6 +1187,10 @@ msgid "#ffffff"
 msgstr ""
 
 #: ../data/
+msgid "NEXT"
+msgstr ""
+
+#: ../data/
 msgid "Deep Standby"
 msgstr "Ausschalten"
 
@@ -1420,13 +1453,8 @@ msgid "Network Setup"
 msgstr "Netzwerkeinstellungen"
 
 #: ../data/
-msgid "Thanks for using the wizard. Your box is now ready to use."
+msgid "#ffffffff"
 msgstr ""
-"Der Assistent ist hiermit beendet. Ihre Dreambox kann nun benutzt werden."
-
-#: ../data/
-msgid "Parental Lock"
-msgstr "Jugendschutz"
 
 #: ../data/
 msgid "Restart"
@@ -1461,8 +1489,8 @@ msgid "Exit wizard"
 msgstr "Assistenten beenden"
 
 #: ../data/
-msgid "Toggle EPG type with INFO button"
-msgstr "EPG-Typen durch Druck auf INFO wechseln"
+msgid "Timer sanity error"
+msgstr ""
 
 #: ../data/
 msgid "Serviceinfo"
@@ -1481,10 +1509,18 @@ msgid "Skip confirmations"
 msgstr "Bestätigungen überspringen"
 
 #: ../data/
+msgid "Choose bouquet"
+msgstr ""
+
+#: ../data/
 msgid "Yes, scan now"
 msgstr "Ja, jetzt suchen."
 
 #: ../data/
+msgid "MORE"
+msgstr ""
+
+#: ../data/
 msgid "Information"
 msgstr "Informationen"
 
@@ -1501,6 +1537,14 @@ msgid "Please set up tuner B"
 msgstr "Einstellungen für Tuner B."
 
 #: ../data/
+msgid ""
+"Thank you for using the wizard. Your box is now ready to use.\n"
+"Please press OK to start using you Dreambox."
+msgstr ""
+"Der Assistent ist hiermit beendet. Ihre Dreambox kann nun benutzt weren.\n"
+"Bitte drücken Sie OK, um den Assistenten zu verlassen."
+
+#: ../data/
 msgid "Delay"
 msgstr "Verzögerung"
 
@@ -1509,10 +1553,6 @@ msgid "Select HDD"
 msgstr "Festplattenwahl"
 
 #: ../data/
-msgid "#ffffffff"
-msgstr ""
-
-#: ../data/
 msgid "Setup Lock"
 msgstr "Setup-Sperre"
 
@@ -1620,6 +1660,10 @@ msgid "Do you want to do a service scan?"
 msgstr "Jetzt nach Kanälen suchen?"
 
 #: ../data/
+msgid "NOW"
+msgstr ""
+
+#: ../data/
 msgid "Seek"
 msgstr ""
 
@@ -1627,6 +1671,17 @@ msgstr ""
 msgid "Satelliteconfig"
 msgstr "Satelliteneinstellungen"
 
+#: ../data/
+msgid "Parental Lock"
+msgstr "Jugendschutz"
+
+#~ msgid "Thanks for using the wizard. Your box is now ready to use."
+#~ msgstr ""
+#~ "Der Assistent ist hiermit beendet. Ihre Dreambox kann nun benutzt werden."
+
+#~ msgid "Toggle EPG type with INFO button"
+#~ msgstr "EPG-Typen durch Druck auf INFO wechseln"
+
 #~ msgid "Recording"
 #~ msgstr "Aufnahmen"
 

diff --git a/po/en.po b/po/en.po
index 263ceea..c13bb42 100644 (file)
--- a/po/en.po
+++ b/po/en.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-25 02:01+0100\n"
+"POT-Creation-Date: 2006-01-28 00:36+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:76
+#: ../lib/python/Screens/EventView.py:80
 #, python-format
 msgid "%d min"
 msgstr ""
@@ -31,70 +31,74 @@ msgstr ""
 msgid "%s (%s, %d MB free)"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:682
+#: ../lib/python/Components/NimManager.py:685
 msgid "0 V"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:685
+#: ../lib/python/Components/NimManager.py:688
 msgid "1.0"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:685
+#: ../lib/python/Components/NimManager.py:688
 msgid "1.1"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:685
+#: ../lib/python/Components/NimManager.py:688
 msgid "1.2"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:682
+#: ../lib/python/Components/NimManager.py:685
 msgid "12 V"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:107
+#: ../lib/python/Screens/Satconfig.py:140
 msgid "12V Output"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:669
+#: ../lib/python/Components/NimManager.py:672
 msgid "13 V"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:669
+#: ../lib/python/Components/NimManager.py:672
 msgid "18 V"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:684
+#: ../lib/python/Components/NimManager.py:687
 msgid "A"
 msgstr ""
 
-#: ../RecordTimer.py:126
+#: ../RecordTimer.py:127
 msgid ""
 "A timer failed to record!\n"
 "Disable TV and try again?\n"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:686
+#: ../lib/python/Components/NimManager.py:689
 msgid "AA"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:686
+#: ../lib/python/Components/NimManager.py:689
 msgid "AB"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEdit.py:25
+#: ../lib/python/Screens/TimerEdit.py:28
 msgid "Add"
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:21
+#: ../lib/python/Screens/EventView.py:21
+msgid "Add Timer"
+msgstr ""
+
+#: ../lib/python/Screens/EpgSelection.py:48
 msgid "Add timer"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:612
-#: ../lib/python/Components/NimManager.py:620
+#: ../lib/python/Components/NimManager.py:615
+#: ../lib/python/Components/NimManager.py:623
 msgid "Advanced"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:359
+#: ../lib/python/Screens/ChannelSelection.py:370
 msgid "All"
 msgstr ""
 
@@ -122,19 +126,19 @@ msgstr ""
 msgid "Automatic Scan"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:684
+#: ../lib/python/Components/NimManager.py:687
 msgid "B"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:686
+#: ../lib/python/Components/NimManager.py:689
 msgid "BA"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:686
+#: ../lib/python/Components/NimManager.py:689
 msgid "BB"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:670
+#: ../lib/python/Components/NimManager.py:673
 msgid "Band"
 msgstr ""
 
@@ -146,11 +150,11 @@ msgstr ""
 msgid "Bus: "
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:678
+#: ../lib/python/Components/NimManager.py:681
 msgid "C-Band"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:110
+#: ../lib/python/Screens/Satconfig.py:66
 msgid "Cable provider"
 msgstr ""
 
@@ -166,11 +170,11 @@ msgstr ""
 msgid "Channel"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:78 ../data/
+#: ../lib/python/Screens/ChannelSelection.py:89 ../data/
 msgid "Channel Selection"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:125
+#: ../lib/python/Screens/InfoBarGenerics.py:135
 msgid "Channel:"
 msgstr ""
 
@@ -178,7 +182,7 @@ msgstr ""
 msgid "Classic"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEdit.py:27
+#: ../lib/python/Screens/TimerEdit.py:30
 msgid "Cleanup"
 msgstr ""
 
@@ -194,11 +198,12 @@ msgstr ""
 msgid "Code rate low"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:87 ../lib/python/Screens/Satconfig.py:89
+#: ../lib/python/Screens/Satconfig.py:120
+#: ../lib/python/Screens/Satconfig.py:122
 msgid "Command order"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:83
+#: ../lib/python/Screens/Satconfig.py:116
 msgid "Committed DiSEqC command"
 msgstr ""
 
@@ -206,11 +211,15 @@ msgstr ""
 msgid "Configuration Mode"
 msgstr ""
 
+#: ../lib/python/Screens/TimerEdit.py:195
+msgid "Conflicting timer"
+msgstr ""
+
 #: ../lib/python/Components/SetupDevices.py:21
 msgid "Default"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEdit.py:24
+#: ../lib/python/Screens/TimerEdit.py:27
 msgid "Delete"
 msgstr ""
 
@@ -234,11 +243,11 @@ msgstr ""
 msgid "Detected NIMs:"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:634
+#: ../lib/python/Components/NimManager.py:637
 msgid "DiSEqC A/B"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:634
+#: ../lib/python/Components/NimManager.py:637
 msgid "DiSEqC A/B/C/D"
 msgstr ""
 
@@ -246,17 +255,17 @@ msgstr ""
 msgid "DiSEqC Mode"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:79
+#: ../lib/python/Screens/Satconfig.py:112
 msgid "DiSEqC mode"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:91
+#: ../lib/python/Screens/Satconfig.py:124
 msgid "DiSEqC repeats"
 msgstr ""
 
 #: ../lib/python/Screens/ScanSetup.py:104
 #: ../lib/python/Screens/ScanSetup.py:375
-#: ../lib/python/Screens/TimerEdit.py:72 ../lib/python/Components/Lcd.py:31
+#: ../lib/python/Screens/TimerEdit.py:75 ../lib/python/Components/Lcd.py:31
 #: ../lib/python/Components/SetupDevices.py:38
 #: ../lib/python/Components/SetupDevices.py:39
 #: ../lib/python/Components/SetupDevices.py:43
@@ -271,7 +280,7 @@ msgstr ""
 msgid "Do you really want to delete this recording?"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:956
+#: ../lib/python/Screens/InfoBarGenerics.py:964
 msgid ""
 "Do you want to stop the current\n"
 "(instant) recording?"
@@ -288,7 +297,7 @@ msgstr ""
 msgid "Dutch"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:577
+#: ../lib/python/Screens/ChannelSelection.py:588
 msgid "E"
 msgstr ""
 
@@ -297,14 +306,14 @@ msgstr ""
 msgid "ERROR - failed to scan (%s)!"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:641
-#: ../lib/python/Components/NimManager.py:697
+#: ../lib/python/Components/NimManager.py:644
+#: ../lib/python/Components/NimManager.py:700
 msgid "East"
 msgstr ""
 
 #: ../lib/python/Screens/ScanSetup.py:104
 #: ../lib/python/Screens/ScanSetup.py:375
-#: ../lib/python/Screens/TimerEdit.py:70 ../lib/python/Components/Lcd.py:31
+#: ../lib/python/Screens/TimerEdit.py:73 ../lib/python/Components/Lcd.py:31
 #: ../lib/python/Components/SetupDevices.py:38
 #: ../lib/python/Components/SetupDevices.py:39
 #: ../lib/python/Components/SetupDevices.py:43
@@ -329,7 +338,7 @@ msgstr ""
 msgid "English"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:615
+#: ../lib/python/Components/NimManager.py:618
 msgid "Equal to Socket A"
 msgstr ""
 
@@ -338,11 +347,11 @@ msgstr ""
 msgid "FEC"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:84
+#: ../lib/python/Screens/Satconfig.py:117
 msgid "Fast DiSEqC"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:362
+#: ../lib/python/Screens/ChannelSelection.py:373
 msgid "Favourites"
 msgstr ""
 
@@ -353,6 +362,7 @@ msgstr ""
 msgid "Frequency"
 msgstr "Frequency"
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Fri"
 msgstr ""
@@ -383,7 +393,7 @@ msgstr ""
 msgid "IP Address"
 msgstr "IP Address"
 
-#: ../lib/python/Screens/Satconfig.py:108
+#: ../lib/python/Screens/Satconfig.py:141
 msgid "Increased voltage"
 msgstr ""
 
@@ -405,19 +415,19 @@ msgstr ""
 msgid "Inversion"
 msgstr "Inversion"
 
-#: ../lib/python/Screens/Satconfig.py:76
+#: ../lib/python/Screens/Satconfig.py:109
 msgid "LNB"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:101
+#: ../lib/python/Screens/Satconfig.py:134
 msgid "LOF"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:105
+#: ../lib/python/Screens/Satconfig.py:138
 msgid "LOF/H"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:104
+#: ../lib/python/Screens/Satconfig.py:137
 msgid "LOF/L"
 msgstr ""
 
@@ -425,17 +435,17 @@ msgstr ""
 msgid "Language selection"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:28 ../lib/python/Screens/Satconfig.py:95
-#: ../data/
+#: ../lib/python/Screens/Satconfig.py:28
+#: ../lib/python/Screens/Satconfig.py:128 ../data/
 msgid "Latitude"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:26 ../lib/python/Screens/Satconfig.py:93
-#: ../data/
+#: ../lib/python/Screens/Satconfig.py:26
+#: ../lib/python/Screens/Satconfig.py:126 ../data/
 msgid "Longitude"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:616
+#: ../lib/python/Components/NimManager.py:619
 msgid "Loopthrough to Socket A"
 msgstr ""
 
@@ -448,6 +458,7 @@ msgstr ""
 msgid "Modulation"
 msgstr ""
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Mon"
 msgstr ""
@@ -465,7 +476,11 @@ msgstr ""
 msgid "Movie Menu"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:471
+#: ../lib/python/Screens/EventView.py:100
+msgid "Multi EPG"
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:474
 msgid "N/A"
 msgstr ""
 
@@ -481,19 +496,19 @@ msgstr "Nameserver"
 msgid "Netmask"
 msgstr "Netmask"
 
-#: ../lib/python/Screens/EpgSelection.py:31
+#: ../lib/python/Screens/EpgSelection.py:34
 msgid "Next"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:671
-#: ../lib/python/Components/NimManager.py:683
-#: ../lib/python/Components/NimManager.py:687
-#: ../lib/python/Components/NimManager.py:688
-#: ../lib/python/Components/NimManager.py:700
+#: ../lib/python/Components/NimManager.py:674
+#: ../lib/python/Components/NimManager.py:686
+#: ../lib/python/Components/NimManager.py:690
+#: ../lib/python/Components/NimManager.py:691
+#: ../lib/python/Components/NimManager.py:703
 msgid "No"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:952
+#: ../lib/python/Screens/InfoBarGenerics.py:960
 msgid "No HDD found or HDD not initialized!"
 msgstr ""
 
@@ -502,19 +517,19 @@ msgstr ""
 #: ../lib/python/Screens/ScanSetup.py:187
 #: ../lib/python/Screens/ScanSetup.py:188
 #: ../lib/python/Screens/ScanSetup.py:192
-#: ../lib/python/Components/NimManager.py:684
-#: ../lib/python/Components/NimManager.py:685
-#: ../lib/python/Components/NimManager.py:686
-#: ../lib/python/Components/NimManager.py:695
+#: ../lib/python/Components/NimManager.py:687
+#: ../lib/python/Components/NimManager.py:688
+#: ../lib/python/Components/NimManager.py:689
+#: ../lib/python/Components/NimManager.py:698
 msgid "None"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:643
-#: ../lib/python/Components/NimManager.py:699
+#: ../lib/python/Components/NimManager.py:646
+#: ../lib/python/Components/NimManager.py:702
 msgid "North"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:617
+#: ../lib/python/Components/NimManager.py:620
 msgid "Nothing connected"
 msgstr ""
 
@@ -522,15 +537,15 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:670
+#: ../lib/python/Components/NimManager.py:673
 msgid "Off"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:670
+#: ../lib/python/Components/NimManager.py:673
 msgid "On"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:695
+#: ../lib/python/Components/NimManager.py:698
 msgid "One"
 msgstr ""
 
@@ -550,7 +565,7 @@ msgstr ""
 msgid "Polarity"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:669
+#: ../lib/python/Components/NimManager.py:672
 msgid "Polarization"
 msgstr ""
 
@@ -570,7 +585,7 @@ msgstr ""
 msgid "Port D"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:634
+#: ../lib/python/Components/NimManager.py:637
 msgid "Positioner"
 msgstr ""
 
@@ -590,23 +605,23 @@ msgstr ""
 msgid "Press OK to start the scan"
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:30
+#: ../lib/python/Screens/EpgSelection.py:33
 msgid "Prev"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:361
+#: ../lib/python/Screens/ChannelSelection.py:372
 msgid "Provider"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:567
+#: ../lib/python/Screens/ChannelSelection.py:578
 msgid "Providers"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEdit.py:92
+#: ../lib/python/Screens/TimerEdit.py:95
 msgid "Really delete done timers?"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1005
+#: ../lib/python/Screens/InfoBarGenerics.py:1013
 msgid "Record"
 msgstr ""
 
@@ -614,16 +629,18 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Sat"
 msgstr ""
 
 #: ../lib/python/Screens/ScanSetup.py:86 ../lib/python/Screens/ScanSetup.py:95
-#: ../lib/python/Screens/Satconfig.py:13 ../lib/python/Screens/Satconfig.py:62
+#: ../lib/python/Screens/Satconfig.py:13 ../lib/python/Screens/Satconfig.py:61
+#: ../lib/python/Screens/Satconfig.py:145
 msgid "Satellite"
 msgstr "Satellite"
 
-#: ../lib/python/Screens/ChannelSelection.py:360
+#: ../lib/python/Screens/ChannelSelection.py:371
 msgid "Satellites"
 msgstr ""
 
@@ -632,7 +649,7 @@ msgstr ""
 msgid "Saturday"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:618
+#: ../lib/python/Components/NimManager.py:621
 msgid "Secondary cable from Rotor-LNB"
 msgstr ""
 
@@ -640,11 +657,11 @@ msgstr ""
 msgid "Select channel to record from"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:85
+#: ../lib/python/Screens/Satconfig.py:118
 msgid "Sequence repeat"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:569
+#: ../lib/python/Screens/ChannelSelection.py:580
 msgid "Services"
 msgstr ""
 
@@ -652,25 +669,29 @@ msgstr ""
 msgid "Show the radio player..."
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:612
-#: ../lib/python/Components/NimManager.py:619
+#: ../lib/python/Components/NimManager.py:615
+#: ../lib/python/Components/NimManager.py:622
 msgid "Simple"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:634
+#: ../lib/python/Components/NimManager.py:637
 msgid "Single"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:647
+#: ../lib/python/Screens/EventView.py:99
+msgid "Single EPG"
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:650
 msgid "Slot "
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:534
+#: ../lib/python/Components/NimManager.py:537
 msgid "Socket "
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:643
-#: ../lib/python/Components/NimManager.py:699
+#: ../lib/python/Components/NimManager.py:646
+#: ../lib/python/Components/NimManager.py:702
 msgid "South"
 msgstr ""
 
@@ -682,7 +703,7 @@ msgstr ""
 msgid "Start"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:958
+#: ../lib/python/Screens/InfoBarGenerics.py:966
 msgid "Start recording?"
 msgstr ""
 
@@ -698,14 +719,15 @@ msgstr ""
 msgid "Stop playing this movie?"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:73
+#: ../lib/python/Screens/Satconfig.py:106
 msgid "Stored position"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1010 ../data/
+#: ../lib/python/Screens/InfoBarGenerics.py:1018 ../data/
 msgid "Subservices"
 msgstr ""
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Sun"
 msgstr ""
@@ -720,18 +742,19 @@ msgstr ""
 msgid "Symbol Rate"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:112
+#: ../lib/python/Screens/Satconfig.py:68
 msgid "Terrestrial provider"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:695
+#: ../lib/python/Components/NimManager.py:698
 msgid "Three"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:106
+#: ../lib/python/Screens/Satconfig.py:139
 msgid "Threshold"
 msgstr ""
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Thu"
 msgstr ""
@@ -745,19 +768,23 @@ msgstr ""
 msgid "Timer Type"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:801
+#: ../lib/python/Screens/InfoBarGenerics.py:809
 msgid "Timeshift not possible!"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:68
+#: ../lib/python/Screens/EpgSelection.py:198
+msgid "Today"
+msgstr ""
+
+#: ../lib/python/Screens/Satconfig.py:101
 msgid "Tone mode"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:82
+#: ../lib/python/Screens/Satconfig.py:115
 msgid "Toneburst"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:634
+#: ../lib/python/Components/NimManager.py:637
 msgid "Toneburst A/B"
 msgstr ""
 
@@ -765,6 +792,7 @@ msgstr ""
 msgid "Transmission mode"
 msgstr ""
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Tue"
 msgstr ""
@@ -779,7 +807,7 @@ msgstr ""
 msgid "Tuner"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:695
+#: ../lib/python/Components/NimManager.py:698
 msgid "Two"
 msgstr ""
 
@@ -789,7 +817,7 @@ msgstr ""
 msgid "Type of scan"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:639
+#: ../lib/python/Components/NimManager.py:642
 msgid "USALS"
 msgstr ""
 
@@ -800,11 +828,11 @@ msgid ""
 "Error: "
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:90
+#: ../lib/python/Screens/Satconfig.py:123
 msgid "Uncommitted DiSEqC command"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:678
+#: ../lib/python/Components/NimManager.py:681
 msgid "Universal LNB"
 msgstr ""
 
@@ -822,22 +850,23 @@ msgstr ""
 msgid "Use DHCP"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:70
+#: ../lib/python/Screens/Satconfig.py:103
 msgid "Use usals for this sat"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:678
+#: ../lib/python/Components/NimManager.py:681
 msgid "User defined"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:67
+#: ../lib/python/Screens/Satconfig.py:100
 msgid "Voltage mode"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:575
+#: ../lib/python/Screens/ChannelSelection.py:586
 msgid "W"
 msgstr ""
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Wed"
 msgstr ""
@@ -851,16 +880,16 @@ msgstr ""
 msgid "Weekday"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:641
-#: ../lib/python/Components/NimManager.py:697
+#: ../lib/python/Components/NimManager.py:644
+#: ../lib/python/Components/NimManager.py:700
 msgid "West"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:671
-#: ../lib/python/Components/NimManager.py:683
-#: ../lib/python/Components/NimManager.py:687
-#: ../lib/python/Components/NimManager.py:688
-#: ../lib/python/Components/NimManager.py:700
+#: ../lib/python/Components/NimManager.py:674
+#: ../lib/python/Components/NimManager.py:686
+#: ../lib/python/Components/NimManager.py:690
+#: ../lib/python/Components/NimManager.py:691
+#: ../lib/python/Components/NimManager.py:703
 msgid "Yes"
 msgstr ""
 
@@ -868,36 +897,36 @@ msgstr ""
 msgid "You cannot delete this!"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:246
+#: ../lib/python/Screens/ChannelSelection.py:257
 msgid "[bouquet edit]"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:248
+#: ../lib/python/Screens/ChannelSelection.py:259
 msgid "[favourite edit]"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:327
+#: ../lib/python/Screens/ChannelSelection.py:338
 msgid "[move mode]"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:71
+#: ../lib/python/Screens/ChannelSelection.py:82
 msgid "abort bouquet edit"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:74
+#: ../lib/python/Screens/ChannelSelection.py:85
 msgid "abort favourites edit"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:46
+#: ../lib/python/Screens/ChannelSelection.py:57
 msgid "add service to bouquet"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:48
+#: ../lib/python/Screens/ChannelSelection.py:59
 msgid "add service to favourites"
 msgstr ""
 
 #: ../lib/python/Screens/MovieSelection.py:21
-#: ../lib/python/Screens/ChannelSelection.py:76
+#: ../lib/python/Screens/ChannelSelection.py:87
 msgid "back"
 msgstr ""
 
@@ -909,7 +938,7 @@ msgstr ""
 msgid "circular right"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:51
+#: ../lib/python/Screens/ChannelSelection.py:62
 msgid "copy to favourites"
 msgstr ""
 
@@ -921,31 +950,31 @@ msgstr ""
 msgid "delete..."
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:67
+#: ../lib/python/Screens/ChannelSelection.py:78
 msgid "disable move mode"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:536
+#: ../lib/python/Components/NimManager.py:539
 msgid "empty/unknown"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:63
+#: ../lib/python/Screens/ChannelSelection.py:74
 msgid "enable bouquet edit"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:65
+#: ../lib/python/Screens/ChannelSelection.py:76
 msgid "enable favourite edit"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:60
+#: ../lib/python/Screens/ChannelSelection.py:71
 msgid "enable move mode"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:70
+#: ../lib/python/Screens/ChannelSelection.py:81
 msgid "end bouquet edit"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:73
+#: ../lib/python/Screens/ChannelSelection.py:84
 msgid "end favourites edit"
 msgstr ""
 
@@ -965,11 +994,11 @@ msgstr ""
 msgid "leave movie player..."
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:639
+#: ../lib/python/Components/NimManager.py:642
 msgid "manual"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:265
+#: ../lib/python/Screens/InfoBarGenerics.py:274
 msgid "next channel"
 msgstr ""
 
@@ -1012,15 +1041,15 @@ msgstr ""
 msgid "please press OK when ready"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:266
+#: ../lib/python/Screens/InfoBarGenerics.py:275
 msgid "previous channel"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:55
+#: ../lib/python/Screens/ChannelSelection.py:66
 msgid "remove bouquet"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:53
+#: ../lib/python/Screens/ChannelSelection.py:64
 msgid "remove service"
 msgstr ""
 
@@ -1058,7 +1087,7 @@ msgstr ""
 msgid "scan state"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:308
+#: ../lib/python/Screens/InfoBarGenerics.py:315
 msgid "show EPG..."
 msgstr ""
 
@@ -1066,7 +1095,7 @@ msgstr ""
 msgid "text"
 msgstr ""
 
-#: ../lib/python/Screens/EventView.py:60
+#: ../lib/python/Screens/EventView.py:64
 msgid "unknown service"
 msgstr ""
 
@@ -1134,6 +1163,10 @@ msgid "#ffffff"
 msgstr ""
 
 #: ../data/
+msgid "NEXT"
+msgstr ""
+
+#: ../data/
 msgid "Deep Standby"
 msgstr ""
 
@@ -1394,11 +1427,7 @@ msgid "Network Setup"
 msgstr ""
 
 #: ../data/
-msgid "Thanks for using the wizard. Your box is now ready to use."
-msgstr ""
-
-#: ../data/
-msgid "Parental Lock"
+msgid "#ffffffff"
 msgstr ""
 
 #: ../data/
@@ -1434,7 +1463,7 @@ msgid "Exit wizard"
 msgstr ""
 
 #: ../data/
-msgid "Toggle EPG type with INFO button"
+msgid "Timer sanity error"
 msgstr ""
 
 #: ../data/
@@ -1454,10 +1483,18 @@ msgid "Skip confirmations"
 msgstr ""
 
 #: ../data/
+msgid "Choose bouquet"
+msgstr ""
+
+#: ../data/
 msgid "Yes, scan now"
 msgstr ""
 
 #: ../data/
+msgid "MORE"
+msgstr ""
+
+#: ../data/
 msgid "Information"
 msgstr ""
 
@@ -1474,15 +1511,17 @@ msgid "Please set up tuner B"
 msgstr ""
 
 #: ../data/
-msgid "Delay"
+msgid ""
+"Thank you for using the wizard. Your box is now ready to use.\n"
+"Please press OK to start using you Dreambox."
 msgstr ""
 
 #: ../data/
-msgid "Select HDD"
+msgid "Delay"
 msgstr ""
 
 #: ../data/
-msgid "#ffffffff"
+msgid "Select HDD"
 msgstr ""
 
 #: ../data/
@@ -1585,6 +1624,10 @@ msgid "Do you want to do a service scan?"
 msgstr ""
 
 #: ../data/
+msgid "NOW"
+msgstr ""
+
+#: ../data/
 msgid "Seek"
 msgstr ""
 
@@ -1592,5 +1635,9 @@ msgstr ""
 msgid "Satelliteconfig"
 msgstr ""
 
+#: ../data/
+msgid "Parental Lock"
+msgstr ""
+
 #~ msgid "Symbolrate"
 #~ msgstr "Symbolrate"

diff --git a/po/es.po b/po/es.po
index 632a96c..e6f3c92 100644 (file)
--- a/po/es.po
+++ b/po/es.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-25 02:01+0100\n"
+"POT-Creation-Date: 2006-01-28 00:36+0100\n"
 "PO-Revision-Date: 2006-01-19 09:00+0100\n"
 "Last-Translator: Jose Juan Zapater <josej@zapater.fdns.net>\n"
 "Language-Team: none\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Poedit-Country: SPAIN\n"
 "X-Poedit-SourceCharset: iso-8859-1\n"
 
-#: ../lib/python/Screens/EventView.py:76
+#: ../lib/python/Screens/EventView.py:80
 #, python-format
 msgid "%d min"
 msgstr ""
@@ -34,43 +34,43 @@ msgstr ""
 msgid "%s (%s, %d MB free)"
 msgstr "%s (%s, %d MB libres)"
 
-#: ../lib/python/Components/NimManager.py:682
+#: ../lib/python/Components/NimManager.py:685
 msgid "0 V"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:685
+#: ../lib/python/Components/NimManager.py:688
 msgid "1.0"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:685
+#: ../lib/python/Components/NimManager.py:688
 msgid "1.1"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:685
+#: ../lib/python/Components/NimManager.py:688
 msgid "1.2"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:682
+#: ../lib/python/Components/NimManager.py:685
 msgid "12 V"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:107
+#: ../lib/python/Screens/Satconfig.py:140
 msgid "12V Output"
 msgstr "12V Salida"
 
-#: ../lib/python/Components/NimManager.py:669
+#: ../lib/python/Components/NimManager.py:672
 msgid "13 V"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:669
+#: ../lib/python/Components/NimManager.py:672
 msgid "18 V"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:684
+#: ../lib/python/Components/NimManager.py:687
 msgid "A"
 msgstr ""
 
-#: ../RecordTimer.py:126
+#: ../RecordTimer.py:127
 msgid ""
 "A timer failed to record!\n"
 "Disable TV and try again?\n"
@@ -78,28 +78,32 @@ msgstr ""
 "¡Ha fallado la grabacion!\n"
 "¿Desactivar TV y probar otra vez?\n"
 
-#: ../lib/python/Components/NimManager.py:686
+#: ../lib/python/Components/NimManager.py:689
 msgid "AA"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:686
+#: ../lib/python/Components/NimManager.py:689
 msgid "AB"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEdit.py:25
+#: ../lib/python/Screens/TimerEdit.py:28
 msgid "Add"
 msgstr "Añadir"
 
-#: ../lib/python/Screens/EpgSelection.py:21
+#: ../lib/python/Screens/EventView.py:21
+msgid "Add Timer"
+msgstr ""
+
+#: ../lib/python/Screens/EpgSelection.py:48
 msgid "Add timer"
 msgstr "Añadir temporizador"
 
-#: ../lib/python/Components/NimManager.py:612
-#: ../lib/python/Components/NimManager.py:620
+#: ../lib/python/Components/NimManager.py:615
+#: ../lib/python/Components/NimManager.py:623
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: ../lib/python/Screens/ChannelSelection.py:359
+#: ../lib/python/Screens/ChannelSelection.py:370
 msgid "All"
 msgstr "Todo"
 
@@ -127,19 +131,19 @@ msgstr ""
 msgid "Automatic Scan"
 msgstr "Escaneo automatico"
 
-#: ../lib/python/Components/NimManager.py:684
+#: ../lib/python/Components/NimManager.py:687
 msgid "B"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:686
+#: ../lib/python/Components/NimManager.py:689
 msgid "BA"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:686
+#: ../lib/python/Components/NimManager.py:689
 msgid "BB"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:670
+#: ../lib/python/Components/NimManager.py:673
 msgid "Band"
 msgstr "Banda"
 
@@ -151,11 +155,11 @@ msgstr "Ancho de banda"
 msgid "Bus: "
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:678
+#: ../lib/python/Components/NimManager.py:681
 msgid "C-Band"
 msgstr "Banda-C"
 
-#: ../lib/python/Screens/Satconfig.py:110
+#: ../lib/python/Screens/Satconfig.py:66
 msgid "Cable provider"
 msgstr "Proveedor de cable"
 
@@ -171,11 +175,11 @@ msgstr "Capacidad: "
 msgid "Channel"
 msgstr "Canal"
 
-#: ../lib/python/Screens/ChannelSelection.py:78 ../data/
+#: ../lib/python/Screens/ChannelSelection.py:89 ../data/
 msgid "Channel Selection"
 msgstr "Seleccion de Canal"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:125
+#: ../lib/python/Screens/InfoBarGenerics.py:135
 msgid "Channel:"
 msgstr "Canal:"
 
@@ -183,7 +187,7 @@ msgstr "Canal:"
 msgid "Classic"
 msgstr "Clasico"
 
-#: ../lib/python/Screens/TimerEdit.py:27
+#: ../lib/python/Screens/TimerEdit.py:30
 msgid "Cleanup"
 msgstr ""
 
@@ -199,11 +203,12 @@ msgstr ""
 msgid "Code rate low"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:87 ../lib/python/Screens/Satconfig.py:89
+#: ../lib/python/Screens/Satconfig.py:120
+#: ../lib/python/Screens/Satconfig.py:122
 msgid "Command order"
 msgstr "Orden de comando"
 
-#: ../lib/python/Screens/Satconfig.py:83
+#: ../lib/python/Screens/Satconfig.py:116
 msgid "Committed DiSEqC command"
 msgstr "Comando DISEqC enviado"
 
@@ -211,11 +216,15 @@ msgstr "Comando DISEqC enviado"
 msgid "Configuration Mode"
 msgstr "Modo Configuracion"
 
+#: ../lib/python/Screens/TimerEdit.py:195
+msgid "Conflicting timer"
+msgstr ""
+
 #: ../lib/python/Components/SetupDevices.py:21
 msgid "Default"
 msgstr "Por defecto"
 
-#: ../lib/python/Screens/TimerEdit.py:24
+#: ../lib/python/Screens/TimerEdit.py:27
 msgid "Delete"
 msgstr "Borrar"
 
@@ -239,11 +248,11 @@ msgstr "HDD: Detectado"
 msgid "Detected NIMs:"
 msgstr "Detectado NIMs:"
 
-#: ../lib/python/Components/NimManager.py:634
+#: ../lib/python/Components/NimManager.py:637
 msgid "DiSEqC A/B"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:634
+#: ../lib/python/Components/NimManager.py:637
 msgid "DiSEqC A/B/C/D"
 msgstr ""
 
@@ -251,17 +260,17 @@ msgstr ""
 msgid "DiSEqC Mode"
 msgstr "Modo DiSEqC"
 
-#: ../lib/python/Screens/Satconfig.py:79
+#: ../lib/python/Screens/Satconfig.py:112
 msgid "DiSEqC mode"
 msgstr "modo DiSEqC"
 
-#: ../lib/python/Screens/Satconfig.py:91
+#: ../lib/python/Screens/Satconfig.py:124
 msgid "DiSEqC repeats"
 msgstr "Repetir DiSEqC"
 
 #: ../lib/python/Screens/ScanSetup.py:104
 #: ../lib/python/Screens/ScanSetup.py:375
-#: ../lib/python/Screens/TimerEdit.py:72 ../lib/python/Components/Lcd.py:31
+#: ../lib/python/Screens/TimerEdit.py:75 ../lib/python/Components/Lcd.py:31
 #: ../lib/python/Components/SetupDevices.py:38
 #: ../lib/python/Components/SetupDevices.py:39
 #: ../lib/python/Components/SetupDevices.py:43
@@ -276,7 +285,7 @@ msgstr "Desabilitar"
 msgid "Do you really want to delete this recording?"
 msgstr "¿Borrar esta grabacion?"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:956
+#: ../lib/python/Screens/InfoBarGenerics.py:964
 msgid ""
 "Do you want to stop the current\n"
 "(instant) recording?"
@@ -297,7 +306,7 @@ msgstr ""
 msgid "Dutch"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:577
+#: ../lib/python/Screens/ChannelSelection.py:588
 msgid "E"
 msgstr ""
 
@@ -306,14 +315,14 @@ msgstr ""
 msgid "ERROR - failed to scan (%s)!"
 msgstr "ERROR - fallo la busqueda (%s)!"
 
-#: ../lib/python/Components/NimManager.py:641
-#: ../lib/python/Components/NimManager.py:697
+#: ../lib/python/Components/NimManager.py:644
+#: ../lib/python/Components/NimManager.py:700
 msgid "East"
 msgstr "Este"
 
 #: ../lib/python/Screens/ScanSetup.py:104
 #: ../lib/python/Screens/ScanSetup.py:375
-#: ../lib/python/Screens/TimerEdit.py:70 ../lib/python/Components/Lcd.py:31
+#: ../lib/python/Screens/TimerEdit.py:73 ../lib/python/Components/Lcd.py:31
 #: ../lib/python/Components/SetupDevices.py:38
 #: ../lib/python/Components/SetupDevices.py:39
 #: ../lib/python/Components/SetupDevices.py:43
@@ -338,7 +347,7 @@ msgstr "HoraFin"
 msgid "English"
 msgstr "Ingles"
 
-#: ../lib/python/Components/NimManager.py:615
+#: ../lib/python/Components/NimManager.py:618
 msgid "Equal to Socket A"
 msgstr ""
 
@@ -347,11 +356,11 @@ msgstr ""
 msgid "FEC"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:84
+#: ../lib/python/Screens/Satconfig.py:117
 msgid "Fast DiSEqC"
 msgstr "DiSEqC Rapido"
 
-#: ../lib/python/Screens/ChannelSelection.py:362
+#: ../lib/python/Screens/ChannelSelection.py:373
 msgid "Favourites"
 msgstr "Favoritos"
 
@@ -362,6 +371,7 @@ msgstr "Favoritos"
 msgid "Frequency"
 msgstr "Frecuencia"
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Fri"
 msgstr ""
@@ -392,7 +402,7 @@ msgstr "Modo jerarquico"
 msgid "IP Address"
 msgstr "Direccion IP"
 
-#: ../lib/python/Screens/Satconfig.py:108
+#: ../lib/python/Screens/Satconfig.py:141
 msgid "Increased voltage"
 msgstr "Voltage incrementado"
 
@@ -414,19 +424,19 @@ msgstr "Inicializando Disco duro..."
 msgid "Inversion"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:76
+#: ../lib/python/Screens/Satconfig.py:109
 msgid "LNB"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:101
+#: ../lib/python/Screens/Satconfig.py:134
 msgid "LOF"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:105
+#: ../lib/python/Screens/Satconfig.py:138
 msgid "LOF/H"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:104
+#: ../lib/python/Screens/Satconfig.py:137
 msgid "LOF/L"
 msgstr ""
 
@@ -434,17 +444,17 @@ msgstr ""
 msgid "Language selection"
 msgstr "Seleccion de Idioma"
 
-#: ../lib/python/Screens/Satconfig.py:28 ../lib/python/Screens/Satconfig.py:95
-#: ../data/
+#: ../lib/python/Screens/Satconfig.py:28
+#: ../lib/python/Screens/Satconfig.py:128 ../data/
 msgid "Latitude"
 msgstr "Latitud"
 
-#: ../lib/python/Screens/Satconfig.py:26 ../lib/python/Screens/Satconfig.py:93
-#: ../data/
+#: ../lib/python/Screens/Satconfig.py:26
+#: ../lib/python/Screens/Satconfig.py:126 ../data/
 msgid "Longitude"
 msgstr "Longitud"
 
-#: ../lib/python/Components/NimManager.py:616
+#: ../lib/python/Components/NimManager.py:619
 msgid "Loopthrough to Socket A"
 msgstr ""
 
@@ -457,6 +467,7 @@ msgstr "Modelo: "
 msgid "Modulation"
 msgstr "Modulacion"
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Mon"
 msgstr ""
@@ -474,7 +485,11 @@ msgstr "Lunes"
 msgid "Movie Menu"
 msgstr "Menu de Peliculas"
 
-#: ../lib/python/Components/NimManager.py:471
+#: ../lib/python/Screens/EventView.py:100
+msgid "Multi EPG"
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:474
 msgid "N/A"
 msgstr ""
 
@@ -490,19 +505,19 @@ msgstr "DNS"
 msgid "Netmask"
 msgstr "Mascara"
 
-#: ../lib/python/Screens/EpgSelection.py:31
+#: ../lib/python/Screens/EpgSelection.py:34
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../lib/python/Components/NimManager.py:671
-#: ../lib/python/Components/NimManager.py:683
-#: ../lib/python/Components/NimManager.py:687
-#: ../lib/python/Components/NimManager.py:688
-#: ../lib/python/Components/NimManager.py:700
+#: ../lib/python/Components/NimManager.py:674
+#: ../lib/python/Components/NimManager.py:686
+#: ../lib/python/Components/NimManager.py:690
+#: ../lib/python/Components/NimManager.py:691
+#: ../lib/python/Components/NimManager.py:703
 msgid "No"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:952
+#: ../lib/python/Screens/InfoBarGenerics.py:960
 msgid "No HDD found or HDD not initialized!"
 msgstr "No HDD encontrado o no inicializado"
 
@@ -511,19 +526,19 @@ msgstr "No HDD encontrado o no inicializado"
 #: ../lib/python/Screens/ScanSetup.py:187
 #: ../lib/python/Screens/ScanSetup.py:188
 #: ../lib/python/Screens/ScanSetup.py:192
-#: ../lib/python/Components/NimManager.py:684
-#: ../lib/python/Components/NimManager.py:685
-#: ../lib/python/Components/NimManager.py:686
-#: ../lib/python/Components/NimManager.py:695
+#: ../lib/python/Components/NimManager.py:687
+#: ../lib/python/Components/NimManager.py:688
+#: ../lib/python/Components/NimManager.py:689
+#: ../lib/python/Components/NimManager.py:698
 msgid "None"
 msgstr "Ninguno"
 
-#: ../lib/python/Components/NimManager.py:643
-#: ../lib/python/Components/NimManager.py:699
+#: ../lib/python/Components/NimManager.py:646
+#: ../lib/python/Components/NimManager.py:702
 msgid "North"
 msgstr "Norte"
 
-#: ../lib/python/Components/NimManager.py:617
+#: ../lib/python/Components/NimManager.py:620
 msgid "Nothing connected"
 msgstr "Nada conectado"
 
@@ -531,15 +546,15 @@ msgstr "Nada conectado"
 msgid "OK"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:670
+#: ../lib/python/Components/NimManager.py:673
 msgid "Off"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:670
+#: ../lib/python/Components/NimManager.py:673
 msgid "On"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:695
+#: ../lib/python/Components/NimManager.py:698
 msgid "One"
 msgstr "Uno"
 
@@ -559,7 +574,7 @@ msgstr "Espere... Cargando lista..."
 msgid "Polarity"
 msgstr "Polaridad"
 
-#: ../lib/python/Components/NimManager.py:669
+#: ../lib/python/Components/NimManager.py:672
 msgid "Polarization"
 msgstr "Polarizacion"
 
@@ -579,7 +594,7 @@ msgstr ""
 msgid "Port D"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:634
+#: ../lib/python/Components/NimManager.py:637
 msgid "Positioner"
 msgstr "Motor"
 
@@ -599,23 +614,23 @@ msgstr "Pulse OK para buscar"
 msgid "Press OK to start the scan"
 msgstr "Pulse OK para comenzar la busqueda"
 
-#: ../lib/python/Screens/EpgSelection.py:30
+#: ../lib/python/Screens/EpgSelection.py:33
 msgid "Prev"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:361
+#: ../lib/python/Screens/ChannelSelection.py:372
 msgid "Provider"
 msgstr "Proveedor"
 
-#: ../lib/python/Screens/ChannelSelection.py:567
+#: ../lib/python/Screens/ChannelSelection.py:578
 msgid "Providers"
 msgstr "Proveedores"
 
-#: ../lib/python/Screens/TimerEdit.py:92
+#: ../lib/python/Screens/TimerEdit.py:95
 msgid "Really delete done timers?"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1005
+#: ../lib/python/Screens/InfoBarGenerics.py:1013
 msgid "Record"
 msgstr "Grabar"
 
@@ -623,16 +638,18 @@ msgstr "Grabar"
 msgid "Reset"
 msgstr "Resetear"
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Sat"
 msgstr ""
 
 #: ../lib/python/Screens/ScanSetup.py:86 ../lib/python/Screens/ScanSetup.py:95
-#: ../lib/python/Screens/Satconfig.py:13 ../lib/python/Screens/Satconfig.py:62
+#: ../lib/python/Screens/Satconfig.py:13 ../lib/python/Screens/Satconfig.py:61
+#: ../lib/python/Screens/Satconfig.py:145
 msgid "Satellite"
 msgstr "Satelite"
 
-#: ../lib/python/Screens/ChannelSelection.py:360
+#: ../lib/python/Screens/ChannelSelection.py:371
 msgid "Satellites"
 msgstr "Satelites"
 
@@ -641,7 +658,7 @@ msgstr "Satelites"
 msgid "Saturday"
 msgstr "Sabado"
 
-#: ../lib/python/Components/NimManager.py:618
+#: ../lib/python/Components/NimManager.py:621
 msgid "Secondary cable from Rotor-LNB"
 msgstr ""
 
@@ -649,11 +666,11 @@ msgstr ""
 msgid "Select channel to record from"
 msgstr "Seleccionar canal del que grabar"
 
-#: ../lib/python/Screens/Satconfig.py:85
+#: ../lib/python/Screens/Satconfig.py:118
 msgid "Sequence repeat"
 msgstr "Repetir secuencia"
 
-#: ../lib/python/Screens/ChannelSelection.py:569
+#: ../lib/python/Screens/ChannelSelection.py:580
 msgid "Services"
 msgstr "Canales"
 
@@ -661,25 +678,29 @@ msgstr "Canales"
 msgid "Show the radio player..."
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:612
-#: ../lib/python/Components/NimManager.py:619
+#: ../lib/python/Components/NimManager.py:615
+#: ../lib/python/Components/NimManager.py:622
 msgid "Simple"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:634
+#: ../lib/python/Components/NimManager.py:637
 msgid "Single"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:647
+#: ../lib/python/Screens/EventView.py:99
+msgid "Single EPG"
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:650
 msgid "Slot "
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:534
+#: ../lib/python/Components/NimManager.py:537
 msgid "Socket "
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:643
-#: ../lib/python/Components/NimManager.py:699
+#: ../lib/python/Components/NimManager.py:646
+#: ../lib/python/Components/NimManager.py:702
 msgid "South"
 msgstr "Sur"
 
@@ -691,7 +712,7 @@ msgstr ""
 msgid "Start"
 msgstr "Inicio"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:958
+#: ../lib/python/Screens/InfoBarGenerics.py:966
 msgid "Start recording?"
 msgstr "¿Iniciar grabacion?"
 
@@ -707,14 +728,15 @@ msgstr "Paso "
 msgid "Stop playing this movie?"
 msgstr "¿Parar grabar esta pelicula?"
 
-#: ../lib/python/Screens/Satconfig.py:73
+#: ../lib/python/Screens/Satconfig.py:106
 msgid "Stored position"
 msgstr "Posicion almacenada"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1010 ../data/
+#: ../lib/python/Screens/InfoBarGenerics.py:1018 ../data/
 msgid "Subservices"
 msgstr "Subservicios"
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Sun"
 msgstr ""
@@ -729,18 +751,19 @@ msgstr "Domingo"
 msgid "Symbol Rate"
 msgstr "Symbolrate"
 
-#: ../lib/python/Screens/Satconfig.py:112
+#: ../lib/python/Screens/Satconfig.py:68
 msgid "Terrestrial provider"
 msgstr "Proveedor terrestre"
 
-#: ../lib/python/Components/NimManager.py:695
+#: ../lib/python/Components/NimManager.py:698
 msgid "Three"
 msgstr "Tres"
 
-#: ../lib/python/Screens/Satconfig.py:106
+#: ../lib/python/Screens/Satconfig.py:139
 msgid "Threshold"
 msgstr ""
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Thu"
 msgstr ""
@@ -754,19 +777,23 @@ msgstr "Jueves"
 msgid "Timer Type"
 msgstr "Tipo Temporizador"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:801
+#: ../lib/python/Screens/InfoBarGenerics.py:809
 msgid "Timeshift not possible!"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:68
+#: ../lib/python/Screens/EpgSelection.py:198
+msgid "Today"
+msgstr ""
+
+#: ../lib/python/Screens/Satconfig.py:101
 msgid "Tone mode"
 msgstr "Modo tono"
 
-#: ../lib/python/Screens/Satconfig.py:82
+#: ../lib/python/Screens/Satconfig.py:115
 msgid "Toneburst"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:634
+#: ../lib/python/Components/NimManager.py:637
 msgid "Toneburst A/B"
 msgstr ""
 
@@ -774,6 +801,7 @@ msgstr ""
 msgid "Transmission mode"
 msgstr "Modo trasmision"
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Tue"
 msgstr ""
@@ -788,7 +816,7 @@ msgstr "Martes"
 msgid "Tuner"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:695
+#: ../lib/python/Components/NimManager.py:698
 msgid "Two"
 msgstr "Dos"
 
@@ -798,7 +826,7 @@ msgstr "Dos"
 msgid "Type of scan"
 msgstr "Tipo de busqueda"
 
-#: ../lib/python/Components/NimManager.py:639
+#: ../lib/python/Components/NimManager.py:642
 msgid "USALS"
 msgstr "USALS"
 
@@ -812,11 +840,11 @@ msgstr ""
 "Por favor mirar el manual de usuario.\n"
 "Error: "
 
-#: ../lib/python/Screens/Satconfig.py:90
+#: ../lib/python/Screens/Satconfig.py:123
 msgid "Uncommitted DiSEqC command"
 msgstr "Comando DiSEqC no enviado"
 
-#: ../lib/python/Components/NimManager.py:678
+#: ../lib/python/Components/NimManager.py:681
 msgid "Universal LNB"
 msgstr ""
 
@@ -834,22 +862,23 @@ msgstr "Actualizando... Espere... Esto tomara algunos minutos..."
 msgid "Use DHCP"
 msgstr "Usar DHCP"
 
-#: ../lib/python/Screens/Satconfig.py:70
+#: ../lib/python/Screens/Satconfig.py:103
 msgid "Use usals for this sat"
 msgstr "Usar usals para este sat"
 
-#: ../lib/python/Components/NimManager.py:678
+#: ../lib/python/Components/NimManager.py:681
 msgid "User defined"
 msgstr "Definido por el usuario"
 
-#: ../lib/python/Screens/Satconfig.py:67
+#: ../lib/python/Screens/Satconfig.py:100
 msgid "Voltage mode"
 msgstr "Modo voltaje"
 
-#: ../lib/python/Screens/ChannelSelection.py:575
+#: ../lib/python/Screens/ChannelSelection.py:586
 msgid "W"
 msgstr ""
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Wed"
 msgstr ""
@@ -863,16 +892,16 @@ msgstr "Miercoles"
 msgid "Weekday"
 msgstr "DiaSemana"
 
-#: ../lib/python/Components/NimManager.py:641
-#: ../lib/python/Components/NimManager.py:697
+#: ../lib/python/Components/NimManager.py:644
+#: ../lib/python/Components/NimManager.py:700
 msgid "West"
 msgstr "Oeste"
 
-#: ../lib/python/Components/NimManager.py:671
-#: ../lib/python/Components/NimManager.py:683
-#: ../lib/python/Components/NimManager.py:687
-#: ../lib/python/Components/NimManager.py:688
-#: ../lib/python/Components/NimManager.py:700
+#: ../lib/python/Components/NimManager.py:674
+#: ../lib/python/Components/NimManager.py:686
+#: ../lib/python/Components/NimManager.py:690
+#: ../lib/python/Components/NimManager.py:691
+#: ../lib/python/Components/NimManager.py:703
 msgid "Yes"
 msgstr "Si"
 
@@ -880,36 +909,36 @@ msgstr "Si"
 msgid "You cannot delete this!"
 msgstr "¡No puede borrar esto!"
 
-#: ../lib/python/Screens/ChannelSelection.py:246
+#: ../lib/python/Screens/ChannelSelection.py:257
 msgid "[bouquet edit]"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:248
+#: ../lib/python/Screens/ChannelSelection.py:259
 msgid "[favourite edit]"
 msgstr "[edit favoritos]"
 
-#: ../lib/python/Screens/ChannelSelection.py:327
+#: ../lib/python/Screens/ChannelSelection.py:338
 msgid "[move mode]"
 msgstr "[modo mover]"
 
-#: ../lib/python/Screens/ChannelSelection.py:71
+#: ../lib/python/Screens/ChannelSelection.py:82
 msgid "abort bouquet edit"
 msgstr "abortar la edición bouquet"
 
-#: ../lib/python/Screens/ChannelSelection.py:74
+#: ../lib/python/Screens/ChannelSelection.py:85
 msgid "abort favourites edit"
 msgstr "abortar la edición de favoritos"
 
-#: ../lib/python/Screens/ChannelSelection.py:46
+#: ../lib/python/Screens/ChannelSelection.py:57
 msgid "add service to bouquet"
 msgstr "añadir canal a bouquet"
 
-#: ../lib/python/Screens/ChannelSelection.py:48
+#: ../lib/python/Screens/ChannelSelection.py:59
 msgid "add service to favourites"
 msgstr "añadir canal a favoritos"
 
 #: ../lib/python/Screens/MovieSelection.py:21
-#: ../lib/python/Screens/ChannelSelection.py:76
+#: ../lib/python/Screens/ChannelSelection.py:87
 msgid "back"
 msgstr "atrás"
 
@@ -921,7 +950,7 @@ msgstr "circular izda"
 msgid "circular right"
 msgstr "circular dcha"
 
-#: ../lib/python/Screens/ChannelSelection.py:51
+#: ../lib/python/Screens/ChannelSelection.py:62
 msgid "copy to favourites"
 msgstr ""
 
@@ -933,31 +962,31 @@ msgstr "diariamente"
 msgid "delete..."
 msgstr "borrar..."
 
-#: ../lib/python/Screens/ChannelSelection.py:67
+#: ../lib/python/Screens/ChannelSelection.py:78
 msgid "disable move mode"
 msgstr "inabilitar modo movimiento"
 
-#: ../lib/python/Components/NimManager.py:536
+#: ../lib/python/Components/NimManager.py:539
 msgid "empty/unknown"
 msgstr "vacío/desconocido"
 
-#: ../lib/python/Screens/ChannelSelection.py:63
+#: ../lib/python/Screens/ChannelSelection.py:74
 msgid "enable bouquet edit"
 msgstr "habilitar edición bouquet"
 
-#: ../lib/python/Screens/ChannelSelection.py:65
+#: ../lib/python/Screens/ChannelSelection.py:76
 msgid "enable favourite edit"
 msgstr "habilitar edición de favoritos"
 
-#: ../lib/python/Screens/ChannelSelection.py:60
+#: ../lib/python/Screens/ChannelSelection.py:71
 msgid "enable move mode"
 msgstr "habilitar modo movimiento"
 
-#: ../lib/python/Screens/ChannelSelection.py:70
+#: ../lib/python/Screens/ChannelSelection.py:81
 msgid "end bouquet edit"
 msgstr "fin de edición bouquet"
 
-#: ../lib/python/Screens/ChannelSelection.py:73
+#: ../lib/python/Screens/ChannelSelection.py:84
 msgid "end favourites edit"
 msgstr "fin edición de favoritos"
 
@@ -977,11 +1006,11 @@ msgstr "iniciar módulo"
 msgid "leave movie player..."
 msgstr "dejar reproductor de pelis..."
 
-#: ../lib/python/Components/NimManager.py:639
+#: ../lib/python/Components/NimManager.py:642
 msgid "manual"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:265
+#: ../lib/python/Screens/InfoBarGenerics.py:274
 msgid "next channel"
 msgstr "siguiente canal"
 
@@ -1024,15 +1053,15 @@ msgstr "una vez"
 msgid "please press OK when ready"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:266
+#: ../lib/python/Screens/InfoBarGenerics.py:275
 msgid "previous channel"
 msgstr "canal anterior"
 
-#: ../lib/python/Screens/ChannelSelection.py:55
+#: ../lib/python/Screens/ChannelSelection.py:66
 msgid "remove bouquet"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:53
+#: ../lib/python/Screens/ChannelSelection.py:64
 msgid "remove service"
 msgstr "borrar canal"
 
@@ -1078,7 +1107,7 @@ msgstr ""
 msgid "scan state"
 msgstr "estado de la búsqueda"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:308
+#: ../lib/python/Screens/InfoBarGenerics.py:315
 msgid "show EPG..."
 msgstr "mostrar EPG..."
 
@@ -1086,7 +1115,7 @@ msgstr "mostrar EPG..."
 msgid "text"
 msgstr "texto"
 
-#: ../lib/python/Screens/EventView.py:60
+#: ../lib/python/Screens/EventView.py:64
 msgid "unknown service"
 msgstr "servicio desconocido"
 
@@ -1154,6 +1183,10 @@ msgid "#ffffff"
 msgstr ""
 
 #: ../data/
+msgid "NEXT"
+msgstr ""
+
+#: ../data/
 msgid "Deep Standby"
 msgstr "Standby fuerte"
 
@@ -1417,12 +1450,8 @@ msgid "Network Setup"
 msgstr "Config Red"
 
 #: ../data/
-msgid "Thanks for using the wizard. Your box is now ready to use."
-msgstr "Gracias por usar el asistente. Tu aparato está listo para usuarse."
-
-#: ../data/
-msgid "Parental Lock"
-msgstr "Bloqueo adultos"
+msgid "#ffffffff"
+msgstr ""
 
 #: ../data/
 msgid "Restart"
@@ -1457,7 +1486,7 @@ msgid "Exit wizard"
 msgstr "Salir del asistente"
 
 #: ../data/
-msgid "Toggle EPG type with INFO button"
+msgid "Timer sanity error"
 msgstr ""
 
 #: ../data/
@@ -1477,10 +1506,18 @@ msgid "Skip confirmations"
 msgstr "Saltar confirmaciones"
 
 #: ../data/
+msgid "Choose bouquet"
+msgstr ""
+
+#: ../data/
 msgid "Yes, scan now"
 msgstr "Si, buscar ahora"
 
 #: ../data/
+msgid "MORE"
+msgstr ""
+
+#: ../data/
 msgid "Information"
 msgstr "Información"
 
@@ -1497,6 +1534,12 @@ msgid "Please set up tuner B"
 msgstr "Por favor, config tuner B"
 
 #: ../data/
+msgid ""
+"Thank you for using the wizard. Your box is now ready to use.\n"
+"Please press OK to start using you Dreambox."
+msgstr ""
+
+#: ../data/
 msgid "Delay"
 msgstr "Retardo"
 
@@ -1505,10 +1548,6 @@ msgid "Select HDD"
 msgstr "Seleccionar disco duro"
 
 #: ../data/
-msgid "#ffffffff"
-msgstr ""
-
-#: ../data/
 msgid "Setup Lock"
 msgstr "Bloquear config"
 
@@ -1616,6 +1655,10 @@ msgid "Do you want to do a service scan?"
 msgstr "¿Quiere hacer una búsqueda de canales?"
 
 #: ../data/
+msgid "NOW"
+msgstr ""
+
+#: ../data/
 msgid "Seek"
 msgstr ""
 
@@ -1623,6 +1666,13 @@ msgstr ""
 msgid "Satelliteconfig"
 msgstr "Configurar satélite"
 
+#: ../data/
+msgid "Parental Lock"
+msgstr "Bloqueo adultos"
+
+#~ msgid "Thanks for using the wizard. Your box is now ready to use."
+#~ msgstr "Gracias por usar el asistente. Tu aparato está listo para usuarse."
+
 #~ msgid "Plugins"
 #~ msgstr "Erweiterungen"
 

diff --git a/po/nl.po b/po/nl.po
index 9368303..22232aa 100755 (executable)
--- a/po/nl.po
+++ b/po/nl.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-25 02:01+0100\n"
+"POT-Creation-Date: 2006-01-28 00:36+0100\n"
 "PO-Revision-Date: 2006-01-21 03:29+0100\n"
 "Last-Translator: Kees Aerts <aerts11@planet.nl>\n"
 "Language-Team: none\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Poedit-Country: NEDERLAND\n"
 "X-Poedit-SourceCharset: iso-8859-15\n"
 
-#: ../lib/python/Screens/EventView.py:76
+#: ../lib/python/Screens/EventView.py:80
 #, python-format
 msgid "%d min"
 msgstr ""
@@ -34,43 +34,43 @@ msgstr ""
 msgid "%s (%s, %d MB free)"
 msgstr "%s (%s, %d MB vrij)"
 
-#: ../lib/python/Components/NimManager.py:682
+#: ../lib/python/Components/NimManager.py:685
 msgid "0 V"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:685
+#: ../lib/python/Components/NimManager.py:688
 msgid "1.0"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:685
+#: ../lib/python/Components/NimManager.py:688
 msgid "1.1"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:685
+#: ../lib/python/Components/NimManager.py:688
 msgid "1.2"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:682
+#: ../lib/python/Components/NimManager.py:685
 msgid "12 V"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:107
+#: ../lib/python/Screens/Satconfig.py:140
 msgid "12V Output"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:669
+#: ../lib/python/Components/NimManager.py:672
 msgid "13 V"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:669
+#: ../lib/python/Components/NimManager.py:672
 msgid "18 V"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:684
+#: ../lib/python/Components/NimManager.py:687
 msgid "A"
 msgstr ""
 
-#: ../RecordTimer.py:126
+#: ../RecordTimer.py:127
 msgid ""
 "A timer failed to record!\n"
 "Disable TV and try again?\n"
@@ -78,28 +78,32 @@ msgstr ""
 "Timeropname mislukt.\n"
 "Verander Tvprogramma en probeer opnieuw?\n"
 
-#: ../lib/python/Components/NimManager.py:686
+#: ../lib/python/Components/NimManager.py:689
 msgid "AA"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:686
+#: ../lib/python/Components/NimManager.py:689
 msgid "AB"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEdit.py:25
+#: ../lib/python/Screens/TimerEdit.py:28
 msgid "Add"
 msgstr "Toevoegen"
 
-#: ../lib/python/Screens/EpgSelection.py:21
+#: ../lib/python/Screens/EventView.py:21
+msgid "Add Timer"
+msgstr ""
+
+#: ../lib/python/Screens/EpgSelection.py:48
 msgid "Add timer"
 msgstr "Timer instellen"
 
-#: ../lib/python/Components/NimManager.py:612
-#: ../lib/python/Components/NimManager.py:620
+#: ../lib/python/Components/NimManager.py:615
+#: ../lib/python/Components/NimManager.py:623
 msgid "Advanced"
 msgstr "Expert"
 
-#: ../lib/python/Screens/ChannelSelection.py:359
+#: ../lib/python/Screens/ChannelSelection.py:370
 msgid "All"
 msgstr "Alles"
 
@@ -127,19 +131,19 @@ msgstr ""
 msgid "Automatic Scan"
 msgstr "Automatische scan"
 
-#: ../lib/python/Components/NimManager.py:684
+#: ../lib/python/Components/NimManager.py:687
 msgid "B"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:686
+#: ../lib/python/Components/NimManager.py:689
 msgid "BA"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:686
+#: ../lib/python/Components/NimManager.py:689
 msgid "BB"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:670
+#: ../lib/python/Components/NimManager.py:673
 msgid "Band"
 msgstr ""
 
@@ -151,11 +155,11 @@ msgstr "Bandbreedte"
 msgid "Bus: "
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:678
+#: ../lib/python/Components/NimManager.py:681
 msgid "C-Band"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:110
+#: ../lib/python/Screens/Satconfig.py:66
 msgid "Cable provider"
 msgstr "Kabel provider"
 
@@ -171,11 +175,11 @@ msgstr "Groote van harddisk: "
 msgid "Channel"
 msgstr "Kanaal"
 
-#: ../lib/python/Screens/ChannelSelection.py:78 ../data/
+#: ../lib/python/Screens/ChannelSelection.py:89 ../data/
 msgid "Channel Selection"
 msgstr "Kanaal lijst"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:125
+#: ../lib/python/Screens/InfoBarGenerics.py:135
 msgid "Channel:"
 msgstr "Kanaal:"
 
@@ -183,7 +187,7 @@ msgstr "Kanaal:"
 msgid "Classic"
 msgstr "klassiek"
 
-#: ../lib/python/Screens/TimerEdit.py:27
+#: ../lib/python/Screens/TimerEdit.py:30
 msgid "Cleanup"
 msgstr ""
 
@@ -199,11 +203,12 @@ msgstr ""
 msgid "Code rate low"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:87 ../lib/python/Screens/Satconfig.py:89
+#: ../lib/python/Screens/Satconfig.py:120
+#: ../lib/python/Screens/Satconfig.py:122
 msgid "Command order"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:83
+#: ../lib/python/Screens/Satconfig.py:116
 msgid "Committed DiSEqC command"
 msgstr ""
 
@@ -211,11 +216,15 @@ msgstr ""
 msgid "Configuration Mode"
 msgstr "Konfiguratie"
 
+#: ../lib/python/Screens/TimerEdit.py:195
+msgid "Conflicting timer"
+msgstr ""
+
 #: ../lib/python/Components/SetupDevices.py:21
 msgid "Default"
 msgstr "Standaard"
 
-#: ../lib/python/Screens/TimerEdit.py:24
+#: ../lib/python/Screens/TimerEdit.py:27
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -239,11 +248,11 @@ msgstr "Gevonden Harddisk:"
 msgid "Detected NIMs:"
 msgstr "Gevonden Tuners:"
 
-#: ../lib/python/Components/NimManager.py:634
+#: ../lib/python/Components/NimManager.py:637
 msgid "DiSEqC A/B"
 msgstr "DiSEqC A/B"
 
-#: ../lib/python/Components/NimManager.py:634
+#: ../lib/python/Components/NimManager.py:637
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
@@ -251,17 +260,17 @@ msgstr "DiSEqC A/B/C/D"
 msgid "DiSEqC Mode"
 msgstr "DiSEqC-Mode"
 
-#: ../lib/python/Screens/Satconfig.py:79
+#: ../lib/python/Screens/Satconfig.py:112
 msgid "DiSEqC mode"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:91
+#: ../lib/python/Screens/Satconfig.py:124
 msgid "DiSEqC repeats"
 msgstr ""
 
 #: ../lib/python/Screens/ScanSetup.py:104
 #: ../lib/python/Screens/ScanSetup.py:375
-#: ../lib/python/Screens/TimerEdit.py:72 ../lib/python/Components/Lcd.py:31
+#: ../lib/python/Screens/TimerEdit.py:75 ../lib/python/Components/Lcd.py:31
 #: ../lib/python/Components/SetupDevices.py:38
 #: ../lib/python/Components/SetupDevices.py:39
 #: ../lib/python/Components/SetupDevices.py:43
@@ -276,7 +285,7 @@ msgstr "Uit"
 msgid "Do you really want to delete this recording?"
 msgstr "Wilt u deze opname werkelijk wissen?"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:956
+#: ../lib/python/Screens/InfoBarGenerics.py:964
 msgid ""
 "Do you want to stop the current\n"
 "(instant) recording?"
@@ -297,7 +306,7 @@ msgstr ""
 msgid "Dutch"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:577
+#: ../lib/python/Screens/ChannelSelection.py:588
 msgid "E"
 msgstr "O"
 
@@ -306,14 +315,14 @@ msgstr "O"
 msgid "ERROR - failed to scan (%s)!"
 msgstr "Fout - Scannen mislukt (%s)!"
 
-#: ../lib/python/Components/NimManager.py:641
-#: ../lib/python/Components/NimManager.py:697
+#: ../lib/python/Components/NimManager.py:644
+#: ../lib/python/Components/NimManager.py:700
 msgid "East"
 msgstr "Oost"
 
 #: ../lib/python/Screens/ScanSetup.py:104
 #: ../lib/python/Screens/ScanSetup.py:375
-#: ../lib/python/Screens/TimerEdit.py:70 ../lib/python/Components/Lcd.py:31
+#: ../lib/python/Screens/TimerEdit.py:73 ../lib/python/Components/Lcd.py:31
 #: ../lib/python/Components/SetupDevices.py:38
 #: ../lib/python/Components/SetupDevices.py:39
 #: ../lib/python/Components/SetupDevices.py:43
@@ -338,7 +347,7 @@ msgstr "Eindtijd"
 msgid "English"
 msgstr "English"
 
-#: ../lib/python/Components/NimManager.py:615
+#: ../lib/python/Components/NimManager.py:618
 msgid "Equal to Socket A"
 msgstr ""
 
@@ -347,11 +356,11 @@ msgstr ""
 msgid "FEC"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:84
+#: ../lib/python/Screens/Satconfig.py:117
 msgid "Fast DiSEqC"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:362
+#: ../lib/python/Screens/ChannelSelection.py:373
 msgid "Favourites"
 msgstr "Favorieten"
 
@@ -362,6 +371,7 @@ msgstr "Favorieten"
 msgid "Frequency"
 msgstr "Frequency"
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Fri"
 msgstr ""
@@ -392,7 +402,7 @@ msgstr ""
 msgid "IP Address"
 msgstr "IP-Adres"
 
-#: ../lib/python/Screens/Satconfig.py:108
+#: ../lib/python/Screens/Satconfig.py:141
 msgid "Increased voltage"
 msgstr "Verhoogd Voltage"
 
@@ -414,19 +424,19 @@ msgstr "Formatting Harddisk..."
 msgid "Inversion"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:76
+#: ../lib/python/Screens/Satconfig.py:109
 msgid "LNB"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:101
+#: ../lib/python/Screens/Satconfig.py:134
 msgid "LOF"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:105
+#: ../lib/python/Screens/Satconfig.py:138
 msgid "LOF/H"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:104
+#: ../lib/python/Screens/Satconfig.py:137
 msgid "LOF/L"
 msgstr ""
 
@@ -434,17 +444,17 @@ msgstr ""
 msgid "Language selection"
 msgstr "Taal Keuze"
 
-#: ../lib/python/Screens/Satconfig.py:28 ../lib/python/Screens/Satconfig.py:95
-#: ../data/
+#: ../lib/python/Screens/Satconfig.py:28
+#: ../lib/python/Screens/Satconfig.py:128 ../data/
 msgid "Latitude"
 msgstr "Breedtegraad"
 
-#: ../lib/python/Screens/Satconfig.py:26 ../lib/python/Screens/Satconfig.py:93
-#: ../data/
+#: ../lib/python/Screens/Satconfig.py:26
+#: ../lib/python/Screens/Satconfig.py:126 ../data/
 msgid "Longitude"
 msgstr "Lengtegraad"
 
-#: ../lib/python/Components/NimManager.py:616
+#: ../lib/python/Components/NimManager.py:619
 msgid "Loopthrough to Socket A"
 msgstr "Loopthrough met Tuner A"
 
@@ -457,6 +467,7 @@ msgstr "Model:"
 msgid "Modulation"
 msgstr ""
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Mon"
 msgstr ""
@@ -474,7 +485,11 @@ msgstr "Maandag"
 msgid "Movie Menu"
 msgstr "Film Keuze"
 
-#: ../lib/python/Components/NimManager.py:471
+#: ../lib/python/Screens/EventView.py:100
+msgid "Multi EPG"
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:474
 msgid "N/A"
 msgstr "Niet Aanwezig"
 
@@ -490,19 +505,19 @@ msgstr ""
 msgid "Netmask"
 msgstr "Netmask"
 
-#: ../lib/python/Screens/EpgSelection.py:31
+#: ../lib/python/Screens/EpgSelection.py:34
 msgid "Next"
 msgstr "Volgende"
 
-#: ../lib/python/Components/NimManager.py:671
-#: ../lib/python/Components/NimManager.py:683
-#: ../lib/python/Components/NimManager.py:687
-#: ../lib/python/Components/NimManager.py:688
-#: ../lib/python/Components/NimManager.py:700
+#: ../lib/python/Components/NimManager.py:674
+#: ../lib/python/Components/NimManager.py:686
+#: ../lib/python/Components/NimManager.py:690
+#: ../lib/python/Components/NimManager.py:691
+#: ../lib/python/Components/NimManager.py:703
 msgid "No"
 msgstr "Nee"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:952
+#: ../lib/python/Screens/InfoBarGenerics.py:960
 msgid "No HDD found or HDD not initialized!"
 msgstr ""
 "Geen Harddisk gevonden of\n"
@@ -513,19 +528,19 @@ msgstr ""
 #: ../lib/python/Screens/ScanSetup.py:187
 #: ../lib/python/Screens/ScanSetup.py:188
 #: ../lib/python/Screens/ScanSetup.py:192
-#: ../lib/python/Components/NimManager.py:684
-#: ../lib/python/Components/NimManager.py:685
-#: ../lib/python/Components/NimManager.py:686
-#: ../lib/python/Components/NimManager.py:695
+#: ../lib/python/Components/NimManager.py:687
+#: ../lib/python/Components/NimManager.py:688
+#: ../lib/python/Components/NimManager.py:689
+#: ../lib/python/Components/NimManager.py:698
 msgid "None"
 msgstr "Geen"
 
-#: ../lib/python/Components/NimManager.py:643
-#: ../lib/python/Components/NimManager.py:699
+#: ../lib/python/Components/NimManager.py:646
+#: ../lib/python/Components/NimManager.py:702
 msgid "North"
 msgstr "Noord"
 
-#: ../lib/python/Components/NimManager.py:617
+#: ../lib/python/Components/NimManager.py:620
 msgid "Nothing connected"
 msgstr "Niks aangesloten"
 
@@ -533,15 +548,15 @@ msgstr "Niks aangesloten"
 msgid "OK"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:670
+#: ../lib/python/Components/NimManager.py:673
 msgid "Off"
 msgstr "Uit"
 
-#: ../lib/python/Components/NimManager.py:670
+#: ../lib/python/Components/NimManager.py:673
 msgid "On"
 msgstr "Aan"
 
-#: ../lib/python/Components/NimManager.py:695
+#: ../lib/python/Components/NimManager.py:698
 msgid "One"
 msgstr "Een"
 
@@ -561,7 +576,7 @@ msgstr "Mom... Lijst word geladen..."
 msgid "Polarity"
 msgstr "Polariteit"
 
-#: ../lib/python/Components/NimManager.py:669
+#: ../lib/python/Components/NimManager.py:672
 msgid "Polarization"
 msgstr ""
 
@@ -581,7 +596,7 @@ msgstr ""
 msgid "Port D"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:634
+#: ../lib/python/Components/NimManager.py:637
 msgid "Positioner"
 msgstr "Rotor"
 
@@ -601,23 +616,23 @@ msgstr "Druk OK om te Scannen."
 msgid "Press OK to start the scan"
 msgstr "Druk OK om Scannen te starten."
 
-#: ../lib/python/Screens/EpgSelection.py:30
+#: ../lib/python/Screens/EpgSelection.py:33
 msgid "Prev"
 msgstr "Vorigge"
 
-#: ../lib/python/Screens/ChannelSelection.py:361
+#: ../lib/python/Screens/ChannelSelection.py:372
 msgid "Provider"
 msgstr "Provider"
 
-#: ../lib/python/Screens/ChannelSelection.py:567
+#: ../lib/python/Screens/ChannelSelection.py:578
 msgid "Providers"
 msgstr "Providers"
 
-#: ../lib/python/Screens/TimerEdit.py:92
+#: ../lib/python/Screens/TimerEdit.py:95
 msgid "Really delete done timers?"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1005
+#: ../lib/python/Screens/InfoBarGenerics.py:1013
 msgid "Record"
 msgstr "Opnemen"
 
@@ -625,16 +640,18 @@ msgstr "Opnemen"
 msgid "Reset"
 msgstr "Reset"
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Sat"
 msgstr ""
 
 #: ../lib/python/Screens/ScanSetup.py:86 ../lib/python/Screens/ScanSetup.py:95
-#: ../lib/python/Screens/Satconfig.py:13 ../lib/python/Screens/Satconfig.py:62
+#: ../lib/python/Screens/Satconfig.py:13 ../lib/python/Screens/Satconfig.py:61
+#: ../lib/python/Screens/Satconfig.py:145
 msgid "Satellite"
 msgstr "Satellite"
 
-#: ../lib/python/Screens/ChannelSelection.py:360
+#: ../lib/python/Screens/ChannelSelection.py:371
 msgid "Satellites"
 msgstr "Satelliten"
 
@@ -643,7 +660,7 @@ msgstr "Satelliten"
 msgid "Saturday"
 msgstr "Zaterdag"
 
-#: ../lib/python/Components/NimManager.py:618
+#: ../lib/python/Components/NimManager.py:621
 msgid "Secondary cable from Rotor-LNB"
 msgstr ""
 
@@ -651,11 +668,11 @@ msgstr ""
 msgid "Select channel to record from"
 msgstr "Selecteer een kanaal waarvan u wilt opnemen"
 
-#: ../lib/python/Screens/Satconfig.py:85
+#: ../lib/python/Screens/Satconfig.py:118
 msgid "Sequence repeat"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:569
+#: ../lib/python/Screens/ChannelSelection.py:580
 msgid "Services"
 msgstr "Services"
 
@@ -663,25 +680,29 @@ msgstr "Services"
 msgid "Show the radio player..."
 msgstr "Toon de radiospeler..."
 
-#: ../lib/python/Components/NimManager.py:612
-#: ../lib/python/Components/NimManager.py:619
+#: ../lib/python/Components/NimManager.py:615
+#: ../lib/python/Components/NimManager.py:622
 msgid "Simple"
 msgstr "Simpel"
 
-#: ../lib/python/Components/NimManager.py:634
+#: ../lib/python/Components/NimManager.py:637
 msgid "Single"
 msgstr "Single"
 
-#: ../lib/python/Components/NimManager.py:647
+#: ../lib/python/Screens/EventView.py:99
+msgid "Single EPG"
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:650
 msgid "Slot "
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:534
+#: ../lib/python/Components/NimManager.py:537
 msgid "Socket "
 msgstr "Socket "
 
-#: ../lib/python/Components/NimManager.py:643
-#: ../lib/python/Components/NimManager.py:699
+#: ../lib/python/Components/NimManager.py:646
+#: ../lib/python/Components/NimManager.py:702
 msgid "South"
 msgstr "Zuid"
 
@@ -693,7 +714,7 @@ msgstr ""
 msgid "Start"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:958
+#: ../lib/python/Screens/InfoBarGenerics.py:966
 msgid "Start recording?"
 msgstr "Start Opnemen?"
 
@@ -709,14 +730,15 @@ msgstr "Stap "
 msgid "Stop playing this movie?"
 msgstr "Stop afspelen deze film?"
 
-#: ../lib/python/Screens/Satconfig.py:73
+#: ../lib/python/Screens/Satconfig.py:106
 msgid "Stored position"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1010 ../data/
+#: ../lib/python/Screens/InfoBarGenerics.py:1018 ../data/
 msgid "Subservices"
 msgstr "Subservices"
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Sun"
 msgstr ""
@@ -731,18 +753,19 @@ msgstr "Zondag"
 msgid "Symbol Rate"
 msgstr "Symbolrate"
 
-#: ../lib/python/Screens/Satconfig.py:112
+#: ../lib/python/Screens/Satconfig.py:68
 msgid "Terrestrial provider"
 msgstr "Regio"
 
-#: ../lib/python/Components/NimManager.py:695
+#: ../lib/python/Components/NimManager.py:698
 msgid "Three"
 msgstr "Drie"
 
-#: ../lib/python/Screens/Satconfig.py:106
+#: ../lib/python/Screens/Satconfig.py:139
 msgid "Threshold"
 msgstr "Drempel"
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Thu"
 msgstr ""
@@ -756,19 +779,23 @@ msgstr "Donderdag"
 msgid "Timer Type"
 msgstr "Timer-Type"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:801
+#: ../lib/python/Screens/InfoBarGenerics.py:809
 msgid "Timeshift not possible!"
 msgstr "Timeshift is niet mogelijk!"
 
-#: ../lib/python/Screens/Satconfig.py:68
+#: ../lib/python/Screens/EpgSelection.py:198
+msgid "Today"
+msgstr ""
+
+#: ../lib/python/Screens/Satconfig.py:101
 msgid "Tone mode"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:82
+#: ../lib/python/Screens/Satconfig.py:115
 msgid "Toneburst"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:634
+#: ../lib/python/Components/NimManager.py:637
 msgid "Toneburst A/B"
 msgstr "Toneburst A/B"
 
@@ -776,6 +803,7 @@ msgstr "Toneburst A/B"
 msgid "Transmission mode"
 msgstr "Overdragings type"
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Tue"
 msgstr ""
@@ -790,7 +818,7 @@ msgstr "Dinsdag"
 msgid "Tuner"
 msgstr "Tuner"
 
-#: ../lib/python/Components/NimManager.py:695
+#: ../lib/python/Components/NimManager.py:698
 msgid "Two"
 msgstr "Twee"
 
@@ -800,7 +828,7 @@ msgstr "Twee"
 msgid "Type of scan"
 msgstr "Type van scan"
 
-#: ../lib/python/Components/NimManager.py:639
+#: ../lib/python/Components/NimManager.py:642
 msgid "USALS"
 msgstr "USALS"
 
@@ -814,11 +842,11 @@ msgstr ""
 "Lees handboek na AUB.\n"
 "Fout: "
 
-#: ../lib/python/Screens/Satconfig.py:90
+#: ../lib/python/Screens/Satconfig.py:123
 msgid "Uncommitted DiSEqC command"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:678
+#: ../lib/python/Components/NimManager.py:681
 msgid "Universal LNB"
 msgstr "Universeel LNB"
 
@@ -836,22 +864,23 @@ msgstr "Update is bezig. Wacht AUB. Dit kan enkele minuten duren."
 msgid "Use DHCP"
 msgstr "automatisch IP verkrijgen (DHCP)"
 
-#: ../lib/python/Screens/Satconfig.py:70
+#: ../lib/python/Screens/Satconfig.py:103
 msgid "Use usals for this sat"
 msgstr "Gebruik USALS voor deze Sat"
 
-#: ../lib/python/Components/NimManager.py:678
+#: ../lib/python/Components/NimManager.py:681
 msgid "User defined"
 msgstr "Gebruikers mode"
 
-#: ../lib/python/Screens/Satconfig.py:67
+#: ../lib/python/Screens/Satconfig.py:100
 msgid "Voltage mode"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:575
+#: ../lib/python/Screens/ChannelSelection.py:586
 msgid "W"
 msgstr ""
 
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Components/TimerList.py:34
 msgid "Wed"
 msgstr ""
@@ -865,16 +894,16 @@ msgstr "Woensdag"
 msgid "Weekday"
 msgstr "Weekdag"
 
-#: ../lib/python/Components/NimManager.py:641
-#: ../lib/python/Components/NimManager.py:697
+#: ../lib/python/Components/NimManager.py:644
+#: ../lib/python/Components/NimManager.py:700
 msgid "West"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:671
-#: ../lib/python/Components/NimManager.py:683
-#: ../lib/python/Components/NimManager.py:687
-#: ../lib/python/Components/NimManager.py:688
-#: ../lib/python/Components/NimManager.py:700
+#: ../lib/python/Components/NimManager.py:674
+#: ../lib/python/Components/NimManager.py:686
+#: ../lib/python/Components/NimManager.py:690
+#: ../lib/python/Components/NimManager.py:691
+#: ../lib/python/Components/NimManager.py:703
 msgid "Yes"
 msgstr "Ja"
 
@@ -882,36 +911,36 @@ msgstr "Ja"
 msgid "You cannot delete this!"
 msgstr "U kunt dit niet wissen."
 
-#: ../lib/python/Screens/ChannelSelection.py:246
+#: ../lib/python/Screens/ChannelSelection.py:257
 msgid "[bouquet edit]"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:248
+#: ../lib/python/Screens/ChannelSelection.py:259
 msgid "[favourite edit]"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:327
+#: ../lib/python/Screens/ChannelSelection.py:338
 msgid "[move mode]"
 msgstr "Verplaats modus"
 
-#: ../lib/python/Screens/ChannelSelection.py:71
+#: ../lib/python/Screens/ChannelSelection.py:82
 msgid "abort bouquet edit"
 msgstr "Bouquet edit stoppen"
 
-#: ../lib/python/Screens/ChannelSelection.py:74
+#: ../lib/python/Screens/ChannelSelection.py:85
 msgid "abort favourites edit"
 msgstr "Favoriet edit stoppen"
 
-#: ../lib/python/Screens/ChannelSelection.py:46
+#: ../lib/python/Screens/ChannelSelection.py:57
 msgid "add service to bouquet"
 msgstr "Toevoegen aan Bouquet"
 
-#: ../lib/python/Screens/ChannelSelection.py:48
+#: ../lib/python/Screens/ChannelSelection.py:59
 msgid "add service to favourites"
 msgstr "Kanaal aan Favorieten toevoegen"
 
 #: ../lib/python/Screens/MovieSelection.py:21
-#: ../lib/python/Screens/ChannelSelection.py:76
+#: ../lib/python/Screens/ChannelSelection.py:87
 msgid "back"
 msgstr "Terug"
 
@@ -923,7 +952,7 @@ msgstr ""
 msgid "circular right"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:51
+#: ../lib/python/Screens/ChannelSelection.py:62
 msgid "copy to favourites"
 msgstr ""
 
@@ -935,31 +964,31 @@ msgstr "Dagelijks"
 msgid "delete..."
 msgstr "Verwijderen..."
 
-#: ../lib/python/Screens/ChannelSelection.py:67
+#: ../lib/python/Screens/ChannelSelection.py:78
 msgid "disable move mode"
 msgstr "Verplaats modus uitzetten"
 
-#: ../lib/python/Components/NimManager.py:536
+#: ../lib/python/Components/NimManager.py:539
 msgid "empty/unknown"
 msgstr "leeg/onbekent"
 
-#: ../lib/python/Screens/ChannelSelection.py:63
+#: ../lib/python/Screens/ChannelSelection.py:74
 msgid "enable bouquet edit"
 msgstr "Bouquet edit aanzetten"
 
-#: ../lib/python/Screens/ChannelSelection.py:65
+#: ../lib/python/Screens/ChannelSelection.py:76
 msgid "enable favourite edit"
 msgstr "Favorieten edit aanzetten"
 
-#: ../lib/python/Screens/ChannelSelection.py:60
+#: ../lib/python/Screens/ChannelSelection.py:71
 msgid "enable move mode"
 msgstr "Verplaats modus aanzetten"
 
-#: ../lib/python/Screens/ChannelSelection.py:70
+#: ../lib/python/Screens/ChannelSelection.py:81
 msgid "end bouquet edit"
 msgstr "Bouquet edit stoppen"
 
-#: ../lib/python/Screens/ChannelSelection.py:73
+#: ../lib/python/Screens/ChannelSelection.py:84
 msgid "end favourites edit"
 msgstr "Favorieten edit stoppen"
 
@@ -979,11 +1008,11 @@ msgstr "Ci-Module initializeren"
 msgid "leave movie player..."
 msgstr "Afspelen stoppen..."
 
-#: ../lib/python/Components/NimManager.py:639
+#: ../lib/python/Components/NimManager.py:642
 msgid "manual"
 msgstr "Handmatig"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:265
+#: ../lib/python/Screens/InfoBarGenerics.py:274
 msgid "next channel"
 msgstr "Volgende Kanaal"
 
@@ -1026,15 +1055,15 @@ msgstr "Eenmalig"
 msgid "please press OK when ready"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:266
+#: ../lib/python/Screens/InfoBarGenerics.py:275
 msgid "previous channel"
 msgstr "Vorig Kanaal"
 
-#: ../lib/python/Screens/ChannelSelection.py:55
+#: ../lib/python/Screens/ChannelSelection.py:66
 msgid "remove bouquet"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:53
+#: ../lib/python/Screens/ChannelSelection.py:64
 msgid "remove service"
 msgstr "Kanaal verwijderen"
 
@@ -1080,7 +1109,7 @@ msgstr ""
 msgid "scan state"
 msgstr "Status"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:308
+#: ../lib/python/Screens/InfoBarGenerics.py:315
 msgid "show EPG..."
 msgstr "laat EPG zien..."
 
@@ -1088,7 +1117,7 @@ msgstr "laat EPG zien..."
 msgid "text"
 msgstr ""
 
-#: ../lib/python/Screens/EventView.py:60
+#: ../lib/python/Screens/EventView.py:64
 msgid "unknown service"
 msgstr "onbekende Service"
 
@@ -1156,6 +1185,10 @@ msgid "#ffffff"
 msgstr ""
 
 #: ../data/
+msgid "NEXT"
+msgstr ""
+
+#: ../data/
 msgid "Deep Standby"
 msgstr "Uitzetten"
 
@@ -1420,12 +1453,8 @@ msgid "Network Setup"
 msgstr "Netwerk instellingen"
 
 #: ../data/
-msgid "Thanks for using the wizard. Your box is now ready to use."
-msgstr "De wizard is klaar. U kunt u dreambox nu gebruiken."
-
-#: ../data/
-msgid "Parental Lock"
-msgstr "Kinderslot"
+msgid "#ffffffff"
+msgstr ""
 
 #: ../data/
 msgid "Restart"
@@ -1460,8 +1489,8 @@ msgid "Exit wizard"
 msgstr "Wizard stoppen"
 
 #: ../data/
-msgid "Toggle EPG type with INFO button"
-msgstr "Verander EPG-Type door Drukken op INFO toets"
+msgid "Timer sanity error"
+msgstr ""
 
 #: ../data/
 msgid "Serviceinfo"
@@ -1480,10 +1509,18 @@ msgid "Skip confirmations"
 msgstr "Bevestigingen overslaan"
 
 #: ../data/
+msgid "Choose bouquet"
+msgstr ""
+
+#: ../data/
 msgid "Yes, scan now"
 msgstr "Ja, nu scannen."
 
 #: ../data/
+msgid "MORE"
+msgstr ""
+
+#: ../data/
 msgid "Information"
 msgstr "Informatie"
 
@@ -1500,6 +1537,12 @@ msgid "Please set up tuner B"
 msgstr "instellingen voor Tuner B."
 
 #: ../data/
+msgid ""
+"Thank you for using the wizard. Your box is now ready to use.\n"
+"Please press OK to start using you Dreambox."
+msgstr ""
+
+#: ../data/
 msgid "Delay"
 msgstr "Vertraging"
 
@@ -1508,10 +1551,6 @@ msgid "Select HDD"
 msgstr "Kies Harddisk"
 
 #: ../data/
-msgid "#ffffffff"
-msgstr ""
-
-#: ../data/
 msgid "Setup Lock"
 msgstr "Setup-Slot"
 
@@ -1618,6 +1657,10 @@ msgid "Do you want to do a service scan?"
 msgstr "Wilt u Kanalen Scannen?"
 
 #: ../data/
+msgid "NOW"
+msgstr ""
+
+#: ../data/
 msgid "Seek"
 msgstr ""
 
@@ -1625,6 +1668,16 @@ msgstr ""
 msgid "Satelliteconfig"
 msgstr "Satelliet instellingen"
 
+#: ../data/
+msgid "Parental Lock"
+msgstr "Kinderslot"
+
+#~ msgid "Thanks for using the wizard. Your box is now ready to use."
+#~ msgstr "De wizard is klaar. U kunt u dreambox nu gebruiken."
+
+#~ msgid "Toggle EPG type with INFO button"
+#~ msgstr "Verander EPG-Type door Drukken op INFO toets"
+
 #~ msgid "Plugins"
 #~ msgstr "Plugins"