teletext.cpp: invert have_pts
[enigma2.git] / po / enigma2.pot
index d215786..e8cc831 100644 (file)
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-28 10:06+0100\n"
+"POT-Creation-Date: 2009-02-16 00:05+0100\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"
@@ -17,41 +17,105 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:202
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:106
 msgid ""
 "\n"
-"Enigma2 will restart after the restore"
+"Advanced options and settings."
 msgstr ""
 
-#: ../lib/python/Screens/TimerEdit.py:118
-#: ../lib/python/Screens/TimerEdit.py:120
-#: ../lib/python/Screens/TimerEdit.py:127
-#: ../lib/python/Screens/TimerEdit.py:129
-#: ../lib/python/Screens/TimerEdit.py:131
-#: ../lib/python/Screens/TimerEdit.py:133
-#: ../lib/python/Screens/TimerEdit.py:147
-#: ../lib/python/Screens/TimerEdit.py:149 ../data/
-msgid " "
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:145
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:347
+msgid ""
+"\n"
+"After pressing OK, please wait!"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:903
-#: ../lib/python/Components/NimManager.py:905
-#: ../lib/python/Components/NimManager.py:978
-#: ../lib/python/Components/NimManager.py:980
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:103
+msgid ""
+"\n"
+"Backup your Dreambox settings."
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:113
+msgid ""
+"\n"
+"Edit the upgrade source address."
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:101
+msgid ""
+"\n"
+"Online update of your Dreambox software."
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:98
+msgid ""
+"\n"
+"Press OK on your remote control to continue."
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:104
+msgid ""
+"\n"
+"Restore your Dreambox settings."
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:102
+msgid ""
+"\n"
+"Restore your Dreambox with a new firmware."
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:110
+msgid ""
+"\n"
+"Restore your backups by date."
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:109
+msgid ""
+"\n"
+"Scan for local packages and install them."
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:111
+msgid ""
+"\n"
+"Select your backup device.\n"
+"Current device: "
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:108
+msgid ""
+"\n"
+"View, install and remove available or installed packages."
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:1112
+#: ../lib/python/Components/NimManager.py:1114
+#: ../lib/python/Components/NimManager.py:1181
+#: ../lib/python/Components/NimManager.py:1182
+#: ../lib/python/Components/NimManager.py:951
+#: ../lib/python/Components/NimManager.py:953
+#: ../lib/python/Components/NimManager.py:1026
+#: ../lib/python/Components/NimManager.py:1028
 msgid "%H:%M"
 msgstr ""
 
-#: ../lib/python/Screens/Standby.py:113
+#: ../lib/python/Screens/Standby.py:117
 #, python-format
 msgid "%d jobs are running in the background!"
 msgstr ""
 
+#: ../lib/python/Screens/EventView.py:147
 #: ../lib/python/Screens/EventView.py:121
 #, python-format
 msgid "%d min"
 msgstr ""
 
 #: ../lib/python/Components/ServiceScan.py:33
+#: ../lib/python/Components/ServiceScan.py:96
+#: ../lib/python/Components/ServiceScan.py:98
 #: ../lib/python/Components/ServiceScan.py:92
 #: ../lib/python/Components/ServiceScan.py:94
 #, python-format
@@ -59,9 +123,8 @@ msgid "%d services found!"
 msgstr ""
 
 #: ../lib/python/Screens/TimeDateInput.py:40
-#: ../lib/python/Screens/TimerEntry.py:94
-#: ../lib/python/Screens/TimerEntry.py:97
-#: ../lib/python/Screens/TimerEntry.py:106
+#: ../lib/python/Screens/TimerEntry.py:105
+#: ../lib/python/Screens/TimerEntry.py:115
 msgid "%d.%B %Y"
 msgstr ""
 
@@ -82,81 +145,88 @@ msgstr ""
 msgid "(ZAP)"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:462
+#: ../lib/python/Components/NimManager.py:512
+#: ../lib/python/Components/NimManager.py:485
 msgid "(empty)"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:316
+#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:326
 msgid "(show optional DVD audio menu)"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:383
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:386
-msgid ".NFI Download failed:"
-msgstr ""
-
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:625
-msgid ".NFI Flasher bootable USB stick successfully created."
+#: ../lib/python/Screens/NetworkSetup.py:81
+msgid "* Only available if more than one interface is active."
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:426
-msgid ""
-".NFI file passed md5sum signature check. You can safely flash this image!"
+#: ../lib/python/Screens/NetworkSetup.py:315
+msgid "* Only available when entering hidden SSID or network key"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:107
-msgid "/usr/share/enigma2 directory"
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:386
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:389
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:385
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:388
+msgid ".NFI Download failed:"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:107
-msgid "/var directory"
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:435
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:434
+msgid ""
+".NFI file passed md5sum signature check. You can safely flash this image!"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:955
+#: ../lib/python/Components/NimManager.py:1067
+#: ../lib/python/Components/NimManager.py:1003
 msgid "1.0"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:955
+#: ../lib/python/Components/NimManager.py:1067
+#: ../lib/python/Components/NimManager.py:1003
 msgid "1.1"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:953
-#: ../lib/python/Components/NimManager.py:955
+#: ../lib/python/Components/NimManager.py:1066
+#: ../lib/python/Components/NimManager.py:1067
+#: ../lib/python/Components/NimManager.py:1001
+#: ../lib/python/Components/NimManager.py:1003
 msgid "1.2"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:918
-#: ../lib/python/Components/NimManager.py:926
+#: ../lib/python/Components/NimManager.py:1063
+#: ../lib/python/Components/NimManager.py:966
+#: ../lib/python/Components/NimManager.py:974
 msgid "13 V"
 msgstr ""
 
-#: ../lib/python/Components/AVSwitch.py:102
+#: ../lib/python/Components/AVSwitch.py:89
 msgid "16:10"
 msgstr ""
 
-#: ../lib/python/Components/AVSwitch.py:94
+#: ../lib/python/Components/AVSwitch.py:81
 msgid "16:10 Letterbox"
 msgstr ""
 
-#: ../lib/python/Components/AVSwitch.py:95
+#: ../lib/python/Components/AVSwitch.py:82
 msgid "16:10 PanScan"
 msgstr ""
 
-#: ../lib/python/Components/AVSwitch.py:92
-#: ../lib/python/Components/AVSwitch.py:101
+#: ../lib/python/Components/AVSwitch.py:79
+#: ../lib/python/Components/AVSwitch.py:88
+#: ../lib/python/Plugins/Extensions/DVDBurn/DVDTitle.py:17
 msgid "16:9"
 msgstr ""
 
-#: ../lib/python/Components/AVSwitch.py:96
+#: ../lib/python/Components/AVSwitch.py:83
 msgid "16:9 Letterbox"
 msgstr ""
 
-#: ../lib/python/Components/AVSwitch.py:93
+#: ../lib/python/Components/AVSwitch.py:80
 msgid "16:9 always"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:918
-#: ../lib/python/Components/NimManager.py:926
+#: ../lib/python/Components/NimManager.py:1063
+#: ../lib/python/Components/NimManager.py:966
+#: ../lib/python/Components/NimManager.py:974
 msgid "18 V"
 msgstr ""
 
@@ -164,15 +234,16 @@ msgstr ""
 msgid "30 minutes"
 msgstr ""
 
-#: ../lib/python/Components/AVSwitch.py:100
+#: ../lib/python/Components/AVSwitch.py:87
+#: ../lib/python/Plugins/Extensions/DVDBurn/DVDTitle.py:17
 msgid "4:3"
 msgstr ""
 
-#: ../lib/python/Components/AVSwitch.py:90
+#: ../lib/python/Components/AVSwitch.py:77
 msgid "4:3 Letterbox"
 msgstr ""
 
-#: ../lib/python/Components/AVSwitch.py:91
+#: ../lib/python/Components/AVSwitch.py:78
 msgid "4:3 PanScan"
 msgstr ""
 
@@ -188,15 +259,17 @@ msgstr ""
 msgid "<unknown>"
 msgstr ""
 
-#: ../lib/python/Screens/Menu.py:109 ../lib/python/Screens/Menu.py:156
-#: ../lib/python/Screens/Menu.py:159 ../lib/python/Screens/Setup.py:139
+#: ../lib/python/Screens/Menu.py:150 ../lib/python/Screens/Menu.py:153
 msgid "??"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:951 ../data/
+#: ../lib/python/Components/NimManager.py:1065 ../data/
+#: ../lib/python/Components/NimManager.py:999
 msgid "A"
 msgstr ""
 
+#: ../lib/python/Screens/Ipkg.py:108
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:612
 #: ../lib/python/Screens/Ipkg.py:104
 #: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:313
 #, python-format
@@ -205,48 +278,51 @@ msgid ""
 "Do you want to keep your version?"
 msgstr ""
 
-#: ../RecordTimer.py:274
+#: ../RecordTimer.py:283 ../RecordTimer.py:277
 msgid ""
 "A finished record timer wants to set your\n"
 "Dreambox to standby. Do that now?"
 msgstr ""
 
-#: ../RecordTimer.py:280
+#: ../RecordTimer.py:289 ../RecordTimer.py:283
 msgid ""
 "A finished record timer wants to shut down\n"
 "your Dreambox. Shutdown now?"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/GraphMultiEPG/plugin.py:95
+#: ../lib/python/Plugins/Extensions/GraphMultiEPG/plugin.py:96
 msgid "A graphical EPG for all services of an specific bouquet"
 msgstr ""
 
-#: ../RecordTimer.py:332
+#: ../RecordTimer.py:364 ../RecordTimer.py:335
 #, python-format
 msgid ""
 "A record has been started:\n"
 "%s"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1538
+#: ../lib/python/Screens/InfoBarGenerics.py:1569
+#: ../lib/python/Screens/InfoBarGenerics.py:1559
 msgid ""
 "A recording is currently running.\n"
 "What do you want to do?"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:571
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:589
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:594
 msgid ""
 "A recording is currently running. Please stop the recording before trying to "
 "configure the positioner."
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:289
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:262
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:298
 msgid ""
 "A recording is currently running. Please stop the recording before trying to "
 "start the satfinder."
 msgstr ""
 
-#: ../lib/python/Components/Task.py:372
+#: ../lib/python/Components/Task.py:381 ../lib/python/Components/Task.py:379
 #, python-format
 msgid "A required tool (%s) was not found."
 msgstr ""
@@ -263,32 +339,36 @@ msgid ""
 "your Dreambox. Shutdown now?"
 msgstr ""
 
-#: ../RecordTimer.py:229
+#: ../RecordTimer.py:233 ../RecordTimer.py:232
 msgid ""
 "A timer failed to record!\n"
 "Disable TV and try again?\n"
 msgstr ""
 
 #: ../lib/python/Plugins/SystemPlugins/Videomode/plugin.py:34
-#: ../lib/python/Plugins/SystemPlugins/Videomode/plugin.py:210 ../data/
+#: ../lib/python/Plugins/SystemPlugins/Videomode/plugin.py:211 ../data/
 msgid "A/V Settings"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:933
+#: ../lib/python/Components/NimManager.py:1041
+#: ../lib/python/Components/NimManager.py:981
 msgid "AA"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:933
+#: ../lib/python/Components/NimManager.py:1041
+#: ../lib/python/Components/NimManager.py:981
 msgid "AB"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/Videomode/plugin.py:94 ../data/
+#: ../lib/python/Plugins/SystemPlugins/Videomode/plugin.py:95 ../data/
 msgid "AC3 default"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1601
-#: ../lib/python/Screens/InfoBarGenerics.py:1619
-#: ../lib/python/Plugins/SystemPlugins/Videomode/plugin.py:96 ../data/
+#: ../lib/python/Screens/InfoBarGenerics.py:1634
+#: ../lib/python/Screens/InfoBarGenerics.py:1652
+#: ../lib/python/Plugins/SystemPlugins/Videomode/plugin.py:97 ../data/
+#: ../lib/python/Screens/InfoBarGenerics.py:1622
+#: ../lib/python/Screens/InfoBarGenerics.py:1640
 msgid "AC3 downmix"
 msgstr ""
 
@@ -301,17 +381,17 @@ msgstr ""
 msgid "Action:"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1332
+#: ../lib/python/Screens/InfoBarGenerics.py:1353
 msgid "Activate Picture in Picture"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:630
+#: ../lib/python/Screens/NetworkSetup.py:857
 msgid "Adapter settings"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:159
-#: ../lib/python/Screens/TimerEdit.py:27
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:126
+#: ../lib/python/Screens/NetworkSetup.py:205
+#: ../lib/python/Screens/TimerEdit.py:43
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:140
 msgid "Add"
 msgstr ""
 
@@ -319,32 +399,45 @@ msgstr ""
 msgid "Add Bookmark"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:199
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:172
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:204
 msgid "Add a mark"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:44
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:85
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:129
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:43
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:104
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:143
 msgid "Add a new title"
 msgstr ""
 
+#: ../lib/python/Screens/EpgSelection.py:68
+#: ../lib/python/Screens/EpgSelection.py:196
+#: ../lib/python/Screens/EpgSelection.py:231
+#: ../lib/python/Screens/EpgSelection.py:342
+#: ../lib/python/Screens/EventView.py:39 ../lib/python/Screens/EventView.py:70
+#: ../lib/python/Screens/EventView.py:104
+#: ../lib/python/Screens/EventView.py:164
+#: ../lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py:576
+#: ../lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py:611
+#: ../lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py:662
 #: ../lib/python/Screens/EpgSelection.py:60
 #: ../lib/python/Screens/EventView.py:34
-#: ../lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py:348
+#: ../lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py:366
 msgid "Add timer"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:44
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:62
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:43
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:61
 msgid "Add title"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1721
+#: ../lib/python/Screens/InfoBarGenerics.py:1759
+#: ../lib/python/Screens/InfoBarGenerics.py:1742
 msgid "Add to bouquet"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1723
+#: ../lib/python/Screens/InfoBarGenerics.py:1761
+#: ../lib/python/Screens/InfoBarGenerics.py:1744
 msgid "Add to favourites"
 msgstr ""
 
@@ -356,43 +449,51 @@ msgid ""
 "test screens."
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:34
-msgid "Advanced"
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:106
+msgid "Advanced Options"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/Videomode/plugin.py:219
+#: ../lib/python/Plugins/SystemPlugins/Videomode/plugin.py:220
 msgid "Advanced Video Setup"
 msgstr ""
 
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:110
+msgid "Advanced restore"
+msgstr ""
+
 #: ../lib/python/Screens/TaskView.py:52
-#: ../lib/python/Screens/TimerEntry.py:191
+#: ../lib/python/Screens/TimerEntry.py:185
 msgid "After event"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:86
-msgid "Album:"
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:130
+msgid "Album"
 msgstr ""
 
 #: ../lib/python/Screens/ChannelSelection.py:651
 #: ../lib/python/Screens/ChannelSelection.py:791
+#: ../lib/python/Screens/MovieSelection.py:202
 msgid "All"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:909
+#: ../lib/python/Components/NimManager.py:1060
+#: ../lib/python/Components/NimManager.py:1061
+#: ../lib/python/Components/NimManager.py:957
 msgid "All Satellites"
 msgstr ""
 
-#: ../lib/python/Screens/MovieSelection.py:181
-msgid "All..."
-msgstr ""
-
 #: ../lib/python/Screens/LocationBox.py:384
 msgid "An empty filename is illegal."
 msgstr ""
 
-#: ../lib/python/Components/Task.py:338
-#: ../lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:165
-#: ../lib/python/Plugins/Extensions/DVDBurn/Process.py:255
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:451
+msgid "An error occured!"
+msgstr ""
+
+#: ../lib/python/Components/Task.py:347
+#: ../lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:168
+#: ../lib/python/Plugins/Extensions/DVDBurn/Process.py:282
+#: ../lib/python/Components/Task.py:345
 msgid "An unknown error occured!"
 msgstr ""
 
@@ -400,14 +501,32 @@ msgstr ""
 msgid "Arabic"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:557
+#: ../lib/python/Screens/NetworkSetup.py:593
+msgid ""
+"Are you sure you want to activate this network configuration?\n"
+"\n"
+msgstr ""
+
+#: ../lib/python/Screens/NetworkSetup.py:788
 msgid ""
 "Are you sure you want to restart your network interfaces?\n"
 "\n"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:82
-msgid "Artist:"
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:251
+msgid ""
+"Are you sure you want to restore\n"
+"following backup:\n"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:152
+msgid ""
+"Are you sure you want to restore your Enigma2 backup?\n"
+"Enigma2 will restart after the restore"
+msgstr ""
+
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:126
+msgid "Artist"
 msgstr ""
 
 #: ../lib/python/Screens/SleepTimerEdit.py:83
@@ -415,84 +534,104 @@ msgstr ""
 msgid "Ask before shutdown:"
 msgstr ""
 
-#: ../lib/python/Components/UsageConfig.py:34
-#: ../lib/python/Components/UsageConfig.py:36
-#: ../lib/python/Components/UsageConfig.py:38
+#: ../lib/python/Components/UsageConfig.py:37
+#: ../lib/python/Components/UsageConfig.py:39
+#: ../lib/python/Components/UsageConfig.py:41
 msgid "Ask user"
 msgstr ""
 
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py:82
 #: ../lib/python/Plugins/SystemPlugins/Videomode/plugin.py:77 ../data/
 msgid "Aspect Ratio"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:133 ../data/
-msgid "Audio"
-msgstr ""
-
-#: ../lib/python/Screens/InfoBarGenerics.py:1562
+#: ../lib/python/Screens/InfoBarGenerics.py:1593
+#: ../lib/python/Screens/InfoBarGenerics.py:1583
 msgid "Audio Options..."
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:122
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:138
 msgid "Authoring mode"
 msgstr ""
 
 #: ../lib/python/Screens/Ci.py:19 ../lib/python/Screens/ScanSetup.py:544
-#: ../lib/python/Screens/ScanSetup.py:547
-#: ../lib/python/Screens/ScanSetup.py:551
+#: ../lib/python/Screens/ScanSetup.py:552
+#: ../lib/python/Screens/ScanSetup.py:579
+#: ../lib/python/Screens/ScanSetup.py:586
+#: ../lib/python/Screens/ScanSetup.py:594
+#: ../lib/python/Screens/ScanSetup.py:609
+#: ../lib/python/Screens/ScanSetup.py:622
+#: ../lib/python/Screens/ScanSetup.py:629
+#: ../lib/python/Screens/ScanSetup.py:634
+#: ../lib/python/Screens/ScanSetup.py:638
+#: ../lib/python/Screens/ScanSetup.py:644
+#: ../lib/python/Screens/ScanSetup.py:650
+#: ../lib/python/Components/NimManager.py:1038
+#: ../lib/python/Tools/Transponder.py:10 ../lib/python/Tools/Transponder.py:15
+#: ../lib/python/Tools/Transponder.py:26 ../lib/python/Tools/Transponder.py:44
+#: ../lib/python/Tools/Transponder.py:50 ../lib/python/Tools/Transponder.py:57
+#: ../lib/python/Tools/Transponder.py:62 ../lib/python/Tools/Transponder.py:72
+#: ../lib/python/Tools/Transponder.py:77 ../lib/python/Tools/Transponder.py:84
+#: ../lib/python/Tools/Transponder.py:91 ../lib/python/Tools/Transponder.py:96
+#: ../lib/python/Tools/Transponder.py:100
+#: ../lib/python/Tools/Transponder.py:106
+#: ../lib/python/Tools/Transponder.py:112
+#: ../lib/python/Screens/ScanSetup.py:542
+#: ../lib/python/Screens/ScanSetup.py:545
+#: ../lib/python/Screens/ScanSetup.py:549
+#: ../lib/python/Screens/ScanSetup.py:553
 #: ../lib/python/Screens/ScanSetup.py:555
-#: ../lib/python/Screens/ScanSetup.py:557
-#: ../lib/python/Screens/ScanSetup.py:562
+#: ../lib/python/Screens/ScanSetup.py:560
+#: ../lib/python/Screens/ScanSetup.py:564
+#: ../lib/python/Screens/ScanSetup.py:565
 #: ../lib/python/Screens/ScanSetup.py:566
 #: ../lib/python/Screens/ScanSetup.py:567
 #: ../lib/python/Screens/ScanSetup.py:568
 #: ../lib/python/Screens/ScanSetup.py:569
-#: ../lib/python/Screens/ScanSetup.py:570
-#: ../lib/python/Screens/ScanSetup.py:571
 msgid "Auto"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:136
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py:89
 msgid "Auto chapter split every ? minutes (0=never)"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/Videomode/plugin.py:91 ../data/
+#: ../lib/python/Plugins/SystemPlugins/Videomode/plugin.py:92 ../data/
 msgid "Auto scart switching"
 msgstr ""
 
-#: ../lib/python/Components/AVSwitch.py:103
+#: ../lib/python/Components/AVSwitch.py:90
 msgid "Automatic"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:385
-msgid "Automatic SSID lookup"
-msgstr ""
-
-#: ../lib/python/Screens/ScanSetup.py:837 ../data/
+#: ../lib/python/Screens/ScanSetup.py:899 ../data/
+#: ../lib/python/Screens/ScanSetup.py:835
 msgid "Automatic Scan"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:93
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:107
 msgid "Available format variables"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:951 ../data/
+#: ../lib/python/Components/NimManager.py:1065 ../data/
+#: ../lib/python/Components/NimManager.py:999
 msgid "B"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:933
+#: ../lib/python/Components/NimManager.py:1041
+#: ../lib/python/Components/NimManager.py:981
 msgid "BA"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:933
+#: ../lib/python/Components/NimManager.py:1041
+#: ../lib/python/Components/NimManager.py:981
 msgid "BB"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:958
-#: ../lib/python/Screens/NetworkSetup.py:963
-#: ../lib/python/Screens/NetworkSetup.py:968
-#: ../lib/python/Screens/NetworkSetup.py:973
-#: ../lib/python/Screens/NetworkSetup.py:978
+#: ../lib/python/Screens/NetworkSetup.py:1220
+#: ../lib/python/Screens/NetworkSetup.py:1225
+#: ../lib/python/Screens/NetworkSetup.py:1230
+#: ../lib/python/Screens/NetworkSetup.py:1235
+#: ../lib/python/Screens/NetworkSetup.py:1240
 msgid "Back"
 msgstr ""
 
@@ -500,31 +639,45 @@ msgstr ""
 msgid "Background"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:73
-msgid "Backup"
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:216
+msgid "Backup done."
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:110
-msgid "Backup Location"
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:218
+msgid "Backup failed."
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:109
-msgid "Backup Mode"
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:79
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:81
+msgid "Backup running"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:919
-#: ../lib/python/Components/NimManager.py:927
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:65
+msgid "Backup running..."
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:103
+msgid "Backup system settings"
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:1064
+#: ../lib/python/Components/NimManager.py:967
+#: ../lib/python/Components/NimManager.py:975
 msgid "Band"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:426
+#: ../lib/python/Screens/ScanSetup.py:390
+#: ../lib/python/Screens/ServiceInfo.py:142
+#: ../lib/python/Screens/ScanSetup.py:425
 #: ../lib/python/Screens/ServiceInfo.py:140
 msgid "Bandwidth"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:42
-#: ../lib/python/Screens/Satconfig.py:265
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:93
+#: ../lib/python/Screens/Satconfig.py:47
+#: ../lib/python/Screens/Satconfig.py:313
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:107
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py:90
+#: ../lib/python/Screens/Satconfig.py:270
 msgid "Begin time"
 msgstr ""
 
@@ -536,15 +689,21 @@ msgstr ""
 msgid "Brightness"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/Process.py:644
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:48
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:81
+#: ../lib/python/Plugins/Extensions/DVDBurn/DVDProject.py:28
+#: ../lib/python/Plugins/Extensions/DVDBurn/Process.py:862
+#: ../lib/python/Plugins/Extensions/DVDBurn/Process.py:901
+#: ../lib/python/Plugins/Extensions/DVDBurn/Process.py:920
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:47
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:94
 msgid "Burn DVD"
 msgstr ""
 
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:97
+msgid "Burn existing image to DVD"
+msgstr ""
+
 #: ../lib/python/Plugins/Extensions/DVDBurn/plugin.py:15
 #: ../lib/python/Plugins/Extensions/DVDBurn/plugin.py:16
-#: ../lib/python/Plugins/Extensions/DVDBurn/Process.py:261
 msgid "Burn to DVD..."
 msgstr ""
 
@@ -552,24 +711,22 @@ msgstr ""
 msgid "Bus: "
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:945
+#: ../lib/python/Components/NimManager.py:923
+#: ../lib/python/Components/NimManager.py:993
 msgid "C-Band"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:108
-msgid "CF Drive"
-msgstr ""
-
-#: ../lib/python/Components/AVSwitch.py:82
+#: ../lib/python/Components/AVSwitch.py:69
 msgid "CVBS"
 msgstr ""
 
 #: ../lib/python/Screens/ChannelSelection.py:907
 #: ../lib/python/Components/ServiceScan.py:69
+#: ../lib/python/Tools/Transponder.py:48
 msgid "Cable"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:405
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:172
 msgid "Cache Thumbnails"
 msgstr ""
 
@@ -578,18 +735,26 @@ msgid "Call monitoring"
 msgstr ""
 
 #: ../lib/python/Screens/LocationBox.py:94
-#: ../lib/python/Screens/LocationBox.py:128 ../lib/python/Screens/Setup.py:93
+#: ../lib/python/Screens/LocationBox.py:128 ../lib/python/Screens/Setup.py:95
 #: ../lib/python/Screens/TimeDateInput.py:14
 #: ../lib/python/Screens/TimerEntry.py:29
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:88
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:102
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py:39
+#: ../lib/python/Plugins/Extensions/MediaPlayer/settings.py:30
+#: ../lib/python/Plugins/Extensions/MediaPlayer/settings.py:69
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:198
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:113
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:201
+#: ../lib/python/Plugins/SystemPlugins/Videomode/plugin.py:37 ../data/
+#: ../lib/python/Screens/Setup.py:88
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:72
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:160
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:195
-#: ../lib/python/Plugins/SystemPlugins/Videomode/plugin.py:37 ../data/
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:197
 msgid "Cancel"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:321
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:324
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:323
 msgid "Cannot parse feed directory"
 msgstr ""
 
@@ -597,7 +762,8 @@ msgstr ""
 msgid "Capacity: "
 msgstr ""
 
-#: ../lib/python/Components/Harddisk.py:265
+#: ../lib/python/Components/Harddisk.py:352
+#: ../lib/python/Components/Harddisk.py:278
 msgid "Card"
 msgstr ""
 
@@ -605,8 +771,10 @@ msgstr ""
 msgid "Catalan"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:205
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:241
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:208
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:244
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:207
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:243
 msgid "Change dir."
 msgstr ""
 
@@ -627,24 +795,33 @@ msgstr ""
 msgid "Change setup pin"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:193
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:93 ../data/
+#: ../lib/python/Screens/Satconfig.py:242
+#: ../lib/python/Screens/Satconfig.py:254
+#: ../lib/python/Screens/Satconfig.py:265
+#: ../lib/python/Screens/TimerEntry.py:175
+#: ../lib/python/Plugins/Extensions/DVDBurn/DVDTitle.py:16
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:107
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py:90 ../data/
 msgid "Channel"
 msgstr ""
 
+#: ../lib/python/Screens/TimerEdit.py:335
+msgid "Channel not in services list"
+msgstr ""
+
 #: ../lib/python/Screens/InfoBarGenerics.py:153
 msgid "Channel:"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:400
+#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:420
 msgid "Chap."
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:401
+#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:421
 msgid "Chapter"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:142
+#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:144
 msgid "Chapter:"
 msgstr ""
 
@@ -656,103 +833,145 @@ msgstr ""
 msgid "Checking Filesystem..."
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:36
-msgid "Choose source"
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:112
+msgid "Choose backup files"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:111
+msgid "Choose backup location"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:234
+#: ../lib/python/Screens/TimerEntry.py:225
 msgid "Choose target folder"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEdit.py:29
-#: ../lib/python/Screens/TimerEdit.py:143
-#: ../lib/python/Screens/TimerEdit.py:145
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:113
+msgid "Choose upgrade source"
+msgstr ""
+
+#: ../lib/python/Tools/Transponder.py:33
+msgid "Circular left"
+msgstr ""
+
+#: ../lib/python/Tools/Transponder.py:34
+msgid "Circular right"
+msgstr ""
+
+#: ../lib/python/Screens/TimerEdit.py:166
+#: ../lib/python/Screens/TimerEdit.py:165
 msgid "Cleanup"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:434
-#: ../lib/python/Screens/ScanSetup.py:828
+#: ../lib/python/Screens/ScanSetup.py:398
+#: ../lib/python/Screens/ScanSetup.py:890
+#: ../lib/python/Screens/ScanSetup.py:433
+#: ../lib/python/Screens/ScanSetup.py:826
 msgid "Clear before scan"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:369
+#: ../lib/python/Screens/TimerEntry.py:387
 msgid "Clear log"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:54
-#: ../lib/python/Screens/NetworkSetup.py:161
-#: ../lib/python/Screens/NetworkSetup.py:271
-#: ../lib/python/Screens/NetworkSetup.py:484
-#: ../lib/python/Screens/NetworkSetup.py:753
-#: ../lib/python/Screens/NetworkSetup.py:1045
+#: ../lib/python/Screens/NetworkSetup.py:60
+#: ../lib/python/Screens/NetworkSetup.py:207
+#: ../lib/python/Screens/NetworkSetup.py:350
+#: ../lib/python/Screens/NetworkSetup.py:697
+#: ../lib/python/Screens/NetworkSetup.py:1047
+#: ../lib/python/Screens/NetworkSetup.py:1307
 #: ../lib/python/Screens/TaskView.py:47
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:335
 msgid "Close"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:427
+#: ../lib/python/Screens/ScanSetup.py:391
+#: ../lib/python/Screens/ScanSetup.py:426
 msgid "Code rate high"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:428
+#: ../lib/python/Screens/ScanSetup.py:392
+#: ../lib/python/Screens/ScanSetup.py:427
 msgid "Code rate low"
 msgstr ""
 
+#: ../lib/python/Screens/ServiceInfo.py:149
 #: ../lib/python/Screens/ServiceInfo.py:147
 msgid "Coderate HP"
 msgstr ""
 
+#: ../lib/python/Screens/ServiceInfo.py:148
 #: ../lib/python/Screens/ServiceInfo.py:146
 msgid "Coderate LP"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:121
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:137
 msgid "Collection name"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:47
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:84
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:46
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:100
 msgid "Collection settings"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/Videomode/plugin.py:87 ../data/
+#: ../lib/python/Plugins/SystemPlugins/Videomode/plugin.py:88 ../data/
 msgid "Color Format"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:236
-#: ../lib/python/Screens/Satconfig.py:248
+#: ../lib/python/Screens/Satconfig.py:284
+#: ../lib/python/Screens/Satconfig.py:296
+#: ../lib/python/Screens/Satconfig.py:241
+#: ../lib/python/Screens/Satconfig.py:253
 msgid "Command order"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:232
+#: ../lib/python/Screens/Satconfig.py:280
+#: ../lib/python/Screens/Satconfig.py:237
 msgid "Committed DiSEqC command"
 msgstr ""
 
-#: ../lib/python/Components/Harddisk.py:266
+#: ../lib/python/Components/Harddisk.py:353
+#: ../lib/python/Components/Harddisk.py:279
 msgid "Compact Flash"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:519
-#: ../lib/python/Screens/ScanSetup.py:520
+#: ../lib/python/Screens/ScanSetup.py:514
+#: ../lib/python/Screens/ScanSetup.py:515
+#: ../lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py:566
+#: ../lib/python/Screens/ScanSetup.py:517
+#: ../lib/python/Screens/ScanSetup.py:518
 msgid "Complete"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:87
-#: ../lib/python/Screens/Satconfig.py:139
-#: ../lib/python/Screens/Satconfig.py:173
-#: ../lib/python/Screens/Satconfig.py:284 ../data/
+#: ../lib/python/Plugins/Extensions/DVDBurn/DVDProject.py:27
+msgid "Complex (allows mixing audio tracks and aspects)"
+msgstr ""
+
+#: ../lib/python/Screens/Satconfig.py:96
+#: ../lib/python/Screens/Satconfig.py:148
+#: ../lib/python/Screens/Satconfig.py:182
+#: ../lib/python/Screens/Satconfig.py:239
+#: ../lib/python/Screens/Satconfig.py:330 ../data/
+#: ../lib/python/Screens/Satconfig.py:92
+#: ../lib/python/Screens/Satconfig.py:144
+#: ../lib/python/Screens/Satconfig.py:178
+#: ../lib/python/Screens/Satconfig.py:289
 msgid "Configuration Mode"
 msgstr ""
 
+#: ../lib/python/Screens/Ipkg.py:99
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:607
 #: ../lib/python/Screens/Ipkg.py:95
 #: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:308
 msgid "Configuring"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEdit.py:309
+#: ../lib/python/Screens/TimerEdit.py:331
+#: ../lib/python/Screens/TimerEdit.py:335
 msgid "Conflicting timer"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:123
+#: ../lib/python/Screens/Satconfig.py:132
+#: ../lib/python/Screens/Satconfig.py:128
 msgid "Connected to"
 msgstr ""
 
@@ -772,15 +991,16 @@ msgid ""
 "retrying..."
 msgstr ""
 
+#: ../lib/python/Screens/ServiceInfo.py:150
 #: ../lib/python/Screens/ServiceInfo.py:148
 msgid "Constellation"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/Process.py:251
+#: ../lib/python/Plugins/Extensions/DVDBurn/Process.py:276
 msgid "Content does not fit on DVD!"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:474
+#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:516
 msgid "Continue playing"
 msgstr ""
 
@@ -788,19 +1008,29 @@ msgstr ""
 msgid "Contrast"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:591
-msgid "Copying USB flasher boot image to stick..."
-msgstr ""
-
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:293
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:296
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:295
 msgid "Could not connect to Dreambox .NFI Image Feed Server:"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/Process.py:250
+#: ../lib/python/Plugins/Extensions/DVDBurn/Process.py:275
 msgid "Could not load Medium! No disc inserted?"
 msgstr ""
 
-#: ../lib/python/Components/Harddisk.py:169
+#: ../lib/python/Screens/InfoBarGenerics.py:1476
+#, python-format
+msgid "Couldn't record due to conflicting timer %s"
+msgstr ""
+
+#: ../lib/python/Plugins/Extensions/DVDBurn/DVDProject.py:28
+#: ../lib/python/Plugins/Extensions/DVDBurn/Process.py:866
+#: ../lib/python/Plugins/Extensions/DVDBurn/Process.py:905
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:96
+msgid "Create DVD-ISO"
+msgstr ""
+
+#: ../lib/python/Components/Harddisk.py:182
+#: ../lib/python/Components/Harddisk.py:172
 msgid "Create movie folder failed"
 msgstr ""
 
@@ -809,7 +1039,8 @@ msgstr ""
 msgid "Creating directory %s failed."
 msgstr ""
 
-#: ../lib/python/Components/Harddisk.py:169
+#: ../lib/python/Components/Harddisk.py:182
+#: ../lib/python/Components/Harddisk.py:172
 msgid "Creating partition failed"
 msgstr ""
 
@@ -821,7 +1052,7 @@ msgstr ""
 msgid "Current Transponder"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:256
+#: ../lib/python/Screens/NetworkSetup.py:335
 msgid "Current settings:"
 msgstr ""
 
@@ -829,11 +1060,13 @@ msgstr ""
 msgid "Current version:"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:78
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:83
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:81
 msgid "Cut"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:406
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:389
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:421
 msgid "Cutlist editor..."
 msgstr ""
 
@@ -841,24 +1074,26 @@ msgstr ""
 msgid "Czech"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:1024
+#: ../lib/python/Screens/NetworkSetup.py:1286
 msgid "DHCP"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:542
+#: ../lib/python/Screens/ScanSetup.py:538
+#: ../lib/python/Screens/ScanSetup.py:540
 msgid "DVB-S"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:542
+#: ../lib/python/Screens/ScanSetup.py:539
+#: ../lib/python/Screens/ScanSetup.py:540
 msgid "DVB-S2"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:635
+#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:676
 msgid "DVD Player"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:148
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:83
+#: ../lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:151
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:98
 msgid "DVD media toolbox"
 msgstr ""
 
@@ -867,45 +1102,53 @@ msgid "Danish"
 msgstr ""
 
 #: ../lib/python/Screens/TimeDateInput.py:46
+#: ../lib/python/Screens/TimerEntry.py:164
 msgid "Date"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:565
-msgid "Decompressing USB stick flasher boot image..."
-msgstr ""
-
 #: ../lib/python/Screens/SleepTimerEdit.py:78 ../data/
 msgid "Deep Standby"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:160
-#: ../lib/python/Screens/TimerEdit.py:26
-#: ../lib/python/Screens/TimerEdit.py:109
-#: ../lib/python/Screens/TimerEdit.py:111
+#: ../lib/python/Screens/NetworkSetup.py:206
+#: ../lib/python/Screens/TimerEdit.py:132
+#: ../lib/python/Screens/TimerEdit.py:131
 msgid "Delete"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:366
+#: ../lib/python/Screens/TimerEntry.py:384
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:491
 msgid "Delete entry"
 msgstr ""
 
-#: ../lib/python/Screens/MovieSelection.py:123
+#: ../lib/python/Screens/MovieSelection.py:143
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:652
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:711
 msgid "Delete failed!"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:322
+#: ../lib/python/Screens/Satconfig.py:368
+#: ../lib/python/Screens/Satconfig.py:327
 #, python-format
 msgid ""
 "Delete no more configured satellite\n"
 "%s?"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:139
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:93
+#: ../lib/python/Screens/TimerEntry.py:135
+#: ../lib/python/Plugins/Extensions/DVDBurn/DVDTitle.py:15
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:107
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py:74
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py:90
 msgid "Description"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:239
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:151
+msgid "Deselect"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:242
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:241
 msgid "Destination directory"
 msgstr ""
 
@@ -917,45 +1160,45 @@ msgstr ""
 msgid "Detected NIMs:"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:876
+#: ../lib/python/Components/NimManager.py:1048
+#: ../lib/python/Components/NimManager.py:921
 msgid "DiSEqC A/B"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:877
+#: ../lib/python/Components/NimManager.py:1048
+#: ../lib/python/Components/NimManager.py:922
 msgid "DiSEqC A/B/C/D"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:91
-msgid "DiSEqC Mode"
-msgstr ""
-
-#: ../lib/python/Screens/Satconfig.py:228
+#: ../lib/python/Screens/Satconfig.py:276
+#: ../lib/python/Screens/Satconfig.py:233
 msgid "DiSEqC mode"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:251
+#: ../lib/python/Screens/Satconfig.py:299
+#: ../lib/python/Screens/Satconfig.py:256
 msgid "DiSEqC repeats"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/DVDProject.py:35
+#: ../lib/python/Plugins/Extensions/DVDBurn/DVDProject.py:26
 msgid "Direct playback of linked titles without menu"
 msgstr ""
 
-#: ../lib/python/Screens/MovieSelection.py:355
+#: ../lib/python/Screens/MovieSelection.py:382
 #, python-format
 msgid "Directory %s nonexistent."
 msgstr ""
 
-#: ../lib/python/Screens/TimerEdit.py:122
-#: ../lib/python/Screens/TimerEdit.py:124
-#: ../lib/python/Screens/TimerEdit.py:390
-#: ../lib/python/Screens/TimerEdit.py:392
-#: ../lib/python/Screens/TimerEdit.py:406
-#: ../lib/python/Screens/TimerEdit.py:408
+#: ../lib/python/Screens/TimerEdit.py:145
+#: ../lib/python/Screens/TimerEdit.py:418
+#: ../lib/python/Screens/TimerEdit.py:438
+#: ../lib/python/Screens/TimerEdit.py:144
+#: ../lib/python/Screens/TimerEdit.py:420
+#: ../lib/python/Screens/TimerEdit.py:440
 msgid "Disable"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1330
+#: ../lib/python/Screens/InfoBarGenerics.py:1351
 msgid "Disable Picture in Picture"
 msgstr ""
 
@@ -979,7 +1222,7 @@ msgid ""
 "retrying..."
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/Videomode/plugin.py:82
+#: ../lib/python/Plugins/SystemPlugins/Videomode/plugin.py:83
 msgid "Display 16:9 content as"
 msgstr ""
 
@@ -987,6 +1230,11 @@ msgstr ""
 msgid "Display 4:3 content as"
 msgstr ""
 
+#: ../lib/python/Plugins/SystemPlugins/Videomode/plugin.py:81
+msgid "Display >16:9 content as"
+msgstr ""
+
+#: ../lib/python/Screens/PluginBrowser.py:120
 #: ../lib/python/Screens/PluginBrowser.py:119
 #, python-format
 msgid ""
@@ -1000,13 +1248,19 @@ msgid ""
 "This could take lots of time!"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBar.py:195
-#: ../lib/python/Screens/MovieSelection.py:106
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:613
+#: ../lib/python/Screens/EpgSelection.py:210
+#: ../lib/python/Screens/EventView.py:83 ../lib/python/Screens/InfoBar.py:200
+#: ../lib/python/Screens/MovieSelection.py:126
+#: ../lib/python/Screens/TimerEdit.py:207
+#: ../lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py:590
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:644
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:697
+#: ../lib/python/Screens/InfoBar.py:195 ../lib/python/Screens/TimerEdit.py:206
 #, python-format
 msgid "Do you really want to delete %s?"
 msgstr ""
 
+#: ../lib/python/Screens/PluginBrowser.py:118
 #: ../lib/python/Screens/PluginBrowser.py:117
 #, python-format
 msgid ""
@@ -1014,10 +1268,6 @@ msgid ""
 "the plugin \"%s\"?"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:195
-msgid "Do you really want to exit?"
-msgstr ""
-
 #: ../lib/python/Screens/HarddiskSetup.py:82
 msgid ""
 "Do you really want to initialize the harddisk?\n"
@@ -1034,28 +1284,41 @@ msgstr ""
 msgid "Do you really want to remove your bookmark of %s?"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:120
-msgid ""
-"Do you want to backup now?\n"
-"After pressing OK, please wait!"
+#: ../lib/python/Plugins/Extensions/DVDBurn/Process.py:412
+msgid "Do you want to burn this collection to DVD medium?"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/Process.py:355
-msgid "Do you want to burn this collection to DVD medium?"
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:400
+msgid "Do you want to install the package:\n"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:553
+#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:590
 msgid "Do you want to play DVD in drive?"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/Process.py:340
+#: ../lib/python/Plugins/Extensions/DVDBurn/Process.py:396
 msgid "Do you want to preview this DVD before burning?"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1870
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:407
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:430
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:646
+msgid "Do you want to reboot your Dreambox?"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:392
+msgid "Do you want to remove the package:\n"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1909
+#: ../lib/python/Screens/InfoBarGenerics.py:1891
 msgid "Do you want to resume this playback?"
 msgstr ""
 
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:145
+msgid "Do you want to update your Dreambox?"
+msgstr ""
+
 #: ../lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py:37
 #: ../lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py:136
 #: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:53
@@ -1065,10 +1328,15 @@ msgid ""
 "After pressing OK, please wait!"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEdit.py:86
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:396
+msgid "Do you want to upgrade the package:\n"
+msgstr ""
+
+#: ../lib/python/Screens/TimerEdit.py:101
 msgid "Don't stop current event but disable coming events"
 msgstr ""
 
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:627
 #: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:328
 #, python-format
 msgid "Done - Installed or upgraded %d packages"
@@ -1076,16 +1344,19 @@ msgstr ""
 
 #: ../lib/python/Screens/Ipkg.py:57
 #, python-format
-msgid "Done - Installed or upgraded %d packages with %d errors"
+msgid "Done - Installed, upgraded or removed %d packages with %d errors"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:203
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:332
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:206
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:335
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:205
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:334
 msgid "Download"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:665
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:700
 #: ../lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py:16
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:695
 msgid "Download .NFI-Files for USB-Flasher"
 msgstr ""
 
@@ -1093,28 +1364,27 @@ msgstr ""
 msgid "Download Plugins"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:467
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:475
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:474
 msgid "Download of USB flasher boot image failed: "
 msgstr ""
 
+#: ../lib/python/Screens/PluginBrowser.py:131
 #: ../lib/python/Screens/PluginBrowser.py:130
 msgid "Downloadable new plugins"
 msgstr ""
 
 #: ../lib/python/Screens/Ipkg.py:82
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:594
 #: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:295
 msgid "Downloading"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:338
-msgid "Downloading image description..."
-msgstr ""
-
 #: ../lib/python/Screens/PluginBrowser.py:89
 msgid "Downloading plugin information. Please wait..."
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/DVDProject.py:35
+#: ../lib/python/Plugins/Extensions/DVDBurn/DVDProject.py:26
 msgid "Dreambox format data DVD (HDTV compatible)"
 msgstr ""
 
@@ -1123,27 +1393,39 @@ msgid "Dutch"
 msgstr ""
 
 #: ../lib/python/Screens/ChannelSelection.py:915
-#: ../lib/python/Screens/Satconfig.py:320
+#: ../lib/python/Screens/Satconfig.py:366
+#: ../lib/python/Components/ServiceScan.py:51
+#: ../lib/python/Screens/Satconfig.py:325
 #: ../lib/python/Components/ServiceScan.py:55
 msgid "E"
 msgstr ""
 
+#: ../lib/python/Components/ServiceScan.py:101
 #: ../lib/python/Components/ServiceScan.py:97
 #, python-format
 msgid "ERROR - failed to scan (%s)!"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:896
-#: ../lib/python/Components/NimManager.py:971
+#: ../lib/python/Components/NimManager.py:1055
+#: ../lib/python/Components/NimManager.py:944
+#: ../lib/python/Components/NimManager.py:1019
 msgid "East"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:273
+#: ../lib/python/Screens/TimerEdit.py:426
+#: ../lib/python/Screens/TimerEdit.py:428
+msgid "Edit"
+msgstr ""
+
+#: ../lib/python/Screens/NetworkSetup.py:352
 msgid "Edit DNS"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:45
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:87
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py:41
+msgid "Edit Title"
+msgstr ""
+
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:102
 msgid "Edit chapters of current title"
 msgstr ""
 
@@ -1151,35 +1433,35 @@ msgstr ""
 msgid "Edit services list"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:1042
+#: ../lib/python/Screens/NetworkSetup.py:1304
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:499
 msgid "Edit settings"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:592
+#: ../lib/python/Screens/NetworkSetup.py:824
 msgid "Edit the Nameserver configuration of your Dreambox.\n"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:588
+#: ../lib/python/Screens/NetworkSetup.py:820
 msgid "Edit the network configuration of your Dreambox.\n"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:45
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:63
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:125
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:139
 msgid "Edit title"
 msgstr ""
 
 #: ../lib/python/Screens/Subtitles.py:44
-#: ../lib/python/Screens/TimerEdit.py:114
-#: ../lib/python/Screens/TimerEdit.py:116
-#: ../lib/python/Screens/TimerEdit.py:382
-#: ../lib/python/Screens/TimerEdit.py:384
-#: ../lib/python/Screens/TimerEdit.py:398
-#: ../lib/python/Screens/TimerEdit.py:400
+#: ../lib/python/Screens/TimerEdit.py:137
+#: ../lib/python/Screens/TimerEdit.py:410
+#: ../lib/python/Screens/TimerEdit.py:430
+#: ../lib/python/Screens/TimerEdit.py:136
+#: ../lib/python/Screens/TimerEdit.py:412
+#: ../lib/python/Screens/TimerEdit.py:432
 msgid "Enable"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:178
+#: ../lib/python/Screens/Satconfig.py:187
+#: ../lib/python/Screens/Satconfig.py:183
 msgid "Enable 5V for active antenna"
 msgstr ""
 
@@ -1195,28 +1477,30 @@ msgstr ""
 msgid "Enabled"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:389
+#: ../lib/python/Screens/NetworkSetup.py:501
 msgid "Encryption"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:394
+#: ../lib/python/Screens/NetworkSetup.py:509
+#: ../lib/python/Screens/NetworkSetup.py:512
 msgid "Encryption Key"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:393
-msgid "Encryption Type"
+#: ../lib/python/Screens/NetworkSetup.py:508
+msgid "Encryption Keytype"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:178
-msgid "End"
+#: ../lib/python/Screens/NetworkSetup.py:505
+msgid "Encryption Type"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:43
-#: ../lib/python/Screens/Satconfig.py:266
+#: ../lib/python/Screens/Satconfig.py:48
+#: ../lib/python/Screens/Satconfig.py:314
+#: ../lib/python/Screens/Satconfig.py:271
 msgid "End time"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:185
+#: ../lib/python/Screens/TimerEntry.py:171
 msgid "EndTime"
 msgstr ""
 
@@ -1235,6 +1519,14 @@ msgid ""
 "© 2006 - Stephan Reichholf"
 msgstr ""
 
+#: ../lib/python/Screens/NetworkSetup.py:528
+msgid "Enter WLAN network name/SSID:"
+msgstr ""
+
+#: ../lib/python/Screens/NetworkSetup.py:530
+msgid "Enter WLAN passphrase/key:"
+msgstr ""
+
 #: ../lib/python/Screens/InfoBarGenerics.py:345
 msgid "Enter main menu..."
 msgstr ""
@@ -1243,8 +1535,10 @@ msgstr ""
 msgid "Enter the service pin"
 msgstr ""
 
-#: ../lib/python/Components/Task.py:275
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:175
+#: ../lib/python/Components/Task.py:284
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:201
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:636
+#: ../lib/python/Components/Task.py:282
 #: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:337
 msgid "Error"
 msgstr ""
@@ -1253,14 +1547,15 @@ msgstr ""
 msgid "Error executing plugin"
 msgstr ""
 
-#: ../lib/python/Components/Task.py:273
+#: ../lib/python/Components/Task.py:282 ../lib/python/Components/Task.py:280
 #, python-format
 msgid ""
 "Error: %s\n"
 "Retry?"
 msgstr ""
 
-#: ../lib/python/Components/Harddisk.py:169
+#: ../lib/python/Components/Harddisk.py:182
+#: ../lib/python/Components/Harddisk.py:172
 msgid "Everything is fine"
 msgstr ""
 
@@ -1272,54 +1567,73 @@ msgstr ""
 msgid "Execution finished!!"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:33
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:88
-#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:474
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:201
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:61
+msgid "Exif"
+msgstr ""
+
+#: ../lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:34
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:106
+#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:516
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:204
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:203
 msgid "Exit"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:201
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:174
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:206
 msgid "Exit editor"
 msgstr ""
 
-#: ../lib/python/Components/UsageConfig.py:43
+#: ../lib/python/Components/UsageConfig.py:46
 msgid "Expert"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:654
+#: ../lib/python/Screens/NetworkSetup.py:881
 msgid "Extended Networksetup Plugin..."
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:650
+#: ../lib/python/Screens/NetworkSetup.py:877
 msgid "Extended Setup..."
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:391
+#: ../lib/python/Screens/ScanSetup.py:356
+#: ../lib/python/Screens/ScanSetup.py:358
+#: ../lib/python/Screens/ScanSetup.py:385
+#: ../lib/python/Screens/ServiceInfo.py:147
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:447
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:449
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:85
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:87
+#: ../lib/python/Screens/ScanSetup.py:391
 #: ../lib/python/Screens/ScanSetup.py:393
-#: ../lib/python/Screens/ScanSetup.py:421
+#: ../lib/python/Screens/ScanSetup.py:420
 #: ../lib/python/Screens/ServiceInfo.py:145
 #: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:448
-#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:137
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:450
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:111
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:113
 msgid "FEC"
 msgstr ""
 
 #: ../lib/python/Components/Task.py:41
-#: ../lib/python/Plugins/Extensions/DVDBurn/Process.py:400
+#: ../lib/python/Plugins/Extensions/DVDBurn/Process.py:436
 msgid "Failed"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:901
-#: ../lib/python/Components/NimManager.py:976
+#: ../lib/python/Components/NimManager.py:1057
+#: ../lib/python/Components/NimManager.py:949
+#: ../lib/python/Components/NimManager.py:1024
 msgid "Fast"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:233
+#: ../lib/python/Screens/Satconfig.py:281
+#: ../lib/python/Screens/Satconfig.py:238
 msgid "Fast DiSEqC"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:901
-#: ../lib/python/Components/NimManager.py:976
+#: ../lib/python/Components/NimManager.py:1057
+#: ../lib/python/Components/NimManager.py:949
+#: ../lib/python/Components/NimManager.py:1024
 msgid "Fast epoch"
 msgstr ""
 
@@ -1327,7 +1641,8 @@ msgstr ""
 msgid "Favourites"
 msgstr ""
 
-#: ../lib/python/Components/Harddisk.py:169
+#: ../lib/python/Components/Harddisk.py:182
+#: ../lib/python/Components/Harddisk.py:172
 msgid "Filesystem contains uncorrectable errors"
 msgstr ""
 
@@ -1335,19 +1650,24 @@ msgstr ""
 msgid "Finished"
 msgstr ""
 
+#: ../lib/python/Screens/NetworkSetup.py:195
+msgid "Finished configuring your network"
+msgstr ""
+
+#: ../lib/python/Screens/NetworkSetup.py:948
+msgid "Finished restarting your network"
+msgstr ""
+
 #: ../lib/python/Components/Language.py:24
 msgid "Finnish"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:446
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:454
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:453
 msgid ""
 "First we need to download the latest boot environment for the USB flasher."
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:208
-msgid "Fix USB stick"
-msgstr ""
-
 #: ../lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:144
 #: ../lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:251
 msgid "Flash"
@@ -1357,51 +1677,69 @@ msgstr ""
 msgid "Flashing failed"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:131
-msgid "Font size"
+#: ../lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:123
+msgid "Format"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:121
-msgid "Format"
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:174
+msgid "Frame size in full view"
 msgstr ""
 
 #: ../lib/python/Components/Language.py:25
 msgid "French"
 msgstr ""
 
+#: ../lib/python/Screens/Satconfig.py:244
+#: ../lib/python/Screens/Satconfig.py:258
+#: ../lib/python/Screens/Satconfig.py:269
+#: ../lib/python/Screens/ScanSetup.py:351
+#: ../lib/python/Screens/ScanSetup.py:381
+#: ../lib/python/Screens/ScanSetup.py:388
+#: ../lib/python/Screens/ServiceInfo.py:140
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:442
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:80
 #: ../lib/python/Screens/ScanSetup.py:386
-#: ../lib/python/Screens/ScanSetup.py:417
-#: ../lib/python/Screens/ScanSetup.py:424
+#: ../lib/python/Screens/ScanSetup.py:416
+#: ../lib/python/Screens/ScanSetup.py:423
 #: ../lib/python/Screens/ServiceInfo.py:138
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:444
-#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:133
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:443
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:106
 msgid "Frequency"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:994
+#: ../lib/python/Components/NimManager.py:1197
+#: ../lib/python/Components/NimManager.py:1042
 msgid "Frequency bands"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:161
+#: ../lib/python/Screens/Satconfig.py:170
+#: ../lib/python/Screens/Satconfig.py:166
 msgid "Frequency scan step size(khz)"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:994
+#: ../lib/python/Components/NimManager.py:1197
+#: ../lib/python/Components/NimManager.py:1042
 msgid "Frequency steps"
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:262
+#: ../lib/python/Screens/EpgSelection.py:299
 #: ../lib/python/Components/EpgList.py:38
 #: ../lib/python/Components/TimerList.py:24
 #: ../lib/python/Tools/FuzzyDate.py:13
+#: ../lib/python/Screens/EpgSelection.py:262
 msgid "Fri"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:108
-#: ../lib/python/Screens/TimerEntry.py:164
+#: ../lib/python/Screens/TimerEntry.py:117
+#: ../lib/python/Screens/TimerEntry.py:160
 msgid "Friday"
 msgstr ""
 
+#: ../lib/python/Components/Language.py:40
+#: ../lib/python/Components/Language.py:39
+msgid "Frisian"
+msgstr ""
+
 #: ../lib/python/Plugins/Extensions/FritzCall/plugin.py:34
 msgid "Fritz!Box FON IP address"
 msgstr ""
@@ -1411,27 +1749,24 @@ msgstr ""
 msgid "Frontprocessor version: %d"
 msgstr ""
 
-#: ../lib/python/Components/Harddisk.py:169
+#: ../lib/python/Components/Harddisk.py:182
+#: ../lib/python/Components/Harddisk.py:172
 msgid "Fsck failed"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:62
-msgid "Function not yet implemented"
-msgstr ""
-
 #: ../lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py:107
 msgid ""
 "GUI needs a restart to apply a new skin\n"
 "Do you want to Restart the GUI now?"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:260
-#: ../lib/python/Screens/NetworkSetup.py:373 ../data/
+#: ../lib/python/Screens/NetworkSetup.py:339
+#: ../lib/python/Screens/NetworkSetup.py:481 ../data/
 msgid "Gateway"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:90
-msgid "Genre:"
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:134
+msgid "Genre"
 msgstr ""
 
 #: ../lib/python/Components/Language.py:17
@@ -1443,16 +1778,19 @@ msgstr ""
 msgid "Getting plugin information. Please wait..."
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:181
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:239
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:195
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:253
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:170
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:228
 msgid "Goto 0"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:236
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:250
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:225
 msgid "Goto position"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/GraphMultiEPG/plugin.py:94
+#: ../lib/python/Plugins/Extensions/GraphMultiEPG/plugin.py:95
 msgid "Graphical Multi EPG"
 msgstr ""
 
@@ -1460,29 +1798,46 @@ msgstr ""
 msgid "Greek"
 msgstr ""
 
+#: ../lib/python/Screens/ServiceInfo.py:152
 #: ../lib/python/Screens/ServiceInfo.py:150
 msgid "Guard Interval"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:431
+#: ../lib/python/Screens/ScanSetup.py:395
+#: ../lib/python/Screens/ScanSetup.py:430
 msgid "Guard interval mode"
 msgstr ""
 
-#: ../lib/python/Components/Harddisk.py:264
+#: ../lib/python/Components/Harddisk.py:351 ../data/
+#: ../lib/python/Components/Harddisk.py:277
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:108
-#: ../data/
 msgid "Harddisk"
 msgstr ""
 
+#: ../lib/python/Screens/NetworkSetup.py:496
+msgid "Hidden network SSID"
+msgstr ""
+
+#: ../lib/python/Screens/ServiceInfo.py:153
 #: ../lib/python/Screens/ServiceInfo.py:151
 msgid "Hierarchy Information"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:432
+#: ../lib/python/Screens/ScanSetup.py:396
+#: ../lib/python/Screens/ScanSetup.py:431
 msgid "Hierarchy mode"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1515
+#: ../lib/python/Screens/Ci.py:334
+msgid "High bitrate support"
+msgstr ""
+
+#: ../lib/python/Tools/Transponder.py:31
+msgid "Horizontal"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1545
+#: ../lib/python/Screens/InfoBarGenerics.py:1536
 msgid "How many minutes do you want to record?"
 msgstr ""
 
@@ -1490,12 +1845,21 @@ msgstr ""
 msgid "Hungarian"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:258
-#: ../lib/python/Screens/NetworkSetup.py:368
-#: ../lib/python/Screens/NetworkSetup.py:1030 ../data/
+#: ../lib/python/Screens/NetworkSetup.py:337
+#: ../lib/python/Screens/NetworkSetup.py:476
+#: ../lib/python/Screens/NetworkSetup.py:1292 ../data/
 msgid "IP Address"
 msgstr ""
 
+#: ../lib/python/Plugins/Extensions/DVDBurn/Process.py:281
+msgid "ISO file is too large for this filesystem!"
+msgstr ""
+
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:141
+msgid "ISO path"
+msgstr ""
+
+#: ../lib/python/Components/Language.py:30
 #: ../lib/python/Components/Language.py:29
 msgid "Icelandic"
 msgstr ""
@@ -1523,20 +1887,17 @@ msgstr ""
 msgid "Image flash utility"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:32
-msgid "Image-Upgrade"
-msgstr ""
-
 #: ../lib/python/Components/Task.py:41
 msgid "In Progress"
 msgstr ""
 
-#: ../RecordTimer.py:232
+#: ../RecordTimer.py:236 ../RecordTimer.py:235
 msgid ""
 "In order to record a timer, the TV was switched to the recording service!\n"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:280
+#: ../lib/python/Screens/Satconfig.py:272
+#: ../lib/python/Screens/Satconfig.py:285
 msgid "Increased voltage"
 msgstr ""
 
@@ -1556,28 +1917,34 @@ msgstr ""
 msgid "Input"
 msgstr ""
 
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:109
+msgid "Install local IPKG"
+msgstr ""
+
 #: ../lib/python/Screens/Ipkg.py:91
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:603
 #: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:304
 msgid "Installing"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1390
+#: ../lib/python/Screens/InfoBarGenerics.py:1411
 msgid "Instant Record..."
 msgstr ""
 
-#: ../lib/python/Components/Network.py:237
+#: ../lib/python/Components/Network.py:290
 msgid "Integrated Ethernet"
 msgstr ""
 
-#: ../lib/python/Components/Network.py:239
+#: ../lib/python/Components/Network.py:292
 msgid "Integrated Wireless"
 msgstr ""
 
-#: ../lib/python/Components/UsageConfig.py:42
+#: ../lib/python/Components/UsageConfig.py:45
 msgid "Intermediate"
 msgstr ""
 
-#: ../lib/python/Components/Harddisk.py:271
+#: ../lib/python/Components/Harddisk.py:358
+#: ../lib/python/Components/Harddisk.py:284
 msgid "Internal Flash"
 msgstr ""
 
@@ -1590,97 +1957,129 @@ msgstr ""
 msgid "Invalid directory selected: %s"
 msgstr ""
 
+#: ../lib/python/Screens/ScanSetup.py:352
+#: ../lib/python/Screens/ScanSetup.py:382
+#: ../lib/python/Screens/ScanSetup.py:389
+#: ../lib/python/Screens/ServiceInfo.py:144
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:443
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:81
 #: ../lib/python/Screens/ScanSetup.py:387
-#: ../lib/python/Screens/ScanSetup.py:418
-#: ../lib/python/Screens/ScanSetup.py:425
+#: ../lib/python/Screens/ScanSetup.py:417
+#: ../lib/python/Screens/ScanSetup.py:424
 #: ../lib/python/Screens/ServiceInfo.py:142
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:445
-#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:134
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:444
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:107
 msgid "Inversion"
 msgstr ""
 
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:727
+msgid "Ipkg"
+msgstr ""
+
+#: ../lib/python/Components/Language.py:31
 #: ../lib/python/Components/Language.py:30
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: (aspect ratio policy: display as fullscreen, even if this breaks the aspect)
-#: ../lib/python/Components/AVSwitch.py:111
-#: ../lib/python/Components/AVSwitch.py:121
+#: ../lib/python/Components/AVSwitch.py:98
+#: ../lib/python/Components/AVSwitch.py:108
 msgid "Just Scale"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:1008
+#: ../lib/python/Screens/NetworkSetup.py:1270
 msgid "LAN Adapter"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:224
+#: ../lib/python/Screens/Satconfig.py:225
+#: ../lib/python/Screens/Satconfig.py:229
 msgid "LNB"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:273
+#: ../lib/python/Screens/Satconfig.py:230
+#: ../lib/python/Screens/Satconfig.py:278
 msgid "LOF"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:277
+#: ../lib/python/Screens/Satconfig.py:234
+#: ../lib/python/Screens/Satconfig.py:246
+#: ../lib/python/Screens/Satconfig.py:282
 msgid "LOF/H"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:276
+#: ../lib/python/Screens/Satconfig.py:233
+#: ../lib/python/Screens/Satconfig.py:245
+#: ../lib/python/Screens/Satconfig.py:281
 msgid "LOF/L"
 msgstr ""
 
-#: ../lib/python/Components/Language.py:91 ../data/
+#: ../lib/python/Components/Language.py:94 ../data/
+#: ../lib/python/Components/Language.py:93
 msgid "Language selection"
 msgstr ""
 
-#: ../lib/python/Components/UsageConfig.py:97
+#: ../lib/python/Components/UsageConfig.py:100
 msgid "Last speed"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:32
-#: ../lib/python/Screens/Satconfig.py:255 ../data/
+#: ../lib/python/Screens/Satconfig.py:37
+#: ../lib/python/Screens/Satconfig.py:303 ../data/
+#: ../lib/python/Screens/Satconfig.py:260
 msgid "Latitude"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:477
+#: ../lib/python/Components/Language.py:29
+msgid "Latvian"
+msgstr ""
+
+#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:519
 msgid "Leave DVD Player?"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1602
-#: ../lib/python/Screens/InfoBarGenerics.py:1607
+#: ../lib/python/Screens/InfoBarGenerics.py:1635
+#: ../lib/python/Screens/InfoBarGenerics.py:1640
+#: ../lib/python/Screens/InfoBarGenerics.py:1623
+#: ../lib/python/Screens/InfoBarGenerics.py:1628
 msgid "Left"
 msgstr ""
 
 #. TRANSLATORS: (aspect ratio policy: black bars on top/bottom) in doubt, keep english term.
-#: ../lib/python/Components/AVSwitch.py:107
+#: ../lib/python/Components/AVSwitch.py:94
 msgid "Letterbox"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:231
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:245
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:220
 msgid "Limit east"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:230
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:244
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:219
 msgid "Limit west"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:229
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:243
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:218
 msgid "Limits off"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:232
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:246
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:221
 msgid "Limits on"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:607
+#: ../lib/python/Screens/NetworkSetup.py:839
 msgid "Link:"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/DVDProject.py:35
+#: ../lib/python/Plugins/Extensions/DVDBurn/DVDProject.py:26
 msgid "Linked titles with a DVD menu"
 msgstr ""
 
-#: ../lib/python/Components/FileList.py:166
+#: ../lib/python/Components/FileList.py:172
+#: ../lib/python/Components/FileList.py:386
+#: ../lib/python/Components/config.py:1088
+#: ../lib/python/Components/config.py:950
 msgid "List of Storage Devices"
 msgstr ""
 
@@ -1688,79 +2087,97 @@ msgstr ""
 msgid "Lithuanian"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:90
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:104
 msgid "Load"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:1017
+#: ../lib/python/Screens/NetworkSetup.py:1279
 msgid "Local Network"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:189
+#: ../lib/python/Screens/TimerEntry.py:178
 msgid "Location"
 msgstr ""
 
+#: ../lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py:580
+msgid "Log results to harddisk"
+msgstr ""
+
 #: ../lib/python/Screens/HelpMenu.py:36
 msgid "Long Keypress"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:30
-#: ../lib/python/Screens/Satconfig.py:253 ../data/
+#: ../lib/python/Screens/Satconfig.py:35
+#: ../lib/python/Screens/Satconfig.py:301 ../data/
+#: ../lib/python/Screens/Satconfig.py:258
 msgid "Longitude"
 msgstr ""
 
-#: ../lib/python/Components/Harddisk.py:267
+#: ../lib/python/Components/Harddisk.py:354
+#: ../lib/python/Components/Harddisk.py:280
 msgid "MMC Card"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:196
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:169
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:201
 msgid "Make this mark an 'in' point"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:197
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:170
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:202
 msgid "Make this mark an 'out' point"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:198
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:171
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:203
 msgid "Make this mark just a mark"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:466
-#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:172
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:725
+msgid "Manage your receiver's software"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:469
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:140
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:470
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:176
 msgid "Manual transponder"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:832
+#: ../lib/python/Screens/Satconfig.py:252
+#: ../lib/python/Screens/Satconfig.py:263
+msgid "Manufacturer"
+msgstr ""
+
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:948
 msgid "Media player"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:135
-#: ../lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:164
-#: ../lib/python/Plugins/Extensions/DVDBurn/Process.py:249
+#: ../lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:137
+#: ../lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:167
+#: ../lib/python/Plugins/Extensions/DVDBurn/Process.py:274
 msgid "Medium is not a writeable DVD!"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/Process.py:254
+#: ../lib/python/Plugins/Extensions/DVDBurn/Process.py:279
 msgid "Medium is not empty!"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:124
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:125
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:126
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:127
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:128
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:129
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:130
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:132
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:133 ../data/
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:143
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:144
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:145
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:146 ../data/
 msgid "Menu"
 msgstr ""
 
-#: ../lib/python/Components/Harddisk.py:169
+#: ../lib/python/Components/Harddisk.py:182
+#: ../lib/python/Components/Harddisk.py:172
 msgid "Mkfs failed"
 msgstr ""
 
+#: ../lib/python/Screens/Satconfig.py:100
 #: ../lib/python/Plugins/SystemPlugins/Videomode/plugin.py:61
+#: ../lib/python/Screens/Satconfig.py:96
 msgid "Mode"
 msgstr ""
 
@@ -1768,45 +2185,58 @@ msgstr ""
 msgid "Model: "
 msgstr ""
 
+#: ../lib/python/Screens/ScanSetup.py:359
+#: ../lib/python/Screens/ScanSetup.py:384
+#: ../lib/python/Screens/ScanSetup.py:393
+#: ../lib/python/Screens/ServiceInfo.py:138
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:450
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:88
 #: ../lib/python/Screens/ScanSetup.py:394
-#: ../lib/python/Screens/ScanSetup.py:420
-#: ../lib/python/Screens/ScanSetup.py:429
+#: ../lib/python/Screens/ScanSetup.py:419
+#: ../lib/python/Screens/ScanSetup.py:428
 #: ../lib/python/Screens/ServiceInfo.py:136
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:451
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:114
 msgid "Modulation"
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:262
+#: ../lib/python/Screens/EpgSelection.py:299
 #: ../lib/python/Components/EpgList.py:38
 #: ../lib/python/Components/TimerList.py:24
 #: ../lib/python/Tools/FuzzyDate.py:13
+#: ../lib/python/Screens/EpgSelection.py:262
 msgid "Mon"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:92
+#: ../lib/python/Screens/TimerEntry.py:103
 msgid "Mon-Fri"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:108
-#: ../lib/python/Screens/TimerEntry.py:160
+#: ../lib/python/Screens/TimerEntry.py:117
+#: ../lib/python/Screens/TimerEntry.py:156
 msgid "Monday"
 msgstr ""
 
-#: ../lib/python/Components/Harddisk.py:169
+#: ../lib/python/Components/Harddisk.py:182
+#: ../lib/python/Components/Harddisk.py:172
 msgid "Mount failed"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1338
+#: ../lib/python/Screens/InfoBarGenerics.py:1359
 msgid "Move Picture in Picture"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:222
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:236
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:211
 msgid "Move east"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:219
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:233
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:208
 msgid "Move west"
 msgstr ""
 
+#: ../lib/python/Screens/EventView.py:210
 #: ../lib/python/Screens/EventView.py:168
 msgid "Multi EPG"
 msgstr ""
@@ -1815,13 +2245,22 @@ msgstr ""
 msgid "Multiple service support"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:518
+#: ../lib/python/Screens/ScanSetup.py:513
+#: ../lib/python/Screens/ScanSetup.py:516
 msgid "Multisat"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:584
-#: ../lib/python/Components/NimManager.py:589
-#: ../lib/python/Components/NimManager.py:701
+#: ../lib/python/Screens/NetworkSetup.py:362
+#: ../lib/python/Screens/NetworkSetup.py:366
+#: ../lib/python/Screens/NetworkSetup.py:369
+#: ../lib/python/Screens/NetworkSetup.py:373
+#: ../lib/python/Screens/NetworkSetup.py:376
+#: ../lib/python/Components/NimManager.py:634
+#: ../lib/python/Components/NimManager.py:639
+#: ../lib/python/Components/NimManager.py:758
+#: ../lib/python/Components/NimManager.py:607
+#: ../lib/python/Components/NimManager.py:612
+#: ../lib/python/Components/NimManager.py:731
 msgid "N/A"
 msgstr ""
 
@@ -1829,54 +2268,57 @@ msgstr ""
 msgid "NFI image flashing completed. Press Yellow to Reboot!"
 msgstr ""
 
-#: ../lib/python/Components/AVSwitch.py:123
+#: ../lib/python/Components/AVSwitch.py:110
 msgid "NTSC"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:138
+#: ../lib/python/Screens/TimerEntry.py:134
 msgid "Name"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:1036 ../data/
+#: ../lib/python/Screens/NetworkSetup.py:1298 ../data/
 msgid "Nameserver"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:189
+#: ../lib/python/Screens/NetworkSetup.py:244
 #, python-format
 msgid "Nameserver %d"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:631
+#: ../lib/python/Screens/NetworkSetup.py:858
 msgid "Nameserver settings"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:259
-#: ../lib/python/Screens/NetworkSetup.py:369 ../data/
+#: ../lib/python/Screens/NetworkSetup.py:338
+#: ../lib/python/Screens/NetworkSetup.py:477 ../data/
 msgid "Netmask"
 msgstr ""
 
-#: ../lib/python/Components/Harddisk.py:268
+#: ../lib/python/Components/Harddisk.py:355
+#: ../lib/python/Components/Harddisk.py:281
 msgid "Network Mount"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:387
+#: ../lib/python/Screens/NetworkSetup.py:494
+#: ../lib/python/Screens/NetworkSetup.py:499
 msgid "Network SSID"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:433
+#: ../lib/python/Screens/ScanSetup.py:397
+#: ../lib/python/Screens/ScanSetup.py:432
 msgid "Network scan"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:632
+#: ../lib/python/Screens/NetworkSetup.py:859
 msgid "Network test"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:267
-#: ../lib/python/Screens/NetworkSetup.py:605
+#: ../lib/python/Screens/NetworkSetup.py:346
+#: ../lib/python/Screens/NetworkSetup.py:837
 msgid "Network:"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:659
+#: ../lib/python/Screens/NetworkSetup.py:886
 msgid "NetworkWizard"
 msgstr ""
 
@@ -1892,67 +2334,89 @@ msgstr ""
 msgid "New version:"
 msgstr ""
 
+#: ../lib/python/Screens/EpgSelection.py:54
 #: ../lib/python/Screens/EpgSelection.py:46
 msgid "Next"
 msgstr ""
 
-#: ../lib/python/Screens/Ci.py:19 ../lib/python/Screens/InfoBar.py:167
-#: ../data/ ../lib/python/Plugins/SystemPlugins/Videomode/
+#: ../lib/python/Screens/Ci.py:19 ../lib/python/Screens/InfoBar.py:165
+#: ../lib/python/Screens/InfoBar.py:172 ../data/
+#: ../lib/python/Plugins/SystemPlugins/Videomode/
+#: ../lib/python/Screens/InfoBar.py:167
 msgid "No"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/Process.py:253
+#: ../lib/python/Plugins/Extensions/DVDBurn/Process.py:278
 msgid "No (supported) DVDROM found!"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1533
+#: ../lib/python/Screens/InfoBarGenerics.py:1564
+#: ../lib/python/Screens/InfoBarGenerics.py:1554
 msgid "No HDD found or HDD not initialized!"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:2178
+#: ../lib/python/Screens/NetworkSetup.py:433
+msgid "No Networks found"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:2217
+#: ../lib/python/Screens/InfoBarGenerics.py:2199
 msgid ""
 "No data on transponder!\n"
 "(Timeout reading PAT)"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:342
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:357
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:345
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:360
 #: ../lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:155
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:344
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:359
 msgid "No details for this image file"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1430
+#: ../lib/python/Screens/InfoBarGenerics.py:1451
 msgid "No event info found, recording indefinitely."
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:2176
+#: ../lib/python/Screens/InfoBarGenerics.py:2215
+#: ../lib/python/Screens/InfoBarGenerics.py:2197
 msgid "No free tuner!"
 msgstr ""
 
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:633
 #: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:334
 msgid ""
 "No packages were upgraded yet. So you can check your network and try again."
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:568
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:586
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:591
 msgid "No positioner capable frontend found."
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:286
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:259
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:295
 msgid "No satellite frontend found!!"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:583
+#: ../lib/python/Screens/MovieSelection.py:425
+msgid "No tags are set on these movies."
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:601
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:606
 msgid "No tuner is configured for use with a diseqc positioner!"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:651
+#: ../lib/python/Screens/ScanSetup.py:714
+#: ../lib/python/Screens/ScanSetup.py:649
 msgid ""
 "No tuner is enabled!\n"
 "Please setup your tuner settings before you start a service scan."
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:537
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:534
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:533
 msgid "No useable USB stick found"
 msgstr ""
 
@@ -1970,80 +2434,89 @@ msgid ""
 "When you say 'No' here the setup protection stay disabled!"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:51
+#: ../lib/python/Screens/NetworkSetup.py:54
 msgid ""
-"No working local networkadapter found.\n"
-"Please verify that you have attached a network cable and your Network is "
+"No working local network adapter found.\n"
+"Please verify that you have attached a network cable and your network is "
 "configured correctly."
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:488
+#: ../lib/python/Screens/NetworkSetup.py:53
 msgid ""
-"No working wireless interface found.\n"
-" Please verify that you have attached a compatible WLAN device or enable "
-"your local network interface."
+"No working wireless network adapter found.\n"
+"Please verify that you have attached a compatible WLAN device and your "
+"network is configured correctly."
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:50
+#: ../lib/python/Screens/NetworkSetup.py:701
 msgid ""
-"No working wireless networkadapter found.\n"
-"Please verify that you have attached a compatible WLAN USB Stick and your "
-"Network is configured correctly."
+"No working wireless network interface found.\n"
+" Please verify that you have attached a compatible WLAN device or enable "
+"your local network interface."
 msgstr ""
 
-#: ../lib/python/Screens/InfoBar.py:169
+#: ../lib/python/Screens/InfoBar.py:173 ../lib/python/Screens/InfoBar.py:169
 msgid "No, but restart from begin"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:547
-#: ../lib/python/Screens/ScanSetup.py:557
-#: ../lib/python/Screens/ScanSetup.py:571
-#: ../lib/python/Components/NimManager.py:933
-#: ../lib/python/Components/NimManager.py:937
-#: ../lib/python/Components/NimManager.py:951
-#: ../lib/python/Components/NimManager.py:955
-#: ../lib/python/Components/NimManager.py:969
+#: ../lib/python/Screens/ScanSetup.py:558
+#: ../lib/python/Screens/ScanSetup.py:601
+#: ../lib/python/Screens/ScanSetup.py:646
+#: ../lib/python/Components/NimManager.py:1041
+#: ../lib/python/Components/NimManager.py:1044
+#: ../lib/python/Components/NimManager.py:1065
+#: ../lib/python/Components/NimManager.py:1067
+#: ../lib/python/Components/NimManager.py:1073
+#: ../lib/python/Tools/Transponder.py:14 ../lib/python/Tools/Transponder.py:61
+#: ../lib/python/Tools/Transponder.py:107
+#: ../lib/python/Screens/ScanSetup.py:545
+#: ../lib/python/Screens/ScanSetup.py:555
+#: ../lib/python/Screens/ScanSetup.py:569
+#: ../lib/python/Components/NimManager.py:981
+#: ../lib/python/Components/NimManager.py:985
+#: ../lib/python/Components/NimManager.py:999
+#: ../lib/python/Components/NimManager.py:1003
+#: ../lib/python/Components/NimManager.py:1017
 msgid "None"
 msgstr ""
 
 #. TRANSLATORS: (aspect ratio policy: display as fullscreen, with stretching the left/right)
-#: ../lib/python/Components/AVSwitch.py:119
+#: ../lib/python/Components/AVSwitch.py:106
 msgid "Nonlinear"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:898
-#: ../lib/python/Components/NimManager.py:973
+#: ../lib/python/Components/NimManager.py:1056
+#: ../lib/python/Components/NimManager.py:946
+#: ../lib/python/Components/NimManager.py:1021
 msgid "North"
 msgstr ""
 
+#: ../lib/python/Components/Language.py:32
 #: ../lib/python/Components/Language.py:31
 msgid "Norwegian"
 msgstr ""
 
-#: ../lib/python/Components/Task.py:359
+#: ../lib/python/Components/Task.py:368 ../lib/python/Components/Task.py:366
 #, python-format
 msgid ""
 "Not enough diskspace. Please free up some diskspace and try again. (%d MB "
 "required, %d MB available)"
 msgstr ""
 
+#: ../lib/python/Screens/ScanSetup.py:829
+#: ../lib/python/Screens/ScanSetup.py:831
+#: ../lib/python/Screens/ScanSetup.py:975
+#: ../lib/python/Screens/ScanSetup.py:977
+#: ../lib/python/Plugins/SystemPlugins/DefaultServicesScanner/plugin.py:90
+#: ../lib/python/Screens/ScanSetup.py:765
 #: ../lib/python/Screens/ScanSetup.py:767
-#: ../lib/python/Screens/ScanSetup.py:769
+#: ../lib/python/Screens/ScanSetup.py:911
 #: ../lib/python/Screens/ScanSetup.py:913
-#: ../lib/python/Screens/ScanSetup.py:915
-#: ../lib/python/Plugins/SystemPlugins/DefaultServicesScanner/plugin.py:90
 msgid ""
 "Nothing to scan!\n"
 "Please setup your tuner settings before you start a service scan."
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:503
-msgid ""
-"Now please insert the USB stick (minimum size is 64 MB) that you want to "
-"format and use as .NFI image flasher. Press OK after you've put the stick "
-"back in."
-msgstr ""
-
 #: ../lib/python/Plugins/SystemPlugins/VideoTune/VideoFinetune.py:147
 msgid ""
 "Now, use the contrast setting to turn up the brightness of the background as "
@@ -2051,82 +2524,100 @@ msgid ""
 "between the two brightest levels of shades.If you have done that, press OK."
 msgstr ""
 
-#: ../lib/python/Screens/LocationBox.py:91 ../lib/python/Screens/Setup.py:92
+#: ../lib/python/Screens/LocationBox.py:91 ../lib/python/Screens/Setup.py:94
 #: ../lib/python/Screens/TimeDateInput.py:13
 #: ../lib/python/Screens/TimerEntry.py:28
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:89
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:172
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:71
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:103
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:198
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py:40
 #: ../lib/python/Plugins/SystemPlugins/Videomode/plugin.py:36 ../data/
+#: ../lib/python/Screens/Setup.py:87
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:71
 msgid "OK"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/Videomode/plugin.py:99
+#: ../lib/python/Plugins/SystemPlugins/Videomode/plugin.py:100
 msgid "OSD visibility"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1601
-#: ../lib/python/Screens/InfoBarGenerics.py:1619
-#: ../lib/python/Components/NimManager.py:919
-#: ../lib/python/Components/NimManager.py:927
+#: ../lib/python/Screens/InfoBarGenerics.py:1634
+#: ../lib/python/Screens/InfoBarGenerics.py:1652
+#: ../lib/python/Components/NimManager.py:1064
+#: ../lib/python/Tools/Transponder.py:12 ../lib/python/Tools/Transponder.py:46
+#: ../lib/python/Tools/Transponder.py:59
+#: ../lib/python/Tools/Transponder.py:114
+#: ../lib/python/Screens/InfoBarGenerics.py:1622
+#: ../lib/python/Screens/InfoBarGenerics.py:1640
+#: ../lib/python/Components/NimManager.py:967
+#: ../lib/python/Components/NimManager.py:975
 msgid "Off"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1601
-#: ../lib/python/Screens/InfoBarGenerics.py:1619
-#: ../lib/python/Components/NimManager.py:919
-#: ../lib/python/Components/NimManager.py:927
+#: ../lib/python/Screens/InfoBarGenerics.py:1634
+#: ../lib/python/Screens/InfoBarGenerics.py:1652
+#: ../lib/python/Components/NimManager.py:1064
+#: ../lib/python/Tools/Transponder.py:11 ../lib/python/Tools/Transponder.py:45
+#: ../lib/python/Tools/Transponder.py:58
+#: ../lib/python/Tools/Transponder.py:113
+#: ../lib/python/Screens/InfoBarGenerics.py:1622
+#: ../lib/python/Screens/InfoBarGenerics.py:1640
+#: ../lib/python/Components/NimManager.py:967
+#: ../lib/python/Components/NimManager.py:975
 msgid "On"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:969
+#: ../lib/python/Components/NimManager.py:1073
+#: ../lib/python/Components/NimManager.py:1017
 msgid "One"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:33
-msgid "Online-Upgrade"
-msgstr ""
-
-#: ../lib/python/Screens/ScanSetup.py:435
+#: ../lib/python/Screens/ScanSetup.py:399
+#: ../lib/python/Screens/ScanSetup.py:434
 msgid "Only Free scan"
 msgstr ""
 
+#: ../lib/python/Screens/ServiceInfo.py:139
 #: ../lib/python/Screens/ServiceInfo.py:137
 msgid "Orbital Position"
 msgstr ""
 
-#: ../lib/python/Screens/MovieSelection.py:307
-msgid "Other..."
-msgstr ""
-
-#: ../lib/python/Components/AVSwitch.py:123
+#: ../lib/python/Components/AVSwitch.py:110
 msgid "PAL"
 msgstr ""
 
+#: ../lib/python/Screens/ServiceInfo.py:87
 #: ../lib/python/Screens/ServiceInfo.py:86
 msgid "PIDs"
 msgstr ""
 
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:371
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:577
 #: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:278
 msgid "Package list update"
 msgstr ""
 
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:108
 #: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:37
 msgid "Packet management"
 msgstr ""
 
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:367
+msgid "Packet manager"
+msgstr ""
+
 #: ../lib/python/Screens/Subtitles.py:52 ../lib/python/Screens/Subtitles.py:55
 #: ../lib/python/Screens/Subtitles.py:57
 msgid "Page"
 msgstr ""
 
 #. TRANSLATORS: (aspect ratio policy: cropped content on left/right) in doubt, keep english term
-#: ../lib/python/Components/AVSwitch.py:109
-#: ../lib/python/Components/AVSwitch.py:117
+#: ../lib/python/Components/AVSwitch.py:96
+#: ../lib/python/Components/AVSwitch.py:104
 msgid "Pan&Scan"
 msgstr ""
 
-#: ../lib/python/Components/FileList.py:168
+#: ../lib/python/Components/FileList.py:174
+#: ../lib/python/Components/FileList.py:388
 msgid "Parent Directory"
 msgstr ""
 
@@ -2138,29 +2629,36 @@ msgstr ""
 msgid "Parental control type"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:543
-msgid "Partitioning USB stick..."
+#: ../lib/python/Components/UsageConfig.py:41
+msgid "Pause movie at end"
 msgstr ""
 
-#: ../lib/python/Components/UsageConfig.py:38
-msgid "Pause movie at end"
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:595
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:596
+msgid "PicturePlayer"
 msgstr ""
 
 #. TRANSLATORS: (aspect ratio policy: black bars on left/right) in doubt, keep english term.
-#: ../lib/python/Components/AVSwitch.py:115
+#: ../lib/python/Components/AVSwitch.py:102
 msgid "Pillarbox"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:398
+#: ../lib/python/Screens/ScanSetup.py:362
+#: ../lib/python/Screens/ServiceInfo.py:145
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:453
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:91
+#: ../lib/python/Screens/ScanSetup.py:397
 #: ../lib/python/Screens/ServiceInfo.py:143
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:454
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:117
 msgid "Pilot"
 msgstr ""
 
-#: ../lib/python/Components/UsageConfig.py:95
+#: ../lib/python/Components/UsageConfig.py:98
 msgid "Play"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:474
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:479
 msgid "Play Audio-CD..."
 msgstr ""
 
@@ -2168,27 +2666,35 @@ msgstr ""
 msgid "Play recorded movies..."
 msgstr ""
 
-#: ../lib/python/Components/Harddisk.py:169
+#: ../lib/python/Components/Harddisk.py:182
+#: ../lib/python/Components/Harddisk.py:172
 msgid "Please Reboot"
 msgstr ""
 
+#: ../lib/python/Plugins/Extensions/MediaScanner/plugin.py:48
 #: ../lib/python/Plugins/Extensions/MediaScanner/plugin.py:44
 msgid "Please Select Medium to be Scanned"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1500
+#: ../lib/python/Screens/InfoBarGenerics.py:1530
+#: ../lib/python/Screens/InfoBarGenerics.py:1521
 msgid "Please change recording endtime"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:293
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:296
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:295
 msgid "Please check your network settings!"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:235
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:238
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:237
 msgid "Please choose .NFI image file from feed server to download"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1252
+#: ../lib/python/Screens/InfoBarGenerics.py:497
+#: ../lib/python/Screens/InfoBarGenerics.py:1278
+#: ../lib/python/Screens/InfoBarGenerics.py:498
+#: ../lib/python/Screens/InfoBarGenerics.py:1275
 msgid "Please choose an extension..."
 msgstr ""
 
@@ -2196,7 +2702,14 @@ msgstr ""
 msgid "Please choose he package..."
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py:53
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:508
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:507
+msgid ""
+"Please disconnect all USB devices from your Dreambox and (re-)attach the "
+"target USB stick (minimum size is 64 MB) now!"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py:55
 msgid "Please do not change any values unless you know what you are doing!"
 msgstr ""
 
@@ -2212,7 +2725,7 @@ msgstr ""
 msgid "Please enter a new filename"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:567
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:597
 msgid "Please enter filename (empty = use current date)"
 msgstr ""
 
@@ -2228,12 +2741,13 @@ msgstr ""
 msgid "Please enter the old pin code"
 msgstr ""
 
-#: ../RecordTimer.py:334
+#: ../RecordTimer.py:366 ../RecordTimer.py:337
 msgid ""
 "Please note that the previously selected media could not be accessed and "
 "therefore the default directory is being used instead."
 msgstr ""
 
+#: ../lib/python/Screens/ScanSetup.py:264
 #: ../lib/python/Screens/ScanSetup.py:299
 msgid "Please press OK to continue."
 msgstr ""
@@ -2248,32 +2762,38 @@ msgstr ""
 msgid "Please select .NFI flash image file from medium"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:608
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:639
 msgid "Please select a playlist to delete..."
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:588
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:618
 msgid "Please select a playlist..."
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:331
+#: ../lib/python/Screens/TimerEntry.py:325
 msgid "Please select a subservice to record..."
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1730
+#: ../lib/python/Screens/InfoBarGenerics.py:1768
 #: ../lib/python/Screens/SubservicesQuickzap.py:106
+#: ../lib/python/Screens/InfoBarGenerics.py:1751
 msgid "Please select a subservice..."
 msgstr ""
 
-#: ../lib/python/Screens/MovieSelection.py:388
-msgid "Please select keyword to filter..."
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:175
+msgid "Please select medium to use as backup location"
+msgstr ""
+
+#: ../lib/python/Screens/MovieSelection.py:422
+msgid "Please select tag to filter..."
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:225
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:228
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:227
 msgid "Please select target directory or medium"
 msgstr ""
 
-#: ../lib/python/Screens/MovieSelection.py:340
+#: ../lib/python/Screens/MovieSelection.py:367
 msgid "Please select the movie path..."
 msgstr ""
 
@@ -2284,88 +2804,122 @@ msgid ""
 "Press OK to go back to the TV mode or EXIT to cancel the moving."
 msgstr ""
 
-#: ../lib/python/Components/Language.py:90
+#: ../lib/python/Components/Language.py:93
+#: ../lib/python/Components/Language.py:92
 msgid ""
 "Please use the UP and DOWN keys to select your language. Afterwards press "
 "the OK button."
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:403
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:177
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:178
-msgid "Please wait for md5 signature verification..."
+#: ../lib/python/Screens/NetworkSetup.py:612
+msgid "Please wait for activation of your network configuration..."
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py:220
+msgid "Please wait while scanning is in progress..."
+msgstr ""
+
+#: ../lib/python/Screens/NetworkSetup.py:182
+msgid "Please wait while we configure your network..."
+msgstr ""
+
+#: ../lib/python/Screens/NetworkSetup.py:936
+msgid "Please wait while your network is restarting..."
+msgstr ""
+
+#: ../lib/python/Screens/NetworkSetup.py:1149
+#: ../lib/python/Screens/NetworkSetup.py:1172
+#: ../lib/python/Screens/NetworkSetup.py:1179
+msgid "Please wait..."
 msgstr ""
 
-#: ../lib/python/Screens/MovieSelection.py:159
-#: ../lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:65
+#: ../lib/python/Screens/MovieSelection.py:180
+#: ../lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:67
 msgid "Please wait... Loading list..."
 msgstr ""
 
+#: ../lib/python/Screens/ScanSetup.py:354
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:445
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:83
 #: ../lib/python/Screens/ScanSetup.py:389
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:447
-#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:136
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:446
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:109
 msgid "Polarity"
 msgstr ""
 
+#: ../lib/python/Screens/ServiceInfo.py:143
+#: ../lib/python/Components/NimManager.py:1063
 #: ../lib/python/Screens/ServiceInfo.py:141
-#: ../lib/python/Components/NimManager.py:918
-#: ../lib/python/Components/NimManager.py:926
+#: ../lib/python/Components/NimManager.py:966
+#: ../lib/python/Components/NimManager.py:974
 msgid "Polarization"
 msgstr ""
 
+#: ../lib/python/Components/Language.py:33
 #: ../lib/python/Components/Language.py:32
 msgid "Polish"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:20
+#: ../lib/python/Screens/Satconfig.py:22
 msgid "Port A"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:23
+#: ../lib/python/Screens/Satconfig.py:25
 msgid "Port B"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:25
+#: ../lib/python/Screens/Satconfig.py:27
 msgid "Port C"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:26
+#: ../lib/python/Screens/Satconfig.py:28
 msgid "Port D"
 msgstr ""
 
+#: ../lib/python/Components/Language.py:34
 #: ../lib/python/Components/Language.py:33
 msgid "Portuguese"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:417
-#: ../lib/python/Components/NimManager.py:878
+#: ../lib/python/Screens/Satconfig.py:477
+#: ../lib/python/Components/NimManager.py:1049
+#: ../lib/python/Screens/Satconfig.py:427
+#: ../lib/python/Components/NimManager.py:923
 msgid "Positioner"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:178
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:192
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:167
 msgid "Positioner fine movement"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:177
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:191
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:166
 msgid "Positioner movement"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:587
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:593
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:605
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:611
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:610
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:616
 msgid "Positioner setup"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:180
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:194
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:169
 msgid "Positioner storage"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:38
-#: ../lib/python/Screens/Satconfig.py:261
+#: ../lib/python/Screens/Satconfig.py:43
+#: ../lib/python/Screens/Satconfig.py:309
+#: ../lib/python/Screens/Satconfig.py:266
 msgid "Power threshold in mA"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:467
-#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:172
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:470
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:140
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:471
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:176
 msgid "Predefined transponder"
 msgstr ""
 
@@ -2373,39 +2927,58 @@ msgstr ""
 msgid "Preparing... Please wait"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:486
+#: ../lib/python/Screens/NetworkSetup.py:55
+#: ../lib/python/Screens/NetworkSetup.py:296
+#: ../lib/python/Screens/NetworkSetup.py:699
 msgid "Press OK on your remote control to continue."
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:162
-#: ../lib/python/Screens/NetworkSetup.py:269
+#: ../lib/python/Screens/NetworkSetup.py:208
+#: ../lib/python/Screens/NetworkSetup.py:348
 msgid "Press OK to activate the settings."
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:55
+#: ../lib/python/Screens/NetworkSetup.py:61
 msgid "Press OK to edit the settings."
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:838
+#: ../lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py:544
+#, python-format
+msgid "Press OK to get further details for %s"
+msgstr ""
+
+#: ../lib/python/Screens/ScanSetup.py:900
+#: ../lib/python/Screens/ScanSetup.py:836
 msgid "Press OK to scan"
 msgstr ""
 
+#: ../lib/python/Screens/ScanSetup.py:300
 #: ../lib/python/Screens/ScanSetup.py:335
 msgid "Press OK to start the scan"
 msgstr ""
 
+#: ../lib/python/Screens/EpgSelection.py:53
 #: ../lib/python/Screens/EpgSelection.py:45
 msgid "Prev"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:82
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:99
 msgid "Preview menu"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:251
+#: ../lib/python/Screens/NetworkSetup.py:330
 msgid "Primary DNS"
 msgstr ""
 
+#: ../lib/python/Screens/Satconfig.py:229
+msgid "Priority"
+msgstr ""
+
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:44
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:103
+msgid "Properties of current title"
+msgstr ""
+
 #: ../lib/python/Screens/ParentalControlSetup.py:68
 msgid "Protect services"
 msgstr ""
@@ -2416,11 +2989,13 @@ msgstr ""
 
 #: ../lib/python/Screens/ChannelSelection.py:653
 #: ../lib/python/Screens/ChannelSelection.py:787
-#: ../lib/python/Components/NimManager.py:996
+#: ../lib/python/Components/NimManager.py:1199
+#: ../lib/python/Components/NimManager.py:1044
 msgid "Provider"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:145
+#: ../lib/python/Screens/Satconfig.py:154
+#: ../lib/python/Screens/Satconfig.py:150
 msgid "Provider to scan"
 msgstr ""
 
@@ -2428,13 +3003,20 @@ msgstr ""
 msgid "Providers"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1721
-#: ../lib/python/Screens/InfoBarGenerics.py:1723
-#: ../lib/python/Screens/InfoBarGenerics.py:1726
+#: ../lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py:566
+msgid "Quick"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1759
+#: ../lib/python/Screens/InfoBarGenerics.py:1761
+#: ../lib/python/Screens/InfoBarGenerics.py:1764
+#: ../lib/python/Screens/InfoBarGenerics.py:1742
+#: ../lib/python/Screens/InfoBarGenerics.py:1744
+#: ../lib/python/Screens/InfoBarGenerics.py:1747
 msgid "Quickzap"
 msgstr ""
 
-#: ../lib/python/Components/AVSwitch.py:82
+#: ../lib/python/Components/AVSwitch.py:69
 msgid "RGB"
 msgstr ""
 
@@ -2442,35 +3024,37 @@ msgstr ""
 msgid "RSS Feed URI"
 msgstr ""
 
-#: ../lib/python/Components/Harddisk.py:269
+#: ../lib/python/Components/Harddisk.py:356
+#: ../lib/python/Components/Harddisk.py:282
 msgid "Ram Disk"
 msgstr ""
 
+#: ../lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py:566
+msgid "Random"
+msgstr ""
+
 #: ../lib/python/Components/ConfigList.py:196
 msgid "Really close without saving settings?"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEdit.py:174
+#: ../lib/python/Screens/TimerEdit.py:194
+#: ../lib/python/Screens/TimerEdit.py:193
 msgid "Really delete done timers?"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEdit.py:185
-msgid "Really delete this timer?"
-msgstr ""
-
 #: ../lib/python/Screens/SubservicesQuickzap.py:117
 msgid "Really exit the subservices quickzap?"
 msgstr ""
 
-#: ../lib/python/Screens/Standby.py:118
+#: ../lib/python/Screens/Standby.py:122
 msgid "Really reboot now?"
 msgstr ""
 
-#: ../lib/python/Screens/Standby.py:122
+#: ../lib/python/Screens/Standby.py:126
 msgid "Really restart now?"
 msgstr ""
 
-#: ../lib/python/Screens/Standby.py:116
+#: ../lib/python/Screens/Standby.py:120
 msgid "Really shutdown now?"
 msgstr ""
 
@@ -2478,19 +3062,25 @@ msgstr ""
 msgid "Reboot"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:93 ../data/
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:107 ../data/
 msgid "Record"
 msgstr ""
 
-#: ../lib/python/Screens/MovieSelection.py:328
+#: ../lib/python/Screens/InfoBarGenerics.py:1474
+#, python-format
+msgid "Record time limited due to conflicting timer %s"
+msgstr ""
+
+#: ../lib/python/Screens/MovieSelection.py:351
 msgid "Recorded files..."
 msgstr ""
 
+#: ../lib/python/Screens/EventView.py:114
 #: ../lib/python/Screens/EventView.py:88
 msgid "Recording"
 msgstr ""
 
-#: ../lib/python/Screens/Standby.py:107
+#: ../lib/python/Screens/Standby.py:111
 msgid "Recording(s) are in progress or coming up in few seconds!"
 msgstr ""
 
@@ -2502,8 +3092,8 @@ msgstr ""
 msgid "Refresh Rate"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:610
-msgid "Remounting stick partition..."
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:336
+msgid "Reload"
 msgstr ""
 
 #: ../lib/python/Screens/LocationBox.py:93
@@ -2515,32 +3105,53 @@ msgstr ""
 msgid "Remove Plugins"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:200
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:173
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:205
 msgid "Remove a mark"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:46
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:45
 msgid "Remove currently selected title"
 msgstr ""
 
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:407
+msgid "Remove finished."
+msgstr ""
+
+#: ../lib/python/Screens/PluginBrowser.py:133
 #: ../lib/python/Screens/PluginBrowser.py:132
 msgid "Remove plugins"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:430
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:438
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:437
 msgid "Remove the broken .NFI file?"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:383
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:386
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:385
 msgid "Remove the incomplete .NFI file?"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:46
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:61
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:86
+#: ../lib/python/Screens/EpgSelection.py:228
+#: ../lib/python/Screens/EpgSelection.py:339
+#: ../lib/python/Screens/EventView.py:101
+#: ../lib/python/Screens/EventView.py:161
+#: ../lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py:608
+#: ../lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py:659
+msgid "Remove timer"
+msgstr ""
+
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:45
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:60
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:105
 msgid "Remove title"
 msgstr ""
 
+#: ../lib/python/Screens/Ipkg.py:95
+msgid "Removing"
+msgstr ""
+
 #: ../lib/python/Screens/LocationBox.py:285
 #, python-format
 msgid "Removing directory %s failed. (Maybe not empty.)"
@@ -2550,15 +3161,16 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:142
+#: ../lib/python/Screens/TimerEntry.py:138
 msgid "Repeat Type"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEdit.py:87
+#: ../lib/python/Screens/TimerEdit.py:103
+#: ../lib/python/Screens/TimerEdit.py:102
 msgid "Repeating event currently recording... What do you want to do?"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:148
+#: ../lib/python/Screens/TimerEntry.py:144
 msgid "Repeats"
 msgstr ""
 
@@ -2566,6 +3178,10 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:101
+msgid "Reset and renumerate title names"
+msgstr ""
+
 #: ../lib/python/Plugins/SystemPlugins/Videomode/plugin.py:63
 msgid "Resolution"
 msgstr ""
@@ -2574,25 +3190,44 @@ msgstr ""
 msgid "Restart GUI now?"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:633
+#: ../lib/python/Screens/NetworkSetup.py:860
 msgid "Restart network"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:912
-#: ../lib/python/Screens/NetworkSetup.py:987
+#: ../lib/python/Screens/NetworkSetup.py:1249
+#: ../lib/python/Screens/NetworkSetup.py:1378
 msgid "Restart test"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:598
+#: ../lib/python/Screens/NetworkSetup.py:830
 msgid "Restart your network connection and interfaces.\n"
 msgstr ""
 
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:202
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:74
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:161
 msgid "Restore"
 msgstr ""
 
-#: ../lib/python/Components/UsageConfig.py:34
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:233
+msgid "Restore backups..."
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:259
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:298
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:300
+msgid "Restore running"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:294
+msgid "Restore running..."
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:104
+msgid "Restore system settings"
+msgstr ""
+
+#: ../lib/python/Components/UsageConfig.py:37
 msgid "Resume from last position"
 msgstr ""
 
@@ -2603,36 +3238,46 @@ msgstr ""
 #. TRANSLATORS: in the middle somewhere and not from the beginning.
 #. TRANSLATORS: (Some translators seem to have interpreted it as a
 #. TRANSLATORS: question or a choice, but it is a statement.)
-#: ../lib/python/Screens/InfoBarGenerics.py:1879
+#: ../lib/python/Screens/InfoBarGenerics.py:1918
+#: ../lib/python/Screens/InfoBarGenerics.py:1900
 msgid "Resuming playback"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:476
+#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:518
 msgid "Return to file browser"
 msgstr ""
 
-#: ../lib/python/Components/UsageConfig.py:36
-#: ../lib/python/Components/UsageConfig.py:38
+#: ../lib/python/Components/UsageConfig.py:39
+#: ../lib/python/Components/UsageConfig.py:41
 msgid "Return to movie list"
 msgstr ""
 
-#: ../lib/python/Components/UsageConfig.py:36
-#: ../lib/python/Components/UsageConfig.py:38
+#: ../lib/python/Components/UsageConfig.py:39
+#: ../lib/python/Components/UsageConfig.py:41
 msgid "Return to previous service"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1602
-#: ../lib/python/Screens/InfoBarGenerics.py:1607
+#: ../lib/python/Screens/InfoBarGenerics.py:1635
+#: ../lib/python/Screens/InfoBarGenerics.py:1640
+#: ../lib/python/Screens/InfoBarGenerics.py:1623
+#: ../lib/python/Screens/InfoBarGenerics.py:1628
 msgid "Right"
 msgstr ""
 
+#: ../lib/python/Screens/ScanSetup.py:361
+#: ../lib/python/Screens/ServiceInfo.py:146
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:452
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:90
 #: ../lib/python/Screens/ScanSetup.py:396
 #: ../lib/python/Screens/ServiceInfo.py:144
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:453
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:116
 msgid "Rolloff"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:39
-#: ../lib/python/Screens/Satconfig.py:262
+#: ../lib/python/Screens/Satconfig.py:44
+#: ../lib/python/Screens/Satconfig.py:310
+#: ../lib/python/Screens/Satconfig.py:267
 msgid "Rotor turning speed"
 msgstr ""
 
@@ -2640,34 +3285,44 @@ msgstr ""
 msgid "Running"
 msgstr ""
 
+#: ../lib/python/Components/Language.py:35
 #: ../lib/python/Components/Language.py:34
 msgid "Russian"
 msgstr ""
 
-#: ../lib/python/Components/AVSwitch.py:82
+#: ../lib/python/Components/AVSwitch.py:69
 msgid "S-Video"
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:262
+#: ../lib/python/Screens/EpgSelection.py:299
 #: ../lib/python/Components/EpgList.py:38
 #: ../lib/python/Components/TimerList.py:24
 #: ../lib/python/Tools/FuzzyDate.py:13
+#: ../lib/python/Screens/EpgSelection.py:262
 msgid "Sat"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:18
-#: ../lib/python/Screens/Satconfig.py:128
-#: ../lib/python/Screens/Satconfig.py:286
+#: ../lib/python/Screens/Satconfig.py:19
+#: ../lib/python/Screens/Satconfig.py:137
+#: ../lib/python/Screens/Satconfig.py:332
+#: ../lib/python/Screens/ScanSetup.py:350
+#: ../lib/python/Screens/ScanSetup.py:366
+#: ../lib/python/Components/ServiceScan.py:40
+#: ../lib/python/Tools/Transponder.py:8
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:430
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:67
+#: ../lib/python/Screens/Satconfig.py:133
+#: ../lib/python/Screens/Satconfig.py:291
 #: ../lib/python/Screens/ScanSetup.py:385
-#: ../lib/python/Screens/ScanSetup.py:402
+#: ../lib/python/Screens/ScanSetup.py:401
 #: ../lib/python/Components/ServiceScan.py:42
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:441
-#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:130
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:431
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:93
 msgid "Satellite"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py:65
-#: ../lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py:71
+#: ../lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py:67
+#: ../lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py:73
 msgid "Satellite Equipment Setup"
 msgstr ""
 
@@ -2676,124 +3331,151 @@ msgstr ""
 msgid "Satellites"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:298
-#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:304 ../data/
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:271
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:277 ../data/
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:307
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:313
 msgid "Satfinder"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:410
+#: ../lib/python/Screens/Satconfig.py:465
+#: ../lib/python/Screens/Satconfig.py:415
 msgid "Sats"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:108
-#: ../lib/python/Screens/TimerEntry.py:165
+#: ../lib/python/Screens/TimerEntry.py:117
+#: ../lib/python/Screens/TimerEntry.py:161
 msgid "Saturday"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:91
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:172
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:175
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:105
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:198
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:201
+#: ../lib/python/Plugins/Extensions/MediaPlayer/settings.py:70
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:114
 msgid "Save"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:567
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:597
 msgid "Save Playlist"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:404
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:171
 msgid "Scaling Mode"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:834
+#: ../lib/python/Screens/ScanSetup.py:896
+#: ../lib/python/Screens/ScanSetup.py:832
 msgid "Scan "
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:165
+#: ../lib/python/Screens/Satconfig.py:174
+#: ../lib/python/Screens/Satconfig.py:170
 msgid "Scan QAM128"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:162
+#: ../lib/python/Screens/Satconfig.py:171
+#: ../lib/python/Screens/Satconfig.py:167
 msgid "Scan QAM16"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:166
+#: ../lib/python/Screens/Satconfig.py:175
+#: ../lib/python/Screens/Satconfig.py:171
 msgid "Scan QAM256"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:163
+#: ../lib/python/Screens/Satconfig.py:172
+#: ../lib/python/Screens/Satconfig.py:168
 msgid "Scan QAM32"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:164
+#: ../lib/python/Screens/Satconfig.py:173
+#: ../lib/python/Screens/Satconfig.py:169
 msgid "Scan QAM64"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:168
+#: ../lib/python/Screens/Satconfig.py:177
+#: ../lib/python/Screens/Satconfig.py:173
 msgid "Scan SR6875"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:167
+#: ../lib/python/Screens/Satconfig.py:176
+#: ../lib/python/Screens/Satconfig.py:172
 msgid "Scan SR6900"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:643
+#: ../lib/python/Screens/NetworkSetup.py:870
 msgid "Scan Wireless Networks"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:169
-#: ../lib/python/Screens/Satconfig.py:170
+#: ../lib/python/Screens/Satconfig.py:178
+#: ../lib/python/Screens/Satconfig.py:179
+#: ../lib/python/Screens/Satconfig.py:174
+#: ../lib/python/Screens/Satconfig.py:175
 msgid "Scan additional SR"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:154
+#: ../lib/python/Screens/Satconfig.py:163
+#: ../lib/python/Screens/Satconfig.py:159
 msgid "Scan band EU HYPER"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:149
+#: ../lib/python/Screens/Satconfig.py:158
+#: ../lib/python/Screens/Satconfig.py:154
 msgid "Scan band EU MID"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:153
+#: ../lib/python/Screens/Satconfig.py:162
+#: ../lib/python/Screens/Satconfig.py:158
 msgid "Scan band EU SUPER"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:151
+#: ../lib/python/Screens/Satconfig.py:160
+#: ../lib/python/Screens/Satconfig.py:156
 msgid "Scan band EU UHF IV"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:152
+#: ../lib/python/Screens/Satconfig.py:161
+#: ../lib/python/Screens/Satconfig.py:157
 msgid "Scan band EU UHF V"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:148
+#: ../lib/python/Screens/Satconfig.py:157
+#: ../lib/python/Screens/Satconfig.py:153
 msgid "Scan band EU VHF I"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:150
+#: ../lib/python/Screens/Satconfig.py:159
+#: ../lib/python/Screens/Satconfig.py:155
 msgid "Scan band EU VHF III"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:157
+#: ../lib/python/Screens/Satconfig.py:166
+#: ../lib/python/Screens/Satconfig.py:162
 msgid "Scan band US HIGH"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:159
+#: ../lib/python/Screens/Satconfig.py:168
+#: ../lib/python/Screens/Satconfig.py:164
 msgid "Scan band US HYPER"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:155
+#: ../lib/python/Screens/Satconfig.py:164
+#: ../lib/python/Screens/Satconfig.py:160
 msgid "Scan band US LOW"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:156
+#: ../lib/python/Screens/Satconfig.py:165
+#: ../lib/python/Screens/Satconfig.py:161
 msgid "Scan band US MID"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:158
+#: ../lib/python/Screens/Satconfig.py:167
+#: ../lib/python/Screens/Satconfig.py:163
 msgid "Scan band US SUPER"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:594
+#: ../lib/python/Screens/NetworkSetup.py:826
 msgid ""
 "Scan your network for wireless Access Points and connect to them using your "
 "WLAN USB Stick\n"
@@ -2804,78 +3486,112 @@ msgid ""
 "Scans default lamedbs sorted by satellite with a connected dish positioner"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:221
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:235
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:210
 msgid "Search east"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:220
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:234
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:209
 msgid "Search west"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:252
+#: ../lib/python/Screens/NetworkSetup.py:331
 msgid "Secondary DNS"
 msgstr ""
 
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:153
+msgid "Select"
+msgstr ""
+
 #: ../lib/python/Screens/LocationBox.py:51
 msgid "Select Location"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1634
+#: ../lib/python/Screens/InfoBarGenerics.py:1667
+#: ../lib/python/Screens/InfoBarGenerics.py:1655
 msgid "Select audio mode"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1610
+#: ../lib/python/Screens/InfoBarGenerics.py:1643
+#: ../lib/python/Screens/InfoBarGenerics.py:1631
 msgid "Select audio track"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:228
+#: ../lib/python/Screens/TimerEntry.py:219
 msgid "Select channel to record from"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:207
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:231
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:112
+msgid "Select files for backup. Currently selected:\n"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:146
+msgid "Select files/folders to backup..."
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:210
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:234
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:209
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:233
 msgid "Select image"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:229
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:232
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:231
 msgid "Selected source image"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/DVDProject.py:35
+#: ../lib/python/Screens/Satconfig.py:20
+msgid "Send DiSEqC"
+msgstr ""
+
+#: ../lib/python/Screens/Satconfig.py:31
+msgid "Send DiSEqC only on satellite change"
+msgstr ""
+
+#: ../lib/python/Plugins/Extensions/DVDBurn/DVDProject.py:26
 msgid "Seperate titles with a main menu"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:234
+#: ../lib/python/Screens/Satconfig.py:282
+#: ../lib/python/Screens/Satconfig.py:239
 msgid "Sequence repeat"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1754
+#: ../lib/python/Screens/InfoBarGenerics.py:1792
+#: ../lib/python/Screens/InfoBarGenerics.py:1775
 msgid "Service has been added to the favourites."
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1760
+#: ../lib/python/Screens/InfoBarGenerics.py:1798
+#: ../lib/python/Screens/InfoBarGenerics.py:1781
 msgid "Service has been added to the selected bouquet."
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:2180
+#: ../lib/python/Screens/InfoBarGenerics.py:2219
+#: ../lib/python/Screens/InfoBarGenerics.py:2201
 msgid ""
 "Service invalid!\n"
 "(Timeout reading PMT)"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:2179
+#: ../lib/python/Screens/InfoBarGenerics.py:2218
+#: ../lib/python/Screens/InfoBarGenerics.py:2200
 msgid ""
 "Service not found!\n"
 "(SID not found in PAT)"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:2185
+#: ../lib/python/Screens/InfoBarGenerics.py:2224
+#: ../lib/python/Screens/InfoBarGenerics.py:2206
 msgid ""
 "Service unavailable!\n"
 "Check tuner configuration!"
 msgstr ""
 
-#: ../lib/python/Screens/ServiceInfo.py:85 ../data/
+#: ../lib/python/Screens/ServiceInfo.py:86 ../data/
+#: ../lib/python/Screens/ServiceInfo.py:85
 msgid "Serviceinfo"
 msgstr ""
 
@@ -2883,30 +3599,43 @@ msgstr ""
 msgid "Services"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:53
+#: ../lib/python/Screens/Satconfig.py:30
+msgid "Set Voltage and 22KHz"
+msgstr ""
+
+#: ../lib/python/Screens/NetworkSetup.py:58
 msgid "Set as default Interface"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:179
+#: ../lib/python/Screens/NetworkSetup.py:81
+msgid "Set interface as default Interface"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:193
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:168
 msgid "Set limits"
 msgstr ""
 
 #: ../lib/python/Screens/SleepTimerEdit.py:86
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:47
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:64
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:46
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:63
 #: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:38
 msgid "Settings"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:1011
-#: ../lib/python/Screens/NetworkSetup.py:1021
-#: ../lib/python/Screens/NetworkSetup.py:1027
-#: ../lib/python/Screens/NetworkSetup.py:1033
-#: ../lib/python/Screens/NetworkSetup.py:1039
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:62 ../data/
+msgid "Setup"
+msgstr ""
+
+#: ../lib/python/Screens/NetworkSetup.py:1273
+#: ../lib/python/Screens/NetworkSetup.py:1283
+#: ../lib/python/Screens/NetworkSetup.py:1289
+#: ../lib/python/Screens/NetworkSetup.py:1295
+#: ../lib/python/Screens/NetworkSetup.py:1301
 msgid "Show Info"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:645
+#: ../lib/python/Screens/NetworkSetup.py:872
 msgid "Show WLAN Status"
 msgstr ""
 
@@ -2922,7 +3651,7 @@ msgstr ""
 msgid "Show the tv player..."
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:596
+#: ../lib/python/Screens/NetworkSetup.py:828
 msgid "Shows the state of your wireless LAN connection.\n"
 msgstr ""
 
@@ -2930,37 +3659,49 @@ msgstr ""
 msgid "Shutdown Dreambox after"
 msgstr ""
 
+#: ../lib/python/Screens/EventView.py:189
 #: ../lib/python/Screens/EventView.py:147
 msgid "Similar"
 msgstr ""
 
+#: ../lib/python/Screens/EventView.py:183
 #: ../lib/python/Screens/EventView.py:141
 msgid "Similar broadcasts:"
 msgstr ""
 
-#: ../lib/python/Components/UsageConfig.py:41
+#: ../lib/python/Components/UsageConfig.py:44
 msgid "Simple"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:874
+#: ../lib/python/Plugins/Extensions/DVDBurn/DVDProject.py:27
+msgid "Simple titleset (compatibility for legacy players)"
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:1047
+#: ../lib/python/Components/NimManager.py:919
 msgid "Single"
 msgstr ""
 
+#: ../lib/python/Screens/EventView.py:209
 #: ../lib/python/Screens/EventView.py:167
 msgid "Single EPG"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:518
+#: ../lib/python/Screens/ScanSetup.py:513
+#: ../lib/python/Screens/ScanSetup.py:516
 msgid "Single satellite"
 msgstr ""
 
+#: ../lib/python/Screens/ScanSetup.py:513
+#: ../lib/python/Screens/ScanSetup.py:514
+#: ../lib/python/Screens/ScanSetup.py:515
+#: ../lib/python/Screens/ScanSetup.py:516
+#: ../lib/python/Screens/ScanSetup.py:517
 #: ../lib/python/Screens/ScanSetup.py:518
-#: ../lib/python/Screens/ScanSetup.py:519
-#: ../lib/python/Screens/ScanSetup.py:520
 msgid "Single transponder"
 msgstr ""
 
-#: ../lib/python/Components/UsageConfig.py:96
+#: ../lib/python/Components/UsageConfig.py:99
 msgid "Singlestep (GOP)"
 msgstr ""
 
@@ -2968,7 +3709,7 @@ msgstr ""
 msgid "Skin..."
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1308 ../data/
+#: ../lib/python/Screens/InfoBarGenerics.py:1329 ../data/
 msgid "Sleep Timer"
 msgstr ""
 
@@ -2977,7 +3718,7 @@ msgstr ""
 msgid "Sleep timer action:"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:403
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:170
 msgid "Slideshow Interval (sec.)"
 msgstr ""
 
@@ -2986,37 +3727,74 @@ msgstr ""
 msgid "Slot %d"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:901
-#: ../lib/python/Components/NimManager.py:976
+#: ../lib/python/Components/NimManager.py:1057
+#: ../lib/python/Components/NimManager.py:949
+#: ../lib/python/Components/NimManager.py:1024
 msgid "Slow"
 msgstr ""
 
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:719
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:725
+msgid "Software manager"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:135
+msgid "Software manager..."
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:102
+msgid "Software restore"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:101
+msgid "Software update"
+msgstr ""
+
 #: ../lib/python/Screens/PluginBrowser.py:38
 msgid "Some plugins are not available:\n"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:143
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:165
+msgid "Sorry MediaScanner is not installed!"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:154
+msgid "Sorry no backups found!"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:84
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py:86
 msgid ""
-"Sorry your Backup destination does not exist\n"
-"\n"
+"Sorry your backup destination is not writeable.\n"
 "Please choose an other one."
 msgstr ""
 
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:212
+msgid ""
+"Sorry, your backup destination is not writeable.\n"
+"\n"
+"Please choose another one."
+msgstr ""
+
 #. TRANSLATORS: This must fit into the header button in the EPG-List
+#: ../lib/python/Screens/EpgSelection.py:187
 #: ../lib/python/Screens/EpgSelection.py:176
 msgid "Sort A-Z"
 msgstr ""
 
 #. TRANSLATORS: This must fit into the header button in the EPG-List
+#: ../lib/python/Screens/EpgSelection.py:184
 #: ../lib/python/Screens/EpgSelection.py:173
 msgid "Sort Time"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:898
-#: ../lib/python/Components/NimManager.py:973
+#: ../lib/python/Components/NimManager.py:1056
+#: ../lib/python/Components/NimManager.py:946
+#: ../lib/python/Components/NimManager.py:1021
 msgid "South"
 msgstr ""
 
+#: ../lib/python/Components/Language.py:36
 #: ../lib/python/Components/Language.py:35
 msgid "Spanish"
 msgstr ""
@@ -3025,138 +3803,169 @@ msgstr ""
 msgid "Standby"
 msgstr ""
 
-#: ../mytest.py:365 ../data/
+#: ../mytest.py:362 ../data/ ../mytest.py:360
 msgid "Standby / Restart"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:171
-msgid "Start"
-msgstr ""
-
-#: ../lib/python/Components/UsageConfig.py:34
+#: ../lib/python/Components/UsageConfig.py:37
 msgid "Start from the beginning"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1549
+#: ../lib/python/Screens/InfoBarGenerics.py:1580
+#: ../lib/python/Screens/InfoBarGenerics.py:1570
 msgid "Start recording?"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:1048
+#: ../lib/python/Screens/NetworkSetup.py:1310
 msgid "Start test"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:176
+#: ../lib/python/Screens/TimerEntry.py:168
 msgid "StartTime"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:150
+#: ../lib/python/Screens/TimerEntry.py:146
 msgid "Starting on"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:226
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:240
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:215
 msgid "Step east"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:225
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:239
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:214
 msgid "Step west"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1602
-#: ../lib/python/Screens/InfoBarGenerics.py:1607
+#: ../lib/python/Screens/InfoBarGenerics.py:1635
+#: ../lib/python/Screens/InfoBarGenerics.py:1640
+#: ../lib/python/Screens/InfoBarGenerics.py:1623
+#: ../lib/python/Screens/InfoBarGenerics.py:1628
 msgid "Stereo"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:214
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:215
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:216
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:217
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:228
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:229
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:230
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:231
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:203
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:204
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:205
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:206
 msgid "Stop"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1123
+#: ../lib/python/Screens/InfoBarGenerics.py:1149
+#: ../lib/python/Screens/InfoBarGenerics.py:1146
 msgid "Stop Timeshift?"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEdit.py:85
+#: ../lib/python/Screens/TimerEdit.py:100
 msgid "Stop current event and disable coming events"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEdit.py:84
+#: ../lib/python/Screens/TimerEdit.py:99
 msgid "Stop current event but not coming events"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBar.py:172
+#: ../lib/python/Screens/InfoBar.py:177 ../lib/python/Screens/InfoBar.py:172
 msgid "Stop playing this movie?"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:1051
+#: ../lib/python/Screens/NetworkSetup.py:1313
 msgid "Stop test"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:235
+#: ../lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py:571
+msgid "Stop testing plane after # failed transponders"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py:575
+msgid "Stop testing plane after # successful transponders"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:249
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:224
 msgid "Store position"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:221
+#: ../lib/python/Screens/Satconfig.py:324
+#: ../lib/python/Screens/Satconfig.py:226
 msgid "Stored position"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1652
+#: ../lib/python/Screens/InfoBarGenerics.py:1685
+#: ../lib/python/Screens/InfoBarGenerics.py:1673
 msgid "Subservice list..."
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:129 ../data/
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:173 ../data/
 msgid "Subtitle selection"
 msgstr ""
 
 #: ../lib/python/Screens/Subtitles.py:61 ../lib/python/Screens/Subtitles.py:64
 #: ../lib/python/Screens/Subtitles.py:66
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:126
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:131 ../data/
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:145 ../data/
 msgid "Subtitles"
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:262
+#: ../lib/python/Screens/EpgSelection.py:299
 #: ../lib/python/Components/EpgList.py:38
 #: ../lib/python/Components/TimerList.py:24
 #: ../lib/python/Tools/FuzzyDate.py:13
+#: ../lib/python/Screens/EpgSelection.py:262
 msgid "Sun"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:108
-#: ../lib/python/Screens/TimerEntry.py:166
+#: ../lib/python/Screens/TimerEntry.py:117
+#: ../lib/python/Screens/TimerEntry.py:162
 msgid "Sunday"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1335
+#: ../lib/python/Screens/InfoBarGenerics.py:1356
 msgid "Swap Services"
 msgstr ""
 
+#: ../lib/python/Components/Language.py:37
 #: ../lib/python/Components/Language.py:36
 msgid "Swedish"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1657
+#: ../lib/python/Screens/InfoBarGenerics.py:1690
+#: ../lib/python/Screens/InfoBarGenerics.py:1678
 msgid "Switch to next subservice"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1658
+#: ../lib/python/Screens/InfoBarGenerics.py:1691
+#: ../lib/python/Screens/InfoBarGenerics.py:1679
 msgid "Switch to previous subservice"
 msgstr ""
 
+#: ../lib/python/Screens/ScanSetup.py:353
+#: ../lib/python/Screens/ScanSetup.py:383
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:444
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:82
 #: ../lib/python/Screens/ScanSetup.py:388
-#: ../lib/python/Screens/ScanSetup.py:419
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:446
-#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:135
+#: ../lib/python/Screens/ScanSetup.py:418
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:445
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:108
 msgid "Symbol Rate"
 msgstr ""
 
+#: ../lib/python/Screens/ServiceInfo.py:141
 #: ../lib/python/Screens/ServiceInfo.py:139
 msgid "Symbolrate"
 msgstr ""
 
+#: ../lib/python/Screens/ScanSetup.py:345
+#: ../lib/python/Screens/ServiceInfo.py:137
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:437
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:75 ../data/
 #: ../lib/python/Screens/ScanSetup.py:380
-#: ../lib/python/Screens/ServiceInfo.py:135 ../data/
+#: ../lib/python/Screens/ServiceInfo.py:135
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:438
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:101
 msgid "System"
 msgstr ""
 
@@ -3165,20 +3974,48 @@ msgstr ""
 msgid "TRANSLATOR_INFO"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:176
+#: ../lib/python/Plugins/Extensions/DVDBurn/Process.py:280
+msgid "TS file is too large for ISO9660 level 1!"
+msgstr ""
+
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:190
 msgid "Table of content for collection"
 msgstr ""
 
+#: ../lib/python/Screens/MovieSelection.py:316
+msgid "Tag 1"
+msgstr ""
+
+#: ../lib/python/Screens/MovieSelection.py:321
+msgid "Tag 2"
+msgstr ""
+
+#: ../lib/python/Screens/MovieSelection.py:328
+#: ../lib/python/Screens/TimerEntry.py:179
+msgid "Tags"
+msgstr ""
+
 #: ../lib/python/Screens/ChannelSelection.py:909
+#: ../lib/python/Components/ServiceScan.py:81
+#: ../lib/python/Tools/Transponder.py:70
 #: ../lib/python/Components/ServiceScan.py:78
 msgid "Terrestrial"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:177
+#: ../lib/python/Screens/Satconfig.py:186
+#: ../lib/python/Screens/Satconfig.py:182
 msgid "Terrestrial provider"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:590
+#: ../lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py:641
+msgid "Test DiSEqC settings"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py:567
+msgid "Test Type"
+msgstr ""
+
+#: ../lib/python/Screens/NetworkSetup.py:822
 msgid "Test the network configuration of your Dreambox.\n"
 msgstr ""
 
@@ -3186,22 +4023,22 @@ msgstr ""
 msgid "Test-Messagebox?"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:626
-msgid ""
-"The .NFI Image flasher USB stick is now ready to use. Please download an ."
-"NFI image file from the feed server and save it on the stick. Then reboot "
-"and hold the 'Down' key on the front panel to boot the .NFI flasher from the "
-"stick!"
-msgstr ""
-
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:257
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:275
 msgid ""
 "The DVD standard doesn't support H.264 (HDTV) video streams. Do you want to "
 "create a Dreambox format data DVD (which will not play in stand-alone DVD "
 "players) instead?"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:539
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:623
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:622
+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 ""
+
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:536
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:535
 #, python-format
 msgid ""
 "The following device was found:\n"
@@ -3211,6 +4048,7 @@ msgid ""
 "Do you want to write the USB flasher to this stick?"
 msgstr ""
 
+#: ../lib/python/Screens/ScanSetup.py:264
 #: ../lib/python/Screens/ScanSetup.py:299
 msgid "The installation of the default services lists is finished."
 msgstr ""
@@ -3228,7 +4066,8 @@ msgid ""
 "risk!"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:430
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:438
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:437
 msgid ""
 "The md5sum validation failed, the file may be downloaded incompletely or be "
 "corrupted!"
@@ -3253,6 +4092,11 @@ msgstr ""
 msgid "The pin codes you entered are different."
 msgstr ""
 
+#: ../lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py:512
+#, python-format
+msgid "The results have been written to %s."
+msgstr ""
+
 #: ../lib/python/Screens/SleepTimerEdit.py:98
 msgid "The sleep timer has been activated."
 msgstr ""
@@ -3261,18 +4105,26 @@ msgstr ""
 msgid "The sleep timer has been disabled."
 msgstr ""
 
-#: ../RecordTimer.py:411
+#: ../RecordTimer.py:455 ../RecordTimer.py:426
 msgid "The timer file (timers.xml) is corrupt and could not be loaded."
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:512
-#: ../lib/python/Screens/NetworkSetup.py:532
-#: ../lib/python/Screens/NetworkSetup.py:546
+#: ../lib/python/Screens/NetworkSetup.py:744
+#: ../lib/python/Screens/NetworkSetup.py:764
+#: ../lib/python/Screens/NetworkSetup.py:778
+#: ../lib/python/Screens/NetworkSetup.py:897
 msgid ""
 "The wireless LAN plugin is not installed!\n"
 "Please install it."
 msgstr ""
 
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:646
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:645 ../data/
+msgid ""
+"The wizard can backup your current settings. Do you want to do a backup now?"
+msgstr ""
+
 #: ../lib/python/Screens/LocationBox.py:359
 msgid ""
 "There might not be enough Space on the selected Partition.\n"
@@ -3296,18 +4148,18 @@ msgid ""
 "flash memory?"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:163
+#: ../lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:166
 msgid ""
 "This DVD RW medium is already formatted - reformatting will erase all "
 "content on the disc."
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:230
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:275
 #, python-format
 msgid "This Dreambox can't decode %s video streams!"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:975
+#: ../lib/python/Screens/NetworkSetup.py:1237
 msgid ""
 "This test checks for configured Nameservers.\n"
 "If you get a \"unconfirmed\" message:\n"
@@ -3316,7 +4168,7 @@ msgid ""
 "the \"Nameserver\" Configuration"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:960
+#: ../lib/python/Screens/NetworkSetup.py:1222
 msgid ""
 "This test checks whether a network cable is connected to your LAN-Adapter.\n"
 "If you get a \"disconnected\" message:\n"
@@ -3324,7 +4176,7 @@ msgid ""
 "- verify that the cable is not broken"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:970
+#: ../lib/python/Screens/NetworkSetup.py:1232
 msgid ""
 "This test checks whether a valid IP Address is found for your LAN Adapter.\n"
 "If you get a \"unconfirmed\" message:\n"
@@ -3332,7 +4184,7 @@ msgid ""
 "- please check your DHCP, cabling and adapter setup"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:965
+#: ../lib/python/Screens/NetworkSetup.py:1227
 msgid ""
 "This test checks whether your LAN Adapter is set up for automatic IP Address "
 "configuration with DHCP.\n"
@@ -3344,27 +4196,35 @@ msgid ""
 "-verify that you have a configured and working DHCP Server in your network."
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:955
+#: ../lib/python/Screens/NetworkSetup.py:1217
 msgid "This test detects your configured LAN-Adapter."
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:969
+#: ../lib/python/Components/NimManager.py:1073
+#: ../lib/python/Components/NimManager.py:1017
 msgid "Three"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:278
+#: ../lib/python/Screens/Satconfig.py:235
+#: ../lib/python/Screens/Satconfig.py:247
+#: ../lib/python/Screens/Satconfig.py:283
 msgid "Threshold"
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:262
+#: ../lib/python/Screens/EpgSelection.py:299
 #: ../lib/python/Components/EpgList.py:38
 #: ../lib/python/Components/TimerList.py:24
 #: ../lib/python/Tools/FuzzyDate.py:13
+#: ../lib/python/Screens/EpgSelection.py:262
 msgid "Thu"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:108
-#: ../lib/python/Screens/TimerEntry.py:163
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:59
+msgid "Thumbnails"
+msgstr ""
+
+#: ../lib/python/Screens/TimerEntry.py:117
+#: ../lib/python/Screens/TimerEntry.py:159
 msgid "Thursday"
 msgstr ""
 
@@ -3372,11 +4232,11 @@ msgstr ""
 msgid "Time"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:140
+#: ../lib/python/Screens/TimerEntry.py:136
 msgid "Timer Type"
 msgstr ""
 
-#: ../RecordTimer.py:430
+#: ../RecordTimer.py:477 ../RecordTimer.py:448
 msgid ""
 "Timer overlap in timers.xml detected!\n"
 "Please recheck it!"
@@ -3387,141 +4247,204 @@ msgstr ""
 msgid "Timer status:"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1093
+#: ../lib/python/Screens/InfoBarGenerics.py:1119
+#: ../lib/python/Screens/InfoBarGenerics.py:1116
 msgid "Timeshift not possible!"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:93
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:125
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:131
-#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:402
+#: ../lib/python/Plugins/Extensions/DVDBurn/DVDTitle.py:14
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:107
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:144
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py:73
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py:90
+#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:422
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:128
 msgid "Title"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:84
-msgid "Title:"
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:44
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:62
+msgid "Title properties"
+msgstr ""
+
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:155
+msgid "Titleset mode"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:492
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:672
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:667
 msgid ""
-"To make sure you intend to do this, please remove the target USB stick now "
-"and stick it back in upon prompt. Press OK when you have taken the stick out."
+"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 ""
 
-#: ../lib/python/Screens/EpgSelection.py:273
+#: ../lib/python/Screens/EpgSelection.py:309
 #: ../lib/python/Tools/FuzzyDate.py:10
+#: ../lib/python/Screens/EpgSelection.py:273
 msgid "Today"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:215
+#: ../lib/python/Screens/Satconfig.py:273
+#: ../lib/python/Screens/Satconfig.py:220
 msgid "Tone mode"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:231
+#: ../lib/python/Screens/Satconfig.py:279
+#: ../lib/python/Screens/Satconfig.py:236
 msgid "Toneburst"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:875
+#: ../lib/python/Components/NimManager.py:1047
+#: ../lib/python/Components/NimManager.py:920
 msgid "Toneburst A/B"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:93
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:107
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py:72
 msgid "Track"
 msgstr ""
 
+#: ../lib/python/Screens/ServiceInfo.py:151
 #: ../lib/python/Screens/ServiceInfo.py:149
 msgid "Transmission Mode"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:430
+#: ../lib/python/Screens/ScanSetup.py:394
+#: ../lib/python/Screens/ScanSetup.py:429
 msgid "Transmission mode"
 msgstr ""
 
+#: ../lib/python/Screens/ServiceInfo.py:88
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:455
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:93
 #: ../lib/python/Screens/ServiceInfo.py:87
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:450
-#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:139
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:456
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:119
 msgid "Transponder"
 msgstr ""
 
+#: ../lib/python/Screens/ServiceInfo.py:136
 #: ../lib/python/Screens/ServiceInfo.py:134
 msgid "Transponder Type"
 msgstr ""
 
-#: ../lib/python/Screens/InputBox.py:173
+#: ../lib/python/Screens/InputBox.py:175
 msgid "Tries left:"
 msgstr ""
 
+#: ../lib/python/Screens/ScanSetup.py:156
 #: ../lib/python/Screens/ScanSetup.py:191
 msgid "Try to find used Transponders in cable network.. please wait..."
 msgstr ""
 
+#: ../lib/python/Screens/ScanSetup.py:243
 #: ../lib/python/Screens/ScanSetup.py:278
 msgid "Try to find used transponders in cable network.. please wait..."
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:262
+#: ../lib/python/Screens/EpgSelection.py:299
 #: ../lib/python/Components/EpgList.py:38
 #: ../lib/python/Components/TimerList.py:24
 #: ../lib/python/Tools/FuzzyDate.py:13
+#: ../lib/python/Screens/EpgSelection.py:262
 msgid "Tue"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:108
-#: ../lib/python/Screens/TimerEntry.py:161
+#: ../lib/python/Screens/TimerEntry.py:117
+#: ../lib/python/Screens/TimerEntry.py:157
 msgid "Tuesday"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:176
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:208
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:439
-#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:128
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:190
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:222
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:428
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:65
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:165
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:197
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:429
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:91
 msgid "Tune"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:2177
+#: ../lib/python/Screens/InfoBarGenerics.py:2216
+#: ../lib/python/Screens/InfoBarGenerics.py:2198
 msgid "Tune failed!"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:105
 #: ../lib/python/Screens/Satconfig.py:114
-#: ../lib/python/Screens/Satconfig.py:405
+#: ../lib/python/Screens/Satconfig.py:123
+#: ../lib/python/Screens/Satconfig.py:460
+#: ../lib/python/Screens/ScanSetup.py:320
+#: ../lib/python/Components/ServiceScan.py:137
+#: ../lib/python/Screens/Satconfig.py:110
+#: ../lib/python/Screens/Satconfig.py:119
+#: ../lib/python/Screens/Satconfig.py:410
 #: ../lib/python/Screens/ScanSetup.py:355
 #: ../lib/python/Components/ServiceScan.py:133
 msgid "Tuner"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:432
+#: ../lib/python/Components/NimManager.py:482
+#: ../lib/python/Components/NimManager.py:455
 msgid "Tuner "
 msgstr ""
 
+#: ../lib/python/Screens/ServiceInfo.py:89
 #: ../lib/python/Screens/ServiceInfo.py:88
 msgid "Tuner status"
 msgstr ""
 
+#: ../lib/python/Components/Language.py:38
 #: ../lib/python/Components/Language.py:37
 msgid "Turkish"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:969
+#: ../lib/python/Components/NimManager.py:1073
+#: ../lib/python/Components/NimManager.py:1017
 msgid "Two"
 msgstr ""
 
+#: ../lib/python/Screens/Satconfig.py:253
+#: ../lib/python/Screens/Satconfig.py:264
+msgid "Type"
+msgstr ""
+
+#: ../lib/python/Screens/ScanSetup.py:331
+#: ../lib/python/Screens/ScanSetup.py:334
+#: ../lib/python/Screens/ScanSetup.py:337
 #: ../lib/python/Screens/ScanSetup.py:366
 #: ../lib/python/Screens/ScanSetup.py:369
 #: ../lib/python/Screens/ScanSetup.py:372
 msgid "Type of scan"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:419
-#: ../lib/python/Components/NimManager.py:892
+#: ../lib/python/Screens/Satconfig.py:479
+#: ../lib/python/Components/NimManager.py:1051
+#: ../lib/python/Screens/Satconfig.py:429
+#: ../lib/python/Components/NimManager.py:940
 msgid "USALS"
 msgstr ""
 
-#: ../lib/python/Components/Harddisk.py:270
+#: ../lib/python/Components/Harddisk.py:357
+#: ../lib/python/Components/Harddisk.py:283
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:108
 msgid "USB Stick"
 msgstr ""
 
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:211
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:210
+msgid "USB stick wizard"
+msgstr ""
+
+#: ../lib/python/Components/Language.py:39
+#: ../lib/python/Components/Language.py:38
+msgid "Ukrainian"
+msgstr ""
+
 #: ../lib/python/Screens/HarddiskSetup.py:75
 msgid ""
 "Unable to complete filesystem check.\n"
@@ -3534,26 +4457,37 @@ msgid ""
 "Error: "
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:249
+#: ../lib/python/Screens/Satconfig.py:297
+#: ../lib/python/Screens/Satconfig.py:254
 msgid "Uncommitted DiSEqC command"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:945
+#: ../lib/python/Components/NimManager.py:922
+msgid "Unicable"
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:980
+msgid "Unicable LNB"
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:981
+msgid "Unicable Martix"
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:921
+#: ../lib/python/Components/NimManager.py:993
 msgid "Universal LNB"
 msgstr ""
 
-#: ../lib/python/Components/Harddisk.py:169
+#: ../lib/python/Components/Harddisk.py:182
+#: ../lib/python/Components/Harddisk.py:172
 msgid "Unmount failed"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:34
+#: ../lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:35
 msgid "Update"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:360
-msgid "Updates your receiver's software"
-msgstr ""
-
 #: ../lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py:46
 #: ../lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py:145
 #: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:231
@@ -3566,57 +4500,72 @@ msgstr ""
 msgid "Updating... Please wait... This can take some minutes..."
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:69
-#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:347
-msgid "Upgrade finished. Do you want to reboot your Dreambox?"
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:430
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:646
+msgid "Upgrade finished."
 msgstr ""
 
 #: ../lib/python/Screens/Ipkg.py:87
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:599
 #: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:300
 msgid "Upgrading"
 msgstr ""
 
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:560
 #: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:261
 msgid "Upgrading Dreambox... Please wait"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:365 ../data/
+#: ../lib/python/Plugins/Extensions/MediaPlayer/settings.py:31
+msgid "Use"
+msgstr ""
+
+#: ../lib/python/Screens/NetworkSetup.py:473 ../data/
 msgid "Use DHCP"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:361
+#: ../lib/python/Screens/NetworkSetup.py:469
 msgid "Use Interface"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:35
-#: ../lib/python/Screens/Satconfig.py:258
+#: ../lib/python/Screens/Satconfig.py:40
+#: ../lib/python/Screens/Satconfig.py:306
+#: ../lib/python/Screens/Satconfig.py:263
 msgid "Use Power Measurement"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:370
+#: ../lib/python/Screens/NetworkSetup.py:478
 msgid "Use a gateway"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:600
+#: ../lib/python/Screens/NetworkSetup.py:832
 msgid "Use the Networkwizard to configure your Network\n"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:218
+#: ../lib/python/Screens/Satconfig.py:321
+#: ../lib/python/Screens/Satconfig.py:223
 msgid "Use usals for this sat"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:142
+#: ../lib/python/Screens/Satconfig.py:151
+#: ../lib/python/Screens/Satconfig.py:147
 msgid "Used service scan type"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:945
+#: ../lib/python/Components/NimManager.py:924
+#: ../lib/python/Components/NimManager.py:982
+#: ../lib/python/Components/NimManager.py:993
 msgid "User defined"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:135
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:157
 msgid "VMGM (intro trailer)"
 msgstr ""
 
+#: ../lib/python/Tools/Transponder.py:32
+msgid "Vertical"
+msgstr ""
+
 #: ../lib/python/Plugins/SystemPlugins/VideoTune/plugin.py:33
 #: ../lib/python/Plugins/SystemPlugins/VideoTune/plugin.py:37
 msgid "Video Fine-Tuning"
@@ -3630,11 +4579,11 @@ msgstr ""
 msgid "Video Output"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/Videomode/plugin.py:219
+#: ../lib/python/Plugins/SystemPlugins/Videomode/plugin.py:220
 msgid "Video Setup"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/Videomode/plugin.py:222
+#: ../lib/python/Plugins/SystemPlugins/Videomode/plugin.py:223
 msgid "Video Wizard"
 msgstr ""
 
@@ -3642,33 +4591,41 @@ msgstr ""
 msgid "View Rass interactive..."
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:2092
+#: ../lib/python/Screens/InfoBarGenerics.py:2131
+#: ../lib/python/Screens/InfoBarGenerics.py:2113
 msgid "View teletext..."
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:214
+#: ../lib/python/Screens/Satconfig.py:271
+#: ../lib/python/Screens/Satconfig.py:219
 msgid "Voltage mode"
 msgstr ""
 
 #: ../lib/python/Screens/ChannelSelection.py:913
-#: ../lib/python/Screens/Satconfig.py:318
+#: ../lib/python/Screens/Satconfig.py:364
+#: ../lib/python/Components/ServiceScan.py:49
+#: ../lib/python/Screens/Satconfig.py:323
 #: ../lib/python/Components/ServiceScan.py:53
 msgid "W"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:307
+#: ../lib/python/Screens/NetworkSetup.py:408
 msgid "WEP"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:308
+#: ../lib/python/Screens/NetworkSetup.py:409
 msgid "WPA"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:309
+#: ../lib/python/Screens/NetworkSetup.py:411
+msgid "WPA or WPA2"
+msgstr ""
+
+#: ../lib/python/Screens/NetworkSetup.py:410
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/Videomode/plugin.py:89 ../data/
+#: ../lib/python/Plugins/SystemPlugins/Videomode/plugin.py:90 ../data/
 msgid "WSS on 4:3"
 msgstr ""
 
@@ -3676,27 +4633,25 @@ msgstr ""
 msgid "Waiting"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:506
-msgid "Waiting for USB stick to settle..."
-msgstr ""
-
-#: ../lib/python/Screens/EpgSelection.py:262
+#: ../lib/python/Screens/EpgSelection.py:299
 #: ../lib/python/Components/EpgList.py:38
 #: ../lib/python/Components/TimerList.py:24
 #: ../lib/python/Tools/FuzzyDate.py:13
+#: ../lib/python/Screens/EpgSelection.py:262
 msgid "Wed"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:108
-#: ../lib/python/Screens/TimerEntry.py:162
+#: ../lib/python/Screens/TimerEntry.py:117
+#: ../lib/python/Screens/TimerEntry.py:158
 msgid "Wednesday"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:157
+#: ../lib/python/Screens/TimerEntry.py:153
 msgid "Weekday"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:224
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:197
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:229
 msgid ""
 "Welcome to the Cutlist editor.\n"
 "\n"
@@ -3706,24 +4661,40 @@ msgid ""
 "Then seek to the end, press OK, select 'end cut'. That's it."
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:896
-#: ../lib/python/Components/NimManager.py:971
+#: ../lib/python/Components/NimManager.py:1055
+#: ../lib/python/Components/NimManager.py:944
+#: ../lib/python/Components/NimManager.py:1019
 msgid "West"
 msgstr ""
 
-#: ../lib/python/Components/Network.py:238
+#: ../lib/python/Screens/FactoryReset.py:5
+msgid ""
+"When you do a factory reset, you will lose ALL your configuration data\n"
+"(including bouquets, services, satellite data ...)\n"
+"After completion of factory reset, your receiver will restart "
+"automatically!\n"
+"\n"
+"Really do a factory reset?"
+msgstr ""
+
+#: ../lib/python/Screens/LocationBox.py:521
+#: ../lib/python/Screens/LocationBox.py:516
+msgid "Where to save temporary timeshift recordings?"
+msgstr ""
+
+#: ../lib/python/Components/Network.py:291
 msgid "Wireless"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:1015
+#: ../lib/python/Screens/NetworkSetup.py:1277
 msgid "Wireless Network"
 msgstr ""
 
-#: ../RecordTimer.py:327
+#: ../RecordTimer.py:359 ../RecordTimer.py:330
 msgid "Write error while recording. Disk full?\n"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/Process.py:252
+#: ../lib/python/Plugins/Extensions/DVDBurn/Process.py:277
 msgid "Write failed!"
 msgstr ""
 
@@ -3731,58 +4702,54 @@ msgstr ""
 msgid "Writing NFI image file to flash completed"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:20
-msgid "Writing image file to NAND Flash"
-msgstr ""
-
-#: ../lib/python/Components/AVSwitch.py:86
+#: ../lib/python/Components/AVSwitch.py:73
 msgid "YPbPr"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:88
-msgid "Year:"
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:107
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:132
+msgid "Year"
 msgstr ""
 
-#: ../lib/python/Screens/Ci.py:19 ../lib/python/Screens/InfoBar.py:162
-#: ../data/ ../lib/python/Plugins/SystemPlugins/Videomode/
+#: ../lib/python/Screens/Ci.py:19 ../lib/python/Screens/InfoBar.py:164
+#: ../lib/python/Screens/InfoBar.py:169 ../data/
+#: ../lib/python/Plugins/SystemPlugins/Videomode/
+#: ../lib/python/Screens/InfoBar.py:162
 msgid "Yes"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBar.py:166
+#: ../lib/python/Screens/InfoBar.py:171 ../lib/python/Screens/InfoBar.py:166
 msgid "Yes, and delete this movie"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBar.py:164
+#: ../lib/python/Screens/InfoBar.py:170 ../lib/python/Screens/InfoBar.py:164
 msgid "Yes, returning to movie list"
 msgstr ""
 
+#: ../lib/python/Screens/InfoBar.py:207
+#: ../lib/python/Screens/MovieSelection.py:128
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:699
 #: ../lib/python/Screens/InfoBar.py:202
-#: ../lib/python/Screens/MovieSelection.py:108
 msgid "You cannot delete this!"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:445
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:453
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:452
 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."
 msgstr ""
 
-#: ../lib/python/Screens/InputBox.py:102
+#: ../lib/python/Screens/InputBox.py:104
 #, python-format
 msgid "You have to wait %s!"
 msgstr ""
 
-#: ../lib/python/Screens/MovieSelection.py:392
-msgid ""
-"You need to define some keywords first!\n"
-"Press the menu-key to define keywords.\n"
-"Do you want to define keywords now?"
-msgstr ""
-
-#: ../lib/python/Screens/NetworkSetup.py:487
+#: ../lib/python/Screens/NetworkSetup.py:700
 msgid "Your Dreambox will restart after pressing OK on your remote control."
 msgstr ""
 
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:635
 #: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:336
 msgid ""
 "Your dreambox isn't connected to the internet properly. Please check it and "
@@ -3795,12 +4762,27 @@ msgid ""
 "Press OK to start upgrade."
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:144
-msgid "Zap back to service before positioner setup?"
+#: ../lib/python/Screens/NetworkSetup.py:631
+#: ../lib/python/Screens/NetworkSetup.py:633
+msgid "Your network configuration has been activated."
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:248
-msgid "Zap back to service before satfinder?"
+#: ../lib/python/Screens/NetworkSetup.py:628
+msgid ""
+"Your network configuration has been activated.\n"
+"A second configured interface has been found.\n"
+"\n"
+"Do you want to disable the second network interface?"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:158
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:133
+msgid "Zap back to service before positioner setup?"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:215
+#: ../lib/python/Plugins/SystemPlugins/Satfinder/plugin.py:251
+msgid "Zap back to service before satfinder?"
 msgstr ""
 
 #: ../lib/python/Screens/ChannelSelection.py:521
@@ -3835,6 +4817,14 @@ msgstr ""
 msgid "about to start"
 msgstr ""
 
+#: ../lib/python/Screens/NetworkSetup.py:214
+msgid "activate current configuration"
+msgstr ""
+
+#: ../lib/python/Screens/NetworkSetup.py:220
+msgid "add a nameserver entry"
+msgstr ""
+
 #: ../lib/python/Screens/ChannelSelection.py:144
 msgid "add alternatives"
 msgstr ""
@@ -3847,15 +4837,15 @@ msgstr ""
 msgid "add bouquet"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:446
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:482
 msgid "add directory to playlist"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:110
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:154
 msgid "add file to playlist"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:448
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:484
 msgid "add files to playlist"
 msgstr ""
 
@@ -3863,23 +4853,31 @@ msgstr ""
 msgid "add marker"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1544
-#: ../lib/python/Screens/InfoBarGenerics.py:1552
+#: ../lib/python/Screens/InfoBarGenerics.py:1571
+#: ../lib/python/Screens/InfoBarGenerics.py:1582
+#: ../lib/python/Screens/InfoBarGenerics.py:1561
+#: ../lib/python/Screens/InfoBarGenerics.py:1572
 msgid "add recording (enter recording duration)"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1545
-#: ../lib/python/Screens/InfoBarGenerics.py:1553
+#: ../lib/python/Screens/InfoBarGenerics.py:1572
+#: ../lib/python/Screens/InfoBarGenerics.py:1583
+#: ../lib/python/Screens/InfoBarGenerics.py:1562
+#: ../lib/python/Screens/InfoBarGenerics.py:1573
 msgid "add recording (enter recording endtime)"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1542
-#: ../lib/python/Screens/InfoBarGenerics.py:1550
+#: ../lib/python/Screens/InfoBarGenerics.py:1573
+#: ../lib/python/Screens/InfoBarGenerics.py:1584
+#: ../lib/python/Screens/InfoBarGenerics.py:1563
+#: ../lib/python/Screens/InfoBarGenerics.py:1574
 msgid "add recording (indefinitely)"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1543
-#: ../lib/python/Screens/InfoBarGenerics.py:1551
+#: ../lib/python/Screens/InfoBarGenerics.py:1570
+#: ../lib/python/Screens/InfoBarGenerics.py:1581
+#: ../lib/python/Screens/InfoBarGenerics.py:1560
+#: ../lib/python/Screens/InfoBarGenerics.py:1571
 msgid "add recording (stop after current event)"
 msgstr ""
 
@@ -3895,97 +4893,124 @@ msgstr ""
 msgid "add to parental protection"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:55
-#: ../lib/python/Screens/Satconfig.py:425
-#: ../lib/python/Components/NimManager.py:857
+#: ../lib/python/Screens/Satconfig.py:60
+#: ../lib/python/Screens/Satconfig.py:485
+#: ../lib/python/Components/NimManager.py:1082
+#: ../lib/python/Screens/Satconfig.py:435
+#: ../lib/python/Components/NimManager.py:900
 msgid "advanced"
 msgstr ""
 
-#: ../lib/python/Screens/MovieSelection.py:53
+#: ../lib/python/Screens/MovieSelection.py:75
 msgid "alphabetic sort"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:202
-msgid ""
-"are you sure you want to restore\n"
-"following backup:\n"
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py:79
+#, python-format
+msgid "audio track (%s) format"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:93
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py:80
+#, python-format
+msgid "audio track (%s) language"
+msgstr ""
+
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:107
 msgid "audio tracks"
 msgstr ""
 
+#: ../lib/python/Screens/TimerEntry.py:96
+msgid "auto"
+msgstr ""
+
 #: ../lib/python/Screens/ChannelSelection.py:159
-#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:51
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:55
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:53
 msgid "back"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:124
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:146
 msgid "background image"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:19
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:176
+msgid "backgroundcolor"
+msgstr ""
+
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:24
 msgid "better"
 msgstr ""
 
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:29
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:30
+msgid "black"
+msgstr ""
+
 #: ../lib/python/Components/ParentalControl.py:16
 msgid "blacklist"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:22
-msgid "by Exif"
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:29
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:30
+msgid "blue"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1540
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py:77
+#, python-format
+msgid "burn audio track (%s)"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1574
+#: ../lib/python/Screens/InfoBarGenerics.py:1564
 msgid "change recording (duration)"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1541
+#: ../lib/python/Screens/InfoBarGenerics.py:1575
+#: ../lib/python/Screens/InfoBarGenerics.py:1565
 msgid "change recording (endtime)"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:93
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:107
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py:94
 msgid "chapters"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:226
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:229
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:228
 msgid "choose destination directory"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:546
+#: ../lib/python/Screens/ScanSetup.py:549
+#: ../lib/python/Screens/ScanSetup.py:544
 msgid "circular left"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:546
+#: ../lib/python/Screens/ScanSetup.py:550
+#: ../lib/python/Screens/ScanSetup.py:544
 msgid "circular right"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:127
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:456
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:171
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:490
 msgid "clear playlist"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:127
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:128
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:129
-msgid "color"
-msgstr ""
-
 #: ../lib/python/Components/ParentalControl.py:12
 msgid "complex"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:880
-#: ../lib/python/Screens/NetworkSetup.py:898
+#: ../lib/python/Screens/NetworkSetup.py:1351
+#: ../lib/python/Screens/NetworkSetup.py:1365
 msgid "confirmed"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:1070
-#: ../lib/python/Screens/NetworkSetup.py:1088
+#: ../lib/python/Screens/NetworkSetup.py:1340
+#: ../lib/python/Screens/NetworkSetup.py:1397
 msgid "connected"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:638
+#: ../lib/python/Screens/InfoBarGenerics.py:657
+#: ../lib/python/Screens/InfoBarGenerics.py:655
 msgid "continue"
 msgstr ""
 
@@ -3993,40 +5018,43 @@ msgstr ""
 msgid "copy to bouquets"
 msgstr ""
 
+#: ../lib/python/Screens/LocationBox.py:407
 #: ../lib/python/Screens/LocationBox.py:405
 msgid "create directory"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:92
+#: ../lib/python/Screens/TimerEntry.py:103
 msgid "daily"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:93
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:107
 msgid "day"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:455
-msgid "delete"
-msgstr ""
-
-#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:64
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:68
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:70
 #: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:66
 msgid "delete cut"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:126
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:487
+msgid "delete file"
+msgstr ""
+
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:170
 msgid "delete playlist entry"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:460
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:498
 msgid "delete saved playlist"
 msgstr ""
 
-#: ../lib/python/Screens/MovieSelection.py:45
+#: ../lib/python/Screens/MovieSelection.py:67
 msgid "delete..."
 msgstr ""
 
-#: ../lib/python/Components/config.py:317
+#: ../lib/python/Components/config.py:441
+#: ../lib/python/Components/config.py:322
 msgid "disable"
 msgstr ""
 
@@ -4034,15 +5062,16 @@ msgstr ""
 msgid "disable move mode"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:868
-#: ../lib/python/Components/NimManager.py:1036
+#: ../lib/python/Screens/NetworkSetup.py:1163
+#: ../lib/python/Components/NimManager.py:1239
 #: ../lib/python/Components/TimerList.py:63
+#: ../lib/python/Components/NimManager.py:1084
 msgid "disabled"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:1065
-#: ../lib/python/Screens/NetworkSetup.py:1075
-#: ../lib/python/Screens/NetworkSetup.py:1092
+#: ../lib/python/Screens/NetworkSetup.py:1325
+#: ../lib/python/Screens/NetworkSetup.py:1344
+#: ../lib/python/Screens/NetworkSetup.py:1392
 msgid "disconnected"
 msgstr ""
 
@@ -4050,12 +5079,14 @@ msgstr ""
 msgid "do not change"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1546
-#: ../lib/python/Screens/TaskView.py:47 ../lib/python/Screens/TimerEntry.py:87
+#: ../lib/python/Screens/InfoBarGenerics.py:1577
+#: ../lib/python/Screens/TaskView.py:47 ../lib/python/Screens/TimerEntry.py:96
+#: ../lib/python/Screens/InfoBarGenerics.py:1567
 msgid "do nothing"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1554
+#: ../lib/python/Screens/InfoBarGenerics.py:1585
+#: ../lib/python/Screens/InfoBarGenerics.py:1575
 msgid "don't record"
 msgstr ""
 
@@ -4068,11 +5099,13 @@ msgstr ""
 msgid "edit alternatives"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:453
+#: ../lib/python/Components/NimManager.py:503
+#: ../lib/python/Components/NimManager.py:476
 msgid "empty"
 msgstr ""
 
-#: ../lib/python/Components/config.py:317
+#: ../lib/python/Components/config.py:441
+#: ../lib/python/Components/config.py:322
 msgid "enable"
 msgstr ""
 
@@ -4088,10 +5121,13 @@ msgstr ""
 msgid "enable move mode"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:864
-#: ../lib/python/Screens/Satconfig.py:430
-#: ../lib/python/Components/NimManager.py:984
-#: ../lib/python/Components/NimManager.py:1024
+#: ../lib/python/Screens/NetworkSetup.py:1159
+#: ../lib/python/Screens/Satconfig.py:490
+#: ../lib/python/Components/NimManager.py:1187
+#: ../lib/python/Components/NimManager.py:1227
+#: ../lib/python/Screens/Satconfig.py:440
+#: ../lib/python/Components/NimManager.py:1032
+#: ../lib/python/Components/NimManager.py:1072
 msgid "enabled"
 msgstr ""
 
@@ -4103,7 +5139,8 @@ msgstr ""
 msgid "end bouquet edit"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:59
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:63
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:65
 #: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:61
 msgid "end cut here"
 msgstr ""
@@ -4112,37 +5149,71 @@ msgstr ""
 msgid "end favourites edit"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:60
-#: ../lib/python/Screens/Satconfig.py:403
-#: ../lib/python/Components/NimManager.py:859
+#: ../lib/python/Screens/Satconfig.py:65
+#: ../lib/python/Screens/Satconfig.py:458
+#: ../lib/python/Components/NimManager.py:1084
+#: ../lib/python/Screens/Satconfig.py:408
+#: ../lib/python/Components/NimManager.py:902
 msgid "equal to"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:228
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:245
 msgid "exceeds dual layer medium!"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:315
+#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:325
 msgid "exit DVD player or return to file browser"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:111
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:155
 msgid "exit mediaplayer"
 msgstr ""
 
-#: ../lib/python/Screens/MovieSelection.py:211
+#: ../lib/python/Screens/MovieSelection.py:232
 msgid "exit movielist"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:577
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:601
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:617
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:629
+#: ../lib/python/Screens/NetworkSetup.py:213
+#: ../lib/python/Screens/NetworkSetup.py:219
+msgid "exit nameserver configuration"
+msgstr ""
+
+#: ../lib/python/Screens/NetworkSetup.py:309
+msgid "exit network adapter configuration"
+msgstr ""
+
+#: ../lib/python/Screens/NetworkSetup.py:303
+msgid "exit network adapter setup menu"
+msgstr ""
+
+#: ../lib/python/Screens/NetworkSetup.py:70
+#: ../lib/python/Screens/NetworkSetup.py:76
+msgid "exit network interface list"
+msgstr ""
+
+#: ../lib/python/Screens/NetworkSetup.py:713
+#: ../lib/python/Screens/NetworkSetup.py:719
+msgid "exit networkadapter setup menu"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:574
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:598
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:614
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:626
 #: ../lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:246
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:573
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:597
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:613
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:625
 msgid "failed"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:93
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:595
+msgid "fileformats (BMP, PNG, JPG, GIF)"
+msgstr ""
+
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:107
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:206
 msgid "filename"
 msgstr ""
 
@@ -4150,17 +5221,13 @@ msgstr ""
 msgid "fine-tune your display"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:130
-msgid "font face"
-msgstr ""
-
-#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:311
+#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:321
 msgid "forward to the next chapter"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:228
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:232
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:236
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:245
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:249
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:253
 msgid "free"
 msgstr ""
 
@@ -4168,36 +5235,37 @@ msgstr ""
 msgid "free diskspace"
 msgstr ""
 
-#: ../lib/python/Screens/TaskView.py:47 ../lib/python/Screens/TimerEntry.py:87
+#: ../lib/python/Screens/TaskView.py:47 ../lib/python/Screens/TimerEntry.py:96
 msgid "go to deep standby"
 msgstr ""
 
-#: ../lib/python/Screens/TaskView.py:47 ../lib/python/Screens/TimerEntry.py:87
+#: ../lib/python/Screens/TaskView.py:47 ../lib/python/Screens/TimerEntry.py:96
 msgid "go to standby"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:127
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:131
-msgid "headline"
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:29
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:30
+msgid "green"
 msgstr ""
 
 #: ../lib/python/Screens/InfoBar.py:61
 msgid "hear radio..."
 msgstr ""
 
-#: ../lib/python/Screens/MovieSelection.py:61
-msgid "hide extended description"
+#: ../lib/python/Screens/NetworkSetup.py:442
+msgid "hidden network"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:457
-msgid "hide player"
+#: ../lib/python/Screens/MovieSelection.py:83
+msgid "hide extended description"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:129
-msgid "highlighted button"
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:494
+msgid "hide player"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:546
+#: ../lib/python/Screens/ScanSetup.py:547
+#: ../lib/python/Screens/ScanSetup.py:544
 msgid "horizontal"
 msgstr ""
 
@@ -4210,7 +5278,7 @@ msgstr ""
 msgid "hours"
 msgstr ""
 
-#: ../lib/python/Components/UsageConfig.py:47
+#: ../lib/python/Components/UsageConfig.py:50
 msgid "immediate shutdown"
 msgstr ""
 
@@ -4225,31 +5293,34 @@ msgstr ""
 msgid "init module"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:74
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:78
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:76
 msgid "insert mark here"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:314
+#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:324
 msgid "jump back to the previous title"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:313
+#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:323
 msgid "jump forward to the next title"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:122
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:166
 msgid "jump to listbegin"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:123
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:167
 msgid "jump to listend"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1843
+#: ../lib/python/Screens/InfoBarGenerics.py:1882
+#: ../lib/python/Screens/InfoBarGenerics.py:1864
 msgid "jump to next marked position"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1842
+#: ../lib/python/Screens/InfoBarGenerics.py:1881
+#: ../lib/python/Screens/InfoBarGenerics.py:1863
 msgid "jump to previous marked position"
 msgstr ""
 
@@ -4257,59 +5328,64 @@ msgstr ""
 msgid "leave movie player..."
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1633
+#: ../lib/python/Screens/InfoBarGenerics.py:1666
+#: ../lib/python/Screens/InfoBarGenerics.py:1654
 msgid "left"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:93
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:107
 msgid "length"
 msgstr ""
 
-#: ../lib/python/Screens/MovieSelection.py:57
+#: ../lib/python/Screens/MovieSelection.py:79
 msgid "list style compact"
 msgstr ""
 
-#: ../lib/python/Screens/MovieSelection.py:56
+#: ../lib/python/Screens/MovieSelection.py:78
 msgid "list style compact with description"
 msgstr ""
 
-#: ../lib/python/Screens/MovieSelection.py:55
+#: ../lib/python/Screens/MovieSelection.py:77
 msgid "list style default"
 msgstr ""
 
-#: ../lib/python/Screens/MovieSelection.py:58
+#: ../lib/python/Screens/MovieSelection.py:80
 msgid "list style single line"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:459
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:495
 msgid "load playlist"
 msgstr ""
 
-#: ../lib/python/Components/TunerInfo.py:69
+#: ../lib/python/Components/TunerInfo.py:77
 msgid "locked"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:64
-#: ../lib/python/Screens/Satconfig.py:402
-#: ../lib/python/Components/NimManager.py:862
+#: ../lib/python/Screens/Satconfig.py:69
+#: ../lib/python/Screens/Satconfig.py:457
+#: ../lib/python/Components/NimManager.py:1087
+#: ../lib/python/Screens/Satconfig.py:407
+#: ../lib/python/Components/NimManager.py:905
 msgid "loopthrough to"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:421
-#: ../lib/python/Components/NimManager.py:893
-#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:22
+#: ../lib/python/Screens/Satconfig.py:481
+#: ../lib/python/Components/NimManager.py:1051
+#: ../lib/python/Screens/Satconfig.py:431
+#: ../lib/python/Components/NimManager.py:941
 msgid "manual"
 msgstr ""
 
 #: ../lib/python/Screens/LocationBox.py:147
-#: ../lib/python/Screens/MovieSelection.py:197
-#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:202
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:53
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:121
+#: ../lib/python/Screens/MovieSelection.py:218
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:175
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:52
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:165
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:207
 msgid "menu"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:602
+#: ../lib/python/Screens/NetworkSetup.py:834
 msgid "menulist"
 msgstr ""
 
@@ -4322,7 +5398,7 @@ msgstr ""
 msgid "minute"
 msgstr ""
 
-#: ../lib/python/Screens/InputBox.py:102
+#: ../lib/python/Screens/InputBox.py:104
 #: ../lib/python/Screens/SleepTimerEdit.py:42
 #: ../lib/python/Components/UsageConfig.py:22
 #: ../lib/python/Components/UsageConfig.py:23
@@ -4330,7 +5406,7 @@ msgstr ""
 msgid "minutes"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:93
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:107
 msgid "month"
 msgstr ""
 
@@ -4338,13 +5414,32 @@ msgstr ""
 msgid "move PiP to main picture"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1028
-#: ../lib/python/Screens/InfoBarGenerics.py:1029
-#: ../lib/python/Screens/InfoBarGenerics.py:1030
+#: ../lib/python/Screens/NetworkSetup.py:708
+msgid "move down to last entry"
+msgstr ""
+
+#: ../lib/python/Screens/NetworkSetup.py:706
+msgid "move down to next entry"
+msgstr ""
+
+#: ../lib/python/Screens/NetworkSetup.py:707
+msgid "move up to first entry"
+msgstr ""
+
+#: ../lib/python/Screens/NetworkSetup.py:705
+msgid "move up to previous entry"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1054
+#: ../lib/python/Screens/InfoBarGenerics.py:1055
+#: ../lib/python/Screens/InfoBarGenerics.py:1056
+#: ../lib/python/Screens/InfoBarGenerics.py:1051
+#: ../lib/python/Screens/InfoBarGenerics.py:1052
+#: ../lib/python/Screens/InfoBarGenerics.py:1053
 msgid "movie list"
 msgstr ""
 
-#: ../lib/python/Components/AVSwitch.py:123
+#: ../lib/python/Components/AVSwitch.py:110
 msgid "multinorm"
 msgstr ""
 
@@ -4362,10 +5457,13 @@ msgstr ""
 
 #: ../lib/python/Screens/MessageBox.py:42
 #: ../lib/python/Screens/MessageBox.py:44
-#: ../lib/python/Screens/ScanSetup.py:521
-#: ../lib/python/Screens/ScanSetup.py:827
+#: ../lib/python/Screens/ScanSetup.py:516
+#: ../lib/python/Screens/ScanSetup.py:889
 #: ../lib/python/Screens/SleepTimerEdit.py:85
-#: ../lib/python/Components/config.py:309
+#: ../lib/python/Components/config.py:431
+#: ../lib/python/Screens/ScanSetup.py:519
+#: ../lib/python/Screens/ScanSetup.py:825
+#: ../lib/python/Components/config.py:314
 msgid "no"
 msgstr ""
 
@@ -4373,10 +5471,6 @@ msgstr ""
 msgid "no HDD found"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:94
-msgid "no Picture found"
-msgstr ""
-
 #: ../lib/python/Screens/Ci.py:309 ../lib/python/Screens/Ci.py:331
 msgid "no module found"
 msgstr ""
@@ -4390,61 +5484,83 @@ msgid "no timeout"
 msgstr ""
 
 #: ../lib/python/Screens/About.py:40
-#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:22
 msgid "none"
 msgstr ""
 
-#: ../lib/python/Components/TunerInfo.py:71
+#: ../lib/python/Components/TunerInfo.py:79
 msgid "not locked"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:53
-#: ../lib/python/Screens/Satconfig.py:407
-#: ../lib/python/Screens/Satconfig.py:428
-#: ../lib/python/Components/NimManager.py:855
-#: ../lib/python/Components/NimManager.py:985
-#: ../lib/python/Components/NimManager.py:1025
+#: ../lib/python/Components/NimManager.py:1019
+msgid "not used"
+msgstr ""
+
+#: ../lib/python/Screens/Satconfig.py:58
+#: ../lib/python/Screens/Satconfig.py:462
+#: ../lib/python/Screens/Satconfig.py:488
+#: ../lib/python/Components/NimManager.py:1053
+#: ../lib/python/Components/NimManager.py:1081
+#: ../lib/python/Components/NimManager.py:1188
+#: ../lib/python/Components/NimManager.py:1228
+#: ../lib/python/Screens/Satconfig.py:412
+#: ../lib/python/Screens/Satconfig.py:438
+#: ../lib/python/Components/NimManager.py:898
+#: ../lib/python/Components/NimManager.py:934
+#: ../lib/python/Components/NimManager.py:935
+#: ../lib/python/Components/NimManager.py:936
+#: ../lib/python/Components/NimManager.py:937
+#: ../lib/python/Components/NimManager.py:1033
+#: ../lib/python/Components/NimManager.py:1073
 msgid "nothing connected"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:126
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:232
+#: ../lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:128
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:249
 msgid "of a DUAL layer medium used."
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:129
-#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:236
+#: ../lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:131
+#: ../lib/python/Plugins/Extensions/DVDBurn/TitleList.py:253
 msgid "of a SINGLE layer medium used."
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:544
-#: ../lib/python/Screens/ScanSetup.py:551
-#: ../lib/python/Screens/ScanSetup.py:555
-#: ../lib/python/Screens/ScanSetup.py:562
-#: ../lib/python/Components/config.py:313
+#: ../lib/python/Screens/ScanSetup.py:542
+#: ../lib/python/Screens/ScanSetup.py:577
+#: ../lib/python/Screens/ScanSetup.py:584
+#: ../lib/python/Screens/ScanSetup.py:607
 #: ../lib/python/Components/UsageConfig.py:27
+#: ../lib/python/Components/config.py:436
+#: ../lib/python/Screens/ScanSetup.py:549
+#: ../lib/python/Screens/ScanSetup.py:553
+#: ../lib/python/Screens/ScanSetup.py:560
+#: ../lib/python/Components/config.py:318
 msgid "off"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:544
-#: ../lib/python/Screens/ScanSetup.py:551
-#: ../lib/python/Screens/ScanSetup.py:555
-#: ../lib/python/Screens/ScanSetup.py:562
-#: ../lib/python/Components/config.py:313
+#: ../lib/python/Screens/ScanSetup.py:543
+#: ../lib/python/Screens/ScanSetup.py:578
+#: ../lib/python/Screens/ScanSetup.py:585
+#: ../lib/python/Screens/ScanSetup.py:608
 #: ../lib/python/Components/UsageConfig.py:27
+#: ../lib/python/Components/config.py:436
+#: ../lib/python/Screens/ScanSetup.py:542
+#: ../lib/python/Screens/ScanSetup.py:549
+#: ../lib/python/Screens/ScanSetup.py:553
+#: ../lib/python/Screens/ScanSetup.py:560
+#: ../lib/python/Components/config.py:318
 msgid "on"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:132
+#: ../lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py:134
 msgid "on READ ONLY medium."
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:88
+#: ../lib/python/Screens/TimerEntry.py:97
 msgid "once"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:107
-msgid "only /etc/enigma2 directory"
+#: ../lib/python/Screens/NetworkSetup.py:310
+msgid "open nameserver configuration"
 msgstr ""
 
 #: ../lib/python/Screens/InfoBarGenerics.py:268
@@ -4459,24 +5575,30 @@ msgstr ""
 msgid "open servicelist(up)"
 msgstr ""
 
+#: ../lib/python/Screens/NetworkSetup.py:315
+msgid "open virtual keyboard input help"
+msgstr ""
+
+#: ../lib/python/Components/ServiceScan.py:137
 #: ../lib/python/Components/ServiceScan.py:133
 msgid "pass"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:637
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:117
+#: ../lib/python/Screens/InfoBarGenerics.py:656
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:161
+#: ../lib/python/Screens/InfoBarGenerics.py:654
 msgid "pause"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:116
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:160
 msgid "play entry"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:120
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:164
 msgid "play from next mark or playlist entry"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:119
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:163
 msgid "play from previous mark or playlist entry"
 msgstr ""
 
@@ -4484,8 +5606,8 @@ msgstr ""
 msgid "please press OK when ready"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/Process.py:404
-#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:240
+#: ../lib/python/Plugins/Extensions/DVDBurn/Process.py:440
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:440
 msgid "please wait, loading picture..."
 msgstr ""
 
@@ -4497,11 +5619,7 @@ msgstr ""
 msgid "previous channel in history"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py:255
-msgid "rebooting..."
-msgstr ""
-
-#: ../lib/python/Screens/TimerEntry.py:86
+#: ../lib/python/Screens/TimerEntry.py:95
 msgid "record"
 msgstr ""
 
@@ -4509,7 +5627,17 @@ msgstr ""
 msgid "recording..."
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:69
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:29
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:30
+msgid "red"
+msgstr ""
+
+#: ../lib/python/Screens/NetworkSetup.py:221
+msgid "remove a nameserver entry"
+msgstr ""
+
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:73
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:71
 msgid "remove after this position"
 msgstr ""
 
@@ -4521,14 +5649,17 @@ msgstr ""
 msgid "remove all new found flags"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:68
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:72
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:70
 msgid "remove before this position"
 msgstr ""
 
+#: ../lib/python/Screens/LocationBox.py:413
 #: ../lib/python/Screens/LocationBox.py:409
 msgid "remove bookmark"
 msgstr ""
 
+#: ../lib/python/Screens/LocationBox.py:408
 #: ../lib/python/Screens/LocationBox.py:406
 msgid "remove directory"
 msgstr ""
@@ -4550,30 +5681,42 @@ msgstr ""
 msgid "remove selected satellite"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:76
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:80
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:78
 msgid "remove this mark"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:461
+#: ../lib/python/Plugins/Extensions/MediaPlayer/settings.py:89
 msgid "repeat playlist"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:88
+#: ../lib/python/Screens/TimerEntry.py:97
 msgid "repeated"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:312
+#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:322
 msgid "rewind to the previous chapter"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1633
+#: ../lib/python/Screens/InfoBarGenerics.py:1666
+#: ../lib/python/Screens/InfoBarGenerics.py:1654
 msgid "right"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:458
+#: ../lib/python/Plugins/Extensions/MediaPlayer/settings.py:91
+msgid "save last directory on exit"
+msgstr ""
+
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:497
 msgid "save playlist"
 msgstr ""
 
+#: ../lib/python/Plugins/Extensions/MediaPlayer/settings.py:90
+msgid "save playlist on exit"
+msgstr ""
+
+#: ../lib/python/Components/ServiceScan.py:96
+#: ../lib/python/Components/ServiceScan.py:98
 #: ../lib/python/Components/ServiceScan.py:92
 #: ../lib/python/Components/ServiceScan.py:94
 msgid "scan done!"
@@ -4592,13 +5735,15 @@ msgstr ""
 msgid "second"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:62
-#: ../lib/python/Screens/Satconfig.py:404
-#: ../lib/python/Components/NimManager.py:860
+#: ../lib/python/Screens/Satconfig.py:67
+#: ../lib/python/Screens/Satconfig.py:459
+#: ../lib/python/Components/NimManager.py:1085
+#: ../lib/python/Screens/Satconfig.py:409
+#: ../lib/python/Components/NimManager.py:903
 msgid "second cable of motorized LNB"
 msgstr ""
 
-#: ../lib/python/Screens/InputBox.py:102
+#: ../lib/python/Screens/InputBox.py:104
 #: ../lib/python/Components/UsageConfig.py:14
 #: ../lib/python/Components/UsageConfig.py:15
 #: ../lib/python/Components/UsageConfig.py:16
@@ -4614,15 +5759,25 @@ msgstr ""
 msgid "select .NFI flash file"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:236
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:239
+#: ../lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py:238
 msgid "select image from server"
 msgstr ""
 
-#: ../lib/python/Screens/MovieSelection.py:212
+#: ../lib/python/Screens/NetworkSetup.py:71
+msgid "select interface"
+msgstr ""
+
+#: ../lib/python/Screens/NetworkSetup.py:304
+#: ../lib/python/Screens/NetworkSetup.py:714
+msgid "select menu entry"
+msgstr ""
+
+#: ../lib/python/Screens/MovieSelection.py:233
 msgid "select movie"
 msgstr ""
 
-#: ../lib/python/Screens/MovieSelection.py:191
+#: ../lib/python/Screens/MovieSelection.py:212
 msgid "select the movie path"
 msgstr ""
 
@@ -4636,7 +5791,7 @@ msgstr ""
 msgid "setup pin"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:309
+#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:319
 msgid "show DVD main menu"
 msgstr ""
 
@@ -4644,7 +5799,11 @@ msgstr ""
 msgid "show EPG..."
 msgstr ""
 
-#: ../lib/python/Screens/MovieSelection.py:203
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:173
+msgid "show Infoline"
+msgstr ""
+
+#: ../lib/python/Screens/MovieSelection.py:224
 msgid "show all"
 msgstr ""
 
@@ -4653,32 +5812,34 @@ msgid "show alternatives"
 msgstr ""
 
 #: ../lib/python/Screens/InfoBarGenerics.py:368
-#: ../lib/python/Screens/MovieSelection.py:198
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:134
+#: ../lib/python/Screens/MovieSelection.py:219
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:178
 msgid "show event details"
 msgstr ""
 
-#: ../lib/python/Screens/MovieSelection.py:63
+#: ../lib/python/Screens/MovieSelection.py:85
 msgid "show extended description"
 msgstr ""
 
-#: ../lib/python/Screens/MovieSelection.py:204
-msgid "show first tag"
+#: ../lib/python/Screens/MovieSelection.py:225
+msgid "show first selected tag"
 msgstr ""
 
-#: ../lib/python/Screens/MovieSelection.py:205
-msgid "show second tag"
+#: ../lib/python/Screens/MovieSelection.py:226
+msgid "show second selected tag"
 msgstr ""
 
-#: ../lib/python/Components/UsageConfig.py:46
+#: ../lib/python/Components/UsageConfig.py:49
 msgid "show shutdown menu"
 msgstr ""
 
 #: ../lib/python/Screens/InfoBarGenerics.py:407
+#: ../lib/python/Screens/InfoBarGenerics.py:496
+#: ../lib/python/Screens/InfoBarGenerics.py:497
 msgid "show single service EPG..."
 msgstr ""
 
-#: ../lib/python/Screens/MovieSelection.py:206
+#: ../lib/python/Screens/MovieSelection.py:227
 msgid "show tag menu"
 msgstr ""
 
@@ -4686,8 +5847,8 @@ msgstr ""
 msgid "show transponder info"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:128
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:453
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:172
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:493
 msgid "shuffle playlist"
 msgstr ""
 
@@ -4695,36 +5856,42 @@ msgstr ""
 msgid "shutdown"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:54
-#: ../lib/python/Screens/Satconfig.py:423
-#: ../lib/python/Components/NimManager.py:856
+#: ../lib/python/Screens/Satconfig.py:59
+#: ../lib/python/Screens/Satconfig.py:483
+#: ../lib/python/Components/NimManager.py:1082
 #: ../lib/python/Components/ParentalControl.py:12
-#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:19
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:24
+#: ../lib/python/Screens/Satconfig.py:433
+#: ../lib/python/Components/NimManager.py:899
 msgid "simple"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:642
+#: ../lib/python/Screens/InfoBarGenerics.py:661
+#: ../lib/python/Screens/InfoBarGenerics.py:659
 msgid "skip backward"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:643
+#: ../lib/python/Screens/InfoBarGenerics.py:662
+#: ../lib/python/Screens/InfoBarGenerics.py:660
 msgid "skip backward (enter time)"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:640
+#: ../lib/python/Screens/InfoBarGenerics.py:659
+#: ../lib/python/Screens/InfoBarGenerics.py:657
 msgid "skip forward"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:641
+#: ../lib/python/Screens/InfoBarGenerics.py:660
+#: ../lib/python/Screens/InfoBarGenerics.py:658
 msgid "skip forward (enter time)"
 msgstr ""
 
-#: ../lib/python/Screens/MovieSelection.py:51
-msgid "sort by date"
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:175
+msgid "slide picture in loop"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:132
-msgid "spaces (top, between rows, left)"
+#: ../lib/python/Screens/MovieSelection.py:73
+msgid "sort by date"
 msgstr ""
 
 #: ../lib/python/Components/UsageConfig.py:30
@@ -4735,16 +5902,23 @@ msgstr ""
 msgid "standby"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:54
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:58
+#: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:60
 #: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:56
 msgid "start cut here"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1065
+#: ../lib/python/Plugins/Extensions/MediaPlayer/settings.py:93
+msgid "start directory"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1091
+#: ../lib/python/Screens/InfoBarGenerics.py:1088
 msgid "start timeshift"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1633
+#: ../lib/python/Screens/InfoBarGenerics.py:1666
+#: ../lib/python/Screens/InfoBarGenerics.py:1654
 msgid "stereo"
 msgstr ""
 
@@ -4752,15 +5926,17 @@ msgstr ""
 msgid "stop PiP"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:118
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:162
 msgid "stop entry"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1539
+#: ../lib/python/Screens/InfoBarGenerics.py:1576
+#: ../lib/python/Screens/InfoBarGenerics.py:1566
 msgid "stop recording"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1066
+#: ../lib/python/Screens/InfoBarGenerics.py:1092
+#: ../lib/python/Screens/InfoBarGenerics.py:1089
 msgid "stop timeshift"
 msgstr ""
 
@@ -4774,31 +5950,41 @@ msgid "switch to bookmarks"
 msgstr ""
 
 #: ../lib/python/Screens/LocationBox.py:142
+#: ../lib/python/Screens/LocationBox.py:412
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:169
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:489
 #: ../lib/python/Screens/LocationBox.py:408
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:125
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:451
 msgid "switch to filelist"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:124
-#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:449
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:168
+#: ../lib/python/Plugins/Extensions/MediaPlayer/plugin.py:485
 msgid "switch to playlist"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:317
+#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:329
+msgid "switch to the next angle"
+msgstr ""
+
+#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:327
 msgid "switch to the next audio track"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:318
+#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:328
 msgid "switch to the next subtitle language"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:128
-msgid "text"
+#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:143
+msgid "template file"
+msgstr ""
+
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:177
+msgid "textcolor"
 msgstr ""
 
+#: ../lib/python/Screens/InfoBar.py:196
+#: ../lib/python/Screens/MovieSelection.py:119
 #: ../lib/python/Screens/InfoBar.py:191
-#: ../lib/python/Screens/MovieSelection.py:99
 msgid "this recording"
 msgstr ""
 
@@ -4806,19 +5992,21 @@ msgstr ""
 msgid "this service is protected by a parental control pin"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1844
+#: ../lib/python/Screens/InfoBarGenerics.py:1883
+#: ../lib/python/Screens/InfoBarGenerics.py:1865
 msgid "toggle a cut mark at the current position"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:310
+#: ../lib/python/Plugins/Extensions/DVDPlayer/plugin.py:320
 msgid "toggle time, chapter, audio, subtitle info"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:884
-#: ../lib/python/Screens/NetworkSetup.py:902
+#: ../lib/python/Screens/NetworkSetup.py:1355
+#: ../lib/python/Screens/NetworkSetup.py:1369
 msgid "unconfirmed"
 msgstr ""
 
+#: ../lib/python/Screens/EventView.py:120
 #: ../lib/python/Screens/EventView.py:94
 msgid "unknown service"
 msgstr ""
@@ -4827,15 +6015,17 @@ msgstr ""
 msgid "until restart"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:92
+#: ../lib/python/Screens/TimerEntry.py:103
 msgid "user defined"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:546
+#: ../lib/python/Screens/ScanSetup.py:548
+#: ../lib/python/Screens/ScanSetup.py:544
 msgid "vertical"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1200
+#: ../lib/python/Screens/InfoBarGenerics.py:1226
+#: ../lib/python/Screens/InfoBarGenerics.py:1223
 msgid "view extensions..."
 msgstr ""
 
@@ -4856,7 +6046,7 @@ msgstr ""
 msgid "waiting"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:92
+#: ../lib/python/Screens/TimerEntry.py:103
 msgid "weekly"
 msgstr ""
 
@@ -4864,31 +6054,42 @@ msgstr ""
 msgid "whitelist"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py:93
-msgid "year"
+#: ../lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py:245
+msgid "working"
+msgstr ""
+
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:29
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:30
+msgid "yellow"
 msgstr ""
 
 #: ../lib/python/Screens/MessageBox.py:42
 #: ../lib/python/Screens/MessageBox.py:44
-#: ../lib/python/Screens/ScanSetup.py:521
-#: ../lib/python/Screens/ScanSetup.py:827
+#: ../lib/python/Screens/ScanSetup.py:516
+#: ../lib/python/Screens/ScanSetup.py:889
 #: ../lib/python/Screens/SleepTimerEdit.py:83
-#: ../lib/python/Components/config.py:309
+#: ../lib/python/Components/config.py:431
+#: ../lib/python/Screens/ScanSetup.py:519
+#: ../lib/python/Screens/ScanSetup.py:825
+#: ../lib/python/Components/config.py:314
 msgid "yes"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:521
-#: ../lib/python/Screens/ScanSetup.py:827
+#: ../lib/python/Screens/ScanSetup.py:516
+#: ../lib/python/Screens/ScanSetup.py:889
+#: ../lib/python/Screens/ScanSetup.py:519
+#: ../lib/python/Screens/ScanSetup.py:825
 msgid "yes (keep feeds)"
 msgstr ""
 
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py:631
 #: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:332
 msgid ""
 "your dreambox might be unusable now. Please consult the manual for further "
 "assistance before rebooting your dreambox."
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:86
+#: ../lib/python/Screens/TimerEntry.py:95
 msgid "zap"
 msgstr ""
 
@@ -4897,6 +6098,10 @@ msgid "zapped"
 msgstr ""
 
 #: ../data/
+msgid " "
+msgstr ""
+
+#: ../data/
 msgid "#000000"
 msgstr ""
 
@@ -4981,14 +6186,6 @@ msgid "9"
 msgstr ""
 
 #: ../data/
-msgid "AGC"
-msgstr ""
-
-#: ../data/
-msgid "AGC:"
-msgstr ""
-
-#: ../data/
 msgid "About"
 msgstr ""
 
@@ -5019,15 +6216,15 @@ msgid "Alternative services tuner priority"
 msgstr ""
 
 #: ../data/
-msgid "BER"
+msgid "Audio"
 msgstr ""
 
 #: ../data/
-msgid "BER:"
+msgid "BER"
 msgstr ""
 
 #: ../data/
-msgid "Backup is done. Please press OK to see the result."
+msgid "BER:"
 msgstr ""
 
 #: ../data/
@@ -5093,10 +6290,6 @@ msgid "Common Interface"
 msgstr ""
 
 #: ../data/
-msgid "Compact flash card"
-msgstr ""
-
-#: ../data/
 msgid "Continue in background"
 msgstr ""
 
@@ -5161,10 +6354,6 @@ msgid "Do you want to install default sat lists?"
 msgstr ""
 
 #: ../data/
-msgid "Do you want to restore your settings?"
-msgstr ""
-
-#: ../data/
 msgid "Do you want to view a tutorial?"
 msgstr ""
 
@@ -5202,10 +6391,6 @@ msgid "Eventview"
 msgstr ""
 
 #: ../data/
-msgid "Exit the wizard"
-msgstr ""
-
-#: ../data/
 msgid "Exit wizard"
 msgstr ""
 
@@ -5342,6 +6527,10 @@ msgid "Message"
 msgstr ""
 
 #: ../data/
+msgid "Message..."
+msgstr ""
+
+#: ../data/
 msgid "Modulator"
 msgstr ""
 
@@ -5385,15 +6574,7 @@ msgstr ""
 msgid "Network..."
 msgstr ""
 
-#: ../data/
-msgid "No backup needed"
-msgstr ""
-
-#: ../data/
-msgid "No, do nothing."
-msgstr ""
-
-#: ../data/
+#: ../data/ ../lib/python/Plugins/SystemPlugins/SoftwareManager/
 msgid "No, just start my dreambox"
 msgstr ""
 
@@ -5406,10 +6587,6 @@ msgid "Now Playing"
 msgstr ""
 
 #: ../data/
-msgid "OK, guide me through the upgrade process"
-msgstr ""
-
-#: ../data/
 msgid "OSD Settings"
 msgstr ""
 
@@ -5486,12 +6663,6 @@ msgid "Restart GUI"
 msgstr ""
 
 #: ../data/
-msgid ""
-"Restoring the settings is done. Please press OK to activate the restored "
-"settings now."
-msgstr ""
-
-#: ../data/
 msgid "Rewind speeds"
 msgstr ""
 
@@ -5540,10 +6711,6 @@ msgid "Service scan"
 msgstr ""
 
 #: ../data/
-msgid "Setup"
-msgstr ""
-
-#: ../data/
 msgid "Setup Mode"
 msgstr ""
 
@@ -5572,10 +6739,6 @@ msgid "Slow Motion speeds"
 msgstr ""
 
 #: ../data/
-msgid "Somewhere else"
-msgstr ""
-
-#: ../data/
 msgid "Sound"
 msgstr ""
 
@@ -5602,23 +6765,10 @@ msgid ""
 msgstr ""
 
 #: ../data/
-msgid "The backup failed. Please choose a different backup location."
-msgstr ""
-
-#: ../data/
 msgid "The package doesn't contain anything."
 msgstr ""
 
 #: ../data/
-msgid ""
-"The wizard can backup your current settings. Do you want to do a backup now?"
-msgstr ""
-
-#: ../data/
-msgid "The wizard is finished now."
-msgstr ""
-
-#: ../data/
 msgid "There are no default services lists in your image."
 msgstr ""
 
@@ -5631,10 +6781,6 @@ msgid "This is step number 2."
 msgstr ""
 
 #: ../data/
-msgid "This is unsupported at the moment."
-msgstr ""
-
-#: ../data/
 msgid "Time/Date Input"
 msgstr ""
 
@@ -5671,6 +6817,10 @@ msgid "Timeshift"
 msgstr ""
 
 #: ../data/
+msgid "Timeshift path..."
+msgstr ""
+
+#: ../data/
 msgid "Timezone"
 msgstr ""
 
@@ -5690,10 +6840,6 @@ msgstr ""
 msgid "Tuner configuration"
 msgstr ""
 
-#: ../data/
-msgid "USB"
-msgstr ""
-
 #.   TRANSLATORS: The effect of "Non-smooth winding" is that rather
 #.       than using ordinary "continuous" or "smooth" winding, a fast
 #.       sequence of stills is shown when winding at high speeds. This
@@ -5736,14 +6882,11 @@ msgid "VCR scart"
 msgstr ""
 
 #: ../data/
-msgid "Volume"
+msgid "Virtual KeyBoard"
 msgstr ""
 
 #: ../data/
-msgid ""
-"Welcome to the Image upgrade wizard. The wizard will assist you in upgrading "
-"the firmware of your Dreambox by providing a backup facility for your "
-"current settings and a short explanation of how to upgrade your firmware."
+msgid "Volume"
 msgstr ""
 
 #: ../data/
@@ -5763,14 +6906,6 @@ msgid "What do you want to scan?"
 msgstr ""
 
 #: ../data/
-msgid "Where do you want to backup your settings?"
-msgstr ""
-
-#: ../data/
-msgid "Yes, backup my settings!"
-msgstr ""
-
-#: ../data/
 msgid "Yes, do a manual scan now"
 msgstr ""
 
@@ -5783,14 +6918,6 @@ msgid "Yes, do another manual scan now"
 msgstr ""
 
 #: ../data/
-msgid "Yes, perform a shutdown now."
-msgstr ""
-
-#: ../data/
-msgid "Yes, restore the settings now"
-msgstr ""
-
-#: ../data/
 msgid "Yes, view the tutorial"
 msgstr ""
 
@@ -5821,57 +6948,12 @@ msgstr ""
 
 #: ../data/
 msgid ""
-"You do not seem to have a harddisk in your Dreambox. So backing up to a "
-"harddisk is not an option for you."
-msgstr ""
-
-#: ../data/
-msgid ""
-"You have chosen to backup to a compact flash card. The card must be in the "
-"slot. We do not verify if it is really used at the moment. So better backup "
-"to the harddisk!\n"
-"Please press OK to start the backup now."
-msgstr ""
-
-#: ../data/
-msgid ""
-"You have chosen to backup to an usb drive. Better backup to the harddisk!\n"
-"Please press OK to start the backup now."
-msgstr ""
-
-#: ../data/
-msgid ""
-"You have chosen to backup to your harddisk. Please press OK to start the "
-"backup now."
-msgstr ""
-
-#: ../data/
-msgid ""
-"You need a PC connected to your dreambox. If you need further instructions, "
-"please visit the website http://www.dm7025.de.\n"
-"Your dreambox will now be halted. After you have performed the update "
-"instructions from the website, your new firmware will ask you to restore "
-"your settings."
-msgstr ""
-
-#: ../data/
-msgid ""
 "You need to set a pin code and hide it from your children.\n"
 "\n"
 "Do you want to set the pin now?"
 msgstr ""
 
 #: ../data/
-msgid ""
-"Your backup succeeded. We will now continue to explain the further upgrade "
-"process."
-msgstr ""
-
-#: ../data/
-msgid "Your dreambox is shutting down. Please stand by..."
-msgstr ""
-
-#: ../data/
 msgid "config menu"
 msgstr ""
 
@@ -5946,3 +7028,226 @@ msgstr ""
 #: ../lib/python/Plugins/SystemPlugins/Videomode/
 msgid "Your TV works with 50 Hz. Good!"
 msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/ ../data/
+msgid "Do you want to restore your settings?"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/ ../data/
+msgid "Exit the wizard"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/
+msgid "Install a new image with a USB stick"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/
+msgid "Install a new image with your web browser"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/ ../data/
+msgid "No backup needed"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/ ../data/
+msgid "No, do nothing."
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/ ../data/
+msgid "OK, guide me through the upgrade process"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/ ../data/
+msgid "The backup failed. Please choose a different backup location."
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/ ../data/
+msgid "The wizard is finished now."
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/ ../data/
+msgid ""
+"Welcome to the Image upgrade wizard. The wizard will assist you in upgrading "
+"the firmware of your Dreambox by providing a backup facility for your "
+"current settings and a short explanation of how to upgrade your firmware."
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/ ../data/
+msgid "Where do you want to backup your settings?"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/ ../data/
+msgid "Yes, backup my settings!"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/ ../data/
+msgid "Yes, perform a shutdown now."
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/ ../data/
+msgid "Yes, restore the settings now"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/
+msgid ""
+"You have chosen to backup your settings. Please press OK to start the backup "
+"now."
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/
+msgid ""
+"You have chosen to restore your settings. Enigma2 will restart after "
+"restore. Please press OK to start the restore now."
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/ ../data/
+msgid ""
+"You need a PC connected to your dreambox. If you need further instructions, "
+"please visit the website http://www.dm7025.de.\n"
+"Your dreambox will now be halted. After you have performed the update "
+"instructions from the website, your new firmware will ask you to restore "
+"your settings."
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/ ../data/
+msgid ""
+"Your backup succeeded. We will now continue to explain the further upgrade "
+"process."
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareManager/ ../data/
+msgid "Your dreambox is shutting down. Please stand by..."
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:107
+msgid "/usr/share/enigma2 directory"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:107
+msgid "/var directory"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:34
+msgid "Advanced"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:73
+msgid "Backup"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:110
+msgid "Backup Location"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:109
+msgid "Backup Mode"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:108
+msgid "CF Drive"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:36
+msgid "Choose source"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:120
+msgid ""
+"Do you want to backup now?\n"
+"After pressing OK, please wait!"
+msgstr ""
+
+#: ../lib/python/Screens/Ipkg.py:57
+#, python-format
+msgid "Done - Installed or upgraded %d packages with %d errors"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:62
+msgid "Function not yet implemented"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:32
+msgid "Image-Upgrade"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:33
+msgid "Online-Upgrade"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:143
+msgid ""
+"Sorry your Backup destination does not exist\n"
+"\n"
+"Please choose an other one."
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:360
+msgid "Updates your receiver's software"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:69
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:347
+msgid "Upgrade finished. Do you want to reboot your Dreambox?"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:202
+msgid ""
+"are you sure you want to restore\n"
+"following backup:\n"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:107
+msgid "enigma2 and network"
+msgstr ""
+
+#: ../data/
+msgid "Backup is done. Please press OK to see the result."
+msgstr ""
+
+#: ../data/
+msgid "Compact flash card"
+msgstr ""
+
+#: ../data/
+msgid ""
+"Restoring the settings is done. Please press OK to activate the restored "
+"settings now."
+msgstr ""
+
+#: ../data/
+msgid "Somewhere else"
+msgstr ""
+
+#: ../data/
+msgid "This is unsupported at the moment."
+msgstr ""
+
+#: ../data/
+msgid "USB"
+msgstr ""
+
+#: ../data/
+msgid ""
+"You do not seem to have a harddisk in your Dreambox. So backing up to a "
+"harddisk is not an option for you."
+msgstr ""
+
+#: ../data/
+msgid ""
+"You have chosen to backup to a compact flash card. The card must be in the "
+"slot. We do not verify if it is really used at the moment. So better backup "
+"to the harddisk!\n"
+"Please press OK to start the backup now."
+msgstr ""
+
+#: ../data/
+msgid ""
+"You have chosen to backup to an usb drive. Better backup to the harddisk!\n"
+"Please press OK to start the backup now."
+msgstr ""
+
+#: ../data/
+msgid ""
+"You have chosen to backup to your harddisk. Please press OK to start the "
+"backup now."
+msgstr ""