X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/561b59495e41aba2a09d524169e58ce2543276a6..2669cc5e44c030dc749e1999c3f96d5296362a54:/po/enigma2.pot

diff --git a/po/enigma2.pot b/po/enigma2.pot
index c710be0a..c65ca1e8 100644
--- a/po/enigma2.pot
+++ b/po/enigma2.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-08 02:59+0200\n"
+"POT-Creation-Date: 2006-09-06 13:57+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,13 +27,14 @@ msgstr ""
 msgid "\"?"
 msgstr ""
 
-#: ../lib/python/Screens/EventView.py:111
+#: ../lib/python/Screens/EventView.py:107
 #, python-format
 msgid "%d min"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:102
-#: ../lib/python/Screens/TimerEntry.py:105
+#: ../lib/python/Screens/TimerEntry.py:106
+#: ../lib/python/Screens/TimerEntry.py:109
+#: ../lib/python/Screens/TimeDateInput.py:49
 msgid "%d.%B %Y"
 msgstr ""
 
@@ -57,35 +58,35 @@ msgstr ""
 msgid "/var directory"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:725
+#: ../lib/python/Components/NimManager.py:758
 msgid "0 V"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:728
+#: ../lib/python/Components/NimManager.py:761
 msgid "1.0"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:728
+#: ../lib/python/Components/NimManager.py:761
 msgid "1.1"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:728
+#: ../lib/python/Components/NimManager.py:761
 msgid "1.2"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:725
+#: ../lib/python/Components/NimManager.py:758
 msgid "12 V"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:147
+#: ../lib/python/Screens/Satconfig.py:150
 msgid "12V Output"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:704
+#: ../lib/python/Components/NimManager.py:737
 msgid "13 V"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:704
+#: ../lib/python/Components/NimManager.py:737
 msgid "18 V"
 msgstr ""
 
@@ -93,93 +94,118 @@ msgstr ""
 msgid "<unknown>"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:727
+#: ../lib/python/Screens/Setup.py:131
+msgid "??"
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:760
 msgid "A"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1075
+#: ../lib/python/Screens/InfoBarGenerics.py:1326
 msgid ""
 "A recording is currently running.\n"
 "What do you want to do?"
 msgstr ""
 
-#: ../RecordTimer.py:142
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:506
+msgid ""
+"A recording is currently running. Please stop the recording before trying to "
+"configure the positioner."
+msgstr ""
+
+#: ../RecordTimer.py:163
 msgid ""
 "A timer failed to record!\n"
 "Disable TV and try again?\n"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:710
+#: ../lib/python/Components/NimManager.py:743
 msgid "AA"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:710
+#: ../lib/python/Components/NimManager.py:743
 msgid "AB"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:251
-msgid "AGC"
+#: ../lib/python/Screens/InfoBarGenerics.py:1165
+msgid "Activate Picture in Picture"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEdit.py:28
+#: ../lib/python/Screens/TimerEdit.py:27
 msgid "Add"
 msgstr ""
 
-#: ../lib/python/Screens/EventView.py:26
-#: ../lib/python/Screens/EpgSelection.py:48
+#: ../lib/python/Screens/MediaPlayer.py:346
+msgid "Add files to playlist"
+msgstr ""
+
+#: ../lib/python/Screens/EventView.py:32
+#: ../lib/python/Screens/EpgSelection.py:60
 msgid "Add timer"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:647
-#: ../lib/python/Components/NimManager.py:655
+#: ../lib/python/Components/NimManager.py:680
+#: ../lib/python/Components/NimManager.py:688
 #: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:31
 msgid "Advanced"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:430
-#: ../lib/python/Screens/ChannelSelection.py:576
+#: ../lib/python/Screens/TimerEntry.py:195
+msgid "After event"
+msgstr ""
+
+#: ../lib/python/Screens/MediaPlayer.py:51
+msgid "Album:"
+msgstr ""
+
+#: ../lib/python/Screens/ChannelSelection.py:474
+#: ../lib/python/Screens/ChannelSelection.py:623
 msgid "All"
 msgstr ""
 
-#: ../lib/python/Components/Language.py:15
+#: ../lib/python/Components/Language.py:16
 msgid "Arabic"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:301
-#: ../lib/python/Screens/ScanSetup.py:304
-#: ../lib/python/Screens/ScanSetup.py:308
-#: ../lib/python/Screens/ScanSetup.py:309
-#: ../lib/python/Screens/ScanSetup.py:310
-#: ../lib/python/Screens/ScanSetup.py:316
-#: ../lib/python/Screens/ScanSetup.py:320
-#: ../lib/python/Screens/ScanSetup.py:321
-#: ../lib/python/Screens/ScanSetup.py:322
-#: ../lib/python/Screens/ScanSetup.py:323
-#: ../lib/python/Screens/ScanSetup.py:324
-#: ../lib/python/Screens/ScanSetup.py:325
+#: ../lib/python/Screens/MediaPlayer.py:47
+msgid "Artist:"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1336
+msgid "Audio Options..."
+msgstr ""
+
+#: ../lib/python/Screens/ScanSetup.py:365
+#: ../lib/python/Screens/ScanSetup.py:368
+#: ../lib/python/Screens/ScanSetup.py:374
+#: ../lib/python/Screens/ScanSetup.py:376
+#: ../lib/python/Screens/ScanSetup.py:382
+#: ../lib/python/Screens/ScanSetup.py:386
+#: ../lib/python/Screens/ScanSetup.py:387
+#: ../lib/python/Screens/ScanSetup.py:388
+#: ../lib/python/Screens/ScanSetup.py:389
+#: ../lib/python/Screens/ScanSetup.py:390
+#: ../lib/python/Screens/ScanSetup.py:391 ../lib/python/Screens/Ci.py:24
 msgid "Auto"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:552
+#: ../lib/python/Screens/ScanSetup.py:702 ../data/
 msgid "Automatic Scan"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:727
+#: ../lib/python/Components/NimManager.py:760
 msgid "B"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:710
+#: ../lib/python/Components/NimManager.py:743
 msgid "BA"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:710
+#: ../lib/python/Components/NimManager.py:743
 msgid "BB"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:253
-msgid "BER"
-msgstr ""
-
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:76
 msgid "Backup"
 msgstr ""
@@ -192,11 +218,11 @@ msgstr ""
 msgid "Backup Mode"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:705
+#: ../lib/python/Components/NimManager.py:738
 msgid "Band"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:236
+#: ../lib/python/Screens/ScanSetup.py:247
 msgid "Bandwidth"
 msgstr ""
 
@@ -204,7 +230,7 @@ msgstr ""
 msgid "Bus: "
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:721
+#: ../lib/python/Components/NimManager.py:754
 msgid "C-Band"
 msgstr ""
 
@@ -212,11 +238,16 @@ msgstr ""
 msgid "CF Drive"
 msgstr ""
 
+#: ../lib/python/Screens/ChannelSelection.py:736
+msgid "Cable"
+msgstr ""
+
 #: ../lib/python/Screens/Satconfig.py:69
 msgid "Cable provider"
 msgstr ""
 
-#: ../lib/python/Screens/Setup.py:110 ../lib/python/Screens/TimerEntry.py:24
+#: ../lib/python/Screens/Setup.py:87 ../lib/python/Screens/TimerEntry.py:25
+#: ../lib/python/Screens/TimeDateInput.py:16
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:75
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:165
 msgid "Cancel"
@@ -226,11 +257,11 @@ msgstr ""
 msgid "Capacity: "
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:190
+#: ../lib/python/Screens/TimerEntry.py:197 ../data/
 msgid "Channel"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:147
+#: ../lib/python/Screens/InfoBarGenerics.py:150
 msgid "Channel:"
 msgstr ""
 
@@ -242,42 +273,50 @@ msgstr ""
 msgid "Classic"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEdit.py:30
+#: ../lib/python/Screens/TimerEdit.py:29
 msgid "Cleanup"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:308
+#: ../lib/python/Screens/ScanSetup.py:213
+#: ../lib/python/Screens/ScanSetup.py:218
+#: ../lib/python/Screens/ScanSetup.py:240
+#: ../lib/python/Screens/ScanSetup.py:255
+#: ../lib/python/Screens/ScanSetup.py:690
+msgid "Clear before scan"
+msgstr ""
+
+#: ../lib/python/Screens/TimerEntry.py:346
 msgid "Clear log"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:237
+#: ../lib/python/Screens/ScanSetup.py:248
 msgid "Code rate high"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:238
+#: ../lib/python/Screens/ScanSetup.py:249
 msgid "Code rate low"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:127
-#: ../lib/python/Screens/Satconfig.py:129
+#: ../lib/python/Screens/Satconfig.py:130
+#: ../lib/python/Screens/Satconfig.py:132
 msgid "Command order"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:123
+#: ../lib/python/Screens/Satconfig.py:126
 msgid "Committed DiSEqC command"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:282
-#: ../lib/python/Screens/ScanSetup.py:283
+#: ../lib/python/Screens/ScanSetup.py:344
+#: ../lib/python/Screens/ScanSetup.py:345
 msgid "Complete"
 msgstr ""
 
 #: ../lib/python/Screens/Satconfig.py:49
-#: ../lib/python/Screens/Satconfig.py:152
+#: ../lib/python/Screens/Satconfig.py:155 ../data/
 msgid "Configuration Mode"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEdit.py:192
+#: ../lib/python/Screens/TimerEdit.py:205
 msgid "Conflicting timer"
 msgstr ""
 
@@ -285,23 +324,39 @@ msgstr ""
 msgid "Current version:"
 msgstr ""
 
+#: ../lib/python/Screens/ScanSetup.py:363
+msgid "DVB-S"
+msgstr ""
+
+#: ../lib/python/Screens/ScanSetup.py:363
+msgid "DVB-S2"
+msgstr ""
+
+#: ../lib/python/Components/Language.py:17
+msgid "Danish"
+msgstr ""
+
+#: ../lib/python/Screens/TimeDateInput.py:54
+msgid "Date"
+msgstr ""
+
 #: ../lib/python/Components/SetupDevices.py:21
 msgid "Default"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEdit.py:27
+#: ../lib/python/Screens/TimerEdit.py:26
 msgid "Delete"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:305
+#: ../lib/python/Screens/TimerEntry.py:343
 msgid "Delete entry"
 msgstr ""
 
-#: ../lib/python/Screens/MovieSelection.py:62
+#: ../lib/python/Screens/MovieSelection.py:64
 msgid "Delete failed!"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:147
+#: ../lib/python/Screens/TimerEntry.py:151
 msgid "Description"
 msgstr ""
 
@@ -313,11 +368,11 @@ msgstr ""
 msgid "Detected NIMs:"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:669
+#: ../lib/python/Components/NimManager.py:702
 msgid "DiSEqC A/B"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:669
+#: ../lib/python/Components/NimManager.py:702
 msgid "DiSEqC A/B/C/D"
 msgstr ""
 
@@ -325,16 +380,16 @@ msgstr ""
 msgid "DiSEqC Mode"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:119
+#: ../lib/python/Screens/Satconfig.py:122
 msgid "DiSEqC mode"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:131
+#: ../lib/python/Screens/Satconfig.py:134
 msgid "DiSEqC repeats"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:211
-#: ../lib/python/Screens/TimerEdit.py:76 ../lib/python/Components/Lcd.py:31
+#: ../lib/python/Screens/ScanSetup.py:222
+#: ../lib/python/Screens/TimerEdit.py:83 ../lib/python/Components/Lcd.py:31
 #: ../lib/python/Components/SetupDevices.py:38
 #: ../lib/python/Components/SetupDevices.py:39
 #: ../lib/python/Components/SetupDevices.py:43
@@ -345,14 +400,23 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
+#: ../lib/python/Screens/InfoBarGenerics.py:1163
+msgid "Disable Picture in Picture"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1120
+msgid "Disable subtitles"
+msgstr ""
+
 #: ../lib/python/Screens/PluginBrowser.py:102
 msgid ""
 "Do you really want to REMOVE\n"
 "the plugin \""
 msgstr ""
 
-#: ../lib/python/Screens/MovieSelection.py:45
-msgid "Do you really want to delete this recording?"
+#: ../lib/python/Screens/MovieSelection.py:47
+#, python-format
+msgid "Do you really want to delete %s?"
 msgstr ""
 
 #: ../lib/python/Screens/PluginBrowser.py:100
@@ -361,12 +425,22 @@ msgid ""
 "the plugin \""
 msgstr ""
 
+#: ../lib/python/Screens/HarddiskSetup.py:54
+msgid ""
+"Do you really want to initialize the harddisk?\n"
+"All data on the disk will be lost!"
+msgstr ""
+
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:123
 msgid ""
 "Do you want to backup now?\n"
 "After pressing OK, please wait!"
 msgstr ""
 
+#: ../lib/python/Screens/InfoBarGenerics.py:1605
+msgid "Do you want to resume this playback?"
+msgstr ""
+
 #: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:50
 #: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:202
 msgid ""
@@ -386,11 +460,11 @@ msgstr ""
 msgid "Downloading plugin information. Please wait..."
 msgstr ""
 
-#: ../lib/python/Components/Language.py:16
+#: ../lib/python/Components/Language.py:18
 msgid "Dutch"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:690
+#: ../lib/python/Screens/ChannelSelection.py:744
 msgid "E"
 msgstr ""
 
@@ -399,13 +473,13 @@ msgstr ""
 msgid "ERROR - failed to scan (%s)!"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:676
-#: ../lib/python/Components/NimManager.py:737
+#: ../lib/python/Components/NimManager.py:709
+#: ../lib/python/Components/NimManager.py:770
 msgid "East"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:211
-#: ../lib/python/Screens/TimerEdit.py:74 ../lib/python/Components/Lcd.py:31
+#: ../lib/python/Screens/ScanSetup.py:222
+#: ../lib/python/Screens/TimerEdit.py:81 ../lib/python/Components/Lcd.py:31
 #: ../lib/python/Components/SetupDevices.py:38
 #: ../lib/python/Components/SetupDevices.py:39
 #: ../lib/python/Components/SetupDevices.py:43
@@ -416,21 +490,29 @@ msgstr ""
 msgid "Enable"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:184
-msgid "End"
+#: ../lib/python/Screens/Satconfig.py:74
+msgid "Enable 5V for active antenna"
 msgstr ""
 
 #: ../lib/python/Screens/TimerEntry.py:188
+msgid "End"
+msgstr ""
+
+#: ../lib/python/Screens/TimerEntry.py:192
 msgid "EndTime"
 msgstr ""
 
 #: ../lib/python/Screens/LanguageSelection.py:53
 #: ../lib/python/Components/SetupDevices.py:24
-#: ../lib/python/Components/Language.py:13
+#: ../lib/python/Components/Language.py:14
 msgid "English"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:650
+#: ../lib/python/Screens/InfoBarGenerics.py:342
+msgid "Enter main menu..."
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:683
 msgid "Equal to Socket A"
 msgstr ""
 
@@ -442,39 +524,44 @@ msgstr ""
 msgid "Execution finished!!"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1140
-msgid "Extensions"
-msgstr ""
-
-#: ../lib/python/Screens/ScanSetup.py:198
-#: ../lib/python/Screens/ScanSetup.py:226
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:342
+#: ../lib/python/Screens/ScanSetup.py:205
+#: ../lib/python/Screens/ScanSetup.py:207
+#: ../lib/python/Screens/ScanSetup.py:237
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:405
 msgid "FEC"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:124
+#: ../lib/python/Screens/Satconfig.py:127
 msgid "Fast DiSEqC"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:433
+#: ../lib/python/Screens/ChannelSelection.py:477
 msgid "Favourites"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:194
-#: ../lib/python/Screens/ScanSetup.py:222
+#: ../lib/python/Components/Language.py:19
+msgid "Finnish"
+msgstr ""
+
+#: ../lib/python/Components/Language.py:20
+msgid "French"
+msgstr ""
+
+#: ../lib/python/Screens/ScanSetup.py:200
 #: ../lib/python/Screens/ScanSetup.py:233
-#: ../lib/python/Screens/TimerEntry.py:156
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:338
+#: ../lib/python/Screens/ScanSetup.py:244
+#: ../lib/python/Screens/TimerEntry.py:160
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:401
 msgid "Frequency"
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:187
+#: ../lib/python/Screens/EpgSelection.py:235
 #: ../lib/python/Components/TimerList.py:34
 msgid "Fri"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:108
-#: ../lib/python/Screens/TimerEntry.py:170
+#: ../lib/python/Screens/TimerEntry.py:112
+#: ../lib/python/Screens/TimerEntry.py:174
 msgid "Friday"
 msgstr ""
 
@@ -487,12 +574,16 @@ msgstr ""
 msgid "Function not yet implemented"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:45
+#: ../lib/python/Screens/NetworkSetup.py:45 ../data/
 msgid "Gateway"
 msgstr ""
 
+#: ../lib/python/Screens/MediaPlayer.py:55
+msgid "Genre:"
+msgstr ""
+
 #: ../lib/python/Components/SetupDevices.py:24
-#: ../lib/python/Components/Language.py:14
+#: ../lib/python/Components/Language.py:15
 msgid "German"
 msgstr ""
 
@@ -500,32 +591,38 @@ msgstr ""
 msgid "Getting plugin information. Please wait..."
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:175
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:134
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:192
+msgid "Goto 0"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:189
 msgid "Goto position"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:241
+#: ../lib/python/Screens/ScanSetup.py:252
 msgid "Guard interval mode"
 msgstr ""
 
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:111
+#: ../data/
 msgid "Harddisk"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:242
+#: ../lib/python/Screens/ScanSetup.py:253
 msgid "Hierarchy mode"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1053
-#: ../lib/python/Screens/InfoBarGenerics.py:1059
+#: ../lib/python/Screens/InfoBarGenerics.py:1302
+#: ../lib/python/Screens/InfoBarGenerics.py:1310
 msgid "How many minutes do you want to record?"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:42
+#: ../lib/python/Screens/NetworkSetup.py:42 ../data/
 msgid "IP Address"
 msgstr ""
 
-#: ../lib/python/Components/Language.py:18
+#: ../lib/python/Components/Language.py:21
 msgid "Icelandic"
 msgstr ""
 
@@ -533,11 +630,16 @@ msgstr ""
 msgid "Image-Upgrade"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:148
+#: ../RecordTimer.py:166
+msgid ""
+"In order to record a timer, the TV was switched to the recording service!\n"
+msgstr ""
+
+#: ../lib/python/Screens/Satconfig.py:151
 msgid "Increased voltage"
 msgstr ""
 
-#: ../lib/python/Screens/Ci.py:214
+#: ../lib/python/Screens/Ci.py:313
 msgid "Init"
 msgstr ""
 
@@ -549,60 +651,76 @@ msgstr ""
 msgid "Initializing Harddisk..."
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:195
-#: ../lib/python/Screens/ScanSetup.py:223
-#: ../lib/python/Screens/ScanSetup.py:235
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:339
+#: ../lib/python/Screens/InfoBarGenerics.py:1212
+msgid "Instant Record..."
+msgstr ""
+
+#: ../lib/python/Screens/ScanSetup.py:201
+#: ../lib/python/Screens/ScanSetup.py:234
+#: ../lib/python/Screens/ScanSetup.py:246
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:402
 msgid "Inversion"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:116
+#: ../lib/python/Components/Language.py:22
+msgid "Italian"
+msgstr ""
+
+#: ../lib/python/Screens/Satconfig.py:119
 msgid "LNB"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:141
+#: ../lib/python/Screens/Satconfig.py:144
 msgid "LOF"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:145
+#: ../lib/python/Screens/Satconfig.py:148
 msgid "LOF/H"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:144
+#: ../lib/python/Screens/Satconfig.py:147
 msgid "LOF/L"
 msgstr ""
 
-#: ../lib/python/Screens/LanguageSelection.py:48
+#: ../lib/python/Screens/LanguageSelection.py:48 ../data/
 msgid "Language selection"
 msgstr ""
 
 #: ../lib/python/Screens/Satconfig.py:28
-#: ../lib/python/Screens/Satconfig.py:135
+#: ../lib/python/Screens/Satconfig.py:138 ../data/
 msgid "Latitude"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:170
+#: ../lib/python/Screens/InfoBarGenerics.py:1376
+msgid "Left"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:184
 msgid "Limit east"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:169
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:183
 msgid "Limit west"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:168
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:182
 msgid "Limits off"
 msgstr ""
 
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:185
+msgid "Limits on"
+msgstr ""
+
 #: ../lib/python/Screens/Satconfig.py:26
-#: ../lib/python/Screens/Satconfig.py:133
+#: ../lib/python/Screens/Satconfig.py:136 ../data/
 msgid "Longitude"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:651
+#: ../lib/python/Components/NimManager.py:684
 msgid "Loopthrough to Socket A"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:358
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:421
 msgid "Manual transponder"
 msgstr ""
 
@@ -610,30 +728,35 @@ msgstr ""
 msgid "Model: "
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:225
-#: ../lib/python/Screens/ScanSetup.py:239
+#: ../lib/python/Screens/ScanSetup.py:208
+#: ../lib/python/Screens/ScanSetup.py:236
+#: ../lib/python/Screens/ScanSetup.py:250
 msgid "Modulation"
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:187
+#: ../lib/python/Screens/EpgSelection.py:235
 #: ../lib/python/Components/TimerList.py:34
 msgid "Mon"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:100
+#: ../lib/python/Screens/TimerEntry.py:104
 msgid "Mon-Fri"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:108
-#: ../lib/python/Screens/TimerEntry.py:166
+#: ../lib/python/Screens/TimerEntry.py:112
+#: ../lib/python/Screens/TimerEntry.py:170
 msgid "Monday"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:166
+#: ../lib/python/Screens/InfoBarGenerics.py:1171
+msgid "Move Picture in Picture"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:175
 msgid "Move east"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:163
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:172
 msgid "Move west"
 msgstr ""
 
@@ -641,95 +764,127 @@ msgstr ""
 msgid "Movie Menu"
 msgstr ""
 
-#: ../lib/python/Screens/EventView.py:131
+#: ../lib/python/Screens/EventView.py:154
 msgid "Multi EPG"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:281
+#: ../lib/python/Screens/Ci.py:324
+msgid "Multiple service support"
+msgstr ""
+
+#: ../lib/python/Screens/ScanSetup.py:343
 msgid "Multisat"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:494
+#: ../lib/python/Components/NimManager.py:499
 msgid "N/A"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:146
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:486
+msgid "NIM "
+msgstr ""
+
+#: ../lib/python/Screens/TimerEntry.py:150
 msgid "Name"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:46
+#: ../lib/python/Screens/NetworkSetup.py:46 ../data/
 msgid "Nameserver"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:44
+#: ../lib/python/Screens/NetworkSetup.py:44 ../data/
 msgid "Netmask"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:227
-#: ../lib/python/Screens/ScanSetup.py:234
+#: ../lib/python/Screens/ScanSetup.py:238
+#: ../lib/python/Screens/ScanSetup.py:245
 msgid "Network scan"
 msgstr ""
 
+#: ../lib/python/Screens/ChannelSelection.py:728
+msgid "New"
+msgstr ""
+
 #: ../lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/plugin.py:33
 msgid "New version:"
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:34
+#: ../lib/python/Screens/EpgSelection.py:46
 msgid "Next"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:706
-#: ../lib/python/Components/NimManager.py:726
-#: ../lib/python/Components/NimManager.py:730
-#: ../lib/python/Components/NimManager.py:731
-#: ../lib/python/Components/NimManager.py:740
+#: ../lib/python/Screens/Ci.py:24 ../lib/python/Components/NimManager.py:739
+#: ../lib/python/Components/NimManager.py:759
+#: ../lib/python/Components/NimManager.py:763
+#: ../lib/python/Components/NimManager.py:764
+#: ../lib/python/Components/NimManager.py:773
 msgid "No"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1071
+#: ../lib/python/Screens/InfoBarGenerics.py:1322
 msgid "No HDD found or HDD not initialized!"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1011
+#: ../lib/python/Screens/InfoBarGenerics.py:1255
 msgid "No event info found, recording indefinitely."
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:304
-#: ../lib/python/Screens/ScanSetup.py:310
-#: ../lib/python/Screens/ScanSetup.py:320
-#: ../lib/python/Screens/ScanSetup.py:321
-#: ../lib/python/Screens/ScanSetup.py:325
-#: ../lib/python/Components/NimManager.py:710
-#: ../lib/python/Components/NimManager.py:714
-#: ../lib/python/Components/NimManager.py:727
-#: ../lib/python/Components/NimManager.py:728
-#: ../lib/python/Components/NimManager.py:735
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:503
+msgid "No positioner capable frontend found."
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:518
+msgid "No tuner is configured for use with a diseqc positioner!"
+msgstr ""
+
+#: ../lib/python/Screens/ScanSetup.py:368
+#: ../lib/python/Screens/ScanSetup.py:376
+#: ../lib/python/Screens/ScanSetup.py:391
+#: ../lib/python/Components/NimManager.py:743
+#: ../lib/python/Components/NimManager.py:747
+#: ../lib/python/Components/NimManager.py:760
+#: ../lib/python/Components/NimManager.py:761
+#: ../lib/python/Components/NimManager.py:768
 msgid "None"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:678
-#: ../lib/python/Components/NimManager.py:739
+#: ../lib/python/Components/NimManager.py:711
+#: ../lib/python/Components/NimManager.py:772
 msgid "North"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:652
+#: ../lib/python/Components/Language.py:23
+msgid "Norwegian"
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:685
 msgid "Nothing connected"
 msgstr ""
 
-#: ../lib/python/Screens/Setup.py:109 ../lib/python/Screens/TimerEntry.py:23
+#: ../lib/python/Screens/ScanSetup.py:568
+#: ../lib/python/Screens/ScanSetup.py:633
+msgid ""
+"Nothing to scan!\n"
+"Please setup your tuner settings before you start a service scan."
+msgstr ""
+
+#: ../lib/python/Screens/Setup.py:86 ../lib/python/Screens/TimerEntry.py:24
+#: ../lib/python/Screens/TimeDateInput.py:15
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:74
 msgid "OK"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:705
+#: ../lib/python/Components/NimManager.py:738
+#: ../lib/python/Components/NimManager.py:782
 msgid "Off"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:705
+#: ../lib/python/Components/NimManager.py:738
+#: ../lib/python/Components/NimManager.py:782
 msgid "On"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:735
+#: ../lib/python/Components/NimManager.py:768
 msgid "One"
 msgstr ""
 
@@ -741,24 +896,48 @@ msgstr ""
 msgid "Packet management"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBar.py:41
+#: ../lib/python/Screens/InfoBar.py:48
 msgid "Play recorded movies..."
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:106
+#: ../lib/python/Screens/InfoBarGenerics.py:1085
+msgid "Please choose an extension..."
+msgstr ""
+
+#: ../lib/python/Screens/ChannelSelection.py:126
 msgid "Please enter a name for the new bouquet"
 msgstr ""
 
-#: ../lib/python/Screens/MovieSelection.py:77
+#: ../lib/python/Screens/ChannelSelection.py:160
+msgid "Please enter a name for the new marker"
+msgstr ""
+
+#: ../lib/python/Screens/TimerEntry.py:320
+msgid "Please select a subservice to record..."
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1473
+#: ../lib/python/Screens/SubservicesQuickzap.py:93
+msgid "Please select a subservice..."
+msgstr ""
+
+#: ../lib/python/Screens/PiPSetup.py:41
+msgid ""
+"Please use direction keys to move the PiP window.\n"
+"Press Bouquet +/- to resize the window.\n"
+"Press OK to go back to the TV mode or EXIT to cancel the moving."
+msgstr ""
+
+#: ../lib/python/Screens/MovieSelection.py:79
 msgid "Please wait... Loading list..."
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:197
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:341
+#: ../lib/python/Screens/ScanSetup.py:203
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:404
 msgid "Polarity"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:704
+#: ../lib/python/Components/NimManager.py:737
 msgid "Polarization"
 msgstr ""
 
@@ -778,19 +957,23 @@ msgstr ""
 msgid "Port D"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:669
+#: ../lib/python/Components/NimManager.py:702
 msgid "Positioner"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:124
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:131
+msgid "Positioner fine movement"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:130
 msgid "Positioner movement"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:126
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:133
 msgid "Positioner storage"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:358
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:421
 msgid "Predefined satellite"
 msgstr ""
 
@@ -798,36 +981,40 @@ msgstr ""
 msgid "Press OK to activate the settings."
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:553
+#: ../lib/python/Screens/ScanSetup.py:703
 msgid "Press OK to scan"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:157
+#: ../lib/python/Screens/ScanSetup.py:160
 msgid "Press OK to start the scan"
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:33
+#: ../lib/python/Screens/EpgSelection.py:45
 msgid "Prev"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:432
-#: ../lib/python/Screens/ChannelSelection.py:572
+#: ../lib/python/Screens/ChannelSelection.py:476
+#: ../lib/python/Screens/ChannelSelection.py:619
 msgid "Provider"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:679
+#: ../lib/python/Screens/ChannelSelection.py:726
 msgid "Providers"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEdit.py:97
+#: ../lib/python/Screens/InfoBarGenerics.py:1469
+msgid "Quickzap"
+msgstr ""
+
+#: ../lib/python/Screens/TimerEdit.py:107
 msgid "Really delete done timers?"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1124
-msgid "Record"
+#: ../lib/python/Screens/SubservicesQuickzap.py:104
+msgid "Really exit the subservices quickzap?"
 msgstr ""
 
-#: ../lib/python/Screens/EventView.py:67
+#: ../lib/python/Screens/EventView.py:74
 msgid "Recording"
 msgstr ""
 
@@ -839,11 +1026,15 @@ msgstr ""
 msgid "Remove plugins"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:150
+#: ../lib/python/Screens/TimerEntry.py:154
 msgid "Repeat Type"
 msgstr ""
 
-#: ../lib/python/Screens/Ci.py:213
+#: ../lib/python/Screens/MediaPlayer.py:347
+msgid "Replace current playlist"
+msgstr ""
+
+#: ../lib/python/Screens/Ci.py:312
 msgid "Reset"
 msgstr ""
 
@@ -852,55 +1043,71 @@ msgstr ""
 msgid "Restore"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:249
-msgid "SNR"
+#: ../lib/python/Screens/InfoBarGenerics.py:1376
+msgid "Right"
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:187
+#: ../lib/python/Screens/EpgSelection.py:235
 #: ../lib/python/Components/TimerList.py:34
 msgid "Sat"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:193
-#: ../lib/python/Screens/ScanSetup.py:202
+#: ../lib/python/Screens/ScanSetup.py:199
+#: ../lib/python/Screens/ScanSetup.py:212
 #: ../lib/python/Screens/Satconfig.py:13 ../lib/python/Screens/Satconfig.py:63
-#: ../lib/python/Screens/Satconfig.py:154
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:335
+#: ../lib/python/Screens/Satconfig.py:157
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:398
 msgid "Satellite"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:431
-#: ../lib/python/Screens/ChannelSelection.py:574
+#: ../lib/python/Screens/ChannelSelection.py:475
+#: ../lib/python/Screens/ChannelSelection.py:621
 msgid "Satellites"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:108
-#: ../lib/python/Screens/TimerEntry.py:171
+#: ../lib/python/Screens/TimerEntry.py:112
+#: ../lib/python/Screens/TimerEntry.py:175
 msgid "Saturday"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:546
-#: ../lib/python/Screens/ScanSetup.py:549
+#: ../lib/python/Screens/ScanSetup.py:695
+#: ../lib/python/Screens/ScanSetup.py:699
 msgid "Scan NIM"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:653
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:174
+msgid "Search east"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:173
+msgid "Search west"
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:686
 msgid "Secondary cable from motorized LNB"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:230
+#: ../lib/python/Screens/InfoBarGenerics.py:1388
+msgid "Select audio mode"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1377
+msgid "Select audio track"
+msgstr ""
+
+#: ../lib/python/Screens/TimerEntry.py:237
 msgid "Select channel to record from"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:125
+#: ../lib/python/Screens/Satconfig.py:128
 msgid "Sequence repeat"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:681
+#: ../lib/python/Screens/ChannelSelection.py:730
 msgid "Services"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:125
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:132
 msgid "Set limits"
 msgstr ""
 
@@ -908,42 +1115,50 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBar.py:42
+#: ../lib/python/Screens/InfoBar.py:49
 msgid "Show the radio player..."
 msgstr ""
 
-#: ../lib/python/Screens/EventView.py:102
+#: ../lib/python/Screens/InfoBar.py:50
+msgid "Show the tv player..."
+msgstr ""
+
+#: ../lib/python/Screens/EventView.py:133
+msgid "Similar"
+msgstr ""
+
+#: ../lib/python/Screens/EventView.py:127
 msgid "Similar broadcasts:"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:647
-#: ../lib/python/Components/NimManager.py:654
+#: ../lib/python/Components/NimManager.py:680
+#: ../lib/python/Components/NimManager.py:687
 msgid "Simple"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:669
+#: ../lib/python/Components/NimManager.py:702
 msgid "Single"
 msgstr ""
 
-#: ../lib/python/Screens/EventView.py:130
+#: ../lib/python/Screens/EventView.py:153
 msgid "Single EPG"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:281
+#: ../lib/python/Screens/ScanSetup.py:343
 msgid "Single satellite"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:281
-#: ../lib/python/Screens/ScanSetup.py:282
-#: ../lib/python/Screens/ScanSetup.py:283
+#: ../lib/python/Screens/ScanSetup.py:343
+#: ../lib/python/Screens/ScanSetup.py:344
+#: ../lib/python/Screens/ScanSetup.py:345
 msgid "Single transponder"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:682
+#: ../lib/python/Components/NimManager.py:715
 msgid "Slot "
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:563
+#: ../lib/python/Components/NimManager.py:568
 msgid "Socket "
 msgstr ""
 
@@ -954,172 +1169,205 @@ msgid ""
 "Please choose an other one."
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:678
-#: ../lib/python/Components/NimManager.py:739
+#: ../lib/python/Components/NimManager.py:711
+#: ../lib/python/Components/NimManager.py:772
 msgid "South"
 msgstr ""
 
-#: ../lib/python/Components/Language.py:17
+#: ../lib/python/Components/Language.py:24
 msgid "Spanish"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:178
+#: ../lib/python/Screens/TimerEntry.py:182
 msgid "Start"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1077
+#: ../lib/python/Screens/InfoBarGenerics.py:1328
 msgid "Start recording?"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:181
+#: ../lib/python/Screens/TimerEntry.py:185
 msgid "StartTime"
 msgstr ""
 
-#: ../lib/python/Screens/Wizard.py:221
+#: ../lib/python/Screens/Wizard.py:230
 msgid "Step "
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:165
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:179
 msgid "Step east"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:164
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:178
 msgid "Step west"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:158
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:159
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:160
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:161
+#: ../lib/python/Screens/InfoBarGenerics.py:1376
+msgid "Stereo"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:167
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:168
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:169
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:170
 msgid "Stop"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:893
+#: ../lib/python/Screens/InfoBarGenerics.py:955
 msgid "Stop Timeshift?"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBar.py:105
+#: ../lib/python/Screens/InfoBar.py:113
 msgid "Stop playing this movie?"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:174
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:188
 msgid "Store position"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:113
+#: ../lib/python/Screens/Satconfig.py:116
 msgid "Stored position"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1129
-msgid "Subservices"
+#: ../lib/python/Screens/InfoBarGenerics.py:1407
+msgid "Subservice list..."
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:187
+#: ../lib/python/Screens/EpgSelection.py:235
 #: ../lib/python/Components/TimerList.py:34
 msgid "Sun"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:108
-#: ../lib/python/Screens/TimerEntry.py:172
+#: ../lib/python/Screens/TimerEntry.py:112
+#: ../lib/python/Screens/TimerEntry.py:176
 msgid "Sunday"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:196
-#: ../lib/python/Screens/ScanSetup.py:224
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:340
+#: ../lib/python/Screens/InfoBarGenerics.py:1168
+msgid "Swap Services"
+msgstr ""
+
+#: ../lib/python/Components/Language.py:25
+msgid "Swedish"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1412
+msgid "Switch to next subservice"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1413
+msgid "Switch to previous subservice"
+msgstr ""
+
+#: ../lib/python/Screens/ScanSetup.py:202
+#: ../lib/python/Screens/ScanSetup.py:235
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:403
 msgid "Symbol Rate"
 msgstr ""
 
+#: ../lib/python/Screens/ChannelSelection.py:738
+msgid "Terrestrial"
+msgstr ""
+
 #: ../lib/python/Screens/Satconfig.py:73
 msgid "Terrestrial provider"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:735
+#: ../lib/python/Components/NimManager.py:768
 msgid "Three"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:146
+#: ../lib/python/Screens/Satconfig.py:149
 msgid "Threshold"
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:187
+#: ../lib/python/Screens/EpgSelection.py:235
 #: ../lib/python/Components/TimerList.py:34
 msgid "Thu"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:108
-#: ../lib/python/Screens/TimerEntry.py:169
+#: ../lib/python/Screens/TimerEntry.py:112
+#: ../lib/python/Screens/TimerEntry.py:173
 msgid "Thursday"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:148
-msgid "Timer Type"
+#: ../lib/python/Screens/TimeDateInput.py:55
+msgid "Time"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:865
-msgid "Timeshift not possible!"
+#: ../lib/python/Screens/TimerEntry.py:152
+msgid "Timer Type"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1133
-msgid "Timeshifting"
+#: ../lib/python/Screens/MediaPlayer.py:49
+msgid "Title:"
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:198
+#: ../lib/python/Screens/EpgSelection.py:246
 #: ../lib/python/Tools/FuzzyDate.py:10
 msgid "Today"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:108
+#: ../lib/python/Screens/Satconfig.py:111
 msgid "Tone mode"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:122
+#: ../lib/python/Screens/Satconfig.py:125
 msgid "Toneburst"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:669
+#: ../lib/python/Components/NimManager.py:702
 msgid "Toneburst A/B"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:240
+#: ../lib/python/Screens/ScanSetup.py:251
 msgid "Transmission mode"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:344
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:407
 msgid "Transponder"
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:187
+#: ../lib/python/Screens/ScanSetup.py:197
+msgid "Transpondertype"
+msgstr ""
+
+#: ../lib/python/Screens/EpgSelection.py:235
 #: ../lib/python/Components/TimerList.py:34
 msgid "Tue"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:108
-#: ../lib/python/Screens/TimerEntry.py:167
+#: ../lib/python/Screens/TimerEntry.py:112
+#: ../lib/python/Screens/TimerEntry.py:171
 msgid "Tuesday"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:123
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:333
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:129
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:161
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:396
 msgid "Tune"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:175
+#: ../lib/python/Screens/ScanSetup.py:178
 #: ../lib/python/Components/ServiceScan.py:75
 msgid "Tuner"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:735
+#: ../lib/python/Components/Language.py:26
+msgid "Turkish"
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:768
 msgid "Two"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:180
-#: ../lib/python/Screens/ScanSetup.py:183
-#: ../lib/python/Screens/ScanSetup.py:186
+#: ../lib/python/Screens/ScanSetup.py:184
+#: ../lib/python/Screens/ScanSetup.py:187
+#: ../lib/python/Screens/ScanSetup.py:190
 msgid "Type of scan"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:674
+#: ../lib/python/Components/NimManager.py:707
 msgid "USALS"
 msgstr ""
 
@@ -1134,11 +1382,11 @@ msgid ""
 "Error: "
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:130
+#: ../lib/python/Screens/Satconfig.py:133
 msgid "Uncommitted DiSEqC command"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:721
+#: ../lib/python/Components/NimManager.py:754
 msgid "Universal LNB"
 msgstr ""
 
@@ -1150,80 +1398,92 @@ msgstr ""
 msgid "Updating... Please wait... This can take some minutes..."
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:40
+#: ../lib/python/Screens/NetworkSetup.py:40 ../data/
 msgid "Use DHCP"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:110
+#: ../lib/python/Screens/Satconfig.py:113
 msgid "Use usals for this sat"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:721
+#: ../lib/python/Components/NimManager.py:754
 msgid "User defined"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:107
+#: ../lib/python/Screens/InfoBarGenerics.py:1743
+msgid "View teletext..."
+msgstr ""
+
+#: ../lib/python/Screens/Satconfig.py:110
 msgid "Voltage mode"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:688
+#: ../lib/python/Screens/ChannelSelection.py:742
 msgid "W"
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:187
+#: ../lib/python/Screens/EpgSelection.py:235
 #: ../lib/python/Components/TimerList.py:34
 msgid "Wed"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:108
-#: ../lib/python/Screens/TimerEntry.py:168
+#: ../lib/python/Screens/TimerEntry.py:112
+#: ../lib/python/Screens/TimerEntry.py:172
 msgid "Wednesday"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:163
+#: ../lib/python/Screens/TimerEntry.py:167
 msgid "Weekday"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:676
-#: ../lib/python/Components/NimManager.py:737
+#: ../lib/python/Components/NimManager.py:709
+#: ../lib/python/Components/NimManager.py:770
 msgid "West"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:706
-#: ../lib/python/Components/NimManager.py:726
-#: ../lib/python/Components/NimManager.py:730
-#: ../lib/python/Components/NimManager.py:731
-#: ../lib/python/Components/NimManager.py:740
+#: ../lib/python/Screens/MediaPlayer.py:53
+msgid "Year:"
+msgstr ""
+
+#: ../lib/python/Screens/Ci.py:24 ../lib/python/Components/NimManager.py:739
+#: ../lib/python/Components/NimManager.py:759
+#: ../lib/python/Components/NimManager.py:763
+#: ../lib/python/Components/NimManager.py:764
+#: ../lib/python/Components/NimManager.py:773
 msgid "Yes"
 msgstr ""
 
-#: ../lib/python/Screens/MovieSelection.py:47
+#: ../lib/python/Screens/MovieSelection.py:49
 msgid "You cannot delete this!"
 msgstr ""
 
+#: ../lib/python/Screens/MediaPlayer.py:348
+msgid "You selected a playlist"
+msgstr ""
+
 #: ../lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/plugin.py:31
 msgid ""
 "Your frontprocessor firmware must be upgraded.\n"
 "Press OK to start upgrade."
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:312
+#: ../lib/python/Screens/ChannelSelection.py:357
 msgid "[bouquet edit]"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:314
+#: ../lib/python/Screens/ChannelSelection.py:359
 msgid "[favourite edit]"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:398
+#: ../lib/python/Screens/ChannelSelection.py:442
 msgid "[move mode]"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:91
+#: ../lib/python/Screens/ChannelSelection.py:111
 msgid "abort bouquet edit"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:94
+#: ../lib/python/Screens/ChannelSelection.py:114
 msgid "abort favourites edit"
 msgstr ""
 
@@ -1231,30 +1491,42 @@ msgstr ""
 msgid "about to start"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:80
-msgid "add bouquet..."
+#: ../lib/python/Screens/ChannelSelection.py:93
+msgid "add bouquet"
+msgstr ""
+
+#: ../lib/python/Screens/MediaPlayer.py:297
+msgid "add directory to playlist"
+msgstr ""
+
+#: ../lib/python/Screens/MediaPlayer.py:299
+msgid "add file to playlist"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1075
-#: ../lib/python/Screens/InfoBarGenerics.py:1077
+#: ../lib/python/Screens/ChannelSelection.py:99
+msgid "add marker"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1326
+#: ../lib/python/Screens/InfoBarGenerics.py:1328
 msgid "add recording (enter recording duration)"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1075
-#: ../lib/python/Screens/InfoBarGenerics.py:1077
+#: ../lib/python/Screens/InfoBarGenerics.py:1326
+#: ../lib/python/Screens/InfoBarGenerics.py:1328
 msgid "add recording (indefinitely)"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1075
-#: ../lib/python/Screens/InfoBarGenerics.py:1077
+#: ../lib/python/Screens/InfoBarGenerics.py:1326
+#: ../lib/python/Screens/InfoBarGenerics.py:1328
 msgid "add recording (stop after current event)"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:65
+#: ../lib/python/Screens/ChannelSelection.py:79
 msgid "add service to bouquet"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:67
+#: ../lib/python/Screens/ChannelSelection.py:81
 msgid "add service to favourites"
 msgstr ""
 
@@ -1265,43 +1537,56 @@ msgid ""
 msgstr ""
 
 #: ../lib/python/Screens/MovieSelection.py:24
-#: ../lib/python/Screens/ChannelSelection.py:96
+#: ../lib/python/Screens/ChannelSelection.py:116
 msgid "back"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1075
+#: ../lib/python/Screens/InfoBarGenerics.py:1326
 msgid "change recording (duration)"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:303
+#: ../lib/python/Screens/ScanSetup.py:367
 msgid "circular left"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:303
+#: ../lib/python/Screens/ScanSetup.py:367
 msgid "circular right"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:70
+#: ../lib/python/Screens/MediaPlayer.py:303
+msgid "clear playlist"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:583
+msgid "continue"
+msgstr ""
+
+#: ../lib/python/Screens/ChannelSelection.py:85
 msgid "copy to favourites"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:100
+#: ../lib/python/Screens/TimerEntry.py:104
 msgid "daily"
 msgstr ""
 
+#: ../lib/python/Screens/MediaPlayer.py:302
+msgid "delete"
+msgstr ""
+
 #: ../lib/python/Screens/MovieSelection.py:24
 msgid "delete..."
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:87
+#: ../lib/python/Screens/ChannelSelection.py:107
 msgid "disable move mode"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1075
+#: ../lib/python/Screens/TimerEntry.py:99
+#: ../lib/python/Screens/InfoBarGenerics.py:1326
 msgid "do nothing"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1077
+#: ../lib/python/Screens/InfoBarGenerics.py:1328
 msgid "don't record"
 msgstr ""
 
@@ -1309,27 +1594,27 @@ msgstr ""
 msgid "done!"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:565
+#: ../lib/python/Components/NimManager.py:570
 msgid "empty/unknown"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:83
+#: ../lib/python/Screens/ChannelSelection.py:103
 msgid "enable bouquet edit"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:85
+#: ../lib/python/Screens/ChannelSelection.py:105
 msgid "enable favourite edit"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:79
+#: ../lib/python/Screens/ChannelSelection.py:100
 msgid "enable move mode"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:90
+#: ../lib/python/Screens/ChannelSelection.py:110
 msgid "end bouquet edit"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:93
+#: ../lib/python/Screens/ChannelSelection.py:113
 msgid "end favourites edit"
 msgstr ""
 
@@ -1341,24 +1626,40 @@ msgstr ""
 msgid "full /etc directory"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:303
+#: ../lib/python/Screens/TimerEntry.py:99
+msgid "go to deep standby"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBar.py:64
+msgid "hear radio..."
+msgstr ""
+
+#: ../lib/python/Screens/MediaPlayer.py:304
+msgid "hide player"
+msgstr ""
+
+#: ../lib/python/Screens/ScanSetup.py:367
 msgid "horizontal"
 msgstr ""
 
-#: ../lib/python/Screens/Ci.py:220
+#: ../lib/python/Screens/Ci.py:318 ../lib/python/Screens/Ci.py:340
 msgid "init module"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBar.py:85
+#: ../lib/python/Screens/InfoBar.py:98
 msgid "leave movie player..."
 msgstr ""
 
+#: ../lib/python/Screens/InfoBarGenerics.py:1387
+msgid "left"
+msgstr ""
+
 #: ../lib/python/Screens/PluginBrowser.py:100
 #: ../lib/python/Screens/PluginBrowser.py:102
 msgid "list"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:674
+#: ../lib/python/Components/NimManager.py:707
 msgid "manual"
 msgstr ""
 
@@ -1367,30 +1668,32 @@ msgstr ""
 msgid "mins"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:257
+#: ../lib/python/Screens/InfoBarGenerics.py:260
 msgid "next channel"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:259
+#: ../lib/python/Screens/InfoBarGenerics.py:262
 msgid "next channel in history"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:312
-#: ../lib/python/Screens/ScanSetup.py:326
-#: ../lib/python/Screens/ScanSetup.py:331
-#: ../lib/python/Screens/ScanSetup.py:545
-#: ../lib/python/Screens/ScanSetup.py:548
-#: ../lib/python/Screens/TimerEntry.py:112
+#: ../lib/python/Screens/ScanSetup.py:346
+#: ../lib/python/Screens/ScanSetup.py:378
+#: ../lib/python/Screens/ScanSetup.py:392
+#: ../lib/python/Screens/ScanSetup.py:397
+#: ../lib/python/Screens/ScanSetup.py:689
+#: ../lib/python/Screens/ScanSetup.py:691
+#: ../lib/python/Screens/ScanSetup.py:698
+#: ../lib/python/Screens/TimerEntry.py:116
 #: ../lib/python/Components/Network.py:145
-#: ../lib/python/Components/RecordingConfig.py:7
+#: ../lib/python/Components/RecordingConfig.py:8
 msgid "no"
 msgstr ""
 
-#: ../lib/python/Screens/HarddiskSetup.py:63
+#: ../lib/python/Screens/HarddiskSetup.py:69
 msgid "no HDD found"
 msgstr ""
 
-#: ../lib/python/Screens/Ci.py:218
+#: ../lib/python/Screens/Ci.py:316 ../lib/python/Screens/Ci.py:338
 msgid "no module found"
 msgstr ""
 
@@ -1398,19 +1701,19 @@ msgstr ""
 msgid "none"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:301
-#: ../lib/python/Screens/ScanSetup.py:308
-#: ../lib/python/Screens/ScanSetup.py:316
+#: ../lib/python/Screens/ScanSetup.py:365
+#: ../lib/python/Screens/ScanSetup.py:374
+#: ../lib/python/Screens/ScanSetup.py:382
 msgid "off"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:301
-#: ../lib/python/Screens/ScanSetup.py:308
-#: ../lib/python/Screens/ScanSetup.py:316
+#: ../lib/python/Screens/ScanSetup.py:365
+#: ../lib/python/Screens/ScanSetup.py:374
+#: ../lib/python/Screens/ScanSetup.py:382
 msgid "on"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:96
+#: ../lib/python/Screens/TimerEntry.py:100
 msgid "once"
 msgstr ""
 
@@ -1418,23 +1721,39 @@ msgstr ""
 msgid "only /etc/enigma2 directory"
 msgstr ""
 
+#: ../lib/python/Screens/InfoBarGenerics.py:263
+msgid "open servicelist"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:258
+msgid "open servicelist(down)"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:257
+msgid "open servicelist(up)"
+msgstr ""
+
 #: ../lib/python/Components/ServiceScan.py:75
 msgid "pass"
 msgstr ""
 
-#: ../lib/python/Screens/Ci.py:84
+#: ../lib/python/Screens/InfoBarGenerics.py:582
+msgid "pause"
+msgstr ""
+
+#: ../lib/python/Screens/Ci.py:86
 msgid "please press OK when ready"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:256
+#: ../lib/python/Screens/InfoBarGenerics.py:259
 msgid "previous channel"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:258
+#: ../lib/python/Screens/InfoBarGenerics.py:261
 msgid "previous channel in history"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:95
+#: ../lib/python/Screens/TimerEntry.py:98
 msgid "record"
 msgstr ""
 
@@ -1442,18 +1761,27 @@ msgstr ""
 msgid "recording..."
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:74
-msgid "remove bouquet"
+#: ../lib/python/Screens/ChannelSelection.py:87
+msgid "remove all new found flags"
+msgstr ""
+
+#: ../lib/python/Screens/ChannelSelection.py:89
+#: ../lib/python/Screens/ChannelSelection.py:94
+msgid "remove entry"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:72
-msgid "remove service"
+#: ../lib/python/Screens/ChannelSelection.py:91
+msgid "remove new found flag"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:96
+#: ../lib/python/Screens/TimerEntry.py:100
 msgid "repeated"
 msgstr ""
 
+#: ../lib/python/Screens/InfoBarGenerics.py:1387
+msgid "right"
+msgstr ""
+
 #: ../lib/python/Components/ServiceScan.py:37
 #, python-format
 msgid ""
@@ -1484,54 +1812,101 @@ msgstr ""
 msgid "scan state"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:346
+#: ../lib/python/Screens/InfoBarGenerics.py:394
 msgid "show EPG..."
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:317
+#: ../lib/python/Screens/InfoBarGenerics.py:356
 msgid "show event details"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1075
+#: ../lib/python/Screens/InfoBarGenerics.py:588
+msgid "skip backward"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:585
+msgid "skip forward"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:897
+msgid "start timeshift"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1387
+msgid "stereo"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1326
 msgid "stop recording"
 msgstr ""
 
-#: ../lib/python/Screens/Wizard.py:225 ../lib/python/Screens/Wizard.py:226
+#: ../lib/python/Screens/InfoBarGenerics.py:898
+msgid "stop timeshift"
+msgstr ""
+
+#: ../lib/python/Screens/MediaPlayer.py:301
+msgid "switch to filelist"
+msgstr ""
+
+#: ../lib/python/Screens/MediaPlayer.py:295
+msgid "switch to playlist"
+msgstr ""
+
+#: ../lib/python/Screens/Wizard.py:234 ../lib/python/Screens/Wizard.py:235
 msgid "text"
 msgstr ""
 
-#: ../lib/python/Screens/EventView.py:73
+#: ../lib/python/Screens/MovieSelection.py:39
+msgid "this recording"
+msgstr ""
+
+#: ../lib/python/Screens/EventView.py:80
 msgid "unknown service"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:100
+#: ../lib/python/Screens/TimerEntry.py:104
 msgid "user defined"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:303
+#: ../lib/python/Screens/ScanSetup.py:367
 msgid "vertical"
 msgstr ""
 
+#: ../lib/python/Screens/InfoBarGenerics.py:1033
+msgid "view extensions..."
+msgstr ""
+
+#: ../lib/python/Screens/InfoBar.py:63
+msgid "view recordings..."
+msgstr ""
+
 #: ../lib/python/Components/TimerList.py:57
 msgid "waiting"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:100
+#: ../lib/python/Screens/TimerEntry.py:104
 msgid "weekly"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:312
-#: ../lib/python/Screens/ScanSetup.py:326
-#: ../lib/python/Screens/ScanSetup.py:331
-#: ../lib/python/Screens/ScanSetup.py:545
-#: ../lib/python/Screens/ScanSetup.py:548
-#: ../lib/python/Screens/TimerEntry.py:112
+#: ../lib/python/Screens/ScanSetup.py:346
+#: ../lib/python/Screens/ScanSetup.py:378
+#: ../lib/python/Screens/ScanSetup.py:392
+#: ../lib/python/Screens/ScanSetup.py:397
+#: ../lib/python/Screens/ScanSetup.py:689
+#: ../lib/python/Screens/ScanSetup.py:691
+#: ../lib/python/Screens/ScanSetup.py:698
+#: ../lib/python/Screens/TimerEntry.py:116
 #: ../lib/python/Components/Network.py:145
-#: ../lib/python/Components/RecordingConfig.py:7
+#: ../lib/python/Components/RecordingConfig.py:8
 msgid "yes"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:95
+#: ../lib/python/Screens/ScanSetup.py:346
+#: ../lib/python/Screens/ScanSetup.py:689
+msgid "yes (keep feeds)"
+msgstr ""
+
+#: ../lib/python/Screens/TimerEntry.py:98
 msgid "zap"
 msgstr ""
 
@@ -1559,10 +1934,6 @@ msgstr ""
 msgid "Games / Plugins"
 msgstr ""
 
-#: ../data/
-msgid "Hide error windows"
-msgstr ""
-
 #: ../data/
 msgid "help..."
 msgstr ""
@@ -1571,16 +1942,17 @@ msgstr ""
 msgid "Yes, backup my settings!"
 msgstr ""
 
-#: ../data/
-msgid "Restoring the settings is done. Please press OK to activate the restored settings now."
-msgstr ""
-
 #: ../data/
 msgid "Satconfig"
 msgstr ""
 
 #: ../data/
-msgid "You need a PC connected to your dreambox. If you need further instructions, please visit the website http://www.dm7025.de.\nYour dreambox will now be halted. After you have performed the update instructions from the website, your new firmware will ask you to restore your settings."
+msgid ""
+"You need a PC connected to your dreambox. If you need further instructions, "
+"please visit the website http://www.dm7025.de.\n"
+"Your dreambox will now be halted. After you have performed the update "
+"instructions from the website, your new firmware will ask you to restore "
+"your settings."
 msgstr ""
 
 #: ../data/
@@ -1600,7 +1972,7 @@ msgid "TV System"
 msgstr ""
 
 #: ../data/
-msgid "#ffffff"
+msgid "Alternative radio mode"
 msgstr ""
 
 #: ../data/
@@ -1608,7 +1980,9 @@ msgid "NEXT"
 msgstr ""
 
 #: ../data/
-msgid "You do not seem to have a harddisk in your Dreambox. So backing up to a harddisk is not an option for you."
+msgid ""
+"You do not seem to have a harddisk in your Dreambox. So backing up to a "
+"harddisk is not an option for you."
 msgstr ""
 
 #: ../data/
@@ -1616,7 +1990,7 @@ msgid "Deep Standby"
 msgstr ""
 
 #: ../data/
-msgid "Netmask"
+msgid "Show positioner movement"
 msgstr ""
 
 #: ../data/
@@ -1632,15 +2006,9 @@ msgid "Sound"
 msgstr ""
 
 #: ../data/
-msgid "Use the up/down keys on your remote control to select an option. After that, press OK."
-msgstr ""
-
-#: ../data/
-msgid "No, just start my dreambox"
-msgstr ""
-
-#: ../data/
-msgid "Show Satposition"
+msgid ""
+"Use the up/down keys on your remote control to select an option. After that, "
+"press OK."
 msgstr ""
 
 #: ../data/
@@ -1655,10 +2023,6 @@ msgstr ""
 msgid "#000000"
 msgstr ""
 
-#: ../data/
-msgid "Longitude"
-msgstr ""
-
 #: ../data/
 msgid "This is step number 2."
 msgstr ""
@@ -1668,23 +2032,25 @@ msgid "Use wizard to set up basic features"
 msgstr ""
 
 #: ../data/
-msgid "Sat / Dish Setup"
+msgid "Extensions"
 msgstr ""
 
 #: ../data/
-msgid "Visualize positioner movement"
+msgid "#bab329"
 msgstr ""
 
 #: ../data/
-msgid "Configuration Mode"
+msgid "Sat / Dish Setup"
 msgstr ""
 
 #: ../data/
-msgid "You have chosen to backup to an usb drive. Better backup to the harddisk!\nPlease press OK to start the backup now."
+msgid "#ffffff"
 msgstr ""
 
 #: ../data/
-msgid "Audio / Video"
+msgid ""
+"You have chosen to backup to an usb drive. Better backup to the harddisk!\n"
+"Please press OK to start the backup now."
 msgstr ""
 
 #: ../data/
@@ -1695,24 +2061,23 @@ msgstr ""
 msgid "Service Searching"
 msgstr ""
 
-#: ../data/
-msgid "#20294a6b"
-msgstr ""
-
 #: ../data/
 msgid "Mute"
 msgstr ""
 
 #: ../data/
-msgid "Harddisk"
+msgid ""
+"Welcome to the Image upgrade wizard. The wizard will assist you in upgrading "
+"the firmware of your Dreambox by providing a backup facility for your "
+"current settings and a short explanation of how to upgrade your firmware."
 msgstr ""
 
 #: ../data/
-msgid "Welcome to the Image upgrade wizard. The wizard will assist you in upgrading the firmware of your Dreambox by providing a backup facility for your current settings and a short explanation of how to upgrade your firmware."
+msgid "Keyboard Map"
 msgstr ""
 
 #: ../data/
-msgid "Keyboard Map"
+msgid "Enable multiple bouquets"
 msgstr ""
 
 #: ../data/
@@ -1723,24 +2088,16 @@ msgstr ""
 msgid "Dish"
 msgstr ""
 
-#: ../data/
-msgid "Record Splitsize"
-msgstr ""
-
-#: ../data/
-msgid "Auto show inforbar"
-msgstr ""
-
 #: ../data/
 msgid "Margin after record"
 msgstr ""
 
 #: ../data/
-msgid "Network"
+msgid "No, just start my dreambox"
 msgstr ""
 
 #: ../data/
-msgid "Invert"
+msgid "#ffffffff"
 msgstr ""
 
 #: ../data/
@@ -1748,11 +2105,13 @@ msgid "System"
 msgstr ""
 
 #: ../data/
-msgid "use power delta"
+msgid "Use power measurement"
 msgstr ""
 
 #: ../data/
-msgid "Latitude"
+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/
@@ -1764,7 +2123,11 @@ msgid "Manual Scan"
 msgstr ""
 
 #: ../data/
-msgid "Welcome.\n\nThis start wizard will guide you through the basic setup of your Dreambox.\nPress the OK button on your remote control to move to the next step."
+msgid ""
+"Welcome.\n"
+"\n"
+"This start wizard will guide you through the basic setup of your Dreambox.\n"
+"Press the OK button on your remote control to move to the next step."
 msgstr ""
 
 #: ../data/
@@ -1776,11 +2139,7 @@ msgid "SNR:"
 msgstr ""
 
 #: ../data/
-msgid "Subservices"
-msgstr ""
-
-#: ../data/
-msgid "Language selection"
+msgid "Network..."
 msgstr ""
 
 #: ../data/
@@ -1808,11 +2167,11 @@ msgid "Exit the wizard"
 msgstr ""
 
 #: ../data/
-msgid "Fast zapping"
+msgid "OSD Settings"
 msgstr ""
 
 #: ../data/
-msgid "OSD Settings"
+msgid "RF output"
 msgstr ""
 
 #: ../data/
@@ -1836,17 +2195,21 @@ msgid "Compact flash card"
 msgstr ""
 
 #: ../data/
-msgid "Yes, view the tutorial"
+msgid "Record"
 msgstr ""
 
 #: ../data/
-msgid "UHF Modulator"
+msgid "Yes, view the tutorial"
 msgstr ""
 
 #: ../data/
 msgid "Color Format"
 msgstr ""
 
+#: ../data/
+msgid "#f23d21"
+msgstr ""
+
 #: ../data/
 msgid "Plugin browser"
 msgstr ""
@@ -1856,15 +2219,15 @@ msgid "#80000000"
 msgstr ""
 
 #: ../data/
-msgid "Downloadable plugins"
+msgid "Timeshift"
 msgstr ""
 
 #: ../data/
-msgid "Do you want to view a cutlist tutorial?"
+msgid "Downloadable plugins"
 msgstr ""
 
 #: ../data/
-msgid "LCD"
+msgid "Do you want to view a cutlist tutorial?"
 msgstr ""
 
 #: ../data/
@@ -1880,7 +2243,7 @@ msgid "About..."
 msgstr ""
 
 #: ../data/
-msgid "#00ff00"
+msgid "Seek"
 msgstr ""
 
 #: ../data/
@@ -1888,23 +2251,27 @@ msgid "Common Interface"
 msgstr ""
 
 #: ../data/
-msgid "Ask before zapping"
+msgid "Tuner configuration"
 msgstr ""
 
 #: ../data/
-msgid "#c0c000"
+msgid "Language..."
 msgstr ""
 
 #: ../data/
-msgid "A/V Settings"
+msgid ""
+"Restoring the settings is done. Please press OK to activate the restored "
+"settings now."
 msgstr ""
 
 #: ../data/
-msgid "Usage Settings"
+msgid "A/V Settings"
 msgstr ""
 
 #: ../data/
-msgid "By pressing the OK Button on your remote control, the info bar is being displayed."
+msgid ""
+"By pressing the OK Button on your remote control, the info bar is being "
+"displayed."
 msgstr ""
 
 #: ../data/
@@ -1931,10 +2298,6 @@ msgstr ""
 msgid "Soundcarrier"
 msgstr ""
 
-#: ../data/
-msgid "#0000ff"
-msgstr ""
-
 #: ../data/
 msgid "Yes, restore the settings now"
 msgstr ""
@@ -1944,7 +2307,9 @@ msgid "Contrast"
 msgstr ""
 
 #: ../data/
-msgid "You have chosen to backup to your harddisk. Please press OK to start the backup now."
+msgid ""
+"You have chosen to backup to your harddisk. Please press OK to start the "
+"backup now."
 msgstr ""
 
 #: ../data/
@@ -1956,7 +2321,11 @@ msgid "Repeat"
 msgstr ""
 
 #: ../data/
-msgid "You have chosen to backup to a compact flash card. The card must be in the slot. We do not verify if it is really used at the moment. So better backup to the harddisk!\nPlease press OK to start the backup now."
+msgid ""
+"You have chosen to backup to a compact flash card. The card must be in the "
+"slot. We do not verify if it is really used at the moment. So better backup "
+"to the harddisk!\n"
+"Please press OK to start the backup now."
 msgstr ""
 
 #: ../data/
@@ -1968,15 +2337,25 @@ msgid "Somewhere else"
 msgstr ""
 
 #: ../data/
-msgid "Your backup succeeded. We will now continue to explain the further upgrade process."
+msgid "Do you want to do a service scan?"
+msgstr ""
+
+#: ../data/
+msgid "Timer log"
 msgstr ""
 
 #: ../data/
-msgid "Menu"
+msgid ""
+"Your backup succeeded. We will now continue to explain the further upgrade "
+"process."
+msgstr ""
+
+#: ../data/
+msgid "PiPSetup"
 msgstr ""
 
 #: ../data/
-msgid "Parental Lock"
+msgid "Menu"
 msgstr ""
 
 #: ../data/
@@ -2007,10 +2386,6 @@ msgstr ""
 msgid "The backup failed. Please choose a different backup location."
 msgstr ""
 
-#: ../data/
-msgid "Automatic Scan"
-msgstr ""
-
 #: ../data/
 msgid "Keymap"
 msgstr ""
@@ -2020,7 +2395,8 @@ msgid "InfoBar"
 msgstr ""
 
 #: ../data/
-msgid "The wizard can backup your current settings. Do you want to do a backup now?"
+msgid ""
+"The wizard can backup your current settings. Do you want to do a backup now?"
 msgstr ""
 
 #: ../data/
@@ -2032,7 +2408,7 @@ msgid "Media player"
 msgstr ""
 
 #: ../data/
-msgid "Nameserver"
+msgid "Yes, perform a shutdown now."
 msgstr ""
 
 #: ../data/
@@ -2056,11 +2432,7 @@ msgid "WSS on 4:3"
 msgstr ""
 
 #: ../data/
-msgid "IP Address"
-msgstr ""
-
-#: ../data/
-msgid "Skip confirmations"
+msgid "Subservices"
 msgstr ""
 
 #: ../data/
@@ -2096,7 +2468,7 @@ msgid "USB"
 msgstr ""
 
 #: ../data/
-msgid "Timer log"
+msgid "Invert display"
 msgstr ""
 
 #: ../data/
@@ -2107,10 +2479,6 @@ msgstr ""
 msgid "Please set up tuner B"
 msgstr ""
 
-#: ../data/
-msgid "Thank you for using the wizard. Your box is now ready to use.\nPlease press OK to start using you Dreambox."
-msgstr ""
-
 #: ../data/
 msgid "Delay"
 msgstr ""
@@ -2119,32 +2487,20 @@ msgstr ""
 msgid "Select HDD"
 msgstr ""
 
-#: ../data/
-msgid "#ffffffff"
-msgstr ""
-
-#: ../data/
-msgid "Setup Lock"
-msgstr ""
-
 #: ../data/
 msgid "Aspect Ratio"
 msgstr ""
 
 #: ../data/
-msgid "Expert Setup"
-msgstr ""
-
-#: ../data/
-msgid "Language"
+msgid "Recordings always have priority"
 msgstr ""
 
 #: ../data/
-msgid "Use the left and right buttons to change an option.\n\nPlease set up tuner A"
+msgid "Customize"
 msgstr ""
 
 #: ../data/
-msgid "Parental Control"
+msgid "#389416"
 msgstr ""
 
 #: ../data/
@@ -2164,11 +2520,7 @@ msgid "Volume"
 msgstr ""
 
 #: ../data/
-msgid "Multi bouquets"
-msgstr ""
-
-#: ../data/
-msgid "Channel"
+msgid "#33294a6b"
 msgstr ""
 
 #: ../data/
@@ -2204,7 +2556,7 @@ msgid "Timer Editor"
 msgstr ""
 
 #: ../data/
-msgid "Use DHCP"
+msgid "Time/Date Input"
 msgstr ""
 
 #: ../data/
@@ -2216,7 +2568,7 @@ msgid "What do you want to scan?"
 msgstr ""
 
 #: ../data/
-msgid "Usage settings"
+msgid "Now Playing"
 msgstr ""
 
 #: ../data/
@@ -2228,11 +2580,7 @@ msgid "Audio"
 msgstr ""
 
 #: ../data/
-msgid "#ff0000"
-msgstr ""
-
-#: ../data/
-msgid "Do you want to do a service scan?"
+msgid "Harddisk..."
 msgstr ""
 
 #: ../data/
@@ -2240,15 +2588,14 @@ msgid "NOW"
 msgstr ""
 
 #: ../data/
-msgid "Yes, perform a shutdown now."
-msgstr ""
-
-#: ../data/
-msgid "Seek"
+msgid ""
+"Use the left and right buttons to change an option.\n"
+"\n"
+"Please set up tuner A"
 msgstr ""
 
 #: ../data/
-msgid "Satelliteconfig"
+msgid "#0064c7"
 msgstr ""
 
 #: ../data/
@@ -2258,7 +2605,3 @@ msgstr ""
 #: ../data/
 msgid "Do you want to do another manual service scan?"
 msgstr ""
-
-#: ../data/
-msgid "Gateway"
-msgstr ""