projects / vuplus_dvbapp / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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
index f1a6a85..2e9f148 100755 (executable)
--- a/po/enigma2.pot
+++ b/po/enigma2.pot
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-29 09:15+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"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:148
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:148
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:135
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:148
 msgid ""
 "\n"
 "Advanced options and settings."
 msgid ""
 "\n"
 "Advanced options and settings."
@@ -27,82 +27,82 @@ msgstr ""
 
 #: ../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:233
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:560
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1147
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1656
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:212
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:360
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:950
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1433
+#: ../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:131
 msgid ""
 "\n"
 "After pressing OK, please wait!"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:131
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:118
+#: ../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:155
 msgid ""
 "\n"
 "Backup your Dreambox settings."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:155
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:142
+#: ../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:128
 msgid ""
 "\n"
 "Edit the upgrade source address."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:128
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:115
+#: ../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:129
 msgid ""
 "\n"
 "Manage extensions or plugins for your Dreambox"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:129
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:116
+#: ../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:121
 msgid ""
 "\n"
 "Online update of your Dreambox software."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:121
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:111
+#: ../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:132
 msgid ""
 "\n"
 "Press OK on your remote control to continue."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:132
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:119
+#: ../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:130
 msgid ""
 "\n"
 "Restore your Dreambox settings."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:130
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:117
+#: ../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:150
 msgid ""
 "\n"
 "Restore your Dreambox with a new firmware."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:150
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:137
+#: ../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:133
 msgid ""
 "\n"
 "Restore your backups by date."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:133
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:120
+#: ../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:151
 msgid ""
 "\n"
 "Scan for local extensions and install them."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:151
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:138
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:151
 msgid ""
 "\n"
 "Select your backup device.\n"
 msgid ""
 "\n"
 "Select your backup device.\n"
@@ -110,14 +110,14 @@ msgid ""
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:256
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:256
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:255
+#: ../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:154
 msgid ""
 "\n"
 "System will restart after the restore!"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:154
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:141
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:154
 msgid ""
 "\n"
 "View, install and remove available or installed packages."
 msgid ""
 "\n"
 "View, install and remove available or installed packages."
@@ -131,53 +131,54 @@ msgstr ""
 msgid " Results"
 msgstr ""
 
 msgid " Results"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:852
-#: ../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/Screens/InputDeviceSetup.py:225
 msgid " extensions."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:225
+#: ../enigma2_master/lib/python/Screens/InputDeviceSetup.py:225
 msgid " ms"
 msgstr ""
 
 msgid " ms"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:662
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:674
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:462
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:474
+#: ../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:204
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:209
 msgid " packages selected."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:204
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:209
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:626
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:660
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:671
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:191
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:196
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:426
-#: ../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: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:359
 msgid " updates available."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:359
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:357
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:359
 msgid " wireless networks found!"
 msgstr ""
 
 msgid " wireless networks found!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1213
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1214
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1363
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1365
-#: ../enigma2_master/lib/python/Components/NimManager.py:1173
-#: ../enigma2_master/lib/python/Components/NimManager.py:1174
-#: ../enigma2_master/lib/python/Components/NimManager.py:1323
-#: ../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:125
 msgid "%H:%M"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Standby.py:125
-#: ../enigma2_master/lib/python/Screens/Standby.py:121
+#: ../enigma2_master/lib/python/Screens/Standby.py:125
 #, python-format
 msgid "%d jobs are running in the background!"
 msgstr ""
 #, python-format
 msgid "%d jobs are running in the background!"
 msgstr ""
@@ -202,8 +203,8 @@ msgstr ""
 #: ../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_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 ""
 
 msgid "%d.%B %Y"
 msgstr ""
 
@@ -241,55 +242,45 @@ msgstr ""
 msgid "(ZAP)"
 msgstr ""
 
 msgid "(ZAP)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:550
-#: ../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:347
 msgid "(empty)"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:347
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:334
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:347
 msgid "(show optional DVD audio menu)"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:65
 msgid "(show optional DVD audio menu)"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:65
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:90
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:65
 msgid "* Only available if more than one interface is active."
 msgstr ""
 
 msgid "* Only available if more than one interface is active."
 msgstr ""
 
-#: ../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_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:357
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:357
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:355
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:357
 msgid "1 wireless network found!"
 msgstr ""
 
 msgid "1 wireless network found!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1108
-#: ../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 ""
 
 msgid "1.0"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1108
-#: ../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 ""
 
 msgid "1.1"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1107
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1108
-#: ../enigma2_master/lib/python/Components/NimManager.py:1080
-#: ../enigma2_master/lib/python/Components/NimManager.py:1081
+#: ../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 ""
 
 msgid "1.2"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1104
-#: ../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 ""
 
 msgid "13 V"
 msgstr ""
 
@@ -327,15 +318,15 @@ msgstr ""
 msgid "16:9 always"
 msgstr ""
 
 msgid "16:9 always"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1104
-#: ../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 ""
 
 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 ""
 
 msgid "30 minutes"
 msgstr ""
 
@@ -356,17 +347,17 @@ msgstr ""
 msgid "4:3 PanScan"
 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 ""
 
 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 ""
 
 msgid "60 minutes"
 msgstr ""
 
@@ -389,6 +380,9 @@ msgstr ""
 #: ../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_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 ""
 #: ../enigma2_master/lib/python/Components/TimerList.py:64
 msgid "<unknown>"
 msgstr ""
@@ -400,16 +394,16 @@ msgstr ""
 msgid "??"
 msgstr ""
 
 msgid "??"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1106
-#: ../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:115
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "A"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Ipkg.py:115
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1375
-#: ../enigma2_master/lib/python/Screens/Ipkg.py:108
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1166
+#: ../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"
 #, python-format
 msgid ""
 "A configuration file (%s) was modified since Installation.\n"
@@ -418,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_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:300
 msgid "A demo plugin for TPM usage."
 msgstr ""
 
 #: ../enigma2_experimental/RecordTimer.py:300
-#: ../enigma2_master/RecordTimer.py:288
+#: ../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:306
 msgid ""
 "A finished record timer wants to set your\n"
 "Dreambox to standby. Do that now?"
 msgstr ""
 
 #: ../enigma2_experimental/RecordTimer.py:306
-#: ../enigma2_master/RecordTimer.py:294
+#: ../enigma2_master/RecordTimer.py:306
 msgid ""
 "A finished record timer wants to shut down\n"
 "your Dreambox. Shutdown now?"
 msgid ""
 "A finished record timer wants to shut down\n"
 "your Dreambox. Shutdown now?"
@@ -447,7 +443,7 @@ msgid ""
 msgstr ""
 
 #: ../enigma2_experimental/RecordTimer.py:381
 msgstr ""
 
 #: ../enigma2_experimental/RecordTimer.py:381
-#: ../enigma2_master/RecordTimer.py:369
+#: ../enigma2_master/RecordTimer.py:381
 #, python-format
 msgid ""
 "A record has been started:\n"
 #, python-format
 msgid ""
 "A record has been started:\n"
@@ -455,7 +451,7 @@ msgid ""
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1648
 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?"
 msgid ""
 "A recording is currently running.\n"
 "What do you want to do?"
@@ -476,18 +472,18 @@ msgid ""
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Components/Task.py:389
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Components/Task.py:389
-#: ../enigma2_master/lib/python/Components/Task.py:390
+#: ../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:212
 #, python-format
 msgid "A required tool (%s) was not found."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:212
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:199
+#: ../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:582
 msgid "A search for available updates is currently in progress."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:582
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:571
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:582
 msgid ""
 "A second configured interface has been found.\n"
 "\n"
 msgid ""
 "A second configured interface has been found.\n"
 "\n"
@@ -496,7 +492,7 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TaskView.py:128
 #: ../enigma2_experimental/SleepTimer.py:34
 
 #: ../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"
 #: ../enigma2_master/SleepTimer.py:34
 msgid ""
 "A sleep timer wants to set your\n"
@@ -505,20 +501,20 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TaskView.py:125
 #: ../enigma2_experimental/SleepTimer.py:29
 
 #: ../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_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:1052
-#: ../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:250
 msgid "A small overview of the available icon states and actions."
 msgstr ""
 
 #: ../enigma2_experimental/RecordTimer.py:250
-#: ../enigma2_master/RecordTimer.py:238
+#: ../enigma2_master/RecordTimer.py:250
 msgid ""
 "A timer failed to record!\n"
 "Disable TV and try again?\n"
 msgid ""
 "A timer failed to record!\n"
 "Disable TV and try again?\n"
@@ -532,13 +528,13 @@ msgstr ""
 msgid "A/V Settings"
 msgstr ""
 
 msgid "A/V Settings"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1082
-#: ../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 ""
 
 msgid "AA"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1082
-#: ../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 ""
 
 msgid "AB"
 msgstr ""
 
@@ -550,8 +546,7 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/AudioSelection.py:75
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/Videomode/plugin.py:100
 
 #: ../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"
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/Videomode/plugin.py:100
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "AC3 downmix"
@@ -570,7 +565,7 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:258
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:76
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:258
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:258
 #: ../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 ""
 
 msgid "Accesspoint:"
 msgstr ""
 
@@ -583,8 +578,8 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:137
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1432
 
 #: ../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 ""
 
 msgid "Activate Picture in Picture"
 msgstr ""
 
@@ -599,14 +594,14 @@ msgid ""
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:885
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:885
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:853
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:885
 msgid "Adapter settings"
 msgstr ""
 
 #: ../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
 msgid "Adapter settings"
 msgstr ""
 
 #: ../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
 #: ../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
@@ -618,8 +613,8 @@ msgstr ""
 msgid "Add Bookmark"
 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 ""
 
 msgid "Add WLAN configuration?"
 msgstr ""
 
@@ -639,8 +634,8 @@ msgstr ""
 msgid "Add a new title"
 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 ""
 
 msgid "Add network configuration?"
 msgstr ""
 
@@ -689,12 +684,12 @@ msgid "Add title"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1760
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1760
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1874
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1760
 msgid "Add to bouquet"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1762
 msgid "Add to bouquet"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1762
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1876
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1762
 msgid "Add to favourites"
 msgstr ""
 
 msgid "Add to favourites"
 msgstr ""
 
@@ -707,20 +702,20 @@ msgstr ""
 msgid "Added: "
 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 ""
 
 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 ""
 
 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 ""
 
 msgid "Adds wlan configuration if enabled."
 msgstr ""
 
@@ -736,17 +731,17 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/TitleList.py:88
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:148
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/TitleList.py:88
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/TitleList.py:88
 #: ../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:163
 msgid "Advanced Options"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:163
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:150
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:163
 msgid "Advanced Software"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:167
 msgid "Advanced Software"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:167
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:154
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:167
 msgid "Advanced Software Plugin"
 msgstr ""
 
 msgid "Advanced Software Plugin"
 msgstr ""
 
@@ -761,14 +756,14 @@ msgid "Advanced Video Setup"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:150
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:150
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:137
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:150
 msgid "Advanced restore"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TaskView.py:59
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:195
 msgid "Advanced restore"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TaskView.py:59
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:195
-#: ../enigma2_master/lib/python/Screens/TaskView.py:57
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:194
+#: ../enigma2_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"
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:528
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:173
 msgid "After event"
@@ -783,8 +778,8 @@ msgstr ""
 #: ../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_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:180
 #: ../enigma2_master/lib/python/Screens/MovieSelection.py:207
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:526
 #: ../enigma2_plugins/mytube/src/MyTubeSearch.py:180
@@ -794,10 +789,10 @@ msgstr ""
 msgid "All"
 msgstr ""
 
 msgid "All"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1101
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1102
-#: ../enigma2_master/lib/python/Components/NimManager.py:1074
-#: ../enigma2_master/lib/python/Components/NimManager.py:1075
+#: ../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 ""
 
 msgid "All Satellites"
 msgstr ""
 
@@ -815,11 +810,12 @@ msgid "Allow zapping via Webinterface"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:53
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:53
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:53
 msgid "Always ask"
 msgstr ""
 
 msgid "Always ask"
 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 "Always ask before sending"
 msgstr ""
 
 msgid "Always ask before sending"
 msgstr ""
 
@@ -838,15 +834,15 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Components/Task.py:347
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:180
 
 #: ../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/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 ""
 
 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 ""
 
 msgid "Anonymize crashlog?"
 msgstr ""
 
@@ -856,14 +852,14 @@ msgid "Arabic"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:568
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:568
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:557
+#: ../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:271
 msgid ""
 "Are you sure you want to activate this network configuration?\n"
 "\n"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:271
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:269
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:271
 msgid ""
 "Are you sure you want to delete\n"
 "following backup:\n"
 msgid ""
 "Are you sure you want to delete\n"
 "following backup:\n"
@@ -875,21 +871,21 @@ msgid "Are you sure you want to exit this wizard?"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:815
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:815
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:783
+#: ../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:256
 msgid ""
 "Are you sure you want to restart your network interfaces?\n"
 "\n"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:256
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:255
+#: ../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:242
 msgid ""
 "Are you sure you want to restore\n"
 "following backup:\n"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:242
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:221
+#: ../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"
 msgid ""
 "Are you sure you want to restore your Enigma2 backup?\n"
 "Enigma2 will restart after the restore"
@@ -940,11 +936,12 @@ msgid "Aspect Ratio"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Components/Network.py:348
 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
 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 ""
 
 msgid "Audio Options..."
 msgstr ""
 
@@ -963,8 +960,8 @@ msgstr ""
 msgid "Australia"
 msgstr ""
 
 msgid "Australia"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1187
-#: ../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 ""
 #: ../enigma2_plugins/mytube/src/plugin.py:1338
 msgid "Author: "
 msgstr ""
@@ -975,19 +972,19 @@ msgid "Authoring mode"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Ci.py:25
 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: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:1079
+#: ../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
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:10
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:15
 #: ../enigma2_experimental/lib/python/Tools/Transponder.py:26
@@ -1004,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_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
 #: ../enigma2_master/lib/python/Tools/Transponder.py:10
 #: ../enigma2_master/lib/python/Tools/Transponder.py:15
 #: ../enigma2_master/lib/python/Tools/Transponder.py:26
@@ -1076,8 +1073,8 @@ msgstr ""
 msgid "Automatic"
 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_experimental/data/ ../enigma2_master/data/
 msgid "Automatic Scan"
 msgstr ""
@@ -1096,19 +1093,19 @@ msgstr ""
 msgid "Available format variables"
 msgstr ""
 
 msgid "Available format variables"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1106
-#: ../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/data/ ../enigma2_master/data/
 msgid "B"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1082
-#: ../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 ""
 
 msgid "BA"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1082
-#: ../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 ""
 
 msgid "BB"
 msgstr ""
 
@@ -1118,13 +1115,14 @@ msgstr ""
 #: ../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/Screens/NetworkSetup.py:1285
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1290
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:507
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:648
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1231
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1236
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1241
-#: ../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/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 ""
 
 msgid "Back"
 msgstr ""
 
@@ -1134,12 +1132,12 @@ msgid "Background"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:305
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:305
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:284
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:305
 msgid "Backup done."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:307
 msgid "Backup done."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:307
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:286
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:307
 msgid "Backup failed."
 msgstr ""
 
 msgid "Backup failed."
 msgstr ""
 
@@ -1153,18 +1151,18 @@ msgid "Backup is running..."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:131
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:131
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:118
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:131
 msgid "Backup system settings"
 msgstr ""
 
 msgid "Backup system settings"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1105
-#: ../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 ""
 
 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_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 ""
 #: ../enigma2_master/lib/python/Screens/ServiceInfo.py:140
 msgid "Bandwidth"
 msgstr ""
@@ -1183,7 +1181,7 @@ msgstr ""
 #: ../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_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"
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:117
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py:97
 msgid "Begin time"
@@ -1192,7 +1190,7 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:262
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:80
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:262
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:262
 #: ../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 ""
 
 msgid "Bitrate:"
 msgstr ""
 
@@ -1233,15 +1231,15 @@ msgid "Browse network neighbourhood"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py:35
 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_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"
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/TitleList.py:66
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/TitleList.py:122
 msgid "Burn DVD"
@@ -1262,8 +1260,8 @@ msgstr ""
 msgid "Bus: "
 msgstr ""
 
 msgid "Bus: "
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1011
-#: ../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 ""
 
 msgid "C-Band"
 msgstr ""
 
@@ -1291,7 +1289,7 @@ msgstr ""
 #: ../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_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
 #: ../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
@@ -1338,36 +1336,40 @@ msgstr ""
 #: ../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:351
 #: ../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:351
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:953
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1521
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/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_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/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/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/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/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/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
 #: ../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
@@ -1390,10 +1392,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
 msgid "Cancel"
 msgstr ""
 
-#: ../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: "
 #: ../enigma2_experimental/lib/python/Screens/HarddiskSetup.py:48
 #: ../enigma2_master/lib/python/Screens/HarddiskSetup.py:48
 msgid "Capacity: "
@@ -1426,35 +1424,30 @@ msgstr ""
 msgid "Change default recording offset?"
 msgstr ""
 
 msgid "Change default recording offset?"
 msgstr ""
 
-#: ../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:198
 #: ../enigma2_experimental/lib/python/Screens/ParentalControlSetup.py:311
 #: ../enigma2_plugins/networkbrowser/src/MountManager.py:76
 msgid "Change hostname"
 msgstr ""
 
 #: ../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
 #: ../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
 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
 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
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py:315
@@ -1467,6 +1460,7 @@ msgid "Change the hostname of your Dreambox."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:756
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:756
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:756
 msgid "Changelog"
 msgstr ""
 
 msgid "Changelog"
 msgstr ""
 
@@ -1478,10 +1472,11 @@ msgstr ""
 #: ../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_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
 #: ../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
@@ -1513,17 +1508,17 @@ msgid "Channels"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:429
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:429
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:416
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:429
 msgid "Chap."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:430
 msgid "Chap."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:430
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:417
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:430
 msgid "Chapter"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:165
 msgid "Chapter"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:165
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:152
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:165
 msgid "Chapter:"
 msgstr ""
 
 msgid "Chapter:"
 msgstr ""
 
@@ -1538,33 +1533,34 @@ msgid "Checking Filesystem..."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:224
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:224
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:222
+#: ../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:152
 msgid "Choose a wireless network"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:152
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:139
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:152
 msgid "Choose backup files"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:151
 msgid "Choose backup files"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:151
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:138
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:151
 msgid "Choose backup location"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:735
 msgid "Choose backup location"
 msgstr ""
 
 #: ../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
 msgid "Choose image to download"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:231
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:230
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:231
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:331
 #: ../enigma2_plugins/mytube/src/MyTubeSearch.py:459
 msgid "Choose target folder"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:155
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:331
 #: ../enigma2_plugins/mytube/src/MyTubeSearch.py:459
 msgid "Choose target folder"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:155
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:142
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:155
 msgid "Choose upgrade source"
 msgstr ""
 
 msgid "Choose upgrade source"
 msgstr ""
 
@@ -1610,10 +1606,10 @@ msgstr ""
 msgid "CleanupWizard"
 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 ""
 
 msgid "Clear before scan"
 msgstr ""
 
@@ -1622,7 +1618,7 @@ msgid "Clear history on Exit:"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:414
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:414
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:398
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:414
 msgid "Clear log"
 msgstr ""
 
 msgid "Clear log"
 msgstr ""
 
@@ -1639,25 +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/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: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/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:171
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:471
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:553
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:666
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1051
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1130
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1434
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1645
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1913
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/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_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:95
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:205
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:64
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:685
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1059
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1316
+#: ../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
 #: ../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
@@ -1666,18 +1663,21 @@ 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/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/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_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/MyTubeSearch.py:398
 #: ../enigma2_plugins/mytube/src/MyTubeSearch.py:562
 #: ../enigma2_plugins/mytube/src/plugin.py:281
@@ -1704,13 +1704,13 @@ msgstr ""
 msgid "Close title selection"
 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 ""
 
 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 ""
 
 msgid "Code rate low"
 msgstr ""
 
@@ -1749,13 +1749,13 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:315
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:327
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:315
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:327
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:302
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:314
+#: ../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:311
 msgid "Command order"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:311
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:298
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:311
 msgid "Committed DiSEqC command"
 msgstr ""
 
 msgid "Committed DiSEqC command"
 msgstr ""
 
@@ -1764,13 +1764,13 @@ msgstr ""
 msgid "Common Interface Assignment"
 msgstr ""
 
 msgid "Common Interface Assignment"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:836
-#: ../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 ""
 
 msgid "CommonInterface"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:850
-#: ../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 ""
 
 msgid "Communication"
 msgstr ""
 
@@ -1779,11 +1779,11 @@ msgstr ""
 msgid "Compact Flash"
 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_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 ""
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py:592
 msgid "Complete"
 msgstr ""
@@ -1798,11 +1798,11 @@ msgstr ""
 #: ../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_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: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_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_experimental/data/ ../enigma2_master/data/
 msgid "Configuration Mode"
 msgstr ""
@@ -1826,9 +1826,9 @@ msgid "Configure your wireless LAN again"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Ipkg.py:106
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Ipkg.py:106
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1366
-#: ../enigma2_master/lib/python/Screens/Ipkg.py:99
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1161
+#: ../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 ""
 
 msgid "Configuring"
 msgstr ""
 
@@ -1840,18 +1840,19 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/Modem/plugin.py:274
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:206
 #: ../enigma2_master/lib/python/Plugins/Extensions/Modem/plugin.py:274
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/Modem/plugin.py:274
 #: ../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:466
 msgid "Connect"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:466
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:401
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:466
 msgid "Connect to a Wireless Network"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:142
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:299
 msgid "Connect to a Wireless Network"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:142
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:299
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:141
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:142
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:299
 msgid "Connected to"
 msgstr ""
 
 msgid "Connected to"
 msgstr ""
 
@@ -1865,13 +1866,18 @@ msgstr ""
 msgid "Constellation"
 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 ""
 
 msgid "Content does not fit on DVD!"
 msgstr ""
 
+#: ../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_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:525
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:512
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:525
 msgid "Continue playing"
 msgstr ""
 
 msgid "Continue playing"
 msgstr ""
 
@@ -1884,60 +1890,60 @@ msgid "Contrast"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:646
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:646
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:277
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:646
 msgid "Could not connect to Dreambox .NFI Image Feed Server:"
 msgstr ""
 
 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:222
 msgid "Could not load Medium! No disc inserted?"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:222
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:215
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:222
 msgid "Could not open Picture in Picture"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1555
 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 ""
 
 #, 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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
 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_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 ""
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/TitleList.py:124
 msgid "Create DVD-ISO"
 msgstr ""
@@ -1972,22 +1978,24 @@ msgid "Croatian"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:986
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:986
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:979
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:986
 msgid "Current Transponder"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:223
 msgid "Current Transponder"
 msgstr ""
 
 #: ../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
 msgid "Current device: "
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:362
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:351
+#: ../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
 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: "
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py:113
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py:330
 msgid "Current value: "
@@ -1999,6 +2007,7 @@ msgid "Current version:"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:738
 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 ""
 
 msgid "Currently installed image"
 msgstr ""
 
@@ -2036,7 +2045,7 @@ msgid "Czech Republic"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1335
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1335
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1295
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1335
 msgid "DHCP"
 msgstr ""
 
 msgid "DHCP"
 msgstr ""
 
@@ -2045,13 +2054,13 @@ msgstr ""
 msgid "DUAL LAYER DVD"
 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 ""
 
 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 ""
 
 msgid "DVB-S2"
 msgstr ""
 
@@ -2064,7 +2073,7 @@ msgid "DVD File Browser"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:715
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:715
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:702
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:715
 msgid "DVD Player"
 msgstr ""
 
 msgid "DVD Player"
 msgstr ""
 
@@ -2090,7 +2099,7 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Screens/TimeDateInput.py:46
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:171
 #: ../enigma2_master/lib/python/Screens/TimeDateInput.py:46
 #: ../enigma2_experimental/lib/python/Screens/TimeDateInput.py:46
 #: ../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 ""
 
 msgid "Date"
 msgstr ""
 
@@ -2099,13 +2108,13 @@ msgstr ""
 msgid "Decide if you want to enable or disable the Cleanup Wizard."
 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 ""
 
 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 ""
 
 msgid "Decide what should happen to the crashlogs after submission."
 msgstr ""
 
@@ -2128,13 +2137,13 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:118
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py:50
 
 #: ../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_master/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py:50
 msgid "Default"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:838
-#: ../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 ""
 
 msgid "Default Settings"
 msgstr ""
 
@@ -2153,7 +2162,7 @@ msgstr ""
 #: ../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_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
 #: ../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
@@ -2162,14 +2171,14 @@ msgstr ""
 msgid "Delete"
 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:411
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:502
 msgid "Delete crashlogs"
 msgstr ""
 
 #: ../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 ""
 #: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:502
 msgid "Delete entry"
 msgstr ""
@@ -2188,7 +2197,7 @@ msgid "Delete mount"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:401
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:401
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:389
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:401
 #, python-format
 msgid ""
 "Delete no more configured satellite\n"
 #, python-format
 msgid ""
 "Delete no more configured satellite\n"
@@ -2205,7 +2214,7 @@ msgstr ""
 #: ../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_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
 #: ../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
@@ -2220,15 +2229,8 @@ msgstr ""
 msgid "Deselect"
 msgstr ""
 
 msgid "Deselect"
 msgstr ""
 
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:221
-msgid "Destination directory"
-msgstr ""
-
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:957
-msgid "Details for extension: "
-msgstr ""
-
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1154
+#: ../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 ""
 
 msgid "Details for plugin: "
 msgstr ""
 
@@ -2243,26 +2245,26 @@ msgid "Detected NIMs:"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:515
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:515
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1089
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:501
-#: ../enigma2_master/lib/python/Components/NimManager.py:1062
+#: ../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:515
 msgid "DiSEqC A/B"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:515
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1089
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:501
-#: ../enigma2_master/lib/python/Components/NimManager.py:1062
+#: ../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:307
 msgid "DiSEqC A/B/C/D"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:307
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:294
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:307
 msgid "DiSEqC mode"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:330
 msgid "DiSEqC mode"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:330
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:317
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:330
 msgid "DiSEqC repeats"
 msgstr ""
 
 msgid "DiSEqC repeats"
 msgstr ""
 
@@ -2297,7 +2299,7 @@ msgid "Directory %s nonexistent."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:43
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:43
-#: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/settings.py:41
+#: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/settings.py:43
 msgid "Directory browser"
 msgstr ""
 
 msgid "Directory browser"
 msgstr ""
 
@@ -2311,16 +2313,12 @@ msgid "Disable"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1430
 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 ""
 
 msgid "Disable Picture in Picture"
 msgstr ""
 
-#: ../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 ""
 
 msgid "Disable crashlog reporting"
 msgstr ""
 
@@ -2333,8 +2331,8 @@ msgstr ""
 #: ../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_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 ""
 
 msgid "Disabled"
 msgstr ""
 
@@ -2368,8 +2366,8 @@ msgstr ""
 msgid "Display >16:9 content as"
 msgstr ""
 
 msgid "Display >16:9 content as"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:846
-#: ../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 ""
 
 msgid "Display and Userinterface"
 msgstr ""
 
@@ -2445,14 +2443,15 @@ msgstr ""
 msgid "Do you really want to remove your bookmark of %s?"
 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_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/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 ""
 #, python-format
 msgid "Do you want to download the image to %s ?"
 msgstr ""
@@ -2463,42 +2462,42 @@ msgstr ""
 msgid "Do you want to enter a username and password for this host?\n"
 msgstr ""
 
 msgid "Do you want to enter a username and password for this host?\n"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1249
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1756
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1056
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1501
+#: ../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:608
 msgid "Do you want to install the package:\n"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:608
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:595
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:608
 msgid "Do you want to play DVD in drive?"
 msgstr ""
 
 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 ""
 
 msgid "Do you want to preview this DVD before burning?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:897
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1256
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1271
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1409
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1763
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1785
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:697
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1063
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1078
-#: ../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 ""
 
 msgid "Do you want to reboot your Dreambox?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1243
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1748
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1050
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1493
+#: ../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 ""
 
 msgid "Do you want to remove the package:\n"
 msgstr ""
 
@@ -2510,7 +2509,7 @@ msgid "Do you want to restore your settings?"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1912
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1912
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2026
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1912
 msgid "Do you want to resume this playback?"
 msgstr ""
 
 msgid "Do you want to resume this playback?"
 msgstr ""
 
@@ -2518,15 +2517,15 @@ msgstr ""
 msgid "Do you want to see more entries?"
 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:233
 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:233
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:212
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:233
 msgid "Do you want to update your Dreambox?"
 msgstr ""
 
 msgid "Do you want to update your Dreambox?"
 msgstr ""
 
@@ -2539,13 +2538,13 @@ msgid ""
 "After pressing OK, please wait!"
 msgstr ""
 
 "After pressing OK, please wait!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1752
-#: ../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 ""
 
 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 ""
 
 msgid "Don't ask, just send"
 msgstr ""
 
@@ -2554,28 +2553,31 @@ msgstr ""
 msgid "Don't stop current event but disable coming events"
 msgstr ""
 
 msgid "Don't stop current event but disable coming events"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1390
-#: ../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:58
 #, python-format
 msgid "Done - Installed or upgraded %d packages"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Ipkg.py:58
-#: ../enigma2_master/lib/python/Screens/Ipkg.py:57
+#: ../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:499
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:508
 #, python-format
 msgid "Done - Installed, upgraded or removed %d packages with %d errors"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:499
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:508
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:185
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:316
+#: ../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:523
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:724
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:731
 msgid "Download"
 msgstr ""
 
 #: ../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 ""
 #, python-format
 msgid "Download %s from Server"
 msgstr ""
@@ -2584,9 +2586,10 @@ msgstr ""
 #: ../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_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:812
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py:20
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py:24
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:681
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py:23
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py:27
+#: ../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 ""
 
 msgid "Download .NFI-Files for USB-Flasher"
 msgstr ""
 
@@ -2603,10 +2606,6 @@ msgstr ""
 msgid "Download location"
 msgstr ""
 
 msgid "Download location"
 msgstr ""
 
-#: ../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"
 #: ../enigma2_experimental/lib/python/Screens/PluginBrowser.py:164
 #: ../enigma2_master/lib/python/Screens/PluginBrowser.py:164
 msgid "Downloadable new plugins"
@@ -2615,9 +2614,11 @@ msgstr ""
 #: ../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/Screens/Ipkg.py:83
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:73
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:101
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1343
-#: ../enigma2_master/lib/python/Screens/Ipkg.py:82
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1148
+#: ../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 ""
 
 msgid "Downloading"
 msgstr ""
 
@@ -2635,8 +2636,8 @@ msgstr ""
 msgid "Dreambox format data DVD (HDTV compatible)"
 msgstr ""
 
 msgid "Dreambox format data DVD (HDTV compatible)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:982
-#: ../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 ""
 
 msgid "Dreambox software because updates are available."
 msgstr ""
 
@@ -2659,8 +2660,8 @@ msgstr ""
 #: ../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_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"
 #: ../enigma2_master/lib/python/Components/ServiceScan.py:51
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:484
 msgid "E"
@@ -2676,17 +2677,17 @@ msgstr ""
 msgid "ERROR - failed to scan (%s)!"
 msgstr ""
 
 msgid "ERROR - failed to scan (%s)!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1096
-#: ../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
 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:1435
+#: ../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/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 ""
 
 msgid "Edit"
 msgstr ""
 
@@ -2703,7 +2704,7 @@ msgid "Edit AutoTimer services"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:376
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:376
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:365
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:376
 msgid "Edit DNS"
 msgstr ""
 
 msgid "Edit DNS"
 msgstr ""
 
@@ -2743,19 +2744,19 @@ msgstr ""
 #: ../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:66
 #: ../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:66
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1313
+#: ../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/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:850
 msgid "Edit settings"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:850
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:818
+#: ../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:846
 msgid "Edit the Nameserver configuration of your Dreambox.\n"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:846
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:814
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:846
 msgid "Edit the network configuration of your Dreambox.\n"
 msgstr ""
 
 msgid "Edit the network configuration of your Dreambox.\n"
 msgstr ""
 
@@ -2764,8 +2765,8 @@ msgstr ""
 msgid "Edit title"
 msgstr ""
 
 msgid "Edit title"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1560
-#: ../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 ""
 
 msgid "Edit upgrade source url."
 msgstr ""
 
@@ -2782,8 +2783,8 @@ msgstr ""
 msgid "Education"
 msgstr ""
 
 msgid "Education"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:848
-#: ../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/data/ ../enigma2_master/data/
 msgid "Electronic Program Guide"
 msgstr ""
@@ -2791,7 +2792,6 @@ msgstr ""
 #: ../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_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
 #: ../enigma2_master/lib/python/Screens/TimerEdit.py:138
 #: ../enigma2_master/lib/python/Screens/TimerEdit.py:408
 #: ../enigma2_master/lib/python/Screens/TimerEdit.py:428
@@ -2803,7 +2803,7 @@ msgid "Enable /media"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:199
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:199
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:198
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:199
 msgid "Enable 5V for active antenna"
 msgstr ""
 
 msgid "Enable 5V for active antenna"
 msgstr ""
 
@@ -2861,7 +2861,7 @@ msgstr ""
 #: ../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_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
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:492
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:128
 #: ../enigma2_plugins/autotimer/src/AutoTimerWizard.py:85
@@ -2875,36 +2875,36 @@ msgid ""
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:276
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:276
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:274
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:276
 msgid "Encrypted: "
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:522
 msgid "Encrypted: "
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:522
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:511
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:522
 msgid "Encryption"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:530
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:533
 msgid "Encryption"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:530
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:533
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:519
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:522
+#: ../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:529
 msgid "Encryption Key"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:529
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:518
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:529
 msgid "Encryption Keytype"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:526
 msgid "Encryption Keytype"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:526
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:515
+#: ../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:81
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:263
 msgid "Encryption Type"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:263
 #: ../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 ""
 
 msgid "Encryption:"
 msgstr ""
 
@@ -2920,12 +2920,12 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:51
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:345
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:51
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:51
 #: ../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:181
 msgid "End time"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:181
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:180
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:181
 msgid "EndTime"
 msgstr ""
 
 msgid "EndTime"
 msgstr ""
 
@@ -2981,7 +2981,7 @@ msgid "Enter share name:"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:198
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:198
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:191
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:198
 msgid "Enter the service pin"
 msgstr ""
 
 msgid "Enter the service pin"
 msgstr ""
 
@@ -2994,8 +2994,8 @@ msgstr ""
 msgid "Enter username:"
 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 ""
 
 msgid "Enter your email address so that we can contact you if needed."
 msgstr ""
 
@@ -3010,14 +3010,14 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Components/Task.py:284
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:224
 
 #: ../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:613
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1399
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1723
-#: ../enigma2_master/lib/python/Components/Task.py:285
+#: ../enigma2_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/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 ""
 
 msgid "Error"
 msgstr ""
 
@@ -3027,7 +3027,7 @@ msgid "Error executing plugin"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Components/Task.py:282
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Components/Task.py:282
-#: ../enigma2_master/lib/python/Components/Task.py:283
+#: ../enigma2_master/lib/python/Components/Task.py:282
 #, python-format
 msgid ""
 "Error: %s\n"
 #, python-format
 msgid ""
 "Error: %s\n"
@@ -3085,8 +3085,7 @@ msgstr ""
 #: ../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_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 ""
 
 msgid "Exit"
 msgstr ""
 
@@ -3097,6 +3096,8 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:60
 #: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:66
 
 #: ../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 ""
 
 msgid "Exit input device selection."
 msgstr ""
 
@@ -3123,41 +3124,41 @@ msgid "Expert"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:908
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:908
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:876
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:908
 msgid "Extended Networksetup Plugin..."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:904
 msgid "Extended Networksetup Plugin..."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:904
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:872
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:904
 msgid "Extended Setup..."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:141
 msgid "Extended Setup..."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:141
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:128
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:141
 msgid "Extended Software"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:145
 msgid "Extended Software"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:145
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:132
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:145
 msgid "Extended Software Plugin"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:574
 msgid "Extended Software Plugin"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:574
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:374
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:574
 msgid "Extensions management"
 msgstr ""
 
 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_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
 #: ../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
@@ -3167,9 +3168,9 @@ msgid "FEC"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Components/Task.py:42
 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/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 ""
 
 msgid "Failed"
 msgstr ""
 
@@ -3191,24 +3192,24 @@ msgstr ""
 msgid "Fan %d Voltage"
 msgstr ""
 
 msgid "Fan %d Voltage"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1098
-#: ../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:312
 msgid "Fast"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:312
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:299
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:312
 msgid "Fast DiSEqC"
 msgstr ""
 
 msgid "Fast DiSEqC"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1098
-#: ../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:711
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:528
 msgid "Fast epoch"
 msgstr ""
 
 #: ../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 ""
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:528
 msgid "Favourites"
 msgstr ""
@@ -3242,12 +3243,12 @@ msgid "Finished"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:218
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:218
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:207
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:218
 msgid "Finished configuring your network"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:975
 msgid "Finished configuring your network"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:975
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:936
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:975
 #: ../enigma2_plugins/networkbrowser/src/MountManager.py:132
 msgid "Finished restarting your network"
 msgstr ""
 #: ../enigma2_plugins/networkbrowser/src/MountManager.py:132
 msgid "Finished restarting your network"
 msgstr ""
@@ -3257,24 +3258,18 @@ msgstr ""
 msgid "Finnish"
 msgstr ""
 
 msgid "Finnish"
 msgstr ""
 
-#: ../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:167
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:167
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:186
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:300
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:167
 msgid "Flash"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:211
 msgid "Flash"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:211
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:296
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:211
 msgid "Flashing failed"
 msgstr ""
 
 msgid "Flashing failed"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:955
-#: ../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 ""
 
 msgid "Following tasks will be done after you press OK!"
 msgstr ""
 
@@ -3309,36 +3304,36 @@ msgstr ""
 #: ../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/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:377
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:407
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:414
+#: ../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_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_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:1391
-#: ../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:182
 msgid "Frequency bands"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:182
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:181
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:182
 msgid "Frequency scan step size(khz)"
 msgstr ""
 
 msgid "Frequency scan step size(khz)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1391
-#: ../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 ""
 
 msgid "Frequency steps"
 msgstr ""
 
@@ -3355,8 +3350,8 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:124
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:167
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:124
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:167
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:123
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:166
+#: ../enigma2_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 ""
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:48
 msgid "Friday"
 msgstr ""
@@ -3393,10 +3388,10 @@ msgstr ""
 #: ../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_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: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_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 ""
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Gateway"
 msgstr ""
@@ -3437,10 +3432,12 @@ msgid "Germany"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:731
 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
 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 ""
 
 msgid "Get latest release image"
 msgstr ""
 
@@ -3490,8 +3487,8 @@ msgstr ""
 msgid "Guard Interval"
 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 ""
 
 msgid "Guard interval mode"
 msgstr ""
 
@@ -3524,7 +3521,7 @@ msgid "Help"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:517
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:517
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:506
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:517
 msgid "Hidden network SSID"
 msgstr ""
 
 msgid "Hidden network SSID"
 msgstr ""
 
@@ -3536,10 +3533,14 @@ msgstr ""
 #: ../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_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:432
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:438
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:440
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:79
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:81
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:441
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:443
+#: ../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 ""
 
 msgid "Hidden networkname"
 msgstr ""
 
@@ -3548,8 +3549,8 @@ msgstr ""
 msgid "Hierarchy Information"
 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 ""
 
 msgid "Hierarchy mode"
 msgstr ""
 
@@ -3578,12 +3579,12 @@ msgid "Horizontal"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1624
 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 ""
 
 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 ""
 
 msgid "How to handle found crashlogs?"
 msgstr ""
 
@@ -3605,9 +3606,9 @@ msgstr ""
 #: ../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_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:353
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:486
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1301
+#: ../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"
 #: ../enigma2_plugins/networkbrowser/src/NetworkBrowser.py:514
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "IP Address"
@@ -3617,8 +3618,8 @@ msgstr ""
 msgid "IP:"
 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 ""
 
 msgid "ISO file is too large for this filesystem!"
 msgstr ""
 
@@ -3662,10 +3663,6 @@ msgid ""
 "If you are happy with the result, press OK."
 msgstr ""
 
 "If you are happy with the result, press OK."
 msgstr ""
 
-#: ../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 ""
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:220
 msgid "Import AutoTimer"
 msgstr ""
@@ -3684,7 +3681,7 @@ msgid "In Progress"
 msgstr ""
 
 #: ../enigma2_experimental/RecordTimer.py:253
 msgstr ""
 
 #: ../enigma2_experimental/RecordTimer.py:253
-#: ../enigma2_master/RecordTimer.py:241
+#: ../enigma2_master/RecordTimer.py:253
 msgid ""
 "In order to record a timer, the TV was switched to the recording service!\n"
 msgstr ""
 msgid ""
 "In order to record a timer, the TV was switched to the recording service!\n"
 msgstr ""
@@ -3695,8 +3692,8 @@ msgstr ""
 msgid "Include"
 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 ""
 
 msgid "Include your email and name (optional) in the mail?"
 msgstr ""
 
@@ -3712,7 +3709,7 @@ msgid "Increase delay by %i ms (can be set)"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:303
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:303
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:290
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:303
 msgid "Increased voltage"
 msgstr ""
 
 msgid "Increased voltage"
 msgstr ""
 
@@ -3753,30 +3750,31 @@ msgid "Input"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:154
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:154
+#: ../enigma2_master/lib/python/Screens/InputDeviceSetup.py:154
 msgid "Input device setup"
 msgstr ""
 
 msgid "Input device setup"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:652
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1190
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1914
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:452
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1001
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1659
+#: ../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 ""
 
 msgid "Install"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1947
-#: ../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:133
 msgid "Install extensions."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:133
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:120
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:133
 msgid "Install local extension"
 msgstr ""
 
 msgid "Install local extension"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:897
-#: ../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 ""
 
 msgid "Install or remove finished."
 msgstr ""
 
@@ -3785,22 +3783,22 @@ msgstr ""
 msgid "Install settings, skins, software..."
 msgstr ""
 
 msgid "Install settings, skins, software..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1256
-#: ../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:94
 msgid "Installation finished."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Ipkg.py:94
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:994
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1354
-#: ../enigma2_master/lib/python/Screens/Ipkg.py:91
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:794
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1157
+#: ../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
 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 ""
 
 msgid "Instant Record..."
 msgstr ""
 
@@ -3809,16 +3807,8 @@ msgstr ""
 msgid "Instant record location"
 msgstr ""
 
 msgid "Instant record location"
 msgstr ""
 
-#: ../enigma2_master/lib/python/Components/Network.py:314
-msgid "Integrated Ethernet"
-msgstr ""
-
-#: ../enigma2_master/lib/python/Components/Network.py:316
-msgid "Integrated Wireless"
-msgstr ""
-
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:276
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:276
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:274
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:276
 msgid "Interface: "
 msgstr ""
 
 msgid "Interface: "
 msgstr ""
 
@@ -3833,6 +3823,7 @@ msgid "Internal Flash"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Components/Network.py:340
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Components/Network.py:340
+#: ../enigma2_master/lib/python/Components/Network.py:340
 msgid "Internal LAN adapter."
 msgstr ""
 
 msgid "Internal LAN adapter."
 msgstr ""
 
@@ -3865,23 +3856,23 @@ msgstr ""
 msgid "Invalid selection"
 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_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_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:1966
-#: ../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 ""
 
 msgid "Ipkg"
 msgstr ""
 
@@ -3934,36 +3925,38 @@ msgid "Key %(key)s (current value: %(value)i ms)"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1319
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1319
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1279
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1319
 msgid "LAN Adapter"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Components/Network.py:326
 #: ../enigma2_experimental/lib/python/Components/Network.py:329
 msgid "LAN Adapter"
 msgstr ""
 
 #: ../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
 msgid "LAN connection"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:244
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:243
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:244
 msgid "LNB"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:249
 msgid "LNB"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:249
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:248
+#: ../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
 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:252
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:264
+#: ../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
 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:251
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:263
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:252
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:264
 msgid "LOF/L"
 msgstr ""
 
 msgid "LOF/L"
 msgstr ""
 
@@ -3981,14 +3974,14 @@ msgid "Last config"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Components/UsageConfig.py:116
 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:334
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:40
 msgid "Last speed"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:40
 #: ../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 ""
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Latitude"
 msgstr ""
@@ -3999,13 +3992,11 @@ msgid "Latvian"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:532
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:532
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:519
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:532
 msgid "Leave DVD Player?"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/VideoEnhancement/VideoEnhancement.py:149
 msgid "Leave DVD Player?"
 msgstr ""
 
 #: ../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 ""
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/VideoEnhancement/VideoEnhancement.py:149
 msgid "Left"
 msgstr ""
@@ -4039,14 +4030,14 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:260
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:78
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:260
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:260
 #: ../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:867
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:146
 msgid "Link Quality:"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:867
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:146
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:835
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:144
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:867
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:146
 msgid "Link:"
 msgstr ""
 
 msgid "Link:"
 msgstr ""
 
@@ -4060,9 +4051,11 @@ msgstr ""
 #: ../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_experimental/lib/python/Components/FileList.py:397
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:561
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:717
-#: ../enigma2_master/lib/python/Components/config.py:1137
+#: ../enigma2_master/lib/python/Components/config.py:1138
 #: ../enigma2_master/lib/python/Components/FileList.py:177
 #: ../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 ""
 
 msgid "List of Storage Devices"
 msgstr ""
 
@@ -4085,7 +4078,7 @@ msgid "Load movie-length"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1328
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1328
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1288
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1328
 msgid "Local Network"
 msgstr ""
 
 msgid "Local Network"
 msgstr ""
 
@@ -4094,7 +4087,7 @@ msgid "Local share name"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:188
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:188
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:187
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:188
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:191
 msgid "Location"
 msgstr ""
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:191
 msgid "Location"
 msgstr ""
@@ -4115,13 +4108,14 @@ msgid "Long Keypress"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Components/RecordingConfig.py:14
 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:332
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:38
 msgid "Long filenames"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:38
 #: ../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 ""
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Longitude"
 msgstr ""
@@ -4159,7 +4153,7 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Screens/PluginBrowser.py:70
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:128
 #: ../enigma2_master/lib/python/Screens/PluginBrowser.py:70
 #: ../enigma2_experimental/lib/python/Screens/PluginBrowser.py:70
 #: ../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 ""
 
 msgid "Manage extensions"
 msgstr ""
 
@@ -4171,10 +4165,10 @@ msgstr ""
 msgid "Manage your network shares..."
 msgstr ""
 
 msgid "Manage your network shares..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1965
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1969
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1710
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1714
+#: ../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 ""
 
 msgid "Manage your receiver's software"
 msgstr ""
 
@@ -4187,8 +4181,8 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:271
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:282
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:271
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:282
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:270
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:281
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:271
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:282
 msgid "Manufacturer"
 msgstr ""
 
 msgid "Manufacturer"
 msgstr ""
 
@@ -4208,7 +4202,7 @@ msgid "Match title: %s"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:276
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:276
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:274
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:276
 msgid "Max. Bitrate: "
 msgstr ""
 
 msgid "Max. Bitrate: "
 msgstr ""
 
@@ -4223,21 +4217,21 @@ msgid ""
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:964
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:964
-#: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:959
+#: ../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
 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/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 ""
 
 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 ""
 
 msgid "Medium is not empty!"
 msgstr ""
 
@@ -4247,6 +4241,7 @@ msgstr ""
 #: ../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_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
 #: ../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
@@ -4269,7 +4264,7 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:110
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/Videomode/plugin.py:62
 
 #: ../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 ""
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/Videomode/plugin.py:62
 msgid "Mode"
 msgstr ""
@@ -4283,15 +4278,15 @@ msgstr ""
 msgid "Modify existing timers"
 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_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
 #: ../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
@@ -4310,14 +4305,14 @@ msgid "Mon"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:109
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:109
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:108
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:109
 msgid "Mon-Fri"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:124
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:163
 msgid "Mon-Fri"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:124
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:163
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:123
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:162
+#: ../enigma2_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 ""
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:44
 msgid "Monday"
 msgstr ""
@@ -4410,7 +4405,7 @@ msgid "Mounts management"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1438
 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 ""
 
 msgid "Move Picture in Picture"
 msgstr ""
 
@@ -4482,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_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 ""
 
 msgid "Multi EPG"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:844
-#: ../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 ""
 
 msgid "Multimedia"
 msgstr ""
 
@@ -4495,8 +4491,8 @@ msgstr ""
 msgid "Multiple service support"
 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 ""
 
 msgid "Multisat"
 msgstr ""
 
@@ -4547,31 +4543,31 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:394
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:398
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:402
 #: ../enigma2_experimental/lib/python/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:688
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:693
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:820
+#: ../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_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:234
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:376
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:380
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:383
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:387
 #: ../enigma2_master/lib/python/Screens/NetworkSetup.py:391
 #: ../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:19
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py:23
 msgid "N/A"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py:19
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py:23
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py:22
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py:26
+#: ../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:202
 msgid "NFI Image Flashing"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:202
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:289
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:202
 msgid "NFI image flashing completed. Press Yellow to Reboot!"
 msgstr ""
 
 msgid "NFI image flashing completed. Press Yellow to Reboot!"
 msgstr ""
 
@@ -4585,37 +4581,37 @@ msgid "NTSC"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:141
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:141
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:140
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:141
 msgid "Name"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1347
 msgid "Name"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1347
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1307
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1347
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Nameserver"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:277
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Nameserver"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:277
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:266
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:277
 #, python-format
 msgid "Nameserver %d"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:886
 #, python-format
 msgid "Nameserver %d"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:886
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:854
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:886
 msgid "Nameserver settings"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:365
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:498
 msgid "Nameserver settings"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:365
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:498
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:354
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:487
+#: ../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/data/ ../enigma2_master/data/
 msgid "Netmask"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:834
-#: ../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 ""
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Network"
 msgstr ""
@@ -4627,8 +4623,8 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:515
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:520
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:515
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:520
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:504
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:509
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:515
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:520
 msgid "Network SSID"
 msgstr ""
 
 msgid "Network SSID"
 msgstr ""
 
@@ -4641,26 +4637,27 @@ msgstr ""
 msgid "Network Wizard"
 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:887
 msgid "Network scan"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:887
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:855
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:887
 msgid "Network test"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1305
 msgid "Network test"
 msgstr ""
 
 #: ../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
 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:361
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:833
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:142
+#: ../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 ""
 
 msgid "Network:"
 msgstr ""
 
@@ -4670,8 +4667,8 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:150
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:913
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:150
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:913
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:139
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:881
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:150
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:913
 msgid "NetworkWizard"
 msgstr ""
 
 msgid "NetworkWizard"
 msgstr ""
 
@@ -4680,22 +4677,22 @@ msgid "Never"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:957
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:957
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:950
+#: ../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/autotimer/src/AutoTimerEditor.py:814
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:1017
 msgid "New"
 msgstr ""
 
+#: ../enigma2_experimental/lib/python/Screens/ParentalControlSetup.py:320
+#: ../enigma2_master/lib/python/Screens/ParentalControlSetup.py:320
+msgid "New PIN"
+msgstr ""
+
 #: ../enigma2_plugins/mytube/src/MyTubeSearch.py:217
 #: ../enigma2_plugins/mytube/src/plugin.py:108
 msgid "New Zealand"
 msgstr ""
 
 #: ../enigma2_plugins/mytube/src/MyTubeSearch.py:217
 #: ../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"
-msgstr ""
-
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/plugin.py:36
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/plugin.py:36
 msgid "New version:"
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/plugin.py:36
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/plugin.py:36
 msgid "New version:"
@@ -4721,8 +4718,8 @@ msgstr ""
 #: ../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/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:176
 #: ../enigma2_plugins/mytube/src/plugin.py:67
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:292
 #: ../enigma2_plugins/mytube/src/MyTubeSearch.py:176
 #: ../enigma2_plugins/mytube/src/plugin.py:67
@@ -4735,46 +4732,44 @@ msgstr ""
 msgid "No"
 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:70
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:425
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:454
 msgid "No (supported) DVDROM found!"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:70
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:425
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:454
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:75
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:437
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:460
+#: ../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
 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:454
 msgid "No HDD found or HDD not initialized!"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:454
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:443
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:454
 msgid "No Networks found"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:2216
 msgid "No Networks found"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:2216
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2330
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2216
 msgid ""
 "No data on transponder!\n"
 "(Timeout reading PAT)"
 msgstr ""
 
 msgid ""
 "No data on transponder!\n"
 "(Timeout reading PAT)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1185
-#: ../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/flasher.py:180
 msgid "No description available."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:180
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:326
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:341
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:197
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:180
 msgid "No details for this image file"
 msgstr ""
 
 msgid "No details for this image file"
 msgstr ""
 
@@ -4784,28 +4779,28 @@ msgid "No displayable files on this medium found!"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1530
 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
 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:2214
 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:2214
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2328
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2214
 msgid "No free tuner!"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:214
 msgid "No free tuner!"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:214
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:635
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:201
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:435
+#: ../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 ""
 
 msgid "No network connection available."
 msgstr ""
 
@@ -4820,8 +4815,8 @@ msgstr ""
 msgid "No networks found"
 msgstr ""
 
 msgid "No networks found"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1396
-#: ../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 ""
 msgid ""
 "No packages were upgraded yet. So you can check your network and try again."
 msgstr ""
@@ -4846,7 +4841,7 @@ msgid "No tags are set on these movies."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:401
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:401
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:389
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:401
 msgid "No to all"
 msgstr ""
 
 msgid "No to all"
 msgstr ""
 
@@ -4855,17 +4850,13 @@ msgstr ""
 msgid "No tuner is configured for use with a diseqc positioner!"
 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 ""
 
 msgid ""
 "No tuner is enabled!\n"
 "Please setup your tuner settings before you start a service scan."
 msgstr ""
 
-#: ../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 ""
 #: ../enigma2_experimental/lib/python/Screens/ParentalControlSetup.py:159
 #: ../enigma2_master/lib/python/Screens/ParentalControlSetup.py:159
 msgid ""
@@ -4887,12 +4878,12 @@ msgid "No videos to display"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:355
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:355
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:353
+#: ../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:33
 msgid "No wireless networks found! Please refresh."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:33
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:58
+#: ../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 "
 msgid ""
 "No working local network adapter found.\n"
 "Please verify that you have attached a network cable and your network is "
@@ -4900,7 +4891,7 @@ msgid ""
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:32
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:32
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:57
+#: ../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 "
 msgid ""
 "No working wireless network adapter found.\n"
 "Please verify that you have attached a compatible WLAN device and your "
@@ -4908,7 +4899,7 @@ msgid ""
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:706
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:706
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:695
+#: ../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 "
 msgid ""
 "No working wireless network interface found.\n"
 " Please verify that you have attached a compatible WLAN device or enable "
@@ -4933,38 +4924,39 @@ msgid "No, but switch to video search."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:52
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:52
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:52
 msgid "No, never"
 msgstr ""
 
 msgid "No, never"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:277
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:277
+#: ../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 ""
 
 msgid "No, not now"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:278
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:278
+#: ../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 ""
 
 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:1082
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1085
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1106
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1108
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1114
+#: ../enigma2_experimental/lib/python/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_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
 #: ../enigma2_master/lib/python/Tools/Transponder.py:14
 #: ../enigma2_master/lib/python/Tools/Transponder.py:61
 #: ../enigma2_master/lib/python/Tools/Transponder.py:107
@@ -4985,8 +4977,8 @@ msgstr ""
 msgid "Nonprofits & Activism"
 msgstr ""
 
 msgid "Nonprofits & Activism"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1097
-#: ../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 ""
 
 msgid "North"
 msgstr ""
 
@@ -4996,7 +4988,7 @@ msgid "Norwegian"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Components/Task.py:368
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Components/Task.py:368
-#: ../enigma2_master/lib/python/Components/Task.py:369
+#: ../enigma2_master/lib/python/Components/Task.py:368
 #, python-format
 msgid ""
 "Not enough diskspace. Please free up some diskspace and try again. (%d MB "
 #, python-format
 msgid ""
 "Not enough diskspace. Please free up some diskspace and try again. (%d MB "
@@ -5007,17 +4999,17 @@ msgstr ""
 msgid "Not fetching feed entries"
 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_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"
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/plugin.py:90
 msgid ""
 "Nothing to scan!\n"
@@ -5055,12 +5047,13 @@ msgstr ""
 #: ../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_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/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
 #: ../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
@@ -5068,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/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
 #: ../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
@@ -5099,15 +5093,13 @@ msgstr ""
 msgid "OSD visibility"
 msgstr ""
 
 msgid "OSD visibility"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1105
+#: ../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_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
 #: ../enigma2_master/lib/python/Tools/Transponder.py:12
 #: ../enigma2_master/lib/python/Tools/Transponder.py:46
 #: ../enigma2_master/lib/python/Tools/Transponder.py:59
@@ -5124,14 +5116,12 @@ msgstr ""
 msgid "Offset before recording (in m)"
 msgstr ""
 
 msgid "Offset before recording (in m)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1105
+#: ../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_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
 #: ../enigma2_master/lib/python/Tools/Transponder.py:11
 #: ../enigma2_master/lib/python/Tools/Transponder.py:45
 #: ../enigma2_master/lib/python/Tools/Transponder.py:58
@@ -5147,8 +5137,8 @@ msgstr ""
 msgid "On same service"
 msgstr ""
 
 msgid "On same service"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1114
-#: ../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 ""
 
 msgid "One"
 msgstr ""
 
@@ -5156,13 +5146,13 @@ msgstr ""
 msgid "Only AutoTimers created during this session"
 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 ""
 
 msgid "Only Free scan"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:954
-#: ../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 ""
 
 msgid "Only extensions."
 msgstr ""
 
@@ -5184,8 +5174,8 @@ msgstr ""
 msgid "Open plugin menu"
 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 ""
 
 msgid "Optionally enter your name if you want to."
 msgstr ""
 
@@ -5203,10 +5193,12 @@ msgid "Override found with alternative service"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:365
 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
 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 ""
 
 msgid "Overwrite configuration files during software upgrade?"
 msgstr ""
 
@@ -5221,30 +5213,24 @@ msgid "PIDs"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:610
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:610
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1326
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1719
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:410
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1131
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1464
+#: ../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:154
 msgid "Package list update"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:154
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:141
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:154
 msgid "Packet management"
 msgstr ""
 
 msgid "Packet management"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1711
-#: ../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 ""
 
 msgid "Packet manager"
 msgstr ""
 
-#: ../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
 #. 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
@@ -5256,12 +5242,12 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Components/FileList.py:179
 #: ../enigma2_experimental/lib/python/Components/FileList.py:399
 #: ../enigma2_master/lib/python/Components/FileList.py:179
 #: ../enigma2_experimental/lib/python/Components/FileList.py:179
 #: ../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 ""
 
 msgid "Parent Directory"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:109
-#: ../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 ""
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Parental control"
 msgstr ""
@@ -5318,11 +5304,11 @@ msgstr ""
 msgid "Pillarbox"
 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_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
 #: ../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
@@ -5330,26 +5316,26 @@ msgid "Pilot"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Components/UsageConfig.py:114
 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:1034
 #: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:490
 msgid "Play"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:490
 #: ../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:531
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:756
 msgid "Play Audio-CD..."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:531
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:756
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:518
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:743
+#: ../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:1022
 msgid "Play DVD"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:1022
-#: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:1017
+#: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:1022
 msgid "Play Music..."
 msgstr ""
 
 msgid "Play Music..."
 msgstr ""
 
@@ -5388,23 +5374,19 @@ msgid "Please add titles to the compilation."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1609
 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:646
 msgid "Please change recording endtime"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:646
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:277
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:646
 msgid "Please check your network settings!"
 msgstr ""
 
 msgid "Please check your network settings!"
 msgstr ""
 
-#: ../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_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 ""
 
 msgid "Please choose an extension..."
 msgstr ""
 
@@ -5413,24 +5395,18 @@ msgstr ""
 msgid "Please choose he package..."
 msgstr ""
 
 msgid "Please choose he package..."
 msgstr ""
 
-#: ../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:186
 #: ../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:186
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:179
+#: ../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:260
 msgid "Please enter a name for the new bouquet"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:260
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:253
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:260
 msgid "Please enter a name for the new marker"
 msgstr ""
 
 msgid "Please enter a name for the new marker"
 msgstr ""
 
@@ -5456,16 +5432,16 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ParentalControlSetup.py:348
 #: ../enigma2_master/lib/python/Screens/ParentalControlSetup.py:348
 
 #: ../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 ""
 
 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 ""
 
 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 ""
 
 msgid "Please enter your name here (optional):"
 msgstr ""
 
@@ -5474,15 +5450,15 @@ msgid "Please enter your search term."
 msgstr ""
 
 #: ../enigma2_experimental/RecordTimer.py:383
 msgstr ""
 
 #: ../enigma2_experimental/RecordTimer.py:383
-#: ../enigma2_master/RecordTimer.py:371
+#: ../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 ""
 
 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_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 ""
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:264
 msgid "Please press OK to continue."
 msgstr ""
@@ -5496,12 +5472,6 @@ msgstr ""
 msgid "Please provide a Text to match"
 msgstr ""
 
 msgid "Please provide a Text to match"
 msgstr ""
 
-#: ../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..."
 #: ../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..."
@@ -5517,18 +5487,19 @@ msgid "Please select a standard feed or try searching for videos."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:350
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:350
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:334
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:350
 msgid "Please select a subservice to record..."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1769
 #: ../enigma2_experimental/lib/python/Screens/SubservicesQuickzap.py:116
 msgid "Please select a subservice to record..."
 msgstr ""
 
 #: ../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/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 ""
 
 msgid "Please select an NFI file and press green key to flash!"
 msgstr ""
 
@@ -5540,7 +5511,7 @@ msgid "Please select an option below."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:268
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:268
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:247
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:268
 msgid "Please select medium to use as backup location"
 msgstr ""
 
 msgid "Please select medium to use as backup location"
 msgstr ""
 
@@ -5549,10 +5520,6 @@ msgstr ""
 msgid "Please select tag to filter..."
 msgstr ""
 
 msgid "Please select tag to filter..."
 msgstr ""
 
-#: ../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..."
 #: ../enigma2_experimental/lib/python/Screens/MovieSelection.py:373
 #: ../enigma2_master/lib/python/Screens/MovieSelection.py:373
 msgid "Please select the movie path..."
@@ -5578,7 +5545,7 @@ msgid "Please wait (Step 2)"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:617
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:617
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:606
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:617
 msgid "Please wait for activation of your network configuration..."
 msgstr ""
 
 msgid "Please wait for activation of your network configuration..."
 msgstr ""
 
@@ -5610,7 +5577,7 @@ msgid "Please wait while updating your network mount..."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:205
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:205
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:194
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:205
 msgid "Please wait while we configure your network..."
 msgstr ""
 
 msgid "Please wait while we configure your network..."
 msgstr ""
 
@@ -5627,7 +5594,7 @@ msgid "Please wait while we test your network..."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:962
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:962
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:923
+#: ../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_plugins/networkbrowser/src/MountManager.py:119
 msgid "Please wait while your network is restarting..."
 msgstr ""
@@ -5641,15 +5608,15 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:141
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:142
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:143
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:141
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:142
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:143
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1160
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1183
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1190
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:136
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:137
+#: ../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: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 ""
 
 msgid "Please wait..."
 msgstr ""
 
@@ -5658,16 +5625,17 @@ msgstr ""
 #: ../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_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 ""
 
 msgid "Please wait... Loading list..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:961
-#: ../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 ""
 
 msgid "Plugin manager activity information"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1058
-#: ../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 ""
 
 msgid "Plugin manager help"
 msgstr ""
 
@@ -5681,19 +5649,19 @@ msgstr ""
 msgid "Poland"
 msgstr ""
 
 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_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_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:1104
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1171
 #: ../enigma2_master/lib/python/Screens/ServiceInfo.py:141
 #: ../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 ""
 
 msgid "Polarization"
 msgstr ""
 
@@ -5736,9 +5704,9 @@ msgid "Portuguese"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:535
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:535
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1090
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:521
-#: ../enigma2_master/lib/python/Components/NimManager.py:1063
+#: ../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 ""
 
 msgid "Positioner"
 msgstr ""
 
@@ -5773,7 +5741,7 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:46
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:340
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:46
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:46
 #: ../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 ""
 
 msgid "Power threshold in mA"
 msgstr ""
 
@@ -5785,6 +5753,7 @@ msgid "Predefined transponder"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:736
 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 ""
 
 msgid "Prepare another USB stick for image flashing"
 msgstr ""
 
@@ -5794,20 +5763,23 @@ msgid "Preparing... Please wait"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:123
 msgstr ""
 
 #: ../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
 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
 msgid "Press MENU on your remote control for additional options."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:34
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:330
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:704
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1311
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:59
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:319
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:693
+#: ../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 ""
 
 msgid "Press OK on your remote control to continue."
 msgstr ""
 
@@ -5818,8 +5790,8 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:243
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:374
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:243
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:374
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:232
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:363
+#: ../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 ""
 #: ../enigma2_plugins/networkbrowser/src/MountEdit.py:64
 msgid "Press OK to activate the settings."
 msgstr ""
@@ -5834,7 +5806,8 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:47
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:35
 
 #: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:47
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:35
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:60
+#: ../enigma2_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 ""
 #: ../enigma2_plugins/networkbrowser/src/MountView.py:62
 msgid "Press OK to edit the settings."
 msgstr ""
@@ -5861,8 +5834,8 @@ msgstr ""
 msgid "Press OK to save settings."
 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 ""
 
 msgid "Press OK to scan"
 msgstr ""
 
@@ -5882,22 +5855,18 @@ msgstr ""
 msgid "Press OK to select/deselect a CAId."
 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 ""
 
 msgid "Press OK to start the scan"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1915
-#: ../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 ""
 
 msgid "Press OK to toggle the selection."
 msgstr ""
 
-#: ../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:36
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:36
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:61
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:36
 msgid "Press yellow to set this interface as default interface."
 msgstr ""
 
 msgid "Press yellow to set this interface as default interface."
 msgstr ""
 
@@ -5920,17 +5889,17 @@ msgid "Preview menu"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:358
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:358
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:347
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:358
 msgid "Primary DNS"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:248
 msgid "Primary DNS"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:248
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:247
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:248
 msgid "Priority"
 msgstr ""
 
 msgid "Priority"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:675
-#: ../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 ""
 
 msgid "Process"
 msgstr ""
 
@@ -5953,21 +5922,21 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:710
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:846
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:710
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:846
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1393
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:703
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:839
-#: ../enigma2_master/lib/python/Components/NimManager.py:1353
+#: ../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:166
 msgid "Provider"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:166
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:165
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:166
 msgid "Provider to scan"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:955
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:470
 msgid "Provider to scan"
 msgstr ""
 
 #: ../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_master/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:470
 msgid "Providers"
 msgstr ""
@@ -5990,9 +5959,9 @@ msgstr ""
 #: ../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_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:1874
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1876
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1879
+#: ../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 ""
 
 msgid "Quickzap"
 msgstr ""
 
@@ -6003,6 +5972,8 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Components/Network.py:352
 #: ../enigma2_experimental/lib/python/Components/Network.py:354
 
 #: ../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 ""
 
 msgid "Ralink"
 msgstr ""
 
@@ -6029,13 +6000,15 @@ msgstr ""
 #: ../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/Screens/NetworkSetup.py:652
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:440
 #: ../enigma2_experimental/lib/python/Components/ConfigList.py:237
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:221
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/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_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
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py:174
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:627
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:957
@@ -6060,22 +6033,22 @@ msgid "Really quit MyTube Player?"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Standby.py:130
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Standby.py:130
-#: ../enigma2_master/lib/python/Screens/Standby.py:126
+#: ../enigma2_master/lib/python/Screens/Standby.py:130
 msgid "Really reboot now?"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Standby.py:134
 msgid "Really reboot now?"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Standby.py:134
-#: ../enigma2_master/lib/python/Screens/Standby.py:130
+#: ../enigma2_master/lib/python/Screens/Standby.py:134
 msgid "Really restart now?"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Standby.py:128
 msgid "Really restart now?"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Standby.py:128
-#: ../enigma2_master/lib/python/Screens/Standby.py:124
+#: ../enigma2_master/lib/python/Screens/Standby.py:128
 msgid "Really shutdown now?"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:223
 msgid "Really shutdown now?"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:223
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:292
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:223
 msgid "Reboot"
 msgstr ""
 
 msgid "Reboot"
 msgstr ""
 
@@ -6101,7 +6074,7 @@ msgid "Record on"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1553
 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 ""
 #, python-format
 msgid "Record time limited due to conflicting timer %s"
 msgstr ""
@@ -6117,18 +6090,18 @@ msgid "Recording"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Standby.py:119
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Standby.py:119
-#: ../enigma2_master/lib/python/Screens/Standby.py:115
+#: ../enigma2_master/lib/python/Screens/Standby.py:119
 msgid "Recording(s) are in progress or coming up in few seconds!"
 msgstr ""
 
 msgid "Recording(s) are in progress or coming up in few seconds!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:832
-#: ../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 "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
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/Videomode/plugin.py:66
@@ -6145,8 +6118,8 @@ msgstr ""
 msgid "Relevance"
 msgstr ""
 
 msgid "Relevance"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1646
-#: ../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 ""
 
 msgid "Reload"
 msgstr ""
 
@@ -6157,16 +6130,16 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ParentalControlSetup.py:93
 #: ../enigma2_master/lib/python/Screens/ParentalControlSetup.py:93
 
 #: ../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
 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 ""
 
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1192
-#: ../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 ""
 
 msgid "Remove"
 msgstr ""
 
@@ -6192,10 +6165,10 @@ msgstr ""
 msgid "Remove currently selected title"
 msgstr ""
 
 msgid "Remove currently selected title"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1271
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1763
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1078
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1508
+#: ../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 ""
 
 msgid "Remove finished."
 msgstr ""
 
@@ -6208,14 +6181,6 @@ msgstr ""
 msgid "Remove selected AutoTimer"
 msgstr ""
 
 msgid "Remove selected AutoTimer"
 msgstr ""
 
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:419
-msgid "Remove the broken .NFI file?"
-msgstr ""
-
-#: ../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
 #: ../enigma2_experimental/lib/python/Screens/EpgSelection.py:254
 #: ../enigma2_experimental/lib/python/Screens/EpgSelection.py:370
 #: ../enigma2_experimental/lib/python/Screens/EventView.py:104
@@ -6239,10 +6204,11 @@ msgid "Remove title"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Ipkg.py:100
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Ipkg.py:100
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:996
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1360
-#: ../enigma2_master/lib/python/Screens/Ipkg.py:95
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:796
+#: ../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 ""
 
 msgid "Removing"
 msgstr ""
 
@@ -6257,13 +6223,13 @@ msgstr ""
 msgid "Rename"
 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:145
 msgid "Rename crashlogs"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:145
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:144
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:145
 msgid "Repeat Type"
 msgstr ""
 
 msgid "Repeat Type"
 msgstr ""
 
@@ -6273,7 +6239,7 @@ msgid "Repeating event currently recording... What do you want to do?"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:151
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:151
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:150
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:151
 msgid "Repeats"
 msgstr ""
 
 msgid "Repeats"
 msgstr ""
 
@@ -6335,19 +6301,19 @@ msgid "Restart GUI now?"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:888
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:888
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:856
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:888
 msgid "Restart network"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1299
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1422
 msgid "Restart network"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1299
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1422
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1260
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1382
+#: ../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:856
 msgid "Restart test"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:856
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:824
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:856
 msgid "Restart your network connection and interfaces.\n"
 msgstr ""
 
 msgid "Restart your network connection and interfaces.\n"
 msgstr ""
 
@@ -6365,19 +6331,20 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:312
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:320
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:322
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:312
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:320
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:322
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:310
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:318
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/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: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:264
 msgid "Restore is running..."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:264
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:263
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:264
 msgid "Restore running"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:132
 msgid "Restore running"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:132
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:119
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:132
 msgid "Restore system settings"
 msgstr ""
 
 msgid "Restore system settings"
 msgstr ""
 
@@ -6391,7 +6358,7 @@ msgid "Resume from last position"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1912
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1912
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2026
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1912
 #, python-format
 msgid "Resume position at %s"
 msgstr ""
 #, python-format
 msgid "Resume position at %s"
 msgstr ""
@@ -6404,12 +6371,12 @@ msgstr ""
 #. 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:1921
 #. 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:1921
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2035
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1921
 msgid "Resuming playback"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:527
 msgid "Resuming playback"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:527
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:514
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:527
 msgid "Return to file browser"
 msgstr ""
 
 msgid "Return to file browser"
 msgstr ""
 
@@ -6432,17 +6399,15 @@ msgid "Return to previous service"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/VideoEnhancement/VideoEnhancement.py:150
 msgstr ""
 
 #: ../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_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_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
 #: ../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
@@ -6452,13 +6417,14 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:47
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:341
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:47
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:47
 #: ../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/AudioSelection.py:95
 #: ../enigma2_experimental/lib/python/Screens/AudioSelection.py:141
 msgid "Rotor turning speed"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/AudioSelection.py:95
 #: ../enigma2_experimental/lib/python/Screens/AudioSelection.py:141
-#: ../enigma2_master/lib/python/Screens/Subtitles.py:43
+#: ../enigma2_master/lib/python/Screens/AudioSelection.py:95
+#: ../enigma2_master/lib/python/Screens/AudioSelection.py:141
 msgid "Running"
 msgstr ""
 
 msgid "Running"
 msgstr ""
 
@@ -6485,7 +6451,7 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:259
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:77
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:259
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:259
 #: ../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 ""
 
 msgid "SSID:"
 msgstr ""
 
@@ -6503,17 +6469,17 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:22
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:147
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:363
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:22
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:147
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:363
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:376
-#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:392
+#: ../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_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
 #: ../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
@@ -6528,15 +6494,15 @@ msgstr ""
 msgid "Satellite Equipment Setup"
 msgstr ""
 
 msgid "Satellite Equipment Setup"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:840
-#: ../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:709
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:848
 msgid "Satellite equipment"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:709
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:848
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:702
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:841
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:709
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:848
 msgid "Satellites"
 msgstr ""
 
 msgid "Satellites"
 msgstr ""
 
@@ -6549,7 +6515,7 @@ msgid "Satfinder"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:516
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:516
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:502
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:516
 msgid "Sats"
 msgstr ""
 
 msgid "Sats"
 msgstr ""
 
@@ -6560,8 +6526,8 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:124
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:168
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:124
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:168
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:123
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:167
+#: ../enigma2_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 ""
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:49
 msgid "Saturday"
 msgstr ""
@@ -6573,19 +6539,19 @@ msgstr ""
 #: ../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/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/BackupRestore.py:116
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1522
+#: ../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/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/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/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/ac3lipsync/src/AC3setup.py:64
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:812
 #: ../enigma2_plugins/autotimer/src/AutoTimerOverview.py:74
@@ -6628,8 +6594,8 @@ msgstr ""
 msgid "Scaling Mode"
 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 ""
 
 msgid "Scan "
 msgstr ""
 
@@ -6643,109 +6609,109 @@ msgid "Scan NFS share"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:186
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:186
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:185
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:186
 msgid "Scan QAM128"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:183
 msgid "Scan QAM128"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:183
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:182
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:183
 msgid "Scan QAM16"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:187
 msgid "Scan QAM16"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:187
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:186
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:187
 msgid "Scan QAM256"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:184
 msgid "Scan QAM256"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:184
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:183
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:184
 msgid "Scan QAM32"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:185
 msgid "Scan QAM32"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:185
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:184
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:185
 msgid "Scan QAM64"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:189
 msgid "Scan QAM64"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:189
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:188
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:189
 msgid "Scan SR6875"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:188
 msgid "Scan SR6875"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:188
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:187
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:188
 msgid "Scan SR6900"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:897
 msgid "Scan SR6900"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:897
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:865
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:897
 msgid "Scan Wireless Networks"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:190
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:191
 msgid "Scan Wireless Networks"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:190
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:191
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:189
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:190
 #: ../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:175
 msgid "Scan additional SR"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:175
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:174
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:175
 msgid "Scan band EU HYPER"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:170
 msgid "Scan band EU HYPER"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:170
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:169
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:170
 msgid "Scan band EU MID"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:174
 msgid "Scan band EU MID"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:174
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:173
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:174
 msgid "Scan band EU SUPER"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:172
 msgid "Scan band EU SUPER"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:172
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:171
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:172
 msgid "Scan band EU UHF IV"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:173
 msgid "Scan band EU UHF IV"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:173
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:172
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:173
 msgid "Scan band EU UHF V"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:169
 msgid "Scan band EU UHF V"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:169
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:168
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:169
 msgid "Scan band EU VHF I"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:171
 msgid "Scan band EU VHF I"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:171
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:170
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:171
 msgid "Scan band EU VHF III"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:178
 msgid "Scan band EU VHF III"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:178
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:177
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:178
 msgid "Scan band US HIGH"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:180
 msgid "Scan band US HIGH"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:180
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:179
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:180
 msgid "Scan band US HYPER"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:176
 msgid "Scan band US HYPER"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:176
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:175
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:176
 msgid "Scan band US LOW"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:177
 msgid "Scan band US LOW"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:177
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:176
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:177
 msgid "Scan band US MID"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:179
 msgid "Scan band US MID"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:179
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:178
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:179
 msgid "Scan band US SUPER"
 msgstr ""
 
 msgid "Scan band US SUPER"
 msgstr ""
 
@@ -6753,13 +6719,8 @@ msgstr ""
 msgid "Scan range"
 msgstr ""
 
 msgid "Scan range"
 msgstr ""
 
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:820
-msgid ""
-"Scan your network for wireless Access Points and connect to them using your "
-"selected wireless device.\n"
-msgstr ""
-
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:852
 #: ../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 "
 "selected wireless device.\n"
 msgid ""
 "Scan your network for wireless access points and connect to them using your "
 "selected wireless device.\n"
@@ -6819,12 +6780,12 @@ msgid "Search west"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:607
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:607
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:407
+#: ../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:610
 msgid "Searching for available updates. Please wait..."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:610
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:410
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:610
 msgid "Searching for new installed or removed packages. Please wait..."
 msgstr ""
 
 msgid "Searching for new installed or removed packages. Please wait..."
 msgstr ""
 
@@ -6833,7 +6794,7 @@ msgid "Searching your network. Please wait..."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:359
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:359
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:348
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:359
 msgid "Secondary DNS"
 msgstr ""
 
 msgid "Secondary DNS"
 msgstr ""
 
@@ -6844,7 +6805,8 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:50
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:40
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:155
 #: ../enigma2_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 ""
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:155
 msgid "Select"
 msgstr ""
@@ -6864,12 +6826,8 @@ msgstr ""
 msgid "Select a timer to import"
 msgstr ""
 
 msgid "Select a timer to import"
 msgstr ""
 
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1782
-msgid "Select audio mode"
-msgstr ""
-
 #: ../enigma2_experimental/lib/python/Screens/AudioSelection.py:71
 #: ../enigma2_experimental/lib/python/Screens/AudioSelection.py:71
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1758
+#: ../enigma2_master/lib/python/Screens/AudioSelection.py:71
 msgid "Select audio track"
 msgstr ""
 
 msgid "Select audio track"
 msgstr ""
 
@@ -6879,7 +6837,8 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:225
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:272
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:225
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:272
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:224
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:225
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:272
 msgid "Select channel to record from"
 msgstr ""
 
 msgid "Select channel to record from"
 msgstr ""
 
@@ -6888,33 +6847,29 @@ msgid "Select channel to record on"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:735
 msgstr ""
 
 #: ../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
 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 ""
 
 msgid "Select files for backup."
 msgstr ""
 
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:139
-msgid "Select files for backup. Currently selected:\n"
-msgstr ""
-
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:148
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:148
 msgid "Select files/folders to backup"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:148
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:148
 msgid "Select files/folders to backup"
 msgstr ""
 
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:189
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:213
-msgid "Select image"
-msgstr ""
-
 #: ../enigma2_experimental/lib/python/Screens/InputDeviceSetup.py:78
 #: ../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
 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 ""
 
 msgid "Select input device."
 msgstr ""
 
@@ -6945,8 +6900,8 @@ msgstr ""
 msgid "Select type of Filter"
 msgstr ""
 
 msgid "Select type of Filter"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1464
-#: ../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 ""
 
 msgid "Select upgrade source to edit."
 msgstr ""
 
@@ -6959,10 +6914,6 @@ msgstr ""
 msgid "Select your choice."
 msgstr ""
 
 msgid "Select your choice."
 msgstr ""
 
-#: ../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"
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:23
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:23
 msgid "Send DiSEqC"
@@ -6979,7 +6930,7 @@ msgid "Seperate titles with a main menu"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:313
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:313
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:300
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:313
 msgid "Sequence repeat"
 msgstr ""
 
 msgid "Sequence repeat"
 msgstr ""
 
@@ -7001,31 +6952,31 @@ msgid "Service delay"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1793
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1793
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1907
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1793
 msgid "Service has been added to the favourites."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1799
 msgid "Service has been added to the favourites."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1799
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1913
+#: ../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:2218
 msgid "Service has been added to the selected bouquet."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:2218
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2332
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2218
 msgid ""
 "Service invalid!\n"
 "(Timeout reading PMT)"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:2217
 msgid ""
 "Service invalid!\n"
 "(Timeout reading PMT)"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:2217
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2331
+#: ../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:2223
 msgid ""
 "Service not found!\n"
 "(SID not found in PAT)"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:2223
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2337
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2223
 msgid ""
 "Service unavailable!\n"
 "Check tuner configuration!"
 msgid ""
 "Service unavailable!\n"
 "Check tuner configuration!"
@@ -7038,12 +6989,12 @@ msgid "Serviceinfo"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:959
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:959
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:952
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:959
 msgid "Services"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:178
 msgid "Services"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:178
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:177
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:178
 msgid "Set End Time"
 msgstr ""
 
 msgid "Set End Time"
 msgstr ""
 
@@ -7066,7 +7017,7 @@ msgid "Set delay to %i ms (can be set)"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:65
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:65
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:90
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:65
 msgid "Set interface as default Interface"
 msgstr ""
 
 msgid "Set interface as default Interface"
 msgstr ""
 
@@ -7108,7 +7059,7 @@ msgid "Setup for the Audio Sync Plugin"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:151
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:151
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:239
+#: ../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 "
 #, python-format
 msgid ""
 "Shall the USB stick wizard proceed and program the image file %s into flash "
@@ -7126,6 +7077,7 @@ msgid "Short Movies"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Components/RecordingConfig.py:13
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Components/RecordingConfig.py:13
+#: ../enigma2_master/lib/python/Components/RecordingConfig.py:13
 msgid "Short filenames"
 msgstr ""
 
 msgid "Short filenames"
 msgstr ""
 
@@ -7147,16 +7099,16 @@ msgstr ""
 #: ../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_experimental/lib/python/Screens/NetworkSetup.py:1338
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1344
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1350
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1282
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1292
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1298
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1304
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1310
+#: ../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:899
 msgid "Show Info"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:899
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:867
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:899
 msgid "Show WLAN Status"
 msgstr ""
 
 msgid "Show WLAN Status"
 msgstr ""
 
@@ -7180,7 +7132,7 @@ msgid "Show the tv player..."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:854
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:854
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:822
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:854
 msgid "Shows the state of your wireless LAN connection.\n"
 msgstr ""
 
 msgid "Shows the state of your wireless LAN connection.\n"
 msgstr ""
 
@@ -7198,12 +7150,12 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:261
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:79
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:261
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py:261
 #: ../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:276
 msgid "Signal Strength:"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:276
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:274
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:276
 msgid "Signal: "
 msgstr ""
 
 msgid "Signal: "
 msgstr ""
 
@@ -7228,9 +7180,9 @@ msgid "Simple titleset (compatibility for legacy players)"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:515
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:515
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1088
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:501
-#: ../enigma2_master/lib/python/Components/NimManager.py:1061
+#: ../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 ""
 
 msgid "Single"
 msgstr ""
 
@@ -7239,22 +7191,22 @@ msgstr ""
 msgid "Single EPG"
 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 ""
 
 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
 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 ""
 
 msgid "Singlestep (GOP)"
 msgstr ""
 
@@ -7263,8 +7215,8 @@ msgstr ""
 msgid "Skin"
 msgstr ""
 
 msgid "Skin"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:830
-#: ../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 ""
 
 msgid "Skins"
 msgstr ""
 
@@ -7304,42 +7256,44 @@ msgstr ""
 msgid "Slovenian"
 msgstr ""
 
 msgid "Slovenian"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1098
-#: ../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 ""
 
 msgid "Slow"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:842
-#: ../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:193
 msgid "Software"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:193
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1958
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1965
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1969
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:180
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1703
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1710
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1714
+#: ../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:339
 msgid "Software management"
 msgstr ""
 
 #: ../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
 msgid "Software manager setup"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:130
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:117
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:130
 msgid "Software restore"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:129
 msgid "Software restore"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:129
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:116
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:129
 msgid "Software update"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:480
 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 ""
 
 msgid "Softwaremanager information"
 msgstr ""
 
@@ -7349,12 +7303,12 @@ msgid "Some plugins are not available:\n"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:250
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:250
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:229
+#: ../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:244
 msgid "Sorry MediaScanner is not installed!"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:244
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:223
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:244
 msgid "Sorry no backups found!"
 msgstr ""
 
 msgid "Sorry no backups found!"
 msgstr ""
 
@@ -7367,8 +7321,8 @@ msgid ""
 "Please choose an other one."
 msgstr ""
 
 "Please choose an other one."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:731
-#: ../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 ""
 
 msgid "Sorry, no Details available!"
 msgstr ""
 
@@ -7377,7 +7331,7 @@ msgid "Sorry, video is not available!"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:301
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:301
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:280
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:301
 msgid ""
 "Sorry, your backup destination is not writeable.\n"
 "\n"
 msgid ""
 "Sorry, your backup destination is not writeable.\n"
 "\n"
@@ -7401,8 +7355,8 @@ msgstr ""
 msgid "Sort Time"
 msgstr ""
 
 msgid "Sort Time"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1097
-#: ../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 ""
 
 msgid "South"
 msgstr ""
 
@@ -7435,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_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/data/ ../enigma2_master/data/
 msgid "Standby"
 msgstr ""
 
-#: ../enigma2_experimental/mytest.py:384 ../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 ""
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Standby / Restart"
 msgstr ""
@@ -7466,12 +7422,12 @@ msgid "Start from the beginning"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1659
 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:1357
 msgid "Start recording?"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1357
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1317
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1357
 msgid "Start test"
 msgstr ""
 
 msgid "Start test"
 msgstr ""
 
@@ -7480,12 +7436,12 @@ msgid "Start with following feed:"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:175
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:175
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:174
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:175
 msgid "StartTime"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:153
 msgid "StartTime"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:153
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:152
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:153
 msgid "Starting on"
 msgstr ""
 
 msgid "Starting on"
 msgstr ""
 
@@ -7521,11 +7477,6 @@ msgstr ""
 msgid "Step west"
 msgstr ""
 
 msgid "Step west"
 msgstr ""
 
-#: ../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
 #: ../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
@@ -7538,7 +7489,7 @@ msgid "Stop"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1233
 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 ""
 
 msgid "Stop Timeshift?"
 msgstr ""
 
@@ -7560,8 +7511,8 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1186
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1358
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1186
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1358
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1147
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1318
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1186
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1358
 msgid "Stop test"
 msgstr ""
 
 msgid "Stop test"
 msgstr ""
 
@@ -7581,29 +7532,26 @@ msgid "Store position"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:355
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:355
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:342
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:355
 msgid "Stored position"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1686
 msgid "Stored position"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1686
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1800
+#: ../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
 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_master/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:173
-#: ../enigma2_master/data/
 msgid "Subtitle selection"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/AudioSelection.py:52
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:159
 msgid "Subtitle selection"
 msgstr ""
 
 #: ../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_master/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:159
-#: ../enigma2_master/data/
 msgid "Subtitles"
 msgstr ""
 
 msgid "Subtitles"
 msgstr ""
 
@@ -7620,14 +7568,14 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:124
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:169
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:124
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:169
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:123
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:168
+#: ../enigma2_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_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 ""
 
 msgid "Swap Services"
 msgstr ""
 
@@ -7642,26 +7590,26 @@ msgid "Swedish"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1691
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1691
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1805
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1691
 msgid "Switch to next subservice"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1692
 msgid "Switch to next subservice"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1692
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1806
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1692
 msgid "Switch to previous subservice"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:550
 msgid "Switch to previous subservice"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:550
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:536
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:550
 msgid "Switchable tuner types:"
 msgstr ""
 
 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_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"
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:444
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:82
 msgid "Symbol Rate"
@@ -7672,16 +7620,16 @@ msgstr ""
 msgid "Symbolrate"
 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/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:828
-#: ../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/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 ""
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "System"
 msgstr ""
@@ -7692,8 +7640,8 @@ msgstr ""
 msgid "TRANSLATOR_INFO"
 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 ""
 
 msgid "TS file is too large for ISO9660 level 1!"
 msgstr ""
 
@@ -7715,7 +7663,7 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Screens/MovieSelection.py:334
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:189
 #: ../enigma2_master/lib/python/Screens/MovieSelection.py:334
 #: ../enigma2_experimental/lib/python/Screens/MovieSelection.py:334
 #: ../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"
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:556
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:200
 msgid "Tags"
@@ -7734,10 +7682,10 @@ msgstr ""
 msgid "Taiwan"
 msgstr ""
 
 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 ""
 
 msgid "Temperature and Fan control"
 msgstr ""
 
@@ -7745,7 +7693,7 @@ msgstr ""
 #: ../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_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
 #: ../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
@@ -7753,7 +7701,7 @@ msgid "Terrestrial"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:198
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:198
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:197
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:198
 msgid "Terrestrial provider"
 msgstr ""
 
 msgid "Terrestrial provider"
 msgstr ""
 
@@ -7772,7 +7720,7 @@ msgid "Test again"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:848
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:848
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:816
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:848
 msgid "Test the network configuration of your Dreambox.\n"
 msgstr ""
 
 msgid "Test the network configuration of your Dreambox.\n"
 msgstr ""
 
@@ -7790,12 +7738,22 @@ msgid ""
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:225
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:225
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:214
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:225
 msgid ""
 "The NetworkWizard extension is not installed!\n"
 "Please install it."
 msgstr ""
 
 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 ""
 #: ../enigma2_experimental/lib/python/Screens/PluginBrowser.py:95
 #: ../enigma2_master/lib/python/Screens/PluginBrowser.py:95
 msgid ""
@@ -7803,13 +7761,8 @@ msgid ""
 "Please install it."
 msgstr ""
 
 "Please install it."
 msgstr ""
 
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:604
-msgid ""
-"The USB stick is now bootable. Do you want to download the latest image from "
-"the feed server and save it on the stick?"
-msgstr ""
-
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:601
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:601
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:601
 msgid ""
 "The USB stick was prepared to be bootable.\n"
 "Now you can download an NFI image file!"
 msgid ""
 "The USB stick was prepared to be bootable.\n"
 "Now you can download an NFI image file!"
@@ -7835,7 +7788,7 @@ msgid ""
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:716
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:716
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:517
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:716
 #, python-format
 msgid ""
 "The following device was found:\n"
 #, python-format
 msgid ""
 "The following device was found:\n"
@@ -7850,8 +7803,8 @@ msgstr ""
 msgid "The following files were found..."
 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 ""
 
 msgid "The installation of the default services lists is finished."
 msgstr ""
 
@@ -7867,22 +7820,10 @@ msgid "The match attribute is mandatory."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:27
 msgstr ""
 
 #: ../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 ""
 
 msgid "The md5sum validation failed, the file may be corrupted!"
 msgstr ""
 
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:243
-msgid ""
-"The md5sum validation failed, the file may be corrupted! Are you sure that "
-"you want to burn this image to flash memory? You are doing this at your own "
-"risk!"
-msgstr ""
-
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:419
-msgid ""
-"The md5sum validation failed, the file may be downloaded incompletely or be "
-"corrupted!"
-msgstr ""
-
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CleanupWizard/CleanupWizard.py:149
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/CleanupWizard/CleanupWizard.py:149
 msgid "The package:"
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CleanupWizard/CleanupWizard.py:149
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/CleanupWizard/CleanupWizard.py:149
 msgid "The package:"
@@ -7894,25 +7835,15 @@ msgstr ""
 msgid "The path %s already exists."
 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:205
 #: ../enigma2_experimental/lib/python/Screens/ParentalControlSetup.py:37
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:205
 #: ../enigma2_experimental/lib/python/Screens/ParentalControlSetup.py:37
-#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:236
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:198
+#: ../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/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 ""
 
 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
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py:528
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py:528
 #, python-format
@@ -7930,7 +7861,7 @@ msgid "The sleep timer has been disabled."
 msgstr ""
 
 #: ../enigma2_experimental/RecordTimer.py:501
 msgstr ""
 
 #: ../enigma2_experimental/RecordTimer.py:501
-#: ../enigma2_master/RecordTimer.py:489
+#: ../enigma2_master/RecordTimer.py:501
 msgid "The timer file (timers.xml) is corrupt and could not be loaded."
 msgstr ""
 
 msgid "The timer file (timers.xml) is corrupt and could not be loaded."
 msgstr ""
 
@@ -7938,17 +7869,17 @@ msgstr ""
 #: ../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_experimental/lib/python/Screens/NetworkSetup.py:777
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:798
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:924
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:739
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:759
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:773
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:892
+#: ../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:614
 msgid ""
 "The wireless LAN plugin is not installed!\n"
 "Please install it."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:614
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:627
+#: ../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 ""
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/
 msgid ""
@@ -7956,6 +7887,7 @@ msgid ""
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:207
 msgstr ""
 
 #: ../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 "
 #, python-format
 msgid ""
 "The wizard found a configuration backup. Do you want to restore your old "
@@ -7964,26 +7896,26 @@ 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:204
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:209
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:626
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:660
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:671
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:191
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:196
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:426
-#: ../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: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 ""
 
 msgid "There are at least "
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:664
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:677
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:464
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:477
+#: ../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 ""
 
 msgid "There are currently no outstanding actions."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:628
-#: ../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 ""
 
 msgid "There are no updates available."
 msgstr ""
 
@@ -8001,10 +7933,10 @@ msgid ""
 "Do you really want to continue?"
 msgstr ""
 
 "Do you really want to continue?"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:613
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1723
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:413
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1468
+#: ../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 ""
 
 msgid "There was an error downloading the packetlist. Please try again."
 msgstr ""
 
@@ -8023,23 +7955,6 @@ msgid ""
 "apply this update now?"
 msgstr ""
 
 "apply this update now?"
 msgstr ""
 
-#: ../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_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_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 ""
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:178
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:178
 msgid ""
@@ -8089,6 +8004,7 @@ msgid ""
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:693
 msgstr ""
 
 #: ../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"
 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"
@@ -8099,23 +8015,23 @@ msgid ""
 "Otherwise plug in a USB stick with a minimum size of 64 MB!"
 msgstr ""
 
 "Otherwise plug in a USB stick with a minimum size of 64 MB!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1077
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:877
+#: ../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 ""
 
 msgid "This plugin is installed."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1079
-#: ../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 ""
 
 msgid "This plugin is not installed."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1081
-#: ../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 ""
 
 msgid "This plugin will be installed."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1083
-#: ../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 ""
 
 msgid "This plugin will be removed."
 msgstr ""
 
@@ -8124,7 +8040,7 @@ msgid "This setting controls the behavior when a timer matches a found event."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1287
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1287
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1248
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1287
 msgid ""
 "This test checks for configured Nameservers.\n"
 "If you get a \"unconfirmed\" message:\n"
 msgid ""
 "This test checks for configured Nameservers.\n"
 "If you get a \"unconfirmed\" message:\n"
@@ -8134,7 +8050,7 @@ msgid ""
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1272
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1272
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1233
+#: ../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"
 msgid ""
 "This test checks whether a network cable is connected to your LAN-Adapter.\n"
 "If you get a \"disconnected\" message:\n"
@@ -8143,7 +8059,7 @@ msgid ""
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1282
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1282
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1243
+#: ../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"
 msgid ""
 "This test checks whether a valid IP Address is found for your LAN Adapter.\n"
 "If you get a \"unconfirmed\" message:\n"
@@ -8152,7 +8068,7 @@ msgid ""
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1277
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1277
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1238
+#: ../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"
 msgid ""
 "This test checks whether your LAN Adapter is set up for automatic IP Address "
 "configuration with DHCP.\n"
@@ -8165,7 +8081,7 @@ msgid ""
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1267
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1267
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1228
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1267
 msgid "This test detects your configured LAN-Adapter."
 msgstr ""
 
 msgid "This test detects your configured LAN-Adapter."
 msgstr ""
 
@@ -8176,15 +8092,15 @@ msgid ""
 "but add it disabled."
 msgstr ""
 
 "but add it disabled."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1114
-#: ../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:254
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:266
 msgid "Three"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:254
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:266
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:253
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:265
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:254
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:266
 msgid "Threshold"
 msgstr ""
 
 msgid "Threshold"
 msgstr ""
 
@@ -8206,8 +8122,8 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:124
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:166
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:124
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:166
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:123
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:165
+#: ../enigma2_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 ""
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:47
 msgid "Thursday"
 msgstr ""
@@ -8226,12 +8142,12 @@ msgid "Time in minutes to prepend to recording."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:143
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:143
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:142
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:143
 msgid "Timer Type"
 msgstr ""
 
 #: ../enigma2_experimental/RecordTimer.py:523
 msgid "Timer Type"
 msgstr ""
 
 #: ../enigma2_experimental/RecordTimer.py:523
-#: ../enigma2_master/RecordTimer.py:511
+#: ../enigma2_master/RecordTimer.py:523
 msgid ""
 "Timer overlap in timers.xml detected!\n"
 "Please recheck it!"
 msgid ""
 "Timer overlap in timers.xml detected!\n"
 "Please recheck it!"
@@ -8261,7 +8177,7 @@ msgid "Timeshift location"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1203
 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 ""
 
 msgid "Timeshift not possible!"
 msgstr ""
 
@@ -8277,7 +8193,7 @@ msgstr ""
 #: ../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/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 ""
 #: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:127
 msgid "Title"
 msgstr ""
@@ -8295,6 +8211,7 @@ msgid "Titleset mode"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:634
 msgstr ""
 
 #: ../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 make sure the bootable "
 msgid ""
 "To update your Dreambox firmware, please follow these steps:\n"
 "1) Turn off your box with the rear power switch and make sure the bootable "
@@ -8304,16 +8221,6 @@ msgid ""
 "3) Wait for bootup and follow instructions of the wizard."
 msgstr ""
 
 "3) Wait for bootup and follow instructions of the wizard."
 msgstr ""
 
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:653
-msgid ""
-"To update your Dreambox firmware, please follow these steps:\n"
-"1) Turn off your box with the rear power switch and plug in the bootable USB "
-"stick.\n"
-"2) Turn mains back on and hold the DOWN button on the front panel pressed "
-"for 10 seconds.\n"
-"3) Wait for bootup and follow instructions of the wizard."
-msgstr ""
-
 #: ../enigma2_experimental/lib/python/Screens/EpgSelection.py:336
 #: ../enigma2_experimental/lib/python/Tools/FuzzyDate.py:10
 #: ../enigma2_master/lib/python/Screens/EpgSelection.py:336
 #: ../enigma2_experimental/lib/python/Screens/EpgSelection.py:336
 #: ../enigma2_experimental/lib/python/Tools/FuzzyDate.py:10
 #: ../enigma2_master/lib/python/Screens/EpgSelection.py:336
@@ -8324,24 +8231,24 @@ msgid "Today"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:158
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:158
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:157
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:158
 msgid "Tone Amplitude"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:304
 msgid "Tone Amplitude"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:304
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:291
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:304
 msgid "Tone mode"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:310
 msgid "Tone mode"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:310
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:297
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:310
 msgid "Toneburst"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:515
 msgid "Toneburst"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:515
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1088
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:501
-#: ../enigma2_master/lib/python/Components/NimManager.py:1061
+#: ../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 ""
 
 msgid "Toneburst A/B"
 msgstr ""
 
@@ -8369,8 +8276,8 @@ msgstr ""
 msgid "Transmission Mode"
 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 ""
 
 msgid "Transmission mode"
 msgstr ""
 
@@ -8399,17 +8306,17 @@ msgid "Tries left:"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:159
 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 ""
 
 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 ""
 
 msgid "Try to find used transponders in cable network.. please wait..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1719
-#: ../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 ""
 
 msgid "Trying to download a new packetlist. Please wait..."
 msgstr ""
 
@@ -8435,8 +8342,8 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:124
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:164
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:124
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:164
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:123
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:163
+#: ../enigma2_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 ""
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:45
 msgid "Tuesday"
 msgstr ""
@@ -8453,25 +8360,25 @@ msgid "Tune"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:2215
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:2215
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2329
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2215
 msgid "Tune failed!"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:124
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:133
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:510
 msgid "Tune failed!"
 msgstr ""
 
 #: ../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:346
+#: ../enigma2_experimental/lib/python/Screens/ScanSetup.py:341
 #: ../enigma2_experimental/lib/python/Components/ServiceScan.py:137
 #: ../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_master/lib/python/Components/ServiceScan.py:137
 msgid "Tuner"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:513
-#: ../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 ""
 
 msgid "Tuner "
 msgstr ""
 
@@ -8481,7 +8388,7 @@ msgid "Tuner status"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:102
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:102
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:101
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:102
 msgid "Tuner type"
 msgstr ""
 
 msgid "Tuner type"
 msgstr ""
 
@@ -8490,31 +8397,31 @@ msgstr ""
 msgid "Turkish"
 msgstr ""
 
 msgid "Turkish"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1114
-#: ../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:272
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:283
 msgid "Two"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:272
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:283
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:271
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:282
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:272
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:283
 msgid "Type"
 msgstr ""
 
 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:537
 msgid "Type of scan"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:537
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1092
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:523
-#: ../enigma2_master/lib/python/Components/NimManager.py:1065
+#: ../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 ""
 
 msgid "USALS"
 msgstr ""
 
@@ -8525,17 +8432,11 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:118
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:736
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:118
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:736
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:190
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:122
+#: ../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 ""
 
 msgid "USB stick wizard"
 msgstr ""
 
-#: ../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"
 #: ../enigma2_experimental/lib/python/Components/Language.py:43
 #: ../enigma2_master/lib/python/Components/Language.py:43
 msgid "Ukrainian"
@@ -8556,38 +8457,39 @@ msgid ""
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:328
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:328
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:315
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:328
 msgid "Uncommitted DiSEqC command"
 msgstr ""
 
 msgid "Uncommitted DiSEqC command"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:656
-#: ../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 ""
 
 msgid "Undo install"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:654
-#: ../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 ""
 
 msgid "Undo uninstall"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1010
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1077
+#: ../enigma2_master/lib/python/Components/NimManager.py:1077
 msgid "Unicable"
 msgstr ""
 
 msgid "Unicable"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1071
-#: ../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 ""
 
 msgid "Unicable LNB"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1072
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1129
-#: ../enigma2_master/lib/python/Components/NimManager.py:1045
-#: ../enigma2_master/lib/python/Components/NimManager.py:1102
+#: ../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 ""
 
 msgid "Unicable Martix"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:650
-#: ../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 ""
 
 msgid "Uninstall"
 msgstr ""
 
@@ -8596,12 +8498,13 @@ msgstr ""
 msgid "United States"
 msgstr ""
 
 msgid "United States"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1009
-#: ../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
 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 ""
 
 msgid "Unknown network adapter."
 msgstr ""
 
@@ -8619,15 +8522,15 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:459
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:469
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:459
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:469
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:465
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py:476
+#: ../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
 msgid "Unsupported"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:33
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:672
+#: ../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/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 ""
 
 msgid "Update"
 msgstr ""
 
@@ -8641,8 +8544,8 @@ msgid ""
 "ask you to update again."
 msgstr ""
 
 "ask you to update again."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:633
-#: ../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 ""
 
 msgid "Updatefeed not available."
 msgstr ""
 
@@ -8659,7 +8562,7 @@ msgid "Updating finished. Here is the result:"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:607
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:607
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:407
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:607
 msgid "Updating software catalog"
 msgstr ""
 
 msgid "Updating software catalog"
 msgstr ""
 
@@ -8674,24 +8577,24 @@ msgstr ""
 msgid "Updating... Please wait... This can take some minutes..."
 msgstr ""
 
 msgid "Updating... Please wait... This can take some minutes..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1409
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1785
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1200
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1530
+#: ../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:88
 msgid "Upgrade finished."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Ipkg.py:88
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:998
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1348
-#: ../enigma2_master/lib/python/Screens/Ipkg.py:87
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:798
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1153
+#: ../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 ""
 
 msgid "Upgrading"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1307
-#: ../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 ""
 
 msgid "Upgrading Dreambox... Please wait"
 msgstr ""
 
@@ -8707,25 +8610,26 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:28
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:319
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:28
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:319
-#: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/settings.py:26
+#: ../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:494
 msgid "Use"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:494
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:483
+#: ../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:490
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Use DHCP"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:490
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:479
+#: ../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:337
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:43
 msgid "Use Interface"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:43
 #: ../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 ""
 
 msgid "Use Power Measurement"
 msgstr ""
 
@@ -8734,25 +8638,27 @@ msgid "Use a custom location"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:499
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:499
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:488
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:499
 msgid "Use a gateway"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:60
 msgid "Use a gateway"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:60
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:85
+#: ../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:858
 msgid "Use the Networkwizard to configure selected network adapter"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:858
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:826
+#: ../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
 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
 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 ""
 
 msgid "Use this settings?"
 msgstr ""
 
@@ -8767,23 +8673,23 @@ msgid "Use time of currently running service"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:352
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:352
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:339
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:352
 msgid "Use usals for this sat"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:163
 msgid "Use usals for this sat"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:163
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:162
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:163
 msgid "Used service scan type"
 msgstr ""
 
 msgid "Used service scan type"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1012
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1073
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1129
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1131
-#: ../enigma2_master/lib/python/Components/NimManager.py:987
-#: ../enigma2_master/lib/python/Components/NimManager.py:1046
-#: ../enigma2_master/lib/python/Components/NimManager.py:1102
-#: ../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 ""
 
 msgid "User defined"
 msgstr ""
 
@@ -8880,7 +8786,7 @@ msgid "View Count"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:1003
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:1003
-#: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:998
+#: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:1003
 msgid "View Movies..."
 msgstr ""
 
 msgid "View Movies..."
 msgstr ""
 
@@ -8890,12 +8796,12 @@ msgid "View Photos..."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:1427
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:1427
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:1420
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:1427
 msgid "View Rass interactive..."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:1013
 msgid "View Rass interactive..."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:1013
-#: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:1008
+#: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:1013
 msgid "View Video CD..."
 msgstr ""
 
 msgid "View Video CD..."
 msgstr ""
 
@@ -8903,73 +8809,73 @@ msgstr ""
 msgid "View active downloads"
 msgstr ""
 
 msgid "View active downloads"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:657
-#: ../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 ""
 
 msgid "View details"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:852
-#: ../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 ""
 
 msgid "View list of available "
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:836
-#: ../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 ""
 
 msgid "View list of available CommonInterface extensions"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:846
-#: ../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 ""
 
 msgid "View list of available Display and Userinterface extensions."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:848
-#: ../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 ""
 
 msgid "View list of available EPG extensions."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:840
-#: ../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 ""
 
 msgid "View list of available Satellite equipment extensions."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:850
-#: ../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 ""
 
 msgid "View list of available communication extensions."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:838
-#: ../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 ""
 
 msgid "View list of available default settings"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:844
-#: ../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 ""
 
 msgid "View list of available multimedia extensions."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:834
-#: ../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 ""
 
 msgid "View list of available networking extensions"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:832
-#: ../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 ""
 
 msgid "View list of available recording extensions"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:830
-#: ../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 ""
 
 msgid "View list of available skins"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:842
-#: ../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 ""
 
 msgid "View list of available software extensions"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:828
-#: ../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 ""
 
 msgid "View list of available system extensions"
 msgstr ""
 
@@ -8982,7 +8888,7 @@ msgid "View response videos"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:2128
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:2128
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2242
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:2128
 msgid "View teletext..."
 msgstr ""
 
 msgid "View teletext..."
 msgstr ""
 
@@ -9000,7 +8906,7 @@ msgid "Views: "
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:302
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:302
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:289
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:302
 msgid "Voltage mode"
 msgstr ""
 
 msgid "Voltage mode"
 msgstr ""
 
@@ -9008,15 +8914,15 @@ msgstr ""
 #: ../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_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:431
 #: ../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:431
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:420
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:431
 msgid "WEP"
 msgstr ""
 
 msgid "WEP"
 msgstr ""
 
@@ -9025,26 +8931,33 @@ msgstr ""
 #: ../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_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
 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
 msgid "WLAN connection"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:432
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:421
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:432
 msgid "WPA"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:434
 msgid "WPA"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:434
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:423
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:434
 msgid "WPA or WPA2"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:433
 msgid "WPA or WPA2"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:433
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:422
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:433
 msgid "WPA2"
 msgstr ""
 
 msgid "WPA2"
 msgstr ""
 
@@ -9089,14 +9002,14 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:124
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:165
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:124
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:165
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:123
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:164
+#: ../enigma2_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:160
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:46
 msgid "Wednesday"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:160
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:159
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:160
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:52
 msgid "Weekday"
 msgstr ""
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:52
 msgid "Weekday"
 msgstr ""
@@ -9153,13 +9066,13 @@ msgid ""
 "Press exit to get back to the input field."
 msgstr ""
 
 "Press exit to get back to the input field."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1096
-#: ../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 ""
 
 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 ""
 
 msgid "What to do with submitted crashlogs?"
 msgstr ""
 
@@ -9185,22 +9098,18 @@ msgstr ""
 msgid "Where to save temporary timeshift recordings?"
 msgstr ""
 
 msgid "Where to save temporary timeshift recordings?"
 msgstr ""
 
-#: ../enigma2_master/lib/python/Components/Network.py:315
-msgid "Wireless"
-msgstr ""
-
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:466
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:466
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:401
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:466
 msgid "Wireless LAN"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1326
 msgid "Wireless LAN"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1326
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1286
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1326
 msgid "Wireless Network"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:116
 msgid "Wireless Network"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:116
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:114
+#: ../enigma2_master/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:116
 msgid "Wireless Network State"
 msgstr ""
 
 msgid "Wireless Network State"
 msgstr ""
 
@@ -9221,19 +9130,15 @@ msgid "Wizard"
 msgstr ""
 
 #: ../enigma2_experimental/RecordTimer.py:376
 msgstr ""
 
 #: ../enigma2_experimental/RecordTimer.py:376
-#: ../enigma2_master/RecordTimer.py:364
+#: ../enigma2_master/RecordTimer.py:376
 msgid "Write error while recording. Disk full?\n"
 msgstr ""
 
 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 ""
 
 msgid "Write failed!"
 msgstr ""
 
-#: ../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"
 #: ../enigma2_experimental/lib/python/Components/AVSwitch.py:75
 #: ../enigma2_master/lib/python/Components/AVSwitch.py:75
 msgid "YPbPr"
@@ -9251,7 +9156,7 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Screens/InfoBar.py:168
 #: ../enigma2_experimental/lib/python/Screens/InfoBar.py:173
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:401
 #: ../enigma2_experimental/lib/python/Screens/InfoBar.py:168
 #: ../enigma2_experimental/lib/python/Screens/InfoBar.py:173
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:401
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py:275
+#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/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_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
@@ -9259,9 +9164,11 @@ msgstr ""
 #: ../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/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_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/MyTubeSearch.py:175
 #: ../enigma2_plugins/mytube/src/plugin.py:66
 #: ../enigma2_plugins/mytube/src/plugin.py:619
@@ -9275,11 +9182,12 @@ msgid "Yes"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:401
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:401
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:389
+#: ../enigma2_master/lib/python/Screens/Satconfig.py:401
 msgid "Yes to all"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:51
 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 ""
 
 msgid "Yes, always"
 msgstr ""
 
@@ -9288,8 +9196,8 @@ msgstr ""
 msgid "Yes, and delete this movie"
 msgstr ""
 
 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 ""
 
 msgid "Yes, and don't ask again"
 msgstr ""
 
@@ -9306,18 +9214,18 @@ msgstr ""
 msgid "Yes, returning to movie list"
 msgstr ""
 
 msgid "Yes, returning to movie list"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1081
-#: ../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 ""
 
 msgid "You can cancel the installation."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1083
-#: ../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 ""
 
 msgid "You can cancel the removal."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1079
-#: ../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 ""
 
 msgid "You can install this plugin."
 msgstr ""
 
@@ -9326,8 +9234,8 @@ msgstr ""
 msgid "You can only burn Dreambox recordings!"
 msgstr ""
 
 msgid "You can only burn Dreambox recordings!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1077
-#: ../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 ""
 
 msgid "You can remove this plugin."
 msgstr ""
 
@@ -9341,6 +9249,7 @@ msgid "You cannot delete this!"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:282
 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 ""
 
 msgid "You didn't select a channel to record from."
 msgstr ""
 
@@ -9353,7 +9262,7 @@ msgid ""
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:715
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:715
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:434
+#: ../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."
 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."
@@ -9375,7 +9284,7 @@ msgid ""
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:705
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:705
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:694
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:705
 msgid "Your Dreambox will restart after pressing OK on your remote control."
 msgstr ""
 
 msgid "Your Dreambox will restart after pressing OK on your remote control."
 msgstr ""
 
@@ -9400,15 +9309,15 @@ msgstr ""
 msgid "Your current collection will get lost!"
 msgstr ""
 
 msgid "Your current collection will get lost!"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1398
-#: ../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 ""
 
 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 ""
 
 msgid "Your email address:"
 msgstr ""
 
@@ -9419,15 +9328,15 @@ msgid ""
 "Press OK to start upgrade."
 msgstr ""
 
 "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:632
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:634
 msgid "Your name (optional):"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:632
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:634
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:621
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:623
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:632
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:634
 msgid "Your network configuration has been activated."
 msgstr ""
 
 msgid "Your network configuration has been activated."
 msgstr ""
 
@@ -9461,33 +9370,34 @@ msgstr ""
 #: ../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_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:363
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:428
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:449
+#: ../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/Components/Network.py:350
 msgid "Zap back to service before tuner setup?"
 msgstr ""
 
 #: ../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
 msgid "Zydas"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:565
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:558
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:565
 msgid "[alternative edit]"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:569
 msgid "[alternative edit]"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:569
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:562
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:569
 msgid "[bouquet edit]"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:571
 msgid "[bouquet edit]"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:571
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:564
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:571
 msgid "[favourite edit]"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:663
 msgid "[favourite edit]"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:663
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:656
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:663
 msgid "[move mode]"
 msgstr ""
 
 msgid "[move mode]"
 msgstr ""
 
@@ -9502,17 +9412,17 @@ msgid "a gui to assign services/providers/caids to common interface modules"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:171
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:171
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:164
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:171
 msgid "abort alternatives edit"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:165
 msgid "abort alternatives edit"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:165
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:158
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:165
 msgid "abort bouquet edit"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:168
 msgid "abort bouquet edit"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:168
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:161
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:168
 msgid "abort favourites edit"
 msgstr ""
 
 msgid "abort favourites edit"
 msgstr ""
 
@@ -9522,12 +9432,12 @@ msgid "about to start"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:249
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:249
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:238
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:249
 msgid "activate current configuration"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:338
 msgid "activate current configuration"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:338
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:327
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:338
 msgid "activate network adapter configuration"
 msgstr ""
 
 msgid "activate network adapter configuration"
 msgstr ""
 
@@ -9547,12 +9457,12 @@ msgid "add Service"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:255
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:255
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:244
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:255
 msgid "add a nameserver entry"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:158
 msgid "add a nameserver entry"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:158
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:151
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:158
 msgid "add alternatives"
 msgstr ""
 
 msgid "add alternatives"
 msgstr ""
 
@@ -9562,7 +9472,7 @@ msgid "add bookmark"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:140
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:140
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:133
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:140
 msgid "add bouquet"
 msgstr ""
 
 msgid "add bouquet"
 msgstr ""
 
@@ -9586,45 +9496,45 @@ msgid "add filters"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:148
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:148
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:141
+#: ../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
 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
 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
 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
 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:120
 msgid "add recording (stop after current event)"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:120
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:114
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:120
 msgid "add service to bouquet"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:123
 msgid "add service to bouquet"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:123
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:116
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:123
 msgid "add service to favourites"
 msgstr ""
 
 msgid "add service to favourites"
 msgstr ""
 
@@ -9639,10 +9549,10 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:63
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:543
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:63
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:543
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1367
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1434
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:63
 #: ../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 ""
 
 msgid "advanced"
 msgstr ""
 
@@ -9675,12 +9585,13 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/AudioSelection.py:52
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:117
 
 #: ../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:102
 #: ../enigma2_master/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:117
 msgid "audio tracks"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:102
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:101
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:102
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:241
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:29
 msgid "auto"
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:241
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:29
 msgid "auto"
@@ -9695,7 +9606,7 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:173
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/CutListEditor/plugin.py:56
 
 #: ../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 ""
 #: ../enigma2_master/lib/python/Plugins/Extensions/CutListEditor/plugin.py:56
 msgid "back"
 msgstr ""
@@ -9722,8 +9633,8 @@ msgstr ""
 msgid "black"
 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 ""
 
 msgid "blacklist"
 msgstr ""
 
@@ -9749,12 +9660,12 @@ msgid "case-sensitive search"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1654
 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
 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 ""
 
 msgid "change recording (endtime)"
 msgstr ""
 
@@ -9765,17 +9676,13 @@ msgstr ""
 msgid "chapters"
 msgstr ""
 
 msgid "chapters"
 msgstr ""
 
-#: ../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 ""
 
 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 ""
 
 msgid "circular right"
 msgstr ""
 
@@ -9786,34 +9693,36 @@ msgstr ""
 msgid "clear playlist"
 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:1395
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1409
 msgid "complex"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1395
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1409
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1355
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1369
+#: ../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:1384
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1440
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:295
 msgid "confirmed"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1384
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1440
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:295
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1344
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1400
+#: ../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_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:504
 msgid "connected"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:756
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:504
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:755
+#: ../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:129
 msgid "continue"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:129
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:122
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:129
 msgid "copy to bouquets"
 msgstr ""
 
 msgid "copy to bouquets"
 msgstr ""
 
@@ -9828,12 +9737,13 @@ msgid "create directory"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:103
 msgstr ""
 
 #: ../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
 #, python-format
 msgid "currently installed image: %s"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:109
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:108
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:109
 msgid "daily"
 msgstr ""
 
 msgid "daily"
 msgstr ""
 
@@ -9874,26 +9784,27 @@ msgstr ""
 msgid "delete..."
 msgstr ""
 
 msgid "delete..."
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1183
+#: ../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
 msgid "description"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Components/config.py:449
-#: ../enigma2_master/lib/python/Components/config.py:448
+#: ../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:160
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:128
 msgid "disable"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:160
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:153
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:160
 msgid "disable move mode"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1213
 msgid "disable move mode"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1213
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1434
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1501
 #: ../enigma2_experimental/lib/python/Components/TimerList.py:69
 #: ../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_master/lib/python/Components/TimerList.py:69
 msgid "disabled"
 msgstr ""
@@ -9901,9 +9812,9 @@ msgstr ""
 #: ../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_experimental/lib/python/Screens/NetworkSetup.py:1369
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1388
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1435
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1329
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1348
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1395
+#: ../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 ""
 
 msgid "disconnected"
 msgstr ""
 
@@ -9915,16 +9826,16 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1656
 #: ../enigma2_experimental/lib/python/Screens/TaskView.py:51
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:102
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1656
 #: ../enigma2_experimental/lib/python/Screens/TaskView.py:51
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:102
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1655
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1656
 #: ../enigma2_master/lib/python/Screens/TaskView.py:51
 #: ../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_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 ""
 
 msgid "don't record"
 msgstr ""
 
@@ -9936,7 +9847,7 @@ msgid "done!"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:154
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:154
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:147
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:154
 msgid "edit alternatives"
 msgstr ""
 
 msgid "edit alternatives"
 msgstr ""
 
@@ -9948,50 +9859,50 @@ msgstr ""
 msgid "edit services"
 msgstr ""
 
 msgid "edit services"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:541
-#: ../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:449
 msgid "empty"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Components/config.py:449
-#: ../enigma2_master/lib/python/Components/config.py:448
+#: ../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:150
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:128
 msgid "enable"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:150
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:143
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:150
 msgid "enable bouquet edit"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:152
 msgid "enable bouquet edit"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:152
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:145
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:152
 msgid "enable favourite edit"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:146
 msgid "enable favourite edit"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:146
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:139
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:146
 msgid "enable move mode"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1209
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:548
 msgid "enable move mode"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1209
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:548
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1381
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1421
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1170
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:534
-#: ../enigma2_master/lib/python/Components/NimManager.py:1341
-#: ../enigma2_master/lib/python/Components/NimManager.py:1381
+#: ../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:170
 msgid "enabled"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:170
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:163
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:170
 msgid "end alternatives edit"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:164
 msgid "end alternatives edit"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:164
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:157
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:164
 msgid "end bouquet edit"
 msgstr ""
 
 msgid "end bouquet edit"
 msgstr ""
 
@@ -10003,7 +9914,7 @@ msgid "end cut here"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:167
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:167
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:160
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:167
 msgid "end favourites edit"
 msgstr ""
 
 msgid "end favourites edit"
 msgstr ""
 
@@ -10013,21 +9924,21 @@ msgstr ""
 #: ../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_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:294
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:340
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py:365
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:452
+#: ../enigma2_master/lib/python/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/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:508
 msgid "enter hidden network SSID"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:68
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:508
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1369
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1436
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:68
 #: ../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 ""
 
 msgid "equal to"
 msgstr ""
 
@@ -10036,7 +9947,7 @@ msgid "exact match"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:346
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:346
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:333
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:346
 msgid "exit DVD player or return to file browser"
 msgstr ""
 
 msgid "exit DVD player or return to file browser"
 msgstr ""
 
@@ -10052,40 +9963,32 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:248
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:254
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:248
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:254
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:237
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:243
+#: ../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:337
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:343
 msgid "exit nameserver configuration"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:337
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:343
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:326
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:332
+#: ../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:52
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:58
 msgid "exit network adapter configuration"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:52
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:58
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:77
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:83
+#: ../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:718
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:724
 msgid "exit network interface list"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:718
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:724
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:707
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:713
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:718
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:724
 msgid "exit networkadapter setup menu"
 msgstr ""
 
 msgid "exit networkadapter setup menu"
 msgstr ""
 
-#: ../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)"
 #: ../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)"
@@ -10104,7 +10007,7 @@ msgid "fine-tune your display"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:342
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:342
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:329
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:342
 msgid "forward to the next chapter"
 msgstr ""
 
 msgid "forward to the next chapter"
 msgstr ""
 
@@ -10123,7 +10026,7 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Screens/TaskView.py:48
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:99
 #: ../enigma2_master/lib/python/Screens/TaskView.py:48
 #: ../enigma2_experimental/lib/python/Screens/TaskView.py:48
 #: ../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"
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:240
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:27
 msgid "go to deep standby"
@@ -10132,7 +10035,7 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Screens/TaskView.py:51
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:102
 #: ../enigma2_master/lib/python/Screens/TaskView.py:51
 #: ../enigma2_experimental/lib/python/Screens/TaskView.py:51
 #: ../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"
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:239
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:28
 msgid "go to standby"
@@ -10165,8 +10068,8 @@ msgstr ""
 msgid "hide player"
 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 ""
 
 msgid "horizontal"
 msgstr ""
 
@@ -10185,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_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 ""
 
 msgid "immediate shutdown"
 msgstr ""
 
@@ -10218,12 +10122,12 @@ msgid "insert mark here"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:345
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:345
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:332
+#: ../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:344
 msgid "jump back to the previous title"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:344
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:331
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:344
 msgid "jump forward to the next title"
 msgstr ""
 
 msgid "jump forward to the next title"
 msgstr ""
 
@@ -10238,12 +10142,12 @@ msgid "jump to listend"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1883
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1883
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1997
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1883
 msgid "jump to next marked position"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1882
 msgid "jump to next marked position"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1882
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1996
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1882
 msgid "jump to previous marked position"
 msgstr ""
 
 msgid "jump to previous marked position"
 msgstr ""
 
@@ -10253,7 +10157,7 @@ msgid "leave movie player..."
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/AudioSelection.py:80
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/AudioSelection.py:80
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1781
+#: ../enigma2_master/lib/python/Screens/AudioSelection.py:80
 msgid "left"
 msgstr ""
 
 msgid "left"
 msgstr ""
 
@@ -10299,17 +10203,17 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:72
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:507
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:72
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:507
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1372
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1439
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:72
 #: ../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:539
 msgid "loopthrough to"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:539
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1092
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:525
-#: ../enigma2_master/lib/python/Components/NimManager.py:1065
+#: ../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 ""
 
 msgid "manual"
 msgstr ""
 
@@ -10327,7 +10231,7 @@ msgid "menu"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:860
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:860
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:828
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:860
 msgid "menulist"
 msgstr ""
 
 msgid "menulist"
 msgstr ""
 
@@ -10372,31 +10276,31 @@ msgid "move PiP to main picture"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:713
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:713
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:702
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:713
 msgid "move down to last entry"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:711
 msgid "move down to last entry"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:711
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:700
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:711
 msgid "move down to next entry"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:712
 msgid "move down to next entry"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:712
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:701
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:712
 msgid "move up to first entry"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:710
 msgid "move up to first entry"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:710
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:699
+#: ../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
 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:1138
 #: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1139
+#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1140
 msgid "movie list"
 msgstr ""
 
 msgid "movie list"
 msgstr ""
 
@@ -10405,10 +10309,10 @@ msgstr ""
 msgid "multinorm"
 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 ""
 
 msgid "never"
 msgstr ""
 
@@ -10424,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/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: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_experimental/lib/python/Screens/SleepTimerEdit.py:92
 #: ../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/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 ""
 
 msgid "no"
 msgstr ""
 
@@ -10488,7 +10392,7 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:61
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:512
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:61
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:61
 #: ../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 ""
 
 msgid "not configured"
 msgstr ""
 
@@ -10497,22 +10401,28 @@ msgstr ""
 msgid "not locked"
 msgstr ""
 
 msgid "not locked"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1152
-#: ../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:546
 #: ../enigma2_experimental/lib/python/Components/FileList.py:200
 msgid "not used"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:546
 #: ../enigma2_experimental/lib/python/Components/FileList.py:200
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1094
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1366
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1382
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1422
-#: ../enigma2_master/lib/python/Screens/Satconfig.py:532
-#: ../enigma2_master/lib/python/Components/NimManager.py:1067
-#: ../enigma2_master/lib/python/Components/NimManager.py:1326
-#: ../enigma2_master/lib/python/Components/NimManager.py:1342
-#: ../enigma2_master/lib/python/Components/NimManager.py:1382
+#: ../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 ""
 
 msgid "nothing connected"
 msgstr ""
 
@@ -10526,32 +10436,32 @@ msgstr ""
 msgid "of a SINGLE layer medium used."
 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/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_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_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/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_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 ""
 #: ../enigma2_master/lib/python/Components/UsageConfig.py:28
 msgid "on"
 msgstr ""
@@ -10566,12 +10476,12 @@ msgid "on Weekday"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:103
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:103
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:102
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:103
 msgid "once"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:344
 msgid "once"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:344
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:333
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:344
 msgid "open nameserver configuration"
 msgstr ""
 
 msgid "open nameserver configuration"
 msgstr ""
 
@@ -10601,7 +10511,7 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:755
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:161
 
 #: ../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 ""
 #: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/plugin.py:161
 msgid "pause"
 msgstr ""
@@ -10626,9 +10536,9 @@ msgstr ""
 msgid "please press OK when ready"
 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_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 ""
 #: ../enigma2_master/lib/python/Plugins/Extensions/PicturePlayer/plugin.py:473
 msgid "please wait, loading picture..."
 msgstr ""
@@ -10644,7 +10554,7 @@ msgid "previous channel in history"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:97
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:97
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:96
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:97
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:187
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:182
 msgid "record"
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:187
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:182
 msgid "record"
@@ -10663,7 +10573,7 @@ msgid "red"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:256
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:256
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:245
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:256
 msgid "remove a nameserver entry"
 msgstr ""
 
 msgid "remove a nameserver entry"
 msgstr ""
 
@@ -10673,12 +10583,12 @@ msgid "remove after this position"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:156
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:156
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:149
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:156
 msgid "remove all alternatives"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:131
 msgid "remove all alternatives"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:131
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:124
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:131
 msgid "remove all new found flags"
 msgstr ""
 
 msgid "remove all new found flags"
 msgstr ""
 
@@ -10699,8 +10609,8 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:133
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:141
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:133
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:141
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:126
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:134
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:133
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:141
 msgid "remove entry"
 msgstr ""
 
 msgid "remove entry"
 msgstr ""
 
@@ -10710,12 +10620,12 @@ msgid "remove from parental protection"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:135
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:135
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:128
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:135
 msgid "remove new found flag"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:126
 msgid "remove new found flag"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:126
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:119
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:126
 msgid "remove selected satellite"
 msgstr ""
 
 msgid "remove selected satellite"
 msgstr ""
 
@@ -10725,27 +10635,27 @@ msgid "remove this mark"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:92
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:92
-#: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/settings.py:90
+#: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/settings.py:92
 msgid "repeat playlist"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:103
 msgid "repeat playlist"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:103
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:102
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:103
 msgid "repeated"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:343
 msgid "repeated"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:343
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:330
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:343
 msgid "rewind to the previous chapter"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/AudioSelection.py:80
 msgid "rewind to the previous chapter"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/AudioSelection.py:80
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1781
+#: ../enigma2_master/lib/python/Screens/AudioSelection.py:80
 msgid "right"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:94
 msgid "right"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:94
-#: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/settings.py:92
+#: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/settings.py:94
 msgid "save last directory on exit"
 msgstr ""
 
 msgid "save last directory on exit"
 msgstr ""
 
@@ -10755,7 +10665,7 @@ msgid "save playlist"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:93
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:93
-#: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/settings.py:91
+#: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/settings.py:93
 msgid "save playlist on exit"
 msgstr ""
 
 msgid "save playlist on exit"
 msgstr ""
 
@@ -10773,7 +10683,7 @@ msgid "scan in progress - %d%% done!"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ServiceScan.py:48
 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 ""
 
 msgid "scan state"
 msgstr ""
 
@@ -10784,10 +10694,10 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:70
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:509
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:70
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:509
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1370
+#: ../enigma2_experimental/lib/python/Components/NimManager.py:1437
 #: ../enigma2_master/lib/python/Screens/Satconfig.py:70
 #: ../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 ""
 
 msgid "second cable of motorized LNB"
 msgstr ""
 
@@ -10809,10 +10719,6 @@ msgstr ""
 msgid "select"
 msgstr ""
 
 msgid "select"
 msgstr ""
 
-#: ../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"
 #: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:123
 #: ../enigma2_master/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py:123
 msgid "select CAId"
@@ -10823,19 +10729,15 @@ msgstr ""
 msgid "select CAId's"
 msgstr ""
 
 msgid "select CAId's"
 msgstr ""
 
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:218
-msgid "select image from server"
-msgstr ""
-
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:53
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:59
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:53
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:59
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:78
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:84
+#: ../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:719
 msgid "select interface"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:719
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:708
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:719
 msgid "select menu entry"
 msgstr ""
 
 msgid "select menu entry"
 msgstr ""
 
@@ -10853,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
 #: ../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
 msgstr ""
 
 #: ../enigma2_plugins/ac3lipsync/src/plugin.py:36
@@ -10864,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
 #: ../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:340
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:340
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:327
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:340
 msgid "show DVD main menu"
 msgstr ""
 
 msgid "show DVD main menu"
 msgstr ""
 
@@ -10888,7 +10790,7 @@ msgid "show all"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:155
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/ChannelSelection.py:155
-#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:148
+#: ../enigma2_master/lib/python/Screens/ChannelSelection.py:155
 msgid "show alternatives"
 msgstr ""
 
 msgid "show alternatives"
 msgstr ""
 
@@ -10919,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_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 ""
 
 msgid "show shutdown menu"
 msgstr ""
 
@@ -10947,7 +10850,7 @@ msgstr ""
 #: ../enigma2_experimental/lib/python/Screens/TaskView.py:50
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:101
 #: ../enigma2_master/lib/python/Screens/TaskView.py:50
 #: ../enigma2_experimental/lib/python/Screens/TaskView.py:50
 #: ../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 ""
 
 msgid "shut down"
 msgstr ""
 
@@ -10957,34 +10860,34 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:62
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:541
 
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:62
 #: ../enigma2_experimental/lib/python/Screens/Satconfig.py:541
-#: ../enigma2_experimental/lib/python/Components/NimManager.py:1367
-#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:26
+#: ../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_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/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
 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
 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
 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 ""
 
 msgid "skip forward (enter time)"
 msgstr ""
 
@@ -11005,6 +10908,7 @@ msgstr ""
 
 #: ../enigma2_experimental/lib/python/Components/RecordingConfig.py:12
 #: ../enigma2_experimental/lib/python/Components/UsageConfig.py:31
 
 #: ../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"
 #: ../enigma2_master/lib/python/Components/UsageConfig.py:31
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:238
 msgid "standard"
@@ -11022,17 +10926,17 @@ msgid "start cut here"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:96
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/MediaPlayer/settings.py:96
-#: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/settings.py:94
+#: ../enigma2_master/lib/python/Plugins/Extensions/MediaPlayer/settings.py:96
 msgid "start directory"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1175
 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/AudioSelection.py:80
 msgid "start timeshift"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/AudioSelection.py:80
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1781
+#: ../enigma2_master/lib/python/Screens/AudioSelection.py:80
 msgid "stereo"
 msgstr ""
 
 msgid "stereo"
 msgstr ""
 
@@ -11047,12 +10951,12 @@ msgid "stop entry"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1649
 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
 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 ""
 
 msgid "stop timeshift"
 msgstr ""
 
@@ -11087,17 +10991,17 @@ msgid "switch to playlist"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:350
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:350
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:337
+#: ../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:348
 msgid "switch to the next angle"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:348
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:335
+#: ../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:349
 msgid "switch to the next audio track"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:349
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:336
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:349
 msgid "switch to the next subtitle language"
 msgstr ""
 
 msgid "switch to the next subtitle language"
 msgstr ""
 
@@ -11118,43 +11022,48 @@ msgstr ""
 msgid "this recording"
 msgstr ""
 
 msgid "this recording"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Components/ParentalControl.py:109
-#: ../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:1884
 msgid "this service is protected by a parental control pin"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/InfoBarGenerics.py:1884
-#: ../enigma2_master/lib/python/Screens/InfoBarGenerics.py:1998
+#: ../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:341
 msgid "toggle a cut mark at the current position"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:341
-#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:328
+#: ../enigma2_master/lib/python/Plugins/Extensions/DVDPlayer/plugin.py:341
 msgid "toggle time, chapter, audio, subtitle info"
 msgstr ""
 
 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: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_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: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:1399
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1413
 msgid "unavailable"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1399
 #: ../enigma2_experimental/lib/python/Screens/NetworkSetup.py:1413
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1359
-#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1373
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1399
+#: ../enigma2_master/lib/python/Screens/NetworkSetup.py:1413
 msgid "unconfirmed"
 msgstr ""
 
 msgid "unconfirmed"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1175
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1180
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:977
-#: ../enigma2_master/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:984
+#: ../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 ""
 
 msgid "unknown"
 msgstr ""
 
@@ -11163,10 +11072,10 @@ msgstr ""
 msgid "unknown service"
 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 ""
 
 msgid "until standby/restart"
 msgstr ""
 
@@ -11175,17 +11084,17 @@ msgid "use as HDD replacement"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:109
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:109
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:108
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:109
 msgid "user defined"
 msgstr ""
 
 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
 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 ""
 
 msgid "view extensions..."
 msgstr ""
 
@@ -11217,12 +11126,12 @@ msgid "was removed successfully"
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:109
 msgstr ""
 
 #: ../enigma2_experimental/lib/python/Screens/TimerEntry.py:109
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:108
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:109
 msgid "weekly"
 msgstr ""
 
 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 ""
 
 msgid "whitelist"
 msgstr ""
 
@@ -11240,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/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: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_experimental/lib/python/Screens/SleepTimerEdit.py:90
 #: ../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/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 ""
 
 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 ""
 
 msgid "yes (keep feeds)"
 msgstr ""
 
-#: ../enigma2_experimental/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:1394
-#: ../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:97
 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:97
-#: ../enigma2_master/lib/python/Screens/TimerEntry.py:96
+#: ../enigma2_master/lib/python/Screens/TimerEntry.py:97
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:187
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:182
 msgid "zap"
 #: ../enigma2_plugins/autotimer/src/AutoTimerEditor.py:187
 #: ../enigma2_plugins/autotimer/src/AutoTimerImporter.py:182
 msgid "zap"
@@ -11373,7 +11282,7 @@ msgstr ""
 msgid "Action on long powerbutton press"
 msgstr ""
 
 msgid "Action on long powerbutton press"
 msgstr ""
 
-#: ../enigma2_experimental/data/
+#: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Action on short powerbutton press"
 msgstr ""
 
 msgid "Action on short powerbutton press"
 msgstr ""
 
@@ -11469,7 +11378,7 @@ msgstr ""
 msgid "Common Interface"
 msgstr ""
 
 msgid "Common Interface"
 msgstr ""
 
-#: ../enigma2_experimental/data/
+#: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Composition of the recording filenames"
 msgstr ""
 
 msgid "Composition of the recording filenames"
 msgstr ""
 
@@ -11625,7 +11534,7 @@ msgstr ""
 msgid "Initialization"
 msgstr ""
 
 msgid "Initialization"
 msgstr ""
 
-#: ../enigma2_experimental/data/
+#: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid "Input devices"
 msgstr ""
 
 msgid "Input devices"
 msgstr ""
 
@@ -11789,6 +11698,12 @@ msgid "Pin code needed"
 msgstr ""
 
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 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 ""
 
 msgid "Please choose the default services lists you want to install."
 msgstr ""
 
@@ -11908,7 +11823,7 @@ msgstr ""
 msgid "Show blinking clock in display during recording"
 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 ""
 
 msgid "Show event-progress in channel selection"
 msgstr ""
 
@@ -12134,7 +12049,7 @@ msgstr ""
 
 #: ../enigma2_experimental/data/ ../enigma2_master/data/
 msgid ""
 
 #: ../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 ""
 "\n"
 "Do you want to set the pin now?"
 msgstr ""
@@ -12576,15 +12491,15 @@ msgstr ""
 msgid "Kerni's DreamMM-HD skin"
 msgstr ""
 
 msgid "Kerni's DreamMM-HD skin"
 msgstr ""
 
-#: ../meta_skins/skin_dreamtv-hd.xml
-msgid "Kerni's dreamTV-HD skin"
-msgstr ""
-
 #: ../meta_skins/skin_dreamtv-hd.xml ../meta_skins/skin_dtv-hd-reloaded.xml
 #: ../meta_skins/skin_dtv-hd.xml
 msgid "A nice looking HD skin from Kerni"
 msgstr ""
 
 #: ../meta_skins/skin_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-reloaded.xml
 msgid "Kerni's dTV-HD-Reloaded skin"
 msgstr ""
@@ -12770,6 +12685,18 @@ msgstr ""
 msgid "The skin is in KingSize-definition 1024x576"
 msgstr ""
 
 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_skins/skin_yads-hd.xml
 msgid "Kerni's YADS-HD skin"
 msgstr ""
@@ -12811,11 +12738,11 @@ msgid "Set Bitstream/PCM audio delays"
 msgstr ""
 
 #: ../meta_plugins/plugin_automatictimerlistcleanup.xml
 msgstr ""
 
 #: ../meta_plugins/plugin_automatictimerlistcleanup.xml
-msgid "Cleanup timerlist automatically"
+msgid "Cleanup timerlist automatically."
 msgstr ""
 
 #: ../meta_plugins/plugin_automatictimerlistcleanup.xml
 msgstr ""
 
 #: ../meta_plugins/plugin_automatictimerlistcleanup.xml
-msgid "Cleanup timerlist automatically."
+msgid "Cleanup timerlist automatically"
 msgstr ""
 
 #: ../meta_plugins/plugin_automaticvolumeadjustment.xml
 msgstr ""
 
 #: ../meta_plugins/plugin_automaticvolumeadjustment.xml
@@ -12854,6 +12781,10 @@ msgstr ""
 msgid "Control your dreambox with only the MUTE button."
 msgstr ""
 
 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 ""
@@ -12892,6 +12823,20 @@ msgstr ""
 msgid "A client for www.dyndns.org"
 msgstr ""
 
 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 "
 #: ../meta_plugins/plugin_elektro.xml
 msgid ""
 "The Elektro Power Save plugin puts the box from standby to sleep mode (Deep "
@@ -12902,10 +12847,6 @@ msgid ""
 "time. You therefore don't have to wait until it is on again."
 msgstr ""
 
 "time. You therefore don't have to wait until it is on again."
 msgstr ""
 
-#: ../meta_plugins/plugin_elektro.xml
-msgid "Sets your Dreambox into Deep-Standby"
-msgstr ""
-
 #: ../meta_plugins/plugin_emailclient.xml
 msgid "IMAP4 e-mail viewer for the Dreambox"
 msgstr ""
 #: ../meta_plugins/plugin_emailclient.xml
 msgid "IMAP4 e-mail viewer for the Dreambox"
 msgstr ""
@@ -13138,6 +13079,16 @@ msgid ""
 "With MyTube you can play YouTube videos directly on your TV without a PC."
 msgstr ""
 
 "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 ""
Unnamed repository; edit this file 'description' to name the repository.