lib/dvb/pmt.cpp: migrate PMT pid search code to new iDataSource stuff

[vuplus_dvbapp] / po / enigma2.pot

diff --git a/po/enigma2.pot b/po/enigma2.pot
old mode 100644 (file)
new mode 100755 (executable)
index ef56615..2e9f148
--- 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-05-11 10:40+0000\n"
+"POT-Creation-Date: 2010-11-01 13:01+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,106 +18,106 @@ 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_master/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:148
 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_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
-#: ../enigma2_master/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:1171
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1688
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:233
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:560
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1171
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1687
 msgid ""
 "\n"
 "After pressing OK, please wait!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:118
-#: ../enigma2_master/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:131
 msgid ""
 "\n"
 "Backup your Dreambox settings."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:142
-#: ../enigma2_master/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:155
 msgid ""
 "\n"
 "Edit the upgrade source address."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:115
-#: ../enigma2_master/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:128
 msgid ""
 "\n"
 "Manage extensions or plugins for your Dreambox"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:116
-#: ../enigma2_master/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:129
 msgid ""
 "\n"
 "Online update of your Dreambox software."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:111
-#: ../enigma2_master/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:121
 msgid ""
 "\n"
 "Press OK on your remote control to continue."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:119
-#: ../enigma2_master/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:132
 msgid ""
 "\n"
 "Restore your Dreambox settings."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:117
-#: ../enigma2_master/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:130
 msgid ""
 "\n"
 "Restore your Dreambox with a new firmware."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:137
-#: ../enigma2_master/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:150
 msgid ""
 "\n"
 "Restore your backups by date."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:120
-#: ../enigma2_master/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:133
 msgid ""
 "\n"
 "Scan for local extensions and install them."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:138
-#: ../enigma2_master/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:151
 msgid ""
 "\n"
 "Select your backup device.\n"
 "Current device: "
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:255
-#: ../enigma2_master/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:256
 msgid ""
 "\n"
 "System will restart after the restore!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:141
-#: ../enigma2_master/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:154
 msgid ""
 "\n"
 "View, install and remove available or installed packages."
@@ -127,53 +127,58 @@ 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_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:652
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:876
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:876
 msgid " extensions."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:462
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:474
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:462
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:474
+#: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:225
+#: ../enigma2_master/lib/python/Screens/InputDeviceSetup.py:225
+msgid " ms"
+msgstr ""
+
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:676
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:688
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:676
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:688
 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_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
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:460
-#: ../enigma2_master/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:630
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:674
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:685
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:204
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:209
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:630
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:674
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:685
 msgid " updates available."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:357
-#: ../enigma2_master/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:359
 msgid " wireless networks found!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1173
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1174
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1323
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1325
-#: ../enigma2_master/lib/python/Components/NimManager.py:1173
-#: ../enigma2_master/lib/python/Components/NimManager.py:1174
-#: ../enigma2_master/lib/python/Components/NimManager.py:1323
-#: ../enigma2_master/lib/python/Components/NimManager.py:1325
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1280
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1281
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1430
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1432
+#: ../enigma2_master/lib/python/Components/NimManager.py:1280
+#: ../enigma2_master/lib/python/Components/NimManager.py:1281
+#: ../enigma2_master/lib/python/Components/NimManager.py:1430
+#: ../enigma2_master/lib/python/Components/NimManager.py:1432
 msgid "%H:%M"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Standby.py:121
-#: ../enigma2_master/lib/python/Screens/Standby.py:121
+#: ../enigma2_experimental/lib/python/Screens/Standby.py:125
+#: ../enigma2_master/lib/python/Screens/Standby.py:125
 #, python-format
 msgid "%d jobs are running in the background!"
 msgstr ""
@@ -195,11 +200,11 @@ 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
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:111
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:122
 msgid "%d.%B %Y"
 msgstr ""
 
@@ -237,58 +242,45 @@ msgstr ""
 msgid "(ZAP)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:525
-#: ../enigma2_master/lib/python/Components/NimManager.py:525
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:585
+#: ../enigma2_master/lib/python/Components/NimManager.py:585
 msgid "(empty)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:334
-#: ../enigma2_master/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:347
 msgid "(show optional DVD audio menu)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:90
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:90
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:65
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:65
 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_master/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:357
 msgid "1 wireless network found!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1081
-#: ../enigma2_master/lib/python/Components/NimManager.py:1081
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1175
+#: ../enigma2_master/lib/python/Components/NimManager.py:1175
 msgid "1.0"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1081
-#: ../enigma2_master/lib/python/Components/NimManager.py:1081
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1175
+#: ../enigma2_master/lib/python/Components/NimManager.py:1175
 msgid "1.1"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1080
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1081
-#: ../enigma2_master/lib/python/Components/NimManager.py:1080
-#: ../enigma2_master/lib/python/Components/NimManager.py:1081
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1174
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1175
+#: ../enigma2_master/lib/python/Components/NimManager.py:1174
+#: ../enigma2_master/lib/python/Components/NimManager.py:1175
 msgid "1.2"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1077
-#: ../enigma2_master/lib/python/Components/NimManager.py:1077
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1171
+#: ../enigma2_master/lib/python/Components/NimManager.py:1171
 msgid "13 V"
 msgstr ""
 
@@ -326,15 +318,15 @@ msgstr ""
 msgid "16:9 always"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1077
-#: ../enigma2_master/lib/python/Components/NimManager.py:1077
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1171
+#: ../enigma2_master/lib/python/Components/NimManager.py:1171
 msgid "18 V"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:27
-#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:28
-#: ../enigma2_master/lib/python/Components/ParentalControl.py:27
-#: ../enigma2_master/lib/python/Components/ParentalControl.py:28
+#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:29
+#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:30
+#: ../enigma2_master/lib/python/Components/ParentalControl.py:29
+#: ../enigma2_master/lib/python/Components/ParentalControl.py:30
 msgid "30 minutes"
 msgstr ""
 
@@ -355,17 +347,17 @@ msgstr ""
 msgid "4:3 PanScan"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:27
-#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:28
-#: ../enigma2_master/lib/python/Components/ParentalControl.py:27
-#: ../enigma2_master/lib/python/Components/ParentalControl.py:28
+#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:29
+#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:30
+#: ../enigma2_master/lib/python/Components/ParentalControl.py:29
+#: ../enigma2_master/lib/python/Components/ParentalControl.py:30
 msgid "5 minutes"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:27
-#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:28
-#: ../enigma2_master/lib/python/Components/ParentalControl.py:27
-#: ../enigma2_master/lib/python/Components/ParentalControl.py:28
+#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:29
+#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:30
+#: ../enigma2_master/lib/python/Components/ParentalControl.py:29
+#: ../enigma2_master/lib/python/Components/ParentalControl.py:30
 msgid "60 minutes"
 msgstr ""
 
@@ -384,7 +376,13 @@ msgstr ""
 msgid "<Last timer location>"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Screens/AudioSelection.py:90
+#: ../enigma2_experimental/lib/python/Screens/AudioSelection.py:105
+#: ../enigma2_experimental/lib/python/Screens/AudioSelection.py:137
 #: ../enigma2_experimental/lib/python/Components/TimerList.py:64
+#: ../enigma2_master/lib/python/Screens/AudioSelection.py:90
+#: ../enigma2_master/lib/python/Screens/AudioSelection.py:105
+#: ../enigma2_master/lib/python/Screens/AudioSelection.py:137
 #: ../enigma2_master/lib/python/Components/TimerList.py:64
 msgid "<unknown>"
 msgstr ""
@@ -396,16 +394,16 @@ msgstr ""
 msgid "??"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1079
-#: ../enigma2_master/lib/python/Components/NimManager.py:1079
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1173
+#: ../enigma2_master/lib/python/Components/NimManager.py:1173
 #: ../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_master/lib/python/Screens/Ipkg.py:108
-#: ../enigma2_master/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:1406
+#: ../enigma2_master/lib/python/Screens/Ipkg.py:115
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1406
 #, python-format
 msgid ""
 "A configuration file (%s) was modified since Installation.\n"
@@ -414,18 +412,20 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/DemoPlugins/TPMDemo/plugin.py:85
 #: ../enigma2_experimental/lib/python/Plugins/DemoPlugins/TPMDemo/plugin.py:86
+#: ../enigma2_master/lib/python/Plugins/DemoPlugins/TPMDemo/plugin.py:85
+#: ../enigma2_master/lib/python/Plugins/DemoPlugins/TPMDemo/plugin.py:86
 msgid "A demo plugin for TPM usage."
 msgstr ""
 
-#: ../enigma2_experimental/RecordTimer.py:288
-#: ../enigma2_master/RecordTimer.py:288
+#: ../enigma2_experimental/RecordTimer.py:300
+#: ../enigma2_master/RecordTimer.py:300
 msgid ""
 "A finished record timer wants to set your\n"
 "Dreambox to standby. Do that now?"
 msgstr ""
 
-#: ../enigma2_experimental/RecordTimer.py:294
-#: ../enigma2_master/RecordTimer.py:294
+#: ../enigma2_experimental/RecordTimer.py:306
+#: ../enigma2_master/RecordTimer.py:306
 msgid ""
 "A finished record timer wants to shut down\n"
 "your Dreambox. Shutdown now?"
@@ -442,8 +442,8 @@ msgid ""
 "Update existing entry and continue?\n"
 msgstr ""
 
-#: ../enigma2_experimental/RecordTimer.py:369
-#: ../enigma2_master/RecordTimer.py:369
+#: ../enigma2_experimental/RecordTimer.py:381
+#: ../enigma2_master/RecordTimer.py:381
 #, python-format
 msgid ""
 "A record has been started:\n"
@@ -451,7 +451,7 @@ msgid ""
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1648
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1647
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1648
 msgid ""
 "A recording is currently running.\n"
 "What do you want to do?"
@@ -471,50 +471,50 @@ msgid ""
 "start the satfinder."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/Task.py:390
-#: ../enigma2_master/lib/python/Components/Task.py:390
+#: ../enigma2_experimental/lib/python/Components/Task.py:389
+#: ../enigma2_master/lib/python/Components/Task.py:389
 #, python-format
 msgid "A required tool (%s) was not found."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:199
-#: ../enigma2_master/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:212
 msgid "A search for available updates is currently in progress."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:571
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:571
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:582
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:582
 msgid ""
 "A second configured interface has been found.\n"
 "\n"
 "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/lib/python/Screens/TaskView.py:128
 #: ../enigma2_master/SleepTimer.py:34
 msgid ""
 "A sleep timer wants to set your\n"
 "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/lib/python/Screens/TaskView.py:125
 #: ../enigma2_master/SleepTimer.py:29
 msgid ""
 "A sleep timer wants to shut down\n"
 "your Dreambox. Shutdown now?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:852
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:852
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1076
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1076
 msgid "A small overview of the available icon states and actions."
 msgstr ""
 
-#: ../enigma2_experimental/RecordTimer.py:238
-#: ../enigma2_master/RecordTimer.py:238
+#: ../enigma2_experimental/RecordTimer.py:250
+#: ../enigma2_master/RecordTimer.py:250
 msgid ""
 "A timer failed to record!\n"
 "Disable TV and try again?\n"
@@ -528,13 +528,13 @@ msgstr ""
 msgid "A/V Settings"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1055
-#: ../enigma2_master/lib/python/Components/NimManager.py:1055
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1149
+#: ../enigma2_master/lib/python/Components/NimManager.py:1149
 msgid "AA"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1055
-#: ../enigma2_master/lib/python/Components/NimManager.py:1055
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1149
+#: ../enigma2_master/lib/python/Components/NimManager.py:1149
 msgid "AB"
 msgstr ""
 
@@ -544,11 +544,9 @@ msgstr ""
 msgid "AC3 default"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1724
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1768
+#: ../enigma2_experimental/lib/python/Screens/AudioSelection.py:75
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/Videomode/plugin.py:100
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1723
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1767
+#: ../enigma2_master/lib/python/Screens/AudioSelection.py:75
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/Videomode/plugin.py:100
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "AC3 downmix"
@@ -565,9 +563,9 @@ 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
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:76
 msgid "Accesspoint:"
 msgstr ""
 
@@ -578,10 +576,10 @@ 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
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:137
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1432
 msgid "Activate Picture in Picture"
 msgstr ""
 
@@ -595,15 +593,15 @@ msgid ""
 "Inactive"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:853
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:853
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:885
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:885
 msgid "Adapter settings"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:229
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:240
 #: ../enigma2_experimental/lib/python/Screens/TimerEdit.py:44
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/TitleList.py:187
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:229
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:240
 #: ../enigma2_master/lib/python/Screens/TimerEdit.py:44
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/TitleList.py:187
 #: ../enigma2_plugins/autotimer/src/AutoTimerOverview.py:76
@@ -615,8 +613,8 @@ msgstr ""
 msgid "Add Bookmark"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:125
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:125
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:126
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:126
 msgid "Add WLAN configuration?"
 msgstr ""
 
@@ -636,8 +634,8 @@ msgstr ""
 msgid "Add a new title"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:124
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:124
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:125
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:125
 msgid "Add network configuration?"
 msgstr ""
 
@@ -685,13 +683,13 @@ msgstr ""
 msgid "Add title"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1875
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1874
+#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1760
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1760
 msgid "Add to bouquet"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1877
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1876
+#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1762
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1762
 msgid "Add to favourites"
 msgstr ""
 
@@ -704,20 +702,20 @@ msgstr ""
 msgid "Added: "
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:178
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:178
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:179
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:179
 msgid ""
 "Adds enigma2 settings and dreambox model informations like SN, rev... if "
 "enabled."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:181
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:181
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:182
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:182
 msgid "Adds network configuration if enabled."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:184
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:184
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:185
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:185
 msgid "Adds wlan configuration if enabled."
 msgstr ""
 
@@ -731,19 +729,19 @@ 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
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:148
 msgid "Advanced Options"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:150
-#: ../enigma2_master/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:163
 msgid "Advanced Software"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:154
-#: ../enigma2_master/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:167
 msgid "Advanced Software Plugin"
 msgstr ""
 
@@ -757,15 +755,15 @@ msgstr ""
 msgid "Advanced Video Setup"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:137
-#: ../enigma2_master/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:150
 msgid "Advanced restore"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TaskView.py:57
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:194
-#: ../enigma2_master/lib/python/Screens/TaskView.py:57
-#: ../enigma2_master/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:59
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:195
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:528
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:173
 msgid "After event"
@@ -776,29 +774,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/ChannelSelection.py:708
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:850
 #: ../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:1074
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1075
-#: ../enigma2_master/lib/python/Components/NimManager.py:1074
-#: ../enigma2_master/lib/python/Components/NimManager.py:1075
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1168
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1169
+#: ../enigma2_master/lib/python/Components/NimManager.py:1168
+#: ../enigma2_master/lib/python/Components/NimManager.py:1169
 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 ""
@@ -811,8 +809,13 @@ msgstr ""
 msgid "Allow zapping via Webinterface"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:20
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:20
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:53
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:53
+msgid "Always ask"
+msgstr ""
+
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:21
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:21
 msgid "Always ask before sending"
 msgstr ""
 
@@ -829,17 +832,17 @@ 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
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:300
+#: ../enigma2_master/lib/python/Components/Task.py:347
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:180
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:290
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:300
 msgid "An unknown error occured!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:123
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:123
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:124
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:124
 msgid "Anonymize crashlog?"
 msgstr ""
 
@@ -848,15 +851,15 @@ msgstr ""
 msgid "Arabic"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:557
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:557
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:568
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:568
 msgid ""
 "Are you sure you want to activate this network configuration?\n"
 "\n"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:269
-#: ../enigma2_master/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:271
 msgid ""
 "Are you sure you want to delete\n"
 "following backup:\n"
@@ -867,22 +870,22 @@ msgstr ""
 msgid "Are you sure you want to exit this wizard?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:783
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:783
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:815
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:815
 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_master/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:256
 msgid ""
 "Are you sure you want to restore\n"
 "following backup:\n"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:221
-#: ../enigma2_master/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:242
 msgid ""
 "Are you sure you want to restore your Enigma2 backup?\n"
 "Enigma2 will restart after the restore"
@@ -899,7 +902,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 ""
@@ -917,8 +920,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"
@@ -932,8 +935,13 @@ msgstr ""
 msgid "Aspect Ratio"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Components/Network.py:348
+#: ../enigma2_master/lib/python/Components/Network.py:348
+msgid "Atheros"
+msgstr ""
+
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1672
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1671
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1672
 msgid "Audio Options..."
 msgstr ""
 
@@ -945,15 +953,15 @@ 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_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:998
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1211
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1211
 #: ../enigma2_plugins/mytube/src/plugin.py:1338
 msgid "Author: "
 msgstr ""
@@ -964,19 +972,19 @@ msgid "Authoring mode"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Ci.py:25
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:577
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:585
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:612
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:619
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:627
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:642
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:655
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:572
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:580
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:607
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:614
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:622
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:637
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:650
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:657
 #: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:662
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:667
-#: ../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:1052
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:666
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:672
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:678
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1146
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:10
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:15
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:26
@@ -993,19 +1001,19 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:106
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:112
 #: ../enigma2_master/lib/python/Screens/Ci.py:25
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:554
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:562
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:589
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:596
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:604
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:619
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:632
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:639
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:644
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:648
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:654
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:660
-#: ../enigma2_master/lib/python/Components/NimManager.py:1052
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:572
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:580
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:607
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:614
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:622
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:637
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:650
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:657
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:662
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:666
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:672
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:678
+#: ../enigma2_master/lib/python/Components/NimManager.py:1146
 #: ../enigma2_master/lib/python/Tools/Transponder.py:10
 #: ../enigma2_master/lib/python/Tools/Transponder.py:15
 #: ../enigma2_master/lib/python/Tools/Transponder.py:26
@@ -1065,13 +1073,13 @@ msgstr ""
 msgid "Automatic"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:938
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:915
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:933
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:933
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 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 ""
@@ -1085,34 +1093,36 @@ msgstr ""
 msgid "Available format variables"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1079
-#: ../enigma2_master/lib/python/Components/NimManager.py:1079
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1173
+#: ../enigma2_master/lib/python/Components/NimManager.py:1173
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "B"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1055
-#: ../enigma2_master/lib/python/Components/NimManager.py:1055
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1149
+#: ../enigma2_master/lib/python/Components/NimManager.py:1149
 msgid "BA"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1055
-#: ../enigma2_master/lib/python/Components/NimManager.py:1055
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1149
+#: ../enigma2_master/lib/python/Components/NimManager.py:1149
 msgid "BB"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1231
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1236
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1241
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1246
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1251
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:448
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1231
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1236
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1241
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1246
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1251
-#: ../enigma2_master/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:658
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1270
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1275
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1280
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1285
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1290
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:507
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:658
 msgid "Back"
 msgstr ""
 
@@ -1121,13 +1131,13 @@ msgstr ""
 msgid "Background"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:284
-#: ../enigma2_master/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:305
 msgid "Backup done."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:286
-#: ../enigma2_master/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:307
 msgid "Backup failed."
 msgstr ""
 
@@ -1140,19 +1150,19 @@ msgstr ""
 msgid "Backup is running..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:118
-#: ../enigma2_master/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:131
 msgid "Backup system settings"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1078
-#: ../enigma2_master/lib/python/Components/NimManager.py:1078
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1172
+#: ../enigma2_master/lib/python/Components/NimManager.py:1172
 msgid "Band"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:416
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:411
 #: ../enigma2_experimental/lib/python/Screens/ServiceInfo.py:140
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:393
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:411
 #: ../enigma2_master/lib/python/Screens/ServiceInfo.py:140
 msgid "Bandwidth"
 msgstr ""
@@ -1167,20 +1177,20 @@ msgid "Begin of timespan"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:50
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:331
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:344
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:117
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py:97
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:50
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:331
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:344
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:117
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py:97
 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
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:80
 msgid "Bitrate:"
 msgstr ""
 
@@ -1203,7 +1213,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 ""
@@ -1221,15 +1231,15 @@ msgid "Browse network neighbourhood"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py:35
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:884
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:925
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:946
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:894
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:935
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:956
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/TitleList.py:66
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/TitleList.py:122
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py:35
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:884
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:925
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:946
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:894
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:935
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:956
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/TitleList.py:66
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/TitleList.py:122
 msgid "Burn DVD"
@@ -1250,8 +1260,8 @@ msgstr ""
 msgid "Bus: "
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:986
-#: ../enigma2_master/lib/python/Components/NimManager.py:986
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1078
+#: ../enigma2_master/lib/python/Components/NimManager.py:1078
 msgid "C-Band"
 msgstr ""
 
@@ -1275,11 +1285,11 @@ 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
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:958
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:965
 #: ../enigma2_master/lib/python/Components/ServiceScan.py:69
 #: ../enigma2_master/lib/python/Tools/Transponder.py:48
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:476
@@ -1295,63 +1305,71 @@ 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:228
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:364
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:239
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:375
 #: ../enigma2_experimental/lib/python/Screens/ParentalControlSetup.py:57
 #: ../enigma2_experimental/lib/python/Screens/ParentalControlSetup.py:334
 #: ../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:977
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1552
 #: ../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
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/Videomode/plugin.py:36
+#: ../enigma2_master/lib/python/Screens/InputDeviceSetup.py:171
 #: ../enigma2_master/lib/python/Screens/LocationBox.py:94
 #: ../enigma2_master/lib/python/Screens/LocationBox.py:128
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:228
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:364
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:239
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:375
 #: ../enigma2_master/lib/python/Screens/ParentalControlSetup.py:57
 #: ../enigma2_master/lib/python/Screens/ParentalControlSetup.py:334
 #: ../enigma2_master/lib/python/Screens/RecordPaths.py:24
 #: ../enigma2_master/lib/python/Screens/Setup.py:84
 #: ../enigma2_master/lib/python/Screens/TimeDateInput.py:14
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:30
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:31
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:60
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:108
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py:41
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:52
-#: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/settings.py:25
-#: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/settings.py:67
+#: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/settings.py:27
+#: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/settings.py:69
 #: ../enigma2_master/lib/python/Plugins/Extensions/PicturePlayer/plugin.py:164
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:367
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py:582
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:177
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:293
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:561
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:717
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:115
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:205
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:753
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1312
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:351
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:977
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1552
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py:102
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py:47
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py:302
@@ -1374,11 +1392,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 ""
-
 #: ../enigma2_experimental/lib/python/Screens/HarddiskSetup.py:48
 #: ../enigma2_master/lib/python/Screens/HarddiskSetup.py:48
 msgid "Capacity: "
@@ -1411,37 +1424,30 @@ 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."
-msgstr ""
-
 #: ../enigma2_plugins/networkbrowser/src/MountManager.py:76
 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/ChannelSelection.py:198
 #: ../enigma2_master/lib/python/Screens/ParentalControlSetup.py:311
 msgid "Change pin code"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ParentalControlSetup.py:90
 #: ../enigma2_master/lib/python/Screens/ParentalControlSetup.py:90
-msgid "Change service pin"
+msgid "Change service PIN"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ParentalControlSetup.py:87
 #: ../enigma2_master/lib/python/Screens/ParentalControlSetup.py:87
-msgid "Change service pins"
+msgid "Change service PINs"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ParentalControlSetup.py:81
 #: ../enigma2_master/lib/python/Screens/ParentalControlSetup.py:81
-msgid "Change setup pin"
+msgid "Change setup PIN"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py:315
@@ -1453,17 +1459,24 @@ msgstr ""
 msgid "Change the hostname of your Dreambox."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:260
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:272
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:283
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:184
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:756
+#: ../enigma2_master/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: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
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:260
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:272
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:283
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:184
+#: ../enigma2_master/lib/python/Screens/AudioSelection.py:83
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:261
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:273
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:284
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:185
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/DVDTitle.py:21
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:117
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py:97
@@ -1494,18 +1507,18 @@ msgstr ""
 msgid "Channels"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:416
-#: ../enigma2_master/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:429
 msgid "Chap."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:417
-#: ../enigma2_master/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:430
 msgid "Chapter"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:152
-#: ../enigma2_master/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:165
 msgid "Chapter:"
 msgstr ""
 
@@ -1519,30 +1532,35 @@ msgstr ""
 msgid "Checking Filesystem..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:222
-#: ../enigma2_master/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:224
 msgid "Choose a wireless network"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:139
-#: ../enigma2_master/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:152
 msgid "Choose backup files"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:138
-#: ../enigma2_master/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:151
 msgid "Choose backup location"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:230
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:230
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:735
+#: ../enigma2_master/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:231
 #: ../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_master/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:155
 msgid "Choose upgrade source"
 msgstr ""
 
@@ -1588,26 +1606,27 @@ msgstr ""
 msgid "CleanupWizard"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:424
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:929
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:401
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:906
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:419
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:924
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:419
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:924
 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_master/lib/python/Screens/TimerEntry.py:398
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:414
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:414
 msgid "Clear log"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:64
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:685
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1059
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1316
+#: ../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: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
@@ -1616,22 +1635,26 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:33
 #: ../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/CrashlogAutoSubmit/plugin.py:78
+#: ../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_master/lib/python/Screens/NetworkSetup.py:64
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:685
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1059
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1316
+#: ../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:680
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1075
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1154
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1465
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1676
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1972
+#: ../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/InputDeviceSetup.py:49
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:39
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:696
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1098
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1356
 #: ../enigma2_master/lib/python/Screens/TaskView.py:51
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/TitleList.py:186
 #: ../enigma2_master/lib/python/Plugins/Extensions/PicturePlayer/plugin.py:60
@@ -1640,20 +1663,23 @@ msgstr ""
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:33
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:417
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:525
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:77
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:78
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:399
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:495
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py:30
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:158
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:353
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:466
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:851
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:931
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1225
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1422
-#: ../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_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:171
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:471
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:553
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:680
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1075
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1154
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1465
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1676
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1944
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:95
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:205
+#: ../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
@@ -1678,13 +1704,13 @@ msgstr ""
 msgid "Close title selection"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:417
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:394
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:412
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:412
 msgid "Code rate high"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:418
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:395
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:413
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:413
 msgid "Code rate low"
 msgstr ""
 
@@ -1716,20 +1742,20 @@ 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 ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:302
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:314
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:302
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:314
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:315
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:327
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:315
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:327
 msgid "Command order"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:298
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:298
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:311
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:311
 msgid "Committed DiSEqC command"
 msgstr ""
 
@@ -1738,13 +1764,13 @@ msgstr ""
 msgid "Common Interface Assignment"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:636
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:636
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:860
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:860
 msgid "CommonInterface"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:650
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:650
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:874
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:874
 msgid "Communication"
 msgstr ""
 
@@ -1753,11 +1779,11 @@ msgstr ""
 msgid "Compact Flash"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:540
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:541
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:535
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:536
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py:592
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:517
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:518
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:535
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:536
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py:592
 msgid "Complete"
 msgstr ""
@@ -1767,21 +1793,21 @@ msgstr ""
 msgid "Complex (allows mixing audio tracks and aspects)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:105
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:159
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:193
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:257
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:348
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:105
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:159
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:193
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:257
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:348
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:106
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:160
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:194
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:258
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:361
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:106
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:160
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:194
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:258
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:361
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Configuration Mode"
 msgstr ""
 
-#: ../enigma2_plugins/webinterface/src/plugin.py:499
+#: ../enigma2_plugins/webinterface/src/plugin.py:540
 msgid "Configuration for the Webinterface"
 msgstr ""
 
@@ -1799,10 +1825,10 @@ 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_master/lib/python/Screens/Ipkg.py:99
-#: ../enigma2_master/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:1397
+#: ../enigma2_master/lib/python/Screens/Ipkg.py:106
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1397
 msgid "Configuring"
 msgstr ""
 
@@ -1812,19 +1838,21 @@ 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
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:206
 msgid "Connect"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:401
-#: ../enigma2_master/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:466
 msgid "Connect to a Wireless Network"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:141
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:141
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:142
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:299
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:142
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:299
 msgid "Connected to"
 msgstr ""
 
@@ -1838,13 +1866,18 @@ msgstr ""
 msgid "Constellation"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:284
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:284
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:294
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:294
 msgid "Content does not fit on DVD!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:512
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:512
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:612
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:612
+msgid "Continue"
+msgstr ""
+
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:525
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:525
 msgid "Continue playing"
 msgstr ""
 
@@ -1856,61 +1889,61 @@ msgstr ""
 msgid "Contrast"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:277
-#: ../enigma2_master/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:646
 msgid "Could not connect to Dreambox .NFI Image Feed Server:"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:283
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:283
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:293
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:293
 msgid "Could not load Medium! No disc inserted?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:215
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:215
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:222
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:222
 msgid "Could not open Picture in Picture"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1555
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1554
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1555
 #, python-format
 msgid "Couldn't record due to conflicting timer %s"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:394
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:394
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:420
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:420
 msgid "Crashlog settings"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:399
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:399
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:425
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:425
 msgid "CrashlogAutoSubmit"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:399
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:399
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:425
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:425
 msgid "CrashlogAutoSubmit settings"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:90
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:90
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:91
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:91
 msgid "CrashlogAutoSubmit settings..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:338
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:338
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:339
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:339
 msgid ""
 "Crashlogs found!\n"
 "Send them to Dream Multimedia?"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py:35
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:890
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:931
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:900
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:941
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/TitleList.py:124
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py:35
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:890
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:931
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:900
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:941
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/TitleList.py:124
 msgid "Create DVD-ISO"
 msgstr ""
@@ -1944,18 +1977,25 @@ msgstr ""
 msgid "Croatian"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:979
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:979
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:986
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:986
 msgid "Current Transponder"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:351
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:351
+#: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:223
+#: ../enigma2_master/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:362
 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/Screens/InputDeviceSetup.py:225
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py:113
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py:330
 msgid "Current value: "
@@ -1966,6 +2006,11 @@ msgstr ""
 msgid "Current version:"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:738
+#: ../enigma2_master/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)"
@@ -1994,13 +2039,13 @@ 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:1295
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1295
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1335
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1335
 msgid "DHCP"
 msgstr ""
 
@@ -2009,13 +2054,13 @@ msgstr ""
 msgid "DUAL LAYER DVD"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:571
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:548
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:566
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:566
 msgid "DVB-S"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:572
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:549
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:567
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:567
 msgid "DVB-S2"
 msgstr ""
 
@@ -2027,8 +2072,8 @@ msgstr ""
 msgid "DVD File Browser"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:702
-#: ../enigma2_master/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:715
 msgid "DVD Player"
 msgstr ""
 
@@ -2052,9 +2097,9 @@ 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
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:171
 msgid "Date"
 msgstr ""
 
@@ -2063,13 +2108,13 @@ msgstr ""
 msgid "Decide if you want to enable or disable the Cleanup Wizard."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:161
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:161
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:162
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:162
 msgid "Decide what should be done when crashlogs are found."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:164
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:164
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:165
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:165
 msgid "Decide what should happen to the crashlogs after submission."
 msgstr ""
 
@@ -2090,15 +2135,15 @@ msgstr ""
 msgid "Deep Standby"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:107
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:118
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py:50
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:107
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:118
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py:50
 msgid "Default"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:638
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:638
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:862
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:862
 msgid "Default Settings"
 msgstr ""
 
@@ -2113,11 +2158,11 @@ msgstr ""
 msgid "Defaults"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:230
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:241
 #: ../enigma2_experimental/lib/python/Screens/TimerEdit.py:133
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:120
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:207
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:230
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:241
 #: ../enigma2_master/lib/python/Screens/TimerEdit.py:133
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:120
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:207
@@ -2126,14 +2171,14 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:22
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:22
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:23
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:23
 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/Screens/TimerEntry.py:411
 #: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:502
 msgid "Delete entry"
 msgstr ""
@@ -2151,25 +2196,25 @@ msgstr ""
 msgid "Delete mount"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:389
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:389
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:401
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:401
 #, python-format
 msgid ""
 "Delete no more configured satellite\n"
 "%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
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py:97
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:141
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:142
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/DVDTitle.py:20
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:117
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py:81
@@ -2184,14 +2229,9 @@ 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: "
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1178
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1178
+msgid "Details for plugin: "
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/About.py:34
@@ -2204,27 +2244,27 @@ msgstr ""
 msgid "Detected NIMs:"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:501
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1062
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:501
-#: ../enigma2_master/lib/python/Components/NimManager.py:1062
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:515
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1156
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:515
+#: ../enigma2_master/lib/python/Components/NimManager.py:1156
 msgid "DiSEqC A/B"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:501
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1062
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:501
-#: ../enigma2_master/lib/python/Components/NimManager.py:1062
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:515
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1156
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:515
+#: ../enigma2_master/lib/python/Components/NimManager.py:1156
 msgid "DiSEqC A/B/C/D"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:294
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:294
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:307
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:307
 msgid "DiSEqC mode"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:317
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:317
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:330
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:330
 msgid "DiSEqC repeats"
 msgstr ""
 
@@ -2258,8 +2298,8 @@ msgstr ""
 msgid "Directory %s nonexistent."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:41
-#: ../enigma2_master/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:43
 msgid "Directory browser"
 msgstr ""
 
@@ -2273,17 +2313,12 @@ msgid "Disable"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1430
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1429
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1430
 msgid "Disable Picture in Picture"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Subtitles.py:37
-#: ../enigma2_master/lib/python/Screens/Subtitles.py:37
-msgid "Disable Subtitles"
-msgstr ""
-
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:20
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:20
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:21
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:21
 msgid "Disable crashlog reporting"
 msgstr ""
 
@@ -2293,11 +2328,11 @@ 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
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:105
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:471
 msgid "Disabled"
 msgstr ""
 
@@ -2331,12 +2366,12 @@ msgstr ""
 msgid "Display >16:9 content as"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:646
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:646
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:870
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:870
 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 ""
 
@@ -2408,55 +2443,61 @@ msgstr ""
 msgid "Do you really want to remove your bookmark of %s?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:424
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:434
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/TitleList.py:255
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:424
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:434
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/TitleList.py:255
 msgid "Do you want to burn this collection to DVD medium?"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:560
+#: ../enigma2_master/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_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1056
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1501
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1280
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1789
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1280
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1787
 msgid "Do you want to install the package:\n"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:595
-#: ../enigma2_master/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:608
 msgid "Do you want to play DVD in drive?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:408
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:408
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:418
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:418
 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_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
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1200
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1508
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1530
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:921
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1287
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1302
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1440
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1796
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1818
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:921
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1287
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1302
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1440
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1794
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1816
 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_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1050
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1493
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1273
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1781
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1273
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1779
 msgid "Do you want to remove the package:\n"
 msgstr ""
 
@@ -2467,8 +2508,8 @@ msgstr ""
 msgid "Do you want to restore your settings?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:2027
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2026
+#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1912
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1912
 msgid "Do you want to resume this playback?"
 msgstr ""
 
@@ -2476,15 +2517,15 @@ msgstr ""
 msgid "Do you want to see more entries?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:167
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:167
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:168
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:168
 msgid ""
 "Do you want to submit your email address and name so that we can contact you "
 "if needed?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:212
-#: ../enigma2_master/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:233
 msgid "Do you want to update your Dreambox?"
 msgstr ""
 
@@ -2497,13 +2538,13 @@ msgid ""
 "After pressing OK, please wait!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1497
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1497
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1785
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1783
 msgid "Do you want to upgrade the package:\n"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:20
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:20
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:21
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:21
 msgid "Don't ask, just send"
 msgstr ""
 
@@ -2512,31 +2553,43 @@ msgstr ""
 msgid "Don't stop current event but disable coming events"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1181
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1181
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1420
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1420
 #, python-format
 msgid "Done - Installed or upgraded %d packages"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Ipkg.py:57
-#: ../enigma2_master/lib/python/Screens/Ipkg.py:57
+#: ../enigma2_experimental/lib/python/Screens/Ipkg.py:58
+#: ../enigma2_master/lib/python/Screens/Ipkg.py:58
 #, 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_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:185
-#: ../enigma2_master/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:499
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:508
 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_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
+#: ../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
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:523
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:724
+#: ../enigma2_master/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:31
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:812
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py:20
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py:24
 msgid "Download .NFI-Files for USB-Flasher"
 msgstr ""
 
@@ -2549,24 +2602,23 @@ 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 ""
-
 #: ../enigma2_experimental/lib/python/Screens/PluginBrowser.py:164
 #: ../enigma2_master/lib/python/Screens/PluginBrowser.py:164
 msgid "Downloadable new plugins"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Ipkg.py:82
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1148
-#: ../enigma2_master/lib/python/Screens/Ipkg.py:82
-#: ../enigma2_master/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:1374
+#: ../enigma2_master/lib/python/Screens/Ipkg.py:83
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:73
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:101
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1374
 msgid "Downloading"
 msgstr ""
 
@@ -2584,8 +2636,8 @@ msgstr ""
 msgid "Dreambox format data DVD (HDTV compatible)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:782
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:782
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1006
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1006
 msgid "Dreambox software because updates are available."
 msgstr ""
 
@@ -2604,12 +2656,12 @@ msgstr ""
 msgid "Dynamic contrast"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:966
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:385
+#: ../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
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:966
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:385
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:973
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:397
 #: ../enigma2_master/lib/python/Components/ServiceScan.py:51
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:484
 msgid "E"
@@ -2625,17 +2677,17 @@ msgstr ""
 msgid "ERROR - failed to scan (%s)!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1069
-#: ../enigma2_master/lib/python/Components/NimManager.py:1069
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1163
+#: ../enigma2_master/lib/python/Components/NimManager.py:1163
 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:1466
 #: ../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
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1466
 msgid "Edit"
 msgstr ""
 
@@ -2651,8 +2703,8 @@ msgstr ""
 msgid "Edit AutoTimer services"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:365
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:365
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:376
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:376
 msgid "Edit DNS"
 msgstr ""
 
@@ -2689,22 +2741,22 @@ msgstr ""
 msgid "Edit services list"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1313
+#: ../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_master/lib/python/Screens/NetworkSetup.py:1313
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:66
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1353
 #: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:510
-#: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/settings.py:64
+#: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/settings.py:66
 msgid "Edit settings"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:818
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:818
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:850
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:850
 msgid "Edit the Nameserver configuration of your Dreambox.\n"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:814
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:814
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:846
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:846
 msgid "Edit the network configuration of your Dreambox.\n"
 msgstr ""
 
@@ -2713,8 +2765,8 @@ msgstr ""
 msgid "Edit title"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1351
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1351
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1591
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1591
 msgid "Edit upgrade source url."
 msgstr ""
 
@@ -2726,22 +2778,20 @@ 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_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:648
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:872
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:872
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Electronic Program Guide"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Subtitles.py:45
 #: ../enigma2_experimental/lib/python/Screens/TimerEdit.py:138
 #: ../enigma2_experimental/lib/python/Screens/TimerEdit.py:408
 #: ../enigma2_experimental/lib/python/Screens/TimerEdit.py:428
-#: ../enigma2_master/lib/python/Screens/Subtitles.py:45
 #: ../enigma2_master/lib/python/Screens/TimerEdit.py:138
 #: ../enigma2_master/lib/python/Screens/TimerEdit.py:408
 #: ../enigma2_master/lib/python/Screens/TimerEdit.py:428
@@ -2752,8 +2802,8 @@ msgstr ""
 msgid "Enable /media"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:198
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:198
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:199
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:199
 msgid "Enable 5V for active antenna"
 msgstr ""
 
@@ -2808,10 +2858,10 @@ 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
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:475
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:492
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:128
 #: ../enigma2_plugins/autotimer/src/AutoTimerWizard.py:85
@@ -2824,37 +2874,37 @@ msgid ""
 "you're searching for special characters like the german umlauts."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:274
-#: ../enigma2_master/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:276
 msgid "Encrypted: "
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:511
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:511
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:522
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:522
 msgid "Encryption"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:519
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:522
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:519
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:522
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:530
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:533
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:530
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:533
 msgid "Encryption Key"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:518
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:518
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:529
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:529
 msgid "Encryption Keytype"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:515
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:515
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:526
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:526
 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
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:81
 msgid "Encryption:"
 msgstr ""
 
@@ -2868,14 +2918,14 @@ msgid "End of timespan"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:51
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:332
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:345
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:51
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:332
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:345
 msgid "End time"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:180
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:180
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:181
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:181
 msgid "EndTime"
 msgstr ""
 
@@ -2930,8 +2980,8 @@ msgstr ""
 msgid "Enter share name:"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:191
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:191
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:198
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:198
 msgid "Enter the service pin"
 msgstr ""
 
@@ -2944,8 +2994,8 @@ msgstr ""
 msgid "Enter username:"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:170
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:170
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:171
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:171
 msgid "Enter your email address so that we can contact you if needed."
 msgstr ""
 
@@ -2953,21 +3003,21 @@ 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_master/lib/python/Components/Task.py:285
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:614
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1430
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1756
+#: ../enigma2_master/lib/python/Components/Task.py:284
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:224
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:413
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1190
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1468
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:614
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1430
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1754
 msgid "Error"
 msgstr ""
 
@@ -2976,8 +3026,8 @@ msgstr ""
 msgid "Error executing plugin"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/Task.py:283
-#: ../enigma2_master/lib/python/Components/Task.py:283
+#: ../enigma2_experimental/lib/python/Components/Task.py:282
+#: ../enigma2_master/lib/python/Components/Task.py:282
 #, python-format
 msgid ""
 "Error: %s\n"
@@ -3032,12 +3082,10 @@ 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
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:183
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:525
 msgid "Exit"
 msgstr ""
 
@@ -3046,6 +3094,13 @@ msgstr ""
 msgid "Exit editor"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:60
+#: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:66
+#: ../enigma2_master/lib/python/Screens/InputDeviceSetup.py:60
+#: ../enigma2_master/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
@@ -3068,42 +3123,42 @@ msgstr ""
 msgid "Expert"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:876
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:876
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:908
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:908
 msgid "Extended Networksetup Plugin..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:872
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:872
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:904
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:904
 msgid "Extended Setup..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:128
-#: ../enigma2_master/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:141
 msgid "Extended Software"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:132
-#: ../enigma2_master/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:145
 msgid "Extended Software Plugin"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:374
-#: ../enigma2_master/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:574
 msgid "Extensions management"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:382
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:384
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:411
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:377
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:379
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:406
 #: ../enigma2_experimental/lib/python/Screens/ServiceInfo.py:145
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:447
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:449
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:85
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:87
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:359
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:361
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:388
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:377
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:379
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:406
 #: ../enigma2_master/lib/python/Screens/ServiceInfo.py:145
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:447
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:449
@@ -3113,9 +3168,9 @@ msgid "FEC"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Components/Task.py:42
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:448
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:458
 #: ../enigma2_master/lib/python/Components/Task.py:42
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:448
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:458
 msgid "Failed"
 msgstr ""
 
@@ -3137,24 +3192,24 @@ msgstr ""
 msgid "Fan %d Voltage"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1071
-#: ../enigma2_master/lib/python/Components/NimManager.py:1071
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1165
+#: ../enigma2_master/lib/python/Components/NimManager.py:1165
 msgid "Fast"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:299
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:299
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:312
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:312
 msgid "Fast DiSEqC"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1071
-#: ../enigma2_master/lib/python/Components/NimManager.py:1071
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1165
+#: ../enigma2_master/lib/python/Components/NimManager.py:1165
 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/Screens/ChannelSelection.py:711
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:528
 msgid "Favourites"
 msgstr ""
@@ -3173,7 +3228,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 ""
@@ -3187,13 +3242,13 @@ msgstr ""
 msgid "Finished"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:207
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:207
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:218
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:218
 msgid "Finished configuring your network"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:936
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:936
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:975
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:975
 #: ../enigma2_plugins/networkbrowser/src/MountManager.py:132
 msgid "Finished restarting your network"
 msgstr ""
@@ -3203,26 +3258,18 @@ 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_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:186
-#: ../enigma2_master/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:167
 msgid "Flash"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:296
-#: ../enigma2_master/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:211
 msgid "Flashing failed"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:755
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:755
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:979
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:979
 msgid "Following tasks will be done after you press OK!"
 msgstr ""
 
@@ -3244,7 +3291,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 ""
@@ -3254,39 +3301,39 @@ msgstr ""
 msgid "French"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:262
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:276
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:287
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:377
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:407
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:414
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:263
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:277
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:288
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:372
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:402
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:409
 #: ../enigma2_experimental/lib/python/Screens/ServiceInfo.py:138
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:442
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:80
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:262
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:276
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:287
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:354
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:384
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:391
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:263
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:277
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:288
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:372
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:402
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:409
 #: ../enigma2_master/lib/python/Screens/ServiceInfo.py:138
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:442
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:80
 msgid "Frequency"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1351
-#: ../enigma2_master/lib/python/Components/NimManager.py:1351
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1458
+#: ../enigma2_master/lib/python/Components/NimManager.py:1458
 msgid "Frequency bands"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:181
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:181
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:182
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:182
 msgid "Frequency scan step size(khz)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1351
-#: ../enigma2_master/lib/python/Components/NimManager.py:1351
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1458
+#: ../enigma2_master/lib/python/Components/NimManager.py:1458
 msgid "Frequency steps"
 msgstr ""
 
@@ -3301,10 +3348,10 @@ msgstr ""
 msgid "Fri"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:123
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:166
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:123
-#: ../enigma2_master/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:124
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:167
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:48
 msgid "Friday"
 msgstr ""
@@ -3332,19 +3379,19 @@ 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 ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:355
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:390
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:393
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:491
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:355
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:390
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:393
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:491
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:366
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:401
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:404
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:502
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:366
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:401
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:404
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:502
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Gateway"
 msgstr ""
@@ -3379,11 +3426,21 @@ 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
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:731
+msgid "Get latest experimental image"
+msgstr ""
+
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:724
+#: ../enigma2_master/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..."
@@ -3410,7 +3467,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 ""
@@ -3430,8 +3487,8 @@ msgstr ""
 msgid "Guard Interval"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:421
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:398
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:416
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:416
 msgid "Guard interval mode"
 msgstr ""
 
@@ -3439,7 +3496,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"
@@ -3463,19 +3520,27 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:506
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:506
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:517
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:517
 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_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
-#: ../enigma2_master/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:75
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:77
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:83
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:85
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:430
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:432
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:438
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:440
 msgid "Hidden networkname"
 msgstr ""
 
@@ -3484,8 +3549,8 @@ msgstr ""
 msgid "Hierarchy Information"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:422
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:399
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:417
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:417
 msgid "Hierarchy mode"
 msgstr ""
 
@@ -3498,12 +3563,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 ""
@@ -3514,16 +3579,16 @@ msgid "Horizontal"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1624
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1623
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1624
 msgid "How many minutes do you want to record?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:118
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:118
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:119
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:119
 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 ""
@@ -3538,12 +3603,12 @@ msgstr ""
 msgid "Hungarian"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:353
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:486
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1301
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:353
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:486
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1301
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:364
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:497
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1341
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:364
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:497
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1341
 #: ../enigma2_plugins/networkbrowser/src/NetworkBrowser.py:514
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "IP Address"
@@ -3553,8 +3618,8 @@ msgstr ""
 msgid "IP:"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:289
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:289
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:299
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:299
 msgid "ISO file is too large for this filesystem!"
 msgstr ""
 
@@ -3598,11 +3663,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 ""
-
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:220
 msgid "Import AutoTimer"
 msgstr ""
@@ -3620,8 +3680,8 @@ msgstr ""
 msgid "In Progress"
 msgstr ""
 
-#: ../enigma2_experimental/RecordTimer.py:241
-#: ../enigma2_master/RecordTimer.py:241
+#: ../enigma2_experimental/RecordTimer.py:253
+#: ../enigma2_master/RecordTimer.py:253
 msgid ""
 "In order to record a timer, the TV was switched to the recording service!\n"
 msgstr ""
@@ -3632,8 +3692,8 @@ msgstr ""
 msgid "Include"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:120
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:120
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:121
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:121
 msgid "Include your email and name (optional) in the mail?"
 msgstr ""
 
@@ -3648,12 +3708,12 @@ msgstr ""
 msgid "Increase delay by %i ms (can be set)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:290
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:290
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:303
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:303
 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 ""
@@ -3689,27 +3749,32 @@ 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_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
+#: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:154
+#: ../enigma2_master/lib/python/Screens/InputDeviceSetup.py:154
+msgid "Input device setup"
+msgstr ""
+
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:662
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1215
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1973
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:662
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1215
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1945
 msgid "Install"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1692
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1692
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:2006
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1978
 msgid "Install extensions."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:120
-#: ../enigma2_master/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:133
 msgid "Install local extension"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:697
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:697
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:921
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:921
 msgid "Install or remove finished."
 msgstr ""
 
@@ -3718,22 +3783,22 @@ msgstr ""
 msgid "Install settings, skins, software..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1063
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1063
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1287
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1287
 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_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
+#: ../enigma2_experimental/lib/python/Screens/Ipkg.py:94
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1018
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1385
+#: ../enigma2_master/lib/python/Screens/Ipkg.py:94
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1018
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1385
 msgid "Installing"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1490
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1489
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1490
 msgid "Instant Record..."
 msgstr ""
 
@@ -3742,18 +3807,8 @@ msgstr ""
 msgid "Instant record location"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/Network.py:314
-#: ../enigma2_master/lib/python/Components/Network.py:314
-msgid "Integrated Ethernet"
-msgstr ""
-
-#: ../enigma2_experimental/lib/python/Components/Network.py:316
-#: ../enigma2_master/lib/python/Components/Network.py:316
-msgid "Integrated Wireless"
-msgstr ""
-
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:274
-#: ../enigma2_master/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:276
 msgid "Interface: "
 msgstr ""
 
@@ -3767,6 +3822,11 @@ msgstr ""
 msgid "Internal Flash"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Components/Network.py:340
+#: ../enigma2_master/lib/python/Components/Network.py:340
+msgid "Internal LAN adapter."
+msgstr ""
+
 #: ../enigma2_experimental/lib/python/Screens/LocationBox.py:401
 #: ../enigma2_master/lib/python/Screens/LocationBox.py:401
 msgid "Invalid Location"
@@ -3796,27 +3856,27 @@ msgstr ""
 msgid "Invalid selection"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:378
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:408
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:415
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:373
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:403
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:410
 #: ../enigma2_experimental/lib/python/Screens/ServiceInfo.py:142
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:443
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:81
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:355
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:385
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:392
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:373
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:403
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:410
 #: ../enigma2_master/lib/python/Screens/ServiceInfo.py:142
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:443
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:81
 msgid "Inversion"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1711
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1711
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:2025
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1997
 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 ""
@@ -3826,7 +3886,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 ""
@@ -3836,12 +3896,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 ""
@@ -3864,32 +3924,39 @@ msgstr ""
 msgid "Key %(key)s (current value: %(value)i ms)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1279
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1279
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1319
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1319
 msgid "LAN Adapter"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:243
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:243
+#: ../enigma2_experimental/lib/python/Components/Network.py:326
+#: ../enigma2_experimental/lib/python/Components/Network.py:329
+#: ../enigma2_master/lib/python/Components/Network.py:326
+#: ../enigma2_master/lib/python/Components/Network.py:329
+msgid "LAN connection"
+msgstr ""
+
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:244
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:244
 msgid "LNB"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:248
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:248
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:249
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:249
 msgid "LOF"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:253
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:265
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:253
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:265
+msgid "LOF/H"
+msgstr ""
+
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:252
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:264
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:252
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:264
-msgid "LOF/H"
-msgstr ""
-
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:251
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:263
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:251
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:263
 msgid "LOF/L"
 msgstr ""
 
@@ -3907,14 +3974,14 @@ msgid "Last config"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Components/UsageConfig.py:116
-#: ../enigma2_master/lib/python/Components/UsageConfig.py:107
+#: ../enigma2_master/lib/python/Components/UsageConfig.py:116
 msgid "Last speed"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:40
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:321
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:334
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:40
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:321
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:334
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Latitude"
 msgstr ""
@@ -3924,16 +3991,12 @@ msgstr ""
 msgid "Latvian"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:519
-#: ../enigma2_master/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:532
 msgid "Leave DVD Player?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1725
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1730
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/VideoEnhancement/VideoEnhancement.py:149
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1724
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1729
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/VideoEnhancement/VideoEnhancement.py:149
 msgid "Left"
 msgstr ""
@@ -3965,16 +4028,16 @@ 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
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:78
 msgid "Link Quality:"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:835
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:144
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:835
-#: ../enigma2_master/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:867
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:146
 msgid "Link:"
 msgstr ""
 
@@ -3983,12 +4046,16 @@ msgstr ""
 msgid "Linked titles with a DVD menu"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/config.py:1137
+#: ../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_master/lib/python/Components/config.py:1137
+#: ../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:1138
 #: ../enigma2_master/lib/python/Components/FileList.py:177
-#: ../enigma2_master/lib/python/Components/FileList.py:394
+#: ../enigma2_master/lib/python/Components/FileList.py:397
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:561
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:717
 msgid "List of Storage Devices"
 msgstr ""
 
@@ -4002,7 +4069,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 ""
 
@@ -4010,8 +4077,8 @@ msgstr ""
 msgid "Load movie-length"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1288
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1288
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1328
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1328
 msgid "Local Network"
 msgstr ""
 
@@ -4019,8 +4086,8 @@ msgstr ""
 msgid "Local share name"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:187
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:187
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:188
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:188
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:191
 msgid "Location"
 msgstr ""
@@ -4040,10 +4107,15 @@ msgstr ""
 msgid "Long Keypress"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Components/RecordingConfig.py:14
+#: ../enigma2_master/lib/python/Components/RecordingConfig.py:14
+msgid "Long filenames"
+msgstr ""
+
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:38
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:319
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:332
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:38
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:319
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:332
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Longitude"
 msgstr ""
@@ -4079,9 +4151,9 @@ 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
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:128
 msgid "Manage extensions"
 msgstr ""
 
@@ -4093,10 +4165,10 @@ 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_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1710
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1714
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:2024
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:2028
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1996
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:2000
 msgid "Manage your receiver's software"
 msgstr ""
 
@@ -4107,10 +4179,10 @@ msgstr ""
 msgid "Manual transponder"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:270
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:281
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:270
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:281
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:271
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:282
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:271
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:282
 msgid "Manufacturer"
 msgstr ""
 
@@ -4129,8 +4201,8 @@ msgstr ""
 msgid "Match title: %s"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:274
-#: ../enigma2_master/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:276
 msgid "Max. Bitrate: "
 msgstr ""
 
@@ -4144,30 +4216,32 @@ msgid ""
 "time (without offset) it won't be matched."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:959
-#: ../enigma2_master/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:964
 msgid "Media player"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:149
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:179
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:282
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:292
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:149
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:179
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:282
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:292
 msgid "Medium is not a writeable DVD!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:287
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:287
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:297
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:297
 msgid "Medium is not empty!"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Screens/AudioSelection.py:168
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:156
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:158
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:159
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:160
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:161
+#: ../enigma2_master/lib/python/Screens/AudioSelection.py:168
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:156
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:158
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:159
@@ -4178,7 +4252,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 ""
@@ -4188,9 +4262,9 @@ msgstr ""
 msgid "Mkfs failed"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:109
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:110
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/Videomode/plugin.py:62
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:109
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:110
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/Videomode/plugin.py:62
 msgid "Mode"
 msgstr ""
@@ -4204,15 +4278,15 @@ msgstr ""
 msgid "Modify existing timers"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:385
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:410
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:419
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:380
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:405
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:414
 #: ../enigma2_experimental/lib/python/Screens/ServiceInfo.py:136
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:450
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:88
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:362
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:387
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:396
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:380
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:405
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:414
 #: ../enigma2_master/lib/python/Screens/ServiceInfo.py:136
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:450
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:88
@@ -4230,15 +4304,15 @@ msgstr ""
 msgid "Mon"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:108
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:108
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:109
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:109
 msgid "Mon-Fri"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:123
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:162
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:123
-#: ../enigma2_master/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:124
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:163
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:44
 msgid "Monday"
 msgstr ""
@@ -4256,13 +4330,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"
@@ -4272,19 +4346,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"
@@ -4331,7 +4405,7 @@ msgid "Mounts management"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1438
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1437
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1438
 msgid "Move Picture in Picture"
 msgstr ""
 
@@ -4403,11 +4477,12 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Screens/EventView.py:213
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:601
 #: ../enigma2_master/lib/python/Screens/EventView.py:213
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:601
 msgid "Multi EPG"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:644
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:644
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:868
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:868
 msgid "Multimedia"
 msgstr ""
 
@@ -4416,12 +4491,12 @@ msgstr ""
 msgid "Multiple service support"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:539
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:516
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:534
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:534
 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 ""
@@ -4445,13 +4520,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 ""
 
@@ -4463,36 +4538,36 @@ msgstr ""
 msgid "MyTubeVideohelpScreen"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:376
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:380
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:383
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:387
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:391
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:663
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:668
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:795
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:242
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:376
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:380
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:383
+#: ../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:733
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:741
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:887
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:234
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:387
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:391
-#: ../enigma2_master/lib/python/Components/NimManager.py:663
-#: ../enigma2_master/lib/python/Components/NimManager.py:668
-#: ../enigma2_master/lib/python/Components/NimManager.py:795
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:242
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:394
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:398
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:402
+#: ../enigma2_master/lib/python/Components/NimManager.py:733
+#: ../enigma2_master/lib/python/Components/NimManager.py:741
+#: ../enigma2_master/lib/python/Components/NimManager.py:887
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:234
 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_master/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py:22
-#: ../enigma2_master/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:19
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py:23
 msgid "NFI Image Flashing"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:289
-#: ../enigma2_master/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:202
 msgid "NFI image flashing completed. Press Yellow to Reboot!"
 msgstr ""
 
@@ -4505,38 +4580,38 @@ msgstr ""
 msgid "NTSC"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:140
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:140
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:141
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:141
 msgid "Name"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1307
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1307
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1347
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1347
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Nameserver"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:266
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:266
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:277
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:277
 #, python-format
 msgid "Nameserver %d"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:854
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:854
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:886
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:886
 msgid "Nameserver settings"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:354
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:487
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:354
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:487
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:365
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:498
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:365
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:498
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Netmask"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:634
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:634
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:858
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:858
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Network"
 msgstr ""
@@ -4546,10 +4621,10 @@ msgstr ""
 msgid "Network Mount"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:504
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:509
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:504
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:509
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:515
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:520
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:515
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:520
 msgid "Network SSID"
 msgstr ""
 
@@ -4562,22 +4637,27 @@ msgstr ""
 msgid "Network Wizard"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:423
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:400
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:418
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:418
 msgid "Network scan"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:855
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:855
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:887
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:887
 msgid "Network test"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:361
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:833
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:142
-#: ../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
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1305
+#: ../enigma2_master/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:865
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:144
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:372
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:865
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:144
 msgid "Network:"
 msgstr ""
 
@@ -4585,10 +4665,10 @@ msgstr ""
 msgid "NetworkBrowser"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:139
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:881
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:139
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:881
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:150
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:913
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:150
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:913
 msgid "NetworkWizard"
 msgstr ""
 
@@ -4596,21 +4676,21 @@ msgstr ""
 msgid "Never"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:950
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:950
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:957
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:957
 #: ../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/plugin.py:108
-msgid "New Zealand"
-msgstr ""
-
 #: ../enigma2_experimental/lib/python/Screens/ParentalControlSetup.py:320
 #: ../enigma2_master/lib/python/Screens/ParentalControlSetup.py:320
-msgid "New pin"
+msgid "New PIN"
+msgstr ""
+
+#: ../enigma2_plugins/mytube/src/MyTubeSearch.py:217
+#: ../enigma2_plugins/mytube/src/plugin.py:108
+msgid "New Zealand"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/plugin.py:36
@@ -4618,7 +4698,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 ""
@@ -4632,16 +4712,16 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Screens/Ci.py:27
 #: ../enigma2_experimental/lib/python/Screens/InfoBar.py:169
 #: ../enigma2_experimental/lib/python/Screens/InfoBar.py:176
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:389
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:270
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:401
+#: ../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
 #: ../enigma2_master/lib/python/Screens/InfoBar.py:176
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:389
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:270
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:401
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:272
 #: ../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/
@@ -4652,48 +4732,44 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:286
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:286
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:296
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:296
 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_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
+#: ../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:70
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:425
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:454
 msgid "No Connection"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1643
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1642
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1643
 msgid "No HDD found or HDD not initialized!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:443
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:443
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:454
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:454
 msgid "No Networks found"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:2331
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2330
+#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:2216
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2216
 msgid ""
 "No data on transponder!\n"
 "(Timeout reading PAT)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:991
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:991
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1209
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1209
 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_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
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:180
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:180
 msgid "No details for this image file"
 msgstr ""
 
@@ -4703,28 +4779,28 @@ msgid "No displayable files on this medium found!"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1530
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1529
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1530
 msgid "No event info found, recording indefinitely."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:950
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:986
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:949
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:985
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:950
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:986
 msgid ""
 "No fast winding possible yet.. but you can use the number buttons to skip "
 "forward/backward!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:2329
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2328
+#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:2214
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2214
 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_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:201
-#: ../enigma2_master/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:640
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:214
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:640
 msgid "No network connection available."
 msgstr ""
 
@@ -4739,8 +4815,8 @@ msgstr ""
 msgid "No networks found"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1187
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1187
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1427
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1427
 msgid ""
 "No packages were upgraded yet. So you can check your network and try again."
 msgstr ""
@@ -4764,8 +4840,8 @@ msgstr ""
 msgid "No tags are set on these movies."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:389
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:389
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:401
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:401
 msgid "No to all"
 msgstr ""
 
@@ -4774,18 +4850,13 @@ msgstr ""
 msgid "No tuner is configured for use with a diseqc positioner!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:749
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:726
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:744
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:744
 msgid ""
 "No tuner is enabled!\n"
 "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 ""
-
 #: ../enigma2_experimental/lib/python/Screens/ParentalControlSetup.py:159
 #: ../enigma2_master/lib/python/Screens/ParentalControlSetup.py:159
 msgid ""
@@ -4806,29 +4877,29 @@ msgstr ""
 msgid "No videos to display"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:353
-#: ../enigma2_master/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:355
 msgid "No wireless networks found! Please refresh."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:58
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:58
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:33
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:33
 msgid ""
 "No working local network adapter found.\n"
 "Please verify that you have attached a network cable and your network is "
 "configured correctly."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:57
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:57
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:32
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:32
 msgid ""
 "No working wireless network adapter found.\n"
 "Please verify that you have attached a compatible WLAN device and your "
 "network is configured correctly."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:695
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:695
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:706
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:706
 msgid ""
 "No working wireless network interface found.\n"
 " Please verify that you have attached a compatible WLAN device or enable "
@@ -4852,35 +4923,40 @@ msgstr ""
 msgid "No, but switch to video search."
 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"
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:52
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:52
+msgid "No, never"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:278
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:278
+msgid "No, not now"
+msgstr ""
+
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:279
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:279
 msgid "No, send them never"
 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:1055
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1058
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1079
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1081
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1087
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:586
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:629
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:674
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1149
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1152
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1173
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1175
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1181
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:14
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:61
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:107
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:568
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:611
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:656
-#: ../enigma2_master/lib/python/Components/NimManager.py:1055
-#: ../enigma2_master/lib/python/Components/NimManager.py:1058
-#: ../enigma2_master/lib/python/Components/NimManager.py:1079
-#: ../enigma2_master/lib/python/Components/NimManager.py:1081
-#: ../enigma2_master/lib/python/Components/NimManager.py:1087
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:586
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:629
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:674
+#: ../enigma2_master/lib/python/Components/NimManager.py:1149
+#: ../enigma2_master/lib/python/Components/NimManager.py:1152
+#: ../enigma2_master/lib/python/Components/NimManager.py:1173
+#: ../enigma2_master/lib/python/Components/NimManager.py:1175
+#: ../enigma2_master/lib/python/Components/NimManager.py:1181
 #: ../enigma2_master/lib/python/Tools/Transponder.py:14
 #: ../enigma2_master/lib/python/Tools/Transponder.py:61
 #: ../enigma2_master/lib/python/Tools/Transponder.py:107
@@ -4896,13 +4972,13 @@ 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:1070
-#: ../enigma2_master/lib/python/Components/NimManager.py:1070
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1164
+#: ../enigma2_master/lib/python/Components/NimManager.py:1164
 msgid "North"
 msgstr ""
 
@@ -4911,8 +4987,8 @@ msgstr ""
 msgid "Norwegian"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/Task.py:369
-#: ../enigma2_master/lib/python/Components/Task.py:369
+#: ../enigma2_experimental/lib/python/Components/Task.py:368
+#: ../enigma2_master/lib/python/Components/Task.py:368
 #, python-format
 msgid ""
 "Not enough diskspace. Please free up some diskspace and try again. (%d MB "
@@ -4923,17 +4999,17 @@ msgstr ""
 msgid "Not fetching feed entries"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:326
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:864
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:866
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:1014
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:1016
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:321
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:859
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:861
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:1009
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:1011
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/plugin.py:90
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:303
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:841
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:843
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:991
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:993
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:321
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:859
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:861
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:1009
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:1011
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/plugin.py:90
 msgid ""
 "Nothing to scan!\n"
@@ -4952,12 +5028,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
@@ -4965,16 +5042,18 @@ 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
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/Videomode/plugin.py:37
+#: ../enigma2_master/lib/python/Screens/InputDeviceSetup.py:172
 #: ../enigma2_master/lib/python/Screens/LocationBox.py:91
 #: ../enigma2_master/lib/python/Screens/ParentalControlSetup.py:58
 #: ../enigma2_master/lib/python/Screens/ParentalControlSetup.py:335
 #: ../enigma2_master/lib/python/Screens/Setup.py:85
 #: ../enigma2_master/lib/python/Screens/TimeDateInput.py:13
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:29
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:30
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:61
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:109
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:221
@@ -4982,6 +5061,7 @@ msgstr ""
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:53
 #: ../enigma2_master/lib/python/Plugins/Extensions/PicturePlayer/plugin.py:165
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py:583
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:352
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py:103
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py:48
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py:303
@@ -5013,17 +5093,13 @@ msgstr ""
 msgid "OSD visibility"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1724
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1768
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1078
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1172
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:12
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:46
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:59
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:114
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/VideoEnhancement/VideoEnhancement.py:148
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1723
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1767
-#: ../enigma2_master/lib/python/Components/NimManager.py:1078
+#: ../enigma2_master/lib/python/Components/NimManager.py:1172
 #: ../enigma2_master/lib/python/Tools/Transponder.py:12
 #: ../enigma2_master/lib/python/Tools/Transponder.py:46
 #: ../enigma2_master/lib/python/Tools/Transponder.py:59
@@ -5040,16 +5116,12 @@ msgstr ""
 msgid "Offset before recording (in m)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1724
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1768
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1078
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1172
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:11
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:45
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:58
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:113
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1723
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1767
-#: ../enigma2_master/lib/python/Components/NimManager.py:1078
+#: ../enigma2_master/lib/python/Components/NimManager.py:1172
 #: ../enigma2_master/lib/python/Tools/Transponder.py:11
 #: ../enigma2_master/lib/python/Tools/Transponder.py:45
 #: ../enigma2_master/lib/python/Tools/Transponder.py:58
@@ -5065,8 +5137,8 @@ msgstr ""
 msgid "On same service"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1087
-#: ../enigma2_master/lib/python/Components/NimManager.py:1087
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1181
+#: ../enigma2_master/lib/python/Components/NimManager.py:1181
 msgid "One"
 msgstr ""
 
@@ -5074,13 +5146,13 @@ msgstr ""
 msgid "Only AutoTimers created during this session"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:425
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:402
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:420
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:420
 msgid "Only Free scan"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:754
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:754
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:978
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:978
 msgid "Only extensions."
 msgstr ""
 
@@ -5102,8 +5174,8 @@ msgstr ""
 msgid "Open plugin menu"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:174
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:174
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:175
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:175
 msgid "Optionally enter your name if you want to."
 msgstr ""
 
@@ -5120,6 +5192,16 @@ msgstr ""
 msgid "Override found with alternative service"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:365
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:365
+msgid "Overwrite configuration files ?"
+msgstr ""
+
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:376
+#: ../enigma2_master/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"
@@ -5130,34 +5212,25 @@ 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_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
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:610
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1357
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1752
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:610
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1357
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1750
 msgid "Package list update"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:141
-#: ../enigma2_master/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:154
 msgid "Packet management"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1456
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1456
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1744
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1742
 msgid "Packet manager"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Subtitles.py:53
-#: ../enigma2_experimental/lib/python/Screens/Subtitles.py:56
-#: ../enigma2_experimental/lib/python/Screens/Subtitles.py:58
-#: ../enigma2_master/lib/python/Screens/Subtitles.py:53
-#: ../enigma2_master/lib/python/Screens/Subtitles.py:56
-#: ../enigma2_master/lib/python/Screens/Subtitles.py:58
-msgid "Page"
-msgstr ""
-
 #. TRANSLATORS: (aspect ratio policy: cropped content on left/right) in doubt, keep english term
 #: ../enigma2_experimental/lib/python/Components/AVSwitch.py:98
 #: ../enigma2_experimental/lib/python/Components/AVSwitch.py:106
@@ -5167,14 +5240,14 @@ 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
+#: ../enigma2_master/lib/python/Components/FileList.py:399
 msgid "Parent Directory"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:113
-#: ../enigma2_master/lib/python/Components/ParentalControl.py:113
+#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:111
+#: ../enigma2_master/lib/python/Components/ParentalControl.py:111
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Parental control"
 msgstr ""
@@ -5201,12 +5274,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 ""
@@ -5231,11 +5304,11 @@ msgstr ""
 msgid "Pillarbox"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:388
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:383
 #: ../enigma2_experimental/lib/python/Screens/ServiceInfo.py:143
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:453
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:91
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:365
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:383
 #: ../enigma2_master/lib/python/Screens/ServiceInfo.py:143
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:453
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:91
@@ -5243,26 +5316,26 @@ msgid "Pilot"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Components/UsageConfig.py:114
-#: ../enigma2_master/lib/python/Components/UsageConfig.py:105
+#: ../enigma2_master/lib/python/Components/UsageConfig.py:114
 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
+#: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:1034
 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_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:518
-#: ../enigma2_master/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:531
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:756
 msgid "Play DVD"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:1017
-#: ../enigma2_master/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:1022
 msgid "Play Music..."
 msgstr ""
 
@@ -5270,7 +5343,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 ""
@@ -5280,7 +5353,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 ""
@@ -5301,24 +5374,19 @@ msgid "Please add titles to the compilation."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1609
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1608
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1609
 msgid "Please change recording endtime"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:277
-#: ../enigma2_master/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:646
 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 ""
-
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:602
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1359
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:601
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1358
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:602
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1359
 msgid "Please choose an extension..."
 msgstr ""
 
@@ -5327,25 +5395,18 @@ 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 "
-"target USB stick (minimum size is 64 MB) now!"
-msgstr ""
-
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py:56
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py:56
 msgid "Please do not change any values unless you know what you are doing!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:179
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:179
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:186
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:186
 msgid "Please enter a name for the new bouquet"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:253
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:253
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:260
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:260
 msgid "Please enter a name for the new marker"
 msgstr ""
 
@@ -5371,16 +5432,16 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ParentalControlSetup.py:348
 #: ../enigma2_master/lib/python/Screens/ParentalControlSetup.py:348
-msgid "Please enter the old pin code"
+msgid "Please enter the old PIN code"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:102
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:102
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:103
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:103
 msgid "Please enter your email address here:"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:104
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:104
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:105
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:105
 msgid "Please enter your name here (optional):"
 msgstr ""
 
@@ -5388,16 +5449,16 @@ msgstr ""
 msgid "Please enter your search term."
 msgstr ""
 
-#: ../enigma2_experimental/RecordTimer.py:371
-#: ../enigma2_master/RecordTimer.py:371
+#: ../enigma2_experimental/RecordTimer.py:383
+#: ../enigma2_master/RecordTimer.py:383
 msgid ""
 "Please note that the previously selected media could not be accessed and "
 "therefore the default directory is being used instead."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:288
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:283
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:264
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:265
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:283
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:264
 msgid "Please press OK to continue."
 msgstr ""
@@ -5411,15 +5472,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
-msgid "Please select .NFI flash image file from medium"
-msgstr ""
-
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:650
 #: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:650
 msgid "Please select a playlist to delete..."
@@ -5434,18 +5486,23 @@ msgstr ""
 msgid "Please select a standard feed or try searching for videos."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:334
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:334
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:350
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:350
 msgid "Please select a subservice to record..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1884
+#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1769
 #: ../enigma2_experimental/lib/python/Screens/SubservicesQuickzap.py:116
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1883
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1769
 #: ../enigma2_master/lib/python/Screens/SubservicesQuickzap.py:116
 msgid "Please select a subservice..."
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:103
+#: ../enigma2_master/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
@@ -5453,8 +5510,8 @@ msgstr ""
 msgid "Please select an option below."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:247
-#: ../enigma2_master/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:268
 msgid "Please select medium to use as backup location"
 msgstr ""
 
@@ -5463,11 +5520,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 ""
-
 #: ../enigma2_experimental/lib/python/Screens/MovieSelection.py:373
 #: ../enigma2_master/lib/python/Screens/MovieSelection.py:373
 msgid "Please select the movie path..."
@@ -5492,8 +5544,8 @@ msgstr ""
 msgid "Please wait (Step 2)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:606
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:606
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:617
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:617
 msgid "Please wait for activation of your network configuration..."
 msgstr ""
 
@@ -5524,8 +5576,8 @@ msgstr ""
 msgid "Please wait while updating your network mount..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:194
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:194
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:205
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:205
 msgid "Please wait while we configure your network..."
 msgstr ""
 
@@ -5541,47 +5593,49 @@ msgstr ""
 msgid "Please wait while we test your network..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:923
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:923
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:962
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:962
 #: ../enigma2_plugins/networkbrowser/src/MountManager.py:119
 msgid "Please wait while your network is restarting..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1160
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1183
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1190
-#: ../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_master/lib/python/Screens/NetworkSetup.py:1160
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1183
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1190
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:136
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:137
+#: ../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:1199
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1222
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1229
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:138
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:139
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:140
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:141
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:142
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:143
 msgid "Please wait..."
 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
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:404
 msgid "Please wait... Loading list..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:761
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:761
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:985
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:985
 msgid "Plugin manager activity information"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:858
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:858
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1082
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1082
 msgid "Plugin manager help"
 msgstr ""
 
@@ -5590,24 +5644,24 @@ 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 ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:380
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:375
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:445
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:83
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:357
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:375
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:445
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:83
 msgid "Polarity"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ServiceInfo.py:141
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1077
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1171
 #: ../enigma2_master/lib/python/Screens/ServiceInfo.py:141
-#: ../enigma2_master/lib/python/Components/NimManager.py:1077
+#: ../enigma2_master/lib/python/Components/NimManager.py:1171
 msgid "Polarization"
 msgstr ""
 
@@ -5649,10 +5703,10 @@ msgstr ""
 msgid "Portuguese"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:521
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1063
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:521
-#: ../enigma2_master/lib/python/Components/NimManager.py:1063
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:535
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1157
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:535
+#: ../enigma2_master/lib/python/Components/NimManager.py:1157
 msgid "Positioner"
 msgstr ""
 
@@ -5685,9 +5739,9 @@ msgid ""
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:46
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:327
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:340
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:46
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:327
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:340
 msgid "Power threshold in mA"
 msgstr ""
 
@@ -5698,17 +5752,34 @@ msgstr ""
 msgid "Predefined transponder"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:736
+#: ../enigma2_master/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/Screens/NetworkSetup.py:59
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:319
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:693
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:59
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:319
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:693
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:123
+#: ../enigma2_master/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
+#: ../enigma2_master/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:1342
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:34
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:330
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:704
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1342
 msgid "Press OK on your remote control to continue."
 msgstr ""
 
@@ -5717,10 +5788,10 @@ msgstr ""
 msgid "Press OK to activate the selected skin."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:232
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:363
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:232
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:363
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:243
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:374
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:243
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:374
 #: ../enigma2_plugins/networkbrowser/src/MountEdit.py:64
 msgid "Press OK to activate the settings."
 msgstr ""
@@ -5733,8 +5804,10 @@ msgstr ""
 msgid "Press OK to edit selected settings."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:60
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:60
+#: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:47
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:35
+#: ../enigma2_master/lib/python/Screens/InputDeviceSetup.py:47
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:35
 #: ../enigma2_plugins/networkbrowser/src/MountView.py:62
 msgid "Press OK to edit the settings."
 msgstr ""
@@ -5761,8 +5834,8 @@ msgstr ""
 msgid "Press OK to save settings."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:939
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:916
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:934
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:934
 msgid "Press OK to scan"
 msgstr ""
 
@@ -5782,23 +5855,18 @@ msgstr ""
 msgid "Press OK to select/deselect a CAId."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:324
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:301
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:319
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:319
 msgid "Press OK to start the scan"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1660
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1660
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1974
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1946
 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 ""
-
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:61
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:61
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:36
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:36
 msgid "Press yellow to set this interface as default interface."
 msgstr ""
 
@@ -5820,18 +5888,18 @@ msgstr ""
 msgid "Preview menu"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:347
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:347
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:358
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:358
 msgid "Primary DNS"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:247
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:247
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:248
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:248
 msgid "Priority"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:475
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:475
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:689
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:689
 msgid "Process"
 msgstr ""
 
@@ -5852,28 +5920,28 @@ 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:1353
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:703
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:839
-#: ../enigma2_master/lib/python/Components/NimManager.py:1353
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:710
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:846
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1460
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:710
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:846
+#: ../enigma2_master/lib/python/Components/NimManager.py:1460
 msgid "Provider"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:165
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:165
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:166
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:166
 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/Screens/ChannelSelection.py:955
 #: ../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 ""
@@ -5888,12 +5956,12 @@ msgstr ""
 msgid "Quick"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1875
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1877
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1880
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1874
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1876
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1879
+#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1760
+#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1762
+#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1765
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1760
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1762
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1765
 msgid "Quickzap"
 msgstr ""
 
@@ -5902,6 +5970,13 @@ msgstr ""
 msgid "RGB"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Components/Network.py:352
+#: ../enigma2_experimental/lib/python/Components/Network.py:354
+#: ../enigma2_master/lib/python/Components/Network.py:352
+#: ../enigma2_master/lib/python/Components/Network.py:354
+msgid "Ralink"
+msgstr ""
+
 #: ../enigma2_experimental/lib/python/Components/Harddisk.py:441
 #: ../enigma2_master/lib/python/Components/Harddisk.py:441
 msgid "Ram Disk"
@@ -5912,7 +5987,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 ""
@@ -5921,15 +5996,19 @@ msgstr ""
 msgid "Ratings: "
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:641
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:426
-#: ../enigma2_experimental/lib/python/Components/ConfigList.py:236
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:221
+#: ../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:222
+#: ../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
-#: ../enigma2_master/lib/python/Components/ConfigList.py:236
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:221
+#: ../enigma2_master/lib/python/Screens/InputDeviceSetup.py:263
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:652
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:440
+#: ../enigma2_master/lib/python/Components/ConfigList.py:237
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:222
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:408
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py:174
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:627
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:957
@@ -5953,27 +6032,27 @@ msgstr ""
 msgid "Really quit MyTube Player?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Standby.py:126
-#: ../enigma2_master/lib/python/Screens/Standby.py:126
+#: ../enigma2_experimental/lib/python/Screens/Standby.py:130
+#: ../enigma2_master/lib/python/Screens/Standby.py:130
 msgid "Really reboot now?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Standby.py:130
-#: ../enigma2_master/lib/python/Screens/Standby.py:130
+#: ../enigma2_experimental/lib/python/Screens/Standby.py:134
+#: ../enigma2_master/lib/python/Screens/Standby.py:134
 msgid "Really restart now?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Standby.py:124
-#: ../enigma2_master/lib/python/Screens/Standby.py:124
+#: ../enigma2_experimental/lib/python/Screens/Standby.py:128
+#: ../enigma2_master/lib/python/Screens/Standby.py:128
 msgid "Really shutdown now?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:292
-#: ../enigma2_master/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:223
 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"
@@ -5995,7 +6074,7 @@ msgid "Record on"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1553
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1552
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1553
 #, python-format
 msgid "Record time limited due to conflicting timer %s"
 msgstr ""
@@ -6010,19 +6089,19 @@ msgstr ""
 msgid "Recording"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Standby.py:115
-#: ../enigma2_master/lib/python/Screens/Standby.py:115
+#: ../enigma2_experimental/lib/python/Screens/Standby.py:119
+#: ../enigma2_master/lib/python/Screens/Standby.py:119
 msgid "Recording(s) are in progress or coming up in few seconds!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:632
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:632
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:856
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:856
 msgid "Recordings"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ParentalControlSetup.py:321
 #: ../enigma2_master/lib/python/Screens/ParentalControlSetup.py:321
-msgid "Reenter new pin"
+msgid "Reenter new PIN"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/Videomode/plugin.py:66
@@ -6034,13 +6113,13 @@ 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_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1423
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1677
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1677
 msgid "Reload"
 msgstr ""
 
@@ -6051,16 +6130,16 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ParentalControlSetup.py:93
 #: ../enigma2_master/lib/python/Screens/ParentalControlSetup.py:93
-msgid "Remember service pin"
+msgid "Remember service PIN"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ParentalControlSetup.py:95
 #: ../enigma2_master/lib/python/Screens/ParentalControlSetup.py:95
-msgid "Remember service pin cancel"
+msgid "Remember service PIN cancel"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1003
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1003
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1219
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1219
 msgid "Remove"
 msgstr ""
 
@@ -6086,10 +6165,10 @@ 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_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1078
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1508
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1302
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1796
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1302
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1794
 msgid "Remove finished."
 msgstr ""
 
@@ -6102,16 +6181,6 @@ 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 ""
-
 #: ../enigma2_experimental/lib/python/Screens/EpgSelection.py:254
 #: ../enigma2_experimental/lib/python/Screens/EpgSelection.py:370
 #: ../enigma2_experimental/lib/python/Screens/EventView.py:104
@@ -6134,10 +6203,12 @@ msgstr ""
 msgid "Remove title"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Ipkg.py:95
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:796
-#: ../enigma2_master/lib/python/Screens/Ipkg.py:95
-#: ../enigma2_master/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:1020
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1391
+#: ../enigma2_master/lib/python/Screens/Ipkg.py:100
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1020
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1391
 msgid "Removing"
 msgstr ""
 
@@ -6152,13 +6223,13 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:22
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:22
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:23
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:23
 msgid "Rename crashlogs"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:144
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:144
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:145
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:145
 msgid "Repeat Type"
 msgstr ""
 
@@ -6167,8 +6238,8 @@ msgstr ""
 msgid "Repeating event currently recording... What do you want to do?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:150
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:150
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:151
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:151
 msgid "Repeats"
 msgstr ""
 
@@ -6229,20 +6300,20 @@ msgstr ""
 msgid "Restart GUI now?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:856
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:856
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:888
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:888
 msgid "Restart network"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1260
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1382
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1260
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1382
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1299
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1422
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1299
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1422
 msgid "Restart test"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:824
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:824
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:856
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:856
 msgid "Restart your network connection and interfaces.\n"
 msgstr ""
 
@@ -6256,22 +6327,24 @@ 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_master/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:310
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:318
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:322
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:217
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:312
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:320
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:322
 msgid "Restore is running..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:263
-#: ../enigma2_master/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:264
 msgid "Restore running"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:119
-#: ../enigma2_master/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:132
 msgid "Restore system settings"
 msgstr ""
 
@@ -6284,8 +6357,8 @@ msgstr ""
 msgid "Resume from last position"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:2027
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2026
+#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1912
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1912
 #, python-format
 msgid "Resume position at %s"
 msgstr ""
@@ -6297,13 +6370,13 @@ msgstr ""
 #. TRANSLATORS: in the middle somewhere and not from the beginning.
 #. TRANSLATORS: (Some translators seem to have interpreted it as a
 #. TRANSLATORS: question or a choice, but it is a statement.)
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:2036
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2035
+#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1921
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1921
 msgid "Resuming playback"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:514
-#: ../enigma2_master/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:527
 msgid "Return to file browser"
 msgstr ""
 
@@ -6311,8 +6384,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"
@@ -6325,20 +6398,16 @@ msgstr ""
 msgid "Return to previous service"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1725
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1730
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/VideoEnhancement/VideoEnhancement.py:150
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1724
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1729
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/VideoEnhancement/VideoEnhancement.py:150
 msgid "Right"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:387
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:382
 #: ../enigma2_experimental/lib/python/Screens/ServiceInfo.py:144
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:452
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:90
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:364
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:382
 #: ../enigma2_master/lib/python/Screens/ServiceInfo.py:144
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:452
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:90
@@ -6346,18 +6415,20 @@ msgid "Rolloff"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:47
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:328
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:341
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:47
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:328
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:341
 msgid "Rotor turning speed"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Subtitles.py:43
-#: ../enigma2_master/lib/python/Screens/Subtitles.py:43
+#: ../enigma2_experimental/lib/python/Screens/AudioSelection.py:95
+#: ../enigma2_experimental/lib/python/Screens/AudioSelection.py:141
+#: ../enigma2_master/lib/python/Screens/AudioSelection.py:95
+#: ../enigma2_master/lib/python/Screens/AudioSelection.py:141
 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 ""
@@ -6378,9 +6449,9 @@ 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
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:77
 msgid "SSID:"
 msgstr ""
 
@@ -6396,19 +6467,19 @@ msgid "Sat"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:22
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:146
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:350
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:376
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:392
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:147
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:363
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:371
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:387
 #: ../enigma2_experimental/lib/python/Components/ServiceScan.py:40
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:8
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:430
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:67
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:22
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:146
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:350
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:353
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:369
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:147
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:363
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:371
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:387
 #: ../enigma2_master/lib/python/Components/ServiceScan.py:40
 #: ../enigma2_master/lib/python/Tools/Transponder.py:8
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:430
@@ -6423,15 +6494,15 @@ msgstr ""
 msgid "Satellite Equipment Setup"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:640
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:640
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:864
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:864
 msgid "Satellite equipment"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:702
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:841
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:702
-#: ../enigma2_master/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:709
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:848
 msgid "Satellites"
 msgstr ""
 
@@ -6443,8 +6514,8 @@ msgstr ""
 msgid "Satfinder"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:502
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:502
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:516
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:516
 msgid "Sats"
 msgstr ""
 
@@ -6453,10 +6524,10 @@ msgstr ""
 msgid "Saturation"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:123
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:167
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:123
-#: ../enigma2_master/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:124
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:168
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:49
 msgid "Saturday"
 msgstr ""
@@ -6465,26 +6536,26 @@ 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/CrashlogAutoSubmit/plugin.py:79
 #: ../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:1553
 #: ../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
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:224
-#: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/settings.py:68
+#: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/settings.py:70
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/CleanupWizard/plugin.py:58
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:368
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:78
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:79
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:116
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1313
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1553
 #: ../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 ""
 
@@ -6523,8 +6594,8 @@ msgstr ""
 msgid "Scaling Mode"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:935
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:912
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:930
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:930
 msgid "Scan "
 msgstr ""
 
@@ -6537,110 +6608,110 @@ msgstr ""
 msgid "Scan NFS share"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:185
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:185
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:186
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:186
 msgid "Scan QAM128"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:182
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:182
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:183
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:183
 msgid "Scan QAM16"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:186
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:186
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:187
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:187
 msgid "Scan QAM256"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:183
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:183
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:184
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:184
 msgid "Scan QAM32"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:184
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:184
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:185
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:185
 msgid "Scan QAM64"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:188
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:188
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:189
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:189
 msgid "Scan SR6875"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:187
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:187
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:188
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:188
 msgid "Scan SR6900"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:865
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:865
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:897
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:897
 msgid "Scan Wireless Networks"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:189
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:190
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:189
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:191
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:190
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:191
 msgid "Scan additional SR"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:174
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:174
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:175
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:175
 msgid "Scan band EU HYPER"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:169
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:169
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:170
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:170
 msgid "Scan band EU MID"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:173
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:173
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:174
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:174
 msgid "Scan band EU SUPER"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:171
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:171
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:172
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:172
 msgid "Scan band EU UHF IV"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:172
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:172
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:173
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:173
 msgid "Scan band EU UHF V"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:168
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:168
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:169
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:169
 msgid "Scan band EU VHF I"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:170
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:170
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:171
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:171
 msgid "Scan band EU VHF III"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:177
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:177
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:178
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:178
 msgid "Scan band US HIGH"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:179
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:179
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:180
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:180
 msgid "Scan band US HYPER"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:175
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:175
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:176
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:176
 msgid "Scan band US LOW"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:176
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:176
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:177
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:177
 msgid "Scan band US MID"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:178
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:178
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:179
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:179
 msgid "Scan band US SUPER"
 msgstr ""
 
@@ -6648,10 +6719,10 @@ msgstr ""
 msgid "Scan range"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:820
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:820
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:852
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:852
 msgid ""
-"Scan your network for wireless Access Points and connect to them using your "
+"Scan your network for wireless access points and connect to them using your "
 "selected wireless device.\n"
 msgstr ""
 
@@ -6661,7 +6732,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 ""
@@ -6670,7 +6741,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 ""
 
@@ -6687,11 +6758,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 ""
 
@@ -6708,13 +6779,13 @@ msgstr ""
 msgid "Search west"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:407
-#: ../enigma2_master/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:607
 msgid "Searching for available updates. Please wait..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:410
-#: ../enigma2_master/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:610
 msgid "Searching for new installed or removed packages. Please wait..."
 msgstr ""
 
@@ -6722,8 +6793,8 @@ msgstr ""
 msgid "Searching your network. Please wait..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:348
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:348
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:359
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:359
 msgid "Secondary DNS"
 msgstr ""
 
@@ -6731,9 +6802,11 @@ msgstr ""
 msgid "Security service not running."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:65
+#: ../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
+#: ../enigma2_master/lib/python/Screens/InputDeviceSetup.py:50
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:40
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:155
 msgid "Select"
 msgstr ""
@@ -6753,13 +6826,8 @@ msgstr ""
 msgid "Select a timer to import"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1783
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1782
-msgid "Select audio mode"
-msgstr ""
-
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1759
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1758
+#: ../enigma2_experimental/lib/python/Screens/AudioSelection.py:71
+#: ../enigma2_master/lib/python/Screens/AudioSelection.py:71
 msgid "Select audio track"
 msgstr ""
 
@@ -6767,8 +6835,10 @@ msgstr ""
 msgid "Select bouquet to record on"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:224
-#: ../enigma2_master/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:225
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:272
 msgid "Select channel to record from"
 msgstr ""
 
@@ -6776,9 +6846,14 @@ msgstr ""
 msgid "Select channel to record on"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:139
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:139
-msgid "Select files for backup. Currently selected:\n"
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:735
+#: ../enigma2_master/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
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:152
+msgid "Select files for backup."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:148
@@ -6786,11 +6861,16 @@ 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"
+#: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:78
+#: ../enigma2_master/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
+#: ../enigma2_master/lib/python/Screens/InputDeviceSetup.py:61
+#: ../enigma2_master/lib/python/Screens/InputDeviceSetup.py:67
+msgid "Select input device."
 msgstr ""
 
 #: ../enigma2_plugins/mytube/src/plugin.py:802
@@ -6820,8 +6900,8 @@ msgstr ""
 msgid "Select type of Filter"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1255
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1255
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1495
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1495
 msgid "Select upgrade source to edit."
 msgstr ""
 
@@ -6834,11 +6914,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 ""
-
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:23
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:23
 msgid "Send DiSEqC"
@@ -6854,8 +6929,8 @@ msgstr ""
 msgid "Seperate titles with a main menu"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:300
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:300
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:313
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:313
 msgid "Sequence repeat"
 msgstr ""
 
@@ -6876,32 +6951,32 @@ msgstr ""
 msgid "Service delay"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1908
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1907
+#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1793
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1793
 msgid "Service has been added to the favourites."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1914
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1913
+#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1799
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1799
 msgid "Service has been added to the selected bouquet."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:2333
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2332
+#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:2218
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2218
 msgid ""
 "Service invalid!\n"
 "(Timeout reading PMT)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:2332
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2331
+#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:2217
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2217
 msgid ""
 "Service not found!\n"
 "(SID not found in PAT)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:2338
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2337
+#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:2223
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2223
 msgid ""
 "Service unavailable!\n"
 "Check tuner configuration!"
@@ -6913,13 +6988,13 @@ msgstr ""
 msgid "Serviceinfo"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:952
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:952
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:959
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:959
 msgid "Services"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:177
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:177
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:178
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:178
 msgid "Set End Time"
 msgstr ""
 
@@ -6941,8 +7016,8 @@ msgstr ""
 msgid "Set delay to %i ms (can be set)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:90
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:90
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:65
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:65
 msgid "Set interface as default Interface"
 msgstr ""
 
@@ -6983,8 +7058,8 @@ msgstr ""
 msgid "Setup for the Audio Sync Plugin"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:239
-#: ../enigma2_master/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:151
 #, python-format
 msgid ""
 "Shall the USB stick wizard proceed and program the image file %s into flash "
@@ -6996,11 +7071,16 @@ 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 ""
 
+#: ../enigma2_experimental/lib/python/Components/RecordingConfig.py:13
+#: ../enigma2_master/lib/python/Components/RecordingConfig.py:13
+msgid "Short filenames"
+msgstr ""
+
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:466
 msgid "Should this AutoTimer be restricted to a timespan?"
 msgstr ""
@@ -7014,21 +7094,21 @@ msgid ""
 "Should timers created by this AutoTimer be recorded to a custom location?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1282
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1292
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1298
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1304
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1310
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1282
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1292
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1298
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1304
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1310
+#: ../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:1322
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1332
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1338
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1344
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1350
 msgid "Show Info"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:867
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:867
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:899
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:899
 msgid "Show WLAN Status"
 msgstr ""
 
@@ -7051,8 +7131,8 @@ msgstr ""
 msgid "Show the tv player..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:822
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:822
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:854
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:854
 msgid "Shows the state of your wireless LAN connection.\n"
 msgstr ""
 
@@ -7068,14 +7148,14 @@ 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
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:79
 msgid "Signal Strength:"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:274
-#: ../enigma2_master/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:276
 msgid "Signal: "
 msgstr ""
 
@@ -7099,10 +7179,10 @@ msgstr ""
 msgid "Simple titleset (compatibility for legacy players)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:501
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1061
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:501
-#: ../enigma2_master/lib/python/Components/NimManager.py:1061
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:515
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1155
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:515
+#: ../enigma2_master/lib/python/Components/NimManager.py:1155
 msgid "Single"
 msgstr ""
 
@@ -7111,22 +7191,22 @@ msgstr ""
 msgid "Single EPG"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:539
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:516
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:534
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:534
 msgid "Single satellite"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:539
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:540
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:541
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:516
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:517
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:518
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:534
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:535
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:536
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:534
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:535
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:536
 msgid "Single transponder"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Components/UsageConfig.py:115
-#: ../enigma2_master/lib/python/Components/UsageConfig.py:106
+#: ../enigma2_master/lib/python/Components/UsageConfig.py:115
 msgid "Singlestep (GOP)"
 msgstr ""
 
@@ -7135,8 +7215,8 @@ msgstr ""
 msgid "Skin"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:630
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:630
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:854
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:854
 msgid "Skins"
 msgstr ""
 
@@ -7176,49 +7256,59 @@ msgstr ""
 msgid "Slovenian"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1071
-#: ../enigma2_master/lib/python/Components/NimManager.py:1071
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1165
+#: ../enigma2_master/lib/python/Components/NimManager.py:1165
 msgid "Slow"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:642
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:642
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:866
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:866
 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_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
-#: ../enigma2_master/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:2017
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:2024
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:2028
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:193
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1989
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1996
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:2000
 msgid "Software management"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:117
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:117
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:339
+#: ../enigma2_master/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:130
 msgid "Software restore"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:116
-#: ../enigma2_master/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:129
 msgid "Software update"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:480
+#: ../enigma2_master/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_master/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:250
 msgid "Sorry MediaScanner is not installed!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:223
-#: ../enigma2_master/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:244
 msgid "Sorry no backups found!"
 msgstr ""
 
@@ -7231,8 +7321,8 @@ msgid ""
 "Please choose an other one."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:531
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:531
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:755
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:755
 msgid "Sorry, no Details available!"
 msgstr ""
 
@@ -7240,8 +7330,8 @@ msgstr ""
 msgid "Sorry, video is not available!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:280
-#: ../enigma2_master/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:301
 msgid ""
 "Sorry, your backup destination is not writeable.\n"
 "\n"
@@ -7265,17 +7355,17 @@ msgstr ""
 msgid "Sort Time"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1070
-#: ../enigma2_master/lib/python/Components/NimManager.py:1070
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1164
+#: ../enigma2_master/lib/python/Components/NimManager.py:1164
 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 ""
@@ -7290,7 +7380,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 ""
@@ -7299,11 +7389,13 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Components/UsageConfig.py:55
 #: ../enigma2_experimental/lib/python/Components/UsageConfig.py:60
 #: ../enigma2_master/lib/python/Screens/SleepTimerEdit.py:87
+#: ../enigma2_master/lib/python/Components/UsageConfig.py:55
+#: ../enigma2_master/lib/python/Components/UsageConfig.py:60
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Standby"
 msgstr ""
 
-#: ../enigma2_experimental/mytest.py:382 ../enigma2_master/mytest.py:381
+#: ../enigma2_experimental/mytest.py:384 ../enigma2_master/mytest.py:384
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Standby / Restart"
 msgstr ""
@@ -7330,26 +7422,26 @@ msgid "Start from the beginning"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1659
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1658
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1659
 msgid "Start recording?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1317
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1317
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1357
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1357
 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_master/lib/python/Screens/TimerEntry.py:174
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:175
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:175
 msgid "StartTime"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:152
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:152
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:153
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:153
 msgid "Starting on"
 msgstr ""
 
@@ -7385,13 +7477,6 @@ msgstr ""
 msgid "Step west"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1725
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1730
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1724
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1729
-msgid "Stereo"
-msgstr ""
-
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:228
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:229
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:230
@@ -7404,7 +7489,7 @@ msgid "Stop"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1233
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1232
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1233
 msgid "Stop Timeshift?"
 msgstr ""
 
@@ -7424,10 +7509,10 @@ msgstr ""
 msgid "Stop playing this movie?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1147
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1318
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1147
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1318
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1186
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1358
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1186
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1358
 msgid "Stop test"
 msgstr ""
 
@@ -7446,31 +7531,27 @@ msgstr ""
 msgid "Store position"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:342
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:342
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:355
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:355
 msgid "Stored position"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1801
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1800
+#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1686
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1686
 msgid "Subservice list..."
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Screens/AudioSelection.py:118
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:173
+#: ../enigma2_master/lib/python/Screens/AudioSelection.py:118
 #: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:173
-#: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Subtitle selection"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Subtitles.py:62
-#: ../enigma2_experimental/lib/python/Screens/Subtitles.py:65
-#: ../enigma2_experimental/lib/python/Screens/Subtitles.py:67
+#: ../enigma2_experimental/lib/python/Screens/AudioSelection.py:52
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:159
-#: ../enigma2_master/lib/python/Screens/Subtitles.py:62
-#: ../enigma2_master/lib/python/Screens/Subtitles.py:65
-#: ../enigma2_master/lib/python/Screens/Subtitles.py:67
+#: ../enigma2_master/lib/python/Screens/AudioSelection.py:52
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:159
-#: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Subtitles"
 msgstr ""
 
@@ -7485,20 +7566,20 @@ msgstr ""
 msgid "Sun"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:123
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:168
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:123
-#: ../enigma2_master/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:124
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:169
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:50
 msgid "Sunday"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1435
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1434
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1435
 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 ""
@@ -7508,27 +7589,27 @@ msgstr ""
 msgid "Swedish"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1806
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1805
+#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1691
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1691
 msgid "Switch to next subservice"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1807
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1806
+#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1692
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1692
 msgid "Switch to previous subservice"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:536
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:536
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:550
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:550
 msgid "Switchable tuner types:"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:379
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:409
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:374
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:404
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:444
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:82
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:356
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:386
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:374
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:404
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:444
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:82
 msgid "Symbol Rate"
@@ -7539,16 +7620,16 @@ msgstr ""
 msgid "Symbolrate"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:371
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:366
 #: ../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_master/lib/python/Screens/ScanSetup.py:348
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:852
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:366
 #: ../enigma2_master/lib/python/Screens/ServiceInfo.py:135
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:437
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:75
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:628
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:852
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "System"
 msgstr ""
@@ -7559,8 +7640,8 @@ msgstr ""
 msgid "TRANSLATOR_INFO"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:288
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:288
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:298
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:298
 msgid "TS file is too large for ISO9660 level 1!"
 msgstr ""
 
@@ -7580,9 +7661,9 @@ 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_master/lib/python/Screens/TimerEntry.py:189
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:556
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:200
 msgid "Tags"
@@ -7596,31 +7677,31 @@ 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 ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py:165
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py:168
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py:165
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py:168
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py:166
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py:169
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py:166
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py:169
 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
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:960
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:967
 #: ../enigma2_master/lib/python/Components/ServiceScan.py:81
 #: ../enigma2_master/lib/python/Tools/Transponder.py:70
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:478
 msgid "Terrestrial"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:197
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:197
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:198
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:198
 msgid "Terrestrial provider"
 msgstr ""
 
@@ -7638,8 +7719,8 @@ msgstr ""
 msgid "Test again"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:816
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:816
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:848
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:848
 msgid "Test the network configuration of your Dreambox.\n"
 msgstr ""
 
@@ -7656,13 +7737,23 @@ msgid ""
 "players) instead?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:214
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:214
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:225
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:225
 msgid ""
 "The NetworkWizard extension is not installed!\n"
 "Please install it."
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Screens/ParentalControlSetup.py:367
+#: ../enigma2_master/lib/python/Screens/ParentalControlSetup.py:367
+msgid "The PIN code has been changed successfully."
+msgstr ""
+
+#: ../enigma2_experimental/lib/python/Screens/ParentalControlSetup.py:369
+#: ../enigma2_master/lib/python/Screens/ParentalControlSetup.py:369
+msgid "The PIN codes you entered are different."
+msgstr ""
+
 #: ../enigma2_experimental/lib/python/Screens/PluginBrowser.py:95
 #: ../enigma2_master/lib/python/Screens/PluginBrowser.py:95
 msgid ""
@@ -7670,11 +7761,11 @@ 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
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:601
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:601
 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?"
+"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
@@ -7696,8 +7787,8 @@ msgid ""
 "the classic editor."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:517
-#: ../enigma2_master/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:716
 #, python-format
 msgid ""
 "The following device was found:\n"
@@ -7712,8 +7803,8 @@ msgstr ""
 msgid "The following files were found..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:288
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:265
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:283
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:283
 msgid "The installation of the default services lists is finished."
 msgstr ""
 
@@ -7728,19 +7819,9 @@ msgstr ""
 msgid "The match attribute is mandatory."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:243
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:243
-msgid ""
-"The md5sum validation failed, the file may be corrupted! Are you sure that "
-"you want to burn this image to flash memory? You are doing this at your own "
-"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 "
-"corrupted!"
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:27
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:27
+msgid "The md5sum validation failed, the file may be corrupted!"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CleanupWizard/CleanupWizard.py:149
@@ -7754,25 +7835,15 @@ msgstr ""
 msgid "The path %s already exists."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ParentalControlSetup.py:367
-#: ../enigma2_master/lib/python/Screens/ParentalControlSetup.py:367
-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:242
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:198
+#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:238
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:205
 #: ../enigma2_master/lib/python/Screens/ParentalControlSetup.py:37
-#: ../enigma2_master/lib/python/Components/ParentalControl.py:242
+#: ../enigma2_master/lib/python/Components/ParentalControl.py:238
 msgid "The pin code you entered is wrong."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ParentalControlSetup.py:369
-#: ../enigma2_master/lib/python/Screens/ParentalControlSetup.py:369
-msgid "The pin codes you entered are different."
-msgstr ""
-
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py:528
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py:528
 #, python-format
@@ -7789,54 +7860,62 @@ msgstr ""
 msgid "The sleep timer has been disabled."
 msgstr ""
 
-#: ../enigma2_experimental/RecordTimer.py:489
-#: ../enigma2_master/RecordTimer.py:489
+#: ../enigma2_experimental/RecordTimer.py:501
+#: ../enigma2_master/RecordTimer.py:501
 msgid "The timer file (timers.xml) is corrupt and could not be loaded."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:739
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:759
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:773
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:892
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:739
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:759
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:773
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:892
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:750
+#: ../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:750
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:777
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:798
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:924
 msgid ""
 "The wireless LAN plugin is not installed!\n"
 "Please install it."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:627
-#: ../enigma2_master/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:614
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/
 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_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
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:460
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:471
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:207
+#: ../enigma2_master/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:630
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:674
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:685
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:204
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:209
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:630
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:674
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:685
 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_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:464
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:477
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:678
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:691
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:678
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:691
 msgid "There are currently no outstanding actions."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:428
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:428
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:632
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:632
 msgid "There are no updates available."
 msgstr ""
 
@@ -7854,10 +7933,10 @@ 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_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:413
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1468
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:614
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1756
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:614
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1754
 msgid "There was an error downloading the packetlist. Please try again."
 msgstr ""
 
@@ -7876,26 +7955,6 @@ 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 "
-"flash memory?"
-msgstr ""
-
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:178
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:178
 msgid ""
@@ -7911,12 +7970,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 ""
@@ -7944,23 +8003,35 @@ msgid ""
 "uses."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:877
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:877
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:693
+#: ../enigma2_master/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:1101
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1101
 msgid "This plugin is installed."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:879
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:879
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1103
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1103
 msgid "This plugin is not installed."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:881
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:881
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1105
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1105
 msgid "This plugin will be installed."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:883
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:883
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1107
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1107
 msgid "This plugin will be removed."
 msgstr ""
 
@@ -7968,8 +8039,8 @@ msgstr ""
 msgid "This setting controls the behavior when a timer matches a found event."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1248
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1248
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1287
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1287
 msgid ""
 "This test checks for configured Nameservers.\n"
 "If you get a \"unconfirmed\" message:\n"
@@ -7978,8 +8049,8 @@ msgid ""
 "the \"Nameserver\" Configuration"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1233
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1233
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1272
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1272
 msgid ""
 "This test checks whether a network cable is connected to your LAN-Adapter.\n"
 "If you get a \"disconnected\" message:\n"
@@ -7987,8 +8058,8 @@ msgid ""
 "- verify that the cable is not broken"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1243
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1243
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1282
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1282
 msgid ""
 "This test checks whether a valid IP Address is found for your LAN Adapter.\n"
 "If you get a \"unconfirmed\" message:\n"
@@ -7996,8 +8067,8 @@ msgid ""
 "- please check your DHCP, cabling and adapter setup"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1238
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1238
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1277
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1277
 msgid ""
 "This test checks whether your LAN Adapter is set up for automatic IP Address "
 "configuration with DHCP.\n"
@@ -8009,8 +8080,8 @@ msgid ""
 "-verify that you have a configured and working DHCP Server in your network."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1228
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1228
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1267
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1267
 msgid "This test detects your configured LAN-Adapter."
 msgstr ""
 
@@ -8021,15 +8092,15 @@ msgid ""
 "but add it disabled."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1087
-#: ../enigma2_master/lib/python/Components/NimManager.py:1087
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1181
+#: ../enigma2_master/lib/python/Components/NimManager.py:1181
 msgid "Three"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:253
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:265
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:253
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:265
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:254
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:266
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:254
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:266
 msgid "Threshold"
 msgstr ""
 
@@ -8049,10 +8120,10 @@ msgstr ""
 msgid "Thumbnails"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:123
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:165
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:123
-#: ../enigma2_master/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:124
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:166
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:47
 msgid "Thursday"
 msgstr ""
@@ -8070,13 +8141,13 @@ msgstr ""
 msgid "Time in minutes to prepend to recording."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:142
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:142
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:143
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:143
 msgid "Timer Type"
 msgstr ""
 
-#: ../enigma2_experimental/RecordTimer.py:511
-#: ../enigma2_master/RecordTimer.py:511
+#: ../enigma2_experimental/RecordTimer.py:523
+#: ../enigma2_master/RecordTimer.py:523
 msgid ""
 "Timer overlap in timers.xml detected!\n"
 "Please recheck it!"
@@ -8106,7 +8177,7 @@ msgid "Timeshift location"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1203
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1202
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1203
 msgid "Timeshift not possible!"
 msgstr ""
 
@@ -8115,14 +8186,14 @@ 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
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:158
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py:80
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py:97
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:418
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:431
 #: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:127
 msgid "Title"
 msgstr ""
@@ -8139,12 +8210,12 @@ msgstr ""
 msgid "Titleset mode"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:653
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:653
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:634
+#: ../enigma2_master/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 plug in the bootable USB "
-"stick.\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."
@@ -8154,40 +8225,40 @@ 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 ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:157
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:157
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:158
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:158
 msgid "Tone Amplitude"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:291
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:291
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:304
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:304
 msgid "Tone mode"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:297
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:297
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:310
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:310
 msgid "Toneburst"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:501
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1061
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:501
-#: ../enigma2_master/lib/python/Components/NimManager.py:1061
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:515
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1155
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:515
+#: ../enigma2_master/lib/python/Components/NimManager.py:1155
 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"
@@ -8205,8 +8276,8 @@ msgstr ""
 msgid "Transmission Mode"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:420
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:397
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:415
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:415
 msgid "Transmission mode"
 msgstr ""
 
@@ -8224,7 +8295,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 ""
@@ -8235,17 +8306,17 @@ msgid "Tries left:"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:159
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:157
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:159
 msgid "Try to find used Transponders in cable network.. please wait..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:266
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:244
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:261
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:261
 msgid "Try to find used transponders in cable network.. please wait..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1464
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1464
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1752
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1750
 msgid "Trying to download a new packetlist. Please wait..."
 msgstr ""
 
@@ -8269,10 +8340,10 @@ msgstr ""
 msgid "Tue"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:123
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:163
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:123
-#: ../enigma2_master/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:124
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:164
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:45
 msgid "Tuesday"
 msgstr ""
@@ -8288,26 +8359,26 @@ msgstr ""
 msgid "Tune"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:2330
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2329
+#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:2215
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2215
 msgid "Tune failed!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:123
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:132
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:496
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:346
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:124
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:133
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:510
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:341
 #: ../enigma2_experimental/lib/python/Components/ServiceScan.py:137
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:123
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:132
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:496
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:323
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:124
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:133
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:510
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:341
 #: ../enigma2_master/lib/python/Components/ServiceScan.py:137
 msgid "Tuner"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:488
-#: ../enigma2_master/lib/python/Components/NimManager.py:488
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:528
+#: ../enigma2_master/lib/python/Components/NimManager.py:528
 msgid "Tuner "
 msgstr ""
 
@@ -8316,8 +8387,8 @@ msgstr ""
 msgid "Tuner status"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:101
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:101
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:102
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:102
 msgid "Tuner type"
 msgstr ""
 
@@ -8326,31 +8397,31 @@ msgstr ""
 msgid "Turkish"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1087
-#: ../enigma2_master/lib/python/Components/NimManager.py:1087
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1181
+#: ../enigma2_master/lib/python/Components/NimManager.py:1181
 msgid "Two"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:271
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:282
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:271
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:282
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:272
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:283
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:272
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:283
 msgid "Type"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:357
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:360
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:363
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:334
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:337
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:340
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:352
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:355
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:358
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:352
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:355
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:358
 msgid "Type of scan"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:523
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1065
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:523
-#: ../enigma2_master/lib/python/Components/NimManager.py:1065
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:537
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1159
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:537
+#: ../enigma2_master/lib/python/Components/NimManager.py:1159
 msgid "USALS"
 msgstr ""
 
@@ -8359,20 +8430,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_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:190
-#: ../enigma2_master/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:118
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:736
 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 "
-"image!"
-msgstr ""
-
 #: ../enigma2_experimental/lib/python/Components/Language.py:43
 #: ../enigma2_master/lib/python/Components/Language.py:43
 msgid "Ukrainian"
@@ -8392,52 +8456,58 @@ msgid ""
 "Error: "
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:315
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:315
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:328
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:328
 msgid "Uncommitted DiSEqC command"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:456
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:456
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:668
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:668
 msgid "Undo install"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:454
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:454
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:666
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:666
 msgid "Undo uninstall"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:985
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1077
+#: ../enigma2_master/lib/python/Components/NimManager.py:1077
 msgid "Unicable"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1044
-#: ../enigma2_master/lib/python/Components/NimManager.py:1044
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1138
+#: ../enigma2_master/lib/python/Components/NimManager.py:1138
 msgid "Unicable LNB"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1045
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1102
-#: ../enigma2_master/lib/python/Components/NimManager.py:1045
-#: ../enigma2_master/lib/python/Components/NimManager.py:1102
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1139
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1196
+#: ../enigma2_master/lib/python/Components/NimManager.py:1139
+#: ../enigma2_master/lib/python/Components/NimManager.py:1196
 msgid "Unicable Martix"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:450
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:450
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:660
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:660
 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:984
-#: ../enigma2_master/lib/python/Components/NimManager.py:984
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1076
+#: ../enigma2_master/lib/python/Components/NimManager.py:1076
 msgid "Universal LNB"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Components/Network.py:358
+#: ../enigma2_master/lib/python/Components/Network.py:358
+msgid "Unknown network adapter."
+msgstr ""
+
 #: ../enigma2_plugins/autotimer/src/AutoTimerSettings.py:39
 msgid ""
 "Unless this is enabled AutoTimer will NOT automatically look for events "
@@ -8450,17 +8520,17 @@ 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_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:465
-#: ../enigma2_master/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:459
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:469
 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:686
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:33
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:472
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:686
 msgid "Update"
 msgstr ""
 
@@ -8474,8 +8544,8 @@ msgid ""
 "ask you to update again."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:433
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:433
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:638
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:638
 msgid "Updatefeed not available."
 msgstr ""
 
@@ -8491,8 +8561,8 @@ msgstr ""
 msgid "Updating finished. Here is the result:"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:407
-#: ../enigma2_master/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:607
 msgid "Updating software catalog"
 msgstr ""
 
@@ -8507,24 +8577,24 @@ 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_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1200
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1530
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1440
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1818
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1440
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1816
 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_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
+#: ../enigma2_experimental/lib/python/Screens/Ipkg.py:88
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1022
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1379
+#: ../enigma2_master/lib/python/Screens/Ipkg.py:88
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1022
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1379
 msgid "Upgrading"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1114
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1114
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1338
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1338
 msgid "Upgrading Dreambox... Please wait"
 msgstr ""
 
@@ -8538,26 +8608,28 @@ msgid ""
 "are not taken into account!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:26
-#: ../enigma2_master/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:28
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:319
 msgid "Use"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:483
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:483
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:494
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:494
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Use DHCP"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:479
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:479
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:490
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:490
 msgid "Use Interface"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:43
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:324
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:337
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:43
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:324
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:337
 msgid "Use Power Measurement"
 msgstr ""
 
@@ -8565,21 +8637,31 @@ msgstr ""
 msgid "Use a custom location"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:488
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:488
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:499
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:499
 msgid "Use a gateway"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:85
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:85
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:60
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:60
 msgid "Use the Networkwizard to configure selected network adapter"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:826
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:826
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:858
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:858
 msgid "Use the Networkwizard to configure your Network\n"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:252
+#: ../enigma2_master/lib/python/Screens/InputDeviceSetup.py:252
+msgid "Use this input device settings?"
+msgstr ""
+
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:397
+#: ../enigma2_master/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?"
@@ -8590,24 +8672,24 @@ msgstr ""
 msgid "Use time of currently running service"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:339
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:339
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:352
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:352
 msgid "Use usals for this sat"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:162
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:162
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:163
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:163
 msgid "Used service scan type"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:987
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1046
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1102
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1104
-#: ../enigma2_master/lib/python/Components/NimManager.py:987
-#: ../enigma2_master/lib/python/Components/NimManager.py:1046
-#: ../enigma2_master/lib/python/Components/NimManager.py:1102
-#: ../enigma2_master/lib/python/Components/NimManager.py:1104
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1079
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1140
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1196
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1198
+#: ../enigma2_master/lib/python/Components/NimManager.py:1079
+#: ../enigma2_master/lib/python/Components/NimManager.py:1140
+#: ../enigma2_master/lib/python/Components/NimManager.py:1196
+#: ../enigma2_master/lib/python/Components/NimManager.py:1198
 msgid "User defined"
 msgstr ""
 
@@ -8685,7 +8767,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 ""
 
@@ -8694,17 +8776,17 @@ 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_master/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:1003
 msgid "View Movies..."
 msgstr ""
 
@@ -8713,13 +8795,13 @@ msgstr ""
 msgid "View Photos..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:1420
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:1420
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:1427
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:1427
 msgid "View Rass interactive..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:1008
-#: ../enigma2_master/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:1013
 msgid "View Video CD..."
 msgstr ""
 
@@ -8727,73 +8809,73 @@ msgstr ""
 msgid "View active downloads"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:457
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:457
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:671
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:671
 msgid "View details"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:652
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:652
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:876
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:876
 msgid "View list of available "
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:636
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:636
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:860
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:860
 msgid "View list of available CommonInterface extensions"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:646
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:646
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:870
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:870
 msgid "View list of available Display and Userinterface extensions."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:648
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:648
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:872
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:872
 msgid "View list of available EPG extensions."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:640
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:640
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:864
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:864
 msgid "View list of available Satellite equipment extensions."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:650
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:650
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:874
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:874
 msgid "View list of available communication extensions."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:638
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:638
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:862
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:862
 msgid "View list of available default settings"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:644
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:644
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:868
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:868
 msgid "View list of available multimedia extensions."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:634
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:634
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:858
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:858
 msgid "View list of available networking extensions"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:632
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:632
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:856
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:856
 msgid "View list of available recording extensions"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:630
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:630
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:854
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:854
 msgid "View list of available skins"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:642
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:642
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:866
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:866
 msgid "View list of available software extensions"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:628
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:628
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:852
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:852
 msgid "View list of available system extensions"
 msgstr ""
 
@@ -8805,8 +8887,8 @@ msgstr ""
 msgid "View response videos"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:2243
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2242
+#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:2128
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2128
 msgid "View teletext..."
 msgstr ""
 
@@ -8823,39 +8905,59 @@ msgstr ""
 msgid "Views: "
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:289
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:289
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:302
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:302
 msgid "Voltage mode"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:964
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:383
+#: ../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
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:964
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:383
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:971
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:395
 #: ../enigma2_master/lib/python/Components/ServiceScan.py:49
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:482
 msgid "W"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:420
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:420
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:431
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:431
 msgid "WEP"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:421
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:421
+#: ../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
+#: ../enigma2_master/lib/python/Components/Network.py:348
+#: ../enigma2_master/lib/python/Components/Network.py:350
+#: ../enigma2_master/lib/python/Components/Network.py:352
+#: ../enigma2_master/lib/python/Components/Network.py:354
+#: ../enigma2_master/lib/python/Components/Network.py:356
+msgid "WLAN adapter."
+msgstr ""
+
+#: ../enigma2_experimental/lib/python/Components/Network.py:333
+#: ../enigma2_experimental/lib/python/Components/Network.py:336
+#: ../enigma2_master/lib/python/Components/Network.py:333
+#: ../enigma2_master/lib/python/Components/Network.py:336
+msgid "WLAN connection"
+msgstr ""
+
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:432
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:432
 msgid "WPA"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:423
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:423
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:434
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:434
 msgid "WPA or WPA2"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:422
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:422
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:433
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:433
 msgid "WPA2"
 msgstr ""
 
@@ -8879,7 +8981,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 ""
 
@@ -8898,16 +9000,16 @@ msgstr ""
 msgid "Wed"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:123
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:164
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:123
-#: ../enigma2_master/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:124
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:165
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:46
 msgid "Wednesday"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:159
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:159
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:160
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:160
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:52
 msgid "Weekday"
 msgstr ""
@@ -8964,13 +9066,13 @@ msgid ""
 "Press exit to get back to the input field."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1069
-#: ../enigma2_master/lib/python/Components/NimManager.py:1069
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1163
+#: ../enigma2_master/lib/python/Components/NimManager.py:1163
 msgid "West"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:119
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:119
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:120
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:120
 msgid "What to do with submitted crashlogs?"
 msgstr ""
 
@@ -8996,23 +9098,18 @@ msgstr ""
 msgid "Where to save temporary timeshift recordings?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/Network.py:315
-#: ../enigma2_master/lib/python/Components/Network.py:315
-msgid "Wireless"
-msgstr ""
-
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:401
-#: ../enigma2_master/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:466
 msgid "Wireless LAN"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1286
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1286
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1326
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1326
 msgid "Wireless Network"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:114
-#: ../enigma2_master/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:116
 msgid "Wireless Network State"
 msgstr ""
 
@@ -9032,21 +9129,16 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#: ../enigma2_experimental/RecordTimer.py:364
-#: ../enigma2_master/RecordTimer.py:364
+#: ../enigma2_experimental/RecordTimer.py:376
+#: ../enigma2_master/RecordTimer.py:376
 msgid "Write error while recording. Disk full?\n"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:285
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:285
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:295
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:295
 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 ""
-
 #: ../enigma2_experimental/lib/python/Components/AVSwitch.py:75
 #: ../enigma2_master/lib/python/Components/AVSwitch.py:75
 msgid "YPbPr"
@@ -9063,17 +9155,21 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Screens/Ci.py:27
 #: ../enigma2_experimental/lib/python/Screens/InfoBar.py:168
 #: ../enigma2_experimental/lib/python/Screens/InfoBar.py:173
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:389
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:275
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:270
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:401
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:276
+#: ../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
 #: ../enigma2_master/lib/python/Screens/InfoBar.py:173
-#: ../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_master/lib/python/Screens/Satconfig.py:401
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:276
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:561
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:717
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:272
+#: ../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
@@ -9085,18 +9181,23 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:389
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:389
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:401
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:401
 msgid "Yes to all"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:51
+#: ../enigma2_master/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"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:276
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:276
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:277
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:277
 msgid "Yes, and don't ask again"
 msgstr ""
 
@@ -9113,18 +9214,18 @@ msgstr ""
 msgid "Yes, returning to movie list"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:881
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:881
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1105
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1105
 msgid "You can cancel the installation."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:883
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:883
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1107
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1107
 msgid "You can cancel the removal."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:879
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:879
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1103
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1103
 msgid "You can install this plugin."
 msgstr ""
 
@@ -9133,8 +9234,8 @@ msgstr ""
 msgid "You can only burn Dreambox recordings!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:877
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:877
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1101
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1101
 msgid "You can remove this plugin."
 msgstr ""
 
@@ -9147,6 +9248,11 @@ msgstr ""
 msgid "You cannot delete this!"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:282
+#: ../enigma2_master/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
@@ -9155,8 +9261,8 @@ msgid ""
 "Do you want to remove trailing whitespaces?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:434
-#: ../enigma2_master/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:715
 msgid ""
 "You have chosen to create a new .NFI flasher bootable USB stick. This will "
 "repartition the USB stick and therefore all data on it will be erased."
@@ -9177,8 +9283,8 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:694
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:694
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:705
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:705
 msgid "Your Dreambox will restart after pressing OK on your remote control."
 msgstr ""
 
@@ -9203,15 +9309,15 @@ msgstr ""
 msgid "Your current collection will get lost!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1189
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1189
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1429
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1429
 msgid ""
 "Your dreambox isn't connected to the internet properly. Please check it and "
 "try again."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:121
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:121
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:122
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:122
 msgid "Your email address:"
 msgstr ""
 
@@ -9222,15 +9328,15 @@ msgid ""
 "Press OK to start upgrade."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:122
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:122
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:123
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:123
 msgid "Your name (optional):"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:621
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:623
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:621
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:623
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:632
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:634
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:632
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:634
 msgid "Your network configuration has been activated."
 msgstr ""
 
@@ -9261,32 +9367,37 @@ msgstr ""
 msgid "Zap back to service before satfinder?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:363
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:428
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:449
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:363
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:428
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:449
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:406
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:442
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:463
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:406
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:442
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:463
 msgid "Zap back to service before tuner setup?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:558
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:558
+#: ../enigma2_experimental/lib/python/Components/Network.py:350
+#: ../enigma2_master/lib/python/Components/Network.py:350
+msgid "Zydas"
+msgstr ""
+
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:565
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:565
 msgid "[alternative edit]"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:562
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:562
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:569
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:569
 msgid "[bouquet edit]"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:564
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:564
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:571
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:571
 msgid "[favourite edit]"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:656
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:656
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:663
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:663
 msgid "[move mode]"
 msgstr ""
 
@@ -9300,18 +9411,18 @@ msgstr ""
 msgid "a gui to assign services/providers/caids to common interface modules"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:164
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:164
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:171
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:171
 msgid "abort alternatives edit"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:158
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:158
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:165
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:165
 msgid "abort bouquet edit"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:161
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:161
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:168
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:168
 msgid "abort favourites edit"
 msgstr ""
 
@@ -9320,13 +9431,13 @@ msgstr ""
 msgid "about to start"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:238
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:238
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:249
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:249
 msgid "activate current configuration"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:327
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:327
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:338
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:338
 msgid "activate network adapter configuration"
 msgstr ""
 
@@ -9345,13 +9456,13 @@ msgstr ""
 msgid "add Service"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:244
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:244
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:255
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:255
 msgid "add a nameserver entry"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:151
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:151
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:158
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:158
 msgid "add alternatives"
 msgstr ""
 
@@ -9360,8 +9471,8 @@ msgstr ""
 msgid "add bookmark"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:133
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:133
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:140
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:140
 msgid "add bouquet"
 msgstr ""
 
@@ -9384,46 +9495,46 @@ msgstr ""
 msgid "add filters"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:141
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:141
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:148
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:148
 msgid "add marker"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1652
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1662
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1651
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1661
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1652
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1662
 msgid "add recording (enter recording duration)"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1653
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1663
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1652
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1662
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1653
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1663
 msgid "add recording (enter recording endtime)"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1651
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1661
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1650
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1660
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1651
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1661
 msgid "add recording (indefinitely)"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1650
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1660
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1649
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1659
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1650
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1660
 msgid "add recording (stop after current event)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:114
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:114
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:120
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:120
 msgid "add service to bouquet"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:116
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:116
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:123
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:123
 msgid "add service to favourites"
 msgstr ""
 
@@ -9437,11 +9548,11 @@ msgid "add to parental protection"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:63
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:529
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1327
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:543
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1434
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:63
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:529
-#: ../enigma2_master/lib/python/Components/NimManager.py:1327
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:543
+#: ../enigma2_master/lib/python/Components/NimManager.py:1434
 msgid "advanced"
 msgstr ""
 
@@ -9472,13 +9583,15 @@ msgstr ""
 msgid "audio track (%s) language"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Screens/AudioSelection.py:52
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:117
+#: ../enigma2_master/lib/python/Screens/AudioSelection.py:52
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:117
 msgid "audio tracks"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:101
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:101
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:102
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:102
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:241
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:29
 msgid "auto"
@@ -9491,9 +9604,9 @@ 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/Screens/ChannelSelection.py:173
 #: ../enigma2_master/lib/python/Plugins/Extensions/CutListEditor/plugin.py:56
 msgid "back"
 msgstr ""
@@ -9520,8 +9633,8 @@ msgstr ""
 msgid "black"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:31
-#: ../enigma2_master/lib/python/Components/ParentalControl.py:31
+#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:33
+#: ../enigma2_master/lib/python/Components/ParentalControl.py:33
 msgid "blacklist"
 msgstr ""
 
@@ -9547,12 +9660,12 @@ msgid "case-sensitive search"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1654
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1653
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1654
 msgid "change recording (duration)"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1655
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1654
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1655
 msgid "change recording (endtime)"
 msgstr ""
 
@@ -9563,18 +9676,13 @@ 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 ""
-
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:582
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:559
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:577
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:577
 msgid "circular left"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:583
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:560
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:578
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:578
 msgid "circular right"
 msgstr ""
 
@@ -9585,32 +9693,36 @@ msgstr ""
 msgid "clear playlist"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:26
-#: ../enigma2_master/lib/python/Components/ParentalControl.py:26
+#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:28
+#: ../enigma2_master/lib/python/Components/ParentalControl.py:28
 msgid "complex"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1355
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1369
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1355
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1369
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1395
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1409
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1395
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1409
 msgid "confirmed"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1344
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1400
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1344
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1400
+#: ../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:1384
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1440
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:295
 msgid "connected"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:756
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:755
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:504
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:756
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:504
 msgid "continue"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:122
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:122
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:129
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:129
 msgid "copy to bouquets"
 msgstr ""
 
@@ -9624,8 +9736,14 @@ msgstr ""
 msgid "create directory"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:108
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:108
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:103
+#: ../enigma2_master/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:109
 msgid "daily"
 msgstr ""
 
@@ -9666,32 +9784,37 @@ msgstr ""
 msgid "delete..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/config.py:448
-#: ../enigma2_master/lib/python/Components/config.py:448
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1207
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1207
+msgid "description"
+msgstr ""
+
+#: ../enigma2_experimental/lib/python/Components/config.py:449
+#: ../enigma2_master/lib/python/Components/config.py:449
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:128
 msgid "disable"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:153
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:153
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:160
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:160
 msgid "disable move mode"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1174
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1394
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1213
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1501
 #: ../enigma2_experimental/lib/python/Components/TimerList.py:69
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1174
-#: ../enigma2_master/lib/python/Components/NimManager.py:1394
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1213
+#: ../enigma2_master/lib/python/Components/NimManager.py:1501
 #: ../enigma2_master/lib/python/Components/TimerList.py:69
 msgid "disabled"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1329
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1348
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1395
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1329
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1348
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1395
+#: ../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:1369
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1388
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1435
 msgid "disconnected"
 msgstr ""
 
@@ -9702,17 +9825,17 @@ 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_master/lib/python/Screens/InfoBarGenerics.py:1655
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:102
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1656
 #: ../enigma2_master/lib/python/Screens/TaskView.py:51
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:101
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:102
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:238
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:26
 msgid "do nothing"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1664
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1663
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1664
 msgid "don't record"
 msgstr ""
 
@@ -9723,8 +9846,8 @@ msgstr ""
 msgid "done!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:147
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:147
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:154
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:154
 msgid "edit alternatives"
 msgstr ""
 
@@ -9736,50 +9859,50 @@ msgstr ""
 msgid "edit services"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:516
-#: ../enigma2_master/lib/python/Components/NimManager.py:516
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:576
+#: ../enigma2_master/lib/python/Components/NimManager.py:576
 msgid "empty"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/config.py:448
-#: ../enigma2_master/lib/python/Components/config.py:448
+#: ../enigma2_experimental/lib/python/Components/config.py:449
+#: ../enigma2_master/lib/python/Components/config.py:449
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:128
 msgid "enable"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:143
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:143
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:150
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:150
 msgid "enable bouquet edit"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:145
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:145
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:152
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:152
 msgid "enable favourite edit"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:139
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:139
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:146
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:146
 msgid "enable move mode"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1170
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:534
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1341
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1381
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1170
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:534
-#: ../enigma2_master/lib/python/Components/NimManager.py:1341
-#: ../enigma2_master/lib/python/Components/NimManager.py:1381
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1209
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:548
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1448
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1488
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1209
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:548
+#: ../enigma2_master/lib/python/Components/NimManager.py:1448
+#: ../enigma2_master/lib/python/Components/NimManager.py:1488
 msgid "enabled"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:163
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:163
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:170
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:170
 msgid "end alternatives edit"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:157
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:157
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:164
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:164
 msgid "end bouquet edit"
 msgstr ""
 
@@ -9790,32 +9913,32 @@ msgstr ""
 msgid "end cut here"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:160
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:160
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:167
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:167
 msgid "end favourites edit"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:452
+#: ../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_master/lib/python/Screens/NetworkSetup.py:452
+#: ../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:463
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:319
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:368
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:292
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:338
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:363
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:294
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:340
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:365
 msgid "enter hidden network SSID"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:68
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:494
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1329
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:508
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1436
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:68
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:494
-#: ../enigma2_master/lib/python/Components/NimManager.py:1329
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:508
+#: ../enigma2_master/lib/python/Components/NimManager.py:1436
 msgid "equal to"
 msgstr ""
 
@@ -9823,8 +9946,8 @@ msgstr ""
 msgid "exact match"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:333
-#: ../enigma2_master/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:346
 msgid "exit DVD player or return to file browser"
 msgstr ""
 
@@ -9838,47 +9961,34 @@ msgstr ""
 msgid "exit movielist"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:237
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:243
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:237
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:243
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:248
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:254
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:248
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:254
 msgid "exit nameserver configuration"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:326
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:332
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:326
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:332
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:337
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:343
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:337
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:343
 msgid "exit network adapter configuration"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:77
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:83
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:77
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:83
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:52
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:58
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:52
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:58
 msgid "exit network interface list"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:707
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:713
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:707
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:713
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:718
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:724
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:718
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:724
 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
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:607
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:295
-msgid "failed"
-msgstr ""
-
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/PicturePlayer/plugin.py:628
 #: ../enigma2_master/lib/python/Plugins/Extensions/PicturePlayer/plugin.py:628
 msgid "fileformats (BMP, PNG, JPG, GIF)"
@@ -9896,8 +10006,8 @@ msgstr ""
 msgid "fine-tune your display"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:329
-#: ../enigma2_master/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:342
 msgid "forward to the next chapter"
 msgstr ""
 
@@ -9914,18 +10024,18 @@ 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_master/lib/python/Screens/TimerEntry.py:99
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:240
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:27
 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_master/lib/python/Screens/TimerEntry.py:102
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:239
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:28
 msgid "go to standby"
@@ -9958,8 +10068,8 @@ msgstr ""
 msgid "hide player"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:580
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:557
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:575
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:575
 msgid "horizontal"
 msgstr ""
 
@@ -9978,6 +10088,7 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Components/UsageConfig.py:54
 #: ../enigma2_experimental/lib/python/Components/UsageConfig.py:59
 #: ../enigma2_master/lib/python/Components/UsageConfig.py:54
+#: ../enigma2_master/lib/python/Components/UsageConfig.py:59
 msgid "immediate shutdown"
 msgstr ""
 
@@ -10010,13 +10121,13 @@ msgstr ""
 msgid "insert mark here"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:332
-#: ../enigma2_master/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:345
 msgid "jump back to the previous title"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:331
-#: ../enigma2_master/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:344
 msgid "jump forward to the next title"
 msgstr ""
 
@@ -10030,13 +10141,13 @@ msgstr ""
 msgid "jump to listend"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1998
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1997
+#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1883
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1883
 msgid "jump to next marked position"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1997
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1996
+#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1882
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1882
 msgid "jump to previous marked position"
 msgstr ""
 
@@ -10045,8 +10156,8 @@ msgstr ""
 msgid "leave movie player..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1782
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1781
+#: ../enigma2_experimental/lib/python/Screens/AudioSelection.py:80
+#: ../enigma2_master/lib/python/Screens/AudioSelection.py:80
 msgid "left"
 msgstr ""
 
@@ -10091,18 +10202,18 @@ msgid "locked"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:72
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:493
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1332
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:507
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1439
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:72
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:493
-#: ../enigma2_master/lib/python/Components/NimManager.py:1332
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:507
+#: ../enigma2_master/lib/python/Components/NimManager.py:1439
 msgid "loopthrough to"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:525
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1065
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:525
-#: ../enigma2_master/lib/python/Components/NimManager.py:1065
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:539
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1159
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:539
+#: ../enigma2_master/lib/python/Components/NimManager.py:1159
 msgid "manual"
 msgstr ""
 
@@ -10119,8 +10230,8 @@ msgstr ""
 msgid "menu"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:828
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:828
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:860
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:860
 msgid "menulist"
 msgstr ""
 
@@ -10164,32 +10275,32 @@ msgstr ""
 msgid "move PiP to main picture"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:702
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:702
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:713
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:713
 msgid "move down to last entry"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:700
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:700
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:711
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:711
 msgid "move down to next entry"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:701
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:701
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:712
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:712
 msgid "move up to first entry"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:699
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:699
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:710
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:710
 msgid "move up to previous entry"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1138
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1139
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1140
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1137
 #: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1138
 #: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1139
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1140
 msgid "movie list"
 msgstr ""
 
@@ -10198,10 +10309,10 @@ msgstr ""
 msgid "multinorm"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:27
-#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:28
-#: ../enigma2_master/lib/python/Components/ParentalControl.py:27
-#: ../enigma2_master/lib/python/Components/ParentalControl.py:28
+#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:29
+#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:30
+#: ../enigma2_master/lib/python/Components/ParentalControl.py:29
+#: ../enigma2_master/lib/python/Components/ParentalControl.py:30
 msgid "never"
 msgstr ""
 
@@ -10217,18 +10328,18 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/MessageBox.py:44
 #: ../enigma2_experimental/lib/python/Screens/MessageBox.py:46
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:542
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:928
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:537
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:923
 #: ../enigma2_experimental/lib/python/Screens/SleepTimerEdit.py:92
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:113
-#: ../enigma2_experimental/lib/python/Components/config.py:438
+#: ../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
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:519
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:905
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:537
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:923
 #: ../enigma2_master/lib/python/Screens/SleepTimerEdit.py:92
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:113
-#: ../enigma2_master/lib/python/Components/config.py:438
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:114
+#: ../enigma2_master/lib/python/Components/config.py:439
 msgid "no"
 msgstr ""
 
@@ -10279,9 +10390,9 @@ msgid "none"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:61
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:498
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:512
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:61
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:498
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:512
 msgid "not configured"
 msgstr ""
 
@@ -10290,21 +10401,28 @@ msgstr ""
 msgid "not locked"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1123
-#: ../enigma2_master/lib/python/Components/NimManager.py:1123
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:587
+#: ../enigma2_master/lib/python/Components/NimManager.py:587
+msgid "not supported"
+msgstr ""
+
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1219
+#: ../enigma2_master/lib/python/Components/NimManager.py:1219
 msgid "not used"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:532
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1067
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1326
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1342
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1382
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:532
-#: ../enigma2_master/lib/python/Components/NimManager.py:1067
-#: ../enigma2_master/lib/python/Components/NimManager.py:1326
-#: ../enigma2_master/lib/python/Components/NimManager.py:1342
-#: ../enigma2_master/lib/python/Components/NimManager.py:1382
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:546
+#: ../enigma2_experimental/lib/python/Components/FileList.py:200
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1161
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1433
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1449
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1489
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:546
+#: ../enigma2_master/lib/python/Components/FileList.py:200
+#: ../enigma2_master/lib/python/Components/NimManager.py:1161
+#: ../enigma2_master/lib/python/Components/NimManager.py:1433
+#: ../enigma2_master/lib/python/Components/NimManager.py:1449
+#: ../enigma2_master/lib/python/Components/NimManager.py:1489
 msgid "nothing connected"
 msgstr ""
 
@@ -10318,32 +10436,32 @@ msgstr ""
 msgid "of a SINGLE layer medium used."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:575
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:610
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:617
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:640
-#: ../enigma2_experimental/lib/python/Components/config.py:443
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:570
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:605
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:612
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:635
+#: ../enigma2_experimental/lib/python/Components/config.py:444
 #: ../enigma2_experimental/lib/python/Components/UsageConfig.py:28
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:552
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:587
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:594
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:617
-#: ../enigma2_master/lib/python/Components/config.py:443
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:570
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:605
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:612
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:635
+#: ../enigma2_master/lib/python/Components/config.py:444
 #: ../enigma2_master/lib/python/Components/UsageConfig.py:28
 msgid "off"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:576
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:611
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:618
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:641
-#: ../enigma2_experimental/lib/python/Components/config.py:443
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:571
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:606
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:613
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:636
+#: ../enigma2_experimental/lib/python/Components/config.py:444
 #: ../enigma2_experimental/lib/python/Components/UsageConfig.py:28
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:553
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:588
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:595
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:618
-#: ../enigma2_master/lib/python/Components/config.py:443
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:571
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:606
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:613
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:636
+#: ../enigma2_master/lib/python/Components/config.py:444
 #: ../enigma2_master/lib/python/Components/UsageConfig.py:28
 msgid "on"
 msgstr ""
@@ -10357,13 +10475,13 @@ msgstr ""
 msgid "on Weekday"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:102
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:102
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:103
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:103
 msgid "once"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:333
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:333
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:344
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:344
 msgid "open nameserver configuration"
 msgstr ""
 
@@ -10393,7 +10511,7 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:755
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:161
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:754
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:755
 #: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:161
 msgid "pause"
 msgstr ""
@@ -10418,9 +10536,9 @@ msgstr ""
 msgid "please press OK when ready"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:452
+#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/Process.py:462
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/PicturePlayer/plugin.py:473
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:452
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/Process.py:462
 #: ../enigma2_master/lib/python/Plugins/Extensions/PicturePlayer/plugin.py:473
 msgid "please wait, loading picture..."
 msgstr ""
@@ -10435,8 +10553,8 @@ msgstr ""
 msgid "previous channel in history"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:96
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:96
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:97
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:97
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:187
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:182
 msgid "record"
@@ -10454,8 +10572,8 @@ msgstr ""
 msgid "red"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:245
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:245
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:256
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:256
 msgid "remove a nameserver entry"
 msgstr ""
 
@@ -10464,13 +10582,13 @@ msgstr ""
 msgid "remove after this position"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:149
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:149
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:156
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:156
 msgid "remove all alternatives"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:124
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:124
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:131
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:131
 msgid "remove all new found flags"
 msgstr ""
 
@@ -10489,10 +10607,10 @@ msgstr ""
 msgid "remove directory"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:126
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:134
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:126
-#: ../enigma2_master/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:133
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:141
 msgid "remove entry"
 msgstr ""
 
@@ -10501,13 +10619,13 @@ msgstr ""
 msgid "remove from parental protection"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:128
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:128
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:135
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:135
 msgid "remove new found flag"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:119
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:119
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:126
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:126
 msgid "remove selected satellite"
 msgstr ""
 
@@ -10516,28 +10634,28 @@ msgstr ""
 msgid "remove this mark"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:90
-#: ../enigma2_master/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:92
 msgid "repeat playlist"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:102
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:102
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:103
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:103
 msgid "repeated"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:330
-#: ../enigma2_master/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:343
 msgid "rewind to the previous chapter"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1782
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1781
+#: ../enigma2_experimental/lib/python/Screens/AudioSelection.py:80
+#: ../enigma2_master/lib/python/Screens/AudioSelection.py:80
 msgid "right"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:92
-#: ../enigma2_master/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:94
 msgid "save last directory on exit"
 msgstr ""
 
@@ -10546,8 +10664,8 @@ msgstr ""
 msgid "save playlist"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:91
-#: ../enigma2_master/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:93
 msgid "save playlist on exit"
 msgstr ""
 
@@ -10565,7 +10683,7 @@ msgid "scan in progress - %d%% done!"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ServiceScan.py:48
-#: ../enigma2_master/lib/python/Screens/ServiceScan.py:63
+#: ../enigma2_master/lib/python/Screens/ServiceScan.py:48
 msgid "scan state"
 msgstr ""
 
@@ -10575,11 +10693,11 @@ msgid "second"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:70
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:495
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1330
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:509
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1437
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:70
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:495
-#: ../enigma2_master/lib/python/Components/NimManager.py:1330
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:509
+#: ../enigma2_master/lib/python/Components/NimManager.py:1437
 msgid "second cable of motorized LNB"
 msgstr ""
 
@@ -10601,11 +10719,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 ""
-
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:123
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:123
 msgid "select CAId"
@@ -10616,20 +10729,15 @@ 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 ""
-
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:78
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:84
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:78
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:84
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:53
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:59
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:53
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:59
 msgid "select interface"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:708
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:708
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:719
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:719
 msgid "select menu entry"
 msgstr ""
 
@@ -10647,7 +10755,7 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Screens/ParentalControlSetup.py:147
 #: ../enigma2_master/lib/python/Screens/ParentalControlSetup.py:118
 #: ../enigma2_master/lib/python/Screens/ParentalControlSetup.py:147
-msgid "service pin"
+msgid "service PIN"
 msgstr ""
 
 #: ../enigma2_plugins/ac3lipsync/src/plugin.py:36
@@ -10658,11 +10766,11 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Screens/ParentalControlSetup.py:140
 #: ../enigma2_master/lib/python/Screens/ParentalControlSetup.py:120
 #: ../enigma2_master/lib/python/Screens/ParentalControlSetup.py:140
-msgid "setup pin"
+msgid "setup PIN"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:327
-#: ../enigma2_master/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:340
 msgid "show DVD main menu"
 msgstr ""
 
@@ -10681,8 +10789,8 @@ msgstr ""
 msgid "show all"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:148
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:148
+#: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:155
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:155
 msgid "show alternatives"
 msgstr ""
 
@@ -10713,6 +10821,7 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Components/UsageConfig.py:53
 #: ../enigma2_experimental/lib/python/Components/UsageConfig.py:58
 #: ../enigma2_master/lib/python/Components/UsageConfig.py:53
+#: ../enigma2_master/lib/python/Components/UsageConfig.py:58
 msgid "show shutdown menu"
 msgstr ""
 
@@ -10739,9 +10848,9 @@ 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
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:101
 msgid "shut down"
 msgstr ""
 
@@ -10750,35 +10859,35 @@ msgid "shutdown"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:62
-#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:527
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1327
-#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:26
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:541
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1434
+#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:28
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/PicturePlayer/plugin.py:23
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:62
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:527
-#: ../enigma2_master/lib/python/Components/NimManager.py:1327
-#: ../enigma2_master/lib/python/Components/ParentalControl.py:26
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:541
+#: ../enigma2_master/lib/python/Components/NimManager.py:1434
+#: ../enigma2_master/lib/python/Components/ParentalControl.py:28
 #: ../enigma2_master/lib/python/Plugins/Extensions/PicturePlayer/plugin.py:23
 msgid "simple"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:760
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:759
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:760
 msgid "skip backward"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:761
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:760
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:761
 msgid "skip backward (enter time)"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:758
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:757
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:758
 msgid "skip forward"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:759
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:758
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:759
 msgid "skip forward (enter time)"
 msgstr ""
 
@@ -10797,7 +10906,9 @@ msgstr ""
 msgid "special characters"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Components/RecordingConfig.py:12
 #: ../enigma2_experimental/lib/python/Components/UsageConfig.py:31
+#: ../enigma2_master/lib/python/Components/RecordingConfig.py:12
 #: ../enigma2_master/lib/python/Components/UsageConfig.py:31
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:238
 msgid "standard"
@@ -10814,18 +10925,18 @@ msgstr ""
 msgid "start cut here"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:94
-#: ../enigma2_master/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:96
 msgid "start directory"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1175
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1174
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1175
 msgid "start timeshift"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1782
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1781
+#: ../enigma2_experimental/lib/python/Screens/AudioSelection.py:80
+#: ../enigma2_master/lib/python/Screens/AudioSelection.py:80
 msgid "stereo"
 msgstr ""
 
@@ -10840,12 +10951,12 @@ msgid "stop entry"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1649
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1648
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1649
 msgid "stop recording"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1176
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1175
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1176
 msgid "stop timeshift"
 msgstr ""
 
@@ -10879,18 +10990,18 @@ msgstr ""
 msgid "switch to playlist"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:337
-#: ../enigma2_master/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:350
 msgid "switch to the next angle"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:335
-#: ../enigma2_master/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:348
 msgid "switch to the next audio track"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:336
-#: ../enigma2_master/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:349
 msgid "switch to the next subtitle language"
 msgstr ""
 
@@ -10911,43 +11022,48 @@ msgstr ""
 msgid "this recording"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:113
-#: ../enigma2_master/lib/python/Components/ParentalControl.py:113
+#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:111
+#: ../enigma2_master/lib/python/Components/ParentalControl.py:111
 msgid "this service is protected by a parental control pin"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1999
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1998
+#: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1884
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1884
 msgid "toggle a cut mark at the current position"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:328
-#: ../enigma2_master/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:341
 msgid "toggle time, chapter, audio, subtitle info"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Screens/Satconfig.py:552
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:552
+msgid "tuner is not supported"
+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
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:338
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:294
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:340
 msgid "unavailable"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1359
-#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1373
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1359
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1373
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1399
+#: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1413
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1399
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1413
 msgid "unconfirmed"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:977
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:984
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:977
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:984
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1199
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1204
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1199
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1204
 msgid "unknown"
 msgstr ""
 
@@ -10956,10 +11072,10 @@ msgstr ""
 msgid "unknown service"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:27
-#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:28
-#: ../enigma2_master/lib/python/Components/ParentalControl.py:27
-#: ../enigma2_master/lib/python/Components/ParentalControl.py:28
+#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:29
+#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:30
+#: ../enigma2_master/lib/python/Components/ParentalControl.py:29
+#: ../enigma2_master/lib/python/Components/ParentalControl.py:30
 msgid "until standby/restart"
 msgstr ""
 
@@ -10967,18 +11083,18 @@ msgstr ""
 msgid "use as HDD replacement"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:108
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:108
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:109
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:109
 msgid "user defined"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:581
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:558
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:576
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:576
 msgid "vertical"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1307
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1306
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1307
 msgid "view extensions..."
 msgstr ""
 
@@ -11009,13 +11125,13 @@ msgstr ""
 msgid "was removed successfully"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:108
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:108
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:109
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:109
 msgid "weekly"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:31
-#: ../enigma2_master/lib/python/Components/ParentalControl.py:31
+#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:33
+#: ../enigma2_master/lib/python/Components/ParentalControl.py:33
 msgid "whitelist"
 msgstr ""
 
@@ -11033,37 +11149,37 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/MessageBox.py:44
 #: ../enigma2_experimental/lib/python/Screens/MessageBox.py:46
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:542
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:928
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:537
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:923
 #: ../enigma2_experimental/lib/python/Screens/SleepTimerEdit.py:90
-#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:113
-#: ../enigma2_experimental/lib/python/Components/config.py:438
+#: ../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
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:519
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:905
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:537
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:923
 #: ../enigma2_master/lib/python/Screens/SleepTimerEdit.py:90
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:113
-#: ../enigma2_master/lib/python/Components/config.py:438
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:114
+#: ../enigma2_master/lib/python/Components/config.py:439
 msgid "yes"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:542
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:928
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:519
-#: ../enigma2_master/lib/python/Screens/ScanSetup.py:905
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:537
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:923
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:537
+#: ../enigma2_master/lib/python/Screens/ScanSetup.py:923
 msgid "yes (keep feeds)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1185
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1185
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1425
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1425
 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_master/lib/python/Screens/TimerEntry.py:96
+#: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:97
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:97
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:187
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:182
 msgid "zap"
@@ -11166,7 +11282,7 @@ msgstr ""
 msgid "Action on long powerbutton press"
 msgstr ""
 
-#: ../enigma2_experimental/data/
+#: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Action on short powerbutton press"
 msgstr ""
 
@@ -11263,6 +11379,10 @@ msgid "Common Interface"
 msgstr ""
 
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
+msgid "Composition of the recording filenames"
+msgstr ""
+
+#: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Continue in background"
 msgstr ""
 
@@ -11415,6 +11535,10 @@ msgid "Initialization"
 msgstr ""
 
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
+msgid "Input devices"
+msgstr ""
+
+#: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Installing Software..."
 msgstr ""
 
@@ -11574,6 +11698,12 @@ msgid "Pin code needed"
 msgstr ""
 
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
+msgid ""
+"Please be aware, that anyone can disable the parental control, if you have "
+"not set a PIN."
+msgstr ""
+
+#: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Please choose the default services lists you want to install."
 msgstr ""
 
@@ -11693,7 +11823,7 @@ msgstr ""
 msgid "Show blinking clock in display during recording"
 msgstr ""
 
-#: ../enigma2_experimental/data/
+#: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Show event-progress in channel selection"
 msgstr ""
 
@@ -11919,7 +12049,7 @@ msgstr ""
 
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid ""
-"You need to set a pin code and hide it from your children.\n"
+"You need to set a PIN code and hide it from your children.\n"
 "\n"
 "Do you want to set the pin now?"
 msgstr ""
@@ -12330,3 +12460,1187 @@ 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 ../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_dreamtv-hd.xml
+msgid "Kerni's dreamTV-HD skin"
+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_vali.hd.nano.xml
+msgid "Vali.HD.nano skin"
+msgstr ""
+
+#: ../meta_skins/skin_vali.hd.nano.xml
+msgid "A BackToTheRoots-Skin .. or good old times."
+msgstr ""
+
+#: ../meta_skins/skin_vali.hd.nano.xml
+msgid "A BackToTheRoots-Skin ... or good old times."
+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_bitrateviewer.xml
+msgid "Shows average bitrate of video and audio"
+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_eibox.xml
+msgid "Visualization for the European Installation Bus"
+msgstr ""
+
+#: ../meta_plugins/plugin_eibox.xml
+msgid ""
+"Visualize and control your lights, dimmers, blinds, thermostats etc. through "
+"EIB/KNX. (linknx server required)"
+msgstr ""
+
+#: ../meta_plugins/plugin_elektro.xml
+msgid "Sets your Dreambox into Deep-Standby"
+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_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_ncidclient.xml
+msgid ""
+"NCID Client shows incoming voice calls promoted by any NCID server (e.g. "
+"Vodafone Easybox) on your Dreambox."
+msgstr ""
+
+#: ../meta_plugins/plugin_ncidclient.xml
+msgid "Callmonitor for NCID-based call notification"
+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 ""