update swedish translation

[enigma2.git] / po / en.po

diff --git a/po/en.po b/po/en.po
index 2096904c0ce3e902c42a680d08dd78a647dc835b..6e570aaab7f0cdb909ace659a2652baad39cd991 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-03-22 21:46+0000\n"
+"POT-Creation-Date: 2006-10-11 17:12+0200\n"
 "PO-Revision-Date: 2005-11-17 20:53+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\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:94
+#: ../lib/python/Screens/TimerEntry.py:97
+#: ../lib/python/Screens/TimeDateInput.py:35
 msgid "%d.%B %Y"
 msgstr ""
 
@@ -57,134 +58,164 @@ msgstr ""
 msgid "/var directory"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:711
+#: ../lib/python/Components/NimManager.py:763
 msgid "0 V"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:714
+#: ../lib/python/Components/NimManager.py:766
 msgid "1.0"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:714
+#: ../lib/python/Components/NimManager.py:766
 msgid "1.1"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:714
+#: ../lib/python/Components/NimManager.py:766
 msgid "1.2"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:711
+#: ../lib/python/Components/NimManager.py:763
 msgid "12 V"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:142
+#: ../lib/python/Screens/Satconfig.py:138
 msgid "12V Output"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:690
+#: ../lib/python/Components/NimManager.py:741
 msgid "13 V"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:690
+#: ../lib/python/Components/NimManager.py:741
 msgid "18 V"
 msgstr ""
 
+#: ../lib/python/Components/ParentalControl.py:14
+msgid "30 minutes"
+msgstr ""
+
+#: ../lib/python/Components/ParentalControl.py:14
+msgid "5 minutes"
+msgstr ""
+
+#: ../lib/python/Components/ParentalControl.py:14
+msgid "60 minutes"
+msgstr ""
+
 #: ../lib/python/Components/TimerList.py:66
 msgid "<unknown>"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:713
+#: ../lib/python/Screens/Setup.py:118
+msgid "??"
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:765
 msgid "A"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1114
+#: ../lib/python/Screens/InfoBarGenerics.py:1334
 msgid ""
 "A recording is currently running.\n"
 "What do you want to do?"
 msgstr ""
 
-#: ../RecordTimer.py:141
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:511
+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:696
+#: ../lib/python/Components/NimManager.py:747
 msgid "AA"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:696
+#: ../lib/python/Components/NimManager.py:747
 msgid "AB"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:166
-msgid "AGC"
+#: ../lib/python/Screens/InfoBarGenerics.py:1173
+msgid "Activate Picture in Picture"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEdit.py:28
+#: ../lib/python/Screens/TimerEdit.py:25
 msgid "Add"
 msgstr ""
 
-#: ../lib/python/Screens/EventView.py:26
-#: ../lib/python/Screens/EpgSelection.py:48
+#: ../lib/python/Screens/MediaPlayer.py:388
+msgid "Add files to playlist"
+msgstr ""
+
+#: ../lib/python/Screens/EventView.py:32
+#: ../lib/python/Screens/EpgSelection.py:59
 msgid "Add timer"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:633
-#: ../lib/python/Components/NimManager.py:641
 #: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:31
 msgid "Advanced"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:430
-#: ../lib/python/Screens/ChannelSelection.py:576
-msgid "All"
+#: ../lib/python/Screens/TimerEntry.py:177
+msgid "After event"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:104
-msgid "Apply satellite"
+#: ../lib/python/Screens/MediaPlayer.py:51
+msgid "Album:"
 msgstr ""
 
-#: ../lib/python/Components/Language.py:15
+#: ../lib/python/Screens/ChannelSelection.py:497
+#: ../lib/python/Screens/ChannelSelection.py:647
+msgid "All"
+msgstr ""
+
+#: ../lib/python/Components/Language.py:16
 msgid "Arabic"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:216
-#: ../lib/python/Screens/ScanSetup.py:219
-#: ../lib/python/Screens/ScanSetup.py:223
-#: ../lib/python/Screens/ScanSetup.py:224
-#: ../lib/python/Screens/ScanSetup.py:225
-#: ../lib/python/Screens/ScanSetup.py:231
-#: ../lib/python/Screens/ScanSetup.py:232
-#: ../lib/python/Screens/ScanSetup.py:233
-#: ../lib/python/Screens/ScanSetup.py:234
-#: ../lib/python/Screens/ScanSetup.py:235
-#: ../lib/python/Screens/ScanSetup.py:236
-#: ../lib/python/Screens/ScanSetup.py:237
-#: ../lib/python/Screens/ScanSetup.py:238
+#: ../lib/python/Screens/MediaPlayer.py:47
+msgid "Artist:"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1344
+msgid "Audio Options..."
+msgstr ""
+
+#: ../lib/python/Screens/ScanSetup.py:361
+#: ../lib/python/Screens/ScanSetup.py:364
+#: ../lib/python/Screens/ScanSetup.py:370
+#: ../lib/python/Screens/ScanSetup.py:372
+#: ../lib/python/Screens/ScanSetup.py:378
+#: ../lib/python/Screens/ScanSetup.py:382
+#: ../lib/python/Screens/ScanSetup.py:383
+#: ../lib/python/Screens/ScanSetup.py:384
+#: ../lib/python/Screens/ScanSetup.py:385
+#: ../lib/python/Screens/ScanSetup.py:386
+#: ../lib/python/Screens/ScanSetup.py:387 ../lib/python/Screens/Ci.py:22
 msgid "Auto"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:447 ../data/
+#: ../lib/python/Screens/ScanSetup.py:602 ../data/
 msgid "Automatic Scan"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:713
+#: ../lib/python/Components/NimManager.py:765
 msgid "B"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:696
+#: ../lib/python/Components/NimManager.py:747
 msgid "BA"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:696
+#: ../lib/python/Components/NimManager.py:747
 msgid "BB"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:168
-msgid "BER"
-msgstr ""
-
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:76
 msgid "Backup"
 msgstr ""
@@ -197,11 +228,11 @@ msgstr ""
 msgid "Backup Mode"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:691
+#: ../lib/python/Components/NimManager.py:742
 msgid "Band"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:151
+#: ../lib/python/Screens/ScanSetup.py:244
 msgid "Bandwidth"
 msgstr ""
 
@@ -209,7 +240,7 @@ msgstr ""
 msgid "Bus: "
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:707
+#: ../lib/python/Components/NimManager.py:759
 msgid "C-Band"
 msgstr ""
 
@@ -217,13 +248,14 @@ msgstr ""
 msgid "CF Drive"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:66
-msgid "Cable provider"
+#: ../lib/python/Screens/ChannelSelection.py:760
+msgid "Cable"
 msgstr ""
 
-#: ../lib/python/Screens/Setup.py:110 ../lib/python/Screens/TimerEntry.py:24
+#: ../lib/python/Screens/Setup.py:85 ../lib/python/Screens/TimerEntry.py:29
+#: ../lib/python/Screens/TimeDateInput.py:16
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:75
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:165
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:166
 msgid "Cancel"
 msgstr ""
 
@@ -231,11 +263,32 @@ msgstr ""
 msgid "Capacity: "
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:190 ../data/
+#: ../lib/python/Components/Language.py:17
+msgid "Catalan"
+msgstr ""
+
+#: ../lib/python/Screens/ChannelSelection.py:146
+#: ../lib/python/Screens/ParentalControlSetup.py:22 ../data/
+msgid "Change pin code"
+msgstr ""
+
+#: ../lib/python/Screens/ParentalControlSetup.py:79
+msgid "Change service pin"
+msgstr ""
+
+#: ../lib/python/Screens/ParentalControlSetup.py:76
+msgid "Change service pins"
+msgstr ""
+
+#: ../lib/python/Screens/ParentalControlSetup.py:70
+msgid "Change setup pin"
+msgstr ""
+
+#: ../lib/python/Screens/TimerEntry.py:179 ../data/
 msgid "Channel"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:145
+#: ../lib/python/Screens/InfoBarGenerics.py:148
 msgid "Channel:"
 msgstr ""
 
@@ -243,46 +296,51 @@ msgstr ""
 msgid "Choose source"
 msgstr ""
 
-#: ../lib/python/Components/SetupDevices.py:21
-msgid "Classic"
+#: ../lib/python/Screens/TimerEdit.py:27
+msgid "Cleanup"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEdit.py:30
-msgid "Cleanup"
+#: ../lib/python/Screens/ScanSetup.py:210
+#: ../lib/python/Screens/ScanSetup.py:215
+#: ../lib/python/Screens/ScanSetup.py:237
+#: ../lib/python/Screens/ScanSetup.py:252
+#: ../lib/python/Screens/ScanSetup.py:588
+msgid "Clear before scan"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:312
+#: ../lib/python/Screens/TimerEntry.py:315
 msgid "Clear log"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:152
+#: ../lib/python/Screens/ScanSetup.py:245
 msgid "Code rate high"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:153
+#: ../lib/python/Screens/ScanSetup.py:246
 msgid "Code rate low"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:122
-#: ../lib/python/Screens/Satconfig.py:124
+#: ../lib/python/Screens/Satconfig.py:118
+#: ../lib/python/Screens/Satconfig.py:120
 msgid "Command order"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:118
+#: ../lib/python/Screens/Satconfig.py:114
 msgid "Committed DiSEqC command"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:197
-#: ../lib/python/Screens/ScanSetup.py:198
+#: ../lib/python/Screens/ScanSetup.py:340
+#: ../lib/python/Screens/ScanSetup.py:341
+#: ../lib/python/Components/NimManager.py:789
 msgid "Complete"
 msgstr ""
 
 #: ../lib/python/Screens/Satconfig.py:47
-#: ../lib/python/Screens/Satconfig.py:147 ../data/
+#: ../lib/python/Screens/Satconfig.py:143 ../data/
 msgid "Configuration Mode"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEdit.py:192
+#: ../lib/python/Screens/TimerEdit.py:208
 msgid "Conflicting timer"
 msgstr ""
 
@@ -290,23 +348,35 @@ msgstr ""
 msgid "Current version:"
 msgstr ""
 
-#: ../lib/python/Components/SetupDevices.py:21
-msgid "Default"
+#: ../lib/python/Screens/ScanSetup.py:359
+msgid "DVB-S"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEdit.py:27
+#: ../lib/python/Screens/ScanSetup.py:359
+msgid "DVB-S2"
+msgstr ""
+
+#: ../lib/python/Components/Language.py:18
+msgid "Danish"
+msgstr ""
+
+#: ../lib/python/Screens/TimeDateInput.py:40
+msgid "Date"
+msgstr ""
+
+#: ../lib/python/Screens/TimerEdit.py:24
 msgid "Delete"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:309
+#: ../lib/python/Screens/TimerEntry.py:312
 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:130
 msgid "Description"
 msgstr ""
 
@@ -318,11 +388,11 @@ msgstr ""
 msgid "Detected NIMs:"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:655
+#: ../lib/python/Components/NimManager.py:697
 msgid "DiSEqC A/B"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:655
+#: ../lib/python/Components/NimManager.py:698
 msgid "DiSEqC A/B/C/D"
 msgstr ""
 
@@ -330,34 +400,35 @@ msgstr ""
 msgid "DiSEqC Mode"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:114
+#: ../lib/python/Screens/Satconfig.py:110
 msgid "DiSEqC mode"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:126
+#: ../lib/python/Screens/Satconfig.py:122
 msgid "DiSEqC repeats"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:127
-#: ../lib/python/Screens/TimerEdit.py:76 ../lib/python/Components/Lcd.py:31
-#: ../lib/python/Components/SetupDevices.py:38
-#: ../lib/python/Components/SetupDevices.py:39
-#: ../lib/python/Components/SetupDevices.py:43
-#: ../lib/python/Components/SetupDevices.py:44
-#: ../lib/python/Components/SetupDevices.py:45
-#: ../lib/python/Components/SetupDevices.py:46
-#: ../lib/python/Components/SetupDevices.py:47
+#: ../lib/python/Screens/TimerEdit.py:81
 msgid "Disable"
 msgstr ""
 
+#: ../lib/python/Screens/InfoBarGenerics.py:1171
+msgid "Disable Picture in Picture"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1128
+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
@@ -366,12 +437,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:1614
+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 ""
@@ -391,11 +472,11 @@ msgstr ""
 msgid "Downloading plugin information. Please wait..."
 msgstr ""
 
-#: ../lib/python/Components/Language.py:16
+#: ../lib/python/Components/Language.py:19
 msgid "Dutch"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:690
+#: ../lib/python/Screens/ChannelSelection.py:768
 msgid "E"
 msgstr ""
 
@@ -404,39 +485,47 @@ msgstr ""
 msgid "ERROR - failed to scan (%s)!"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:662
-#: ../lib/python/Components/NimManager.py:723
+#: ../lib/python/Components/NimManager.py:711
+#: ../lib/python/Components/NimManager.py:782
 msgid "East"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:127
-#: ../lib/python/Screens/TimerEdit.py:74 ../lib/python/Components/Lcd.py:31
-#: ../lib/python/Components/SetupDevices.py:38
-#: ../lib/python/Components/SetupDevices.py:39
-#: ../lib/python/Components/SetupDevices.py:43
-#: ../lib/python/Components/SetupDevices.py:44
-#: ../lib/python/Components/SetupDevices.py:45
-#: ../lib/python/Components/SetupDevices.py:46
-#: ../lib/python/Components/SetupDevices.py:47
+#: ../lib/python/Screens/ParentalControlSetup.py:82
+msgid "Edit services list"
+msgstr ""
+
+#: ../lib/python/Screens/TimerEdit.py:79
 msgid "Enable"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:184
+#: ../lib/python/Screens/Satconfig.py:72
+msgid "Enable 5V for active antenna"
+msgstr ""
+
+#: ../lib/python/Screens/ParentalControlSetup.py:64
+msgid "Enable parental control"
+msgstr ""
+
+#: ../lib/python/Screens/TimerEntry.py:167
 msgid "End"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:188
+#: ../lib/python/Screens/TimerEntry.py:174
 msgid "EndTime"
 msgstr ""
 
-#: ../lib/python/Screens/LanguageSelection.py:45
-#: ../lib/python/Components/SetupDevices.py:24
-#: ../lib/python/Components/Language.py:13
+#: ../lib/python/Screens/LanguageSelection.py:53
+#: ../lib/python/Components/SetupDevices.py:15
+#: ../lib/python/Components/Language.py:14
 msgid "English"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:636
-msgid "Equal to Socket A"
+#: ../lib/python/Screens/InfoBarGenerics.py:340
+msgid "Enter main menu..."
+msgstr ""
+
+#: ../lib/python/Screens/ChannelSelection.py:146
+msgid "Enter the service pin"
 msgstr ""
 
 #: ../lib/python/Screens/Console.py:41
@@ -447,37 +536,44 @@ msgstr ""
 msgid "Execution finished!!"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1181
-msgid "Extensions"
-msgstr ""
-
-#: ../lib/python/Screens/ScanSetup.py:114
-#: ../lib/python/Screens/ScanSetup.py:142
+#: ../lib/python/Screens/ScanSetup.py:202
+#: ../lib/python/Screens/ScanSetup.py:204
+#: ../lib/python/Screens/ScanSetup.py:234
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:404
 msgid "FEC"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:119
+#: ../lib/python/Screens/Satconfig.py:115
 msgid "Fast DiSEqC"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:433
+#: ../lib/python/Screens/ChannelSelection.py:500
 msgid "Favourites"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:110
-#: ../lib/python/Screens/ScanSetup.py:138
-#: ../lib/python/Screens/ScanSetup.py:149
-#: ../lib/python/Screens/TimerEntry.py:156
+#: ../lib/python/Components/Language.py:20
+msgid "Finnish"
+msgstr ""
+
+#: ../lib/python/Components/Language.py:21
+msgid "French"
+msgstr ""
+
+#: ../lib/python/Screens/ScanSetup.py:197
+#: ../lib/python/Screens/ScanSetup.py:230
+#: ../lib/python/Screens/ScanSetup.py:241
+#: ../lib/python/Screens/TimerEntry.py:139
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:400
 msgid "Frequency"
 msgstr "Frequency"
 
-#: ../lib/python/Screens/EpgSelection.py:187
+#: ../lib/python/Screens/EpgSelection.py:234
 #: ../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:100
+#: ../lib/python/Screens/TimerEntry.py:153
 msgid "Friday"
 msgstr ""
 
@@ -490,12 +586,16 @@ msgstr ""
 msgid "Function not yet implemented"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:45 ../data/
+#: ../lib/python/Screens/NetworkSetup.py:32 ../data/
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../lib/python/Components/SetupDevices.py:24
-#: ../lib/python/Components/Language.py:14
+#: ../lib/python/Screens/MediaPlayer.py:55
+msgid "Genre:"
+msgstr ""
+
+#: ../lib/python/Components/SetupDevices.py:15
+#: ../lib/python/Components/Language.py:15
 msgid "German"
 msgstr ""
 
@@ -503,11 +603,16 @@ msgstr ""
 msgid "Getting plugin information. Please wait..."
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:106
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:133
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:191
+msgid "Goto 0"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:188
 msgid "Goto position"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:156
+#: ../lib/python/Screens/ScanSetup.py:249
 msgid "Guard interval mode"
 msgstr ""
 
@@ -516,28 +621,37 @@ msgstr ""
 msgid "Harddisk"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:157
+#: ../lib/python/Screens/ScanSetup.py:250
 msgid "Hierarchy mode"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1088
-#: ../lib/python/Screens/InfoBarGenerics.py:1096
+#: ../lib/python/Screens/InfoBarGenerics.py:1310
+#: ../lib/python/Screens/InfoBarGenerics.py:1318
 msgid "How many minutes do you want to record?"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:42 ../data/
+#: ../lib/python/Screens/NetworkSetup.py:29 ../data/
 msgid "IP Address"
 msgstr "IP Address"
 
+#: ../lib/python/Components/Language.py:22
+msgid "Icelandic"
+msgstr ""
+
 #: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:29
 msgid "Image-Upgrade"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:143
+#: ../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:139
 msgid "Increased voltage"
 msgstr ""
 
-#: ../lib/python/Screens/Ci.py:214
+#: ../lib/python/Screens/Ci.py:295
 msgid "Init"
 msgstr ""
 
@@ -549,86 +663,112 @@ msgstr ""
 msgid "Initializing Harddisk..."
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:111
-#: ../lib/python/Screens/ScanSetup.py:139
-#: ../lib/python/Screens/ScanSetup.py:150
+#: ../lib/python/Screens/InputBox.py:14 ../data/
+msgid "Input"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1220
+msgid "Instant Record..."
+msgstr ""
+
+#: ../lib/python/Screens/ScanSetup.py:198
+#: ../lib/python/Screens/ScanSetup.py:231
+#: ../lib/python/Screens/ScanSetup.py:243
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:401
 msgid "Inversion"
 msgstr "Inversion"
 
-#: ../lib/python/Screens/Satconfig.py:111
+#: ../lib/python/Components/Language.py:23
+msgid "Italian"
+msgstr ""
+
+#: ../lib/python/Screens/Satconfig.py:107
 msgid "LNB"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:136
+#: ../lib/python/Screens/Satconfig.py:132
 msgid "LOF"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:140
+#: ../lib/python/Screens/Satconfig.py:136
 msgid "LOF/H"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:139
+#: ../lib/python/Screens/Satconfig.py:135
 msgid "LOF/L"
 msgstr ""
 
-#: ../lib/python/Screens/LanguageSelection.py:40 ../data/
+#: ../lib/python/Screens/LanguageSelection.py:48 ../data/
 msgid "Language selection"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:28
-#: ../lib/python/Screens/Satconfig.py:130 ../data/
+#: ../lib/python/Screens/Satconfig.py:26
+#: ../lib/python/Screens/Satconfig.py:126 ../data/
 msgid "Latitude"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:100
+#: ../lib/python/Screens/InfoBarGenerics.py:1384
+msgid "Left"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:183
 msgid "Limit east"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:101
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:182
 msgid "Limit west"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:99
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:181
 msgid "Limits off"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:26
-#: ../lib/python/Screens/Satconfig.py:128 ../data/
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:184
+msgid "Limits on"
+msgstr ""
+
+#: ../lib/python/Screens/Satconfig.py:24
+#: ../lib/python/Screens/Satconfig.py:124 ../data/
 msgid "Longitude"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:637
-msgid "Loopthrough to Socket A"
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:421
+msgid "Manual transponder"
 msgstr ""
 
 #: ../lib/python/Screens/HarddiskSetup.py:29
 msgid "Model: "
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:141
-#: ../lib/python/Screens/ScanSetup.py:154
+#: ../lib/python/Screens/ScanSetup.py:205
+#: ../lib/python/Screens/ScanSetup.py:233
+#: ../lib/python/Screens/ScanSetup.py:247
 msgid "Modulation"
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:187
+#: ../lib/python/Screens/EpgSelection.py:234
 #: ../lib/python/Components/TimerList.py:34
 msgid "Mon"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:100
+#: ../lib/python/Screens/TimerEntry.py:92
 msgid "Mon-Fri"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:108
-#: ../lib/python/Screens/TimerEntry.py:166
+#: ../lib/python/Screens/TimerEntry.py:100
+#: ../lib/python/Screens/TimerEntry.py:149
 msgid "Monday"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:94
+#: ../lib/python/Screens/InfoBarGenerics.py:1179
+msgid "Move Picture in Picture"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:174
 msgid "Move east"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:97
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:171
 msgid "Move west"
 msgstr ""
 
@@ -636,94 +776,121 @@ 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:196
+#: ../lib/python/Screens/Ci.py:306
+msgid "Multiple service support"
+msgstr ""
+
+#: ../lib/python/Screens/ScanSetup.py:339
 msgid "Multisat"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:483
+#: ../lib/python/Components/NimManager.py:480
 msgid "N/A"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:146
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:491
+msgid "NIM "
+msgstr ""
+
+#: ../lib/python/Screens/TimerEntry.py:129
 msgid "Name"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:46 ../data/
+#: ../lib/python/Screens/NetworkSetup.py:33 ../data/
 msgid "Nameserver"
 msgstr "Nameserver"
 
-#: ../lib/python/Screens/NetworkSetup.py:44 ../data/
+#: ../lib/python/Screens/NetworkSetup.py:31 ../data/
 msgid "Netmask"
 msgstr "Netmask"
 
-#: ../lib/python/Screens/ScanSetup.py:143
+#: ../lib/python/Screens/ScanSetup.py:235
+#: ../lib/python/Screens/ScanSetup.py:242
 msgid "Network scan"
 msgstr ""
 
+#: ../lib/python/Screens/ChannelSelection.py:752
+msgid "New"
+msgstr ""
+
+#: ../lib/python/Screens/ParentalControlSetup.py:218
+msgid "New pin"
+msgstr ""
+
 #: ../lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/plugin.py:33
 msgid "New version:"
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:34
+#: ../lib/python/Screens/EpgSelection.py:45
 msgid "Next"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:692
-#: ../lib/python/Components/NimManager.py:712
-#: ../lib/python/Components/NimManager.py:716
-#: ../lib/python/Components/NimManager.py:717
-#: ../lib/python/Components/NimManager.py:726
+#: ../lib/python/Screens/Ci.py:22
 msgid "No"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1110
+#: ../lib/python/Screens/InfoBarGenerics.py:1330
 msgid "No HDD found or HDD not initialized!"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1067
+#: ../lib/python/Screens/InfoBarGenerics.py:1263
 msgid "No event info found, recording indefinitely."
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:219
-#: ../lib/python/Screens/ScanSetup.py:225
-#: ../lib/python/Screens/ScanSetup.py:233
-#: ../lib/python/Screens/ScanSetup.py:234
-#: ../lib/python/Screens/ScanSetup.py:238
-#: ../lib/python/Components/NimManager.py:696
-#: ../lib/python/Components/NimManager.py:700
-#: ../lib/python/Components/NimManager.py:713
-#: ../lib/python/Components/NimManager.py:714
-#: ../lib/python/Components/NimManager.py:721
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:508
+msgid "No positioner capable frontend found."
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:523
+msgid "No tuner is configured for use with a diseqc positioner!"
+msgstr ""
+
+#: ../lib/python/Screens/ScanSetup.py:364
+#: ../lib/python/Screens/ScanSetup.py:372
+#: ../lib/python/Screens/ScanSetup.py:387
+#: ../lib/python/Components/NimManager.py:747
+#: ../lib/python/Components/NimManager.py:751
+#: ../lib/python/Components/NimManager.py:765
+#: ../lib/python/Components/NimManager.py:766
+#: ../lib/python/Components/NimManager.py:780
 msgid "None"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:664
-#: ../lib/python/Components/NimManager.py:725
+#: ../lib/python/Components/NimManager.py:713
+#: ../lib/python/Components/NimManager.py:784
 msgid "North"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:638
-msgid "Nothing connected"
+#: ../lib/python/Components/Language.py:24
+msgid "Norwegian"
 msgstr ""
 
-#: ../lib/python/Screens/Setup.py:109 ../lib/python/Screens/TimerEntry.py:23
+#: ../lib/python/Screens/ScanSetup.py:560
+#: ../lib/python/Screens/ScanSetup.py:668
+msgid ""
+"Nothing to scan!\n"
+"Please setup your tuner settings before you start a service scan."
+msgstr ""
+
+#: ../lib/python/Screens/Setup.py:84 ../lib/python/Screens/TimerEntry.py:28
+#: ../lib/python/Screens/TimeDateInput.py:15
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:74
 msgid "OK"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:691
+#: ../lib/python/Components/NimManager.py:742
 msgid "Off"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:691
+#: ../lib/python/Components/NimManager.py:742
 msgid "On"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:721
+#: ../lib/python/Components/NimManager.py:780
 msgid "One"
 msgstr ""
 
@@ -735,91 +902,172 @@ msgstr ""
 msgid "Packet management"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBar.py:40
+#: ../lib/python/Components/ParentalControl.py:80 ../data/
+msgid "Parental control"
+msgstr ""
+
+#: ../lib/python/Screens/ParentalControlSetup.py:74
+msgid "Parental control type"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBar.py:48
 msgid "Play recorded movies..."
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:106
+#: ../lib/python/Screens/InfoBarGenerics.py:1093
+msgid "Please choose an extension..."
+msgstr ""
+
+#: ../lib/python/Screens/ChannelSelection.py:134
 msgid "Please enter a name for the new bouquet"
 msgstr ""
 
-#: ../lib/python/Screens/MovieSelection.py:77
+#: ../lib/python/Screens/ChannelSelection.py:183
+msgid "Please enter a name for the new marker"
+msgstr ""
+
+#: ../lib/python/Screens/ParentalControlSetup.py:28
+msgid "Please enter the correct pin code"
+msgstr ""
+
+#: ../lib/python/Screens/ParentalControlSetup.py:232
+msgid "Please enter the old pin code"
+msgstr ""
+
+#: ../lib/python/Screens/TimerEntry.py:289
+msgid "Please select a subservice to record..."
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1481
+#: ../lib/python/Screens/SubservicesQuickzap.py:97
+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:113
+#: ../lib/python/Screens/ScanSetup.py:200
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:403
 msgid "Polarity"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:690
+#: ../lib/python/Components/NimManager.py:741
 msgid "Polarization"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:15
+#: ../lib/python/Screens/Satconfig.py:13
 msgid "Port A"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:18
+#: ../lib/python/Screens/Satconfig.py:16
 msgid "Port B"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:20
+#: ../lib/python/Screens/Satconfig.py:18
 msgid "Port C"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:21
+#: ../lib/python/Screens/Satconfig.py:19
 msgid "Port D"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:655
+#: ../lib/python/Components/NimManager.py:699
 msgid "Positioner"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:69
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:130
+msgid "Positioner fine movement"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:129
 msgid "Positioner movement"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:71
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:132
 msgid "Positioner storage"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:35
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:422
+msgid "Predefined transponder"
+msgstr ""
+
+#: ../lib/python/Screens/NetworkSetup.py:22
 msgid "Press OK to activate the settings."
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:448
+#: ../lib/python/Screens/ScanSetup.py:603
 msgid "Press OK to scan"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:73
+#: ../lib/python/Screens/ScanSetup.py:158
 msgid "Press OK to start the scan"
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:33
+#: ../lib/python/Screens/EpgSelection.py:44
 msgid "Prev"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:432
-#: ../lib/python/Screens/ChannelSelection.py:572
+#: ../lib/python/Screens/ParentalControlSetup.py:72
+msgid "Protect services"
+msgstr ""
+
+#: ../lib/python/Screens/ParentalControlSetup.py:68
+msgid "Protect setup"
+msgstr ""
+
+#: ../lib/python/Screens/ChannelSelection.py:499
+#: ../lib/python/Screens/ChannelSelection.py:643
 msgid "Provider"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:679
+#: ../lib/python/Screens/ChannelSelection.py:750
 msgid "Providers"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEdit.py:97
+#: ../lib/python/Components/NimManager.py:789
+msgid "Quick"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1477
+msgid "Quickzap"
+msgstr ""
+
+#: ../lib/python/Screens/Setup.py:145
+msgid "Really close without saving settings?"
+msgstr ""
+
+#: ../lib/python/Screens/TimerEdit.py:105
 msgid "Really delete done timers?"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1165
-msgid "Record"
+#: ../lib/python/Screens/TimerEdit.py:113
+msgid "Really delete this timer?"
 msgstr ""
 
-#: ../lib/python/Screens/EventView.py:67
+#: ../lib/python/Screens/SubservicesQuickzap.py:108
+msgid "Really exit the subservices quickzap?"
+msgstr ""
+
+#: ../lib/python/Screens/EventView.py:74
 msgid "Recording"
 msgstr ""
 
+#: ../lib/python/Screens/ParentalControlSetup.py:219
+msgid "Reenter new pin"
+msgstr ""
+
+#: ../lib/python/Screens/ParentalControlSetup.py:81
+msgid "Remember service pin"
+msgstr ""
+
 #: ../lib/python/Screens/PluginBrowser.py:20
 msgid "Remove Plugins"
 msgstr ""
@@ -828,67 +1076,88 @@ msgstr ""
 msgid "Remove plugins"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:150
+#: ../lib/python/Screens/TimerEntry.py:133
 msgid "Repeat Type"
 msgstr ""
 
-#: ../lib/python/Screens/Ci.py:213
+#: ../lib/python/Screens/MediaPlayer.py:389
+msgid "Replace current playlist"
+msgstr ""
+
+#: ../lib/python/Screens/Ci.py:294
 msgid "Reset"
 msgstr ""
 
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:77
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:166
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:167
 msgid "Restore"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:164
-msgid "SNR"
+#: ../lib/python/Screens/InfoBarGenerics.py:1384
+msgid "Right"
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:187
+#: ../lib/python/Screens/EpgSelection.py:234
 #: ../lib/python/Components/TimerList.py:34
 msgid "Sat"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:109
-#: ../lib/python/Screens/ScanSetup.py:118
-#: ../lib/python/Screens/Satconfig.py:13 ../lib/python/Screens/Satconfig.py:61
-#: ../lib/python/Screens/Satconfig.py:149
+#: ../lib/python/Screens/ScanSetup.py:196
+#: ../lib/python/Screens/ScanSetup.py:209
+#: ../lib/python/Screens/Satconfig.py:11 ../lib/python/Screens/Satconfig.py:61
+#: ../lib/python/Screens/Satconfig.py:145
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:397
 msgid "Satellite"
 msgstr "Satellite"
 
-#: ../lib/python/Screens/ChannelSelection.py:431
-#: ../lib/python/Screens/ChannelSelection.py:574
+#: ../lib/python/Screens/ChannelSelection.py:498
+#: ../lib/python/Screens/ChannelSelection.py:645
 msgid "Satellites"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:108
-#: ../lib/python/Screens/TimerEntry.py:171
+#: ../lib/python/Screens/TimerEntry.py:100
+#: ../lib/python/Screens/TimerEntry.py:154
 msgid "Saturday"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:441
-#: ../lib/python/Screens/ScanSetup.py:444
+#: ../lib/python/Screens/ScanSetup.py:594
+#: ../lib/python/Screens/ScanSetup.py:599
 msgid "Scan NIM"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:639
-msgid "Secondary cable from motorized LNB"
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:173
+msgid "Search east"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:172
+msgid "Search west"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1396
+msgid "Select audio mode"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:230
+#: ../lib/python/Screens/InfoBarGenerics.py:1385
+msgid "Select audio track"
+msgstr ""
+
+#: ../lib/python/Screens/TimerEntry.py:210
 msgid "Select channel to record from"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:120
+#: ../lib/python/Screens/Satconfig.py:116
 msgid "Sequence repeat"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:681
+#: ../lib/python/Screens/Satconfig.py:67
+msgid "Service scan type needed"
+msgstr ""
+
+#: ../lib/python/Screens/ChannelSelection.py:754
 msgid "Services"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:70
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:131
 msgid "Set limits"
 msgstr ""
 
@@ -896,42 +1165,49 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBar.py:41
+#: ../lib/python/Screens/ParentalControlSetup.py:197
+msgid "Show services beginning with"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBar.py:49
 msgid "Show the radio player..."
 msgstr ""
 
-#: ../lib/python/Screens/EventView.py:102
-msgid "Similar broadcastings:"
+#: ../lib/python/Screens/InfoBar.py:50
+msgid "Show the tv player..."
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:633
-#: ../lib/python/Components/NimManager.py:640
-msgid "Simple"
+#: ../lib/python/Screens/EventView.py:133
+msgid "Similar"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:655
+#: ../lib/python/Screens/EventView.py:127
+msgid "Similar broadcasts:"
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:695
 msgid "Single"
 msgstr ""
 
-#: ../lib/python/Screens/EventView.py:130
+#: ../lib/python/Screens/EventView.py:153
 msgid "Single EPG"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:196
+#: ../lib/python/Screens/ScanSetup.py:339
 msgid "Single satellite"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:196
-#: ../lib/python/Screens/ScanSetup.py:197
-#: ../lib/python/Screens/ScanSetup.py:198
+#: ../lib/python/Screens/ScanSetup.py:339
+#: ../lib/python/Screens/ScanSetup.py:340
+#: ../lib/python/Screens/ScanSetup.py:341
 msgid "Single transponder"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:668
+#: ../lib/python/Components/NimManager.py:717
 msgid "Slot "
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:552
+#: ../lib/python/Components/NimManager.py:549
 msgid "Socket "
 msgstr ""
 
@@ -942,154 +1218,223 @@ msgid ""
 "Please choose an other one."
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:664
-#: ../lib/python/Components/NimManager.py:725
+#: ../lib/python/Components/NimManager.py:713
+#: ../lib/python/Components/NimManager.py:784
 msgid "South"
 msgstr ""
 
-#: ../lib/python/Components/Language.py:17
+#: ../lib/python/Components/Language.py:25
 msgid "Spanish"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:178
+#: ../lib/python/Screens/TimerEntry.py:160
 msgid "Start"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1117
+#: ../lib/python/Screens/InfoBarGenerics.py:1336
 msgid "Start recording?"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:181
+#: ../lib/python/Screens/TimerEntry.py:165
 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:95
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:178
 msgid "Step east"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:96
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:177
 msgid "Step west"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:950
+#: ../lib/python/Screens/InfoBarGenerics.py:1384
+msgid "Stereo"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:166
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:167
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:168
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:169
+msgid "Stop"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:963
 msgid "Stop Timeshift?"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBar.py:100
+#: ../lib/python/Screens/InfoBar.py:113
 msgid "Stop playing this movie?"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:105
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:187
 msgid "Store position"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:108
+#: ../lib/python/Screens/Satconfig.py:104
 msgid "Stored position"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1170 ../data/
-msgid "Subservices"
+#: ../lib/python/Screens/InfoBarGenerics.py:1414
+msgid "Subservice list..."
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:187
+#: ../lib/python/Screens/EpgSelection.py:234
 #: ../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:100
+#: ../lib/python/Screens/TimerEntry.py:155
 msgid "Sunday"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:112
-#: ../lib/python/Screens/ScanSetup.py:140
+#: ../lib/python/Screens/InfoBarGenerics.py:1176
+msgid "Swap Services"
+msgstr ""
+
+#: ../lib/python/Components/Language.py:26
+msgid "Swedish"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1419
+msgid "Switch to next subservice"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1420
+msgid "Switch to previous subservice"
+msgstr ""
+
+#: ../lib/python/Screens/ScanSetup.py:199
+#: ../lib/python/Screens/ScanSetup.py:232
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:402
 msgid "Symbol Rate"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:68
+#: ../lib/python/Screens/ChannelSelection.py:762
+msgid "Terrestrial"
+msgstr ""
+
+#: ../lib/python/Screens/Satconfig.py:71
 msgid "Terrestrial provider"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:721
+#: ../lib/python/Screens/ParentalControlSetup.py:251
+msgid "The pin code has been changed successfully."
+msgstr ""
+
+#: ../lib/python/Screens/ChannelSelection.py:153
+#: ../lib/python/Screens/ParentalControlSetup.py:40
+#: ../lib/python/Components/ParentalControl.py:141
+msgid "The pin code you entered is wrong."
+msgstr ""
+
+#: ../lib/python/Screens/ParentalControlSetup.py:253
+msgid "The pin codes you entered are different."
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:780
 msgid "Three"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:141
+#: ../lib/python/Screens/Satconfig.py:137
 msgid "Threshold"
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:187
+#: ../lib/python/Screens/EpgSelection.py:234
 #: ../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:100
+#: ../lib/python/Screens/TimerEntry.py:152
 msgid "Thursday"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:148
-msgid "Timer Type"
+#: ../lib/python/Screens/TimeDateInput.py:41
+msgid "Time"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:922
-msgid "Timeshift not possible!"
+#: ../lib/python/Screens/TimerEntry.py:131
+msgid "Timer Type"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1174
-msgid "Timeshifting"
+#: ../lib/python/Screens/MediaPlayer.py:49
+msgid "Title:"
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:198
+#: ../lib/python/Screens/EpgSelection.py:245
 #: ../lib/python/Tools/FuzzyDate.py:10
 msgid "Today"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:103
+#: ../lib/python/Screens/Satconfig.py:99
 msgid "Tone mode"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:117
+#: ../lib/python/Screens/Satconfig.py:113
 msgid "Toneburst"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:655
+#: ../lib/python/Components/NimManager.py:696
 msgid "Toneburst A/B"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:155
+#: ../lib/python/Screens/ScanSetup.py:248
 msgid "Transmission mode"
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:187
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:406
+msgid "Transponder"
+msgstr ""
+
+#: ../lib/python/Screens/ScanSetup.py:194
+msgid "Transpondertype"
+msgstr ""
+
+#: ../lib/python/Screens/InputBox.py:168
+msgid "Tries left:"
+msgstr ""
+
+#: ../lib/python/Screens/EpgSelection.py:234
 #: ../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:100
+#: ../lib/python/Screens/TimerEntry.py:150
 msgid "Tuesday"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:91
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:128
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:160
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:395
+msgid "Tune"
+msgstr ""
+
+#: ../lib/python/Screens/ScanSetup.py:176
 #: ../lib/python/Components/ServiceScan.py:75
 msgid "Tuner"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:721
+#: ../lib/python/Components/Language.py:27
+msgid "Turkish"
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:780
 msgid "Two"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:96 ../lib/python/Screens/ScanSetup.py:99
-#: ../lib/python/Screens/ScanSetup.py:102
+#: ../lib/python/Screens/ScanSetup.py:182
+#: ../lib/python/Screens/ScanSetup.py:185
+#: ../lib/python/Screens/ScanSetup.py:188
 msgid "Type of scan"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:660
+#: ../lib/python/Components/NimManager.py:707
 msgid "USALS"
 msgstr ""
 
@@ -1104,11 +1449,11 @@ msgid ""
 "Error: "
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:125
+#: ../lib/python/Screens/Satconfig.py:121
 msgid "Uncommitted DiSEqC command"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:707
+#: ../lib/python/Components/NimManager.py:759
 msgid "Universal LNB"
 msgstr ""
 
@@ -1120,80 +1465,92 @@ msgstr ""
 msgid "Updating... Please wait... This can take some minutes..."
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:40 ../data/
+#: ../lib/python/Screens/NetworkSetup.py:27 ../data/
 msgid "Use DHCP"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:105
+#: ../lib/python/Screens/Satconfig.py:101
 msgid "Use usals for this sat"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:707
+#: ../lib/python/Components/NimManager.py:759
 msgid "User defined"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:102
+#: ../lib/python/Screens/InfoBarGenerics.py:1752
+msgid "View teletext..."
+msgstr ""
+
+#: ../lib/python/Screens/Satconfig.py:98
 msgid "Voltage mode"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:688
+#: ../lib/python/Screens/ChannelSelection.py:766
 msgid "W"
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:187
+#: ../lib/python/Screens/EpgSelection.py:234
 #: ../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:100
+#: ../lib/python/Screens/TimerEntry.py:151
 msgid "Wednesday"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:163
+#: ../lib/python/Screens/TimerEntry.py:146
 msgid "Weekday"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:662
-#: ../lib/python/Components/NimManager.py:723
+#: ../lib/python/Components/NimManager.py:711
+#: ../lib/python/Components/NimManager.py:782
 msgid "West"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:692
-#: ../lib/python/Components/NimManager.py:712
-#: ../lib/python/Components/NimManager.py:716
-#: ../lib/python/Components/NimManager.py:717
-#: ../lib/python/Components/NimManager.py:726
+#: ../lib/python/Screens/MediaPlayer.py:53
+msgid "Year:"
+msgstr ""
+
+#: ../lib/python/Screens/Ci.py:22
 msgid "Yes"
 msgstr ""
 
-#: ../lib/python/Screens/MovieSelection.py:47
+#: ../lib/python/Screens/MovieSelection.py:49
 msgid "You cannot delete this!"
 msgstr ""
 
+#: ../lib/python/Screens/InputBox.py:108
+msgid "You have to wait for"
+msgstr ""
+
+#: ../lib/python/Screens/MediaPlayer.py:390
+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:380
 msgid "[bouquet edit]"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:314
+#: ../lib/python/Screens/ChannelSelection.py:382
 msgid "[favourite edit]"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:398
+#: ../lib/python/Screens/ChannelSelection.py:465
 msgid "[move mode]"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:91
+#: ../lib/python/Screens/ChannelSelection.py:119
 msgid "abort bouquet edit"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:94
+#: ../lib/python/Screens/ChannelSelection.py:122
 msgid "abort favourites edit"
 msgstr ""
 
@@ -1201,18 +1558,54 @@ msgstr ""
 msgid "about to start"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:80
-msgid "add bouquet..."
+#: ../lib/python/Screens/ChannelSelection.py:101
+msgid "add bouquet"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:65
+#: ../lib/python/Screens/MediaPlayer.py:337
+msgid "add directory to playlist"
+msgstr ""
+
+#: ../lib/python/Screens/MediaPlayer.py:339
+msgid "add file to playlist"
+msgstr ""
+
+#: ../lib/python/Screens/ChannelSelection.py:107
+msgid "add marker"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1334
+#: ../lib/python/Screens/InfoBarGenerics.py:1336
+msgid "add recording (enter recording duration)"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1334
+#: ../lib/python/Screens/InfoBarGenerics.py:1336
+msgid "add recording (indefinitely)"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1334
+#: ../lib/python/Screens/InfoBarGenerics.py:1336
+msgid "add recording (stop after current event)"
+msgstr ""
+
+#: ../lib/python/Screens/ChannelSelection.py:87
 msgid "add service to bouquet"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:67
+#: ../lib/python/Screens/ChannelSelection.py:89
 msgid "add service to favourites"
 msgstr ""
 
+#: ../lib/python/Screens/ChannelSelection.py:83
+msgid "add to parental protection"
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:664
+#: ../lib/python/Components/NimManager.py:675
+msgid "advanced"
+msgstr ""
+
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:208
 msgid ""
 "are you sure you want to restore\n"
@@ -1220,39 +1613,64 @@ msgid ""
 msgstr ""
 
 #: ../lib/python/Screens/MovieSelection.py:24
-#: ../lib/python/Screens/ChannelSelection.py:96
+#: ../lib/python/Screens/ChannelSelection.py:124
 msgid "back"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:218
+#: ../lib/python/Components/ParentalControl.py:17
+msgid "blacklist"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1334
+msgid "change recording (duration)"
+msgstr ""
+
+#: ../lib/python/Screens/ScanSetup.py:363
 msgid "circular left"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:218
+#: ../lib/python/Screens/ScanSetup.py:363
 msgid "circular right"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:70
+#: ../lib/python/Screens/MediaPlayer.py:343
+msgid "clear playlist"
+msgstr ""
+
+#: ../lib/python/Components/ParentalControl.py:13
+msgid "complex"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:586
+msgid "continue"
+msgstr ""
+
+#: ../lib/python/Screens/ChannelSelection.py:93
 msgid "copy to favourites"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:100
+#: ../lib/python/Screens/TimerEntry.py:92
 msgid "daily"
 msgstr ""
 
+#: ../lib/python/Screens/MediaPlayer.py:342
+msgid "delete"
+msgstr ""
+
 #: ../lib/python/Screens/MovieSelection.py:24
 msgid "delete..."
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:87
+#: ../lib/python/Screens/ChannelSelection.py:115
 msgid "disable move mode"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1114
+#: ../lib/python/Screens/TimerEntry.py:87
+#: ../lib/python/Screens/InfoBarGenerics.py:1334
 msgid "do nothing"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1117
+#: ../lib/python/Screens/InfoBarGenerics.py:1336
 msgid "don't record"
 msgstr ""
 
@@ -1260,33 +1678,32 @@ msgstr ""
 msgid "done!"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:554
+#: ../lib/python/Components/NimManager.py:551
 msgid "empty/unknown"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:83
+#: ../lib/python/Screens/ChannelSelection.py:111
 msgid "enable bouquet edit"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:85
+#: ../lib/python/Screens/ChannelSelection.py:113
 msgid "enable favourite edit"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:79
+#: ../lib/python/Screens/ChannelSelection.py:108
 msgid "enable move mode"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:90
+#: ../lib/python/Screens/ChannelSelection.py:118
 msgid "end bouquet edit"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:93
+#: ../lib/python/Screens/ChannelSelection.py:121
 msgid "end favourites edit"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1114
-#: ../lib/python/Screens/InfoBarGenerics.py:1117
-msgid "enter recording duration"
+#: ../lib/python/Components/NimManager.py:670
+msgid "equal to Socket A"
 msgstr ""
 
 #: ../lib/python/Components/DiskInfo.py:30
@@ -1297,50 +1714,78 @@ msgstr ""
 msgid "full /etc directory"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:218
+#: ../lib/python/Screens/TimerEntry.py:87
+msgid "go to deep standby"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBar.py:64
+msgid "hear radio..."
+msgstr ""
+
+#: ../lib/python/Screens/MediaPlayer.py:344
+msgid "hide player"
+msgstr ""
+
+#: ../lib/python/Screens/ScanSetup.py:363
 msgid "horizontal"
 msgstr ""
 
-#: ../lib/python/Screens/Ci.py:220
+#: ../lib/python/Screens/Ci.py:300 ../lib/python/Screens/Ci.py:322
 msgid "init module"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBar.py:80
+#: ../lib/python/Screens/InfoBar.py:98
 msgid "leave movie player..."
 msgstr ""
 
+#: ../lib/python/Screens/InfoBarGenerics.py:1395
+msgid "left"
+msgstr ""
+
 #: ../lib/python/Screens/PluginBrowser.py:100
 #: ../lib/python/Screens/PluginBrowser.py:102
 msgid "list"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:660
+#: ../lib/python/Components/NimManager.py:671
+msgid "loopthrough to socket A"
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:708
 msgid "manual"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:290
+#: ../lib/python/Components/TimerList.py:48
+#: ../lib/python/Components/TimerList.py:53
+msgid "mins"
+msgstr ""
+
+#: ../lib/python/Screens/InputBox.py:108
+msgid "minutes and"
+msgstr ""
+
+#: ../lib/python/Components/ParentalControl.py:14
+msgid "never"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:258
 msgid "next channel"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:292
+#: ../lib/python/Screens/InfoBarGenerics.py:260
 msgid "next channel in history"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:227
-#: ../lib/python/Screens/ScanSetup.py:243
-#: ../lib/python/Screens/ScanSetup.py:440
-#: ../lib/python/Screens/ScanSetup.py:443
-#: ../lib/python/Screens/TimerEntry.py:112
-#: ../lib/python/Components/Network.py:145
-#: ../lib/python/Components/RecordingConfig.py:7
+#: ../lib/python/Screens/ScanSetup.py:342
+#: ../lib/python/Screens/ScanSetup.py:587
 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:298 ../lib/python/Screens/Ci.py:320
 msgid "no module found"
 msgstr ""
 
@@ -1348,19 +1793,23 @@ msgstr ""
 msgid "none"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:216
-#: ../lib/python/Screens/ScanSetup.py:223
-#: ../lib/python/Screens/ScanSetup.py:231
+#: ../lib/python/Components/NimManager.py:672
+msgid "nothing connected"
+msgstr ""
+
+#: ../lib/python/Screens/ScanSetup.py:361
+#: ../lib/python/Screens/ScanSetup.py:370
+#: ../lib/python/Screens/ScanSetup.py:378
 msgid "off"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:216
-#: ../lib/python/Screens/ScanSetup.py:223
-#: ../lib/python/Screens/ScanSetup.py:231
+#: ../lib/python/Screens/ScanSetup.py:361
+#: ../lib/python/Screens/ScanSetup.py:370
+#: ../lib/python/Screens/ScanSetup.py:378
 msgid "on"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:96
+#: ../lib/python/Screens/TimerEntry.py:88
 msgid "once"
 msgstr ""
 
@@ -1368,46 +1817,71 @@ msgstr ""
 msgid "only /etc/enigma2 directory"
 msgstr ""
 
+#: ../lib/python/Screens/InfoBarGenerics.py:261
+msgid "open servicelist"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:256
+msgid "open servicelist(down)"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:255
+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:585
+msgid "pause"
+msgstr ""
+
+#: ../lib/python/Screens/Ci.py:82
 msgid "please press OK when ready"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:289
+#: ../lib/python/Screens/InfoBarGenerics.py:257
 msgid "previous channel"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:291
+#: ../lib/python/Screens/InfoBarGenerics.py:259
 msgid "previous channel in history"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:95
+#: ../lib/python/Screens/TimerEntry.py:86
 msgid "record"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1117
-msgid "record indefinitely"
-msgstr ""
-
 #: ../lib/python/Components/TimerList.py:64
 msgid "recording..."
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:74
-msgid "remove bouquet"
+#: ../lib/python/Screens/ChannelSelection.py:95
+msgid "remove all new found flags"
+msgstr ""
+
+#: ../lib/python/Screens/ChannelSelection.py:97
+#: ../lib/python/Screens/ChannelSelection.py:102
+msgid "remove entry"
+msgstr ""
+
+#: ../lib/python/Screens/ChannelSelection.py:85
+msgid "remove from parental protection"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:72
-msgid "remove service"
+#: ../lib/python/Screens/ChannelSelection.py:99
+msgid "remove new found flag"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:96
+#: ../lib/python/Screens/TimerEntry.py:88
 msgid "repeated"
 msgstr ""
 
+#: ../lib/python/Screens/InfoBarGenerics.py:1395
+msgid "right"
+msgstr ""
+
 #: ../lib/python/Components/ServiceScan.py:37
 #, python-format
 msgid ""
@@ -1438,57 +1912,131 @@ msgstr ""
 msgid "scan state"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:379
+#: ../lib/python/Components/NimManager.py:673
+msgid "second cable of motorized LNB"
+msgstr ""
+
+#: ../lib/python/Screens/InputBox.py:108
+msgid "seconds."
+msgstr ""
+
+#: ../lib/python/Screens/ParentalControlSetup.py:96
+msgid "service pin"
+msgstr ""
+
+#: ../lib/python/Screens/ParentalControlSetup.py:98
+msgid "setup pin"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:392
 msgid "show EPG..."
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:350
+#: ../lib/python/Screens/InfoBarGenerics.py:354
 msgid "show event details"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1117
-msgid "stop after current event"
+#: ../lib/python/Components/ParentalControl.py:13
+#: ../lib/python/Components/NimManager.py:663
+#: ../lib/python/Components/NimManager.py:674
+msgid "simple"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:591
+msgid "skip backward"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:588
+msgid "skip forward"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:905
+msgid "start timeshift"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1395
+msgid "stereo"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1114
+#: ../lib/python/Screens/InfoBarGenerics.py:1334
 msgid "stop recording"
 msgstr ""
 
-#: ../lib/python/Screens/Wizard.py:225 ../lib/python/Screens/Wizard.py:226
+#: ../lib/python/Screens/InfoBarGenerics.py:906
+msgid "stop timeshift"
+msgstr ""
+
+#: ../lib/python/Screens/MediaPlayer.py:341
+msgid "switch to filelist"
+msgstr ""
+
+#: ../lib/python/Screens/MediaPlayer.py:335
+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/Components/ParentalControl.py:80
+msgid "this service is protected by a parental control pin"
+msgstr ""
+
+#: ../lib/python/Screens/EventView.py:80
 msgid "unknown service"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:100
+#: ../lib/python/Components/ParentalControl.py:14
+msgid "until restart"
+msgstr ""
+
+#: ../lib/python/Screens/TimerEntry.py:92
 msgid "user defined"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:218
+#: ../lib/python/Screens/ScanSetup.py:363
 msgid "vertical"
 msgstr ""
 
+#: ../lib/python/Screens/InfoBarGenerics.py:1041
+msgid "view extensions..."
+msgstr ""
+
+#: ../lib/python/Screens/InfoBar.py:63
+msgid "view recordings..."
+msgstr ""
+
+#: ../lib/python/Screens/Ci.py:167
+msgid "wait for ci..."
+msgstr ""
+
 #: ../lib/python/Components/TimerList.py:57
 msgid "waiting"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:100
+#: ../lib/python/Screens/TimerEntry.py:92
 msgid "weekly"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:227
-#: ../lib/python/Screens/ScanSetup.py:243
-#: ../lib/python/Screens/ScanSetup.py:440
-#: ../lib/python/Screens/ScanSetup.py:443
-#: ../lib/python/Screens/TimerEntry.py:112
-#: ../lib/python/Components/Network.py:145
-#: ../lib/python/Components/RecordingConfig.py:7
+#: ../lib/python/Components/ParentalControl.py:17
+msgid "whitelist"
+msgstr ""
+
+#: ../lib/python/Screens/ScanSetup.py:342
+#: ../lib/python/Screens/ScanSetup.py:587
 msgid "yes"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:95
+#: ../lib/python/Screens/ScanSetup.py:342
+#: ../lib/python/Screens/ScanSetup.py:587
+msgid "yes (keep feeds)"
+msgstr ""
+
+#: ../lib/python/Screens/TimerEntry.py:86
 msgid "zap"
 msgstr ""
 
@@ -1516,10 +2064,6 @@ msgstr ""
 msgid "Games / Plugins"
 msgstr ""
 
-#: ../data/
-msgid "Hide error windows"
-msgstr ""
-
 #: ../data/
 msgid "help..."
 msgstr ""
@@ -1528,10 +2072,6 @@ msgstr ""
 msgid "Yes, backup my settings!"
 msgstr ""
 
-#: ../data/
-msgid "#c0c000"
-msgstr ""
-
 #: ../data/
 msgid "Satconfig"
 msgstr ""
@@ -1557,12 +2097,16 @@ msgstr ""
 msgid "DiSEqC"
 msgstr ""
 
+#: ../data/
+msgid "Main menu"
+msgstr ""
+
 #: ../data/
 msgid "TV System"
 msgstr ""
 
 #: ../data/
-msgid "#ffffff"
+msgid "Alternative radio mode"
 msgstr ""
 
 #: ../data/
@@ -1579,6 +2123,10 @@ msgstr ""
 msgid "Deep Standby"
 msgstr ""
 
+#: ../data/
+msgid "Show positioner movement"
+msgstr ""
+
 #: ../data/
 msgid "Tuner Slot"
 msgstr ""
@@ -1597,10 +2145,6 @@ msgid ""
 "press OK."
 msgstr ""
 
-#: ../data/
-msgid "Show Satposition"
-msgstr ""
-
 #: ../data/
 msgid "Do you want to view a tutorial?"
 msgstr ""
@@ -1622,33 +2166,33 @@ 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 ""
-"You have chosen to backup to an usb drive. Better backup to the harddisk!\n"
-"Please press OK to start the backup now."
+msgid "Startwizard"
 msgstr ""
 
 #: ../data/
-msgid "Audio / Video"
+msgid "#ffffff"
 msgstr ""
 
 #: ../data/
-msgid "Mute"
+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/
-msgid "Service Searching"
+msgid "Mute"
 msgstr ""
 
 #: ../data/
-msgid "#20294a6b"
+msgid "Service Searching"
 msgstr ""
 
 #: ../data/
@@ -1663,19 +2207,22 @@ msgid "Keyboard Map"
 msgstr ""
 
 #: ../data/
-msgid "Keyboard Setup"
+msgid "Enable multiple bouquets"
 msgstr ""
 
 #: ../data/
-msgid "Dish"
+msgid "Keyboard Setup"
 msgstr ""
 
 #: ../data/
-msgid "Record Splitsize"
+msgid ""
+"Use the left and right buttons to change an option.\n"
+"\n"
+"Please set up tuner A"
 msgstr ""
 
 #: ../data/
-msgid "Auto show inforbar"
+msgid "Dish"
 msgstr ""
 
 #: ../data/
@@ -1683,19 +2230,21 @@ msgid "Margin after record"
 msgstr ""
 
 #: ../data/
-msgid "Network"
+msgid "#ffffffff"
 msgstr ""
 
 #: ../data/
-msgid "Invert"
+msgid "System"
 msgstr ""
 
 #: ../data/
-msgid "System"
+msgid "Use power measurement"
 msgstr ""
 
 #: ../data/
-msgid "use power delta"
+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/
@@ -1707,7 +2256,7 @@ msgid "Manual Scan"
 msgstr ""
 
 #: ../data/
-msgid "OSD Settings"
+msgid "Timer Edit"
 msgstr ""
 
 #: ../data/
@@ -1718,6 +2267,14 @@ msgstr ""
 msgid "No, just start my dreambox"
 msgstr ""
 
+#: ../data/
+msgid "Network..."
+msgstr ""
+
+#: ../data/
+msgid "Tuner configuration"
+msgstr ""
+
 #: ../data/
 msgid "select Slot"
 msgstr ""
@@ -1731,7 +2288,7 @@ msgid "Standby / Restart"
 msgstr ""
 
 #: ../data/
-msgid "Main menu"
+msgid "Standby"
 msgstr ""
 
 #: ../data/
@@ -1743,11 +2300,11 @@ msgid "Exit the wizard"
 msgstr ""
 
 #: ../data/
-msgid "Fast zapping"
+msgid "OSD Settings"
 msgstr ""
 
 #: ../data/
-msgid "Usage Settings"
+msgid "RF output"
 msgstr ""
 
 #: ../data/
@@ -1755,7 +2312,7 @@ msgid "Brightness"
 msgstr ""
 
 #: ../data/
-msgid "Standby"
+msgid "Parental control services Editor"
 msgstr ""
 
 #: ../data/
@@ -1775,17 +2332,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 ""
@@ -1798,12 +2359,20 @@ msgstr ""
 msgid "SNR:"
 msgstr ""
 
+#: ../data/
+msgid "Timeshift"
+msgstr ""
+
 #: ../data/
 msgid "Downloadable plugins"
 msgstr ""
 
 #: ../data/
-msgid "LCD"
+msgid "Subservices"
+msgstr ""
+
+#: ../data/
+msgid "Parental control setup"
 msgstr ""
 
 #: ../data/
@@ -1819,7 +2388,7 @@ msgid "About..."
 msgstr ""
 
 #: ../data/
-msgid "#00ff00"
+msgid "Seek"
 msgstr ""
 
 #: ../data/
@@ -1827,7 +2396,7 @@ msgid "Common Interface"
 msgstr ""
 
 #: ../data/
-msgid "Ask before zapping"
+msgid "Language..."
 msgstr ""
 
 #: ../data/
@@ -1862,18 +2431,10 @@ msgstr ""
 msgid "No, scan later manually"
 msgstr ""
 
-#: ../data/
-msgid "Input"
-msgstr ""
-
 #: ../data/
 msgid "Soundcarrier"
 msgstr ""
 
-#: ../data/
-msgid "#0000ff"
-msgstr ""
-
 #: ../data/
 msgid "Yes, restore the settings now"
 msgstr ""
@@ -1888,6 +2449,10 @@ msgid ""
 "backup now."
 msgstr ""
 
+#: ../data/
+msgid "Timer selection"
+msgstr ""
+
 #: ../data/
 msgid "Repeat"
 msgstr ""
@@ -1908,6 +2473,14 @@ msgstr ""
 msgid "Somewhere else"
 msgstr ""
 
+#: ../data/
+msgid "Do you want to do a service scan?"
+msgstr ""
+
+#: ../data/
+msgid "Timer log"
+msgstr ""
+
 #: ../data/
 msgid ""
 "Your backup succeeded. We will now continue to explain the further upgrade "
@@ -1915,11 +2488,11 @@ msgid ""
 msgstr ""
 
 #: ../data/
-msgid "Menu"
+msgid "PiPSetup"
 msgstr ""
 
 #: ../data/
-msgid "Parental Lock"
+msgid "Menu"
 msgstr ""
 
 #: ../data/
@@ -1991,10 +2564,6 @@ msgstr ""
 msgid "WSS on 4:3"
 msgstr ""
 
-#: ../data/
-msgid "Skip confirmations"
-msgstr ""
-
 #: ../data/
 msgid "Choose bouquet"
 msgstr ""
@@ -2028,7 +2597,7 @@ msgid "USB"
 msgstr ""
 
 #: ../data/
-msgid "Timer log"
+msgid "Invert display"
 msgstr ""
 
 #: ../data/
@@ -2039,12 +2608,6 @@ msgstr ""
 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 ""
@@ -2053,35 +2616,24 @@ msgstr ""
 msgid "Select HDD"
 msgstr ""
 
-#: ../data/
-msgid "#ffffffff"
-msgstr ""
-
-#: ../data/
-msgid "Setup Lock"
-msgstr ""
-
 #: ../data/
 msgid "Aspect Ratio"
 msgstr ""
 
 #: ../data/
-msgid "Expert Setup"
+msgid "Recordings always have priority"
 msgstr ""
 
 #: ../data/
-msgid "Language"
+msgid "Customize"
 msgstr ""
 
 #: ../data/
-msgid ""
-"Use the left and right buttons to change an option.\n"
-"\n"
-"Please set up tuner A"
+msgid "#389416"
 msgstr ""
 
 #: ../data/
-msgid "Parental Control"
+msgid "Pin code needed"
 msgstr ""
 
 #: ../data/
@@ -2101,7 +2653,7 @@ msgid "Volume"
 msgstr ""
 
 #: ../data/
-msgid "Multi bouquets"
+msgid "#33294a6b"
 msgstr ""
 
 #: ../data/
@@ -2109,7 +2661,11 @@ msgid "Alpha"
 msgstr ""
 
 #: ../data/
-msgid "Timer Edit"
+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/
@@ -2137,55 +2693,47 @@ msgid "Timer Editor"
 msgstr ""
 
 #: ../data/
-msgid "AGC:"
-msgstr ""
-
-#: ../data/
-msgid "What do you want to scan?"
+msgid "Time/Date Input"
 msgstr ""
 
 #: ../data/
-msgid "Usage settings"
+msgid "AGC:"
 msgstr ""
 
 #: ../data/
-msgid "Channellist menu"
+msgid "Sat / Dish Setup"
 msgstr ""
 
 #: ../data/
-msgid "Audio"
+msgid "What do you want to scan?"
 msgstr ""
 
 #: ../data/
-msgid "#ff0000"
+msgid "Now Playing"
 msgstr ""
 
 #: ../data/
-msgid "Do you want to do a service scan?"
+msgid "Channellist menu"
 msgstr ""
 
 #: ../data/
-msgid "NOW"
+msgid "Audio"
 msgstr ""
 
 #: ../data/
-msgid "Yes, perform a shutdown now."
+msgid "Harddisk..."
 msgstr ""
 
 #: ../data/
-msgid "Seek"
+msgid "NOW"
 msgstr ""
 
 #: ../data/
-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."
+msgid "Yes, perform a shutdown now."
 msgstr ""
 
 #: ../data/
-msgid "Satelliteconfig"
+msgid "#0064c7"
 msgstr ""
 
 #: ../data/