Merge commit 'origin/bug_563_fix_backuprestore_crash'

[enigma2.git] / po / enigma2.pot

diff --git a/po/enigma2.pot b/po/enigma2.pot
index 6a6c5477185ed5dd28e82a46153eb3e948cc061b..f1a6a85784cd2deba4d184a1db986596d40b1bc1 100755 (executable)
--- a/po/enigma2.pot
+++ b/po/enigma2.pot
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-09 10:31+0000\n"
+"POT-Creation-Date: 2010-09-29 09:15+0000\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"
@@ -18,17 +18,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:135
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:148
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:135
 msgid ""
 "\n"
 "Advanced options and settings."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:212
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:360
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:950
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1433
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:233
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:560
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1147
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1656
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:212
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:360
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:950
@@ -38,70 +38,70 @@ msgid ""
 "After pressing OK, please wait!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:118
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:131
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:118
 msgid ""
 "\n"
 "Backup your Dreambox settings."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:142
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:155
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:142
 msgid ""
 "\n"
 "Edit the upgrade source address."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:115
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:128
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:115
 msgid ""
 "\n"
 "Manage extensions or plugins for your Dreambox"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:116
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:129
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:116
 msgid ""
 "\n"
 "Online update of your Dreambox software."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:111
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:121
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:111
 msgid ""
 "\n"
 "Press OK on your remote control to continue."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:119
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:132
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:119
 msgid ""
 "\n"
 "Restore your Dreambox settings."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:117
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:130
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:117
 msgid ""
 "\n"
 "Restore your Dreambox with a new firmware."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:137
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:150
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:137
 msgid ""
 "\n"
 "Restore your backups by date."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:120
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:133
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:120
 msgid ""
 "\n"
 "Scan for local extensions and install them."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:138
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:151
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:138
 msgid ""
 "\n"
@@ -109,14 +109,14 @@ msgid ""
 "Current device: "
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:255
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:256
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:255
 msgid ""
 "\n"
 "System will restart after the restore!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:141
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:154
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:141
 msgid ""
 "\n"
@@ -127,27 +127,31 @@ msgstr ""
 msgid " "
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:307
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:314
 msgid " Results"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:652
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:852
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:652
 msgid " extensions."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:462
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:474
+#: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:225
+msgid " ms"
+msgstr ""
+
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:662
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:674
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:462
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:474
 msgid " packages selected."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:191
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:196
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:426
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:460
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:471
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:204
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:209
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:626
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:660
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:671
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:191
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:196
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:426
@@ -156,15 +160,15 @@ msgstr ""
 msgid " updates available."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:357
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:359
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:357
 msgid " wireless networks found!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1233
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1234
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1383
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1385
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1213
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1214
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1363
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1365
 #: ../enigma2_master/lib/python/Components/NimManager.py:1173
 #: ../enigma2_master/lib/python/Components/NimManager.py:1174
 #: ../enigma2_master/lib/python/Components/NimManager.py:1323
@@ -195,8 +199,8 @@ msgid "%d services found!"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimeDateInput.py:40
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:110
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:121
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:111
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:122
 #: ../enigma2_master/lib/python/Screens/TimeDateInput.py:40
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:110
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:121
@@ -237,12 +241,12 @@ msgstr ""
 msgid "(ZAP)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:558
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:550
 #: ../enigma2_master/lib/python/Components/NimManager.py:525
 msgid "(empty)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:334
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:347
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:334
 msgid "(show optional DVD audio menu)"
 msgstr ""
@@ -252,42 +256,39 @@ msgstr ""
 msgid "* Only available if more than one interface is active."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:367
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:370
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:367
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:370
 msgid ".NFI Download failed:"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:416
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:416
 msgid ""
 ".NFI file passed md5sum signature check. You can safely flash this image!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:355
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:357
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:355
 msgid "1 wireless network found!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1116
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1108
 #: ../enigma2_master/lib/python/Components/NimManager.py:1081
 msgid "1.0"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1116
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1108
 #: ../enigma2_master/lib/python/Components/NimManager.py:1081
 msgid "1.1"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1115
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1116
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1107
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1108
 #: ../enigma2_master/lib/python/Components/NimManager.py:1080
 #: ../enigma2_master/lib/python/Components/NimManager.py:1081
 msgid "1.2"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1112
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1104
 #: ../enigma2_master/lib/python/Components/NimManager.py:1077
 msgid "13 V"
 msgstr ""
@@ -326,7 +327,7 @@ msgstr ""
 msgid "16:9 always"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1112
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1104
 #: ../enigma2_master/lib/python/Components/NimManager.py:1077
 msgid "18 V"
 msgstr ""
@@ -399,14 +400,14 @@ msgstr ""
 msgid "??"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1114
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1106
 #: ../enigma2_master/lib/python/Components/NimManager.py:1079
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "A"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Ipkg.py:108
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1166
+#: ../enigma2_experimental/lib/python/Screens/Ipkg.py:115
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1375
 #: ../enigma2_master/lib/python/Screens/Ipkg.py:108
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1166
 #, python-format
@@ -420,14 +421,14 @@ msgstr ""
 msgid "A demo plugin for TPM usage."
 msgstr ""
 
-#: ../enigma2_experimental/RecordTimer.py:297
+#: ../enigma2_experimental/RecordTimer.py:300
 #: ../enigma2_master/RecordTimer.py:288
 msgid ""
 "A finished record timer wants to set your\n"
 "Dreambox to standby. Do that now?"
 msgstr ""
 
-#: ../enigma2_experimental/RecordTimer.py:303
+#: ../enigma2_experimental/RecordTimer.py:306
 #: ../enigma2_master/RecordTimer.py:294
 msgid ""
 "A finished record timer wants to shut down\n"
@@ -445,7 +446,7 @@ msgid ""
 "Update existing entry and continue?\n"
 msgstr ""
 
-#: ../enigma2_experimental/RecordTimer.py:378
+#: ../enigma2_experimental/RecordTimer.py:381
 #: ../enigma2_master/RecordTimer.py:369
 #, python-format
 msgid ""
@@ -474,13 +475,13 @@ msgid ""
 "start the satfinder."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/Task.py:390
+#: ../enigma2_experimental/lib/python/Components/Task.py:389
 #: ../enigma2_master/lib/python/Components/Task.py:390
 #, python-format
 msgid "A required tool (%s) was not found."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:199
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:212
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:199
 msgid "A search for available updates is currently in progress."
 msgstr ""
@@ -493,7 +494,7 @@ msgid ""
 "Do you want to disable the second network interface?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TaskView.py:124
+#: ../enigma2_experimental/lib/python/Screens/TaskView.py:128
 #: ../enigma2_experimental/SleepTimer.py:34
 #: ../enigma2_master/lib/python/Screens/TaskView.py:124
 #: ../enigma2_master/SleepTimer.py:34
@@ -502,7 +503,7 @@ msgid ""
 "Dreambox to standby. Do that now?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TaskView.py:121
+#: ../enigma2_experimental/lib/python/Screens/TaskView.py:125
 #: ../enigma2_experimental/SleepTimer.py:29
 #: ../enigma2_master/lib/python/Screens/TaskView.py:121
 #: ../enigma2_master/SleepTimer.py:29
@@ -511,12 +512,12 @@ msgid ""
 "your Dreambox. Shutdown now?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:852
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1052
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:852
 msgid "A small overview of the available icon states and actions."
 msgstr ""
 
-#: ../enigma2_experimental/RecordTimer.py:247
+#: ../enigma2_experimental/RecordTimer.py:250
 #: ../enigma2_master/RecordTimer.py:238
 msgid ""
 "A timer failed to record!\n"
@@ -531,12 +532,12 @@ msgstr ""
 msgid "A/V Settings"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1090
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1082
 #: ../enigma2_master/lib/python/Components/NimManager.py:1055
 msgid "AA"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1090
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1082
 #: ../enigma2_master/lib/python/Components/NimManager.py:1055
 msgid "AB"
 msgstr ""
@@ -567,7 +568,7 @@ msgid "About..."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:258
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:74
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:76
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:258
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:74
 msgid "Accesspoint:"
@@ -580,7 +581,7 @@ msgstr ""
 msgid "Action:"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:130
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:137
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1432
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:130
 #: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1431
@@ -597,7 +598,7 @@ msgid ""
 "Inactive"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:864
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:885
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:853
 msgid "Adapter settings"
 msgstr ""
@@ -733,18 +734,18 @@ msgid ""
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/TitleList.py:88
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:135
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:148
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/TitleList.py:88
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:135
 msgid "Advanced Options"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:150
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:163
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:150
 msgid "Advanced Software"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:154
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:167
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:154
 msgid "Advanced Software Plugin"
 msgstr ""
@@ -759,13 +760,13 @@ msgstr ""
 msgid "Advanced Video Setup"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:137
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:150
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:137
 msgid "Advanced restore"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TaskView.py:57
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:194
+#: ../enigma2_experimental/lib/python/Screens/TaskView.py:59
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:195
 #: ../enigma2_master/lib/python/Screens/TaskView.py:57
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:194
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:528
@@ -778,29 +779,29 @@ msgstr ""
 msgid "Album"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:701
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:843
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:708
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:850
 #: ../enigma2_experimental/lib/python/Screens/MovieSelection.py:207
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:526
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:701
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:843
 #: ../enigma2_master/lib/python/Screens/MovieSelection.py:207
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:526
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:178
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:198
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:180
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:200
 #: ../enigma2_plugins/mytube/src/plugin.py:71
 #: ../enigma2_plugins/mytube/src/plugin.py:91
 msgid "All"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1109
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1110
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1101
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1102
 #: ../enigma2_master/lib/python/Components/NimManager.py:1074
 #: ../enigma2_master/lib/python/Components/NimManager.py:1075
 msgid "All Satellites"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:166
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:168
 #: ../enigma2_plugins/mytube/src/plugin.py:59
 msgid "All Time"
 msgstr ""
@@ -813,6 +814,10 @@ msgstr ""
 msgid "Allow zapping via Webinterface"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:53
+msgid "Always ask"
+msgstr ""
+
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:20
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:20
 msgid "Always ask before sending"
@@ -831,7 +836,7 @@ msgstr ""
 msgid "An error occured."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/Task.py:348
+#: ../enigma2_experimental/lib/python/Components/Task.py:347
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:180
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:290
 #: ../enigma2_master/lib/python/Components/Task.py:348
@@ -857,7 +862,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:269
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:271
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:269
 msgid ""
 "Are you sure you want to delete\n"
@@ -869,21 +874,21 @@ msgstr ""
 msgid "Are you sure you want to exit this wizard?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:794
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:815
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:783
 msgid ""
 "Are you sure you want to restart your network interfaces?\n"
 "\n"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:255
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:256
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:255
 msgid ""
 "Are you sure you want to restore\n"
 "following backup:\n"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:221
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:242
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:221
 msgid ""
 "Are you sure you want to restore your Enigma2 backup?\n"
@@ -901,7 +906,7 @@ msgstr ""
 msgid "Artist"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:226
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:228
 #: ../enigma2_plugins/mytube/src/plugin.py:119
 msgid "Ascending"
 msgstr ""
@@ -919,8 +924,8 @@ msgstr ""
 #: ../enigma2_master/lib/python/Components/UsageConfig.py:41
 #: ../enigma2_master/lib/python/Components/UsageConfig.py:43
 #: ../enigma2_master/lib/python/Components/UsageConfig.py:45
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:247
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:250
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:249
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:252
 #: ../enigma2_plugins/mytube/src/plugin.py:139
 #: ../enigma2_plugins/mytube/src/plugin.py:142
 msgid "Ask user"
@@ -934,7 +939,7 @@ msgstr ""
 msgid "Aspect Ratio"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/Network.py:347
+#: ../enigma2_experimental/lib/python/Components/Network.py:348
 msgid "Atheros"
 msgstr ""
 
@@ -951,14 +956,14 @@ msgstr ""
 msgid "Audio Sync Setup"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:199
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:206
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:201
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:208
 #: ../enigma2_plugins/mytube/src/plugin.py:92
 #: ../enigma2_plugins/mytube/src/plugin.py:99
 msgid "Australia"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:998
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1187
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:998
 #: ../enigma2_plugins/mytube/src/plugin.py:1338
 msgid "Author: "
@@ -982,7 +987,7 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:671
 #: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:677
 #: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:683
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1087
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1079
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:10
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:15
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:26
@@ -1077,7 +1082,7 @@ msgstr ""
 msgid "Automatic Scan"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:180
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:182
 #: ../enigma2_plugins/mytube/src/plugin.py:73
 msgid "Autos & Vehicles"
 msgstr ""
@@ -1091,28 +1096,29 @@ msgstr ""
 msgid "Available format variables"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1114
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1106
 #: ../enigma2_master/lib/python/Components/NimManager.py:1079
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "B"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1090
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1082
 #: ../enigma2_master/lib/python/Components/NimManager.py:1055
 msgid "BA"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1090
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1082
 #: ../enigma2_master/lib/python/Components/NimManager.py:1055
 msgid "BB"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1242
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1247
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1252
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1257
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1262
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:448
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1270
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1275
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1280
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1285
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1290
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:507
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:648
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1231
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1236
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1241
@@ -1127,12 +1133,12 @@ msgstr ""
 msgid "Background"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:284
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:305
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:284
 msgid "Backup done."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:286
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:307
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:286
 msgid "Backup failed."
 msgstr ""
@@ -1146,12 +1152,12 @@ msgstr ""
 msgid "Backup is running..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:118
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:131
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:118
 msgid "Backup system settings"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1113
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1105
 #: ../enigma2_master/lib/python/Components/NimManager.py:1078
 msgid "Band"
 msgstr ""
@@ -1184,7 +1190,7 @@ msgid "Begin time"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:262
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:78
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:80
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:262
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:78
 msgid "Bitrate:"
@@ -1209,7 +1215,7 @@ msgstr ""
 msgid "Bouquets"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:200
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:202
 #: ../enigma2_plugins/mytube/src/plugin.py:93
 msgid "Brazil"
 msgstr ""
@@ -1256,7 +1262,7 @@ msgstr ""
 msgid "Bus: "
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1019
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1011
 #: ../enigma2_master/lib/python/Components/NimManager.py:986
 msgid "C-Band"
 msgstr ""
@@ -1281,7 +1287,7 @@ msgstr ""
 msgid "CVBS"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:958
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:965
 #: ../enigma2_experimental/lib/python/Components/ServiceScan.py:69
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:48
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:476
@@ -1301,11 +1307,12 @@ msgstr ""
 msgid "Can't connect to server. Please check your network!"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:201
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:203
 #: ../enigma2_plugins/mytube/src/plugin.py:94
 msgid "Canada"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:171
 #: ../enigma2_experimental/lib/python/Screens/LocationBox.py:94
 #: ../enigma2_experimental/lib/python/Screens/LocationBox.py:128
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:239
@@ -1315,21 +1322,24 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Screens/RecordPaths.py:24
 #: ../enigma2_experimental/lib/python/Screens/Setup.py:84
 #: ../enigma2_experimental/lib/python/Screens/TimeDateInput.py:14
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:30
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:31
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:60
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:108
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py:41
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:52
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:25
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:67
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:27
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:69
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/PicturePlayer/plugin.py:164
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:367
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py:582
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:177
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:293
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:561
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:717
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:115
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:205
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:753
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1312
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:351
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:953
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1521
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py:102
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py:47
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py:302
@@ -1380,7 +1390,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:305
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:305
 msgid "Cannot parse feed directory"
 msgstr ""
@@ -1417,8 +1426,6 @@ msgstr ""
 msgid "Change default recording offset?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:187
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:223
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:187
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:223
 msgid "Change dir."
@@ -1428,7 +1435,7 @@ msgstr ""
 msgid "Change hostname"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:191
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:198
 #: ../enigma2_experimental/lib/python/Screens/ParentalControlSetup.py:311
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:191
 #: ../enigma2_master/lib/python/Screens/ParentalControlSetup.py:311
@@ -1459,11 +1466,15 @@ msgstr ""
 msgid "Change the hostname of your Dreambox."
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:756
+msgid "Changelog"
+msgstr ""
+
 #: ../enigma2_experimental/lib/python/Screens/AudioSelection.py:83
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:261
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:273
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:284
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:184
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:185
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/DVDTitle.py:21
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:117
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py:97
@@ -1501,17 +1512,17 @@ msgstr ""
 msgid "Channels"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:416
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:429
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:416
 msgid "Chap."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:417
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:430
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:417
 msgid "Chapter"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:152
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:165
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:152
 msgid "Chapter:"
 msgstr ""
@@ -1526,29 +1537,33 @@ msgstr ""
 msgid "Checking Filesystem..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:222
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:224
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:222
 msgid "Choose a wireless network"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:139
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:152
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:139
 msgid "Choose backup files"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:138
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:151
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:138
 msgid "Choose backup location"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:230
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:735
+msgid "Choose image to download"
+msgstr ""
+
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:231
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:230
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:331
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:452
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:459
 msgid "Choose target folder"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:142
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:155
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:142
 msgid "Choose upgrade source"
 msgstr ""
@@ -1602,19 +1617,20 @@ msgstr ""
 msgid "Clear before scan"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:431
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:438
 msgid "Clear history on Exit:"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:398
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:414
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:398
 msgid "Clear log"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:49
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:39
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:696
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1070
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1328
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1098
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1356
 #: ../enigma2_experimental/lib/python/Screens/TaskView.py:51
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/TitleList.py:186
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/PicturePlayer/plugin.py:60
@@ -1624,17 +1640,20 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:417
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:525
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:77
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:399
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:495
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py:30
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:158
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:353
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:466
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:851
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:931
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1225
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1422
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1658
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:93
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:203
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:171
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:471
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:553
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:666
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1051
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1130
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1434
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1645
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1913
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:95
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:205
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:64
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:685
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1059
@@ -1659,8 +1678,8 @@ msgstr ""
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1658
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:93
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:203
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:391
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:555
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:398
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:562
 #: ../enigma2_plugins/mytube/src/plugin.py:281
 #: ../enigma2_plugins/mytube/src/plugin.py:1280
 #: ../enigma2_plugins/mytube/src/plugin.py:1466
@@ -1723,7 +1742,7 @@ msgstr ""
 msgid "Color Format"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:187
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:189
 #: ../enigma2_plugins/mytube/src/plugin.py:80
 msgid "Comedy"
 msgstr ""
@@ -1745,12 +1764,12 @@ msgstr ""
 msgid "Common Interface Assignment"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:636
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:836
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:636
 msgid "CommonInterface"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:650
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:850
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:650
 msgid "Communication"
 msgstr ""
@@ -1788,7 +1807,7 @@ msgstr ""
 msgid "Configuration Mode"
 msgstr ""
 
-#: ../enigma2_plugins/webinterface/src/plugin.py:499
+#: ../enigma2_plugins/webinterface/src/plugin.py:540
 msgid "Configuration for the Webinterface"
 msgstr ""
 
@@ -1806,8 +1825,8 @@ msgstr ""
 msgid "Configure your wireless LAN again"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Ipkg.py:99
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1161
+#: ../enigma2_experimental/lib/python/Screens/Ipkg.py:106
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1366
 #: ../enigma2_master/lib/python/Screens/Ipkg.py:99
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1161
 msgid "Configuring"
@@ -1819,13 +1838,13 @@ msgid "Conflicting timer"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/Modem/plugin.py:274
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:204
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:206
 #: ../enigma2_master/lib/python/Plugins/Extensions/Modem/plugin.py:274
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:204
 msgid "Connect"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:401
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:466
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:401
 msgid "Connect to a Wireless Network"
 msgstr ""
@@ -1851,7 +1870,7 @@ msgstr ""
 msgid "Content does not fit on DVD!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:512
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:525
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:512
 msgid "Continue playing"
 msgstr ""
@@ -1864,7 +1883,7 @@ msgstr ""
 msgid "Contrast"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:277
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:646
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:277
 msgid "Could not connect to Dreambox .NFI Image Feed Server:"
 msgstr ""
@@ -1874,7 +1893,7 @@ msgstr ""
 msgid "Could not load Medium! No disc inserted?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:215
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:222
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:215
 msgid "Could not open Picture in Picture"
 msgstr ""
@@ -1952,16 +1971,21 @@ msgstr ""
 msgid "Croatian"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:979
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:986
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:979
 msgid "Current Transponder"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:223
+msgid "Current device: "
+msgstr ""
+
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:362
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:351
 msgid "Current settings:"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:225
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py:113
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py:330
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py:113
@@ -1974,6 +1998,10 @@ msgstr ""
 msgid "Current version:"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:738
+msgid "Currently installed image"
+msgstr ""
+
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:287
 #, python-format
 msgid "Custom (%s)"
@@ -2002,12 +2030,12 @@ msgstr ""
 msgid "Czech"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:202
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:204
 #: ../enigma2_plugins/mytube/src/plugin.py:95
 msgid "Czech Republic"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1307
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1335
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1295
 msgid "DHCP"
 msgstr ""
@@ -2035,7 +2063,7 @@ msgstr ""
 msgid "DVD File Browser"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:702
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:715
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:702
 msgid "DVD Player"
 msgstr ""
@@ -2060,7 +2088,7 @@ msgid "Danish"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimeDateInput.py:46
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:170
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:171
 #: ../enigma2_master/lib/python/Screens/TimeDateInput.py:46
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:170
 msgid "Date"
@@ -2105,7 +2133,7 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:638
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:838
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:638
 msgid "Default Settings"
 msgstr ""
@@ -2139,7 +2167,7 @@ msgstr ""
 msgid "Delete crashlogs"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:395
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:411
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:502
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:395
 #: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:502
@@ -2167,12 +2195,12 @@ msgid ""
 "%s?"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:227
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:229
 #: ../enigma2_plugins/mytube/src/plugin.py:120
 msgid "Descending"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:141
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:142
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/DVDTitle.py:20
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:117
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py:81
@@ -2192,16 +2220,18 @@ msgstr ""
 msgid "Deselect"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:221
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:221
 msgid "Destination directory"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:957
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:957
 msgid "Details for extension: "
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1154
+msgid "Details for plugin: "
+msgstr ""
+
 #: ../enigma2_experimental/lib/python/Screens/About.py:34
 #: ../enigma2_master/lib/python/Screens/About.py:34
 msgid "Detected HDD:"
@@ -2213,14 +2243,14 @@ msgid "Detected NIMs:"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:515
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1097
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1089
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:501
 #: ../enigma2_master/lib/python/Components/NimManager.py:1062
 msgid "DiSEqC A/B"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:515
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1097
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1089
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:501
 #: ../enigma2_master/lib/python/Components/NimManager.py:1062
 msgid "DiSEqC A/B/C/D"
@@ -2266,7 +2296,7 @@ msgstr ""
 msgid "Directory %s nonexistent."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:41
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:43
 #: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/settings.py:41
 msgid "Directory browser"
 msgstr ""
@@ -2300,8 +2330,8 @@ msgid "Disable timer"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/SleepTimerEdit.py:32
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:104
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:478
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:105
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:471
 #: ../enigma2_master/lib/python/Screens/SleepTimerEdit.py:32
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:104
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:478
@@ -2338,12 +2368,12 @@ msgstr ""
 msgid "Display >16:9 content as"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:646
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:846
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:646
 msgid "Display and Userinterface"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:412
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:419
 msgid "Display search results by:"
 msgstr ""
 
@@ -2422,20 +2452,25 @@ msgstr ""
 msgid "Do you want to burn this collection to DVD medium?"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:560
+#, python-format
+msgid "Do you want to download the image to %s ?"
+msgstr ""
+
 #: ../enigma2_plugins/networkbrowser/src/NetworkBrowser.py:391
 #: ../enigma2_plugins/networkbrowser/src/NetworkBrowser.py:393
 #: ../enigma2_plugins/networkbrowser/src/NetworkBrowser.py:406
 msgid "Do you want to enter a username and password for this host?\n"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1056
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1501
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1249
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1756
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1056
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1501
 msgid "Do you want to install the package:\n"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:595
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:608
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:595
 msgid "Do you want to play DVD in drive?"
 msgstr ""
@@ -2445,12 +2480,12 @@ msgstr ""
 msgid "Do you want to preview this DVD before burning?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:697
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1063
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1078
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1200
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1508
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1530
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:897
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1256
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1271
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1409
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1763
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1785
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:697
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1063
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1078
@@ -2460,8 +2495,8 @@ msgstr ""
 msgid "Do you want to reboot your Dreambox?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1050
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1493
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1243
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1748
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1050
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1493
 msgid "Do you want to remove the package:\n"
@@ -2490,7 +2525,7 @@ msgid ""
 "if needed?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:212
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:233
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:212
 msgid "Do you want to update your Dreambox?"
 msgstr ""
@@ -2504,7 +2539,7 @@ msgid ""
 "After pressing OK, please wait!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1497
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1752
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1497
 msgid "Do you want to upgrade the package:\n"
 msgstr ""
@@ -2519,28 +2554,36 @@ msgstr ""
 msgid "Don't stop current event but disable coming events"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1181
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1390
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1181
 #, python-format
 msgid "Done - Installed or upgraded %d packages"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Ipkg.py:57
+#: ../enigma2_experimental/lib/python/Screens/Ipkg.py:58
 #: ../enigma2_master/lib/python/Screens/Ipkg.py:57
 #, python-format
 msgid "Done - Installed, upgraded or removed %d packages with %d errors"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:185
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:316
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:499
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:508
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:185
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:316
 msgid "Download"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:681
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py:23
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py:27
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:523
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:724
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:731
+#, python-format
+msgid "Download %s from Server"
+msgstr ""
+
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:31
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:812
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py:20
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py:24
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:681
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py:23
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py:27
@@ -2556,11 +2599,10 @@ msgstr ""
 msgid "Download Video"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:428
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:435
 msgid "Download location"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:456
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:456
 msgid "Download of USB flasher boot image failed: "
 msgstr ""
@@ -2570,8 +2612,10 @@ msgstr ""
 msgid "Downloadable new plugins"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Ipkg.py:82
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1148
+#: ../enigma2_experimental/lib/python/Screens/Ipkg.py:83
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:73
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:101
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1343
 #: ../enigma2_master/lib/python/Screens/Ipkg.py:82
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1148
 msgid "Downloading"
@@ -2591,7 +2635,7 @@ msgstr ""
 msgid "Dreambox format data DVD (HDTV compatible)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:782
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:982
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:782
 msgid "Dreambox software because updates are available."
 msgstr ""
@@ -2611,7 +2655,7 @@ msgstr ""
 msgid "Dynamic contrast"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:966
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:973
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:397
 #: ../enigma2_experimental/lib/python/Components/ServiceScan.py:51
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:484
@@ -2632,14 +2676,14 @@ msgstr ""
 msgid "ERROR - failed to scan (%s)!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1104
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1096
 #: ../enigma2_master/lib/python/Components/NimManager.py:1069
 msgid "East"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEdit.py:424
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:34
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1226
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1435
 #: ../enigma2_master/lib/python/Screens/TimerEdit.py:424
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:34
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1226
@@ -2696,21 +2740,21 @@ msgstr ""
 msgid "Edit services list"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1325
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1353
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:510
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:64
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:66
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1313
 #: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:510
 #: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/settings.py:64
 msgid "Edit settings"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:829
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:850
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:818
 msgid "Edit the Nameserver configuration of your Dreambox.\n"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:825
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:846
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:814
 msgid "Edit the network configuration of your Dreambox.\n"
 msgstr ""
@@ -2720,7 +2764,7 @@ msgstr ""
 msgid "Edit title"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1351
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1560
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1351
 msgid "Edit upgrade source url."
 msgstr ""
@@ -2733,12 +2777,12 @@ msgstr ""
 msgid "Editor for new AutoTimers"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:191
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:193
 #: ../enigma2_plugins/mytube/src/plugin.py:84
 msgid "Education"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:648
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:848
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:648
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Electronic Program Guide"
@@ -2814,7 +2858,7 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/SleepTimerEdit.py:30
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:109
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:482
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:475
 #: ../enigma2_master/lib/python/Screens/SleepTimerEdit.py:30
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:109
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:482
@@ -2830,7 +2874,7 @@ msgid ""
 "you're searching for special characters like the german umlauts."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:274
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:276
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:274
 msgid "Encrypted: "
 msgstr ""
@@ -2858,7 +2902,7 @@ msgid "Encryption Type"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:263
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:79
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:81
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:263
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:79
 msgid "Encryption:"
@@ -2880,7 +2924,7 @@ msgstr ""
 msgid "End time"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:180
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:181
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:180
 msgid "EndTime"
 msgstr ""
@@ -2936,7 +2980,7 @@ msgstr ""
 msgid "Enter share name:"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:191
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:198
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:191
 msgid "Enter the service pin"
 msgstr ""
@@ -2959,16 +3003,16 @@ msgstr ""
 msgid "Enter your search term(s)"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:190
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:192
 #: ../enigma2_plugins/mytube/src/plugin.py:83
 msgid "Entertainment"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/Task.py:285
+#: ../enigma2_experimental/lib/python/Components/Task.py:284
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:224
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:413
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1190
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1468
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:613
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1399
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1723
 #: ../enigma2_master/lib/python/Components/Task.py:285
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:224
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:413
@@ -2982,7 +3026,7 @@ msgstr ""
 msgid "Error executing plugin"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/Task.py:283
+#: ../enigma2_experimental/lib/python/Components/Task.py:282
 #: ../enigma2_master/lib/python/Components/Task.py:283
 #, python-format
 msgid ""
@@ -3038,8 +3082,7 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:32
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/TitleList.py:130
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:512
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:183
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:525
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:32
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/TitleList.py:130
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:512
@@ -3052,6 +3095,11 @@ msgstr ""
 msgid "Exit editor"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:60
+#: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:66
+msgid "Exit input device selection."
+msgstr ""
+
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:159
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:407
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:159
@@ -3074,27 +3122,27 @@ msgstr ""
 msgid "Expert"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:887
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:908
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:876
 msgid "Extended Networksetup Plugin..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:883
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:904
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:872
 msgid "Extended Setup..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:128
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:141
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:128
 msgid "Extended Software"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:132
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:145
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:132
 msgid "Extended Software Plugin"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:374
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:574
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:374
 msgid "Extensions management"
 msgstr ""
@@ -3143,7 +3191,7 @@ msgstr ""
 msgid "Fan %d Voltage"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1106
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1098
 #: ../enigma2_master/lib/python/Components/NimManager.py:1071
 msgid "Fast"
 msgstr ""
@@ -3153,12 +3201,12 @@ msgstr ""
 msgid "Fast DiSEqC"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1106
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1098
 #: ../enigma2_master/lib/python/Components/NimManager.py:1071
 msgid "Fast epoch"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:704
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:711
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:528
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:704
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:528
@@ -3179,7 +3227,7 @@ msgstr ""
 msgid "Filesystem contains uncorrectable errors"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:179
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:181
 #: ../enigma2_plugins/mytube/src/plugin.py:72
 msgid "Film & Animation"
 msgstr ""
@@ -3198,7 +3246,7 @@ msgstr ""
 msgid "Finished configuring your network"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:947
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:975
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:936
 #: ../enigma2_plugins/networkbrowser/src/MountManager.py:132
 msgid "Finished restarting your network"
@@ -3209,25 +3257,23 @@ msgstr ""
 msgid "Finnish"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:435
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:435
 msgid ""
 "First we need to download the latest boot environment for the USB flasher."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:186
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:300
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:167
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:186
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:300
 msgid "Flash"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:296
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:211
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:296
 msgid "Flashing failed"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:755
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:955
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:755
 msgid "Following tasks will be done after you press OK!"
 msgstr ""
@@ -3250,7 +3296,7 @@ msgstr ""
 msgid "Frame size in full view"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:203
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:205
 #: ../enigma2_plugins/mytube/src/plugin.py:96
 msgid "France"
 msgstr ""
@@ -3281,7 +3327,7 @@ msgstr ""
 msgid "Frequency"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1411
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1391
 #: ../enigma2_master/lib/python/Components/NimManager.py:1351
 msgid "Frequency bands"
 msgstr ""
@@ -3291,7 +3337,7 @@ msgstr ""
 msgid "Frequency scan step size(khz)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1411
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1391
 #: ../enigma2_master/lib/python/Components/NimManager.py:1351
 msgid "Frequency steps"
 msgstr ""
@@ -3307,8 +3353,8 @@ msgstr ""
 msgid "Fri"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:123
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:166
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:124
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:167
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:123
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:166
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:48
@@ -3338,7 +3384,7 @@ msgid ""
 "Do you want to Restart the GUI now?"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:186
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:188
 #: ../enigma2_plugins/mytube/src/plugin.py:79
 msgid "Gaming"
 msgstr ""
@@ -3385,11 +3431,19 @@ msgstr ""
 msgid "German"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:204
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:206
 #: ../enigma2_plugins/mytube/src/plugin.py:97
 msgid "Germany"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:731
+msgid "Get latest experimental image"
+msgstr ""
+
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:724
+msgid "Get latest release image"
+msgstr ""
+
 #: ../enigma2_experimental/lib/python/Screens/PluginBrowser.py:124
 #: ../enigma2_master/lib/python/Screens/PluginBrowser.py:124
 msgid "Getting plugin information. Please wait..."
@@ -3416,7 +3470,7 @@ msgstr ""
 msgid "Graphical Multi EPG"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:205
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:207
 #: ../enigma2_plugins/mytube/src/plugin.py:98
 msgid "Great Britain"
 msgstr ""
@@ -3445,7 +3499,7 @@ msgstr ""
 msgid "Guess existing timer based on begin/end"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:235
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:237
 #: ../enigma2_plugins/mytube/src/plugin.py:128
 #: ../enigma2_plugins/mytube/src/plugin.py:790
 msgid "HD videos"
@@ -3474,10 +3528,14 @@ msgstr ""
 msgid "Hidden network SSID"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:79
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:81
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:441
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:443
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:75
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:77
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:83
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:85
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:430
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:432
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:438
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:440
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:79
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:81
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:441
@@ -3504,12 +3562,12 @@ msgstr ""
 msgid "History"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:207
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:209
 #: ../enigma2_plugins/mytube/src/plugin.py:100
 msgid "Holland"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:208
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:210
 #: ../enigma2_plugins/mytube/src/plugin.py:101
 msgid "Hong Kong"
 msgstr ""
@@ -3529,7 +3587,7 @@ msgstr ""
 msgid "How to handle found crashlogs?"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:192
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:194
 #: ../enigma2_plugins/mytube/src/plugin.py:85
 msgid "Howto & Style"
 msgstr ""
@@ -3546,7 +3604,7 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:364
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:497
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1313
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1341
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:353
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:486
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1301
@@ -3604,7 +3662,6 @@ msgid ""
 "If you are happy with the result, press OK."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:52
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:52
 msgid "Image flash utility"
 msgstr ""
@@ -3626,7 +3683,7 @@ msgstr ""
 msgid "In Progress"
 msgstr ""
 
-#: ../enigma2_experimental/RecordTimer.py:250
+#: ../enigma2_experimental/RecordTimer.py:253
 #: ../enigma2_master/RecordTimer.py:241
 msgid ""
 "In order to record a timer, the TV was switched to the recording service!\n"
@@ -3659,7 +3716,7 @@ msgstr ""
 msgid "Increased voltage"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:209
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:211
 #: ../enigma2_plugins/mytube/src/plugin.py:102
 msgid "India"
 msgstr ""
@@ -3695,26 +3752,30 @@ msgstr ""
 msgid "Input"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:452
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1001
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1659
+#: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:154
+msgid "Input device setup"
+msgstr ""
+
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:652
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1190
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1914
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:452
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1001
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1659
 msgid "Install"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1692
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1947
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1692
 msgid "Install extensions."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:120
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:133
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:120
 msgid "Install local extension"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:697
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:897
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:697
 msgid "Install or remove finished."
 msgstr ""
@@ -3724,14 +3785,14 @@ msgstr ""
 msgid "Install settings, skins, software..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1063
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1256
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1063
 msgid "Installation finished."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Ipkg.py:91
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:794
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1157
+#: ../enigma2_experimental/lib/python/Screens/Ipkg.py:94
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:994
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1354
 #: ../enigma2_master/lib/python/Screens/Ipkg.py:91
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:794
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1157
@@ -3756,7 +3817,7 @@ msgstr ""
 msgid "Integrated Wireless"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:274
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:276
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:274
 msgid "Interface: "
 msgstr ""
@@ -3771,7 +3832,7 @@ msgstr ""
 msgid "Internal Flash"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/Network.py:339
+#: ../enigma2_experimental/lib/python/Components/Network.py:340
 msgid "Internal LAN adapter."
 msgstr ""
 
@@ -3819,12 +3880,12 @@ msgstr ""
 msgid "Inversion"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1711
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1966
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1711
 msgid "Ipkg"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:210
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:212
 #: ../enigma2_plugins/mytube/src/plugin.py:103
 msgid "Ireland"
 msgstr ""
@@ -3834,7 +3895,7 @@ msgstr ""
 msgid "Is this videomode ok?"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:211
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:213
 #: ../enigma2_plugins/mytube/src/plugin.py:104
 msgid "Israel"
 msgstr ""
@@ -3844,12 +3905,12 @@ msgstr ""
 msgid "Italian"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:212
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:214
 #: ../enigma2_plugins/mytube/src/plugin.py:105
 msgid "Italy"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:213
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:215
 #: ../enigma2_plugins/mytube/src/plugin.py:106
 msgid "Japan"
 msgstr ""
@@ -3872,13 +3933,13 @@ msgstr ""
 msgid "Key %(key)s (current value: %(value)i ms)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1291
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1319
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1279
 msgid "LAN Adapter"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/Network.py:325
-#: ../enigma2_experimental/lib/python/Components/Network.py:328
+#: ../enigma2_experimental/lib/python/Components/Network.py:326
+#: ../enigma2_experimental/lib/python/Components/Network.py:329
 msgid "LAN connection"
 msgstr ""
 
@@ -3937,7 +3998,7 @@ msgstr ""
 msgid "Latvian"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:519
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:532
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:519
 msgid "Leave DVD Player?"
 msgstr ""
@@ -3976,14 +4037,14 @@ msgid "Limits on"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:260
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:76
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:78
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:260
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:76
 msgid "Link Quality:"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:846
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:144
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:867
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:146
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:835
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:144
 msgid "Link:"
@@ -3996,7 +4057,9 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Components/config.py:1138
 #: ../enigma2_experimental/lib/python/Components/FileList.py:177
-#: ../enigma2_experimental/lib/python/Components/FileList.py:394
+#: ../enigma2_experimental/lib/python/Components/FileList.py:397
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:561
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:717
 #: ../enigma2_master/lib/python/Components/config.py:1137
 #: ../enigma2_master/lib/python/Components/FileList.py:177
 #: ../enigma2_master/lib/python/Components/FileList.py:394
@@ -4013,7 +4076,7 @@ msgstr ""
 msgid "Load"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:416
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:423
 msgid "Load feed on startup:"
 msgstr ""
 
@@ -4021,7 +4084,7 @@ msgstr ""
 msgid "Load movie-length"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1300
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1328
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1288
 msgid "Local Network"
 msgstr ""
@@ -4030,7 +4093,7 @@ msgstr ""
 msgid "Local share name"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:187
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:188
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:187
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:191
 msgid "Location"
@@ -4094,7 +4157,7 @@ msgid "Make this mark just a mark"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/PluginBrowser.py:70
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:115
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:128
 #: ../enigma2_master/lib/python/Screens/PluginBrowser.py:70
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:115
 msgid "Manage extensions"
@@ -4108,8 +4171,8 @@ msgstr ""
 msgid "Manage your network shares..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1710
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1714
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1965
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1969
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1710
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1714
 msgid "Manage your receiver's software"
@@ -4144,7 +4207,7 @@ msgstr ""
 msgid "Match title: %s"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:274
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:276
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:274
 msgid "Max. Bitrate: "
 msgstr ""
@@ -4159,7 +4222,7 @@ msgid ""
 "time (without offset) it won't be matched."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:959
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:964
 #: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:959
 msgid "Media player"
 msgstr ""
@@ -4194,7 +4257,7 @@ msgstr ""
 msgid "Menu"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:214
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:216
 #: ../enigma2_plugins/mytube/src/plugin.py:107
 msgid "Mexico"
 msgstr ""
@@ -4246,13 +4309,13 @@ msgstr ""
 msgid "Mon"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:108
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:109
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:108
 msgid "Mon-Fri"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:123
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:162
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:124
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:163
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:123
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:162
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:44
@@ -4272,13 +4335,13 @@ msgstr ""
 msgid "Mosquito noise reduction"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:239
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:241
 #: ../enigma2_plugins/mytube/src/plugin.py:132
 #: ../enigma2_plugins/mytube/src/plugin.py:797
 msgid "Most discussed"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:241
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:243
 #: ../enigma2_plugins/mytube/src/plugin.py:134
 #: ../enigma2_plugins/mytube/src/plugin.py:798
 msgid "Most linked"
@@ -4288,19 +4351,19 @@ msgstr ""
 msgid "Most popular"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:243
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:245
 #: ../enigma2_plugins/mytube/src/plugin.py:136
 #: ../enigma2_plugins/mytube/src/plugin.py:796
 msgid "Most recent"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:242
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:244
 #: ../enigma2_plugins/mytube/src/plugin.py:135
 #: ../enigma2_plugins/mytube/src/plugin.py:800
 msgid "Most responded"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:236
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:238
 #: ../enigma2_plugins/mytube/src/plugin.py:129
 #: ../enigma2_plugins/mytube/src/plugin.py:794
 msgid "Most viewed"
@@ -4422,7 +4485,7 @@ msgstr ""
 msgid "Multi EPG"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:644
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:844
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:644
 msgid "Multimedia"
 msgstr ""
@@ -4437,7 +4500,7 @@ msgstr ""
 msgid "Multisat"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:181
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:183
 #: ../enigma2_plugins/mytube/src/plugin.py:74
 msgid "Music"
 msgstr ""
@@ -4461,13 +4524,13 @@ msgstr ""
 msgid "MyTubePlayer Help"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:568
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:584
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:575
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:591
 msgid "MyTubePlayer active video downloads"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:405
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:408
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:412
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:415
 msgid "MyTubePlayer settings"
 msgstr ""
 
@@ -4484,10 +4547,10 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:394
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:398
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:402
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:696
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:701
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:828
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:242
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:688
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:693
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:820
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:234
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:376
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:380
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:383
@@ -4500,14 +4563,14 @@ msgstr ""
 msgid "N/A"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py:22
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py:26
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py:19
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py:23
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py:22
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py:26
 msgid "NFI Image Flashing"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:289
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:202
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:289
 msgid "NFI image flashing completed. Press Yellow to Reboot!"
 msgstr ""
@@ -4521,12 +4584,12 @@ msgstr ""
 msgid "NTSC"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:140
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:141
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:140
 msgid "Name"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1319
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1347
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1307
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Nameserver"
@@ -4538,7 +4601,7 @@ msgstr ""
 msgid "Nameserver %d"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:865
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:886
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:854
 msgid "Nameserver settings"
 msgstr ""
@@ -4551,7 +4614,7 @@ msgstr ""
 msgid "Netmask"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:634
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:834
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:634
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Network"
@@ -4583,18 +4646,18 @@ msgstr ""
 msgid "Network scan"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:866
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:887
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:855
 msgid "Network test"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1277
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1305
 msgid "Network test: "
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:372
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:844
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:142
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:865
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:144
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:361
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:833
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:142
@@ -4606,7 +4669,7 @@ msgid "NetworkBrowser"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:150
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:892
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:913
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:139
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:881
 msgid "NetworkWizard"
@@ -4616,14 +4679,14 @@ msgstr ""
 msgid "Never"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:950
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:957
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:950
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:814
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:1017
 msgid "New"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:215
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:217
 #: ../enigma2_plugins/mytube/src/plugin.py:108
 msgid "New Zealand"
 msgstr ""
@@ -4638,7 +4701,7 @@ msgstr ""
 msgid "New version:"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:189
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:191
 #: ../enigma2_plugins/mytube/src/plugin.py:82
 msgid "News & Politics"
 msgstr ""
@@ -4653,7 +4716,7 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Screens/InfoBar.py:169
 #: ../enigma2_experimental/lib/python/Screens/InfoBar.py:176
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:401
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:270
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:272
 #: ../enigma2_master/lib/python/Screens/Ci.py:25
 #: ../enigma2_master/lib/python/Screens/Ci.py:27
 #: ../enigma2_master/lib/python/Screens/InfoBar.py:169
@@ -4661,7 +4724,7 @@ msgstr ""
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:389
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:270
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:292
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:174
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:176
 #: ../enigma2_plugins/mytube/src/plugin.py:67
 #: ../enigma2_plugins/mytube/src/plugin.py:620
 #: ../enigma2_plugins/mytube/src/plugin.py:626 ../enigma2_experimental/data/
@@ -4677,9 +4740,9 @@ msgstr ""
 msgid "No (supported) DVDROM found!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:75
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:437
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:460
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:70
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:425
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:454
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:75
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:437
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:460
@@ -4703,14 +4766,12 @@ msgid ""
 "(Timeout reading PAT)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:991
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1185
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:991
 msgid "No description available."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:326
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:341
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:197
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:180
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:326
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:341
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:197
@@ -4741,8 +4802,8 @@ msgstr ""
 msgid "No free tuner!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:201
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:435
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:214
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:635
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:201
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:435
 msgid "No network connection available."
@@ -4759,7 +4820,7 @@ msgstr ""
 msgid "No networks found"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1187
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1396
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1187
 msgid ""
 "No packages were upgraded yet. So you can check your network and try again."
@@ -4801,7 +4862,6 @@ msgid ""
 "Please setup your tuner settings before you start a service scan."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:515
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:515
 msgid "No useable USB stick found"
 msgstr ""
@@ -4826,7 +4886,7 @@ msgstr ""
 msgid "No videos to display"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:353
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:355
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:353
 msgid "No wireless networks found! Please refresh."
 msgstr ""
@@ -4872,6 +4932,10 @@ msgstr ""
 msgid "No, but switch to video search."
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:52
+msgid "No, never"
+msgstr ""
+
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:277
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:277
 msgid "No, not now"
@@ -4885,11 +4949,11 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:591
 #: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:634
 #: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:679
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1090
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1093
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1082
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1085
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1106
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1108
 #: ../enigma2_experimental/lib/python/Components/NimManager.py:1114
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1116
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1122
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:14
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:61
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:107
@@ -4916,12 +4980,12 @@ msgstr ""
 msgid "Nonlinear"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:193
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:195
 #: ../enigma2_plugins/mytube/src/plugin.py:86
 msgid "Nonprofits & Activism"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1105
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1097
 #: ../enigma2_master/lib/python/Components/NimManager.py:1070
 msgid "North"
 msgstr ""
@@ -4931,7 +4995,7 @@ msgstr ""
 msgid "Norwegian"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/Task.py:369
+#: ../enigma2_experimental/lib/python/Components/Task.py:368
 #: ../enigma2_master/lib/python/Components/Task.py:369
 #, python-format
 msgid ""
@@ -4972,12 +5036,13 @@ msgstr ""
 msgid "Number of scheduled recordings left."
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:172
 #: ../enigma2_experimental/lib/python/Screens/LocationBox.py:91
 #: ../enigma2_experimental/lib/python/Screens/ParentalControlSetup.py:58
 #: ../enigma2_experimental/lib/python/Screens/ParentalControlSetup.py:335
 #: ../enigma2_experimental/lib/python/Screens/Setup.py:85
 #: ../enigma2_experimental/lib/python/Screens/TimeDateInput.py:13
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:29
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:30
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:61
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:109
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:221
@@ -4985,6 +5050,7 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:53
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/PicturePlayer/plugin.py:165
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py:583
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:352
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py:103
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py:48
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py:303
@@ -5033,7 +5099,7 @@ msgstr ""
 msgid "OSD visibility"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1113
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1105
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:12
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:46
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:59
@@ -5058,7 +5124,7 @@ msgstr ""
 msgid "Offset before recording (in m)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1113
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1105
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:11
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:45
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:58
@@ -5081,7 +5147,7 @@ msgstr ""
 msgid "On same service"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1122
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1114
 #: ../enigma2_master/lib/python/Components/NimManager.py:1087
 msgid "One"
 msgstr ""
@@ -5095,7 +5161,7 @@ msgstr ""
 msgid "Only Free scan"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:754
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:954
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:754
 msgid "Only extensions."
 msgstr ""
@@ -5136,6 +5202,14 @@ msgstr ""
 msgid "Override found with alternative service"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:365
+msgid "Overwrite configuration files ?"
+msgstr ""
+
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:376
+msgid "Overwrite configuration files during software upgrade?"
+msgstr ""
+
 #: ../enigma2_experimental/lib/python/Components/AVSwitch.py:112
 #: ../enigma2_master/lib/python/Components/AVSwitch.py:112
 msgid "PAL"
@@ -5146,21 +5220,21 @@ msgstr ""
 msgid "PIDs"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:410
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1131
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1464
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:610
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1326
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1719
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:410
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1131
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1464
 msgid "Package list update"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:141
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:154
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:141
 msgid "Packet management"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1456
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1711
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1456
 msgid "Packet manager"
 msgstr ""
@@ -5180,7 +5254,7 @@ msgid "Pan&Scan"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Components/FileList.py:179
-#: ../enigma2_experimental/lib/python/Components/FileList.py:396
+#: ../enigma2_experimental/lib/python/Components/FileList.py:399
 #: ../enigma2_master/lib/python/Components/FileList.py:179
 #: ../enigma2_master/lib/python/Components/FileList.py:396
 msgid "Parent Directory"
@@ -5214,12 +5288,12 @@ msgstr ""
 msgid "Pause movie at end"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:188
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:190
 #: ../enigma2_plugins/mytube/src/plugin.py:81
 msgid "People & Blogs"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:182
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:184
 #: ../enigma2_plugins/mytube/src/plugin.py:75
 msgid "Pets & Animals"
 msgstr ""
@@ -5261,20 +5335,20 @@ msgid "Play"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:490
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:1029
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:1034
 #: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:490
 #: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:1029
 msgid "Play Audio-CD..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:518
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:743
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:531
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:756
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:518
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:743
 msgid "Play DVD"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:1017
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:1022
 #: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:1017
 msgid "Play Music..."
 msgstr ""
@@ -5283,7 +5357,7 @@ msgstr ""
 msgid "Play YouTube movies"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:247
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:249
 #: ../enigma2_plugins/mytube/src/plugin.py:139
 msgid "Play next video"
 msgstr ""
@@ -5293,7 +5367,7 @@ msgstr ""
 msgid "Play recorded movies..."
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:247
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:249
 #: ../enigma2_plugins/mytube/src/plugin.py:139
 msgid "Play video again"
 msgstr ""
@@ -5318,12 +5392,11 @@ msgstr ""
 msgid "Please change recording endtime"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:277
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:646
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:277
 msgid "Please check your network settings!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:217
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:217
 msgid "Please choose .NFI image file from feed server to download"
 msgstr ""
@@ -5340,7 +5413,6 @@ msgstr ""
 msgid "Please choose he package..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:489
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:489
 msgid ""
 "Please disconnect all USB devices from your Dreambox and (re-)attach the "
@@ -5352,12 +5424,12 @@ msgstr ""
 msgid "Please do not change any values unless you know what you are doing!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:179
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:186
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:179
 msgid "Please enter a name for the new bouquet"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:253
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:260
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:253
 msgid "Please enter a name for the new marker"
 msgstr ""
@@ -5401,7 +5473,7 @@ msgstr ""
 msgid "Please enter your search term."
 msgstr ""
 
-#: ../enigma2_experimental/RecordTimer.py:380
+#: ../enigma2_experimental/RecordTimer.py:383
 #: ../enigma2_master/RecordTimer.py:371
 msgid ""
 "Please note that the previously selected media could not be accessed and "
@@ -5424,9 +5496,6 @@ msgstr ""
 msgid "Please provide a Text to match"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:53
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:87
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:249
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:53
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:87
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:249
@@ -5447,7 +5516,7 @@ msgstr ""
 msgid "Please select a standard feed or try searching for videos."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:334
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:350
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:334
 msgid "Please select a subservice to record..."
 msgstr ""
@@ -5459,6 +5528,10 @@ msgstr ""
 msgid "Please select a subservice..."
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:103
+msgid "Please select an NFI file and press green key to flash!"
+msgstr ""
+
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CleanupWizard/CleanupWizard.py:143
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CleanupWizard/CleanupWizard.py:151
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/CleanupWizard/CleanupWizard.py:143
@@ -5466,7 +5539,7 @@ msgstr ""
 msgid "Please select an option below."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:247
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:268
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:247
 msgid "Please select medium to use as backup location"
 msgstr ""
@@ -5476,7 +5549,6 @@ msgstr ""
 msgid "Please select tag to filter..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:207
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:207
 msgid "Please select target directory or medium"
 msgstr ""
@@ -5554,21 +5626,21 @@ msgstr ""
 msgid "Please wait while we test your network..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:934
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:962
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:923
 #: ../enigma2_plugins/networkbrowser/src/MountManager.py:119
 msgid "Please wait while your network is restarting..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1171
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1194
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1201
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:136
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:137
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1199
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1222
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1229
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:138
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:139
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:140
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:141
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:142
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:143
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1160
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1183
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1190
@@ -5583,17 +5655,18 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/MovieSelection.py:185
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:67
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:404
 #: ../enigma2_master/lib/python/Screens/MovieSelection.py:185
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:67
 msgid "Please wait... Loading list..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:761
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:961
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:761
 msgid "Plugin manager activity information"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:858
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1058
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:858
 msgid "Plugin manager help"
 msgstr ""
@@ -5603,7 +5676,7 @@ msgstr ""
 msgid "Plugin: %(plugin)s , Version: %(version)s"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:216
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:218
 #: ../enigma2_plugins/mytube/src/plugin.py:109
 msgid "Poland"
 msgstr ""
@@ -5618,7 +5691,7 @@ msgid "Polarity"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ServiceInfo.py:141
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1112
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1104
 #: ../enigma2_master/lib/python/Screens/ServiceInfo.py:141
 #: ../enigma2_master/lib/python/Components/NimManager.py:1077
 msgid "Polarization"
@@ -5663,7 +5736,7 @@ msgid "Portuguese"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:535
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1098
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1090
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:521
 #: ../enigma2_master/lib/python/Components/NimManager.py:1063
 msgid "Positioner"
@@ -5711,14 +5784,27 @@ msgstr ""
 msgid "Predefined transponder"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:736
+msgid "Prepare another USB stick for image flashing"
+msgstr ""
+
 #: ../enigma2_experimental/lib/python/Screens/Ipkg.py:21
 #: ../enigma2_master/lib/python/Screens/Ipkg.py:21
 msgid "Preparing... Please wait"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:123
+msgid "Press INFO on your remote control for additional information."
+msgstr ""
+
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:122
+msgid "Press MENU on your remote control for additional options."
+msgstr ""
+
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:34
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:330
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:704
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1311
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:59
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:319
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:693
@@ -5746,6 +5832,7 @@ msgstr ""
 msgid "Press OK to edit selected settings."
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:47
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:35
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:60
 #: ../enigma2_plugins/networkbrowser/src/MountView.py:62
@@ -5800,12 +5887,11 @@ msgstr ""
 msgid "Press OK to start the scan"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1660
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1915
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1660
 msgid "Press OK to toggle the selection."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:342
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:342
 msgid "Press OK to view full changelog"
 msgstr ""
@@ -5843,7 +5929,7 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:475
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:675
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:475
 msgid "Process"
 msgstr ""
@@ -5865,9 +5951,9 @@ msgstr ""
 msgid "Protect setup"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:703
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:839
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1413
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:710
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:846
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1393
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:703
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:839
 #: ../enigma2_master/lib/python/Components/NimManager.py:1353
@@ -5879,14 +5965,14 @@ msgstr ""
 msgid "Provider to scan"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:948
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:955
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:470
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:948
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:470
 msgid "Providers"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:161
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:163
 #: ../enigma2_plugins/mytube/src/plugin.py:54
 msgid "Published"
 msgstr ""
@@ -5915,7 +6001,8 @@ msgstr ""
 msgid "RGB"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/Network.py:351
+#: ../enigma2_experimental/lib/python/Components/Network.py:352
+#: ../enigma2_experimental/lib/python/Components/Network.py:354
 msgid "Ralink"
 msgstr ""
 
@@ -5929,7 +6016,7 @@ msgstr ""
 msgid "Random"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:162
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:164
 #: ../enigma2_plugins/mytube/src/plugin.py:55
 msgid "Rating"
 msgstr ""
@@ -5938,10 +6025,12 @@ msgstr ""
 msgid "Ratings: "
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:263
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:652
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:440
 #: ../enigma2_experimental/lib/python/Components/ConfigList.py:237
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:221
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:408
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py:174
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:641
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:426
@@ -5985,12 +6074,12 @@ msgstr ""
 msgid "Really shutdown now?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:292
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:223
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:292
 msgid "Reboot"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:238
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:240
 #: ../enigma2_plugins/mytube/src/plugin.py:131
 #: ../enigma2_plugins/mytube/src/plugin.py:799
 msgid "Recently featured"
@@ -6032,7 +6121,7 @@ msgstr ""
 msgid "Recording(s) are in progress or coming up in few seconds!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:632
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:832
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:632
 msgid "Recordings"
 msgstr ""
@@ -6051,12 +6140,12 @@ msgstr ""
 msgid "Related video entries."
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:159
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:161
 #: ../enigma2_plugins/mytube/src/plugin.py:52
 msgid "Relevance"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1423
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1646
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1423
 msgid "Reload"
 msgstr ""
@@ -6076,7 +6165,7 @@ msgstr ""
 msgid "Remember service pin cancel"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1003
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1192
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1003
 msgid "Remove"
 msgstr ""
@@ -6103,8 +6192,8 @@ msgstr ""
 msgid "Remove currently selected title"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1078
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1508
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1271
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1763
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1078
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1508
 msgid "Remove finished."
@@ -6119,12 +6208,10 @@ msgstr ""
 msgid "Remove selected AutoTimer"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:419
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:419
 msgid "Remove the broken .NFI file?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:367
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:367
 msgid "Remove the incomplete .NFI file?"
 msgstr ""
@@ -6151,8 +6238,9 @@ msgstr ""
 msgid "Remove title"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Ipkg.py:95
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:796
+#: ../enigma2_experimental/lib/python/Screens/Ipkg.py:100
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:996
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1360
 #: ../enigma2_master/lib/python/Screens/Ipkg.py:95
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:796
 msgid "Removing"
@@ -6174,7 +6262,7 @@ msgstr ""
 msgid "Rename crashlogs"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:144
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:145
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:144
 msgid "Repeat Type"
 msgstr ""
@@ -6184,7 +6272,7 @@ msgstr ""
 msgid "Repeating event currently recording... What do you want to do?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:150
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:151
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:150
 msgid "Repeats"
 msgstr ""
@@ -6246,19 +6334,19 @@ msgstr ""
 msgid "Restart GUI now?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:867
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:888
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:856
 msgid "Restart network"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1271
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1394
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1299
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1422
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1260
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1382
 msgid "Restart test"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:835
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:856
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:824
 msgid "Restart your network connection and interfaces.\n"
 msgstr ""
@@ -6273,21 +6361,22 @@ msgstr ""
 msgid "Restore backups"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:310
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:318
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:217
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:312
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:320
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:322
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:310
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:318
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:320
 msgid "Restore is running..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:263
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:264
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:263
 msgid "Restore running"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:119
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:132
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:119
 msgid "Restore system settings"
 msgstr ""
@@ -6319,7 +6408,7 @@ msgstr ""
 msgid "Resuming playback"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:514
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:527
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:514
 msgid "Return to file browser"
 msgstr ""
@@ -6328,8 +6417,8 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Components/UsageConfig.py:45
 #: ../enigma2_master/lib/python/Components/UsageConfig.py:43
 #: ../enigma2_master/lib/python/Components/UsageConfig.py:45
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:247
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:250
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:249
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:252
 #: ../enigma2_plugins/mytube/src/plugin.py:139
 #: ../enigma2_plugins/mytube/src/plugin.py:142
 msgid "Return to movie list"
@@ -6373,7 +6462,7 @@ msgstr ""
 msgid "Running"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:217
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:219
 #: ../enigma2_plugins/mytube/src/plugin.py:110
 msgid "Russia"
 msgstr ""
@@ -6394,7 +6483,7 @@ msgid "SINGLE LAYER DVD"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:259
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:75
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:77
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:259
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:75
 msgid "SSID:"
@@ -6439,13 +6528,13 @@ msgstr ""
 msgid "Satellite Equipment Setup"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:640
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:840
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:640
 msgid "Satellite equipment"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:702
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:841
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:709
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:848
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:702
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:841
 msgid "Satellites"
@@ -6469,8 +6558,8 @@ msgstr ""
 msgid "Saturation"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:123
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:167
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:124
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:168
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:123
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:167
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:49
@@ -6481,12 +6570,12 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:112
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:221
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:224
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:68
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:70
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CleanupWizard/plugin.py:58
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:368
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:78
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:116
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1313
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1522
 #: ../enigma2_master/lib/python/Screens/RecordPaths.py:25
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:112
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:221
@@ -6500,7 +6589,7 @@ msgstr ""
 #: ../enigma2_plugins/ac3lipsync/src/AC3setup.py:64
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:812
 #: ../enigma2_plugins/autotimer/src/AutoTimerOverview.py:74
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:392
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:399
 msgid "Save"
 msgstr ""
 
@@ -6588,7 +6677,7 @@ msgstr ""
 msgid "Scan SR6900"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:876
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:897
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:865
 msgid "Scan Wireless Networks"
 msgstr ""
@@ -6670,7 +6759,7 @@ msgid ""
 "selected wireless device.\n"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:831
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:852
 msgid ""
 "Scan your network for wireless access points and connect to them using your "
 "selected wireless device.\n"
@@ -6682,7 +6771,7 @@ msgid ""
 "Scans default lamedbs sorted by satellite with a connected dish positioner"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:194
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:196
 #: ../enigma2_plugins/mytube/src/plugin.py:87
 msgid "Science & Technology"
 msgstr ""
@@ -6691,7 +6780,7 @@ msgstr ""
 msgid "Search Term(s)"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:414
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:421
 msgid "Search category:"
 msgstr ""
 
@@ -6708,11 +6797,11 @@ msgstr ""
 msgid "Search for network shares..."
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:415
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:422
 msgid "Search region:"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:413
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:420
 msgid "Search restricted content:"
 msgstr ""
 
@@ -6729,12 +6818,12 @@ msgstr ""
 msgid "Search west"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:407
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:607
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:407
 msgid "Searching for available updates. Please wait..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:410
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:610
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:410
 msgid "Searching for new installed or removed packages. Please wait..."
 msgstr ""
@@ -6752,6 +6841,7 @@ msgstr ""
 msgid "Security service not running."
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:50
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:40
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:155
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:65
@@ -6787,7 +6877,8 @@ msgstr ""
 msgid "Select bouquet to record on"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:224
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:225
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:272
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:224
 msgid "Select channel to record from"
 msgstr ""
@@ -6796,7 +6887,14 @@ msgstr ""
 msgid "Select channel to record on"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:139
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:735
+msgid "Select desired image from feed list"
+msgstr ""
+
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:152
+msgid "Select files for backup."
+msgstr ""
+
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:139
 msgid "Select files for backup. Currently selected:\n"
 msgstr ""
@@ -6806,13 +6904,20 @@ msgstr ""
 msgid "Select files/folders to backup"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:189
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:213
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:189
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:213
 msgid "Select image"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:78
+msgid "Select input device"
+msgstr ""
+
+#: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:61
+#: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:67
+msgid "Select input device."
+msgstr ""
+
 #: ../enigma2_plugins/mytube/src/plugin.py:802
 msgid "Select new feed to view."
 msgstr ""
@@ -6840,7 +6945,7 @@ msgstr ""
 msgid "Select type of Filter"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1255
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1464
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1255
 msgid "Select upgrade source to edit."
 msgstr ""
@@ -6854,7 +6959,6 @@ msgstr ""
 msgid "Select your choice."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:211
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:211
 msgid "Selected source image"
 msgstr ""
@@ -6933,12 +7037,12 @@ msgstr ""
 msgid "Serviceinfo"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:952
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:959
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:952
 msgid "Services"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:177
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:178
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:177
 msgid "Set End Time"
 msgstr ""
@@ -7003,7 +7107,7 @@ msgstr ""
 msgid "Setup for the Audio Sync Plugin"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:239
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:151
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:239
 #, python-format
 msgid ""
@@ -7016,7 +7120,7 @@ msgstr ""
 msgid "Sharpness"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:185
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:187
 #: ../enigma2_plugins/mytube/src/plugin.py:78
 msgid "Short Movies"
 msgstr ""
@@ -7038,11 +7142,11 @@ msgid ""
 "Should timers created by this AutoTimer be recorded to a custom location?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1294
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1304
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1310
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1316
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1322
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1332
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1338
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1344
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1350
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1282
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1292
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1298
@@ -7051,7 +7155,7 @@ msgstr ""
 msgid "Show Info"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:878
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:899
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:867
 msgid "Show WLAN Status"
 msgstr ""
@@ -7075,7 +7179,7 @@ msgstr ""
 msgid "Show the tv player..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:833
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:854
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:822
 msgid "Shows the state of your wireless LAN connection.\n"
 msgstr ""
@@ -7092,13 +7196,13 @@ msgid "Shutdown Dreambox after"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:261
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:77
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:79
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:261
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:77
 msgid "Signal Strength:"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:274
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:276
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:274
 msgid "Signal: "
 msgstr ""
@@ -7124,7 +7228,7 @@ msgid "Simple titleset (compatibility for legacy players)"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:515
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1096
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1088
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:501
 #: ../enigma2_master/lib/python/Components/NimManager.py:1061
 msgid "Single"
@@ -7159,7 +7263,7 @@ msgstr ""
 msgid "Skin"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:630
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:830
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:630
 msgid "Skins"
 msgstr ""
@@ -7200,20 +7304,20 @@ msgstr ""
 msgid "Slovenian"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1106
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1098
 #: ../enigma2_master/lib/python/Components/NimManager.py:1071
 msgid "Slow"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:642
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:842
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:642
 msgid "Software"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:180
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1703
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1710
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1714
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:193
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1958
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1965
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1969
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:180
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1703
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1710
@@ -7221,27 +7325,35 @@ msgstr ""
 msgid "Software management"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:117
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:339
+msgid "Software manager setup"
+msgstr ""
+
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:130
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:117
 msgid "Software restore"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:116
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:129
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:116
 msgid "Software update"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:480
+msgid "Softwaremanager information"
+msgstr ""
+
 #: ../enigma2_experimental/lib/python/Screens/PluginBrowser.py:52
 #: ../enigma2_master/lib/python/Screens/PluginBrowser.py:52
 msgid "Some plugins are not available:\n"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:229
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:250
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:229
 msgid "Sorry MediaScanner is not installed!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:223
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:244
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:223
 msgid "Sorry no backups found!"
 msgstr ""
@@ -7255,7 +7367,7 @@ msgid ""
 "Please choose an other one."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:531
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:731
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:531
 msgid "Sorry, no Details available!"
 msgstr ""
@@ -7264,7 +7376,7 @@ msgstr ""
 msgid "Sorry, video is not available!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:280
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:301
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:280
 msgid ""
 "Sorry, your backup destination is not writeable.\n"
@@ -7289,17 +7401,17 @@ msgstr ""
 msgid "Sort Time"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1105
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1097
 #: ../enigma2_master/lib/python/Components/NimManager.py:1070
 msgid "South"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:218
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:220
 #: ../enigma2_plugins/mytube/src/plugin.py:111
 msgid "South Korea"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:219
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:221
 #: ../enigma2_plugins/mytube/src/plugin.py:112
 msgid "Spain"
 msgstr ""
@@ -7314,7 +7426,7 @@ msgstr ""
 msgid "Split preview mode"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:183
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:185
 #: ../enigma2_plugins/mytube/src/plugin.py:76
 msgid "Sports"
 msgstr ""
@@ -7358,21 +7470,21 @@ msgstr ""
 msgid "Start recording?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1329
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1357
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1317
 msgid "Start test"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:419
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:426
 msgid "Start with following feed:"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:174
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:175
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:174
 msgid "StartTime"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:152
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:153
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:152
 msgid "Starting on"
 msgstr ""
@@ -7446,8 +7558,8 @@ msgstr ""
 msgid "Stop playing this movie?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1158
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1330
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1186
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1358
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1147
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1318
 msgid "Stop test"
@@ -7506,8 +7618,8 @@ msgstr ""
 msgid "Sun"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:123
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:168
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:124
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:169
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:123
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:168
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:50
@@ -7519,7 +7631,7 @@ msgstr ""
 msgid "Swap Services"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:220
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:222
 #: ../enigma2_plugins/mytube/src/plugin.py:113
 msgid "Sweden"
 msgstr ""
@@ -7564,7 +7676,7 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Screens/ServiceInfo.py:135
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:437
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:75
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:628
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:828
 #: ../enigma2_master/lib/python/Screens/ScanSetup.py:348
 #: ../enigma2_master/lib/python/Screens/ServiceInfo.py:135
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:437
@@ -7601,7 +7713,7 @@ msgid "Tag 2"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/MovieSelection.py:334
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:188
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:189
 #: ../enigma2_master/lib/python/Screens/MovieSelection.py:334
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:188
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:556
@@ -7617,7 +7729,7 @@ msgstr ""
 msgid "Tags: "
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:221
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:223
 #: ../enigma2_plugins/mytube/src/plugin.py:114
 msgid "Taiwan"
 msgstr ""
@@ -7629,7 +7741,7 @@ msgstr ""
 msgid "Temperature and Fan control"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:960
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:967
 #: ../enigma2_experimental/lib/python/Components/ServiceScan.py:81
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:70
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:478
@@ -7659,7 +7771,7 @@ msgstr ""
 msgid "Test again"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:827
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:848
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:816
 msgid "Test the network configuration of your Dreambox.\n"
 msgstr ""
@@ -7691,13 +7803,18 @@ msgid ""
 "Please install it."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:604
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:604
 msgid ""
 "The USB stick is now bootable. Do you want to download the latest image from "
 "the feed server and save it on the stick?"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:601
+msgid ""
+"The USB stick was prepared to be bootable.\n"
+"Now you can download an NFI image file!"
+msgstr ""
+
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:480
 msgid ""
 "The counter can automatically be reset to the limit at certain intervals."
@@ -7717,7 +7834,7 @@ msgid ""
 "the classic editor."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:517
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:716
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:517
 #, python-format
 msgid ""
@@ -7749,7 +7866,10 @@ msgstr ""
 msgid "The match attribute is mandatory."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:243
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:27
+msgid "The md5sum validation failed, the file may be corrupted!"
+msgstr ""
+
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:243
 msgid ""
 "The md5sum validation failed, the file may be corrupted! Are you sure that "
@@ -7757,7 +7877,6 @@ msgid ""
 "risk!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:419
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:419
 msgid ""
 "The md5sum validation failed, the file may be downloaded incompletely or be "
@@ -7780,7 +7899,7 @@ msgstr ""
 msgid "The pin code has been changed successfully."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:198
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:205
 #: ../enigma2_experimental/lib/python/Screens/ParentalControlSetup.py:37
 #: ../enigma2_experimental/lib/python/Components/ParentalControl.py:236
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:198
@@ -7810,15 +7929,15 @@ msgstr ""
 msgid "The sleep timer has been disabled."
 msgstr ""
 
-#: ../enigma2_experimental/RecordTimer.py:498
+#: ../enigma2_experimental/RecordTimer.py:501
 #: ../enigma2_master/RecordTimer.py:489
 msgid "The timer file (timers.xml) is corrupt and could not be loaded."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:750
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:770
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:784
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:903
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:777
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:798
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:924
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:739
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:759
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:773
@@ -7828,7 +7947,7 @@ msgid ""
 "Please install it."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:627
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:614
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:627
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/
@@ -7836,11 +7955,18 @@ msgid ""
 "The wizard can backup your current settings. Do you want to do a backup now?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:191
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:196
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:426
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:460
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:471
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:207
+#, python-format
+msgid ""
+"The wizard found a configuration backup. Do you want to restore your old "
+"settings from %s?"
+msgstr ""
+
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:204
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:209
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:626
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:660
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:671
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:191
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:196
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:426
@@ -7849,14 +7975,14 @@ msgstr ""
 msgid "There are at least "
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:464
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:477
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:664
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:677
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:464
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:477
 msgid "There are currently no outstanding actions."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:428
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:628
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:428
 msgid "There are no updates available."
 msgstr ""
@@ -7875,8 +8001,8 @@ msgid ""
 "Do you really want to continue?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:413
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1468
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:613
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1723
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:413
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1468
 msgid "There was an error downloading the packetlist. Please try again."
@@ -7897,20 +8023,17 @@ msgid ""
 "apply this update now?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:231
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:231
 #, python-format
 msgid "This .NFI file does not contain a valid %s image!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:229
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:229
 msgid ""
 "This .NFI file does not have a md5sum signature and is not guaranteed to "
 "work. Do you really want to burn this image to flash memory?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:241
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:241
 msgid ""
 "This .NFI file has a valid md5 signature. Continue programming this image to "
@@ -7932,12 +8055,12 @@ msgstr ""
 msgid "This Dreambox can't decode %s streams!"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:167
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:169
 #: ../enigma2_plugins/mytube/src/plugin.py:60
 msgid "This Month"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:168
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:170
 #: ../enigma2_plugins/mytube/src/plugin.py:61
 msgid "This Week"
 msgstr ""
@@ -7965,22 +8088,33 @@ msgid ""
 "uses."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:877
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:693
+msgid ""
+"This plugin creates a USB stick which can be used to update the firmware of "
+"your Dreambox without the need for a network or WLAN connection.\n"
+"First, a USB stick needs to be prepared so that it becomes bootable.\n"
+"In the next step, an NFI image file can be downloaded from the update server "
+"and saved on the USB stick.\n"
+"If you already have a prepared bootable USB stick, please insert it now. "
+"Otherwise plug in a USB stick with a minimum size of 64 MB!"
+msgstr ""
+
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1077
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:877
 msgid "This plugin is installed."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:879
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1079
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:879
 msgid "This plugin is not installed."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:881
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1081
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:881
 msgid "This plugin will be installed."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:883
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1083
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:883
 msgid "This plugin will be removed."
 msgstr ""
@@ -7989,7 +8123,7 @@ msgstr ""
 msgid "This setting controls the behavior when a timer matches a found event."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1259
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1287
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1248
 msgid ""
 "This test checks for configured Nameservers.\n"
@@ -7999,7 +8133,7 @@ msgid ""
 "the \"Nameserver\" Configuration"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1244
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1272
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1233
 msgid ""
 "This test checks whether a network cable is connected to your LAN-Adapter.\n"
@@ -8008,7 +8142,7 @@ msgid ""
 "- verify that the cable is not broken"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1254
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1282
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1243
 msgid ""
 "This test checks whether a valid IP Address is found for your LAN Adapter.\n"
@@ -8017,7 +8151,7 @@ msgid ""
 "- please check your DHCP, cabling and adapter setup"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1249
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1277
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1238
 msgid ""
 "This test checks whether your LAN Adapter is set up for automatic IP Address "
@@ -8030,7 +8164,7 @@ msgid ""
 "-verify that you have a configured and working DHCP Server in your network."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1239
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1267
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1228
 msgid "This test detects your configured LAN-Adapter."
 msgstr ""
@@ -8042,7 +8176,7 @@ msgid ""
 "but add it disabled."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1122
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1114
 #: ../enigma2_master/lib/python/Components/NimManager.py:1087
 msgid "Three"
 msgstr ""
@@ -8070,8 +8204,8 @@ msgstr ""
 msgid "Thumbnails"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:123
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:165
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:124
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:166
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:123
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:165
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:47
@@ -8091,12 +8225,12 @@ msgstr ""
 msgid "Time in minutes to prepend to recording."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:142
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:143
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:142
 msgid "Timer Type"
 msgstr ""
 
-#: ../enigma2_experimental/RecordTimer.py:520
+#: ../enigma2_experimental/RecordTimer.py:523
 #: ../enigma2_master/RecordTimer.py:511
 msgid ""
 "Timer overlap in timers.xml detected!\n"
@@ -8136,7 +8270,7 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:158
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py:80
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py:97
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:418
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:431
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:127
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/DVDTitle.py:19
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:117
@@ -8160,7 +8294,16 @@ msgstr ""
 msgid "Titleset mode"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:653
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:634
+msgid ""
+"To update your Dreambox firmware, please follow these steps:\n"
+"1) Turn off your box with the rear power switch and make sure the bootable "
+"USB stick is plugged in.\n"
+"2) Turn mains back on and hold the DOWN button on the front panel pressed "
+"for 10 seconds.\n"
+"3) Wait for bootup and follow instructions of the wizard."
+msgstr ""
+
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:653
 msgid ""
 "To update your Dreambox firmware, please follow these steps:\n"
@@ -8175,7 +8318,7 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Tools/FuzzyDate.py:10
 #: ../enigma2_master/lib/python/Screens/EpgSelection.py:336
 #: ../enigma2_master/lib/python/Tools/FuzzyDate.py:10
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:169
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:171
 #: ../enigma2_plugins/mytube/src/plugin.py:62
 msgid "Today"
 msgstr ""
@@ -8196,19 +8339,19 @@ msgid "Toneburst"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:515
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1096
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1088
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:501
 #: ../enigma2_master/lib/python/Components/NimManager.py:1061
 msgid "Toneburst A/B"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:240
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:242
 #: ../enigma2_plugins/mytube/src/plugin.py:133
 #: ../enigma2_plugins/mytube/src/plugin.py:793
 msgid "Top favorites"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:237
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:239
 #: ../enigma2_plugins/mytube/src/plugin.py:130
 #: ../enigma2_plugins/mytube/src/plugin.py:792
 msgid "Top rated"
@@ -8245,7 +8388,7 @@ msgstr ""
 msgid "Transponder Type"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:184
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:186
 #: ../enigma2_plugins/mytube/src/plugin.py:77
 msgid "Travel & Events"
 msgstr ""
@@ -8265,7 +8408,7 @@ msgstr ""
 msgid "Try to find used transponders in cable network.. please wait..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1464
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1719
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1464
 msgid "Trying to download a new packetlist. Please wait..."
 msgstr ""
@@ -8290,8 +8433,8 @@ msgstr ""
 msgid "Tue"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:123
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:163
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:124
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:164
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:123
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:163
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:45
@@ -8327,7 +8470,7 @@ msgstr ""
 msgid "Tuner"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:521
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:513
 #: ../enigma2_master/lib/python/Components/NimManager.py:488
 msgid "Tuner "
 msgstr ""
@@ -8347,7 +8490,7 @@ msgstr ""
 msgid "Turkish"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1122
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1114
 #: ../enigma2_master/lib/python/Components/NimManager.py:1087
 msgid "Two"
 msgstr ""
@@ -8369,7 +8512,7 @@ msgid "Type of scan"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:537
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1100
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1092
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:523
 #: ../enigma2_master/lib/python/Components/NimManager.py:1065
 msgid "USALS"
@@ -8380,14 +8523,13 @@ msgstr ""
 msgid "USB Stick"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:190
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:122
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:118
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:736
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:190
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:122
 msgid "USB stick wizard"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:314
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:314
 msgid ""
 "USB stick wizard finished. Your dreambox will now restart with your new "
@@ -8418,49 +8560,48 @@ msgstr ""
 msgid "Uncommitted DiSEqC command"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:456
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:656
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:456
 msgid "Undo install"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:454
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:654
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:454
 msgid "Undo uninstall"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1018
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1010
 msgid "Unicable"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1079
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1071
 #: ../enigma2_master/lib/python/Components/NimManager.py:1044
 msgid "Unicable LNB"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1080
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1137
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1072
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1129
 #: ../enigma2_master/lib/python/Components/NimManager.py:1045
 #: ../enigma2_master/lib/python/Components/NimManager.py:1102
 msgid "Unicable Martix"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:450
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:650
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:450
 msgid "Uninstall"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:222
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:224
 #: ../enigma2_plugins/mytube/src/plugin.py:115
 msgid "United States"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1017
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1009
 #: ../enigma2_master/lib/python/Components/NimManager.py:984
 msgid "Universal LNB"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/Network.py:353
-#: ../enigma2_experimental/lib/python/Components/Network.py:355
+#: ../enigma2_experimental/lib/python/Components/Network.py:358
 msgid "Unknown network adapter."
 msgstr ""
 
@@ -8476,15 +8617,15 @@ msgstr ""
 msgid "Unmount failed"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:465
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:476
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:459
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:469
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:465
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:476
 msgid "Unsupported"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:33
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:472
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:672
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:33
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:472
 msgid "Update"
@@ -8500,7 +8641,7 @@ msgid ""
 "ask you to update again."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:433
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:633
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:433
 msgid "Updatefeed not available."
 msgstr ""
@@ -8517,7 +8658,7 @@ msgstr ""
 msgid "Updating finished. Here is the result:"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:407
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:607
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:407
 msgid "Updating software catalog"
 msgstr ""
@@ -8533,23 +8674,23 @@ msgstr ""
 msgid "Updating... Please wait... This can take some minutes..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1200
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1530
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1409
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1785
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1200
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1530
 msgid "Upgrade finished."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Ipkg.py:87
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:798
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1153
+#: ../enigma2_experimental/lib/python/Screens/Ipkg.py:88
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:998
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1348
 #: ../enigma2_master/lib/python/Screens/Ipkg.py:87
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:798
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1153
 msgid "Upgrading"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1114
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1307
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1114
 msgid "Upgrading Dreambox... Please wait"
 msgstr ""
@@ -8564,7 +8705,8 @@ msgid ""
 "are not taken into account!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:26
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:28
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:319
 #: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/settings.py:26
 msgid "Use"
 msgstr ""
@@ -8601,11 +8743,19 @@ msgstr ""
 msgid "Use the Networkwizard to configure selected network adapter"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:837
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:858
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:826
 msgid "Use the Networkwizard to configure your Network\n"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:252
+msgid "Use this input device settings?"
+msgstr ""
+
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:397
+msgid "Use this settings?"
+msgstr ""
+
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py:164
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py:164
 msgid "Use this video enhancement settings?"
@@ -8626,10 +8776,10 @@ msgstr ""
 msgid "Used service scan type"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1020
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1081
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1137
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1139
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1012
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1073
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1129
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1131
 #: ../enigma2_master/lib/python/Components/NimManager.py:987
 #: ../enigma2_master/lib/python/Components/NimManager.py:1046
 #: ../enigma2_master/lib/python/Components/NimManager.py:1102
@@ -8711,7 +8861,7 @@ msgstr ""
 msgid "Video enhancement setup"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:421
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:428
 msgid "Videobrowser exit behavior:"
 msgstr ""
 
@@ -8720,16 +8870,16 @@ msgstr ""
 msgid "Videoenhancement Setup"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:420
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:427
 msgid "Videoplayer stop/exit behavior:"
 msgstr ""
 
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:160
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:162
 #: ../enigma2_plugins/mytube/src/plugin.py:53
 msgid "View Count"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:998
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:1003
 #: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:998
 msgid "View Movies..."
 msgstr ""
@@ -8739,12 +8889,12 @@ msgstr ""
 msgid "View Photos..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:1420
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:1427
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:1420
 msgid "View Rass interactive..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:1008
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:1013
 #: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:1008
 msgid "View Video CD..."
 msgstr ""
@@ -8753,72 +8903,72 @@ msgstr ""
 msgid "View active downloads"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:457
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:657
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:457
 msgid "View details"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:652
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:852
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:652
 msgid "View list of available "
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:636
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:836
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:636
 msgid "View list of available CommonInterface extensions"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:646
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:846
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:646
 msgid "View list of available Display and Userinterface extensions."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:648
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:848
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:648
 msgid "View list of available EPG extensions."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:640
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:840
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:640
 msgid "View list of available Satellite equipment extensions."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:650
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:850
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:650
 msgid "View list of available communication extensions."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:638
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:838
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:638
 msgid "View list of available default settings"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:644
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:844
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:644
 msgid "View list of available multimedia extensions."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:634
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:834
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:634
 msgid "View list of available networking extensions"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:632
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:832
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:632
 msgid "View list of available recording extensions"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:630
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:830
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:630
 msgid "View list of available skins"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:642
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:842
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:642
 msgid "View list of available software extensions"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:628
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:828
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:628
 msgid "View list of available system extensions"
 msgstr ""
@@ -8854,7 +9004,7 @@ msgstr ""
 msgid "Voltage mode"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:964
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:971
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:395
 #: ../enigma2_experimental/lib/python/Components/ServiceScan.py:49
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:482
@@ -8870,14 +9020,16 @@ msgstr ""
 msgid "WEP"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/Network.py:347
-#: ../enigma2_experimental/lib/python/Components/Network.py:349
-#: ../enigma2_experimental/lib/python/Components/Network.py:351
+#: ../enigma2_experimental/lib/python/Components/Network.py:348
+#: ../enigma2_experimental/lib/python/Components/Network.py:350
+#: ../enigma2_experimental/lib/python/Components/Network.py:352
+#: ../enigma2_experimental/lib/python/Components/Network.py:354
+#: ../enigma2_experimental/lib/python/Components/Network.py:356
 msgid "WLAN adapter."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/Network.py:332
-#: ../enigma2_experimental/lib/python/Components/Network.py:335
+#: ../enigma2_experimental/lib/python/Components/Network.py:333
+#: ../enigma2_experimental/lib/python/Components/Network.py:336
 msgid "WLAN connection"
 msgstr ""
 
@@ -8916,7 +9068,7 @@ msgstr ""
 msgid "Warn if free space drops below (kB):"
 msgstr ""
 
-#: ../enigma2_plugins/webinterface/src/plugin.py:499
+#: ../enigma2_plugins/webinterface/src/plugin.py:540
 msgid "Webinterface"
 msgstr ""
 
@@ -8935,15 +9087,15 @@ msgstr ""
 msgid "Wed"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:123
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:164
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:124
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:165
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:123
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:164
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:46
 msgid "Wednesday"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:159
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:160
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:159
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:52
 msgid "Weekday"
@@ -9001,7 +9153,7 @@ msgid ""
 "Press exit to get back to the input field."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1104
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1096
 #: ../enigma2_master/lib/python/Components/NimManager.py:1069
 msgid "West"
 msgstr ""
@@ -9037,17 +9189,17 @@ msgstr ""
 msgid "Wireless"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:401
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:466
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:401
 msgid "Wireless LAN"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1298
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1326
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1286
 msgid "Wireless Network"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:114
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:116
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:114
 msgid "Wireless Network State"
 msgstr ""
@@ -9068,7 +9220,7 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#: ../enigma2_experimental/RecordTimer.py:373
+#: ../enigma2_experimental/RecordTimer.py:376
 #: ../enigma2_master/RecordTimer.py:364
 msgid "Write error while recording. Disk full?\n"
 msgstr ""
@@ -9078,7 +9230,6 @@ msgstr ""
 msgid "Write failed!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:288
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:288
 msgid "Writing NFI image file to flash completed"
 msgstr ""
@@ -9101,7 +9252,9 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Screens/InfoBar.py:173
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:401
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:275
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:270
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:561
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:717
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:272
 #: ../enigma2_master/lib/python/Screens/Ci.py:25
 #: ../enigma2_master/lib/python/Screens/Ci.py:27
 #: ../enigma2_master/lib/python/Screens/InfoBar.py:168
@@ -9109,7 +9262,7 @@ msgstr ""
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:389
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:275
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:270
-#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:173
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:175
 #: ../enigma2_plugins/mytube/src/plugin.py:66
 #: ../enigma2_plugins/mytube/src/plugin.py:619
 #: ../enigma2_plugins/mytube/src/plugin.py:625
@@ -9126,6 +9279,10 @@ msgstr ""
 msgid "Yes to all"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:51
+msgid "Yes, always"
+msgstr ""
+
 #: ../enigma2_experimental/lib/python/Screens/InfoBar.py:175
 #: ../enigma2_master/lib/python/Screens/InfoBar.py:175
 msgid "Yes, and delete this movie"
@@ -9149,17 +9306,17 @@ msgstr ""
 msgid "Yes, returning to movie list"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:881
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1081
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:881
 msgid "You can cancel the installation."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:883
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1083
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:883
 msgid "You can cancel the removal."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:879
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1079
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:879
 msgid "You can install this plugin."
 msgstr ""
@@ -9169,7 +9326,7 @@ msgstr ""
 msgid "You can only burn Dreambox recordings!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:877
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1077
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:877
 msgid "You can remove this plugin."
 msgstr ""
@@ -9183,6 +9340,10 @@ msgstr ""
 msgid "You cannot delete this!"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:282
+msgid "You didn't select a channel to record from."
+msgstr ""
+
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:653
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:241
 #, python-format
@@ -9191,7 +9352,7 @@ msgid ""
 "Do you want to remove trailing whitespaces?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:434
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:715
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:434
 msgid ""
 "You have chosen to create a new .NFI flasher bootable USB stick. This will "
@@ -9239,7 +9400,7 @@ msgstr ""
 msgid "Your current collection will get lost!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1189
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1398
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1189
 msgid ""
 "Your dreambox isn't connected to the internet properly. Please check it and "
@@ -9306,26 +9467,26 @@ msgstr ""
 msgid "Zap back to service before tuner setup?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/Network.py:349
+#: ../enigma2_experimental/lib/python/Components/Network.py:350
 msgid "Zydas"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:558
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:565
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:558
 msgid "[alternative edit]"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:562
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:569
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:562
 msgid "[bouquet edit]"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:564
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:571
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:564
 msgid "[favourite edit]"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:656
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:663
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:656
 msgid "[move mode]"
 msgstr ""
@@ -9340,17 +9501,17 @@ msgstr ""
 msgid "a gui to assign services/providers/caids to common interface modules"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:164
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:171
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:164
 msgid "abort alternatives edit"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:158
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:165
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:158
 msgid "abort bouquet edit"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:161
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:168
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:161
 msgid "abort favourites edit"
 msgstr ""
@@ -9390,7 +9551,7 @@ msgstr ""
 msgid "add a nameserver entry"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:151
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:158
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:151
 msgid "add alternatives"
 msgstr ""
@@ -9400,7 +9561,7 @@ msgstr ""
 msgid "add bookmark"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:133
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:140
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:133
 msgid "add bouquet"
 msgstr ""
@@ -9424,7 +9585,7 @@ msgstr ""
 msgid "add filters"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:141
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:148
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:141
 msgid "add marker"
 msgstr ""
@@ -9457,12 +9618,12 @@ msgstr ""
 msgid "add recording (stop after current event)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:114
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:120
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:114
 msgid "add service to bouquet"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:116
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:123
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:116
 msgid "add service to favourites"
 msgstr ""
@@ -9478,7 +9639,7 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:63
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:543
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1387
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1367
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:63
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:529
 #: ../enigma2_master/lib/python/Components/NimManager.py:1327
@@ -9518,7 +9679,7 @@ msgstr ""
 msgid "audio tracks"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:101
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:102
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:101
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:241
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:29
@@ -9532,7 +9693,7 @@ msgstr ""
 msgid "available"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:166
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:173
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/CutListEditor/plugin.py:56
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:166
 #: ../enigma2_master/lib/python/Plugins/Extensions/CutListEditor/plugin.py:56
@@ -9604,7 +9765,6 @@ msgstr ""
 msgid "chapters"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:208
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:208
 msgid "choose destination directory"
 msgstr ""
@@ -9631,15 +9791,15 @@ msgstr ""
 msgid "complex"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1367
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1381
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1395
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1409
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1355
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1369
 msgid "confirmed"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1356
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1412
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1384
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1440
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:295
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1344
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1400
@@ -9647,11 +9807,12 @@ msgid "connected"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:756
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:504
 #: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:755
 msgid "continue"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:122
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:129
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:122
 msgid "copy to bouquets"
 msgstr ""
@@ -9666,7 +9827,12 @@ msgstr ""
 msgid "create directory"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:108
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:103
+#, python-format
+msgid "currently installed image: %s"
+msgstr ""
+
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:109
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:108
 msgid "daily"
 msgstr ""
@@ -9708,19 +9874,23 @@ msgstr ""
 msgid "delete..."
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1183
+msgid "description"
+msgstr ""
+
 #: ../enigma2_experimental/lib/python/Components/config.py:449
 #: ../enigma2_master/lib/python/Components/config.py:448
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:128
 msgid "disable"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:153
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:160
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:153
 msgid "disable move mode"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1185
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1454
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1213
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1434
 #: ../enigma2_experimental/lib/python/Components/TimerList.py:69
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1174
 #: ../enigma2_master/lib/python/Components/NimManager.py:1394
@@ -9728,9 +9898,9 @@ msgstr ""
 msgid "disabled"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1341
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1360
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1407
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1369
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1388
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1435
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1329
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1348
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1395
@@ -9744,7 +9914,7 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1656
 #: ../enigma2_experimental/lib/python/Screens/TaskView.py:51
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:101
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:102
 #: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1655
 #: ../enigma2_master/lib/python/Screens/TaskView.py:51
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:101
@@ -9765,7 +9935,7 @@ msgstr ""
 msgid "done!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:147
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:154
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:147
 msgid "edit alternatives"
 msgstr ""
@@ -9778,7 +9948,7 @@ msgstr ""
 msgid "edit services"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:549
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:541
 #: ../enigma2_master/lib/python/Components/NimManager.py:516
 msgid "empty"
 msgstr ""
@@ -9789,25 +9959,25 @@ msgstr ""
 msgid "enable"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:143
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:150
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:143
 msgid "enable bouquet edit"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:145
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:152
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:145
 msgid "enable favourite edit"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:139
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:146
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:139
 msgid "enable move mode"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1181
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1209
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:548
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1401
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1441
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1381
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1421
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1170
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:534
 #: ../enigma2_master/lib/python/Components/NimManager.py:1341
@@ -9815,12 +9985,12 @@ msgstr ""
 msgid "enabled"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:163
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:170
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:163
 msgid "end alternatives edit"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:157
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:164
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:157
 msgid "end bouquet edit"
 msgstr ""
@@ -9832,7 +10002,7 @@ msgstr ""
 msgid "end cut here"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:160
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:167
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:160
 msgid "end favourites edit"
 msgstr ""
@@ -9840,9 +10010,9 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:463
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:319
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:368
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:292
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:338
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:363
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:294
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:340
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:365
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:452
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:319
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:368
@@ -9854,7 +10024,7 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:68
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:508
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1389
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1369
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:68
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:494
 #: ../enigma2_master/lib/python/Components/NimManager.py:1329
@@ -9865,7 +10035,7 @@ msgstr ""
 msgid "exact match"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:333
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:346
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:333
 msgid "exit DVD player or return to file browser"
 msgstr ""
@@ -9908,11 +10078,6 @@ msgstr ""
 msgid "exit networkadapter setup menu"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:555
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:579
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:595
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:607
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:295
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:555
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:579
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:595
@@ -9938,7 +10103,7 @@ msgstr ""
 msgid "fine-tune your display"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:329
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:342
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:329
 msgid "forward to the next chapter"
 msgstr ""
@@ -9956,7 +10121,7 @@ msgid "free diskspace"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TaskView.py:48
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:98
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:99
 #: ../enigma2_master/lib/python/Screens/TaskView.py:48
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:98
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:240
@@ -9965,7 +10130,7 @@ msgid "go to deep standby"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TaskView.py:51
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:101
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:102
 #: ../enigma2_master/lib/python/Screens/TaskView.py:51
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:101
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:239
@@ -10052,12 +10217,12 @@ msgstr ""
 msgid "insert mark here"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:332
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:345
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:332
 msgid "jump back to the previous title"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:331
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:344
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:331
 msgid "jump forward to the next title"
 msgstr ""
@@ -10134,7 +10299,7 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:72
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:507
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1392
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1372
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:72
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:493
 #: ../enigma2_master/lib/python/Components/NimManager.py:1332
@@ -10142,7 +10307,7 @@ msgid "loopthrough to"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:539
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1100
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1092
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:525
 #: ../enigma2_master/lib/python/Components/NimManager.py:1065
 msgid "manual"
@@ -10161,7 +10326,7 @@ msgstr ""
 msgid "menu"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:839
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:860
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:828
 msgid "menulist"
 msgstr ""
@@ -10262,7 +10427,7 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:542
 #: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:928
 #: ../enigma2_experimental/lib/python/Screens/SleepTimerEdit.py:92
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:113
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:114
 #: ../enigma2_experimental/lib/python/Components/config.py:439
 #: ../enigma2_master/lib/python/Screens/MessageBox.py:44
 #: ../enigma2_master/lib/python/Screens/MessageBox.py:46
@@ -10332,16 +10497,17 @@ msgstr ""
 msgid "not locked"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1158
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1152
 #: ../enigma2_master/lib/python/Components/NimManager.py:1123
 msgid "not used"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:546
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1102
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1386
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1402
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1442
+#: ../enigma2_experimental/lib/python/Components/FileList.py:200
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1094
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1366
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1382
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1422
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:532
 #: ../enigma2_master/lib/python/Components/NimManager.py:1067
 #: ../enigma2_master/lib/python/Components/NimManager.py:1326
@@ -10399,7 +10565,7 @@ msgstr ""
 msgid "on Weekday"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:102
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:103
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:102
 msgid "once"
 msgstr ""
@@ -10477,7 +10643,7 @@ msgstr ""
 msgid "previous channel in history"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:96
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:97
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:96
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:187
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:182
@@ -10506,12 +10672,12 @@ msgstr ""
 msgid "remove after this position"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:149
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:156
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:149
 msgid "remove all alternatives"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:124
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:131
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:124
 msgid "remove all new found flags"
 msgstr ""
@@ -10531,8 +10697,8 @@ msgstr ""
 msgid "remove directory"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:126
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:134
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:133
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:141
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:126
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:134
 msgid "remove entry"
@@ -10543,12 +10709,12 @@ msgstr ""
 msgid "remove from parental protection"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:128
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:135
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:128
 msgid "remove new found flag"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:119
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:126
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:119
 msgid "remove selected satellite"
 msgstr ""
@@ -10558,17 +10724,17 @@ msgstr ""
 msgid "remove this mark"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:90
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:92
 #: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/settings.py:90
 msgid "repeat playlist"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:102
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:103
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:102
 msgid "repeated"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:330
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:343
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:330
 msgid "rewind to the previous chapter"
 msgstr ""
@@ -10578,7 +10744,7 @@ msgstr ""
 msgid "right"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:92
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:94
 #: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/settings.py:92
 msgid "save last directory on exit"
 msgstr ""
@@ -10588,7 +10754,7 @@ msgstr ""
 msgid "save playlist"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:91
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:93
 #: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/settings.py:91
 msgid "save playlist on exit"
 msgstr ""
@@ -10618,7 +10784,7 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:70
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:509
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1390
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1370
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:70
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:495
 #: ../enigma2_master/lib/python/Components/NimManager.py:1330
@@ -10643,7 +10809,6 @@ msgstr ""
 msgid "select"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:88
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:88
 msgid "select .NFI flash file"
 msgstr ""
@@ -10658,7 +10823,6 @@ msgstr ""
 msgid "select CAId's"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:218
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:218
 msgid "select image from server"
 msgstr ""
@@ -10703,7 +10867,7 @@ msgstr ""
 msgid "setup pin"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:327
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:340
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:327
 msgid "show DVD main menu"
 msgstr ""
@@ -10723,7 +10887,7 @@ msgstr ""
 msgid "show all"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:148
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:155
 #: ../enigma2_master/lib/python/Screens/ChannelSelection.py:148
 msgid "show alternatives"
 msgstr ""
@@ -10781,7 +10945,7 @@ msgid "shuffle playlist"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TaskView.py:50
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:100
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:101
 #: ../enigma2_master/lib/python/Screens/TaskView.py:50
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:100
 msgid "shut down"
@@ -10793,7 +10957,7 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:62
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:541
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1387
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1367
 #: ../enigma2_experimental/lib/python/Components/ParentalControl.py:26
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/PicturePlayer/plugin.py:23
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:62
@@ -10857,7 +11021,7 @@ msgstr ""
 msgid "start cut here"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:94
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:96
 #: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/settings.py:94
 msgid "start directory"
 msgstr ""
@@ -10922,17 +11086,17 @@ msgstr ""
 msgid "switch to playlist"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:337
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:350
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:337
 msgid "switch to the next angle"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:335
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:348
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:335
 msgid "switch to the next audio track"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:336
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:349
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:336
 msgid "switch to the next subtitle language"
 msgstr ""
@@ -10964,15 +11128,15 @@ msgstr ""
 msgid "toggle a cut mark at the current position"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:328
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:341
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:328
 msgid "toggle time, chapter, audio, subtitle info"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:338
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:346
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:292
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:338
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:294
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:340
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:338
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:346
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:292
@@ -10980,15 +11144,15 @@ msgstr ""
 msgid "unavailable"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1371
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1385
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1399
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1413
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1359
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1373
 msgid "unconfirmed"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:977
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:984
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1175
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1180
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:977
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:984
 msgid "unknown"
@@ -11010,7 +11174,7 @@ msgstr ""
 msgid "use as HDD replacement"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:108
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:109
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:108
 msgid "user defined"
 msgstr ""
@@ -11052,7 +11216,7 @@ msgstr ""
 msgid "was removed successfully"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:108
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:109
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:108
 msgid "weekly"
 msgstr ""
@@ -11079,7 +11243,7 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:542
 #: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:928
 #: ../enigma2_experimental/lib/python/Screens/SleepTimerEdit.py:90
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:113
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:114
 #: ../enigma2_experimental/lib/python/Components/config.py:439
 #: ../enigma2_master/lib/python/Screens/MessageBox.py:44
 #: ../enigma2_master/lib/python/Screens/MessageBox.py:46
@@ -11098,14 +11262,14 @@ msgstr ""
 msgid "yes (keep feeds)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1185
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1394
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1185
 msgid ""
 "your dreambox might be unusable now. Please consult the manual for further "
 "assistance before rebooting your dreambox."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:96
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:97
 #: ../enigma2_master/lib/python/Screens/TimerEntry.py:96
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:187
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:182
@@ -11461,6 +11625,10 @@ msgstr ""
 msgid "Initialization"
 msgstr ""
 
+#: ../enigma2_experimental/data/
+msgid "Input devices"
+msgstr ""
+
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Installing Software..."
 msgstr ""
@@ -12377,3 +12545,1151 @@ msgid ""
 "Your 'Match in title' Attribute ends with a Whitespace.\n"
 "Please confirm if this was intentional, if not they will be removed."
 msgstr ""
+
+#: ../meta_skins/skin_basic-hd.xml
+msgid "BASIC-HD Skin for Dreambox Images created from Ismail Demir"
+msgstr ""
+
+#: ../meta_skins/skin_basic-hd.xml
+msgid "BASIC-HD Skin by Ismail Demir"
+msgstr ""
+
+#: ../meta_skins/skin_brushedalu-hd.xml
+msgid "A nice looking HD skin in Brushed Alu Design from Kerni."
+msgstr ""
+
+#: ../meta_skins/skin_brushedalu-hd.xml
+msgid "Kerni's BrushedAlu-HD skin"
+msgstr ""
+
+#: ../meta_skins/skin_dmm-hd.xml ../meta_skins/skin_dreammm-hd.xml
+#: ../meta_skins/skin_elgato-hd.xml ../meta_skins/skin_ultraviolet.xml
+#: ../meta_skins/skin_yads-hd.xml
+msgid "a HD skin from Kerni"
+msgstr ""
+
+#: ../meta_skins/skin_dmm-hd.xml
+msgid "Kerni's dmm-HD skin"
+msgstr ""
+
+#: ../meta_skins/skin_dreammm-hd.xml
+msgid "Kerni's DreamMM-HD skin"
+msgstr ""
+
+#: ../meta_skins/skin_dreamtv-hd.xml
+msgid "Kerni's dreamTV-HD skin"
+msgstr ""
+
+#: ../meta_skins/skin_dreamtv-hd.xml ../meta_skins/skin_dtv-hd-reloaded.xml
+#: ../meta_skins/skin_dtv-hd.xml
+msgid "A nice looking HD skin from Kerni"
+msgstr ""
+
+#: ../meta_skins/skin_dtv-hd-reloaded.xml
+msgid "Kerni's dTV-HD-Reloaded skin"
+msgstr ""
+
+#: ../meta_skins/skin_dtv-hd.xml
+msgid "Kerni's dTV-HD skin"
+msgstr ""
+
+#: ../meta_skins/skin_elgato-hd.xml
+msgid "Kerni's Elgato-HD skin"
+msgstr ""
+
+#: ../meta_skins/skin_kerni-hd1.xml
+msgid "Kerni-HD1 skin"
+msgstr ""
+
+#: ../meta_skins/skin_kerni-hd1.xml
+msgid "Kernis HD1 skin"
+msgstr ""
+
+#: ../meta_skins/skin_kerni-hd1r2.xml
+msgid "Kerni-HD1R2 skin"
+msgstr ""
+
+#: ../meta_skins/skin_kerni-hd1r2.xml
+msgid "redesigned Kerni-HD1 skin"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.blackbox.xml
+msgid "Nemesis BlackBox Skin"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.blackbox.xml
+msgid "Nemesis BlackBox Skin for the Dreambox"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.blueline.extended.xml
+msgid "Nemesis Blueline.Extended Skin for the Dreambox"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.blueline.extended.xml
+msgid "Nemesis Blueline.Extended Skin"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.blueline.single.xml
+msgid "Nemesis Blueline Single Skin"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.blueline.single.xml
+msgid "Nemesis Blueline Single Skin for the Dreambox"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.blueline.xml
+msgid "Nemesis Blueline Skin"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.blueline.xml
+msgid "Nemesis Blueline Skin for the Dreambox"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.chromeline.cobolt.xml
+msgid "Nemesis ChromeLine Cobolt Skin for the Dreambox"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.chromeline.cobolt.xml
+msgid "Nemesis ChromeLine Cobolt Skin"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.chromeline.xml
+msgid "Nemesis ChromeLine Skin"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.chromeline.xml
+msgid "Nemesis ChromeLine Skin for the Dreambox"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.flatline.blue.xml
+msgid "Nemesis Flatline Blue Skin"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.flatline.blue.xml
+msgid "Nemesis Flatline Blue Skin for the Dreambox"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.flatline.xml
+msgid "Nemesis Flatline Skin for the Dreambox"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.flatline.xml
+msgid "Nemesis Flatline Skin"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.glassline.xml
+msgid "Nemesis GlassLine Skin"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.glassline.xml
+msgid "Nemesis GlassLine Skin for the Dreambox"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.greenline.extended.xml
+msgid "Nemesis Greenline Extended Skin for the Dreambox"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.greenline.extended.xml
+msgid "Nemesis Greenline Extended Skin"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.greenline.single.xml
+msgid "Nemesis Greenline Single Skin"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.greenline.single.xml
+msgid "Nemesis Greenline Single Skin for the Dreambox"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.greenline.xml
+msgid "Nemesis Greenline Skin"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.greenline.xml
+msgid "Nemesis Greenline Skin for the Dreambox"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.greyline.extended.xml
+msgid "Nemesis Greyline Extended Skin for the Dreambox"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.greyline.extended.xml
+msgid "Nemesis Greyline Extended Skin"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.greyline.single.xml
+msgid "Nemesis Greyline Single Skin for the Dreambox"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.greyline.single.xml
+msgid "Nemesis Greyline Single Skin"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.greyline.xml
+msgid "Nemesis Greyline Skin for the Dreambox"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.greyline.xml
+msgid "Nemesis Greyline Skin"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.shadowline.xml
+msgid "Nemesis ShadowLine Skin for the Dreambox"
+msgstr ""
+
+#: ../meta_skins/skin_nemesis.shadowline.xml
+msgid "Nemesis ShadowLine Skin"
+msgstr ""
+
+#: ../meta_skins/skin_simple.xml ../meta_skins/skin_swain-hd.xml
+#: ../meta_skins/skin_swain.xml
+msgid "A nice looking skin from Kerni"
+msgstr ""
+
+#: ../meta_skins/skin_simple.xml
+msgid "Kerni's simple skin"
+msgstr ""
+
+#: ../meta_skins/skin_swain-hd.xml
+msgid "Kerni's SWAIN-HD skin"
+msgstr ""
+
+#: ../meta_skins/skin_swain.xml
+msgid "Kerni's SWAIN skin"
+msgstr ""
+
+#: ../meta_skins/skin_ultraviolet.xml
+msgid "Kerni's UltraViolet skin"
+msgstr ""
+
+#: ../meta_skins/skin_vali-xd.xml
+msgid "Vali-XD skin"
+msgstr ""
+
+#: ../meta_skins/skin_vali-xd.xml
+msgid "The skin is in KingSize-definition 1024x576"
+msgstr ""
+
+#: ../meta_skins/skin_yads-hd.xml
+msgid "Kerni's YADS-HD skin"
+msgstr ""
+
+#: ../meta_plugins/plugin_aihdcontrol.xml
+msgid "First generate your skin-style with the Ai.HD-Control plugin."
+msgstr ""
+
+#: ../meta_plugins/plugin_aihdcontrol.xml
+msgid "Ai.HD skin-style control plugin"
+msgstr ""
+
+#: ../meta_plugins/plugin_antiscrollbar.xml
+msgid ""
+"With AntiScrollbar you can cover up annoying ticker lines (e.g. in news "
+"channels)."
+msgstr ""
+
+#: ../meta_plugins/plugin_antiscrollbar.xml
+msgid "Overlay for scrolling bars"
+msgstr ""
+
+#: ../meta_plugins/plugin_ardmediathek.xml
+msgid "Access to the ARD-Mediathek online video database."
+msgstr ""
+
+#: ../meta_plugins/plugin_ardmediathek.xml
+msgid "Access to the ARD-Mediathek"
+msgstr ""
+
+#: ../meta_plugins/plugin_audiosync.xml
+msgid ""
+"AudoSync allows delaying the sound output (Bitstream/PCM) so that it is "
+"synchronous to the picture."
+msgstr ""
+
+#: ../meta_plugins/plugin_audiosync.xml
+msgid "Set Bitstream/PCM audio delays"
+msgstr ""
+
+#: ../meta_plugins/plugin_automatictimerlistcleanup.xml
+msgid "Cleanup timerlist automatically"
+msgstr ""
+
+#: ../meta_plugins/plugin_automatictimerlistcleanup.xml
+msgid "Cleanup timerlist automatically."
+msgstr ""
+
+#: ../meta_plugins/plugin_automaticvolumeadjustment.xml
+msgid "Automatic volume adjustment"
+msgstr ""
+
+#: ../meta_plugins/plugin_automaticvolumeadjustment.xml
+msgid "Automatic volume adjustment for ac3/dts services."
+msgstr ""
+
+#: ../meta_plugins/plugin_autoresolution.xml
+msgid "Automatically change video resolution"
+msgstr ""
+
+#: ../meta_plugins/plugin_autoresolution.xml
+msgid ""
+"Automatically changes the output resolution depending on the video "
+"resolution you are watching."
+msgstr ""
+
+#: ../meta_plugins/plugin_autotimer.xml
+msgid ""
+"AutoTimer scans the EPG and creates Timers depending on user-defined search  "
+"criteria."
+msgstr ""
+
+#: ../meta_plugins/plugin_autotimer.xml
+msgid "Automatically create timer events based on keywords"
+msgstr ""
+
+#: ../meta_plugins/plugin_babelzapper.xml
+msgid "Control your dreambox with only the MUTE button"
+msgstr ""
+
+#: ../meta_plugins/plugin_babelzapper.xml
+msgid "Control your dreambox with only the MUTE button."
+msgstr ""
+
+#: ../meta_plugins/plugin_bonjour.xml
+msgid "Bonjour/Avahi control plugin."
+msgstr ""
+
+#: ../meta_plugins/plugin_bonjour.xml
+msgid "Bonjour/Avahi control plugin"
+msgstr ""
+
+#: ../meta_plugins/plugin_cdinfo.xml
+msgid ""
+"CDInfo enables gathering album and track details from CDDB and CD-Text when "
+"playing Audio CDs in Mediaplayer."
+msgstr ""
+
+#: ../meta_plugins/plugin_cdinfo.xml
+msgid "Get AudioCD info from CDDB and CD-Text"
+msgstr ""
+
+#: ../meta_plugins/plugin_dreamirc.xml
+msgid "IRC Client for Enigma2"
+msgstr ""
+
+#: ../meta_plugins/plugin_dreamirc.xml
+msgid "Simple IRC GroupChat client for e2 #dm8000-vip channel"
+msgstr ""
+
+#: ../meta_plugins/plugin_dvdbackup.xml
+msgid "Create a backup of your Video-DVD"
+msgstr ""
+
+#: ../meta_plugins/plugin_dvdbackup.xml
+msgid "Create a backup of your Video DVD on your DreamBox hard drive."
+msgstr ""
+
+#: ../meta_plugins/plugin_dyndns.xml
+msgid "A client for www.dyndns.org"
+msgstr ""
+
+#: ../meta_plugins/plugin_elektro.xml
+msgid ""
+"The Elektro Power Save plugin puts the box from standby to sleep mode (Deep "
+"Standby) at certain times.\n"
+"This only happens if the box is in standby and no recording is running or "
+"sheduled in the next 20 minutes.\n"
+"The box automatically wakes up for recordings or at the end of the sleep "
+"time. You therefore don't have to wait until it is on again."
+msgstr ""
+
+#: ../meta_plugins/plugin_elektro.xml
+msgid "Sets your Dreambox into Deep-Standby"
+msgstr ""
+
+#: ../meta_plugins/plugin_emailclient.xml
+msgid "IMAP4 e-mail viewer for the Dreambox"
+msgstr ""
+
+#: ../meta_plugins/plugin_emailclient.xml
+msgid "Emailclient is an IMAP4 e-mail viewer for the Dreambox."
+msgstr ""
+
+#: ../meta_plugins/plugin_epgrefresh.xml
+msgid ""
+"EPGRefresh will automatically switch to user-defined channels when the box "
+"is idleing\n"
+"(in standby mode without any running recordings) to perform updates of the "
+"epg information on these channels."
+msgstr ""
+
+#: ../meta_plugins/plugin_epgrefresh.xml
+msgid "Automatically refresh EPG"
+msgstr ""
+
+#: ../meta_plugins/plugin_epgsearch.xml
+msgid "Search through the EPG"
+msgstr ""
+
+#: ../meta_plugins/plugin_epgsearch.xml
+msgid "With EPGSearch you can search through the EPG and create timers."
+msgstr ""
+
+#: ../meta_plugins/plugin_filebrowser.xml
+msgid "Manage local files"
+msgstr ""
+
+#: ../meta_plugins/plugin_filebrowser.xml
+msgid "Copy, rename, delete, move local files on your Dreambox."
+msgstr ""
+
+#: ../meta_plugins/plugin_fritzcall.xml
+msgid "Callmonitor for the Fritz!Box routers"
+msgstr ""
+
+#: ../meta_plugins/plugin_fritzcall.xml
+msgid "FritzCall shows incoming calls to your Fritz!Box on your Dreambox."
+msgstr ""
+
+#: ../meta_plugins/plugin_ftpbrowser.xml
+msgid "A basic ftp client"
+msgstr ""
+
+#: ../meta_plugins/plugin_ftpbrowser.xml
+msgid ""
+"FTPBrowser allows uploading and downloading files between your Dreambox and "
+"a server using the file transfer protocol."
+msgstr ""
+
+#: ../meta_plugins/plugin_genuinedreambox.xml
+msgid "With Genuine Dreambox you can verify the authenticity of your Dreambox."
+msgstr ""
+
+#: ../meta_plugins/plugin_genuinedreambox.xml
+msgid "Genuine Dreambox verification"
+msgstr ""
+
+#: ../meta_plugins/plugin_googlemaps.xml
+msgid "View Google maps"
+msgstr ""
+
+#: ../meta_plugins/plugin_googlemaps.xml
+msgid "View Google maps with your Dreambox."
+msgstr ""
+
+#: ../meta_plugins/plugin_growlee.xml
+msgid "redirect notifications to Growl"
+msgstr ""
+
+#: ../meta_plugins/plugin_growlee.xml
+msgid ""
+"Growlee allows your Dreambox to send short messages using the growl "
+"protocol\n"
+"like Recording started notifications to a PC running a growl client"
+msgstr ""
+
+#: ../meta_plugins/plugin_httpproxy.xml
+msgid "use your Dreambox as Web proxy."
+msgstr ""
+
+#: ../meta_plugins/plugin_httpproxy.xml
+msgid "use your Dreambox as Web proxy"
+msgstr ""
+
+#: ../meta_plugins/plugin_imdb.xml
+msgid ""
+"With IMDb you can download and displays movie information (rating, poster, "
+"cast, synopsis etc.) about the selected event."
+msgstr ""
+
+#: ../meta_plugins/plugin_imdb.xml
+msgid "Displays movie information from the InternetMovieDatabase"
+msgstr ""
+
+#: ../meta_plugins/plugin_kiddytimer.xml
+msgid "KiddyTimer allows to control your kids's daily tv usage."
+msgstr ""
+
+#: ../meta_plugins/plugin_kiddytimer.xml
+msgid "Control your kids's tv usage"
+msgstr ""
+
+#: ../meta_plugins/plugin_lastfm.xml
+msgid "Play music from Last.fm."
+msgstr ""
+
+#: ../meta_plugins/plugin_lastfm.xml
+msgid "Play music from Last.fm"
+msgstr ""
+
+#: ../meta_plugins/plugin_letterbox.xml
+msgid "Zoom into letterboxed/anamorph movies."
+msgstr ""
+
+#: ../meta_plugins/plugin_letterbox.xml
+msgid "Zoom into letterboxed/anamorph movies"
+msgstr ""
+
+#: ../meta_plugins/plugin_logomanager.xml
+msgid "Manage logos to display at boottime"
+msgstr ""
+
+#: ../meta_plugins/plugin_logomanager.xml
+msgid "Manage logos to display at boot time or while in radio mode."
+msgstr ""
+
+#: ../meta_plugins/plugin_mediadownloader.xml
+msgid "A simple downloading application for other plugins"
+msgstr ""
+
+#: ../meta_plugins/plugin_mediadownloader.xml
+msgid "To be used as simple downloading application by other Plugins."
+msgstr ""
+
+#: ../meta_plugins/plugin_merlinepg.xml
+msgid "A graphical EPG interface"
+msgstr ""
+
+#: ../meta_plugins/plugin_merlinepg.xml
+msgid "A graphical EPG interface."
+msgstr ""
+
+#: ../meta_plugins/plugin_merlinmusicplayer.xml
+msgid "Merlin Music Player and iDream"
+msgstr ""
+
+#: ../meta_plugins/plugin_merlinmusicplayer.xml
+msgid ""
+"Manage your music files in a database, play it with Merlin Music Player."
+msgstr ""
+
+#: ../meta_plugins/plugin_meteoitalia.xml
+msgid "Italian Weather forecast on Dreambox from www.google.it."
+msgstr ""
+
+#: ../meta_plugins/plugin_meteoitalia.xml
+msgid "Italian Weather forecast on Dreambox"
+msgstr ""
+
+#: ../meta_plugins/plugin_mosaic.xml
+msgid "Preview screenshots of running tv shows."
+msgstr ""
+
+#: ../meta_plugins/plugin_mosaic.xml
+msgid "Preview screenshots of running tv shows"
+msgstr ""
+
+#: ../meta_plugins/plugin_moviecut.xml
+msgid "Cut your movies"
+msgstr ""
+
+#: ../meta_plugins/plugin_moviecut.xml
+msgid "Cut your movies."
+msgstr ""
+
+#: ../meta_plugins/plugin_movielistpreview.xml
+msgid "Create preview pictures of your Movies"
+msgstr ""
+
+#: ../meta_plugins/plugin_movielistpreview.xml
+msgid ""
+"Movielist Preview creates screenshots of recordings and shows them inside "
+"the movielist."
+msgstr ""
+
+#: ../meta_plugins/plugin_movieretitle.xml
+msgid "Rename your movies"
+msgstr ""
+
+#: ../meta_plugins/plugin_movieretitle.xml
+msgid "With MovieRetitle you can rename your movies."
+msgstr ""
+
+#: ../meta_plugins/plugin_movieselectionquickbutton.xml
+msgid "assign color buttons to plugins from MOVIELIST"
+msgstr ""
+
+#: ../meta_plugins/plugin_movieselectionquickbutton.xml
+msgid "assign color buttons (red/green/yellow/blue) to plugins from MOVIELIST."
+msgstr ""
+
+#: ../meta_plugins/plugin_movietagger.xml
+msgid ""
+"MovieTagger adds tags to recorded movies to sort a large list of movies."
+msgstr ""
+
+#: ../meta_plugins/plugin_movietagger.xml
+msgid "add tags to recorded movies"
+msgstr ""
+
+#: ../meta_plugins/plugin_multirc.xml
+msgid "control multiple Dreamboxes with different RCs"
+msgstr ""
+
+#: ../meta_plugins/plugin_multirc.xml
+msgid "Use and control multiple Dreamboxes with different RCs."
+msgstr ""
+
+#: ../meta_plugins/plugin_mytube.xml
+msgid "Direct playback of Youtube videos"
+msgstr ""
+
+#: ../meta_plugins/plugin_mytube.xml
+msgid ""
+"With MyTube you can play YouTube videos directly on your TV without a PC."
+msgstr ""
+
+#: ../meta_plugins/plugin_netcaster.xml
+msgid "Player for Network and Internet Streams"
+msgstr ""
+
+#: ../meta_plugins/plugin_netcaster.xml
+msgid "Player for Network and Internet Streams."
+msgstr ""
+
+#: ../meta_plugins/plugin_networkbrowser.xml
+msgid "Browse for and connect to network shares"
+msgstr ""
+
+#: ../meta_plugins/plugin_networkbrowser.xml
+msgid "Browse for nfs/cifs shares and connect to them."
+msgstr ""
+
+#: ../meta_plugins/plugin_ofdb.xml
+msgid "Movie informations from the Online Film Datenbank"
+msgstr ""
+
+#: ../meta_plugins/plugin_ofdb.xml
+msgid "Movie information from the Online Film Datenbank (German)."
+msgstr ""
+
+#: ../meta_plugins/plugin_orfat.xml
+msgid "Video streaming from the orf.at web page"
+msgstr ""
+
+#: ../meta_plugins/plugin_orfat.xml
+msgid "Streaming modules for the orf.at iptv web page."
+msgstr ""
+
+#: ../meta_plugins/plugin_partnerbox.xml
+msgid "Remote timer and remote TV player"
+msgstr ""
+
+#: ../meta_plugins/plugin_partnerbox.xml
+msgid ""
+"Partnerbox allows editing a remote Dreambox's record timers and stream its "
+"TV  program."
+msgstr ""
+
+#: ../meta_plugins/plugin_passwordchanger.xml
+#: ../meta_plugins/plugin_setpasswd.xml
+msgid "GUI to change the ftp and telnet-password"
+msgstr ""
+
+#: ../meta_plugins/plugin_passwordchanger.xml
+msgid ""
+"GUI that allows user to change the ftp-/telnet-password of the Dreambox."
+msgstr ""
+
+#: ../meta_plugins/plugin_permanentclock.xml
+msgid "PermanentClock shows the clock permanently on the screen."
+msgstr ""
+
+#: ../meta_plugins/plugin_permanentclock.xml
+msgid "Shows the clock permanently on the screen"
+msgstr ""
+
+#: ../meta_plugins/plugin_podcast.xml
+msgid "PodCast streams podcasts to your Dreambox."
+msgstr ""
+
+#: ../meta_plugins/plugin_podcast.xml
+msgid "Stream podcasts"
+msgstr ""
+
+#: ../meta_plugins/plugin_porncenter.xml
+msgid "Adult streaming plugin"
+msgstr ""
+
+#: ../meta_plugins/plugin_porncenter.xml
+msgid "Adult streaming plugin."
+msgstr ""
+
+#: ../meta_plugins/plugin_quickbutton.xml
+msgid "assign long key-press on color buttons to plugins or E2 functions"
+msgstr ""
+
+#: ../meta_plugins/plugin_quickbutton.xml
+msgid ""
+"assign long key-press (red/green/yellow/blue) to plugins or E2 functions."
+msgstr ""
+
+#: ../meta_plugins/plugin_reconstructapsc.xml
+msgid "Reconstruct .ap and .sc files"
+msgstr ""
+
+#: ../meta_plugins/plugin_reconstructapsc.xml
+msgid "Reconstruct missing or corrupt .ap and .sc files of recorded movies."
+msgstr ""
+
+#: ../meta_plugins/plugin_remotetimer.xml
+msgid "Create timers on remote Dreamboxes."
+msgstr ""
+
+#: ../meta_plugins/plugin_remotetimer.xml
+msgid "Create remote timers"
+msgstr ""
+
+#: ../meta_plugins/plugin_rsdownloader.xml
+msgid "Allows user to download files from rapidshare in the background."
+msgstr ""
+
+#: ../meta_plugins/plugin_rsdownloader.xml
+msgid "Download files from Rapidshare"
+msgstr ""
+
+#: ../meta_plugins/plugin_seekbar.xml
+msgid "Replace the minute input for the seek functions with a seekbar."
+msgstr ""
+
+#: ../meta_plugins/plugin_seekbar.xml
+msgid "Replace the rewind  input with a seekbar"
+msgstr ""
+
+#: ../meta_plugins/plugin_setpasswd.xml
+msgid "GUI that allows user to change the ftp- / telnet password."
+msgstr ""
+
+#: ../meta_plugins/plugin_shoutcast.xml
+msgid "Listen and record internet radio"
+msgstr ""
+
+#: ../meta_plugins/plugin_shoutcast.xml
+msgid "Listen and record shoutcast internet radio on your Dreambox."
+msgstr ""
+
+#: ../meta_plugins/plugin_simplerss.xml
+msgid "RSS viewer"
+msgstr ""
+
+#: ../meta_plugins/plugin_simplerss.xml
+msgid "SimpleRSS allows reading RSS newsfeeds on your Dreambox."
+msgstr ""
+
+#: ../meta_plugins/plugin_startupservice.xml
+msgid "Define a startup service"
+msgstr ""
+
+#: ../meta_plugins/plugin_startupservice.xml
+msgid "Define a startup service for your Dreambox."
+msgstr ""
+
+#: ../meta_plugins/plugin_startuptostandby.xml
+msgid "set enigma2 to standby-mode after startup"
+msgstr ""
+
+#: ../meta_plugins/plugin_startuptostandby.xml
+msgid ""
+"After a reboot or power outage, StartupToStandby will bring your Dreambox to "
+"standby-mode."
+msgstr ""
+
+#: ../meta_plugins/plugin_tageditor.xml
+msgid "Edit tags of recorded movies."
+msgstr ""
+
+#: ../meta_plugins/plugin_tageditor.xml
+msgid "Edit tags of recorded movies"
+msgstr ""
+
+#: ../meta_plugins/plugin_trafficinfo.xml
+msgid "TrafficInfo shows german traffic information."
+msgstr ""
+
+#: ../meta_plugins/plugin_trafficinfo.xml
+msgid "German traffic information"
+msgstr ""
+
+#: ../meta_plugins/plugin_unwetterzentrale.xml
+msgid "German storm information"
+msgstr ""
+
+#: ../meta_plugins/plugin_unwetterzentrale.xml
+msgid "UnwetterInfo shows german storm information."
+msgstr ""
+
+#: ../meta_plugins/plugin_virtualzap.xml
+msgid "see service-epg (and PiP) from channels in an infobar"
+msgstr ""
+
+#: ../meta_plugins/plugin_virtualzap.xml
+msgid "See service-epg (and PiP) from other channels in an infobar."
+msgstr ""
+
+#: ../meta_plugins/plugin_vlcplayer.xml
+msgid "Play videos from PC on your Dreambox"
+msgstr ""
+
+#: ../meta_plugins/plugin_vlcplayer.xml
+msgid ""
+"Enigma2 Plugin to play AVI/DIVX/WMV/etc. videos from PC on your Dreambox. "
+"Needs a running VLC from www.videolan.org on your pc."
+msgstr ""
+
+#: ../meta_plugins/plugin_vxdcontrol.xml
+msgid "Customize Vali-XD skins by yourself."
+msgstr ""
+
+#: ../meta_plugins/plugin_vxdcontrol.xml
+msgid "Customize Vali-XD skins"
+msgstr ""
+
+#: ../meta_plugins/plugin_weatherplugin.xml
+msgid "Weatherforecast on your Dreambox"
+msgstr ""
+
+#: ../meta_plugins/plugin_weatherplugin.xml
+msgid "WeatherPlugin shows weatherforecasts on your Dreambox."
+msgstr ""
+
+#: ../meta_plugins/plugin_webcamviewer.xml
+msgid "Show webcam pictures on your TV Screen"
+msgstr ""
+
+#: ../meta_plugins/plugin_webcamviewer.xml
+msgid "With WebcamViewer you can watch webcams on your TV Screen."
+msgstr ""
+
+#: ../meta_plugins/plugin_webinterface.xml
+msgid "Control your Dreambox with your Web browser."
+msgstr ""
+
+#: ../meta_plugins/plugin_webinterface.xml
+msgid "Control your Dreambox with your browser"
+msgstr ""
+
+#: ../meta_plugins/plugin_werbezapper.xml
+msgid "Zap between commercials"
+msgstr ""
+
+#: ../meta_plugins/plugin_werbezapper.xml
+msgid ""
+"With Werbezapper you can bridge commercials by creating short timers\n"
+"(between 1 and 9 minutes long) which will automatically zap back to the "
+"original channel after execution."
+msgstr ""
+
+#: ../meta_plugins/plugin_youtubeplayer.xml
+msgid ""
+"With YouTubePlayer you can watch YouTube-Videos on the Dreambox.\n"
+"This plugin requires a PC with the VLC program running."
+msgstr ""
+
+#: ../meta_plugins/plugin_youtubeplayer.xml
+msgid "Playback of Youtube through a PC"
+msgstr ""
+
+#: ../meta_plugins/plugin_zaphistorybrowser.xml
+msgid ""
+"Shows a list containing the zapping-history and allows user to zap to the "
+"entries or to modify them."
+msgstr ""
+
+#: ../meta_plugins/plugin_zaphistorybrowser.xml
+msgid "Shows a list of recent zap entries"
+msgstr ""
+
+#: ../meta_plugins/plugin_zapstatistic.xml
+msgid "ZapStatistic shows the watched services with some statistics."
+msgstr ""
+
+#: ../meta_plugins/plugin_zapstatistic.xml
+msgid "Shows statistics of watched services"
+msgstr ""
+
+#: ../meta_plugins/plugin_zdfmediathek.xml
+msgid "Watch streams from ZDF Mediathek"
+msgstr ""
+
+#: ../meta_plugins/plugin_zdfmediathek.xml
+msgid "ZDFMediathek allows you to watch streams from ZDF Mediathek."
+msgstr ""
+
+#: ../meta_experimental/plugin_cleanupwizard.xml
+msgid "Automatically informs you on low internal memory"
+msgstr ""
+
+#: ../meta_experimental/plugin_cleanupwizard.xml
+msgid ""
+"The CleanupWizard informs you when the internal free memory of your dreambox "
+"has dropped below a definable threshold.You can use this wizard to remove "
+"some plugins."
+msgstr ""
+
+#: ../meta_experimental/plugin_commoninterfaceassignment.xml
+msgid ""
+"With the CommonInterfaceAssignment plugin it is possible to use differentCI "
+"modules in your Dreambox and assign dedicated providers/services or caids to "
+"each of them.\n"
+"This allows watching a scrambled service while recording another one."
+msgstr ""
+
+#: ../meta_experimental/plugin_commoninterfaceassignment.xml
+msgid "Assigning providers/services/caids to a CI module"
+msgstr ""
+
+#: ../meta_experimental/plugin_crashlogautosubmit.xml
+msgid "Automatically send crashlogs to Dream Multimedia"
+msgstr ""
+
+#: ../meta_experimental/plugin_crashlogautosubmit.xml
+msgid ""
+"With the CrashlogAutoSubmit plugin it is possible to automaticallymail "
+"crashlogs found on your hard drive to Dream Multimedia."
+msgstr ""
+
+#: ../meta_experimental/plugin_cutlisteditor.xml
+msgid "CutListEditor allows you to edit your movies"
+msgstr ""
+
+#: ../meta_experimental/plugin_cutlisteditor.xml
+msgid ""
+"CutListEditor allows you to edit your movies.\n"
+"Seek to the start of the stuff you want to cut away. Press OK, select 'start "
+"cut'.\n"
+"Then seek to the end, press OK, select 'end cut'. That's it."
+msgstr ""
+
+#: ../meta_experimental/plugin_defaultservicesscanner.xml
+msgid ""
+"With the DefaultServicesScanner plugin you can scan default lamedbs sorted "
+"by satellite with a connected dish positioner."
+msgstr ""
+
+#: ../meta_experimental/plugin_defaultservicesscanner.xml
+msgid "Scans default lamedbs sorted by satellite"
+msgstr ""
+
+#: ../meta_experimental/plugin_diseqctester.xml
+msgid "Test your DiSEqC equipment"
+msgstr ""
+
+#: ../meta_experimental/plugin_diseqctester.xml
+msgid ""
+"With the DiseqcTester plugin you can test your satellite equipment for "
+"DiSEqC compatibility and errors."
+msgstr ""
+
+#: ../meta_experimental/plugin_dvdburn.xml
+msgid ""
+"With DVDBurn you can make compilations of records from your Dreambox hard "
+"drive.\n"
+"Optionally you can add customizable menus. You can record the compilation to "
+"a standard-compliant DVD that can be played on conventinal DVD players.\n"
+"HDTV recordings can only be burned in proprietary dreambox format."
+msgstr ""
+
+#: ../meta_experimental/plugin_dvdburn.xml
+msgid "Burn your recordings to DVD"
+msgstr ""
+
+#: ../meta_experimental/plugin_dvdplayer.xml
+msgid ""
+"DVDPlayer plays your DVDs on your Dreambox.\n"
+"With the DVDPlayer you can play your DVDs on your Dreambox from a DVD or "
+"even from an iso file or video_ts folder on your harddisc or network."
+msgstr ""
+
+#: ../meta_experimental/plugin_dvdplayer.xml
+msgid "DVDPlayer plays your DVDs on your Dreambox"
+msgstr ""
+
+#: ../meta_experimental/plugin_frontprocessorupgrade.xml
+msgid "Internal firmware updater"
+msgstr ""
+
+#: ../meta_experimental/plugin_frontprocessorupgrade.xml
+msgid ""
+"This system tool is internally used to program the hardware with firmware "
+"updates."
+msgstr ""
+
+#: ../meta_experimental/plugin_graphmultiepg.xml
+msgid ""
+"GraphMultiEPG shows a graphical timeline EPG.\n"
+"Shows a nice overview of all running und upcoming tv shows."
+msgstr ""
+
+#: ../meta_experimental/plugin_graphmultiepg.xml
+msgid "GraphMultiEPG shows a graphical timeline EPG"
+msgstr ""
+
+#: ../meta_experimental/plugin_hotplug.xml
+msgid "Hotplugging for removeable devices"
+msgstr ""
+
+#: ../meta_experimental/plugin_hotplug.xml
+msgid ""
+"The Hotplug plugin notifies your system of newly added or removed devices."
+msgstr ""
+
+#: ../meta_experimental/plugin_mediaplayer.xml
+msgid "Plays your favorite music and videos"
+msgstr ""
+
+#: ../meta_experimental/plugin_mediaplayer.xml
+msgid ""
+"Mediaplayer plays your favorite music and videos.\n"
+"Play all your favorite music and video files, organize them in playlists, "
+"view cover and album information."
+msgstr ""
+
+#: ../meta_experimental/plugin_mediascanner.xml
+msgid "Scan devices for playable media files"
+msgstr ""
+
+#: ../meta_experimental/plugin_mediascanner.xml
+msgid ""
+"MediaScanner scans devices for playable media files and displays a menu with "
+"possible actions like viewing pictures or playing movies."
+msgstr ""
+
+#: ../meta_experimental/plugin_networkwizard.xml
+msgid "Step by step network configuration"
+msgstr ""
+
+#: ../meta_experimental/plugin_networkwizard.xml
+msgid ""
+"With the NetworkWizard you can easily configure your network step by step."
+msgstr ""
+
+#: ../meta_experimental/plugin_nfiflash.xml
+msgid "Restore your Dreambox with a USB stick"
+msgstr ""
+
+#: ../meta_experimental/plugin_nfiflash.xml
+msgid ""
+"With the NFIFlash plugin it is possible to prepare a USB stick with an "
+"Dreambox image.\n"
+"It is then possible to flash your Dreambox with the image on that stick."
+msgstr ""
+
+#: ../meta_experimental/plugin_pictureplayer.xml
+msgid "Display your photos on the TV"
+msgstr ""
+
+#: ../meta_experimental/plugin_pictureplayer.xml
+msgid ""
+"The PicturePlayer displays your photos on the TV.\n"
+"You can view them as thumbnails or slideshow."
+msgstr ""
+
+#: ../meta_experimental/plugin_positionersetup.xml
+msgid "PositionerSetup helps you installing a motorized dish"
+msgstr ""
+
+#: ../meta_experimental/plugin_positionersetup.xml
+msgid ""
+"With the PositionerSetup plugin it is easy to install and configure a "
+"motorized dish."
+msgstr ""
+
+#: ../meta_experimental/plugin_satelliteequipmentcontrol.xml
+msgid ""
+"With the SatelliteEquipmentControl plugin it is possible to fine-tune DiSEqC-"
+"settings."
+msgstr ""
+
+#: ../meta_experimental/plugin_satelliteequipmentcontrol.xml
+msgid "SatelliteEquipmentControl allows you to fine-tune DiSEqC-settings"
+msgstr ""
+
+#: ../meta_experimental/plugin_satfinder.xml
+msgid ""
+"The Satfinder plugin helps you to align your dish.\n"
+"It shows you informations about signal rate and errors."
+msgstr ""
+
+#: ../meta_experimental/plugin_satfinder.xml
+msgid "Satfinder helps you to align your dish"
+msgstr ""
+
+#: ../meta_experimental/plugin_skinselector.xml
+msgid "SkinSelector shows a menu with selectable skins"
+msgstr ""
+
+#: ../meta_experimental/plugin_skinselector.xml
+msgid ""
+"The SkinSelector shows a menu with selectable skins.\n"
+"It's now easy to change the look and feel of your Dreambox."
+msgstr ""
+
+#: ../meta_experimental/plugin_socketmmi.xml
+msgid "Frontend for /tmp/mmi.socket"
+msgstr ""
+
+#: ../meta_experimental/plugin_socketmmi.xml
+msgid "Python frontend for /tmp/mmi.socket."
+msgstr ""
+
+#: ../meta_experimental/plugin_softwaremanager.xml
+msgid "SoftwareManager manages your Dreambox software"
+msgstr ""
+
+#: ../meta_experimental/plugin_softwaremanager.xml
+msgid ""
+"The SoftwareManager manages your Dreambox software.\n"
+"It's easy to update your receiver's software, install or remove plugins or "
+"even backup and restore your system settings."
+msgstr ""
+
+#: ../meta_experimental/plugin_tempfancontrol.xml
+msgid "Control your system fan"
+msgstr ""
+
+#: ../meta_experimental/plugin_tempfancontrol.xml
+msgid "Control your internal system fan."
+msgstr ""
+
+#: ../meta_experimental/plugin_tuxboxplugins.xml
+msgid "Execute TuxboxPlugins"
+msgstr ""
+
+#: ../meta_experimental/plugin_tuxboxplugins.xml
+msgid "Allows the execution of TuxboxPlugins."
+msgstr ""
+
+#: ../meta_experimental/plugin_videoenhancement.xml
+msgid "VideoEnhancement provides advanced video enhancement settings"
+msgstr ""
+
+#: ../meta_experimental/plugin_videoenhancement.xml
+msgid ""
+"The VideoEnhancement plugin provides advanced video enhancement settings."
+msgstr ""
+
+#: ../meta_experimental/plugin_videomode.xml
+msgid "Videomode provides advanced video mode settings"
+msgstr ""
+
+#: ../meta_experimental/plugin_videomode.xml
+msgid "The Videomode plugin provides advanced video mode settings."
+msgstr ""
+
+#: ../meta_experimental/plugin_videotune.xml
+msgid "VideoTune helps fine-tuning your tv display"
+msgstr ""
+
+#: ../meta_experimental/plugin_videotune.xml
+msgid ""
+"The VideoTune helps fine-tuning your tv display.\n"
+"You can control brightness and contrast of your tv."
+msgstr ""
+
+#: ../meta_experimental/plugin_wirelesslan.xml
+msgid ""
+"The WirelessLan plugin helps you configuring your WLAN network interface."
+msgstr ""
+
+#: ../meta_experimental/plugin_wirelesslan.xml
+msgid "Configure your WLAN network interface"
+msgstr ""