update da language

[enigma2.git] / po / fi.po

diff --git a/po/fi.po b/po/fi.po
index 85214f77960c377fac11c794c6cf0551f33fc736..d786c2573e8f269e09224eb24afb89eb6cdfa58c 100755 (executable)
--- a/po/fi.po
+++ b/po/fi.po
@@ -2,15 +2,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxbox-enigma 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-05 19:29+0000\n"
-"PO-Revision-Date: 2006-07-20 23:11+0200\n"
+"POT-Creation-Date: 2006-10-19 15:17+0200\n"
+"PO-Revision-Date: 2006-10-23 20:36+0200\n"
 "Last-Translator: Sauli Halttu <salde@salde.net>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Language: Finnish\n"
 "X-Poedit-Country: FINLAND\n"
 "X-Poedit-SourceCharset: iso-8859-15\n"
 
@@ -25,16 +24,52 @@ msgstr ""
 #: ../lib/python/Screens/PluginBrowser.py:100
 #: ../lib/python/Screens/PluginBrowser.py:102
 msgid "\"?"
+msgstr "\"?"
+
+#: ../data/
+msgid "#000000"
+msgstr ""
+
+#: ../data/
+msgid "#0064c7"
+msgstr ""
+
+#: ../data/
+msgid "#33294a6b"
+msgstr ""
+
+#: ../data/
+msgid "#389416"
+msgstr ""
+
+#: ../data/
+msgid "#80000000"
+msgstr ""
+
+#: ../data/
+msgid "#bab329"
+msgstr ""
+
+#: ../data/
+msgid "#f23d21"
+msgstr ""
+
+#: ../data/
+msgid "#ffffff"
+msgstr ""
+
+#: ../data/
+msgid "#ffffffff"
 msgstr ""
 
 #: ../lib/python/Screens/EventView.py:107
 #, python-format
 msgid "%d min"
-msgstr ""
+msgstr "%d min"
 
-#: ../lib/python/Screens/TimerEntry.py:106
-#: ../lib/python/Screens/TimerEntry.py:109
-#: ../lib/python/Screens/TimeDateInput.py:49
+#: ../lib/python/Screens/TimeDateInput.py:35
+#: ../lib/python/Screens/TimerEntry.py:94
+#: ../lib/python/Screens/TimerEntry.py:97
 msgid "%d.%B %Y"
 msgstr "%d.%m.%Y"
 
@@ -50,7 +85,7 @@ msgstr ""
 #: ../lib/python/Components/TimerList.py:46
 #: ../lib/python/Components/TimerList.py:51
 msgid "(ZAP)"
-msgstr ""
+msgstr "(ZAP)"
 
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:110
 msgid "/usr/share/enigma2 directory"
@@ -60,51 +95,88 @@ msgstr "/usr/share/enigma2 hakemisto"
 msgid "/var directory"
 msgstr "/var hakemisto"
 
-#: ../lib/python/Components/NimManager.py:758
+#: ../lib/python/Components/NimManager.py:771
 msgid "0 V"
-msgstr ""
+msgstr "0 V"
 
-#: ../lib/python/Components/NimManager.py:761
+#: ../lib/python/Components/NimManager.py:774
 msgid "1.0"
-msgstr ""
+msgstr "1.0"
 
-#: ../lib/python/Components/NimManager.py:761
+#: ../lib/python/Components/NimManager.py:774
 msgid "1.1"
-msgstr ""
+msgstr "1.1"
 
-#: ../lib/python/Components/NimManager.py:761
+#: ../lib/python/Components/NimManager.py:774
 msgid "1.2"
-msgstr ""
+msgstr "1.2"
 
-#: ../lib/python/Components/NimManager.py:758
+#: ../lib/python/Components/NimManager.py:771
 msgid "12 V"
-msgstr ""
+msgstr "12 V"
 
-#: ../lib/python/Screens/Satconfig.py:150
+#: ../lib/python/Screens/Satconfig.py:138
 msgid "12V Output"
 msgstr "12V lähtö"
 
-#: ../lib/python/Components/NimManager.py:737
+#: ../lib/python/Components/NimManager.py:749
 msgid "13 V"
-msgstr ""
+msgstr "13 V"
+
+#: ../lib/python/Components/AVSwitch.py:89
+msgid "16:10 Letterbox"
+msgstr "16:10 Kirjelaatikko"
 
-#: ../lib/python/Components/NimManager.py:737
+#: ../lib/python/Components/AVSwitch.py:90
+msgid "16:10 PanScan"
+msgstr "16:10 PanScan"
+
+#: ../lib/python/Components/AVSwitch.py:87
+msgid "16:9"
+msgstr "16:9"
+
+#: ../lib/python/Components/AVSwitch.py:88
+msgid "16:9 always"
+msgstr "19:9 aina"
+
+#: ../lib/python/Components/NimManager.py:749
 msgid "18 V"
-msgstr ""
+msgstr "18 V"
+
+#: ../lib/python/Components/ParentalControl.py:14
+msgid "30 minutes"
+msgstr "30 minuuttia"
+
+#: ../lib/python/Components/AVSwitch.py:85
+msgid "4:3 Letterbox"
+msgstr "4:3 Kirjelaatikko"
+
+#: ../lib/python/Components/AVSwitch.py:86
+msgid "4:3 PanScan"
+msgstr "4:3 PanScan"
+
+#: ../lib/python/Components/ParentalControl.py:14
+msgid "5 minutes"
+msgstr "5 minuuttia"
+
+#: ../lib/python/Components/ParentalControl.py:14
+msgid "60 minutes"
+msgstr "60 minuuttia"
 
 #: ../lib/python/Components/TimerList.py:66
 msgid "<unknown>"
 msgstr "<tuntematon>"
 
-#: ../lib/python/Screens/Setup.py:131
+#: ../lib/python/Screens/Menu.py:126 ../lib/python/Screens/Menu.py:166
+#: ../lib/python/Screens/Menu.py:169 ../lib/python/Screens/Setup.py:118
 msgid "??"
-msgstr ""
+msgstr "??"
 
-#: ../lib/python/Components/NimManager.py:760
+#: ../lib/python/Components/NimManager.py:773
 msgid "A"
-msgstr ""
+msgstr "A"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1214
+#: ../lib/python/Screens/InfoBarGenerics.py:1339
 msgid ""
 "A recording is currently running.\n"
 "What do you want to do?"
@@ -112,7 +184,7 @@ msgstr ""
 "Tallennus on parhaillaan käynnissä.\n"
 "Mitä haluat tehdä?"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:506
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:511
 msgid ""
 "A recording is currently running. Please stop the recording before trying to "
 "configure the positioner."
@@ -128,50 +200,86 @@ msgstr ""
 "Ajastintallennus epäonnistui!\n"
 "Yritä uudelleen?\n"
 
-#: ../lib/python/Components/NimManager.py:743
+#: ../data/
+msgid "A/V Settings"
+msgstr "A/V asetukset"
+
+#: ../lib/python/Components/NimManager.py:755
 msgid "AA"
-msgstr ""
+msgstr "AA"
 
-#: ../lib/python/Components/NimManager.py:743
+#: ../lib/python/Components/NimManager.py:755
 msgid "AB"
-msgstr ""
+msgstr "AB"
+
+#: ../data/
+msgid "AC3 default"
+msgstr "AC3 oletus"
+
+#: ../data/
+msgid "AGC:"
+msgstr "AGC:"
+
+#: ../data/
+msgid "About"
+msgstr "Tietoa"
+
+#: ../data/
+msgid "About..."
+msgstr "Tietoja..."
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1043
+#: ../lib/python/Screens/InfoBarGenerics.py:1178
 msgid "Activate Picture in Picture"
 msgstr "Käynnistä Kuva Kuvassa-toiminto"
 
-#: ../lib/python/Screens/TimerEdit.py:27
+#: ../data/
+msgid "Activate network settings"
+msgstr "Ota verkkoasetukset käyttöön"
+
+#: ../lib/python/Screens/TimerEdit.py:25
 msgid "Add"
 msgstr "Lisää"
 
-#: ../lib/python/Screens/MediaPlayer.py:346
+#: ../lib/python/Screens/MediaPlayer.py:389
 msgid "Add files to playlist"
 msgstr "Lisää tiedostot soittolistalle"
 
+#: ../lib/python/Screens/EpgSelection.py:59
 #: ../lib/python/Screens/EventView.py:32
-#: ../lib/python/Screens/EpgSelection.py:60
 msgid "Add timer"
 msgstr "Lisää ajastin"
 
-#: ../lib/python/Components/NimManager.py:680
-#: ../lib/python/Components/NimManager.py:688
-#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:31
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:32
 msgid "Advanced"
 msgstr "Edistyneille"
 
-#: ../lib/python/Screens/TimerEntry.py:195
+#: ../lib/python/Screens/TimerEntry.py:177
 msgid "After event"
 msgstr "Tapahtuman jälkeen"
 
+#: ../data/
+msgid ""
+"After the start wizard is completed, you need to protect single services. "
+"Refer to your dreambox's manual on how to do that."
+msgstr ""
+
 #: ../lib/python/Screens/MediaPlayer.py:51
 msgid "Album:"
 msgstr "Albumi:"
 
-#: ../lib/python/Screens/ChannelSelection.py:474
-#: ../lib/python/Screens/ChannelSelection.py:622
+#: ../lib/python/Screens/ChannelSelection.py:497
+#: ../lib/python/Screens/ChannelSelection.py:647
 msgid "All"
 msgstr "Kaikki"
 
+#: ../data/
+msgid "Alpha"
+msgstr "Alpha"
+
+#: ../data/
+msgid "Alternative radio mode"
+msgstr "Vaihtoehtoinen radiomuoto"
+
 #: ../lib/python/Components/Language.py:16
 msgid "Arabic"
 msgstr "Arabialainen"
@@ -180,39 +288,51 @@ msgstr "Arabialainen"
 msgid "Artist:"
 msgstr "Artisti:"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1224
+#: ../data/
+msgid "Aspect Ratio"
+msgstr "Kuvasuhde"
+
+#: ../data/
+msgid "Audio"
+msgstr "Ääni"
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1349
 msgid "Audio Options..."
 msgstr "Äänivalinnat"
 
-#: ../lib/python/Screens/ScanSetup.py:365
-#: ../lib/python/Screens/ScanSetup.py:368
-#: ../lib/python/Screens/ScanSetup.py:374
-#: ../lib/python/Screens/ScanSetup.py:376
+#: ../lib/python/Screens/Ci.py:22 ../lib/python/Screens/ScanSetup.py:360
+#: ../lib/python/Screens/ScanSetup.py:363
+#: ../lib/python/Screens/ScanSetup.py:369
+#: ../lib/python/Screens/ScanSetup.py:371
+#: ../lib/python/Screens/ScanSetup.py:377
+#: ../lib/python/Screens/ScanSetup.py:381
 #: ../lib/python/Screens/ScanSetup.py:382
+#: ../lib/python/Screens/ScanSetup.py:383
+#: ../lib/python/Screens/ScanSetup.py:384
+#: ../lib/python/Screens/ScanSetup.py:385
 #: ../lib/python/Screens/ScanSetup.py:386
-#: ../lib/python/Screens/ScanSetup.py:387
-#: ../lib/python/Screens/ScanSetup.py:388
-#: ../lib/python/Screens/ScanSetup.py:389
-#: ../lib/python/Screens/ScanSetup.py:390
-#: ../lib/python/Screens/ScanSetup.py:391 ../lib/python/Screens/Ci.py:24
 msgid "Auto"
 msgstr "Automaattinen"
 
-#: ../lib/python/Screens/ScanSetup.py:702 ../data/
+#: ../lib/python/Screens/ScanSetup.py:603 ../data/
 msgid "Automatic Scan"
 msgstr "Automaattihaku"
 
-#: ../lib/python/Components/NimManager.py:760
+#: ../lib/python/Components/NimManager.py:773
 msgid "B"
-msgstr ""
+msgstr "B"
 
-#: ../lib/python/Components/NimManager.py:743
+#: ../lib/python/Components/NimManager.py:755
 msgid "BA"
-msgstr ""
+msgstr "BA"
 
-#: ../lib/python/Components/NimManager.py:743
+#: ../lib/python/Components/NimManager.py:755
 msgid "BB"
-msgstr ""
+msgstr "BB"
+
+#: ../data/
+msgid "BER:"
+msgstr "BER:"
 
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:76
 msgid "Backup"
@@ -226,19 +346,34 @@ msgstr "Mihin tallennetaan"
 msgid "Backup Mode"
 msgstr "Mitä tallennetaan"
 
-#: ../lib/python/Components/NimManager.py:738
+#: ../data/
+msgid "Backup is done. Please press OK to see the result."
+msgstr "Varmuuskopio valmis. Paina OK nähdäksesi tulokset."
+
+#: ../lib/python/Components/NimManager.py:750
 msgid "Band"
 msgstr "Taajuus"
 
-#: ../lib/python/Screens/ScanSetup.py:247
+#: ../lib/python/Screens/ScanSetup.py:243
 msgid "Bandwidth"
 msgstr "Kaistanleveys"
 
+#: ../data/
+msgid "Brightness"
+msgstr "Kirkkaus"
+
 #: ../lib/python/Screens/HarddiskSetup.py:31
 msgid "Bus: "
 msgstr "Väylä:"
 
-#: ../lib/python/Components/NimManager.py:754
+#: ../data/
+msgid ""
+"By pressing the OK Button on your remote control, the info bar is being "
+"displayed."
+msgstr ""
+"Kun painat OK nappia kauko-ohjaimessasi tietopalkki näytetään ruudussa."
+
+#: ../lib/python/Components/NimManager.py:767
 msgid "C-Band"
 msgstr "C-taajuusalue"
 
@@ -246,18 +381,18 @@ msgstr "C-taajuusalue"
 msgid "CF Drive"
 msgstr "CF-Asema"
 
-#: ../lib/python/Screens/ChannelSelection.py:735
+#: ../lib/python/Components/AVSwitch.py:77
+msgid "CVBS"
+msgstr "CVBS"
+
+#: ../lib/python/Screens/ChannelSelection.py:760
 msgid "Cable"
 msgstr "Kaapeli"
 
-#: ../lib/python/Screens/Satconfig.py:69
-msgid "Cable provider"
-msgstr "Kaapeli-TV operaattori"
-
-#: ../lib/python/Screens/Setup.py:87 ../lib/python/Screens/TimerEntry.py:25
-#: ../lib/python/Screens/TimeDateInput.py:16
+#: ../lib/python/Screens/Setup.py:85 ../lib/python/Screens/TimeDateInput.py:16
+#: ../lib/python/Screens/TimerEntry.py:29
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:75
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:165
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:166
 msgid "Cancel"
 msgstr "Peruuta"
 
@@ -265,98 +400,164 @@ msgstr "Peruuta"
 msgid "Capacity: "
 msgstr "Kapasiteetti:"
 
-#: ../lib/python/Screens/TimerEntry.py:197 ../data/
+#: ../lib/python/Components/Language.py:17
+msgid "Catalan"
+msgstr ""
+
+#: ../data/
+msgid "Change bouquets in quickzap"
+msgstr "Vaihda kanavanippuja nopeavaihdossa"
+
+#: ../lib/python/Screens/ChannelSelection.py:146
+#: ../lib/python/Screens/ParentalControlSetup.py:22 ../data/
+msgid "Change pin code"
+msgstr "Vaihda pin-koodi"
+
+#: ../lib/python/Screens/ParentalControlSetup.py:79
+msgid "Change service pin"
+msgstr "Vaihda palvelun pin-koodi"
+
+#: ../lib/python/Screens/ParentalControlSetup.py:76
+msgid "Change service pins"
+msgstr "Vaihda palvelun pin-koodit"
+
+#: ../lib/python/Screens/ParentalControlSetup.py:70
+msgid "Change setup pin"
+msgstr "Vaihda asetusten pin-koodi"
+
+#: ../lib/python/Screens/TimerEntry.py:179 ../data/
 msgid "Channel"
 msgstr "Kanava"
 
+#: ../data/
+msgid "Channel Selection"
+msgstr "Kanavien valinta"
+
 #: ../lib/python/Screens/InfoBarGenerics.py:150
 msgid "Channel:"
 msgstr "Kanava:"
 
-#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:33
+#: ../data/
+msgid "Channellist menu"
+msgstr "Kanavalistavalikko"
+
+#: ../data/
+msgid "Choose bouquet"
+msgstr "Valitse kanavanippu"
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:34
 msgid "Choose source"
 msgstr "Valitse lähde"
 
-#: ../lib/python/Components/SetupDevices.py:21
-msgid "Classic"
-msgstr "Klassinen"
-
-#: ../lib/python/Screens/TimerEdit.py:29
+#: ../lib/python/Screens/TimerEdit.py:27
 msgid "Cleanup"
 msgstr "Puhdista"
 
-#: ../lib/python/Screens/ScanSetup.py:213
-#: ../lib/python/Screens/ScanSetup.py:218
-#: ../lib/python/Screens/ScanSetup.py:240
-#: ../lib/python/Screens/ScanSetup.py:255
-#: ../lib/python/Screens/ScanSetup.py:690
+#: ../lib/python/Screens/ScanSetup.py:209
+#: ../lib/python/Screens/ScanSetup.py:214
+#: ../lib/python/Screens/ScanSetup.py:236
+#: ../lib/python/Screens/ScanSetup.py:251
+#: ../lib/python/Screens/ScanSetup.py:587
 msgid "Clear before scan"
 msgstr "Tyhjennä ennen hakua"
 
-#: ../lib/python/Screens/TimerEntry.py:346
+#: ../lib/python/Screens/TimerEntry.py:315
 msgid "Clear log"
 msgstr "Tyhjennä loki"
 
-#: ../lib/python/Screens/ScanSetup.py:248
+#: ../lib/python/Screens/ScanSetup.py:244
 msgid "Code rate high"
 msgstr "Koodin taso korkea"
 
-#: ../lib/python/Screens/ScanSetup.py:249
+#: ../lib/python/Screens/ScanSetup.py:245
 msgid "Code rate low"
 msgstr "Koodin taso alhainen"
 
-#: ../lib/python/Screens/Satconfig.py:130
-#: ../lib/python/Screens/Satconfig.py:132
+#: ../data/
+msgid "Color Format"
+msgstr "Väriformaatti"
+
+#: ../lib/python/Screens/Satconfig.py:118
+#: ../lib/python/Screens/Satconfig.py:120
 msgid "Command order"
 msgstr "Käskyjen järjestys"
 
-#: ../lib/python/Screens/Satconfig.py:126
+#: ../lib/python/Screens/Satconfig.py:114
 msgid "Committed DiSEqC command"
 msgstr "Committed DiSEqC-käsky"
 
-#: ../lib/python/Screens/ScanSetup.py:344
-#: ../lib/python/Screens/ScanSetup.py:345
+#: ../data/
+msgid "Common Interface"
+msgstr "Common Interface"
+
+#: ../data/
+msgid "Compact flash card"
+msgstr "Compact flash kortti"
+
+#: ../lib/python/Screens/ScanSetup.py:339
+#: ../lib/python/Screens/ScanSetup.py:340
+#: ../lib/python/Components/NimManager.py:797
 msgid "Complete"
-msgstr "Valmis"
+msgstr "Täysi"
 
-#: ../lib/python/Screens/Satconfig.py:49
-#: ../lib/python/Screens/Satconfig.py:155 ../data/
+#: ../lib/python/Screens/Satconfig.py:47
+#: ../lib/python/Screens/Satconfig.py:143 ../data/
 msgid "Configuration Mode"
 msgstr "Muokkaustila"
 
-#: ../lib/python/Screens/TimerEdit.py:205
+#: ../lib/python/Screens/TimerEdit.py:208
 msgid "Conflicting timer"
 msgstr "Ajastinkonflikti"
 
+#: ../data/
+msgid "Contrast"
+msgstr "Kontrasti"
+
+#: ../lib/python/Components/Harddisk.py:132
+msgid "Create movie folder failed"
+msgstr "Movie-hakemiston luonti epäonnistui"
+
+#: ../lib/python/Components/Harddisk.py:132
+msgid "Creating partition failed"
+msgstr "Osion luonti epäonnistui"
+
 #: ../lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/plugin.py:32
 msgid "Current version:"
 msgstr "Nykyinen versio:"
 
-#: ../lib/python/Screens/ScanSetup.py:363
+#: ../data/
+msgid "Customize"
+msgstr "Sovita"
+
+#: ../lib/python/Screens/ScanSetup.py:358
 msgid "DVB-S"
-msgstr ""
+msgstr "DVB-S"
 
-#: ../lib/python/Screens/ScanSetup.py:363
+#: ../lib/python/Screens/ScanSetup.py:358
 msgid "DVB-S2"
-msgstr ""
+msgstr "DVB-S2"
 
-#: ../lib/python/Components/Language.py:17
+#: ../lib/python/Components/Language.py:18
 msgid "Danish"
 msgstr "Tanska"
 
-#: ../lib/python/Screens/TimeDateInput.py:54
+#: ../lib/python/Screens/TimeDateInput.py:40
 msgid "Date"
 msgstr "Päiväys"
 
-#: ../lib/python/Components/SetupDevices.py:21
-msgid "Default"
-msgstr "Oletus"
+#: ../data/
+msgid "Deep Standby"
+msgstr "Syvä valmiustila"
+
+#: ../data/
+msgid "Delay"
+msgstr "Viive"
 
-#: ../lib/python/Screens/TimerEdit.py:26
+#: ../lib/python/Screens/TimerEdit.py:24
 msgid "Delete"
 msgstr "Poista"
 
-#: ../lib/python/Screens/TimerEntry.py:343
+#: ../lib/python/Screens/TimerEntry.py:312
 msgid "Delete entry"
 msgstr "Poista valinta"
 
@@ -364,7 +565,7 @@ msgstr "Poista valinta"
 msgid "Delete failed!"
 msgstr "Poisto epäonnistui!"
 
-#: ../lib/python/Screens/TimerEntry.py:151
+#: ../lib/python/Screens/TimerEntry.py:130
 msgid "Description"
 msgstr "Kuvaus"
 
@@ -376,49 +577,53 @@ msgstr "Löytyi kiintolevy:"
 msgid "Detected NIMs:"
 msgstr "Löytyneet NIMit:"
 
-#: ../lib/python/Components/NimManager.py:702
+#: ../data/
+msgid "DiSEqC"
+msgstr "DiSEqC"
+
+#: ../lib/python/Components/NimManager.py:704
 msgid "DiSEqC A/B"
 msgstr "DiSEqC A/B"
 
-#: ../lib/python/Components/NimManager.py:702
+#: ../lib/python/Components/NimManager.py:705
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-#: ../lib/python/Screens/Satconfig.py:53
+#: ../lib/python/Screens/Satconfig.py:51
 msgid "DiSEqC Mode"
 msgstr "DiSEqC-Tila"
 
-#: ../lib/python/Screens/Satconfig.py:122
+#: ../lib/python/Screens/Satconfig.py:110
 msgid "DiSEqC mode"
 msgstr "DiSEqC-tila"
 
-#: ../lib/python/Screens/Satconfig.py:134
+#: ../lib/python/Screens/Satconfig.py:122
 msgid "DiSEqC repeats"
 msgstr "DiSEqC toistoja"
 
-#: ../lib/python/Screens/ScanSetup.py:222
-#: ../lib/python/Screens/TimerEdit.py:83 ../lib/python/Components/Lcd.py:31
-#: ../lib/python/Components/SetupDevices.py:38
-#: ../lib/python/Components/SetupDevices.py:39
-#: ../lib/python/Components/SetupDevices.py:43
-#: ../lib/python/Components/SetupDevices.py:44
-#: ../lib/python/Components/SetupDevices.py:45
-#: ../lib/python/Components/SetupDevices.py:46
-#: ../lib/python/Components/SetupDevices.py:47
+#: ../lib/python/Screens/TimerEdit.py:81
 msgid "Disable"
 msgstr "Pois"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1045
+#: ../lib/python/Screens/InfoBarGenerics.py:1176
 msgid "Disable Picture in Picture"
 msgstr "Sulje Kuva Kuvassa-toiminto"
 
+#: ../lib/python/Screens/InfoBarGenerics.py:1134
+msgid "Disable subtitles"
+msgstr "Poista tekstitys"
+
+#: ../data/
+msgid "Dish"
+msgstr "Antenni"
+
 #: ../lib/python/Screens/PluginBrowser.py:102
 msgid ""
 "Do you really want to REMOVE\n"
 "the plugin \""
 msgstr ""
 "Haluatko varmasti POISTAA\n"
-"tämän lisäosan?\""
+"tämän lisäosan \""
 
 #: ../lib/python/Screens/MovieSelection.py:47
 #, python-format
@@ -431,7 +636,7 @@ msgid ""
 "the plugin \""
 msgstr ""
 "Haluatko varmasti ladata\n"
-"tämän lisäosan?\""
+"tämän lisäosan \""
 
 #: ../lib/python/Screens/HarddiskSetup.py:54
 msgid ""
@@ -449,12 +654,28 @@ msgstr ""
 "Haluatko varmasti luoda varmuuskopion?\n"
 "Paina OK ja odota!"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1493
+#: ../data/
+msgid "Do you want to do a service scan?"
+msgstr "Haluatko tehdä kanavahaun?"
+
+#: ../data/
+msgid "Do you want to do another manual service scan?"
+msgstr "Haluatko tehdä uuden käsinhaun?"
+
+#: ../data/
+msgid "Do you want to enable the parental control feature or your dreambox?"
+msgstr "Haluatko ottaa käyttöön lapsilukon dreamboxissasi?"
+
+#: ../data/
+msgid "Do you want to restore your settings?"
+msgstr "Haluatko palauttaa asetukset?"
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1621
 msgid "Do you want to resume this playback?"
-msgstr ""
+msgstr "Haluatko jatkaa videon toistamista?"
 
-#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:50
-#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:202
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:51
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:213
 msgid ""
 "Do you want to update your Dreambox?\n"
 "After pressing OK, please wait!"
@@ -462,6 +683,10 @@ msgstr ""
 "Haluatko varmasti päivittää Dreamboxin?\n"
 "Paina OK ja odota!"
 
+#: ../data/
+msgid "Do you want to view a tutorial?"
+msgstr "Haluatko katsoa opasohjelman?"
+
 #: ../lib/python/Screens/PluginBrowser.py:21
 msgid "Download Plugins"
 msgstr "Lataa lisäosia"
@@ -470,112 +695,149 @@ msgstr "Lataa lisäosia"
 msgid "Downloadable new plugins"
 msgstr "Uudet ladattavat lisäosat"
 
+#: ../data/
+msgid "Downloadable plugins"
+msgstr "Ladattavat lisäosat"
+
 #: ../lib/python/Screens/PluginBrowser.py:79
 msgid "Downloading plugin information. Please wait..."
 msgstr "Ladataan tietoja lisäosista. Odota..."
 
-#: ../lib/python/Components/Language.py:18
+#: ../lib/python/Components/Language.py:19
 msgid "Dutch"
 msgstr "Hollantilainen"
 
-#: ../lib/python/Screens/ChannelSelection.py:743
+#: ../lib/python/Screens/ChannelSelection.py:768
 msgid "E"
-msgstr ""
+msgstr "E"
+
+#: ../data/
+msgid "EPG Selection"
+msgstr "EPG valinta"
 
 #: ../lib/python/Components/ServiceScan.py:40
 #, python-format
 msgid "ERROR - failed to scan (%s)!"
 msgstr "VIRHE - haku epäonnistui (%s)!"
 
-#: ../lib/python/Components/NimManager.py:709
-#: ../lib/python/Components/NimManager.py:770
+#: ../lib/python/Components/NimManager.py:719
+#: ../lib/python/Components/NimManager.py:790
 msgid "East"
 msgstr "Itä"
 
-#: ../lib/python/Screens/ScanSetup.py:222
-#: ../lib/python/Screens/TimerEdit.py:81 ../lib/python/Components/Lcd.py:31
-#: ../lib/python/Components/SetupDevices.py:38
-#: ../lib/python/Components/SetupDevices.py:39
-#: ../lib/python/Components/SetupDevices.py:43
-#: ../lib/python/Components/SetupDevices.py:44
-#: ../lib/python/Components/SetupDevices.py:45
-#: ../lib/python/Components/SetupDevices.py:46
-#: ../lib/python/Components/SetupDevices.py:47
+#: ../lib/python/Screens/ParentalControlSetup.py:82
+msgid "Edit services list"
+msgstr "Muokkaa palvelulistaa"
+
+#: ../lib/python/Screens/TimerEdit.py:79
 msgid "Enable"
 msgstr "Päälle"
 
-#: ../lib/python/Screens/Satconfig.py:74
+#: ../lib/python/Screens/Satconfig.py:72
 msgid "Enable 5V for active antenna"
 msgstr "Syötä 5V aktiiviselle antennille"
 
-#: ../lib/python/Screens/TimerEntry.py:188
+#: ../data/
+msgid "Enable multiple bouquets"
+msgstr "Käytä useaa kanavanippua"
+
+#: ../lib/python/Screens/ParentalControlSetup.py:64
+msgid "Enable parental control"
+msgstr "Ota lapsilukko käyttöön"
+
+#: ../lib/python/Screens/TimerEntry.py:167
 msgid "End"
 msgstr "Lopeta"
 
-#: ../lib/python/Screens/TimerEntry.py:192
+#: ../lib/python/Screens/TimerEntry.py:174
 msgid "EndTime"
 msgstr "Loppuaika"
 
 #: ../lib/python/Screens/LanguageSelection.py:53
-#: ../lib/python/Components/SetupDevices.py:24
 #: ../lib/python/Components/Language.py:14
+#: ../lib/python/Components/SetupDevices.py:15
 msgid "English"
 msgstr "Englantilainen"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:342
+#: ../lib/python/Screens/InfoBarGenerics.py:345
 msgid "Enter main menu..."
 msgstr "Mene päävalikkoon..."
 
-#: ../lib/python/Components/NimManager.py:683
-msgid "Equal to Socket A"
-msgstr "Kuten Kanta A"
+#: ../lib/python/Screens/ChannelSelection.py:146
+msgid "Enter the service pin"
+msgstr "Syötä palvelun pin-koodi"
+
+#: ../data/
+msgid "Eventview"
+msgstr "Ohjelmatiedot"
+
+#: ../lib/python/Components/Harddisk.py:132
+msgid "Everything is fine"
+msgstr "Kaikki on kunnossa"
 
-#: ../lib/python/Screens/Console.py:41
+#: ../lib/python/Screens/Console.py:43
 msgid "Execution Progress:"
 msgstr "Toimenpiteen edistyminen:"
 
-#: ../lib/python/Screens/Console.py:51
+#: ../lib/python/Screens/Console.py:53
 msgid "Execution finished!!"
 msgstr "Toimenpide valmis!"
 
-#: ../lib/python/Screens/ScanSetup.py:205
-#: ../lib/python/Screens/ScanSetup.py:207
-#: ../lib/python/Screens/ScanSetup.py:237
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:405
-msgid "FEC"
-msgstr ""
+#: ../data/
+msgid "Exit the wizard"
+msgstr "Poistu velhosta"
+
+#: ../data/
+msgid "Exit wizard"
+msgstr "Poistu Velhosta"
+
+#: ../data/
+msgid "Extensions"
+msgstr "Laajennukset"
+
+#: ../lib/python/Screens/ScanSetup.py:201
+#: ../lib/python/Screens/ScanSetup.py:203
+#: ../lib/python/Screens/ScanSetup.py:233
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:404
+msgid "FEC"
+msgstr "FEC"
 
-#: ../lib/python/Screens/Satconfig.py:127
+#: ../lib/python/Screens/Satconfig.py:115
 msgid "Fast DiSEqC"
 msgstr "Nopea DiSEqC"
 
-#: ../lib/python/Screens/ChannelSelection.py:477
+#: ../lib/python/Screens/ChannelSelection.py:500
 msgid "Favourites"
 msgstr "Suosikit"
 
-#: ../lib/python/Components/Language.py:19
+#: ../data/
+msgid "Finetune"
+msgstr "Hienosäädä"
+
+#: ../lib/python/Components/Language.py:20
 msgid "Finnish"
 msgstr "Suomalainen"
 
-#: ../lib/python/Components/Language.py:20
+#: ../lib/python/Components/Language.py:21
 msgid "French"
 msgstr "Ranskalainen"
 
-#: ../lib/python/Screens/ScanSetup.py:200
-#: ../lib/python/Screens/ScanSetup.py:233
-#: ../lib/python/Screens/ScanSetup.py:244
-#: ../lib/python/Screens/TimerEntry.py:160
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:401
+#: ../lib/python/Screens/ScanSetup.py:196
+#: ../lib/python/Screens/ScanSetup.py:229
+#: ../lib/python/Screens/ScanSetup.py:240
+#: ../lib/python/Screens/TimerEntry.py:139
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:400
 msgid "Frequency"
 msgstr "Taajuus"
 
-#: ../lib/python/Screens/EpgSelection.py:235
+#: ../lib/python/Screens/EpgSelection.py:234
+#: ../lib/python/Components/EpgList.py:46
 #: ../lib/python/Components/TimerList.py:34
 msgid "Fri"
 msgstr "Pe"
 
-#: ../lib/python/Screens/TimerEntry.py:112
-#: ../lib/python/Screens/TimerEntry.py:174
+#: ../lib/python/Screens/TimerEntry.py:100
+#: ../lib/python/Screens/TimerEntry.py:153
 msgid "Friday"
 msgstr "Perjantai"
 
@@ -584,11 +846,15 @@ msgstr "Perjantai"
 msgid "Frontprocessor version: %d"
 msgstr "Front -prosessorin versio: %d"
 
-#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:59
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:60
 msgid "Function not yet implemented"
 msgstr "Toiminto ei ole vielä käytössä"
 
-#: ../lib/python/Screens/NetworkSetup.py:45 ../data/
+#: ../data/
+msgid "Games / Plugins"
+msgstr "Pelit / Lisäosat"
+
+#: ../lib/python/Screens/NetworkSetup.py:32 ../data/
 msgid "Gateway"
 msgstr "Yhdyskäytävä"
 
@@ -596,8 +862,8 @@ msgstr "Yhdyskäytävä"
 msgid "Genre:"
 msgstr "Laji:"
 
-#: ../lib/python/Components/SetupDevices.py:24
 #: ../lib/python/Components/Language.py:15
+#: ../lib/python/Components/SetupDevices.py:15
 msgid "German"
 msgstr "Saksalainen"
 
@@ -605,16 +871,16 @@ msgstr "Saksalainen"
 msgid "Getting plugin information. Please wait..."
 msgstr "Haetaan tietoja lisäosista. Odota..."
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:134
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:192
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:133
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:191
 msgid "Goto 0"
-msgstr ""
+msgstr "Goto 0"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:189
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:188
 msgid "Goto position"
 msgstr "Mene sijaintiin"
 
-#: ../lib/python/Screens/ScanSetup.py:252
+#: ../lib/python/Screens/ScanSetup.py:248
 msgid "Guard interval mode"
 msgstr "Suoja-aika asetus"
 
@@ -623,24 +889,40 @@ msgstr "Suoja-aika asetus"
 msgid "Harddisk"
 msgstr "Kiintolevy"
 
-#: ../lib/python/Screens/ScanSetup.py:253
+#: ../data/
+msgid "Harddisk setup"
+msgstr "Kiintolevyn asetukset"
+
+#: ../data/
+msgid "Harddisk standby after"
+msgstr "Kiintolevyn valmiustila"
+
+#: ../lib/python/Screens/ScanSetup.py:249
 msgid "Hierarchy mode"
 msgstr "Hierarkia-tila"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1190
-#: ../lib/python/Screens/InfoBarGenerics.py:1198
+#: ../lib/python/Screens/InfoBarGenerics.py:1315
+#: ../lib/python/Screens/InfoBarGenerics.py:1323
 msgid "How many minutes do you want to record?"
 msgstr "Kuinka monta minuuttia haluat tallentaa?"
 
-#: ../lib/python/Screens/NetworkSetup.py:42 ../data/
+#: ../lib/python/Screens/NetworkSetup.py:29 ../data/
 msgid "IP Address"
 msgstr "IP osoite"
 
-#: ../lib/python/Components/Language.py:21
+#: ../lib/python/Components/Language.py:22
 msgid "Icelandic"
 msgstr "Islantilainen"
 
-#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:29
+#: ../lib/python/Screens/Scart.py:21
+msgid ""
+"If you see this, something is wrong with\n"
+"your scart connection. Press OK to return."
+msgstr ""
+"Jos näet tämän, jotain on väärin\n"
+"scart-liitännässä. Paina OK palataksesi."
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:30
 msgid "Image-Upgrade"
 msgstr "Image-päivitys"
 
@@ -649,14 +931,30 @@ msgid ""
 "In order to record a timer, the TV was switched to the recording service!\n"
 msgstr "Tallennuksen onnistumiseksi, vaihdettiin tallennettavalle kanavalle!\n"
 
-#: ../lib/python/Screens/Satconfig.py:151
+#: ../lib/python/Screens/Satconfig.py:139
 msgid "Increased voltage"
 msgstr "Korotettu jännite"
 
-#: ../lib/python/Screens/Ci.py:313
+#: ../data/
+msgid "InfoBar"
+msgstr "Tietopalkki"
+
+#: ../data/
+msgid "Infobar timeout"
+msgstr "tietopalkin näkyvyys"
+
+#: ../data/
+msgid "Information"
+msgstr "Tietoja"
+
+#: ../lib/python/Screens/Ci.py:295
 msgid "Init"
 msgstr "Alusta"
 
+#: ../data/
+msgid "Initialization..."
+msgstr "Alustetaan..."
+
 #: ../lib/python/Screens/HarddiskSetup.py:33
 msgid "Initialize"
 msgstr "Alusta"
@@ -665,112 +963,189 @@ msgstr "Alusta"
 msgid "Initializing Harddisk..."
 msgstr "Alustetaan kiintolevyä..."
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1100
+#: ../lib/python/Screens/InputBox.py:14 ../data/
+msgid "Input"
+msgstr "Syöttö"
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1225
 msgid "Instant Record..."
 msgstr "Välitön tallennus..."
 
-#: ../lib/python/Screens/ScanSetup.py:201
-#: ../lib/python/Screens/ScanSetup.py:234
-#: ../lib/python/Screens/ScanSetup.py:246
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:402
+#: ../lib/python/Screens/ScanSetup.py:197
+#: ../lib/python/Screens/ScanSetup.py:230
+#: ../lib/python/Screens/ScanSetup.py:242
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:401
 msgid "Inversion"
-msgstr "Käänteinen"
+msgstr "Inversio"
 
-#: ../lib/python/Components/Language.py:22
+#: ../data/
+msgid "Invert display"
+msgstr "käänteinen näyttö"
+
+#: ../lib/python/Components/Language.py:23
 msgid "Italian"
 msgstr "Italialainen"
 
-#: ../lib/python/Screens/Satconfig.py:119
+#: ../data/
+msgid "Keyboard Map"
+msgstr "Näppäimistökartta"
+
+#: ../data/
+msgid "Keyboard Setup"
+msgstr "Näppäimistön asetukset"
+
+#: ../data/
+msgid "Keymap"
+msgstr "Näppäinkartta"
+
+#: ../data/
+msgid "LCD Setup"
+msgstr "LCD asetukset"
+
+#: ../lib/python/Screens/Satconfig.py:107
 msgid "LNB"
-msgstr ""
+msgstr "LNB"
 
-#: ../lib/python/Screens/Satconfig.py:144
+#: ../lib/python/Screens/Satconfig.py:132
 msgid "LOF"
-msgstr ""
+msgstr "LOF"
 
-#: ../lib/python/Screens/Satconfig.py:148
+#: ../lib/python/Screens/Satconfig.py:136
 msgid "LOF/H"
-msgstr ""
+msgstr "LOF/H"
 
-#: ../lib/python/Screens/Satconfig.py:147
+#: ../lib/python/Screens/Satconfig.py:135
 msgid "LOF/L"
-msgstr ""
+msgstr "LOF/L"
 
 #: ../lib/python/Screens/LanguageSelection.py:48 ../data/
 msgid "Language selection"
 msgstr "Kielivalinta"
 
-#: ../lib/python/Screens/Satconfig.py:28
-#: ../lib/python/Screens/Satconfig.py:138 ../data/
+#: ../data/
+msgid "Language..."
+msgstr "Kieli..."
+
+#: ../lib/python/Screens/Satconfig.py:26
+#: ../lib/python/Screens/Satconfig.py:126 ../data/
 msgid "Latitude"
 msgstr "leveysaste"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1264
+#: ../lib/python/Screens/InfoBarGenerics.py:1389
 msgid "Left"
 msgstr "Vasen"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:184
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:183
 msgid "Limit east"
 msgstr "Raja itään"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:183
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:182
 msgid "Limit west"
 msgstr "Raja länteen"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:182
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:181
 msgid "Limits off"
 msgstr "Rajat pois"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:185
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:184
 msgid "Limits on"
 msgstr "Rajat päälle"
 
-#: ../lib/python/Screens/Satconfig.py:26
-#: ../lib/python/Screens/Satconfig.py:136 ../data/
+#: ../lib/python/Screens/Satconfig.py:24
+#: ../lib/python/Screens/Satconfig.py:124 ../data/
 msgid "Longitude"
 msgstr "Pituusaste"
 
-#: ../lib/python/Components/NimManager.py:684
-msgid "Loopthrough to Socket A"
-msgstr "Läpisyöttö kytkentään A"
+#: ../data/
+msgid "MORE"
+msgstr "LISÄÄ"
+
+#: ../data/
+msgid "Main menu"
+msgstr "Päävalikko"
+
+#: ../data/
+msgid "Mainmenu"
+msgstr "Päävalikko"
+
+#: ../data/
+msgid "Manual Scan"
+msgstr "Käsinhaku"
 
 #: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:421
 msgid "Manual transponder"
 msgstr "Manuaalinen transponderi"
 
+#: ../data/
+msgid "Margin after record"
+msgstr "Lisäaika tallenteen loppuun (minuuttia)"
+
+#: ../data/
+msgid "Margin before record (minutes)"
+msgstr "Lisäaika tallenteen alkuun (minuuttia)"
+
+#: ../data/
+msgid "Media player"
+msgstr "Mediasoitin"
+
+#: ../data/
+msgid "MediaPlayer"
+msgstr "Mediasoitin"
+
+#: ../data/
+msgid "Menu"
+msgstr "Valikko"
+
+#: ../data/
+msgid "Message"
+msgstr "Viesti"
+
+#: ../lib/python/Components/Harddisk.py:132
+msgid "Mkfs failed"
+msgstr "Mkfs epäonnistui"
+
 #: ../lib/python/Screens/HarddiskSetup.py:29
 msgid "Model: "
 msgstr "Malli:"
 
-#: ../lib/python/Screens/ScanSetup.py:208
-#: ../lib/python/Screens/ScanSetup.py:236
-#: ../lib/python/Screens/ScanSetup.py:250
+#: ../lib/python/Screens/ScanSetup.py:204
+#: ../lib/python/Screens/ScanSetup.py:232
+#: ../lib/python/Screens/ScanSetup.py:246
 msgid "Modulation"
 msgstr "Modulaatio"
 
-#: ../lib/python/Screens/EpgSelection.py:235
+#: ../data/
+msgid "Modulator"
+msgstr "Modulaattori"
+
+#: ../lib/python/Screens/EpgSelection.py:234
+#: ../lib/python/Components/EpgList.py:46
 #: ../lib/python/Components/TimerList.py:34
 msgid "Mon"
 msgstr "Ma"
 
-#: ../lib/python/Screens/TimerEntry.py:104
+#: ../lib/python/Screens/TimerEntry.py:92
 msgid "Mon-Fri"
 msgstr "Ma-Pe"
 
-#: ../lib/python/Screens/TimerEntry.py:112
-#: ../lib/python/Screens/TimerEntry.py:170
+#: ../lib/python/Screens/TimerEntry.py:100
+#: ../lib/python/Screens/TimerEntry.py:149
 msgid "Monday"
 msgstr "Maanantai"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1046
+#: ../lib/python/Components/Harddisk.py:132
+msgid "Mount failed"
+msgstr "Liittäminen epäonnistui"
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1184
 msgid "Move Picture in Picture"
 msgstr "Siirrä Kuva Kuvassa-toimintoa"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:175
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:174
 msgid "Move east"
 msgstr "Liikuta itään"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:172
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:171
 msgid "Move west"
 msgstr "Liikuta länteen"
 
@@ -782,103 +1157,143 @@ msgstr "Elokuvavalikko"
 msgid "Multi EPG"
 msgstr "Moni EPG"
 
-#: ../lib/python/Screens/Ci.py:324
+#: ../lib/python/Screens/Ci.py:306
 msgid "Multiple service support"
 msgstr "Usean palvelun tuki"
 
-#: ../lib/python/Screens/ScanSetup.py:343
+#: ../lib/python/Screens/ScanSetup.py:338
 msgid "Multisat"
 msgstr "Usea satelliitti"
 
-#: ../lib/python/Components/NimManager.py:499
+#: ../data/
+msgid "Mute"
+msgstr "Mykistä"
+
+#: ../lib/python/Components/NimManager.py:488
 msgid "N/A"
 msgstr "Ei saatavilla"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:486
+#: ../data/
+msgid "NEXT"
+msgstr "SEURAAVA"
+
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:491
 msgid "NIM "
-msgstr ""
+msgstr "NIM"
 
-#: ../lib/python/Screens/TimerEntry.py:150
+#: ../data/
+msgid "NOW"
+msgstr "NYT"
+
+#: ../lib/python/Components/AVSwitch.py:92
+msgid "NTSC"
+msgstr "NTSC"
+
+#: ../lib/python/Screens/TimerEntry.py:129
 msgid "Name"
 msgstr "Nimi"
 
-#: ../lib/python/Screens/NetworkSetup.py:46 ../data/
+#: ../lib/python/Screens/NetworkSetup.py:33 ../data/
 msgid "Nameserver"
 msgstr "Nimipalvelin"
 
-#: ../lib/python/Screens/NetworkSetup.py:44 ../data/
+#: ../lib/python/Screens/NetworkSetup.py:31 ../data/
 msgid "Netmask"
 msgstr "Verkkomaski"
 
-#: ../lib/python/Screens/ScanSetup.py:238
-#: ../lib/python/Screens/ScanSetup.py:245
+#: ../data/
+msgid "Network Setup"
+msgstr "Verkkoasetukset"
+
+#: ../lib/python/Screens/ScanSetup.py:234
+#: ../lib/python/Screens/ScanSetup.py:241
 msgid "Network scan"
 msgstr "Verkkohaku"
 
-#: ../lib/python/Screens/ChannelSelection.py:727
+#: ../data/
+msgid "Network setup"
+msgstr "Verkkoasetukset"
+
+#: ../data/
+msgid "Network..."
+msgstr "Verkko..."
+
+#: ../lib/python/Screens/ChannelSelection.py:752
 msgid "New"
 msgstr "Uusi"
 
+#: ../lib/python/Screens/ParentalControlSetup.py:218
+msgid "New pin"
+msgstr "uusi pin"
+
 #: ../lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/plugin.py:33
 msgid "New version:"
 msgstr "Uusi versio:"
 
-#: ../lib/python/Screens/EpgSelection.py:46
+#: ../lib/python/Screens/EpgSelection.py:45
 msgid "Next"
 msgstr "Seuraava"
 
-#: ../lib/python/Screens/Ci.py:24 ../lib/python/Components/NimManager.py:739
-#: ../lib/python/Components/NimManager.py:759
-#: ../lib/python/Components/NimManager.py:763
-#: ../lib/python/Components/NimManager.py:764
-#: ../lib/python/Components/NimManager.py:773
+#: ../lib/python/Screens/Ci.py:22 ../data/
 msgid "No"
 msgstr "Ei"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1210
+#: ../lib/python/Screens/InfoBarGenerics.py:1335
 msgid "No HDD found or HDD not initialized!"
 msgstr ""
 "Kiintolevyä ei löydy tai\n"
 "kiintolevy alustamaton."
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1143
+#: ../data/
+msgid "No backup needed"
+msgstr "Varmuuskopiota ei tarvitse"
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1268
 msgid "No event info found, recording indefinitely."
 msgstr "Ohjelmatietoa ei löydy, tallennetaan ilman ohjelmatietoja."
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:503
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:508
 msgid "No positioner capable frontend found."
 msgstr "Ei löytynyt moottoria ymmärtävää frontendiä."
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:518
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:523
 msgid "No tuner is configured for use with a diseqc positioner!"
 msgstr "Yhtään viritintä ei ole määritetty käyttämään diseqc-moottoria!"
 
-#: ../lib/python/Screens/ScanSetup.py:368
-#: ../lib/python/Screens/ScanSetup.py:376
-#: ../lib/python/Screens/ScanSetup.py:391
-#: ../lib/python/Components/NimManager.py:743
-#: ../lib/python/Components/NimManager.py:747
-#: ../lib/python/Components/NimManager.py:760
-#: ../lib/python/Components/NimManager.py:761
-#: ../lib/python/Components/NimManager.py:768
+#: ../data/
+msgid "No, do nothing."
+msgstr "Ei, älä tee mitään."
+
+#: ../data/
+msgid "No, just start my dreambox"
+msgstr "Ei, käynnistä vain Dreambox"
+
+#: ../data/
+msgid "No, scan later manually"
+msgstr "Ei, hae myöhemmin käsin"
+
+#: ../lib/python/Screens/ScanSetup.py:363
+#: ../lib/python/Screens/ScanSetup.py:371
+#: ../lib/python/Screens/ScanSetup.py:386
+#: ../lib/python/Components/NimManager.py:755
+#: ../lib/python/Components/NimManager.py:759
+#: ../lib/python/Components/NimManager.py:773
+#: ../lib/python/Components/NimManager.py:774
+#: ../lib/python/Components/NimManager.py:788
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../lib/python/Components/NimManager.py:711
-#: ../lib/python/Components/NimManager.py:772
+#: ../lib/python/Components/NimManager.py:721
+#: ../lib/python/Components/NimManager.py:792
 msgid "North"
 msgstr "Pohjoinen"
 
-#: ../lib/python/Components/Language.py:23
+#: ../lib/python/Components/Language.py:24
 msgid "Norwegian"
 msgstr "Norjalainen"
 
-#: ../lib/python/Components/NimManager.py:685
-msgid "Nothing connected"
-msgstr "Ei kytketty"
-
-#: ../lib/python/Screens/ScanSetup.py:568
-#: ../lib/python/Screens/ScanSetup.py:633
+#: ../lib/python/Screens/ScanSetup.py:559
+#: ../lib/python/Screens/ScanSetup.py:669
 msgid ""
 "Nothing to scan!\n"
 "Please setup your tuner settings before you start a service scan."
@@ -886,62 +1301,116 @@ msgstr ""
 "Ei mitään haettavaa!\n"
 "Määritä virittimen asetukset ennen kanavahakua."
 
-#: ../lib/python/Screens/Setup.py:86 ../lib/python/Screens/TimerEntry.py:24
-#: ../lib/python/Screens/TimeDateInput.py:15
+#: ../data/
+msgid "Now Playing"
+msgstr "Nyt Soi"
+
+#: ../lib/python/Screens/Setup.py:84 ../lib/python/Screens/TimeDateInput.py:15
+#: ../lib/python/Screens/TimerEntry.py:28
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:74
 msgid "OK"
 msgstr "OK"
 
-#: ../lib/python/Components/NimManager.py:738
-#: ../lib/python/Components/NimManager.py:782
+#: ../data/
+msgid "OK, guide me through the upgrade process"
+msgstr "OK, opasta päivityksessä"
+
+#: ../data/
+msgid "OSD Settings"
+msgstr "OSD asetukset"
+
+#: ../lib/python/Components/NimManager.py:750
 msgid "Off"
 msgstr "Pois"
 
-#: ../lib/python/Components/NimManager.py:738
-#: ../lib/python/Components/NimManager.py:782
+#: ../lib/python/Components/NimManager.py:750
 msgid "On"
 msgstr "Päällä"
 
-#: ../lib/python/Components/NimManager.py:768
+#: ../lib/python/Components/NimManager.py:788
 msgid "One"
 msgstr "Yksi"
 
-#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:30
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:31
 msgid "Online-Upgrade"
 msgstr "Online-päivitys"
 
-#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:34
+#: ../lib/python/Components/AVSwitch.py:92
+msgid "PAL"
+msgstr "PAL"
+
+#: ../lib/python/Screens/ServiceInfo.py:79
+msgid "PIDs"
+msgstr "PID:it"
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:35
 msgid "Packet management"
 msgstr "Pakettienhallinta"
 
-#: ../lib/python/Screens/InfoBar.py:47
+#: ../lib/python/Components/ParentalControl.py:80 ../data/
+msgid "Parental control"
+msgstr "Lapsilukko"
+
+#: ../data/
+msgid "Parental control services Editor"
+msgstr "Lapsilukon palvelueditori"
+
+#: ../data/
+msgid "Parental control setup"
+msgstr "Lapsilukon asetukset"
+
+#: ../lib/python/Screens/ParentalControlSetup.py:74
+msgid "Parental control type"
+msgstr "Lapsilukon tyyppi"
+
+#: ../data/
+msgid "PiPSetup"
+msgstr "PiP-Asetukset"
+
+#: ../data/
+msgid "Pin code needed"
+msgstr "Tarvitaan pin-koodi"
+
+#: ../lib/python/Screens/InfoBar.py:48
 msgid "Play recorded movies..."
 msgstr "Toista tallennetut elokuvat..."
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1055
+#: ../lib/python/Screens/InfoBarGenerics.py:1099
 msgid "Please choose an extension..."
 msgstr "Valitse laajennus..."
 
-#: ../lib/python/Screens/ChannelSelection.py:126
+#: ../lib/python/Screens/ChannelSelection.py:134
 msgid "Please enter a name for the new bouquet"
 msgstr "Anna uuden kanavanipun nimi"
 
-#: ../lib/python/Screens/ChannelSelection.py:160
+#: ../lib/python/Screens/ChannelSelection.py:183
 msgid "Please enter a name for the new marker"
 msgstr "Anna nimi uudelle merkille"
 
-#: ../lib/python/Screens/TimerEntry.py:320
+#: ../lib/python/Screens/ParentalControlSetup.py:28
+msgid "Please enter the correct pin code"
+msgstr "Syötä oikea pin-koodi"
+
+#: ../lib/python/Screens/ParentalControlSetup.py:232
+msgid "Please enter the old pin code"
+msgstr "Syötä vanha pin-koodi"
+
+#: ../lib/python/Screens/TimerEntry.py:289
 msgid "Please select a subservice to record..."
 msgstr "Valitse tallennettava alipalvelu..."
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1361
-#: ../lib/python/Screens/SubservicesQuickzap.py:90
+#: ../lib/python/Screens/InfoBarGenerics.py:1487
+#: ../lib/python/Screens/SubservicesQuickzap.py:97
 msgid "Please select a subservice..."
 msgstr "Valitse alipalvelu..."
 
-#: ../lib/python/Screens/PiPSetup.py:41
-msgid ""
-"Please use direction keys to move the PiP window.\n"
+#: ../data/
+msgid "Please set up tuner B"
+msgstr "Aseta viritin B."
+
+#: ../lib/python/Screens/PiPSetup.py:41
+msgid ""
+"Please use direction keys to move the PiP window.\n"
 "Press Bouquet +/- to resize the window.\n"
 "Press OK to go back to the TV mode or EXIT to cancel the moving."
 msgstr ""
@@ -953,92 +1422,140 @@ msgstr ""
 msgid "Please wait... Loading list..."
 msgstr "Odota... Listaa noudetaan..."
 
-#: ../lib/python/Screens/ScanSetup.py:203
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:404
+#: ../data/
+msgid "Plugin browser"
+msgstr "Lisäosien selaus"
+
+#: ../lib/python/Screens/ScanSetup.py:199
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:403
 msgid "Polarity"
 msgstr "Polariteetti"
 
-#: ../lib/python/Components/NimManager.py:737
+#: ../lib/python/Components/NimManager.py:749
 msgid "Polarization"
 msgstr "Polarisaatio"
 
-#: ../lib/python/Screens/Satconfig.py:15
+#: ../lib/python/Screens/Satconfig.py:13
 msgid "Port A"
 msgstr "Portti A"
 
-#: ../lib/python/Screens/Satconfig.py:18
+#: ../lib/python/Screens/Satconfig.py:16
 msgid "Port B"
 msgstr "Portti B"
 
-#: ../lib/python/Screens/Satconfig.py:20
+#: ../lib/python/Screens/Satconfig.py:18
 msgid "Port C"
 msgstr "Portti C"
 
-#: ../lib/python/Screens/Satconfig.py:21
+#: ../lib/python/Screens/Satconfig.py:19
 msgid "Port D"
 msgstr "Portti D"
 
-#: ../lib/python/Components/NimManager.py:702
+#: ../lib/python/Components/NimManager.py:706
 msgid "Positioner"
 msgstr "Moottori"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:131
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:130
 msgid "Positioner fine movement"
 msgstr "Moottorin hidas liikutus"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:130
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:129
 msgid "Positioner movement"
 msgstr "Moottorin liikutus"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:133
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:132
 msgid "Positioner storage"
 msgstr "Moottorin muisti"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:421
-msgid "Predefined satellite"
-msgstr "Ennalta määritelty satelliitti"
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:422
+msgid "Predefined transponder"
+msgstr "Ennalta määritelty transponderi"
 
-#: ../lib/python/Screens/NetworkSetup.py:35
+#: ../lib/python/Screens/NetworkSetup.py:22
 msgid "Press OK to activate the settings."
 msgstr "Paina OK aktivoidaksesi asetukset."
 
-#: ../lib/python/Screens/ScanSetup.py:703
+#: ../lib/python/Screens/ScanSetup.py:604
 msgid "Press OK to scan"
 msgstr "Paina OK skannataksesi"
 
-#: ../lib/python/Screens/ScanSetup.py:160
+#: ../lib/python/Screens/ScanSetup.py:157
 msgid "Press OK to start the scan"
 msgstr "Paina OK aloittaaksesi skannauksen"
 
-#: ../lib/python/Screens/EpgSelection.py:45
+#: ../lib/python/Screens/EpgSelection.py:44
 msgid "Prev"
 msgstr "Edellinen"
 
-#: ../lib/python/Screens/ChannelSelection.py:476
-#: ../lib/python/Screens/ChannelSelection.py:618
+#: ../lib/python/Screens/ParentalControlSetup.py:72
+msgid "Protect services"
+msgstr "Suojaa palvelut"
+
+#: ../lib/python/Screens/ParentalControlSetup.py:68
+msgid "Protect setup"
+msgstr "Suojaa asetukset"
+
+#: ../lib/python/Screens/ChannelSelection.py:499
+#: ../lib/python/Screens/ChannelSelection.py:643
 msgid "Provider"
 msgstr "Toimittaja"
 
-#: ../lib/python/Screens/ChannelSelection.py:725
+#: ../lib/python/Screens/ChannelSelection.py:750
 msgid "Providers"
 msgstr "Toimittajat"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1357
+#: ../lib/python/Components/NimManager.py:797
+msgid "Quick"
+msgstr "Nopea"
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1483
 msgid "Quickzap"
-msgstr ""
+msgstr "Pikavaihto"
+
+#: ../data/
+msgid "RC Menu"
+msgstr "Kauko-ohjaimen valikko"
+
+#: ../data/
+msgid "RF output"
+msgstr "RF-ulostulo"
+
+#: ../lib/python/Components/AVSwitch.py:77
+msgid "RGB"
+msgstr "RGB"
+
+#: ../lib/python/Screens/Setup.py:145
+msgid "Really close without saving settings?"
+msgstr "Haluatko varmasti poistua tallentamatta asetuksia?"
 
-#: ../lib/python/Screens/TimerEdit.py:107
+#: ../lib/python/Screens/TimerEdit.py:105
 msgid "Really delete done timers?"
 msgstr "Poistetaanko menneet ajastukset?"
 
-#: ../lib/python/Screens/SubservicesQuickzap.py:101
+#: ../lib/python/Screens/TimerEdit.py:113
+msgid "Really delete this timer?"
+msgstr "Tuhoa tämä ajastus?"
+
+#: ../lib/python/Screens/SubservicesQuickzap.py:108
 msgid "Really exit the subservices quickzap?"
-msgstr ""
+msgstr "Poistu alipalveluiden pikavaihdosta?"
+
+#: ../data/
+msgid "Record"
+msgstr "Tallenna"
 
 #: ../lib/python/Screens/EventView.py:74
 msgid "Recording"
 msgstr "Tallennetaan"
 
+#: ../data/
+msgid "Recordings always have priority"
+msgstr "Tallennuksilla on aina etuoikeus"
+
+#: ../lib/python/Screens/ParentalControlSetup.py:219
+msgid "Reenter new pin"
+msgstr "Syötä uudelleen uusi pin-koodi"
+
 #: ../lib/python/Screens/PluginBrowser.py:20
 msgid "Remove Plugins"
 msgstr "Poista lisäosia"
@@ -1047,100 +1564,185 @@ msgstr "Poista lisäosia"
 msgid "Remove plugins"
 msgstr "Poista lisäosia"
 
-#: ../lib/python/Screens/TimerEntry.py:154
+#: ../data/
+msgid "Repeat"
+msgstr "Toista"
+
+#: ../lib/python/Screens/TimerEntry.py:133
 msgid "Repeat Type"
 msgstr "Toiston tyyppi"
 
-#: ../lib/python/Screens/MediaPlayer.py:347
+#: ../lib/python/Screens/MediaPlayer.py:390
 msgid "Replace current playlist"
 msgstr "Korvaa nykyinen soittolista"
 
-#: ../lib/python/Screens/Ci.py:312
+#: ../lib/python/Screens/Ci.py:294
 msgid "Reset"
 msgstr "Resetoi"
 
+#: ../data/
+msgid "Restart"
+msgstr "Uudelleenkäynnistä"
+
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:77
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:166
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:167
 msgid "Restore"
 msgstr "Palauta"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1264
+#: ../data/
+msgid ""
+"Restoring the settings is done. Please press OK to activate the restored "
+"settings now."
+msgstr ""
+"Asetusten palautus on valmis. Paina OK ottaaksesi palautetut asetukset "
+"käyttöön."
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1389
 msgid "Right"
 msgstr "Oikea"
 
-#: ../lib/python/Screens/EpgSelection.py:235
+#: ../lib/python/Components/AVSwitch.py:77
+msgid "S-Video"
+msgstr "S-Video"
+
+#: ../data/
+msgid "SNR:"
+msgstr "SNR:"
+
+#: ../lib/python/Screens/EpgSelection.py:234
+#: ../lib/python/Components/EpgList.py:46
 #: ../lib/python/Components/TimerList.py:34
 msgid "Sat"
 msgstr "La"
 
-#: ../lib/python/Screens/ScanSetup.py:199
-#: ../lib/python/Screens/ScanSetup.py:212
-#: ../lib/python/Screens/Satconfig.py:13 ../lib/python/Screens/Satconfig.py:63
-#: ../lib/python/Screens/Satconfig.py:157
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:398
+#: ../data/
+msgid "Sat / Dish Setup"
+msgstr "Antenniasetukset"
+
+#: ../data/
+msgid "Satconfig"
+msgstr "Satelliittiasetukset"
+
+#: ../lib/python/Screens/Satconfig.py:11 ../lib/python/Screens/Satconfig.py:61
+#: ../lib/python/Screens/Satconfig.py:145
+#: ../lib/python/Screens/ScanSetup.py:195
+#: ../lib/python/Screens/ScanSetup.py:208
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:397
 msgid "Satellite"
 msgstr "Satelliitti"
 
-#: ../lib/python/Screens/ChannelSelection.py:475
-#: ../lib/python/Screens/ChannelSelection.py:620
+#: ../lib/python/Screens/ChannelSelection.py:498
+#: ../lib/python/Screens/ChannelSelection.py:645
 msgid "Satellites"
 msgstr "Satelliitit"
 
-#: ../lib/python/Screens/TimerEntry.py:112
-#: ../lib/python/Screens/TimerEntry.py:175
+#: ../lib/python/Screens/TimerEntry.py:100
+#: ../lib/python/Screens/TimerEntry.py:154
 msgid "Saturday"
 msgstr "Lauantai"
 
-#: ../lib/python/Screens/ScanSetup.py:695
-#: ../lib/python/Screens/ScanSetup.py:699
+#: ../lib/python/Screens/ScanSetup.py:595
+#: ../lib/python/Screens/ScanSetup.py:600
 msgid "Scan NIM"
 msgstr "Skannaa NIM"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:174
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:173
 msgid "Search east"
 msgstr "Etsintä itään"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:173
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:172
 msgid "Search west"
 msgstr "Etsintä länteen"
 
-#: ../lib/python/Components/NimManager.py:686
-msgid "Secondary cable from motorized LNB"
-msgstr "Toinen kaapeli moottorisoidulta mikropäältä"
+#: ../data/
+msgid "Seek"
+msgstr "Etsi"
+
+#: ../data/
+msgid "Select HDD"
+msgstr "Valitse kiintolevy"
+
+#: ../data/
+msgid "Select a movie"
+msgstr "Valitse elokuva"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1276
+#: ../lib/python/Screens/InfoBarGenerics.py:1401
 msgid "Select audio mode"
 msgstr "Valitse äänimuoto"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1265
+#: ../lib/python/Screens/InfoBarGenerics.py:1390
 msgid "Select audio track"
 msgstr "Valitse ääniraita"
 
-#: ../lib/python/Screens/TimerEntry.py:237
+#: ../lib/python/Screens/TimerEntry.py:210
 msgid "Select channel to record from"
 msgstr "Valitse tallennettava kanava"
 
-#: ../lib/python/Screens/Satconfig.py:128
+#: ../lib/python/Screens/Satconfig.py:116
 msgid "Sequence repeat"
 msgstr "Vaiheen toisto"
 
-#: ../lib/python/Screens/ChannelSelection.py:729
+#: ../data/
+msgid "Service"
+msgstr "Kanava"
+
+#: ../data/
+msgid "Service Scan"
+msgstr "Kanavahaku"
+
+#: ../data/
+msgid "Service Searching"
+msgstr "Kanavahaku"
+
+#: ../data/
+msgid "Service scan"
+msgstr "Kanavahaku"
+
+#: ../lib/python/Screens/Satconfig.py:67
+msgid "Service scan type needed"
+msgstr "Tarvitaan palveluhaun tyyppi"
+
+#: ../lib/python/Screens/ServiceInfo.py:78 ../data/
+msgid "Serviceinfo"
+msgstr "Kanavatieto"
+
+#: ../lib/python/Screens/ChannelSelection.py:754
 msgid "Services"
 msgstr "Kanavat"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:132
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:131
 msgid "Set limits"
 msgstr "Aseta rajat"
 
-#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:35
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:36
 msgid "Settings"
 msgstr "Asetukset"
 
-#: ../lib/python/Screens/InfoBar.py:48
+#: ../data/
+msgid "Setup"
+msgstr "Käyttöasetukset"
+
+#: ../data/
+msgid "Show infobar on channel change"
+msgstr "Näytä tietopalkki kanavanvaihdossa"
+
+#: ../data/
+msgid "Show infobar on skip forward/backward"
+msgstr "Näytä tietopalkki hypätessä ed./seur."
+
+#: ../data/
+msgid "Show positioner movement"
+msgstr "Näytä moottorin liikkuminen"
+
+#: ../lib/python/Screens/ParentalControlSetup.py:197
+msgid "Show services beginning with"
+msgstr "Näytä palvelut jotka alkavat"
+
+#: ../lib/python/Screens/InfoBar.py:49
 msgid "Show the radio player..."
 msgstr "Näytä radiosoitin..."
 
-#: ../lib/python/Screens/InfoBar.py:49
+#: ../lib/python/Screens/InfoBar.py:50
 msgid "Show the tv player..."
 msgstr "Näytä tv..."
 
@@ -1152,11 +1754,6 @@ msgstr "Samanlainen"
 msgid "Similar broadcasts:"
 msgstr "Samantyyliset lähetykset:"
 
-#: ../lib/python/Components/NimManager.py:680
-#: ../lib/python/Components/NimManager.py:687
-msgid "Simple"
-msgstr "Yksinkertainen"
-
 #: ../lib/python/Components/NimManager.py:702
 msgid "Single"
 msgstr "Yksi"
@@ -1165,24 +1762,28 @@ msgstr "Yksi"
 msgid "Single EPG"
 msgstr "Yksi EPG"
 
-#: ../lib/python/Screens/ScanSetup.py:343
+#: ../lib/python/Screens/ScanSetup.py:338
 msgid "Single satellite"
 msgstr "Yksi satelliitti"
 
-#: ../lib/python/Screens/ScanSetup.py:343
-#: ../lib/python/Screens/ScanSetup.py:344
-#: ../lib/python/Screens/ScanSetup.py:345
+#: ../lib/python/Screens/ScanSetup.py:338
+#: ../lib/python/Screens/ScanSetup.py:339
+#: ../lib/python/Screens/ScanSetup.py:340
 msgid "Single transponder"
 msgstr "Yksi lähetin"
 
-#: ../lib/python/Components/NimManager.py:715
+#: ../lib/python/Components/NimManager.py:725
 msgid "Slot "
 msgstr "Lukija"
 
-#: ../lib/python/Components/NimManager.py:568
+#: ../lib/python/Components/NimManager.py:557
 msgid "Socket "
 msgstr "Pistoke"
 
+#: ../data/
+msgid "Somewhere else"
+msgstr "Jossakin muualla"
+
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:149
 msgid ""
 "Sorry your Backup destination does not exist\n"
@@ -1193,208 +1794,353 @@ msgstr ""
 "\n"
 "Valitse uusi kohde."
 
-#: ../lib/python/Components/NimManager.py:711
-#: ../lib/python/Components/NimManager.py:772
+#: ../data/
+msgid "Sound"
+msgstr "Ääni"
+
+#: ../data/
+msgid "Soundcarrier"
+msgstr "Äänenkantoaalto"
+
+#: ../lib/python/Components/NimManager.py:721
+#: ../lib/python/Components/NimManager.py:792
 msgid "South"
 msgstr "Etelä"
 
-#: ../lib/python/Components/Language.py:24
+#: ../lib/python/Components/Language.py:25
 msgid "Spanish"
 msgstr "Espanjalainen"
 
-#: ../lib/python/Screens/TimerEntry.py:182
+#: ../data/
+msgid "Standby"
+msgstr "Valmiustila"
+
+#: ../data/
+msgid "Standby / Restart"
+msgstr "Valmiustila / Käynnistys"
+
+#: ../lib/python/Screens/TimerEntry.py:160
 msgid "Start"
 msgstr "Aloita"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1216
+#: ../lib/python/Screens/InfoBarGenerics.py:1341
 msgid "Start recording?"
 msgstr "Aloita tallennus?"
 
-#: ../lib/python/Screens/TimerEntry.py:185
+#: ../lib/python/Screens/TimerEntry.py:165
 msgid "StartTime"
 msgstr "Aloitusaika"
 
-#: ../lib/python/Screens/Wizard.py:230
+#: ../data/
+msgid "Startwizard"
+msgstr "Käynnistysvelho"
+
+#: ../lib/python/Screens/Wizard.py:232
 msgid "Step "
 msgstr "Askel"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:179
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:178
 msgid "Step east"
 msgstr "Askel itään"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:178
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:177
 msgid "Step west"
 msgstr "Askel länteen"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1264
+#: ../lib/python/Screens/InfoBarGenerics.py:1389
 msgid "Stereo"
 msgstr "Stereo"
 
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:166
 #: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:167
 #: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:168
 #: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:169
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:170
 msgid "Stop"
 msgstr "Pysäytä"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:955
+#: ../lib/python/Screens/InfoBarGenerics.py:969
 msgid "Stop Timeshift?"
 msgstr "Pysäytä aikasiirto?"
 
-#: ../lib/python/Screens/InfoBar.py:111
+#: ../lib/python/Screens/InfoBar.py:113
 msgid "Stop playing this movie?"
 msgstr "Pysäytä elokuvan toistaminen?"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:188
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:187
 msgid "Store position"
 msgstr "Tallenna sijainti"
 
-#: ../lib/python/Screens/Satconfig.py:116
+#: ../lib/python/Screens/Satconfig.py:104
 msgid "Stored position"
 msgstr "Tallennettu sijainti"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1295
+#: ../lib/python/Screens/InfoBarGenerics.py:1419
 msgid "Subservice list..."
 msgstr "Alipalvelulista..."
 
-#: ../lib/python/Screens/EpgSelection.py:235
+#: ../data/
+msgid "Subservices"
+msgstr "Alipalvelut"
+
+#: ../lib/python/Screens/EpgSelection.py:234
+#: ../lib/python/Components/EpgList.py:46
 #: ../lib/python/Components/TimerList.py:34
 msgid "Sun"
 msgstr "Su"
 
-#: ../lib/python/Screens/TimerEntry.py:112
-#: ../lib/python/Screens/TimerEntry.py:176
+#: ../lib/python/Screens/TimerEntry.py:100
+#: ../lib/python/Screens/TimerEntry.py:155
 msgid "Sunday"
 msgstr "Sunnuntai"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1047
-msgid "Swap services"
+#: ../lib/python/Screens/InfoBarGenerics.py:1181
+msgid "Swap Services"
 msgstr "Vaihda palveluita"
 
-#: ../lib/python/Components/Language.py:25
+#: ../lib/python/Components/Language.py:26
 msgid "Swedish"
 msgstr "Ruotsalainen"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1300
+#: ../lib/python/Screens/InfoBarGenerics.py:1424
 msgid "Switch to next subservice"
 msgstr "Vaihda seuraavaan alipalveluun"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1301
+#: ../lib/python/Screens/InfoBarGenerics.py:1425
 msgid "Switch to previous subservice"
 msgstr "Vaihda edelliseen alipalveluun"
 
-#: ../lib/python/Screens/ScanSetup.py:202
-#: ../lib/python/Screens/ScanSetup.py:235
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:403
+#: ../lib/python/Screens/ScanSetup.py:198
+#: ../lib/python/Screens/ScanSetup.py:231
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:402
 msgid "Symbol Rate"
 msgstr "Symboolinopeus"
 
-#: ../lib/python/Screens/ChannelSelection.py:737
+#: ../data/
+msgid "System"
+msgstr "Järjestelmä"
+
+#: ../data/
+msgid "TV System"
+msgstr "TV järjestelmä"
+
+#: ../lib/python/Screens/ChannelSelection.py:762
 msgid "Terrestrial"
 msgstr "Maanpäällinen"
 
-#: ../lib/python/Screens/Satconfig.py:73
+#: ../lib/python/Screens/Satconfig.py:71
 msgid "Terrestrial provider"
 msgstr "Terrestiaalioperaattori"
 
-#: ../lib/python/Components/NimManager.py:768
+#: ../data/
+msgid "Test mode"
+msgstr "Testitila"
+
+#: ../data/
+msgid ""
+"Thank you for using the wizard. Your box is now ready to use.\n"
+"Please press OK to start using you Dreambox."
+msgstr ""
+"Kiitos velhon käyttämisestä. Laitteesi on nyt käyttövalmis.\n"
+"Paina OK aloittaaksesi käytön."
+
+#: ../data/
+msgid "The backup failed. Please choose a different backup location."
+msgstr "Varmuuskopiointi epäonnistui. Valitse toinen varmuuskopiontipaikka."
+
+#: ../lib/python/Screens/ParentalControlSetup.py:251
+msgid "The pin code has been changed successfully."
+msgstr "Pin-koodi on vaihdettu."
+
+#: ../lib/python/Screens/ChannelSelection.py:153
+#: ../lib/python/Screens/ParentalControlSetup.py:40
+#: ../lib/python/Components/ParentalControl.py:141
+msgid "The pin code you entered is wrong."
+msgstr "Syöttämäsi pin-koodi on väärin."
+
+#: ../lib/python/Screens/ParentalControlSetup.py:253
+msgid "The pin codes you entered are different."
+msgstr "Syöttämäsi pin-koodit eroavat toisistaan."
+
+#: ../data/
+msgid ""
+"The wizard can backup your current settings. Do you want to do a backup now?"
+msgstr ""
+"Velho voi kopioida nykyiset asetuksesi. Haluatko varmuuskopioida asetukset "
+"nyt?"
+
+#: ../data/
+msgid "The wizard is finished now."
+msgstr "Velho on lopettanut."
+
+#: ../data/
+msgid "This is step number 2."
+msgstr "Tämä on vaihe 2."
+
+#: ../data/
+msgid "This is unsupported at the moment."
+msgstr "Tätä ei tällä hetkellä tueta."
+
+#: ../lib/python/Components/NimManager.py:788
 msgid "Three"
 msgstr "Kolme"
 
-#: ../lib/python/Screens/Satconfig.py:149
+#: ../lib/python/Screens/Satconfig.py:137
 msgid "Threshold"
 msgstr "Kynnys"
 
-#: ../lib/python/Screens/EpgSelection.py:235
+#: ../lib/python/Screens/EpgSelection.py:234
+#: ../lib/python/Components/EpgList.py:46
 #: ../lib/python/Components/TimerList.py:34
 msgid "Thu"
 msgstr "To"
 
-#: ../lib/python/Screens/TimerEntry.py:112
-#: ../lib/python/Screens/TimerEntry.py:173
+#: ../lib/python/Screens/TimerEntry.py:100
+#: ../lib/python/Screens/TimerEntry.py:152
 msgid "Thursday"
 msgstr "Torstai"
 
-#: ../lib/python/Screens/TimeDateInput.py:55
+#: ../lib/python/Screens/TimeDateInput.py:41
 msgid "Time"
 msgstr "Aika"
 
-#: ../lib/python/Screens/TimerEntry.py:152
-msgid "Timer Type"
-msgstr "Ajastimen tyyppi"
-
-#: ../lib/python/Screens/MediaPlayer.py:49
-msgid "Title:"
-msgstr "Otsikko:"
+#: ../data/
+msgid "Time/Date Input"
+msgstr "Aika/Päivä "
 
-#: ../lib/python/Screens/EpgSelection.py:246
-#: ../lib/python/Tools/FuzzyDate.py:10
-msgid "Today"
-msgstr "Tänään"
+#: ../data/
+msgid "Timer"
+msgstr "Ajastin"
 
-#: ../lib/python/Screens/Satconfig.py:111
-msgid "Tone mode"
-msgstr "Äänitila"
+#: ../data/
+msgid "Timer Edit"
+msgstr "Ajastimen muokkaus"
 
-#: ../lib/python/Screens/Satconfig.py:125
-msgid "Toneburst"
-msgstr "Äänipurske"
+#: ../data/
+msgid "Timer Editor"
+msgstr "Ajastimen muokkaus"
 
-#: ../lib/python/Components/NimManager.py:702
+#: ../lib/python/Screens/TimerEntry.py:131
+msgid "Timer Type"
+msgstr "Ajastimen tyyppi"
+
+#: ../data/
+msgid "Timer entry"
+msgstr "Ajastintieto"
+
+#: ../data/
+msgid "Timer log"
+msgstr "Ajastinloki"
+
+#: ../data/
+msgid "Timer sanity error"
+msgstr "Ajastinvirhe"
+
+#: ../data/
+msgid "Timer selection"
+msgstr "Ajastinvalinta"
+
+#: ../data/
+msgid "Timeshift"
+msgstr "Aikasiirto"
+
+#: ../data/
+msgid "Timezone"
+msgstr "Aikavyöhyke"
+
+#: ../lib/python/Screens/MediaPlayer.py:49
+msgid "Title:"
+msgstr "Otsikko:"
+
+#: ../lib/python/Screens/EpgSelection.py:245
+#: ../lib/python/Tools/FuzzyDate.py:10
+msgid "Today"
+msgstr "Tänään"
+
+#: ../lib/python/Screens/Satconfig.py:99
+msgid "Tone mode"
+msgstr "Äänitila"
+
+#: ../lib/python/Screens/Satconfig.py:113
+msgid "Toneburst"
+msgstr "Äänipurske"
+
+#: ../lib/python/Components/NimManager.py:703
 msgid "Toneburst A/B"
 msgstr "Äänipurske A/B"
 
-#: ../lib/python/Screens/ScanSetup.py:251
+#: ../lib/python/Screens/ScanSetup.py:247
 msgid "Transmission mode"
 msgstr "Lähetystapa"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:407
+#: ../lib/python/Screens/ServiceInfo.py:80
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:406
 msgid "Transponder"
 msgstr "Transponderi"
 
-#: ../lib/python/Screens/ScanSetup.py:197
+#: ../lib/python/Screens/ScanSetup.py:193
 msgid "Transpondertype"
 msgstr "Transponderityyppi"
 
-#: ../lib/python/Screens/EpgSelection.py:235
+#: ../lib/python/Screens/InputBox.py:168
+msgid "Tries left:"
+msgstr "Yrityksiä jäljellä:"
+
+#: ../lib/python/Screens/EpgSelection.py:234
+#: ../lib/python/Components/EpgList.py:46
 #: ../lib/python/Components/TimerList.py:34
 msgid "Tue"
 msgstr "Ti"
 
-#: ../lib/python/Screens/TimerEntry.py:112
-#: ../lib/python/Screens/TimerEntry.py:171
+#: ../lib/python/Screens/TimerEntry.py:100
+#: ../lib/python/Screens/TimerEntry.py:150
 msgid "Tuesday"
 msgstr "Tiistai"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:129
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:161
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:396
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:128
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:160
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:395
 msgid "Tune"
 msgstr "Viritä"
 
-#: ../lib/python/Screens/ScanSetup.py:178
+#: ../lib/python/Screens/ScanSetup.py:175
 #: ../lib/python/Components/ServiceScan.py:75
 msgid "Tuner"
 msgstr "Viritin"
 
-#: ../lib/python/Components/Language.py:26
+#: ../data/
+msgid "Tuner Slot"
+msgstr "Viritinpaikka"
+
+#: ../data/
+msgid "Tuner configuration"
+msgstr "Viritinasetukset"
+
+#: ../lib/python/Screens/ServiceInfo.py:81
+msgid "Tuner status"
+msgstr "Virittimen tila"
+
+#: ../lib/python/Components/Language.py:27
 msgid "Turkish"
 msgstr "Turkkilainen"
 
-#: ../lib/python/Components/NimManager.py:768
+#: ../lib/python/Components/NimManager.py:788
 msgid "Two"
 msgstr "Kaksi"
 
+#: ../lib/python/Screens/ScanSetup.py:181
 #: ../lib/python/Screens/ScanSetup.py:184
 #: ../lib/python/Screens/ScanSetup.py:187
-#: ../lib/python/Screens/ScanSetup.py:190
 msgid "Type of scan"
 msgstr "Skannauksen tyyppi"
 
-#: ../lib/python/Components/NimManager.py:707
+#: ../lib/python/Components/NimManager.py:715
 msgid "USALS"
 msgstr "USALS"
 
+#: ../data/
+msgid "USB"
+msgstr "USB"
+
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:111
 msgid "USB Stick"
 msgstr "USB-muistitikku"
@@ -1409,85 +2155,268 @@ msgstr ""
 "Katso ohjeita levyn ohjekirjasta.\n"
 "VIRHE: "
 
-#: ../lib/python/Screens/Satconfig.py:133
+#: ../lib/python/Screens/Satconfig.py:121
 msgid "Uncommitted DiSEqC command"
 msgstr "Uncommitted DiSEqC-käsky"
 
-#: ../lib/python/Components/NimManager.py:754
+#: ../lib/python/Components/NimManager.py:767
 msgid "Universal LNB"
 msgstr "Universaali LNB"
 
-#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:211
+#: ../lib/python/Components/Harddisk.py:132
+msgid "Unmount failed"
+msgstr "Irrottaminen epäonnistui"
+
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:222
 msgid "Updating finished. Here is the result:"
 msgstr "Päivitys valmis. Tulos:"
 
-#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:217
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:228
 msgid "Updating... Please wait... This can take some minutes..."
 msgstr "Päivitetään...odota...tämä voi kestää muutaman minuutin..."
 
-#: ../lib/python/Screens/NetworkSetup.py:40 ../data/
+#: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:67
+msgid "Upgrade finished. Do you want to reboot your Dreambox?"
+msgstr "Päivitys valmis. Haluatko uudelleenkäynnistää Dreamboxin?"
+
+#: ../lib/python/Screens/NetworkSetup.py:27 ../data/
 msgid "Use DHCP"
 msgstr "Käytä DHCP"
 
-#: ../lib/python/Screens/Satconfig.py:113
+#: ../data/
+msgid "Use power measurement"
+msgstr "Käytä tehonmittausta"
+
+#: ../data/
+msgid ""
+"Use the left and right buttons to change an option.\n"
+"\n"
+"Please set up tuner A"
+msgstr ""
+"Käytä vasenta ja oikeata nappia vaihtaaksesi valintaa.\n"
+"\n"
+"Valitse viritin A"
+
+#: ../data/
+msgid ""
+"Use the up/down keys on your remote control to select an option. After that, "
+"press OK."
+msgstr ""
+"Käytä ylös/alas näppäimiä kauko-ohjaimessasi valitaksesi vaihtoehdon. Paina "
+"sitten OK."
+
+#: ../lib/python/Screens/Satconfig.py:101
 msgid "Use usals for this sat"
 msgstr "Käytä USALS tälle satelliitille"
 
-#: ../lib/python/Components/NimManager.py:754
+#: ../data/
+msgid "Use wizard to set up basic features"
+msgstr "Käytä Velhoa perusasetuksien luonnissa"
+
+#: ../lib/python/Components/NimManager.py:767
 msgid "User defined"
 msgstr "Käyttäjän määrittelemä"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1631
+#: ../data/
+msgid "VCR Switch"
+msgstr "VCR Vaihto"
+
+#: ../data/
+msgid "VCR scart"
+msgstr "VCR scart"
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1759
 msgid "View teletext..."
 msgstr "näytä tekstitv..."
 
-#: ../lib/python/Screens/Satconfig.py:110
+#: ../lib/python/Screens/Satconfig.py:98
 msgid "Voltage mode"
 msgstr "Jännitetila"
 
-#: ../lib/python/Screens/ChannelSelection.py:741
+#: ../data/
+msgid "Volume"
+msgstr "Äänenvoimakkuus"
+
+#: ../lib/python/Screens/ChannelSelection.py:766
 msgid "W"
-msgstr ""
+msgstr "W"
+
+#: ../data/
+msgid "WSS on 4:3"
+msgstr "WSS 4:3"
 
-#: ../lib/python/Screens/EpgSelection.py:235
+#: ../lib/python/Screens/EpgSelection.py:234
+#: ../lib/python/Components/EpgList.py:46
 #: ../lib/python/Components/TimerList.py:34
 msgid "Wed"
 msgstr "Ke"
 
-#: ../lib/python/Screens/TimerEntry.py:112
-#: ../lib/python/Screens/TimerEntry.py:172
+#: ../lib/python/Screens/TimerEntry.py:100
+#: ../lib/python/Screens/TimerEntry.py:151
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
-#: ../lib/python/Screens/TimerEntry.py:167
+#: ../lib/python/Screens/TimerEntry.py:146
 msgid "Weekday"
 msgstr "Viikonpäivä"
 
-#: ../lib/python/Components/NimManager.py:709
-#: ../lib/python/Components/NimManager.py:770
+#: ../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 ""
+"Tervetuloa ohjelmiston päivitys-Velhoon. Velho avustaa ohjelmiston "
+"päivityksessä ja varmuuskopioinnissa sekä asetusten palauttamisessa "
+"päivityksen jälkeen."
+
+#: ../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."
+msgstr ""
+"Tervetuloa.\n"
+"\n"
+"Tämä aloitus-Velho auttaa perusasetusten luomisessa.\n"
+"Paina kauko-ohjaimen OK-näppäintä edetäksesi seuraavaan vaiheeseen."
+
+#: ../lib/python/Components/NimManager.py:719
+#: ../lib/python/Components/NimManager.py:790
 msgid "West"
 msgstr "Länsi"
 
+#: ../data/
+msgid "What do you want to scan?"
+msgstr "Mitä haluat etsiä?"
+
+#: ../data/
+msgid "Where do you want to backup your settings?"
+msgstr "Minne haluat varmuuskopioida asetukset?"
+
+#: ../lib/python/Components/AVSwitch.py:81
+msgid "YPbPr"
+msgstr "YPbPr"
+
 #: ../lib/python/Screens/MediaPlayer.py:53
 msgid "Year:"
 msgstr "Vuosi:"
 
-#: ../lib/python/Screens/Ci.py:24 ../lib/python/Components/NimManager.py:739
-#: ../lib/python/Components/NimManager.py:759
-#: ../lib/python/Components/NimManager.py:763
-#: ../lib/python/Components/NimManager.py:764
-#: ../lib/python/Components/NimManager.py:773
+#: ../lib/python/Screens/Ci.py:22 ../data/
 msgid "Yes"
 msgstr "Kyllä"
 
+#: ../data/
+msgid "Yes, backup my settings!"
+msgstr "Kyllä, varmuuskopioi asetukset!"
+
+#: ../data/
+msgid "Yes, do a manual scan now"
+msgstr "Kyllä, tee käsinhaku nyt"
+
+#: ../data/
+msgid "Yes, do an automatic scan now"
+msgstr "Kyllä, tee automaattihaku nyt"
+
+#: ../data/
+msgid "Yes, do another manual scan now"
+msgstr "Kyllä, tee toinen käsinhaku nyt"
+
+#: ../data/
+msgid "Yes, perform a shutdown now."
+msgstr "Kyllä, sammuta nyt."
+
+#: ../data/
+msgid "Yes, restore the settings now"
+msgstr "Kyllä, palauta asetukset nyt"
+
+#: ../data/
+msgid "Yes, view the tutorial"
+msgstr "Kyllä, katso opasohjelma"
+
 #: ../lib/python/Screens/MovieSelection.py:49
 msgid "You cannot delete this!"
 msgstr "Et voi poistaa tätä!"
 
-#: ../lib/python/Screens/MediaPlayer.py:348
+#: ../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 ""
+"Laitteessasi ei näytä olevan kiintolevyä, joten et voi varmuuskopioida "
+"kiintolevylle."
+
+#: ../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 ""
+"Olet valinnut varmuuskopioinnin Compact Flash -kortille. Kortin on oltava "
+"lukijassa. Sen toimintaa ei voi todeta. Suosittelemme varmuuskopiointia "
+"kiintolevylle!\n"
+"Paina OK aloittaakseni varmuuskopioinnin nyt."
+
+#: ../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 ""
+"Olet valinnut varmuuskopioinnin USB:lle. Kiintolevy on luotettavampi "
+"vaihtoehto!\n"
+"Paina OK aloittaaksesi varmuuskopioinnin."
+
+#: ../data/
+msgid ""
+"You have chosen to backup to your harddisk. Please press OK to start the "
+"backup now."
+msgstr ""
+"Olet valinnut varmuuskopioinnin kiintolevylle. Paina OK aloittaaksesi "
+"varmistuksen nyt."
+
+#: ../lib/python/Screens/InputBox.py:108
+msgid "You have to wait for"
+msgstr "Sinun täytyy odottaa"
+
+#: ../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 ""
+"Tarvitse PC:n, joka on yhdistetty Dreamboksiin. Katso lisätietoja http://www."
+"dm7025.de.\n"
+"Dreamboksisi sammutetaan nyt. Kun olet tehnyt päivitystoimenpiteet sivuston "
+"mukaisesti, uusi ohjelmaversio pyytää sinua palauttamaan asetukset."
+
+#: ../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 ""
+"Sinun täytyy asettaa pin-koodi ja piilottaa se lapsiltasi.\n"
+"\n"
+"Haluatko asettaa pin-koodin nyt?"
+
+#: ../lib/python/Screens/MediaPlayer.py:391
 msgid "You selected a playlist"
 msgstr "Valitsit soittolistan"
 
+#: ../data/
+msgid ""
+"Your backup succeeded. We will now continue to explain the further upgrade "
+"process."
+msgstr "Varmuuskopiointi onnistui. Päivitys jatkuu eteenpäin."
+
+#: ../data/
+msgid "Your dreambox is shutting down. Please stand by..."
+msgstr "Laitteesi on sammumassa. Odota..."
+
 #: ../lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/plugin.py:31
 msgid ""
 "Your frontprocessor firmware must be upgraded.\n"
@@ -1496,23 +2425,23 @@ msgstr ""
 "Front-prosessori on päivitettävä.\n"
 "Paina OK aloittaaksesi päivityksen."
 
-#: ../lib/python/Screens/ChannelSelection.py:357
+#: ../lib/python/Screens/ChannelSelection.py:380
 msgid "[bouquet edit]"
 msgstr "[kanavanippujen muokkaus]"
 
-#: ../lib/python/Screens/ChannelSelection.py:359
+#: ../lib/python/Screens/ChannelSelection.py:382
 msgid "[favourite edit]"
 msgstr "[suosikkien muokkaus]"
 
-#: ../lib/python/Screens/ChannelSelection.py:442
+#: ../lib/python/Screens/ChannelSelection.py:465
 msgid "[move mode]"
 msgstr "[siirtotila]"
 
-#: ../lib/python/Screens/ChannelSelection.py:111
+#: ../lib/python/Screens/ChannelSelection.py:119
 msgid "abort bouquet edit"
 msgstr "peruuta kanavanippujen muokkaus"
 
-#: ../lib/python/Screens/ChannelSelection.py:114
+#: ../lib/python/Screens/ChannelSelection.py:122
 msgid "abort favourites edit"
 msgstr "peruuta suosikkien muokkaus"
 
@@ -1520,45 +2449,54 @@ msgstr "peruuta suosikkien muokkaus"
 msgid "about to start"
 msgstr "aloittamassa"
 
-#: ../lib/python/Screens/ChannelSelection.py:93
+#: ../lib/python/Screens/ChannelSelection.py:101
 msgid "add bouquet"
 msgstr "lisää kanavanippu"
 
-#: ../lib/python/Screens/MediaPlayer.py:297
+#: ../lib/python/Screens/MediaPlayer.py:338
 msgid "add directory to playlist"
 msgstr "lisää hakemisto soittolistalle"
 
-#: ../lib/python/Screens/MediaPlayer.py:299
+#: ../lib/python/Screens/MediaPlayer.py:340
 msgid "add file to playlist"
 msgstr "lisää tiedosto soittolistalle"
 
-#: ../lib/python/Screens/ChannelSelection.py:99
+#: ../lib/python/Screens/ChannelSelection.py:107
 msgid "add marker"
 msgstr "lisää merkki"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1214
-#: ../lib/python/Screens/InfoBarGenerics.py:1216
+#: ../lib/python/Screens/InfoBarGenerics.py:1339
+#: ../lib/python/Screens/InfoBarGenerics.py:1341
 msgid "add recording (enter recording duration)"
 msgstr "tallenna (syötä tallennuksen kesto)"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1214
-#: ../lib/python/Screens/InfoBarGenerics.py:1216
+#: ../lib/python/Screens/InfoBarGenerics.py:1339
+#: ../lib/python/Screens/InfoBarGenerics.py:1341
 msgid "add recording (indefinitely)"
 msgstr "tallenna (jatkuva)"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1214
-#: ../lib/python/Screens/InfoBarGenerics.py:1216
+#: ../lib/python/Screens/InfoBarGenerics.py:1339
+#: ../lib/python/Screens/InfoBarGenerics.py:1341
 msgid "add recording (stop after current event)"
 msgstr "tallenna (lopeta nykyisen ohjelman jälkeen)"
 
-#: ../lib/python/Screens/ChannelSelection.py:79
+#: ../lib/python/Screens/ChannelSelection.py:87
 msgid "add service to bouquet"
 msgstr "lisää kanava kanavanippuun"
 
-#: ../lib/python/Screens/ChannelSelection.py:81
+#: ../lib/python/Screens/ChannelSelection.py:89
 msgid "add service to favourites"
 msgstr "lisää kanava suosikkeihin"
 
+#: ../lib/python/Screens/ChannelSelection.py:83
+msgid "add to parental protection"
+msgstr "lisää lapsilukkoon"
+
+#: ../lib/python/Components/NimManager.py:672
+#: ../lib/python/Components/NimManager.py:682
+msgid "advanced"
+msgstr "laaja"
+
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:208
 msgid ""
 "are you sure you want to restore\n"
@@ -1567,40 +2505,52 @@ msgstr ""
 "haluatko varmasti palauttaa\n"
 "seuraavan varmuuskopion:\n"
 
+#: ../lib/python/Screens/ChannelSelection.py:124
 #: ../lib/python/Screens/MovieSelection.py:24
-#: ../lib/python/Screens/ChannelSelection.py:116
 msgid "back"
 msgstr "takaisin"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1214
+#: ../lib/python/Components/ParentalControl.py:17
+msgid "blacklist"
+msgstr "kielletyt"
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1339
 msgid "change recording (duration)"
 msgstr "muokkaa tallennusta (kesto)"
 
-#: ../lib/python/Screens/ScanSetup.py:367
+#: ../lib/python/Screens/ScanSetup.py:362
 msgid "circular left"
 msgstr "Kiertopolarisaatio vasen"
 
-#: ../lib/python/Screens/ScanSetup.py:367
+#: ../lib/python/Screens/ScanSetup.py:362
 msgid "circular right"
 msgstr "Kiertopolarisaatio oikea"
 
-#: ../lib/python/Screens/MediaPlayer.py:303
+#: ../lib/python/Screens/MediaPlayer.py:344
 msgid "clear playlist"
 msgstr "tyhjennä soittolista"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:583
+#: ../lib/python/Components/ParentalControl.py:13
+msgid "complex"
+msgstr "monipuolinen"
+
+#: ../data/
+msgid "config menu"
+msgstr "Asetusvalikko"
+
+#: ../lib/python/Screens/InfoBarGenerics.py:591
 msgid "continue"
 msgstr "jatka"
 
-#: ../lib/python/Screens/ChannelSelection.py:85
+#: ../lib/python/Screens/ChannelSelection.py:93
 msgid "copy to favourites"
 msgstr "kopioi suosikkeihin"
 
-#: ../lib/python/Screens/TimerEntry.py:104
+#: ../lib/python/Screens/TimerEntry.py:92
 msgid "daily"
 msgstr "päivittäinen"
 
-#: ../lib/python/Screens/MediaPlayer.py:302
+#: ../lib/python/Screens/MediaPlayer.py:343
 msgid "delete"
 msgstr "poista"
 
@@ -1608,16 +2558,20 @@ msgstr "poista"
 msgid "delete..."
 msgstr "poista..."
 
-#: ../lib/python/Screens/ChannelSelection.py:107
+#: ../lib/python/Components/config.py:262
+msgid "disable"
+msgstr "pois"
+
+#: ../lib/python/Screens/ChannelSelection.py:115
 msgid "disable move mode"
 msgstr "poistu siirtotilasta"
 
-#: ../lib/python/Screens/TimerEntry.py:99
-#: ../lib/python/Screens/InfoBarGenerics.py:1214
+#: ../lib/python/Screens/InfoBarGenerics.py:1339
+#: ../lib/python/Screens/TimerEntry.py:87
 msgid "do nothing"
 msgstr "älä tee mitään"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1216
+#: ../lib/python/Screens/InfoBarGenerics.py:1341
 msgid "don't record"
 msgstr "älä tallenna"
 
@@ -1625,30 +2579,38 @@ msgstr "älä tallenna"
 msgid "done!"
 msgstr "valmis!"
 
-#: ../lib/python/Components/NimManager.py:570
+#: ../lib/python/Components/NimManager.py:559
 msgid "empty/unknown"
 msgstr "tyhjä/tuntematon"
 
-#: ../lib/python/Screens/ChannelSelection.py:103
+#: ../lib/python/Components/config.py:262
+msgid "enable"
+msgstr "päälle"
+
+#: ../lib/python/Screens/ChannelSelection.py:111
 msgid "enable bouquet edit"
 msgstr "ota kanavanippujen muokkaustila käyttöön"
 
-#: ../lib/python/Screens/ChannelSelection.py:105
+#: ../lib/python/Screens/ChannelSelection.py:113
 msgid "enable favourite edit"
 msgstr "ota suosikkien muokkaustila käyttöön"
 
-#: ../lib/python/Screens/ChannelSelection.py:100
+#: ../lib/python/Screens/ChannelSelection.py:108
 msgid "enable move mode"
 msgstr "ota siirtotila käyttöön"
 
-#: ../lib/python/Screens/ChannelSelection.py:110
+#: ../lib/python/Screens/ChannelSelection.py:118
 msgid "end bouquet edit"
 msgstr "lopeta kanavanippujen muokkaus"
 
-#: ../lib/python/Screens/ChannelSelection.py:113
+#: ../lib/python/Screens/ChannelSelection.py:121
 msgid "end favourites edit"
 msgstr "lopeta suosikkien muokkaus"
 
+#: ../lib/python/Components/NimManager.py:677
+msgid "equal to Socket A"
+msgstr "kuten kanta A"
+
 #: ../lib/python/Components/DiskInfo.py:30
 msgid "free diskspace"
 msgstr "vapaata levytilaa"
@@ -1657,31 +2619,44 @@ msgstr "vapaata levytilaa"
 msgid "full /etc directory"
 msgstr "täysi /etc hakemisto"
 
-#: ../lib/python/Screens/TimerEntry.py:99
+#: ../lib/python/Screens/TimerEntry.py:87
 msgid "go to deep standby"
 msgstr "mene syvään valmiustilaan"
 
-#: ../lib/python/Screens/InfoBar.py:62
+#: ../lib/python/Screens/InfoBar.py:64
 msgid "hear radio..."
 msgstr "kuuntele radiota..."
 
-#: ../lib/python/Screens/MediaPlayer.py:304
+#: ../data/
+msgid "help..."
+msgstr "apua..."
+
+#: ../lib/python/Screens/MediaPlayer.py:345
 msgid "hide player"
 msgstr "piilota soitin"
 
-#: ../lib/python/Screens/ScanSetup.py:367
+#: ../lib/python/Screens/ScanSetup.py:362
 msgid "horizontal"
 msgstr "horisontaali"
 
-#: ../lib/python/Screens/Ci.py:318 ../lib/python/Screens/Ci.py:340
+#: ../lib/python/Components/UsageConfig.py:20
+msgid "hour"
+msgstr "tunti"
+
+#: ../lib/python/Components/UsageConfig.py:20
+#: ../lib/python/Components/UsageConfig.py:21
+msgid "hours"
+msgstr "tuntia"
+
+#: ../lib/python/Screens/Ci.py:300 ../lib/python/Screens/Ci.py:322
 msgid "init module"
 msgstr "alusta moduuli"
 
-#: ../lib/python/Screens/InfoBar.py:96
+#: ../lib/python/Screens/InfoBar.py:98
 msgid "leave movie player..."
 msgstr "poistu elokuvatoistimesta..."
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1275
+#: ../lib/python/Screens/InfoBarGenerics.py:1400
 msgid "left"
 msgstr "vasen"
 
@@ -1690,7 +2665,15 @@ msgstr "vasen"
 msgid "list"
 msgstr "listaa"
 
-#: ../lib/python/Components/NimManager.py:707
+#: ../lib/python/Components/TunerInfo.py:69
+msgid "locked"
+msgstr "lukittu"
+
+#: ../lib/python/Components/NimManager.py:678
+msgid "loopthrough to socket A"
+msgstr "Läpisyöttö kytkentään A"
+
+#: ../lib/python/Components/NimManager.py:716
 msgid "manual"
 msgstr "manuaali"
 
@@ -1699,24 +2682,36 @@ msgstr "manuaali"
 msgid "mins"
 msgstr "minuuttia"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:260
+#: ../lib/python/Components/UsageConfig.py:18
+msgid "minute"
+msgstr "minuutti"
+
+#: ../lib/python/Components/UsageConfig.py:18
+#: ../lib/python/Components/UsageConfig.py:19
+#: ../lib/python/Components/UsageConfig.py:20
+msgid "minutes"
+msgstr "minuuttia"
+
+#: ../lib/python/Screens/InputBox.py:108
+msgid "minutes and"
+msgstr "minuuttia ja"
+
+#: ../lib/python/Components/ParentalControl.py:14
+msgid "never"
+msgstr "ei koskaan"
+
+#: ../lib/python/Screens/InfoBarGenerics.py:261
 msgid "next channel"
 msgstr "seuraava kanava"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:262
+#: ../lib/python/Screens/InfoBarGenerics.py:263
 msgid "next channel in history"
 msgstr "seuraava kanava historiassa"
 
-#: ../lib/python/Screens/ScanSetup.py:346
-#: ../lib/python/Screens/ScanSetup.py:378
-#: ../lib/python/Screens/ScanSetup.py:392
-#: ../lib/python/Screens/ScanSetup.py:397
-#: ../lib/python/Screens/ScanSetup.py:689
-#: ../lib/python/Screens/ScanSetup.py:691
-#: ../lib/python/Screens/ScanSetup.py:698
-#: ../lib/python/Screens/TimerEntry.py:116
-#: ../lib/python/Components/Network.py:145
-#: ../lib/python/Components/RecordingConfig.py:8
+#: ../lib/python/Screens/MessageBox.py:45
+#: ../lib/python/Screens/ScanSetup.py:341
+#: ../lib/python/Screens/ScanSetup.py:586
+#: ../lib/python/Components/config.py:254
 msgid "no"
 msgstr "ei"
 
@@ -1724,27 +2719,45 @@ msgstr "ei"
 msgid "no HDD found"
 msgstr "kiintolevyä ei löydy"
 
-#: ../lib/python/Screens/Ci.py:316 ../lib/python/Screens/Ci.py:338
+#: ../lib/python/Screens/Ci.py:298 ../lib/python/Screens/Ci.py:320
 msgid "no module found"
 msgstr "moduleita ei löydy"
 
+#: ../lib/python/Components/UsageConfig.py:17
+msgid "no standby"
+msgstr "ei valmiustilaa"
+
+#: ../lib/python/Components/UsageConfig.py:11
+msgid "no timeout"
+msgstr "ei aikaa"
+
 #: ../lib/python/Screens/About.py:40
 msgid "none"
 msgstr "ei yhtään"
 
-#: ../lib/python/Screens/ScanSetup.py:365
-#: ../lib/python/Screens/ScanSetup.py:374
-#: ../lib/python/Screens/ScanSetup.py:382
+#: ../lib/python/Components/TunerInfo.py:71
+msgid "not locked"
+msgstr "ei lukittu"
+
+#: ../lib/python/Components/NimManager.py:679
+msgid "nothing connected"
+msgstr "ei kytketty"
+
+#: ../lib/python/Screens/ScanSetup.py:360
+#: ../lib/python/Screens/ScanSetup.py:369
+#: ../lib/python/Screens/ScanSetup.py:377
+#: ../lib/python/Components/config.py:258
 msgid "off"
 msgstr "pois"
 
-#: ../lib/python/Screens/ScanSetup.py:365
-#: ../lib/python/Screens/ScanSetup.py:374
-#: ../lib/python/Screens/ScanSetup.py:382
+#: ../lib/python/Screens/ScanSetup.py:360
+#: ../lib/python/Screens/ScanSetup.py:369
+#: ../lib/python/Screens/ScanSetup.py:377
+#: ../lib/python/Components/config.py:258
 msgid "on"
 msgstr "päällä"
 
-#: ../lib/python/Screens/TimerEntry.py:100
+#: ../lib/python/Screens/TimerEntry.py:88
 msgid "once"
 msgstr "kerran"
 
@@ -1752,15 +2765,15 @@ msgstr "kerran"
 msgid "only /etc/enigma2 directory"
 msgstr "vain /etc/enigma2 hakemisto"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:263
+#: ../lib/python/Screens/InfoBarGenerics.py:264
 msgid "open servicelist"
 msgstr "avaa palvelulista"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:258
+#: ../lib/python/Screens/InfoBarGenerics.py:259
 msgid "open servicelist(down)"
 msgstr "avaa palvelulista(alaspäin)"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:257
+#: ../lib/python/Screens/InfoBarGenerics.py:258
 msgid "open servicelist(up)"
 msgstr "avaa palvelulista(ylöspäin)"
 
@@ -1768,23 +2781,23 @@ msgstr "avaa palvelulista(ylöspäin)"
 msgid "pass"
 msgstr "hyväksytty"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:582
+#: ../lib/python/Screens/InfoBarGenerics.py:590
 msgid "pause"
 msgstr "tauko"
 
-#: ../lib/python/Screens/Ci.py:86
+#: ../lib/python/Screens/Ci.py:82
 msgid "please press OK when ready"
 msgstr "paina OK kun olet valmis"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:259
+#: ../lib/python/Screens/InfoBarGenerics.py:260
 msgid "previous channel"
 msgstr "edellinen kanava"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:261
+#: ../lib/python/Screens/InfoBarGenerics.py:262
 msgid "previous channel in history"
 msgstr "edellinen kanava historiassa"
 
-#: ../lib/python/Screens/TimerEntry.py:98
+#: ../lib/python/Screens/TimerEntry.py:86
 msgid "record"
 msgstr "tallenna"
 
@@ -1792,24 +2805,28 @@ msgstr "tallenna"
 msgid "recording..."
 msgstr "tallennetaan..."
 
-#: ../lib/python/Screens/ChannelSelection.py:87
+#: ../lib/python/Screens/ChannelSelection.py:95
 msgid "remove all new found flags"
 msgstr "poista kaikki uusi kanava-liput"
 
-#: ../lib/python/Screens/ChannelSelection.py:89
-#: ../lib/python/Screens/ChannelSelection.py:94
+#: ../lib/python/Screens/ChannelSelection.py:97
+#: ../lib/python/Screens/ChannelSelection.py:102
 msgid "remove entry"
 msgstr "poista merkintä"
 
-#: ../lib/python/Screens/ChannelSelection.py:91
+#: ../lib/python/Screens/ChannelSelection.py:85
+msgid "remove from parental protection"
+msgstr "poista lapsilukosta"
+
+#: ../lib/python/Screens/ChannelSelection.py:99
 msgid "remove new found flag"
 msgstr "poista uusi kanava-lippu"
 
-#: ../lib/python/Screens/TimerEntry.py:100
+#: ../lib/python/Screens/TimerEntry.py:88
 msgid "repeated"
 msgstr "toistuva"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1275
+#: ../lib/python/Screens/InfoBarGenerics.py:1400
 msgid "right"
 msgstr "oikea"
 
@@ -1851,47 +2868,84 @@ msgstr ""
 msgid "scan state"
 msgstr "haun tila"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:394
+#: ../lib/python/Components/UsageConfig.py:11
+msgid "second"
+msgstr "sekuntti"
+
+#: ../lib/python/Components/NimManager.py:680
+msgid "second cable of motorized LNB"
+msgstr "toinen kaapeli moottorisoidulta mikropäältä"
+
+#: ../lib/python/Components/UsageConfig.py:11
+#: ../lib/python/Components/UsageConfig.py:12
+#: ../lib/python/Components/UsageConfig.py:13
+#: ../lib/python/Components/UsageConfig.py:17
+msgid "seconds"
+msgstr "sekunttia"
+
+#: ../lib/python/Screens/InputBox.py:108
+msgid "seconds."
+msgstr "sekunttia."
+
+#: ../data/
+msgid "select Slot"
+msgstr "Valitse lukija"
+
+#: ../lib/python/Screens/ParentalControlSetup.py:96
+msgid "service pin"
+msgstr "palveluiden pin-koodi"
+
+#: ../lib/python/Screens/ParentalControlSetup.py:98
+msgid "setup pin"
+msgstr "asetusten pin-koodi"
+
+#: ../lib/python/Screens/InfoBarGenerics.py:397
 msgid "show EPG..."
 msgstr "näytä EPG..."
 
-#: ../lib/python/Screens/InfoBarGenerics.py:356
+#: ../lib/python/Screens/InfoBarGenerics.py:359
 msgid "show event details"
 msgstr "näytä ohjelman tarkemmat tiedot"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:588
+#: ../lib/python/Components/NimManager.py:671
+#: ../lib/python/Components/NimManager.py:681
+#: ../lib/python/Components/ParentalControl.py:13
+msgid "simple"
+msgstr "suppea"
+
+#: ../lib/python/Screens/InfoBarGenerics.py:596
 msgid "skip backward"
 msgstr "siirry taaksepäin"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:585
+#: ../lib/python/Screens/InfoBarGenerics.py:593
 msgid "skip forward"
 msgstr "siirry eteenpäin"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:897
+#: ../lib/python/Screens/InfoBarGenerics.py:911
 msgid "start timeshift"
 msgstr "aloita ajansiirto"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1275
+#: ../lib/python/Screens/InfoBarGenerics.py:1400
 msgid "stereo"
 msgstr "stereo"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1214
+#: ../lib/python/Screens/InfoBarGenerics.py:1339
 msgid "stop recording"
 msgstr "lopeta tallennus"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:898
+#: ../lib/python/Screens/InfoBarGenerics.py:912
 msgid "stop timeshift"
 msgstr "Pysäytä ajansiirto"
 
-#: ../lib/python/Screens/MediaPlayer.py:301
+#: ../lib/python/Screens/MediaPlayer.py:342
 msgid "switch to filelist"
 msgstr "vaihda tiedostolistaan"
 
-#: ../lib/python/Screens/MediaPlayer.py:295
+#: ../lib/python/Screens/MediaPlayer.py:336
 msgid "switch to playlist"
 msgstr "vaihda soittolistaan"
 
-#: ../lib/python/Screens/Wizard.py:234 ../lib/python/Screens/Wizard.py:235
+#: ../lib/python/Screens/Wizard.py:236 ../lib/python/Screens/Wizard.py:237
 msgid "text"
 msgstr "teksti"
 
@@ -1899,778 +2953,66 @@ msgstr "teksti"
 msgid "this recording"
 msgstr "tämä tallennus"
 
+#: ../lib/python/Components/ParentalControl.py:80
+msgid "this service is protected by a parental control pin"
+msgstr "tämä palvelu on suojattu lapsilukolla"
+
 #: ../lib/python/Screens/EventView.py:80
 msgid "unknown service"
 msgstr "tuntematon kanava"
 
-#: ../lib/python/Screens/TimerEntry.py:104
+#: ../lib/python/Components/ParentalControl.py:14
+msgid "until restart"
+msgstr "uudelleenkäynnistykseen asti"
+
+#: ../lib/python/Screens/TimerEntry.py:92
 msgid "user defined"
 msgstr "käyttäjän määrittelemä"
 
-#: ../lib/python/Screens/ScanSetup.py:367
+#: ../lib/python/Screens/ScanSetup.py:362
 msgid "vertical"
 msgstr "vertikaali"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1031
+#: ../lib/python/Screens/InfoBarGenerics.py:1047
 msgid "view extensions..."
 msgstr "näytä laajennukset..."
 
-#: ../lib/python/Screens/InfoBar.py:61
+#: ../lib/python/Screens/InfoBar.py:63
 msgid "view recordings..."
 msgstr "näytä tallenteet..."
 
+#: ../lib/python/Screens/Ci.py:167
+msgid "wait for ci..."
+msgstr "odotetaan ci:tä..."
+
 #: ../lib/python/Components/TimerList.py:57
 msgid "waiting"
 msgstr "odottaa"
 
-#: ../lib/python/Screens/TimerEntry.py:104
+#: ../lib/python/Screens/TimerEntry.py:92
 msgid "weekly"
 msgstr "viikottainen"
 
-#: ../lib/python/Screens/ScanSetup.py:346
-#: ../lib/python/Screens/ScanSetup.py:378
-#: ../lib/python/Screens/ScanSetup.py:392
-#: ../lib/python/Screens/ScanSetup.py:397
-#: ../lib/python/Screens/ScanSetup.py:689
-#: ../lib/python/Screens/ScanSetup.py:691
-#: ../lib/python/Screens/ScanSetup.py:698
-#: ../lib/python/Screens/TimerEntry.py:116
-#: ../lib/python/Components/Network.py:145
-#: ../lib/python/Components/RecordingConfig.py:8
+#: ../lib/python/Components/ParentalControl.py:17
+msgid "whitelist"
+msgstr "hyväksytyt"
+
+#: ../lib/python/Screens/MessageBox.py:45
+#: ../lib/python/Screens/ScanSetup.py:341
+#: ../lib/python/Screens/ScanSetup.py:586
+#: ../lib/python/Components/config.py:254
 msgid "yes"
 msgstr "kyllä"
 
-#: ../lib/python/Screens/ScanSetup.py:346
-#: ../lib/python/Screens/ScanSetup.py:689
+#: ../lib/python/Screens/ScanSetup.py:341
+#: ../lib/python/Screens/ScanSetup.py:586
 msgid "yes (keep feeds)"
 msgstr "kyllä (pidä feedit)"
 
-#: ../lib/python/Screens/TimerEntry.py:98
+#: ../lib/python/Screens/TimerEntry.py:86
 msgid "zap"
 msgstr "vaihto"
 
 #: ../lib/python/Components/TimerList.py:62
 msgid "zapped"
 msgstr "vaihdettu"
-
-#: ../data/
-msgid "Channel Selection"
-msgstr "Kanavien valinta"
-
-#: ../data/
-msgid "Backup is done. Please press OK to see the result."
-msgstr "Varmuuskopio valmis. Paina OK nähdäksesi tulokset."
-
-#: ../data/
-msgid "Service"
-msgstr "Kanava"
-
-#: ../data/
-msgid "Network setup"
-msgstr "Verkkoasetukset"
-
-#: ../data/
-msgid "Games / Plugins"
-msgstr "Pelit / Lisäosat"
-
-#: ../data/
-msgid "help..."
-msgstr "apua..."
-
-#: ../data/
-msgid "Yes, backup my settings!"
-msgstr "Kyllä, varmuuskopioi asetukset!"
-
-#: ../data/
-msgid "Satconfig"
-msgstr "Satelliittiasetukset"
-
-#: ../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 ""
-"Tarvitse PC:n, joka on yhdistetty Dreamboksiin. Katso lisätietoja http://www."
-"dm7025.de.\n"
-"Dreamboksisi sammutetaan nyt. Kun olet tehnyt päivitystoimenpiteet sivuston "
-"mukaisesti, uusi ohjelmaversio pyytää sinua palauttamaan asetukset."
-
-#: ../data/
-msgid "Where do you want to backup your settings?"
-msgstr "Minne haluat varmuuskopioida asetukset?"
-
-#: ../data/
-msgid "Service Scan"
-msgstr "Kanavahaku"
-
-#: ../data/
-msgid "DiSEqC"
-msgstr ""
-
-#: ../data/
-msgid "TV System"
-msgstr "TV järjestelmä"
-
-#: ../data/
-msgid "Alternative radio mode"
-msgstr "Vaihtoehtoinen radiomuoto"
-
-#: ../data/
-msgid "NEXT"
-msgstr "SEURAAVA"
-
-#: ../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 ""
-"Laitteessasi ei näytä olevan kiintolevyä, joten et voi varmuuskopioida "
-"kiintolevylle."
-
-#: ../data/
-msgid "Deep Standby"
-msgstr "Syvä valmiustila"
-
-#: ../data/
-msgid "Show positioner movement"
-msgstr "Näytä moottorin liikkuminen"
-
-#: ../data/
-msgid "Tuner Slot"
-msgstr "Viritinpaikka"
-
-#: ../data/
-msgid "Change bouquets in quickzap"
-msgstr "Vaihda kanavanippuja nopeavaihdossa"
-
-#: ../data/
-msgid "Sound"
-msgstr "Ääni"
-
-#: ../data/
-msgid ""
-"Use the up/down keys on your remote control to select an option. After that, "
-"press OK."
-msgstr ""
-"Käytä ylös/alas näppäimiä kauko-ohjaimessasi valitaksesi vaihtoehdon. Paina "
-"sitten OK."
-
-#: ../data/
-msgid "Do you want to view a tutorial?"
-msgstr "Haluatko katsoa opasohjelman?"
-
-#: ../data/
-msgid "No, do nothing."
-msgstr "Ei, älä tee mitään."
-
-#: ../data/
-msgid "#000000"
-msgstr ""
-
-#: ../data/
-msgid "This is step number 2."
-msgstr "Tämä on vaihe 2."
-
-#: ../data/
-msgid "Use wizard to set up basic features"
-msgstr "Käytä Velhoa perusasetuksien luonnissa"
-
-#: ../data/
-msgid "Extensions"
-msgstr "Laajennukset"
-
-#: ../data/
-msgid "#bab329"
-msgstr ""
-
-#: ../data/
-msgid "Sat / Dish Setup"
-msgstr "Antenniasetukset"
-
-#: ../data/
-msgid "#ffffff"
-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 ""
-"Olet valinnut varmuuskopioinnin USB:lle. Kiintolevy on luotettavampi "
-"vaihtoehto!\n"
-"Paina OK aloittaaksesi varmuuskopioinnin."
-
-#: ../data/
-msgid "Mute"
-msgstr "Mykistä"
-
-#: ../data/
-msgid "Service Searching"
-msgstr "Kanavahaku"
-
-#: ../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 ""
-"Tervetuloa ohjelmiston päivitys-Velhoon. Velho avustaa ohjelmiston "
-"päivityksessä ja varmuuskopioinnissa sekä asetusten palauttamisessa "
-"päivityksen jälkeen."
-
-#: ../data/
-msgid "Keyboard Map"
-msgstr "Näppäimistökartta"
-
-#: ../data/
-msgid "Enable multiple bouquets"
-msgstr "Käytä useaa kanavanippua"
-
-#: ../data/
-msgid "Keyboard Setup"
-msgstr "Näppäimistön asetukset"
-
-#: ../data/
-msgid ""
-"Use the left and right buttons to change an option.\n"
-"\n"
-"Please set up tuner A"
-msgstr ""
-"Käytä vasenta ja oikeata nappia vaihtaaksesi valintaa.\n"
-"\n"
-"Valitse viritin A"
-
-#: ../data/
-msgid "Dish"
-msgstr "Antenni"
-
-#: ../data/
-msgid "Margin after record"
-msgstr "Lisäaika tallenteen loppuun (minuuttia)"
-
-#: ../data/
-msgid "#ffffffff"
-msgstr ""
-
-#: ../data/
-msgid "System"
-msgstr "Järjestelmä"
-
-#: ../data/
-msgid "Use power measurement"
-msgstr "Käytä tehonmittausta"
-
-#: ../data/
-msgid ""
-"Thank you for using the wizard. Your box is now ready to use.\n"
-"Please press OK to start using you Dreambox."
-msgstr ""
-"Kiitos velhon käyttämisestä. Laitteesi on nyt käyttövalmis.\n"
-"Paina OK aloittaaksesi käytön."
-
-#: ../data/
-msgid "Test mode"
-msgstr "Testitila"
-
-#: ../data/
-msgid "Manual Scan"
-msgstr "Käsinhaku"
-
-#: ../data/
-msgid "Timer Edit"
-msgstr "Ajastimen muokkaus"
-
-#: ../data/
-msgid "RC Menu"
-msgstr "Kauko-ohjaimen valikko"
-
-#: ../data/
-msgid "No, just start my dreambox"
-msgstr "Ei, käynnistä vain Dreambox"
-
-#: ../data/
-msgid "Network..."
-msgstr "Verkko..."
-
-#: ../data/
-msgid "Tuner configuration"
-msgstr "Viritinasetukset"
-
-#: ../data/
-msgid "select Slot"
-msgstr "Valitse lukija"
-
-#: ../data/
-msgid "BER:"
-msgstr ""
-
-#: ../data/
-msgid "Standby / Restart"
-msgstr "Valmiustila / Käynnistys"
-
-#: ../data/
-msgid "Main menu"
-msgstr "Päävalikko"
-
-#: ../data/
-msgid "EPG Selection"
-msgstr "EPG valinta"
-
-#: ../data/
-msgid "Exit the wizard"
-msgstr "Poistu velhosta"
-
-#: ../data/
-msgid "OSD Settings"
-msgstr "OSD asetukset"
-
-#: ../data/
-msgid "RF output"
-msgstr "RF-ulostulo"
-
-#: ../data/
-msgid "Brightness"
-msgstr "Kirkkaus"
-
-#: ../data/
-msgid "Standby"
-msgstr "Valmiustila"
-
-#: ../data/
-msgid "Yes, do another manual scan now"
-msgstr "Kyllä, tee toinen käsinhaku nyt"
-
-#: ../data/
-msgid "Activate network settings"
-msgstr "Ota verkkoasetukset käyttöön"
-
-#: ../data/
-msgid "Timer"
-msgstr "Ajastin"
-
-#: ../data/
-msgid "Compact flash card"
-msgstr "Compact flash kortti"
-
-#: ../data/
-msgid "Record"
-msgstr "Tallenna"
-
-#: ../data/
-msgid "Yes, view the tutorial"
-msgstr "Kyllä, katso opasohjelma"
-
-#: ../data/
-msgid "Color Format"
-msgstr "Väriformaatti"
-
-#: ../data/
-msgid "#f23d21"
-msgstr ""
-
-#: ../data/
-msgid "Plugin browser"
-msgstr "Lisäosien selaus"
-
-#: ../data/
-msgid "#80000000"
-msgstr ""
-
-#: ../data/
-msgid "SNR:"
-msgstr ""
-
-#: ../data/
-msgid "Timeshift"
-msgstr "Aikasiirto"
-
-#: ../data/
-msgid "Downloadable plugins"
-msgstr "Ladattavat lisäosat"
-
-#: ../data/
-msgid "Subservices"
-msgstr "Alipalvelut"
-
-#: ../data/
-msgid "Timezone"
-msgstr "Aikavyöhyke"
-
-#: ../data/
-msgid "Message"
-msgstr "Viesti"
-
-#: ../data/
-msgid "About..."
-msgstr "Tietoja..."
-
-#: ../data/
-msgid "Seek"
-msgstr "Etsi"
-
-#: ../data/
-msgid "Common Interface"
-msgstr ""
-
-#: ../data/
-msgid "Language..."
-msgstr "Kieli..."
-
-#: ../data/
-msgid ""
-"Restoring the settings is done. Please press OK to activate the restored "
-"settings now."
-msgstr ""
-"Asetusten palautus on valmis. Paina OK ottaaksesi palautetut asetukset "
-"käyttöön."
-
-#: ../data/
-msgid "A/V Settings"
-msgstr "A/V asetukset"
-
-#: ../data/
-msgid ""
-"By pressing the OK Button on your remote control, the info bar is being "
-"displayed."
-msgstr ""
-"Kun painat OK nappia kauko-ohjaimessasi tietopalkki näytetään ruudussa."
-
-#: ../data/
-msgid "Service scan"
-msgstr "Kanavahaku"
-
-#: ../data/
-msgid "The wizard is finished now."
-msgstr "Velho on lopettanut."
-
-#: ../data/
-msgid "LCD Setup"
-msgstr "LCD asetukset"
-
-#: ../data/
-msgid "No, scan later manually"
-msgstr "Ei, hae myöhemmin käsin"
-
-#: ../data/
-msgid "Input"
-msgstr "Syöttö"
-
-#: ../data/
-msgid "Soundcarrier"
-msgstr "Äänenkantoaalto"
-
-#: ../data/
-msgid "Yes, restore the settings now"
-msgstr "Kyllä, palauta asetukset nyt"
-
-#: ../data/
-msgid "Contrast"
-msgstr "Kontrasti"
-
-#: ../data/
-msgid ""
-"You have chosen to backup to your harddisk. Please press OK to start the "
-"backup now."
-msgstr ""
-"Olet valinnut varmuuskopioinnin kiintolevylle. Paina OK aloittaaksesi "
-"varmistuksen nyt."
-
-#: ../data/
-msgid "Timer selection"
-msgstr "Ajastinvalinta"
-
-#: ../data/
-msgid "Repeat"
-msgstr "Toista"
-
-#: ../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 ""
-"Olet valinnut varmuuskopioinnin Compact Flash -kortille. Kortin on oltava "
-"lukijassa. Sen toimintaa ei voi todeta. Suosittelemme varmuuskopiointia "
-"kiintolevylle!\n"
-"Paina OK aloittaakseni varmuuskopioinnin nyt."
-
-#: ../data/
-msgid "Network Setup"
-msgstr "Verkkoasetukset"
-
-#: ../data/
-msgid "Somewhere else"
-msgstr "Jossakin muualla"
-
-#: ../data/
-msgid "Do you want to do a service scan?"
-msgstr "Haluatko tehdä kanavahaun?"
-
-#: ../data/
-msgid "Timer log"
-msgstr "Ajastinloki"
-
-#: ../data/
-msgid ""
-"Your backup succeeded. We will now continue to explain the further upgrade "
-"process."
-msgstr "Varmuuskopiointi onnistui. Päivitys jatkuu eteenpäin."
-
-#: ../data/
-msgid "PiPSetup"
-msgstr "PiP-Asetukset"
-
-#: ../data/
-msgid "Menu"
-msgstr "Valikko"
-
-#: ../data/
-msgid "Restart"
-msgstr "Uudelleenkäynnistä"
-
-#: ../data/
-msgid "AC3 default"
-msgstr "AC3 oletus"
-
-#: ../data/
-msgid "Timer entry"
-msgstr "Ajastintieto"
-
-#: ../data/
-msgid "Modulator"
-msgstr "Modulaattori"
-
-#: ../data/
-msgid "Eventview"
-msgstr "Ohjelmatiedot"
-
-#: ../data/
-msgid "Margin before record (minutes)"
-msgstr "Lisäaika tallenteen alkuun (minuuttia)"
-
-#: ../data/
-msgid "The backup failed. Please choose a different backup location."
-msgstr "Varmuuskopiointi epäonnistui. Valitse toinen varmuuskopiontipaikka."
-
-#: ../data/
-msgid "Keymap"
-msgstr "Näppäinkartta"
-
-#: ../data/
-msgid "InfoBar"
-msgstr "Tietopalkki"
-
-#: ../data/
-msgid ""
-"The wizard can backup your current settings. Do you want to do a backup now?"
-msgstr ""
-"Velho voi kopioida nykyiset asetuksesi. Haluatko varmuuskopioida asetukset "
-"nyt?"
-
-#: ../data/
-msgid "Exit wizard"
-msgstr "Poistu Velhosta"
-
-#: ../data/
-msgid "Media player"
-msgstr "Mediasoitin"
-
-#: ../data/
-msgid "Timer sanity error"
-msgstr "Ajastinvirhe"
-
-#: ../data/
-msgid "Serviceinfo"
-msgstr "Kanavatieto"
-
-#: ../data/
-msgid "VCR Switch"
-msgstr "VCR Vaihto"
-
-#: ../data/
-msgid "Your dreambox is shutting down. Please stand by..."
-msgstr "Laitteesi on sammumassa. Odota..."
-
-#: ../data/
-msgid "WSS on 4:3"
-msgstr "WSS 4:3"
-
-#: ../data/
-msgid "Choose bouquet"
-msgstr "Valitse kanavanippu"
-
-#: ../data/
-msgid "OK, guide me through the upgrade process"
-msgstr "OK, opasta päivityksessä"
-
-#: ../data/
-msgid "No backup needed"
-msgstr "Varmuuskopiota ei tarvitse"
-
-#: ../data/
-msgid "MORE"
-msgstr "LISÄÄ"
-
-#: ../data/
-msgid "Yes, do an automatic scan now"
-msgstr "Kyllä, tee automaattihaku nyt"
-
-#: ../data/
-msgid "Information"
-msgstr "Tietoja"
-
-#: ../data/
-msgid "Yes, do a manual scan now"
-msgstr "Kyllä, tee käsinhaku nyt"
-
-#: ../data/
-msgid "USB"
-msgstr ""
-
-#: ../data/
-msgid "Invert display"
-msgstr "käänteinen näyttö"
-
-#: ../data/
-msgid "Do you want to restore your settings?"
-msgstr "Haluatko palauttaa asetukset?"
-
-#: ../data/
-msgid "Please set up tuner B"
-msgstr "Aseta viritin B."
-
-#: ../data/
-msgid "Delay"
-msgstr "Viive"
-
-#: ../data/
-msgid "Select HDD"
-msgstr "Valitse kiintolevy"
-
-#: ../data/
-msgid "Aspect Ratio"
-msgstr "Kuvasuhde"
-
-#: ../data/
-msgid "Recordings always have priority"
-msgstr "Tallennuksilla on aina etuoikeus"
-
-#: ../data/
-msgid "Customize"
-msgstr "Sovita"
-
-#: ../data/
-msgid "#389416"
-msgstr ""
-
-#: ../data/
-msgid "VCR scart"
-msgstr "VCR scart"
-
-#: ../data/
-msgid "Mainmenu"
-msgstr "Päävalikko"
-
-#: ../data/
-msgid "Select a movie"
-msgstr "Valitse elokuva"
-
-#: ../data/
-msgid "Volume"
-msgstr "Äänenvoimakkuus"
-
-#: ../data/
-msgid "#33294a6b"
-msgstr ""
-
-#: ../data/
-msgid "Alpha"
-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."
-msgstr ""
-"Tervetuloa.\n"
-"\n"
-"Tämä aloitus-Velho auttaa perusasetusten luomisessa.\n"
-"Paina kauko-ohjaimen OK-näppäintä edetäksesi seuraavaan vaiheeseen."
-
-#: ../data/
-msgid "Setup"
-msgstr "Käyttöasetukset"
-
-#: ../data/
-msgid "This is unsupported at the moment."
-msgstr "Tätä ei tällä hetkellä tueta."
-
-#: ../data/
-msgid "About"
-msgstr "Tietoa"
-
-#: ../data/
-msgid "config menu"
-msgstr "Asetusvalikko"
-
-#: ../data/
-msgid "Finetune"
-msgstr "Hienosäädä"
-
-#: ../data/
-msgid "Timer Editor"
-msgstr "Ajastimen muokkaus"
-
-#: ../data/
-msgid "Time/Date Input"
-msgstr "Aika/Päivä "
-
-#: ../data/
-msgid "AGC:"
-msgstr ""
-
-#: ../data/
-msgid "What do you want to scan?"
-msgstr "Mitä haluat etsiä?"
-
-#: ../data/
-msgid "Now Playing"
-msgstr "Nyt Soi"
-
-#: ../data/
-msgid "Channellist menu"
-msgstr "Kanavalistavalikko"
-
-#: ../data/
-msgid "Audio"
-msgstr "Ääni"
-
-#: ../data/
-msgid "Harddisk..."
-msgstr "Kiintolevy..."
-
-#: ../data/
-msgid "NOW"
-msgstr "NYT"
-
-#: ../data/
-msgid "Yes, perform a shutdown now."
-msgstr "Kyllä, sammuta nyt."
-
-#: ../data/
-msgid "#0064c7"
-msgstr ""
-
-#: ../data/
-msgid "MediaPlayer"
-msgstr "Mediasoitin"
-
-#: ../data/
-msgid "Do you want to do another manual service scan?"
-msgstr "Haluatko tehdä uuden käsinhaun?"