update ca language

[enigma2.git] / po / enigma2.pot

diff --git a/po/enigma2.pot b/po/enigma2.pot
index 3525c70bc7699e42ae6d1c02ae04e606214503d5..a48961f82f3e3760fd44751b28f36b75dd12d6de 100644 (file)
--- a/po/enigma2.pot
+++ b/po/enigma2.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 11:14+0100\n"
+"POT-Creation-Date: 2006-12-19 08:30+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"
@@ -16,14 +16,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:209
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:206
 msgid ""
 "\n"
 "Enigma2 will restart after the restore"
 msgstr ""
 
-#: ../lib/python/Screens/PluginBrowser.py:100
-#: ../lib/python/Screens/PluginBrowser.py:102
+#: ../lib/python/Screens/PluginBrowser.py:109
+#: ../lib/python/Screens/PluginBrowser.py:111
 msgid "\"?"
 msgstr ""
 
@@ -45,23 +45,24 @@ msgid ""
 "(%s, %d MB free)"
 msgstr ""
 
-#: ../lib/python/Components/TimerList.py:46
-#: ../lib/python/Components/TimerList.py:51
+#: ../lib/python/Screens/PluginBrowser.py:40
+#, python-format
+msgid "%s (%s)\n"
+msgstr ""
+
+#: ../lib/python/Components/TimerList.py:35
+#: ../lib/python/Components/TimerList.py:40
 msgid "(ZAP)"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:111
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:108
 msgid "/usr/share/enigma2 directory"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:111
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:108
 msgid "/var directory"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:771
-msgid "0 V"
-msgstr ""
-
 #: ../lib/python/Components/NimManager.py:774
 msgid "1.0"
 msgstr ""
@@ -74,14 +75,6 @@ msgstr ""
 msgid "1.2"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:771
-msgid "12 V"
-msgstr ""
-
-#: ../lib/python/Screens/Satconfig.py:138
-msgid "12V Output"
-msgstr ""
-
 #: ../lib/python/Components/NimManager.py:749
 msgid "13 V"
 msgstr ""
@@ -126,7 +119,7 @@ msgstr ""
 msgid "60 minutes"
 msgstr ""
 
-#: ../lib/python/Components/TimerList.py:66
+#: ../lib/python/Components/TimerList.py:55
 msgid "<unknown>"
 msgstr ""
 
@@ -139,7 +132,7 @@ msgstr ""
 msgid "A"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1330
+#: ../lib/python/Screens/InfoBarGenerics.py:1328
 msgid ""
 "A recording is currently running.\n"
 "What do you want to do?"
@@ -169,7 +162,7 @@ msgid ""
 "your Dreambox. Shutdown now?"
 msgstr ""
 
-#: ../RecordTimer.py:167
+#: ../RecordTimer.py:178
 msgid ""
 "A timer failed to record!\n"
 "Disable TV and try again?\n"
@@ -183,11 +176,11 @@ msgstr ""
 msgid "AB"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py:80 ../data/
+#: ../lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py:75 ../data/
 msgid "About..."
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1169
+#: ../lib/python/Screens/InfoBarGenerics.py:1167
 msgid "Activate Picture in Picture"
 msgstr ""
 
@@ -199,32 +192,24 @@ msgstr ""
 msgid "Add a mark"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/ZappingAlternatives/plugin.py:191
-msgid "Add alternative"
-msgstr ""
-
-#: ../lib/python/Screens/MediaPlayer.py:396
+#: ../lib/python/Screens/MediaPlayer.py:395
 msgid "Add files to playlist"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/ZappingAlternatives/plugin.py:71
-msgid "Add service"
-msgstr ""
-
 #: ../lib/python/Screens/EpgSelection.py:59
 #: ../lib/python/Screens/EventView.py:32
 msgid "Add timer"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1478
+#: ../lib/python/Screens/InfoBarGenerics.py:1476
 msgid "Add to bouquet"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1480
+#: ../lib/python/Screens/InfoBarGenerics.py:1478
 msgid "Add to favourites"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:32
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:35
 msgid "Advanced"
 msgstr ""
 
@@ -232,12 +217,12 @@ msgstr ""
 msgid "After event"
 msgstr ""
 
-#: ../lib/python/Screens/MediaPlayer.py:52
+#: ../lib/python/Screens/MediaPlayer.py:51
 msgid "Album:"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:503
-#: ../lib/python/Screens/ChannelSelection.py:653
+#: ../lib/python/Screens/ChannelSelection.py:600
+#: ../lib/python/Screens/ChannelSelection.py:749
 msgid "All"
 msgstr ""
 
@@ -245,11 +230,11 @@ msgstr ""
 msgid "All..."
 msgstr ""
 
-#: ../lib/python/Components/Language.py:16
+#: ../lib/python/Components/Language.py:15
 msgid "Arabic"
 msgstr ""
 
-#: ../lib/python/Screens/MediaPlayer.py:48
+#: ../lib/python/Screens/MediaPlayer.py:47
 msgid "Artist:"
 msgstr ""
 
@@ -258,11 +243,11 @@ msgstr ""
 msgid "Ask before shutdown:"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1340
+#: ../lib/python/Screens/InfoBarGenerics.py:1338
 msgid "Audio Options..."
 msgstr ""
 
-#: ../lib/python/Screens/Ci.py:22 ../lib/python/Screens/ScanSetup.py:360
+#: ../lib/python/Screens/Ci.py:20 ../lib/python/Screens/ScanSetup.py:360
 #: ../lib/python/Screens/ScanSetup.py:363
 #: ../lib/python/Screens/ScanSetup.py:369
 #: ../lib/python/Screens/ScanSetup.py:371
@@ -292,15 +277,15 @@ msgstr ""
 msgid "BB"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:77
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:74
 msgid "Backup"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:114
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:111
 msgid "Backup Location"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:113
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:110
 msgid "Backup Mode"
 msgstr ""
 
@@ -320,7 +305,7 @@ msgstr ""
 msgid "C-Band"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:112
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:109
 msgid "CF Drive"
 msgstr ""
 
@@ -328,11 +313,11 @@ msgstr ""
 msgid "CVBS"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:766
+#: ../lib/python/Screens/ChannelSelection.py:862
 msgid "Cable"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:407
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:405
 msgid "Cache Thumbnails"
 msgstr ""
 
@@ -342,8 +327,8 @@ msgstr ""
 
 #: ../lib/python/Screens/Setup.py:84 ../lib/python/Screens/TimeDateInput.py:16
 #: ../lib/python/Screens/TimerEntry.py:29
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:76
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:167
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:73
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:164
 msgid "Cancel"
 msgstr ""
 
@@ -355,24 +340,24 @@ msgstr ""
 msgid "Card"
 msgstr ""
 
-#: ../lib/python/Components/Language.py:17
+#: ../lib/python/Components/Language.py:16
 msgid "Catalan"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:146
-#: ../lib/python/Screens/ParentalControlSetup.py:22 ../data/
+#: ../lib/python/Screens/ChannelSelection.py:163
+#: ../lib/python/Screens/ParentalControlSetup.py:20 ../data/
 msgid "Change pin code"
 msgstr ""
 
-#: ../lib/python/Screens/ParentalControlSetup.py:79
+#: ../lib/python/Screens/ParentalControlSetup.py:77
 msgid "Change service pin"
 msgstr ""
 
-#: ../lib/python/Screens/ParentalControlSetup.py:76
+#: ../lib/python/Screens/ParentalControlSetup.py:74
 msgid "Change service pins"
 msgstr ""
 
-#: ../lib/python/Screens/ParentalControlSetup.py:70
+#: ../lib/python/Screens/ParentalControlSetup.py:68
 msgid "Change setup pin"
 msgstr ""
 
@@ -384,7 +369,7 @@ msgstr ""
 msgid "Channel:"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:34
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:37
 msgid "Choose source"
 msgstr ""
 
@@ -436,19 +421,24 @@ msgstr ""
 msgid "Configuration Mode"
 msgstr ""
 
+#: ../lib/python/Screens/Ipkg.py:92
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:293
+msgid "Configuring"
+msgstr ""
+
 #: ../lib/python/Screens/TimerEdit.py:208
 msgid "Conflicting timer"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/FritzCall/plugin.py:100
+#: ../lib/python/Plugins/Extensions/FritzCall/plugin.py:104
 msgid "Connected to Fritz!Box!"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/FritzCall/plugin.py:97
+#: ../lib/python/Plugins/Extensions/FritzCall/plugin.py:101
 msgid "Connecting to Fritz!Box..."
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/FritzCall/plugin.py:110
+#: ../lib/python/Plugins/Extensions/FritzCall/plugin.py:114
 #, python-format
 msgid ""
 "Connection to Fritz!Box\n"
@@ -464,7 +454,7 @@ msgstr ""
 msgid "Creating partition failed"
 msgstr ""
 
-#: ../lib/python/Components/Language.py:19
+#: ../lib/python/Components/Language.py:17
 msgid "Croatian"
 msgstr ""
 
@@ -492,7 +482,7 @@ msgstr ""
 msgid "DVB-S2"
 msgstr ""
 
-#: ../lib/python/Components/Language.py:20
+#: ../lib/python/Components/Language.py:19
 msgid "Danish"
 msgstr ""
 
@@ -552,7 +542,7 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1167
+#: ../lib/python/Screens/InfoBarGenerics.py:1165
 msgid "Disable Picture in Picture"
 msgstr ""
 
@@ -564,7 +554,7 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/FritzCall/plugin.py:106
+#: ../lib/python/Plugins/Extensions/FritzCall/plugin.py:110
 #, python-format
 msgid ""
 "Disconnected from\n"
@@ -572,7 +562,7 @@ msgid ""
 "retrying..."
 msgstr ""
 
-#: ../lib/python/Screens/PluginBrowser.py:102
+#: ../lib/python/Screens/PluginBrowser.py:111
 msgid ""
 "Do you really want to REMOVE\n"
 "the plugin \""
@@ -583,7 +573,7 @@ msgstr ""
 msgid "Do you really want to delete %s?"
 msgstr ""
 
-#: ../lib/python/Screens/PluginBrowser.py:100
+#: ../lib/python/Screens/PluginBrowser.py:109
 msgid ""
 "Do you really want to download\n"
 "the plugin \""
@@ -595,42 +585,57 @@ msgid ""
 "All data on the disk will be lost!"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:124
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:121
 msgid ""
 "Do you want to backup now?\n"
 "After pressing OK, please wait!"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1662
+#: ../lib/python/Screens/InfoBarGenerics.py:1655
 msgid "Do you want to resume this playback?"
 msgstr ""
 
 #: ../lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py:41
-#: ../lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py:149
-#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:51
-#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:213
+#: ../lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py:140
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:54
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:207
 msgid ""
 "Do you want to update your Dreambox?\n"
 "After pressing OK, please wait!"
 msgstr ""
 
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:307
+#, python-format
+msgid "Done - Installed or upgraded %d packages"
+msgstr ""
+
+#: ../lib/python/Screens/Ipkg.py:54
+#, python-format
+msgid "Done - Installed or upgraded %d packages with %d errors"
+msgstr ""
+
 #: ../lib/python/Screens/PluginBrowser.py:21
 msgid "Download Plugins"
 msgstr ""
 
-#: ../lib/python/Screens/PluginBrowser.py:113
+#: ../lib/python/Screens/PluginBrowser.py:122
 msgid "Downloadable new plugins"
 msgstr ""
 
-#: ../lib/python/Screens/PluginBrowser.py:79
+#: ../lib/python/Screens/Ipkg.py:79
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:280
+msgid "Downloading"
+msgstr ""
+
+#: ../lib/python/Screens/PluginBrowser.py:88
 msgid "Downloading plugin information. Please wait..."
 msgstr ""
 
-#: ../lib/python/Components/Language.py:21
+#: ../lib/python/Components/Language.py:20
 msgid "Dutch"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:774
+#: ../lib/python/Screens/ChannelSelection.py:870
 msgid "E"
 msgstr ""
 
@@ -644,7 +649,7 @@ msgstr ""
 msgid "East"
 msgstr ""
 
-#: ../lib/python/Screens/ParentalControlSetup.py:82
+#: ../lib/python/Screens/ParentalControlSetup.py:80
 msgid "Edit services list"
 msgstr ""
 
@@ -656,7 +661,7 @@ msgstr ""
 msgid "Enable 5V for active antenna"
 msgstr ""
 
-#: ../lib/python/Screens/ParentalControlSetup.py:64
+#: ../lib/python/Screens/ParentalControlSetup.py:62
 msgid "Enable parental control"
 msgstr ""
 
@@ -673,12 +678,12 @@ msgid "EndTime"
 msgstr ""
 
 #: ../lib/python/Screens/LanguageSelection.py:59
-#: ../lib/python/Components/Language.py:14
+#: ../lib/python/Components/Language.py:13
 #: ../lib/python/Components/SetupDevices.py:15
 msgid "English"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py:79
+#: ../lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py:74
 msgid ""
 "Enigma2 Skinselector v0.5 BETA\n"
 "\n"
@@ -688,14 +693,18 @@ msgid ""
 "© 2006 - Stephan Reichholf"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:346
+#: ../lib/python/Screens/InfoBarGenerics.py:345
 msgid "Enter main menu..."
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:146
+#: ../lib/python/Screens/ChannelSelection.py:163
 msgid "Enter the service pin"
 msgstr ""
 
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:316
+msgid "Error"
+msgstr ""
+
 #: ../lib/python/Components/Harddisk.py:132
 msgid "Everything is fine"
 msgstr ""
@@ -724,15 +733,15 @@ msgstr ""
 msgid "Fast DiSEqC"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:506
+#: ../lib/python/Screens/ChannelSelection.py:603
 msgid "Favourites"
 msgstr ""
 
-#: ../lib/python/Components/Language.py:22
+#: ../lib/python/Components/Language.py:21
 msgid "Finnish"
 msgstr ""
 
-#: ../lib/python/Components/Language.py:23
+#: ../lib/python/Components/Language.py:22
 msgid "French"
 msgstr ""
 
@@ -746,8 +755,8 @@ msgid "Frequency"
 msgstr ""
 
 #: ../lib/python/Screens/EpgSelection.py:234
-#: ../lib/python/Components/EpgList.py:47
-#: ../lib/python/Components/TimerList.py:34
+#: ../lib/python/Components/EpgList.py:38
+#: ../lib/python/Components/TimerList.py:23
 msgid "Fri"
 msgstr ""
 
@@ -765,11 +774,11 @@ msgstr ""
 msgid "Frontprocessor version: %d"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:60
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:63
 msgid "Function not yet implemented"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py:101
+#: ../lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py:96
 msgid ""
 "GUI needs a restart to apply a new skin\n"
 "Do you want to Restart the GUI now?"
@@ -779,16 +788,16 @@ msgstr ""
 msgid "Gateway"
 msgstr ""
 
-#: ../lib/python/Screens/MediaPlayer.py:56
+#: ../lib/python/Screens/MediaPlayer.py:55
 msgid "Genre:"
 msgstr ""
 
-#: ../lib/python/Components/Language.py:15
+#: ../lib/python/Components/Language.py:14
 #: ../lib/python/Components/SetupDevices.py:15
 msgid "German"
 msgstr ""
 
-#: ../lib/python/Screens/PluginBrowser.py:81
+#: ../lib/python/Screens/PluginBrowser.py:90
 msgid "Getting plugin information. Please wait..."
 msgstr ""
 
@@ -806,7 +815,7 @@ msgid "Guard interval mode"
 msgstr ""
 
 #: ../lib/python/Components/Harddisk.py:213
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:112
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:109
 #: ../data/
 msgid "Harddisk"
 msgstr ""
@@ -815,11 +824,15 @@ msgstr ""
 msgid "Hierarchy mode"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1306
-#: ../lib/python/Screens/InfoBarGenerics.py:1314
+#: ../lib/python/Screens/InfoBarGenerics.py:1304
+#: ../lib/python/Screens/InfoBarGenerics.py:1312
 msgid "How many minutes do you want to record?"
 msgstr ""
 
+#: ../lib/python/Components/Language.py:23
+msgid "Hungarian"
+msgstr ""
+
 #: ../lib/python/Screens/NetworkSetup.py:29 ../data/
 msgid "IP Address"
 msgstr ""
@@ -828,17 +841,17 @@ msgstr ""
 msgid "Icelandic"
 msgstr ""
 
-#: ../lib/python/Screens/Scart.py:28
+#: ../lib/python/Screens/Scart.py:25
 msgid ""
 "If you see this, something is wrong with\n"
 "your scart connection. Press OK to return."
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:30
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:33
 msgid "Image-Upgrade"
 msgstr ""
 
-#: ../RecordTimer.py:170
+#: ../RecordTimer.py:181
 msgid ""
 "In order to record a timer, the TV was switched to the recording service!\n"
 msgstr ""
@@ -847,7 +860,7 @@ msgstr ""
 msgid "Increased voltage"
 msgstr ""
 
-#: ../lib/python/Screens/Ci.py:295
+#: ../lib/python/Screens/Ci.py:293
 msgid "Init"
 msgstr ""
 
@@ -859,11 +872,16 @@ msgstr ""
 msgid "Initializing Harddisk..."
 msgstr ""
 
-#: ../lib/python/Screens/InputBox.py:14 ../data/
+#: ../lib/python/Screens/InputBox.py:11 ../data/
 msgid "Input"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1216
+#: ../lib/python/Screens/Ipkg.py:88
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:289
+msgid "Installing"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1214
 msgid "Instant Record..."
 msgstr ""
 
@@ -908,7 +926,7 @@ msgstr ""
 msgid "Latitude"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1379
+#: ../lib/python/Screens/InfoBarGenerics.py:1377
 msgid "Left"
 msgstr ""
 
@@ -928,7 +946,7 @@ msgstr ""
 msgid "Limits on"
 msgstr ""
 
-#: ../lib/python/Components/FileList.py:124
+#: ../lib/python/Components/FileList.py:117
 msgid "List of Storage Devices"
 msgstr ""
 
@@ -973,8 +991,8 @@ msgid "Modulation"
 msgstr ""
 
 #: ../lib/python/Screens/EpgSelection.py:234
-#: ../lib/python/Components/EpgList.py:47
-#: ../lib/python/Components/TimerList.py:34
+#: ../lib/python/Components/EpgList.py:38
+#: ../lib/python/Components/TimerList.py:23
 msgid "Mon"
 msgstr ""
 
@@ -991,7 +1009,7 @@ msgstr ""
 msgid "Mount failed"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1175
+#: ../lib/python/Screens/InfoBarGenerics.py:1173
 msgid "Move Picture in Picture"
 msgstr ""
 
@@ -1011,7 +1029,7 @@ msgstr ""
 msgid "Multi EPG"
 msgstr ""
 
-#: ../lib/python/Screens/Ci.py:306
+#: ../lib/python/Screens/Ci.py:304
 msgid "Multiple service support"
 msgstr ""
 
@@ -1053,11 +1071,11 @@ msgstr ""
 msgid "Network scan"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:758
+#: ../lib/python/Screens/ChannelSelection.py:854
 msgid "New"
 msgstr ""
 
-#: ../lib/python/Screens/ParentalControlSetup.py:218
+#: ../lib/python/Screens/ParentalControlSetup.py:216
 msgid "New pin"
 msgstr ""
 
@@ -1069,18 +1087,33 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: ../lib/python/Screens/Ci.py:22 ../data/
+#: ../lib/python/Screens/Ci.py:20 ../data/
 msgid "No"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1326
+#: ../lib/python/Screens/InfoBarGenerics.py:1324
 msgid "No HDD found or HDD not initialized!"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1259
+#: ../lib/python/Screens/InfoBarGenerics.py:1879
+msgid ""
+"No data on transponder!\n"
+"(Timeout reading PAT)"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1257
 msgid "No event info found, recording indefinitely."
 msgstr ""
 
+#: ../lib/python/Screens/InfoBarGenerics.py:1877
+msgid "No free tuner!"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:313
+msgid ""
+"No packages were upgraded yet. So you can check your network and try again."
+msgstr ""
+
 #: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:546
 msgid "No positioner capable frontend found."
 msgstr ""
@@ -1122,7 +1155,7 @@ msgstr ""
 
 #: ../lib/python/Screens/Setup.py:83 ../lib/python/Screens/TimeDateInput.py:15
 #: ../lib/python/Screens/TimerEntry.py:28
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:75
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:72
 msgid "OK"
 msgstr ""
 
@@ -1138,7 +1171,7 @@ msgstr ""
 msgid "One"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:31
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:34
 msgid "Online-Upgrade"
 msgstr ""
 
@@ -1154,7 +1187,11 @@ msgstr ""
 msgid "PIDs"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:35
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:263
+msgid "Package list update"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:38
 msgid "Packet management"
 msgstr ""
 
@@ -1167,31 +1204,31 @@ msgstr ""
 msgid "Parental control"
 msgstr ""
 
-#: ../lib/python/Screens/ParentalControlSetup.py:74
+#: ../lib/python/Screens/ParentalControlSetup.py:72
 msgid "Parental control type"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBar.py:47
+#: ../lib/python/Screens/InfoBar.py:43
 msgid "Play recorded movies..."
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1109
+#: ../lib/python/Screens/InfoBarGenerics.py:1107
 msgid "Please choose an extension..."
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:134
+#: ../lib/python/Screens/ChannelSelection.py:151
 msgid "Please enter a name for the new bouquet"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:180
+#: ../lib/python/Screens/ChannelSelection.py:197
 msgid "Please enter a name for the new marker"
 msgstr ""
 
-#: ../lib/python/Screens/ParentalControlSetup.py:28
+#: ../lib/python/Screens/ParentalControlSetup.py:26
 msgid "Please enter the correct pin code"
 msgstr ""
 
-#: ../lib/python/Screens/ParentalControlSetup.py:232
+#: ../lib/python/Screens/ParentalControlSetup.py:230
 msgid "Please enter the old pin code"
 msgstr ""
 
@@ -1203,7 +1240,7 @@ msgstr ""
 msgid "Please select a subservice to record..."
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1487
+#: ../lib/python/Screens/InfoBarGenerics.py:1485
 #: ../lib/python/Screens/SubservicesQuickzap.py:97
 msgid "Please select a subservice..."
 msgstr ""
@@ -1212,7 +1249,7 @@ msgstr ""
 msgid "Please select keyword to filter..."
 msgstr ""
 
-#: ../lib/python/Screens/PiPSetup.py:41
+#: ../lib/python/Screens/PiPSetup.py:37
 msgid ""
 "Please use direction keys to move the PiP window.\n"
 "Press Bouquet +/- to resize the window.\n"
@@ -1275,6 +1312,10 @@ msgstr ""
 msgid "Predefined transponder"
 msgstr ""
 
+#: ../lib/python/Screens/Ipkg.py:18
+msgid "Preparing... Please wait"
+msgstr ""
+
 #: ../lib/python/Screens/NetworkSetup.py:22
 msgid "Press OK to activate the settings."
 msgstr ""
@@ -1291,20 +1332,20 @@ msgstr ""
 msgid "Prev"
 msgstr ""
 
-#: ../lib/python/Screens/ParentalControlSetup.py:72
+#: ../lib/python/Screens/ParentalControlSetup.py:70
 msgid "Protect services"
 msgstr ""
 
-#: ../lib/python/Screens/ParentalControlSetup.py:68
+#: ../lib/python/Screens/ParentalControlSetup.py:66
 msgid "Protect setup"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:505
-#: ../lib/python/Screens/ChannelSelection.py:649
+#: ../lib/python/Screens/ChannelSelection.py:602
+#: ../lib/python/Screens/ChannelSelection.py:745
 msgid "Provider"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:756
+#: ../lib/python/Screens/ChannelSelection.py:852
 msgid "Providers"
 msgstr ""
 
@@ -1312,9 +1353,9 @@ msgstr ""
 msgid "Quick"
 msgstr ""
 
+#: ../lib/python/Screens/InfoBarGenerics.py:1476
 #: ../lib/python/Screens/InfoBarGenerics.py:1478
-#: ../lib/python/Screens/InfoBarGenerics.py:1480
-#: ../lib/python/Screens/InfoBarGenerics.py:1483
+#: ../lib/python/Screens/InfoBarGenerics.py:1481
 msgid "Quickzap"
 msgstr ""
 
@@ -1354,7 +1395,7 @@ msgstr ""
 msgid "Recording"
 msgstr ""
 
-#: ../lib/python/Screens/ParentalControlSetup.py:219
+#: ../lib/python/Screens/ParentalControlSetup.py:217
 msgid "Reenter new pin"
 msgstr ""
 
@@ -1366,36 +1407,32 @@ msgstr ""
 msgid "Remove a mark"
 msgstr ""
 
-#: ../lib/python/Screens/PluginBrowser.py:115
+#: ../lib/python/Screens/PluginBrowser.py:124
 msgid "Remove plugins"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/ZappingAlternatives/plugin.py:192
-msgid "Remove service"
-msgstr ""
-
 #: ../lib/python/Screens/TimerEntry.py:133
 msgid "Repeat Type"
 msgstr ""
 
-#: ../lib/python/Screens/MediaPlayer.py:397
+#: ../lib/python/Screens/MediaPlayer.py:396
 msgid "Replace current playlist"
 msgstr ""
 
-#: ../lib/python/Screens/Ci.py:294
+#: ../lib/python/Screens/Ci.py:292
 msgid "Reset"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py:102
+#: ../lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py:97
 msgid "Restart GUI now?"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:78
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:168
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:75
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:165
 msgid "Restore"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1379
+#: ../lib/python/Screens/InfoBarGenerics.py:1377
 msgid "Right"
 msgstr ""
 
@@ -1408,8 +1445,8 @@ msgid "S-Video"
 msgstr ""
 
 #: ../lib/python/Screens/EpgSelection.py:234
-#: ../lib/python/Components/EpgList.py:47
-#: ../lib/python/Components/TimerList.py:34
+#: ../lib/python/Components/EpgList.py:38
+#: ../lib/python/Components/TimerList.py:23
 msgid "Sat"
 msgstr ""
 
@@ -1422,8 +1459,8 @@ msgstr ""
 msgid "Satellite"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:504
-#: ../lib/python/Screens/ChannelSelection.py:651
+#: ../lib/python/Screens/ChannelSelection.py:601
+#: ../lib/python/Screens/ChannelSelection.py:747
 msgid "Satellites"
 msgstr ""
 
@@ -1437,7 +1474,7 @@ msgstr ""
 msgid "Saturday"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:406
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:404
 msgid "Scaling Mode"
 msgstr ""
 
@@ -1454,15 +1491,11 @@ msgstr ""
 msgid "Search west"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/ZappingAlternatives/plugin.py:231
-msgid "Select alternative service"
-msgstr ""
-
-#: ../lib/python/Screens/InfoBarGenerics.py:1391
+#: ../lib/python/Screens/InfoBarGenerics.py:1389
 msgid "Select audio mode"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1380
+#: ../lib/python/Screens/InfoBarGenerics.py:1378
 msgid "Select audio track"
 msgstr ""
 
@@ -1470,22 +1503,30 @@ msgstr ""
 msgid "Select channel to record from"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/ZappingAlternatives/plugin.py:218
-msgid "Select reference service"
-msgstr ""
-
 #: ../lib/python/Screens/Satconfig.py:116
 msgid "Sequence repeat"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1513
+#: ../lib/python/Screens/InfoBarGenerics.py:1511
 msgid "Service has been added to the favourites."
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1519
+#: ../lib/python/Screens/InfoBarGenerics.py:1517
 msgid "Service has been added to the selected bouquet."
 msgstr ""
 
+#: ../lib/python/Screens/InfoBarGenerics.py:1881
+msgid ""
+"Service invalid!\n"
+"(Timeout reading PMT)"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1880
+msgid ""
+"Service not found!\n"
+"(SID not found in PAT)"
+msgstr ""
+
 #: ../lib/python/Screens/Satconfig.py:67
 msgid "Service scan type needed"
 msgstr ""
@@ -1494,7 +1535,7 @@ msgstr ""
 msgid "Serviceinfo"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:760
+#: ../lib/python/Screens/ChannelSelection.py:856
 msgid "Services"
 msgstr ""
 
@@ -1503,19 +1544,19 @@ msgid "Set limits"
 msgstr ""
 
 #: ../lib/python/Screens/SleepTimerEdit.py:64
-#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:36
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:39
 msgid "Settings"
 msgstr ""
 
-#: ../lib/python/Screens/ParentalControlSetup.py:197
+#: ../lib/python/Screens/ParentalControlSetup.py:195
 msgid "Show services beginning with"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBar.py:48
+#: ../lib/python/Screens/InfoBar.py:44
 msgid "Show the radio player..."
 msgstr ""
 
-#: ../lib/python/Screens/InfoBar.py:49
+#: ../lib/python/Screens/InfoBar.py:45
 msgid "Show the tv player..."
 msgstr ""
 
@@ -1549,7 +1590,7 @@ msgstr ""
 msgid "Single transponder"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1145 ../data/
+#: ../lib/python/Screens/InfoBarGenerics.py:1143 ../data/
 msgid "Sleep Timer"
 msgstr ""
 
@@ -1558,7 +1599,7 @@ msgstr ""
 msgid "Sleep timer action:"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:405
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:403
 msgid "Slideshow Interval (sec.)"
 msgstr ""
 
@@ -1570,7 +1611,11 @@ msgstr ""
 msgid "Socket "
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:150
+#: ../lib/python/Screens/PluginBrowser.py:38
+msgid "Some plugins are not available:\n"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:147
 msgid ""
 "Sorry your Backup destination does not exist\n"
 "\n"
@@ -1594,7 +1639,7 @@ msgstr ""
 msgid "Start"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1332
+#: ../lib/python/Screens/InfoBarGenerics.py:1330
 msgid "Start recording?"
 msgstr ""
 
@@ -1614,7 +1659,7 @@ msgstr ""
 msgid "Step west"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1379
+#: ../lib/python/Screens/InfoBarGenerics.py:1377
 msgid "Stereo"
 msgstr ""
 
@@ -1625,11 +1670,11 @@ msgstr ""
 msgid "Stop"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:979
+#: ../lib/python/Screens/InfoBarGenerics.py:977
 msgid "Stop Timeshift?"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBar.py:113
+#: ../lib/python/Screens/InfoBar.py:110
 msgid "Stop playing this movie?"
 msgstr ""
 
@@ -1641,13 +1686,13 @@ msgstr ""
 msgid "Stored position"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1409
+#: ../lib/python/Screens/InfoBarGenerics.py:1407
 msgid "Subservice list..."
 msgstr ""
 
 #: ../lib/python/Screens/EpgSelection.py:234
-#: ../lib/python/Components/EpgList.py:47
-#: ../lib/python/Components/TimerList.py:34
+#: ../lib/python/Components/EpgList.py:38
+#: ../lib/python/Components/TimerList.py:23
 msgid "Sun"
 msgstr ""
 
@@ -1656,7 +1701,7 @@ msgstr ""
 msgid "Sunday"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1172
+#: ../lib/python/Screens/InfoBarGenerics.py:1170
 msgid "Swap Services"
 msgstr ""
 
@@ -1664,11 +1709,11 @@ msgstr ""
 msgid "Swedish"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1414
+#: ../lib/python/Screens/InfoBarGenerics.py:1412
 msgid "Switch to next subservice"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1415
+#: ../lib/python/Screens/InfoBarGenerics.py:1413
 msgid "Switch to previous subservice"
 msgstr ""
 
@@ -1679,7 +1724,7 @@ msgstr ""
 msgid "Symbol Rate"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:768
+#: ../lib/python/Screens/ChannelSelection.py:864
 msgid "Terrestrial"
 msgstr ""
 
@@ -1687,22 +1732,22 @@ msgstr ""
 msgid "Terrestrial provider"
 msgstr ""
 
-#: ../lib/python/Plugins/DemoPlugins/TestPlugin/plugin.py:52
-#: ../lib/python/Plugins/DemoPlugins/TestPlugin/plugin.py:78
+#: ../lib/python/Plugins/DemoPlugins/TestPlugin/plugin.py:48
+#: ../lib/python/Plugins/DemoPlugins/TestPlugin/plugin.py:74
 msgid "Test-Messagebox?"
 msgstr ""
 
-#: ../lib/python/Screens/ParentalControlSetup.py:251
+#: ../lib/python/Screens/ParentalControlSetup.py:249
 msgid "The pin code has been changed successfully."
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:153
-#: ../lib/python/Screens/ParentalControlSetup.py:40
+#: ../lib/python/Screens/ChannelSelection.py:170
+#: ../lib/python/Screens/ParentalControlSetup.py:38
 #: ../lib/python/Components/ParentalControl.py:141
 msgid "The pin code you entered is wrong."
 msgstr ""
 
-#: ../lib/python/Screens/ParentalControlSetup.py:253
+#: ../lib/python/Screens/ParentalControlSetup.py:251
 msgid "The pin codes you entered are different."
 msgstr ""
 
@@ -1719,8 +1764,8 @@ msgid "Threshold"
 msgstr ""
 
 #: ../lib/python/Screens/EpgSelection.py:234
-#: ../lib/python/Components/EpgList.py:47
-#: ../lib/python/Components/TimerList.py:34
+#: ../lib/python/Components/EpgList.py:38
+#: ../lib/python/Components/TimerList.py:23
 msgid "Thu"
 msgstr ""
 
@@ -1742,11 +1787,11 @@ msgstr ""
 msgid "Timer status:"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:949
+#: ../lib/python/Screens/InfoBarGenerics.py:948
 msgid "Timeshift not possible!"
 msgstr ""
 
-#: ../lib/python/Screens/MediaPlayer.py:50
+#: ../lib/python/Screens/MediaPlayer.py:49
 msgid "Title:"
 msgstr ""
 
@@ -1777,13 +1822,13 @@ msgstr ""
 msgid "Transponder"
 msgstr ""
 
-#: ../lib/python/Screens/InputBox.py:168
+#: ../lib/python/Screens/InputBox.py:165
 msgid "Tries left:"
 msgstr ""
 
 #: ../lib/python/Screens/EpgSelection.py:234
-#: ../lib/python/Components/EpgList.py:47
-#: ../lib/python/Components/TimerList.py:34
+#: ../lib/python/Components/EpgList.py:38
+#: ../lib/python/Components/TimerList.py:23
 msgid "Tue"
 msgstr ""
 
@@ -1799,6 +1844,10 @@ msgstr ""
 msgid "Tune"
 msgstr ""
 
+#: ../lib/python/Screens/InfoBarGenerics.py:1878
+msgid "Tune failed!"
+msgstr ""
+
 #: ../lib/python/Screens/ScanSetup.py:175
 #: ../lib/python/Components/ServiceScan.py:75
 msgid "Tuner"
@@ -1827,7 +1876,7 @@ msgid "USALS"
 msgstr ""
 
 #: ../lib/python/Components/Harddisk.py:219
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:112
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:109
 msgid "USB Stick"
 msgstr ""
 
@@ -1850,22 +1899,36 @@ msgstr ""
 msgid "Unmount failed"
 msgstr ""
 
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:336
+msgid "Updates your receiver's software"
+msgstr ""
+
 #: ../lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py:50
-#: ../lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py:158
-#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:222
+#: ../lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py:149
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:216
 msgid "Updating finished. Here is the result:"
 msgstr ""
 
 #: ../lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py:56
-#: ../lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py:164
-#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:228
+#: ../lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py:155
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:222
 msgid "Updating... Please wait... This can take some minutes..."
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:67
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:70
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:323
 msgid "Upgrade finished. Do you want to reboot your Dreambox?"
 msgstr ""
 
+#: ../lib/python/Screens/Ipkg.py:84
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:285
+msgid "Upgrading"
+msgstr ""
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:246
+msgid "Upgrading Dreambox... Please wait"
+msgstr ""
+
 #: ../lib/python/Screens/NetworkSetup.py:27 ../data/
 msgid "Use DHCP"
 msgstr ""
@@ -1878,7 +1941,7 @@ msgstr ""
 msgid "User defined"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1800
+#: ../lib/python/Screens/InfoBarGenerics.py:1793
 msgid "View teletext..."
 msgstr ""
 
@@ -1886,13 +1949,13 @@ msgstr ""
 msgid "Voltage mode"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:772
+#: ../lib/python/Screens/ChannelSelection.py:868
 msgid "W"
 msgstr ""
 
 #: ../lib/python/Screens/EpgSelection.py:234
-#: ../lib/python/Components/EpgList.py:47
-#: ../lib/python/Components/TimerList.py:34
+#: ../lib/python/Components/EpgList.py:38
+#: ../lib/python/Components/TimerList.py:23
 msgid "Wed"
 msgstr ""
 
@@ -1914,11 +1977,11 @@ msgstr ""
 msgid "YPbPr"
 msgstr ""
 
-#: ../lib/python/Screens/MediaPlayer.py:54
+#: ../lib/python/Screens/MediaPlayer.py:53
 msgid "Year:"
 msgstr ""
 
-#: ../lib/python/Screens/Ci.py:22 ../data/
+#: ../lib/python/Screens/Ci.py:20 ../data/
 msgid "Yes"
 msgstr ""
 
@@ -1926,7 +1989,7 @@ msgstr ""
 msgid "You cannot delete this!"
 msgstr ""
 
-#: ../lib/python/Screens/InputBox.py:108
+#: ../lib/python/Screens/InputBox.py:105
 msgid "You have to wait for"
 msgstr ""
 
@@ -1937,10 +2000,16 @@ msgid ""
 "Do you want to define keywords now?"
 msgstr ""
 
-#: ../lib/python/Screens/MediaPlayer.py:398
+#: ../lib/python/Screens/MediaPlayer.py:397
 msgid "You selected a playlist"
 msgstr ""
 
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:315
+msgid ""
+"Your dreambox isn't connected to the internet properly. Please check it and "
+"try again."
+msgstr ""
+
 #: ../lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/plugin.py:31
 msgid ""
 "Your frontprocessor firmware must be upgraded.\n"
@@ -1955,70 +2024,82 @@ msgstr ""
 msgid "Zap back to service before satfinder?"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:386
+#: ../lib/python/Screens/ChannelSelection.py:471
+msgid "[alternative edit]"
+msgstr ""
+
+#: ../lib/python/Screens/ChannelSelection.py:475
 msgid "[bouquet edit]"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:388
+#: ../lib/python/Screens/ChannelSelection.py:477
 msgid "[favourite edit]"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:471
+#: ../lib/python/Screens/ChannelSelection.py:568
 msgid "[move mode]"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:119
+#: ../lib/python/Screens/ChannelSelection.py:139
+msgid "abort alternatives edit"
+msgstr ""
+
+#: ../lib/python/Screens/ChannelSelection.py:133
 msgid "abort bouquet edit"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:122
+#: ../lib/python/Screens/ChannelSelection.py:136
 msgid "abort favourites edit"
 msgstr ""
 
-#: ../lib/python/Components/TimerList.py:59
+#: ../lib/python/Components/TimerList.py:48
 msgid "about to start"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:101
+#: ../lib/python/Screens/ChannelSelection.py:126
+msgid "add alternatives"
+msgstr ""
+
+#: ../lib/python/Screens/ChannelSelection.py:108
 msgid "add bouquet"
 msgstr ""
 
-#: ../lib/python/Screens/MediaPlayer.py:345
+#: ../lib/python/Screens/MediaPlayer.py:344
 msgid "add directory to playlist"
 msgstr ""
 
-#: ../lib/python/Screens/MediaPlayer.py:347
+#: ../lib/python/Screens/MediaPlayer.py:346
 msgid "add file to playlist"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:107
+#: ../lib/python/Screens/ChannelSelection.py:116
 msgid "add marker"
 msgstr ""
 
+#: ../lib/python/Screens/InfoBarGenerics.py:1328
 #: ../lib/python/Screens/InfoBarGenerics.py:1330
-#: ../lib/python/Screens/InfoBarGenerics.py:1332
 msgid "add recording (enter recording duration)"
 msgstr ""
 
+#: ../lib/python/Screens/InfoBarGenerics.py:1328
 #: ../lib/python/Screens/InfoBarGenerics.py:1330
-#: ../lib/python/Screens/InfoBarGenerics.py:1332
 msgid "add recording (indefinitely)"
 msgstr ""
 
+#: ../lib/python/Screens/InfoBarGenerics.py:1328
 #: ../lib/python/Screens/InfoBarGenerics.py:1330
-#: ../lib/python/Screens/InfoBarGenerics.py:1332
 msgid "add recording (stop after current event)"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:87
+#: ../lib/python/Screens/ChannelSelection.py:94
 msgid "add service to bouquet"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:89
+#: ../lib/python/Screens/ChannelSelection.py:96
 msgid "add service to favourites"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:83
+#: ../lib/python/Screens/ChannelSelection.py:90
 msgid "add to parental protection"
 msgstr ""
 
@@ -2027,19 +2108,19 @@ msgstr ""
 msgid "advanced"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:209
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:206
 msgid ""
 "are you sure you want to restore\n"
 "following backup:\n"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:124
+#: ../lib/python/Screens/ChannelSelection.py:141
 #: ../lib/python/Screens/MovieSelection.py:25
 #: ../lib/python/Plugins/Extensions/CutListEditor/plugin.py:50
 msgid "back"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:21
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:19
 msgid "better"
 msgstr ""
 
@@ -2047,11 +2128,11 @@ msgstr ""
 msgid "blacklist"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:24
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:22
 msgid "by Exif"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1330
+#: ../lib/python/Screens/InfoBarGenerics.py:1328
 msgid "change recording (duration)"
 msgstr ""
 
@@ -2063,7 +2144,7 @@ msgstr ""
 msgid "circular right"
 msgstr ""
 
-#: ../lib/python/Screens/MediaPlayer.py:351
+#: ../lib/python/Screens/MediaPlayer.py:350
 msgid "clear playlist"
 msgstr ""
 
@@ -2071,11 +2152,11 @@ msgstr ""
 msgid "complex"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:601
+#: ../lib/python/Screens/InfoBarGenerics.py:600
 msgid "continue"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:93
+#: ../lib/python/Screens/ChannelSelection.py:100
 msgid "copy to bouquets"
 msgstr ""
 
@@ -2083,7 +2164,7 @@ msgstr ""
 msgid "daily"
 msgstr ""
 
-#: ../lib/python/Screens/MediaPlayer.py:350
+#: ../lib/python/Screens/MediaPlayer.py:349
 msgid "delete"
 msgstr ""
 
@@ -2100,23 +2181,31 @@ msgstr ""
 msgid "disable"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:115
+#: ../lib/python/Screens/ChannelSelection.py:128
 msgid "disable move mode"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1330
+#: ../lib/python/Components/UsageConfig.py:24
+msgid "do not change"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1328
 #: ../lib/python/Screens/TimerEntry.py:87
 msgid "do nothing"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1332
+#: ../lib/python/Screens/InfoBarGenerics.py:1330
 msgid "don't record"
 msgstr ""
 
-#: ../lib/python/Components/TimerList.py:68
+#: ../lib/python/Components/TimerList.py:57
 msgid "done!"
 msgstr ""
 
+#: ../lib/python/Screens/ChannelSelection.py:122
+msgid "edit alternatives"
+msgstr ""
+
 #: ../lib/python/Components/NimManager.py:559
 msgid "empty/unknown"
 msgstr ""
@@ -2125,19 +2214,23 @@ msgstr ""
 msgid "enable"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:111
+#: ../lib/python/Screens/ChannelSelection.py:118
 msgid "enable bouquet edit"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:113
+#: ../lib/python/Screens/ChannelSelection.py:120
 msgid "enable favourite edit"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:108
+#: ../lib/python/Screens/ChannelSelection.py:114
 msgid "enable move mode"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:118
+#: ../lib/python/Screens/ChannelSelection.py:138
+msgid "end alternatives edit"
+msgstr ""
+
+#: ../lib/python/Screens/ChannelSelection.py:132
 msgid "end bouquet edit"
 msgstr ""
 
@@ -2146,7 +2239,7 @@ msgstr ""
 msgid "end cut here"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:121
+#: ../lib/python/Screens/ChannelSelection.py:135
 msgid "end favourites edit"
 msgstr ""
 
@@ -2158,7 +2251,7 @@ msgstr ""
 msgid "free diskspace"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:111
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:108
 msgid "full /etc directory"
 msgstr ""
 
@@ -2166,11 +2259,11 @@ msgstr ""
 msgid "go to deep standby"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBar.py:63
+#: ../lib/python/Screens/InfoBar.py:59
 msgid "hear radio..."
 msgstr ""
 
-#: ../lib/python/Screens/MediaPlayer.py:352
+#: ../lib/python/Screens/MediaPlayer.py:351
 msgid "hide player"
 msgstr ""
 
@@ -2178,23 +2271,23 @@ msgstr ""
 msgid "horizontal"
 msgstr ""
 
-#: ../lib/python/Components/UsageConfig.py:20
+#: ../lib/python/Components/UsageConfig.py:21
 msgid "hour"
 msgstr ""
 
-#: ../lib/python/Components/UsageConfig.py:20
 #: ../lib/python/Components/UsageConfig.py:21
+#: ../lib/python/Components/UsageConfig.py:22
 msgid "hours"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/FritzCall/plugin.py:81
+#: ../lib/python/Plugins/Extensions/FritzCall/plugin.py:82
 #, python-format
 msgid ""
 "incoming call!\n"
 "%s calls on %s!"
 msgstr ""
 
-#: ../lib/python/Screens/Ci.py:300 ../lib/python/Screens/Ci.py:322
+#: ../lib/python/Screens/Ci.py:298 ../lib/python/Screens/Ci.py:320
 msgid "init module"
 msgstr ""
 
@@ -2202,16 +2295,16 @@ msgstr ""
 msgid "insert mark here"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBar.py:97
+#: ../lib/python/Screens/InfoBar.py:94
 msgid "leave movie player..."
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1390
+#: ../lib/python/Screens/InfoBarGenerics.py:1388
 msgid "left"
 msgstr ""
 
-#: ../lib/python/Screens/PluginBrowser.py:100
-#: ../lib/python/Screens/PluginBrowser.py:102
+#: ../lib/python/Screens/PluginBrowser.py:109
+#: ../lib/python/Screens/PluginBrowser.py:111
 msgid "list"
 msgstr ""
 
@@ -2224,43 +2317,47 @@ msgid "loopthrough to socket A"
 msgstr ""
 
 #: ../lib/python/Components/NimManager.py:716
-#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:24
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:22
 msgid "manual"
 msgstr ""
 
-#: ../lib/python/Components/TimerList.py:48
-#: ../lib/python/Components/TimerList.py:53
+#: ../lib/python/Components/TimerList.py:37
+#: ../lib/python/Components/TimerList.py:42
 msgid "mins"
 msgstr ""
 
-#: ../lib/python/Components/UsageConfig.py:18
+#: ../lib/python/Components/UsageConfig.py:19
 msgid "minute"
 msgstr ""
 
 #: ../lib/python/Screens/SleepTimerEdit.py:27
-#: ../lib/python/Components/UsageConfig.py:18
 #: ../lib/python/Components/UsageConfig.py:19
 #: ../lib/python/Components/UsageConfig.py:20
+#: ../lib/python/Components/UsageConfig.py:21
 msgid "minutes"
 msgstr ""
 
-#: ../lib/python/Screens/InputBox.py:108
+#: ../lib/python/Screens/InputBox.py:105
 msgid "minutes and"
 msgstr ""
 
+#: ../lib/python/Components/AVSwitch.py:92
+msgid "multinorm"
+msgstr ""
+
 #: ../lib/python/Components/ParentalControl.py:14
 msgid "never"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:262
+#: ../lib/python/Screens/InfoBarGenerics.py:261
 msgid "next channel"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:264
+#: ../lib/python/Screens/InfoBarGenerics.py:263
 msgid "next channel in history"
 msgstr ""
 
-#: ../lib/python/Screens/MessageBox.py:45
+#: ../lib/python/Screens/MessageBox.py:46
 #: ../lib/python/Screens/ScanSetup.py:341
 #: ../lib/python/Screens/ScanSetup.py:586
 #: ../lib/python/Screens/SleepTimerEdit.py:63
@@ -2272,24 +2369,24 @@ msgstr ""
 msgid "no HDD found"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:96
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:94
 msgid "no Picture found"
 msgstr ""
 
-#: ../lib/python/Screens/Ci.py:298 ../lib/python/Screens/Ci.py:320
+#: ../lib/python/Screens/Ci.py:296 ../lib/python/Screens/Ci.py:318
 msgid "no module found"
 msgstr ""
 
-#: ../lib/python/Components/UsageConfig.py:17
+#: ../lib/python/Components/UsageConfig.py:18
 msgid "no standby"
 msgstr ""
 
-#: ../lib/python/Components/UsageConfig.py:11
+#: ../lib/python/Components/UsageConfig.py:12
 msgid "no timeout"
 msgstr ""
 
 #: ../lib/python/Screens/About.py:40
-#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:24
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:22
 msgid "none"
 msgstr ""
 
@@ -2304,6 +2401,7 @@ msgstr ""
 #: ../lib/python/Screens/ScanSetup.py:360
 #: ../lib/python/Screens/ScanSetup.py:369
 #: ../lib/python/Screens/ScanSetup.py:377
+#: ../lib/python/Components/UsageConfig.py:24
 #: ../lib/python/Components/config.py:281
 msgid "off"
 msgstr ""
@@ -2311,6 +2409,7 @@ msgstr ""
 #: ../lib/python/Screens/ScanSetup.py:360
 #: ../lib/python/Screens/ScanSetup.py:369
 #: ../lib/python/Screens/ScanSetup.py:377
+#: ../lib/python/Components/UsageConfig.py:24
 #: ../lib/python/Components/config.py:281
 msgid "on"
 msgstr ""
@@ -2319,19 +2418,19 @@ msgstr ""
 msgid "once"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:111
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:108
 msgid "only /etc/enigma2 directory"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:265
+#: ../lib/python/Screens/InfoBarGenerics.py:264
 msgid "open servicelist"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:260
+#: ../lib/python/Screens/InfoBarGenerics.py:259
 msgid "open servicelist(down)"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:259
+#: ../lib/python/Screens/InfoBarGenerics.py:258
 msgid "open servicelist(up)"
 msgstr ""
 
@@ -2339,23 +2438,23 @@ msgstr ""
 msgid "pass"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:600
+#: ../lib/python/Screens/InfoBarGenerics.py:599
 msgid "pause"
 msgstr ""
 
-#: ../lib/python/Screens/Ci.py:82
+#: ../lib/python/Screens/Ci.py:80
 msgid "please press OK when ready"
 msgstr ""
 
-#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:242
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:240
 msgid "please wait, loading picture..."
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:261
+#: ../lib/python/Screens/InfoBarGenerics.py:260
 msgid "previous channel"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:263
+#: ../lib/python/Screens/InfoBarGenerics.py:262
 msgid "previous channel in history"
 msgstr ""
 
@@ -2363,7 +2462,7 @@ msgstr ""
 msgid "record"
 msgstr ""
 
-#: ../lib/python/Components/TimerList.py:64
+#: ../lib/python/Components/TimerList.py:53
 msgid "recording..."
 msgstr ""
 
@@ -2371,7 +2470,11 @@ msgstr ""
 msgid "remove after this position"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:95
+#: ../lib/python/Screens/ChannelSelection.py:124
+msgid "remove all alternatives"
+msgstr ""
+
+#: ../lib/python/Screens/ChannelSelection.py:102
 msgid "remove all new found flags"
 msgstr ""
 
@@ -2379,16 +2482,16 @@ msgstr ""
 msgid "remove before this position"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:97
-#: ../lib/python/Screens/ChannelSelection.py:102
+#: ../lib/python/Screens/ChannelSelection.py:104
+#: ../lib/python/Screens/ChannelSelection.py:109
 msgid "remove entry"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:85
+#: ../lib/python/Screens/ChannelSelection.py:92
 msgid "remove from parental protection"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:99
+#: ../lib/python/Screens/ChannelSelection.py:106
 msgid "remove new found flag"
 msgstr ""
 
@@ -2400,7 +2503,7 @@ msgstr ""
 msgid "repeated"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1390
+#: ../lib/python/Screens/InfoBarGenerics.py:1388
 msgid "right"
 msgstr ""
 
@@ -2434,7 +2537,7 @@ msgstr ""
 msgid "scan state"
 msgstr ""
 
-#: ../lib/python/Components/UsageConfig.py:11
+#: ../lib/python/Components/UsageConfig.py:12
 msgid "second"
 msgstr ""
 
@@ -2442,30 +2545,34 @@ msgstr ""
 msgid "second cable of motorized LNB"
 msgstr ""
 
-#: ../lib/python/Components/UsageConfig.py:11
 #: ../lib/python/Components/UsageConfig.py:12
 #: ../lib/python/Components/UsageConfig.py:13
-#: ../lib/python/Components/UsageConfig.py:17
+#: ../lib/python/Components/UsageConfig.py:14
+#: ../lib/python/Components/UsageConfig.py:18
 msgid "seconds"
 msgstr ""
 
-#: ../lib/python/Screens/InputBox.py:108
+#: ../lib/python/Screens/InputBox.py:105
 msgid "seconds."
 msgstr ""
 
-#: ../lib/python/Screens/ParentalControlSetup.py:96
+#: ../lib/python/Screens/ParentalControlSetup.py:94
 msgid "service pin"
 msgstr ""
 
-#: ../lib/python/Screens/ParentalControlSetup.py:98
+#: ../lib/python/Screens/ParentalControlSetup.py:96
 msgid "setup pin"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:407
+#: ../lib/python/Screens/InfoBarGenerics.py:406
 msgid "show EPG..."
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:369
+#: ../lib/python/Screens/ChannelSelection.py:123
+msgid "show alternatives"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:368
 msgid "show event details"
 msgstr ""
 
@@ -2476,15 +2583,15 @@ msgstr ""
 #: ../lib/python/Components/NimManager.py:671
 #: ../lib/python/Components/NimManager.py:681
 #: ../lib/python/Components/ParentalControl.py:13
-#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:21
+#: ../lib/python/Plugins/Extensions/PicturePlayer/plugin.py:19
 msgid "simple"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:606
+#: ../lib/python/Screens/InfoBarGenerics.py:605
 msgid "skip backward"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:603
+#: ../lib/python/Screens/InfoBarGenerics.py:602
 msgid "skip forward"
 msgstr ""
 
@@ -2497,27 +2604,27 @@ msgstr ""
 msgid "start cut here"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:921
+#: ../lib/python/Screens/InfoBarGenerics.py:920
 msgid "start timeshift"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1390
+#: ../lib/python/Screens/InfoBarGenerics.py:1388
 msgid "stereo"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1330
+#: ../lib/python/Screens/InfoBarGenerics.py:1328
 msgid "stop recording"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:922
+#: ../lib/python/Screens/InfoBarGenerics.py:921
 msgid "stop timeshift"
 msgstr ""
 
-#: ../lib/python/Screens/MediaPlayer.py:349
+#: ../lib/python/Screens/MediaPlayer.py:348
 msgid "switch to filelist"
 msgstr ""
 
-#: ../lib/python/Screens/MediaPlayer.py:343
+#: ../lib/python/Screens/MediaPlayer.py:342
 msgid "switch to playlist"
 msgstr ""
 
@@ -2549,19 +2656,19 @@ msgstr ""
 msgid "vertical"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1057
+#: ../lib/python/Screens/InfoBarGenerics.py:1055
 msgid "view extensions..."
 msgstr ""
 
-#: ../lib/python/Screens/InfoBar.py:62
+#: ../lib/python/Screens/InfoBar.py:58
 msgid "view recordings..."
 msgstr ""
 
-#: ../lib/python/Screens/Ci.py:167
+#: ../lib/python/Screens/Ci.py:165
 msgid "wait for ci..."
 msgstr ""
 
-#: ../lib/python/Components/TimerList.py:57
+#: ../lib/python/Components/TimerList.py:46
 msgid "waiting"
 msgstr ""
 
@@ -2573,7 +2680,7 @@ msgstr ""
 msgid "whitelist"
 msgstr ""
 
-#: ../lib/python/Screens/MessageBox.py:45
+#: ../lib/python/Screens/MessageBox.py:46
 #: ../lib/python/Screens/ScanSetup.py:341
 #: ../lib/python/Screens/ScanSetup.py:586
 #: ../lib/python/Screens/SleepTimerEdit.py:61
@@ -2586,11 +2693,17 @@ msgstr ""
 msgid "yes (keep feeds)"
 msgstr ""
 
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:311
+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
 msgid "zap"
 msgstr ""
 
-#: ../lib/python/Components/TimerList.py:62
+#: ../lib/python/Components/TimerList.py:51
 msgid "zapped"
 msgstr ""
 
@@ -2634,7 +2747,12 @@ msgid "Yes, backup my settings!"
 msgstr ""
 
 #: ../data/
-msgid "Startwizard"
+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/
@@ -2702,7 +2820,7 @@ msgid "Do you want to view a tutorial?"
 msgstr ""
 
 #: ../data/
-msgid "Setup"
+msgid "No, do nothing."
 msgstr ""
 
 #: ../data/
@@ -2726,7 +2844,7 @@ msgid "#bab329"
 msgstr ""
 
 #: ../data/
-msgid "Sat / Dish Setup"
+msgid "Startwizard"
 msgstr ""
 
 #: ../data/
@@ -2740,17 +2858,13 @@ msgid ""
 msgstr ""
 
 #: ../data/
-msgid "The wizard is finished now."
+msgid "Mute"
 msgstr ""
 
 #: ../data/
 msgid "Service Searching"
 msgstr ""
 
-#: ../data/
-msgid "Mute"
-msgstr ""
-
 #: ../data/
 msgid ""
 "Welcome to the Image upgrade wizard. The wizard will assist you in upgrading "
@@ -2771,15 +2885,18 @@ msgid "Keyboard Setup"
 msgstr ""
 
 #: ../data/
-msgid "Dish"
+msgid ""
+"Use the left and right buttons to change an option.\n"
+"\n"
+"Please set up tuner A"
 msgstr ""
 
 #: ../data/
-msgid "Margin after record"
+msgid "Dish"
 msgstr ""
 
 #: ../data/
-msgid "No, just start my dreambox"
+msgid "Margin after record"
 msgstr ""
 
 #: ../data/
@@ -2809,11 +2926,7 @@ msgid "Manual Scan"
 msgstr ""
 
 #: ../data/
-msgid ""
-"Welcome.\n"
-"\n"
-"This start wizard will guide you through the basic setup of your Dreambox.\n"
-"Press the OK button on your remote control to move to the next step."
+msgid "Timer Edit"
 msgstr ""
 
 #: ../data/
@@ -2821,7 +2934,7 @@ msgid "RC Menu"
 msgstr ""
 
 #: ../data/
-msgid "SNR:"
+msgid "No, just start my dreambox"
 msgstr ""
 
 #: ../data/
@@ -2844,6 +2957,10 @@ msgstr ""
 msgid "Standby / Restart"
 msgstr ""
 
+#: ../data/
+msgid "Contrast"
+msgstr ""
+
 #: ../data/
 msgid "EPG Selection"
 msgstr ""
@@ -2868,6 +2985,10 @@ msgstr ""
 msgid "Parental control services Editor"
 msgstr ""
 
+#: ../data/
+msgid "Yes, do another manual scan now"
+msgstr ""
+
 #: ../data/
 msgid "Activate network settings"
 msgstr ""
@@ -2889,11 +3010,7 @@ msgid "Yes, view the tutorial"
 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."
+msgid "Show infobar on skip forward/backward"
 msgstr ""
 
 #: ../data/
@@ -2912,6 +3029,10 @@ msgstr ""
 msgid "#80000000"
 msgstr ""
 
+#: ../data/
+msgid "SNR:"
+msgstr ""
+
 #: ../data/
 msgid "Harddisk setup"
 msgstr ""
@@ -2928,10 +3049,6 @@ msgstr ""
 msgid "Downloadable plugins"
 msgstr ""
 
-#: ../data/
-msgid "Do you want to view a cutlist tutorial?"
-msgstr ""
-
 #: ../data/
 msgid "Subservices"
 msgstr ""
@@ -2944,6 +3061,10 @@ msgstr ""
 msgid "Timezone"
 msgstr ""
 
+#: ../data/
+msgid "Message"
+msgstr ""
+
 #: ../data/
 msgid "Seek"
 msgstr ""
@@ -2977,16 +3098,7 @@ msgid "Service scan"
 msgstr ""
 
 #: ../data/
-msgid "Yes, do another manual scan 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."
+msgid "The wizard is finished now."
 msgstr ""
 
 #: ../data/
@@ -3006,7 +3118,7 @@ msgid "Yes, restore the settings now"
 msgstr ""
 
 #: ../data/
-msgid "Contrast"
+msgid "12V output"
 msgstr ""
 
 #: ../data/
@@ -3024,7 +3136,11 @@ msgid "Repeat"
 msgstr ""
 
 #: ../data/
-msgid "Show infobar on skip forward/backward"
+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/
@@ -3050,7 +3166,7 @@ msgid "PiPSetup"
 msgstr ""
 
 #: ../data/
-msgid "Menu"
+msgid "Installing Software..."
 msgstr ""
 
 #: ../data/
@@ -3061,6 +3177,10 @@ msgstr ""
 msgid "AC3 default"
 msgstr ""
 
+#: ../data/
+msgid "Menu"
+msgstr ""
+
 #: ../data/
 msgid "Timer entry"
 msgstr ""
@@ -3102,10 +3222,6 @@ msgstr ""
 msgid "Media player"
 msgstr ""
 
-#: ../data/
-msgid "Yes, perform a shutdown now."
-msgstr ""
-
 #: ../data/
 msgid "Timer sanity error"
 msgstr ""
@@ -3231,11 +3347,15 @@ msgid "Alpha"
 msgstr ""
 
 #: ../data/
-msgid "Timer Edit"
+msgid ""
+"Welcome.\n"
+"\n"
+"This start wizard will guide you through the basic setup of your Dreambox.\n"
+"Press the OK button on your remote control to move to the next step."
 msgstr ""
 
 #: ../data/
-msgid "No, do nothing."
+msgid "Setup"
 msgstr ""
 
 #: ../data/
@@ -3250,10 +3370,6 @@ msgstr ""
 msgid "config menu"
 msgstr ""
 
-#: ../data/
-msgid "Message"
-msgstr ""
-
 #: ../data/
 msgid "Finetune"
 msgstr ""
@@ -3270,6 +3386,10 @@ msgstr ""
 msgid "AGC:"
 msgstr ""
 
+#: ../data/
+msgid "Sat / Dish Setup"
+msgstr ""
+
 #: ../data/
 msgid "What do you want to scan?"
 msgstr ""
@@ -3295,10 +3415,7 @@ msgid "NOW"
 msgstr ""
 
 #: ../data/
-msgid ""
-"Use the left and right buttons to change an option.\n"
-"\n"
-"Please set up tuner A"
+msgid "Yes, perform a shutdown now."
 msgstr ""
 
 #: ../data/