X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/99e654bbd9a05bffb46765d32078c710f315bd50..f6e41e11b078600c2ccf568304b3eb3d0a556fbe:/po/fi.po

diff --git a/po/fi.po b/po/fi.po
index 65a9b559..85214f77 100755
--- a/po/fi.po
+++ b/po/fi.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxbox-enigma 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-12 13:27+0200\n"
-"PO-Revision-Date: 2006-06-19 16:18+0200\n"
+"POT-Creation-Date: 2006-08-05 19:29+0000\n"
+"PO-Revision-Date: 2006-07-20 23:11+0200\n"
 "Last-Translator: Sauli Halttu <salde@salde.net>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -36,7 +36,7 @@ msgstr ""
 #: ../lib/python/Screens/TimerEntry.py:109
 #: ../lib/python/Screens/TimeDateInput.py:49
 msgid "%d.%B %Y"
-msgstr ""
+msgstr "%d.%m.%Y"
 
 #: ../lib/python/Screens/About.py:38
 #, python-format
@@ -60,23 +60,23 @@ msgstr "/usr/share/enigma2 hakemisto"
 msgid "/var directory"
 msgstr "/var hakemisto"
 
-#: ../lib/python/Components/NimManager.py:748
+#: ../lib/python/Components/NimManager.py:758
 msgid "0 V"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:751
+#: ../lib/python/Components/NimManager.py:761
 msgid "1.0"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:751
+#: ../lib/python/Components/NimManager.py:761
 msgid "1.1"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:751
+#: ../lib/python/Components/NimManager.py:761
 msgid "1.2"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:748
+#: ../lib/python/Components/NimManager.py:758
 msgid "12 V"
 msgstr ""
 
@@ -84,11 +84,11 @@ msgstr ""
 msgid "12V Output"
 msgstr "12V lähtö"
 
-#: ../lib/python/Components/NimManager.py:727
+#: ../lib/python/Components/NimManager.py:737
 msgid "13 V"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:727
+#: ../lib/python/Components/NimManager.py:737
 msgid "18 V"
 msgstr ""
 
@@ -96,11 +96,15 @@ msgstr ""
 msgid "<unknown>"
 msgstr "<tuntematon>"
 
-#: ../lib/python/Components/NimManager.py:750
+#: ../lib/python/Screens/Setup.py:131
+msgid "??"
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:760
 msgid "A"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1191
+#: ../lib/python/Screens/InfoBarGenerics.py:1214
 msgid ""
 "A recording is currently running.\n"
 "What do you want to do?"
@@ -124,15 +128,15 @@ msgstr ""
 "Ajastintallennus epäonnistui!\n"
 "Yritä uudelleen?\n"
 
-#: ../lib/python/Components/NimManager.py:733
+#: ../lib/python/Components/NimManager.py:743
 msgid "AA"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:733
+#: ../lib/python/Components/NimManager.py:743
 msgid "AB"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1022
+#: ../lib/python/Screens/InfoBarGenerics.py:1043
 msgid "Activate Picture in Picture"
 msgstr "Käynnistä Kuva Kuvassa-toiminto"
 
@@ -140,7 +144,7 @@ msgstr "Käynnistä Kuva Kuvassa-toiminto"
 msgid "Add"
 msgstr "Lisää"
 
-#: ../lib/python/Screens/MediaPlayer.py:344
+#: ../lib/python/Screens/MediaPlayer.py:346
 msgid "Add files to playlist"
 msgstr "Lisää tiedostot soittolistalle"
 
@@ -149,8 +153,8 @@ msgstr "Lisää tiedostot soittolistalle"
 msgid "Add timer"
 msgstr "Lisää ajastin"
 
-#: ../lib/python/Components/NimManager.py:670
-#: ../lib/python/Components/NimManager.py:678
+#: ../lib/python/Components/NimManager.py:680
+#: ../lib/python/Components/NimManager.py:688
 #: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:31
 msgid "Advanced"
 msgstr "Edistyneille"
@@ -159,12 +163,12 @@ msgstr "Edistyneille"
 msgid "After event"
 msgstr "Tapahtuman jälkeen"
 
-#: ../lib/python/Screens/MediaPlayer.py:49
+#: ../lib/python/Screens/MediaPlayer.py:51
 msgid "Album:"
 msgstr "Albumi:"
 
-#: ../lib/python/Screens/ChannelSelection.py:445
-#: ../lib/python/Screens/ChannelSelection.py:591
+#: ../lib/python/Screens/ChannelSelection.py:474
+#: ../lib/python/Screens/ChannelSelection.py:622
 msgid "All"
 msgstr "Kaikki"
 
@@ -172,41 +176,41 @@ msgstr "Kaikki"
 msgid "Arabic"
 msgstr "Arabialainen"
 
-#: ../lib/python/Screens/MediaPlayer.py:45
+#: ../lib/python/Screens/MediaPlayer.py:47
 msgid "Artist:"
 msgstr "Artisti:"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1201
+#: ../lib/python/Screens/InfoBarGenerics.py:1224
 msgid "Audio Options..."
-msgstr ""
+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:377
-#: ../lib/python/Screens/ScanSetup.py:383
-#: ../lib/python/Screens/ScanSetup.py:385
-#: ../lib/python/Screens/ScanSetup.py:391
-#: ../lib/python/Screens/ScanSetup.py:395
-#: ../lib/python/Screens/ScanSetup.py:396
-#: ../lib/python/Screens/ScanSetup.py:397
-#: ../lib/python/Screens/ScanSetup.py:398
-#: ../lib/python/Screens/ScanSetup.py:399
-#: ../lib/python/Screens/ScanSetup.py:400
+#: ../lib/python/Screens/ScanSetup.py:376
+#: ../lib/python/Screens/ScanSetup.py:382
+#: ../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:715 ../data/
+#: ../lib/python/Screens/ScanSetup.py:702 ../data/
 msgid "Automatic Scan"
 msgstr "Automaattihaku"
 
-#: ../lib/python/Components/NimManager.py:750
+#: ../lib/python/Components/NimManager.py:760
 msgid "B"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:733
+#: ../lib/python/Components/NimManager.py:743
 msgid "BA"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:733
+#: ../lib/python/Components/NimManager.py:743
 msgid "BB"
 msgstr ""
 
@@ -222,11 +226,11 @@ msgstr "Mihin tallennetaan"
 msgid "Backup Mode"
 msgstr "Mitä tallennetaan"
 
-#: ../lib/python/Components/NimManager.py:728
+#: ../lib/python/Components/NimManager.py:738
 msgid "Band"
 msgstr "Taajuus"
 
-#: ../lib/python/Screens/ScanSetup.py:256
+#: ../lib/python/Screens/ScanSetup.py:247
 msgid "Bandwidth"
 msgstr "Kaistanleveys"
 
@@ -234,7 +238,7 @@ msgstr "Kaistanleveys"
 msgid "Bus: "
 msgstr "Väylä:"
 
-#: ../lib/python/Components/NimManager.py:744
+#: ../lib/python/Components/NimManager.py:754
 msgid "C-Band"
 msgstr "C-taajuusalue"
 
@@ -242,7 +246,7 @@ msgstr "C-taajuusalue"
 msgid "CF Drive"
 msgstr "CF-Asema"
 
-#: ../lib/python/Screens/ChannelSelection.py:704
+#: ../lib/python/Screens/ChannelSelection.py:735
 msgid "Cable"
 msgstr "Kaapeli"
 
@@ -250,7 +254,7 @@ msgstr "Kaapeli"
 msgid "Cable provider"
 msgstr "Kaapeli-TV operaattori"
 
-#: ../lib/python/Screens/Setup.py:95 ../lib/python/Screens/TimerEntry.py:25
+#: ../lib/python/Screens/Setup.py:87 ../lib/python/Screens/TimerEntry.py:25
 #: ../lib/python/Screens/TimeDateInput.py:16
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:75
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:165
@@ -279,13 +283,13 @@ msgstr "Klassinen"
 
 #: ../lib/python/Screens/TimerEdit.py:29
 msgid "Cleanup"
-msgstr "Tyhjennys"
+msgstr "Puhdista"
 
-#: ../lib/python/Screens/ScanSetup.py:222
-#: ../lib/python/Screens/ScanSetup.py:227
-#: ../lib/python/Screens/ScanSetup.py:249
-#: ../lib/python/Screens/ScanSetup.py:264
-#: ../lib/python/Screens/ScanSetup.py:703
+#: ../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
 msgid "Clear before scan"
 msgstr "Tyhjennä ennen hakua"
 
@@ -293,11 +297,11 @@ msgstr "Tyhjennä ennen hakua"
 msgid "Clear log"
 msgstr "Tyhjennä loki"
 
-#: ../lib/python/Screens/ScanSetup.py:257
+#: ../lib/python/Screens/ScanSetup.py:248
 msgid "Code rate high"
 msgstr "Koodin taso korkea"
 
-#: ../lib/python/Screens/ScanSetup.py:258
+#: ../lib/python/Screens/ScanSetup.py:249
 msgid "Code rate low"
 msgstr "Koodin taso alhainen"
 
@@ -310,8 +314,8 @@ msgstr "Käskyjen järjestys"
 msgid "Committed DiSEqC command"
 msgstr "Committed DiSEqC-käsky"
 
-#: ../lib/python/Screens/ScanSetup.py:353
-#: ../lib/python/Screens/ScanSetup.py:354
+#: ../lib/python/Screens/ScanSetup.py:344
+#: ../lib/python/Screens/ScanSetup.py:345
 msgid "Complete"
 msgstr "Valmis"
 
@@ -328,11 +332,11 @@ msgstr "Ajastinkonflikti"
 msgid "Current version:"
 msgstr "Nykyinen versio:"
 
-#: ../lib/python/Screens/ScanSetup.py:372
+#: ../lib/python/Screens/ScanSetup.py:363
 msgid "DVB-S"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:372
+#: ../lib/python/Screens/ScanSetup.py:363
 msgid "DVB-S2"
 msgstr ""
 
@@ -372,11 +376,11 @@ msgstr "Löytyi kiintolevy:"
 msgid "Detected NIMs:"
 msgstr "Löytyneet NIMit:"
 
-#: ../lib/python/Components/NimManager.py:692
+#: ../lib/python/Components/NimManager.py:702
 msgid "DiSEqC A/B"
 msgstr "DiSEqC A/B"
 
-#: ../lib/python/Components/NimManager.py:692
+#: ../lib/python/Components/NimManager.py:702
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
@@ -392,7 +396,7 @@ msgstr "DiSEqC-tila"
 msgid "DiSEqC repeats"
 msgstr "DiSEqC toistoja"
 
-#: ../lib/python/Screens/ScanSetup.py:231
+#: ../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
@@ -404,7 +408,7 @@ msgstr "DiSEqC toistoja"
 msgid "Disable"
 msgstr "Pois"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1024
+#: ../lib/python/Screens/InfoBarGenerics.py:1045
 msgid "Disable Picture in Picture"
 msgstr "Sulje Kuva Kuvassa-toiminto"
 
@@ -445,6 +449,10 @@ msgstr ""
 "Haluatko varmasti luoda varmuuskopion?\n"
 "Paina OK ja odota!"
 
+#: ../lib/python/Screens/InfoBarGenerics.py:1493
+msgid "Do you want to resume this playback?"
+msgstr ""
+
 #: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:50
 #: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:202
 msgid ""
@@ -470,7 +478,7 @@ msgstr "Ladataan tietoja lisäosista. Odota..."
 msgid "Dutch"
 msgstr "Hollantilainen"
 
-#: ../lib/python/Screens/ChannelSelection.py:712
+#: ../lib/python/Screens/ChannelSelection.py:743
 msgid "E"
 msgstr ""
 
@@ -479,12 +487,12 @@ msgstr ""
 msgid "ERROR - failed to scan (%s)!"
 msgstr "VIRHE - haku epäonnistui (%s)!"
 
-#: ../lib/python/Components/NimManager.py:699
-#: ../lib/python/Components/NimManager.py:760
+#: ../lib/python/Components/NimManager.py:709
+#: ../lib/python/Components/NimManager.py:770
 msgid "East"
 msgstr "Itä"
 
-#: ../lib/python/Screens/ScanSetup.py:231
+#: ../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
@@ -498,7 +506,7 @@ msgstr "Päälle"
 
 #: ../lib/python/Screens/Satconfig.py:74
 msgid "Enable 5V for active antenna"
-msgstr ""
+msgstr "Syötä 5V aktiiviselle antennille"
 
 #: ../lib/python/Screens/TimerEntry.py:188
 msgid "End"
@@ -514,11 +522,11 @@ msgstr "Loppuaika"
 msgid "English"
 msgstr "Englantilainen"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:322
+#: ../lib/python/Screens/InfoBarGenerics.py:342
 msgid "Enter main menu..."
-msgstr ""
+msgstr "Mene päävalikkoon..."
 
-#: ../lib/python/Components/NimManager.py:673
+#: ../lib/python/Components/NimManager.py:683
 msgid "Equal to Socket A"
 msgstr "Kuten Kanta A"
 
@@ -530,9 +538,9 @@ msgstr "Toimenpiteen edistyminen:"
 msgid "Execution finished!!"
 msgstr "Toimenpide valmis!"
 
-#: ../lib/python/Screens/ScanSetup.py:214
-#: ../lib/python/Screens/ScanSetup.py:216
-#: ../lib/python/Screens/ScanSetup.py:246
+#: ../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 ""
@@ -541,7 +549,7 @@ msgstr ""
 msgid "Fast DiSEqC"
 msgstr "Nopea DiSEqC"
 
-#: ../lib/python/Screens/ChannelSelection.py:448
+#: ../lib/python/Screens/ChannelSelection.py:477
 msgid "Favourites"
 msgstr "Suosikit"
 
@@ -553,9 +561,9 @@ msgstr "Suomalainen"
 msgid "French"
 msgstr "Ranskalainen"
 
-#: ../lib/python/Screens/ScanSetup.py:209
-#: ../lib/python/Screens/ScanSetup.py:242
-#: ../lib/python/Screens/ScanSetup.py:253
+#: ../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
 msgid "Frequency"
@@ -584,7 +592,7 @@ msgstr "Toiminto ei ole vielä käytössä"
 msgid "Gateway"
 msgstr "Yhdyskäytävä"
 
-#: ../lib/python/Screens/MediaPlayer.py:53
+#: ../lib/python/Screens/MediaPlayer.py:55
 msgid "Genre:"
 msgstr "Laji:"
 
@@ -606,7 +614,7 @@ msgstr ""
 msgid "Goto position"
 msgstr "Mene sijaintiin"
 
-#: ../lib/python/Screens/ScanSetup.py:261
+#: ../lib/python/Screens/ScanSetup.py:252
 msgid "Guard interval mode"
 msgstr "Suoja-aika asetus"
 
@@ -615,12 +623,12 @@ msgstr "Suoja-aika asetus"
 msgid "Harddisk"
 msgstr "Kiintolevy"
 
-#: ../lib/python/Screens/ScanSetup.py:262
+#: ../lib/python/Screens/ScanSetup.py:253
 msgid "Hierarchy mode"
 msgstr "Hierarkia-tila"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1167
-#: ../lib/python/Screens/InfoBarGenerics.py:1175
+#: ../lib/python/Screens/InfoBarGenerics.py:1190
+#: ../lib/python/Screens/InfoBarGenerics.py:1198
 msgid "How many minutes do you want to record?"
 msgstr "Kuinka monta minuuttia haluat tallentaa?"
 
@@ -645,7 +653,7 @@ msgstr "Tallennuksen onnistumiseksi, vaihdettiin tallennettavalle kanavalle!\n"
 msgid "Increased voltage"
 msgstr "Korotettu jännite"
 
-#: ../lib/python/Screens/Ci.py:290
+#: ../lib/python/Screens/Ci.py:313
 msgid "Init"
 msgstr "Alusta"
 
@@ -657,13 +665,13 @@ msgstr "Alusta"
 msgid "Initializing Harddisk..."
 msgstr "Alustetaan kiintolevyä..."
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1077
+#: ../lib/python/Screens/InfoBarGenerics.py:1100
 msgid "Instant Record..."
-msgstr ""
+msgstr "Välitön tallennus..."
 
-#: ../lib/python/Screens/ScanSetup.py:210
-#: ../lib/python/Screens/ScanSetup.py:243
-#: ../lib/python/Screens/ScanSetup.py:255
+#: ../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
 msgid "Inversion"
 msgstr "Käänteinen"
@@ -697,7 +705,7 @@ msgstr "Kielivalinta"
 msgid "Latitude"
 msgstr "leveysaste"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1241
+#: ../lib/python/Screens/InfoBarGenerics.py:1264
 msgid "Left"
 msgstr "Vasen"
 
@@ -722,7 +730,7 @@ msgstr "Rajat päälle"
 msgid "Longitude"
 msgstr "Pituusaste"
 
-#: ../lib/python/Components/NimManager.py:674
+#: ../lib/python/Components/NimManager.py:684
 msgid "Loopthrough to Socket A"
 msgstr "Läpisyöttö kytkentään A"
 
@@ -734,9 +742,9 @@ msgstr "Manuaalinen transponderi"
 msgid "Model: "
 msgstr "Malli:"
 
-#: ../lib/python/Screens/ScanSetup.py:217
-#: ../lib/python/Screens/ScanSetup.py:245
-#: ../lib/python/Screens/ScanSetup.py:259
+#: ../lib/python/Screens/ScanSetup.py:208
+#: ../lib/python/Screens/ScanSetup.py:236
+#: ../lib/python/Screens/ScanSetup.py:250
 msgid "Modulation"
 msgstr "Modulaatio"
 
@@ -754,7 +762,7 @@ msgstr "Ma-Pe"
 msgid "Monday"
 msgstr "Maanantai"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1025
+#: ../lib/python/Screens/InfoBarGenerics.py:1046
 msgid "Move Picture in Picture"
 msgstr "Siirrä Kuva Kuvassa-toimintoa"
 
@@ -774,11 +782,15 @@ msgstr "Elokuvavalikko"
 msgid "Multi EPG"
 msgstr "Moni EPG"
 
-#: ../lib/python/Screens/ScanSetup.py:352
+#: ../lib/python/Screens/Ci.py:324
+msgid "Multiple service support"
+msgstr "Usean palvelun tuki"
+
+#: ../lib/python/Screens/ScanSetup.py:343
 msgid "Multisat"
 msgstr "Usea satelliitti"
 
-#: ../lib/python/Components/NimManager.py:495
+#: ../lib/python/Components/NimManager.py:499
 msgid "N/A"
 msgstr "Ei saatavilla"
 
@@ -798,12 +810,12 @@ msgstr "Nimipalvelin"
 msgid "Netmask"
 msgstr "Verkkomaski"
 
-#: ../lib/python/Screens/ScanSetup.py:247
-#: ../lib/python/Screens/ScanSetup.py:254
+#: ../lib/python/Screens/ScanSetup.py:238
+#: ../lib/python/Screens/ScanSetup.py:245
 msgid "Network scan"
 msgstr "Verkkohaku"
 
-#: ../lib/python/Screens/ChannelSelection.py:696
+#: ../lib/python/Screens/ChannelSelection.py:727
 msgid "New"
 msgstr "Uusi"
 
@@ -815,21 +827,21 @@ msgstr "Uusi versio:"
 msgid "Next"
 msgstr "Seuraava"
 
-#: ../lib/python/Components/NimManager.py:729
-#: ../lib/python/Components/NimManager.py:749
-#: ../lib/python/Components/NimManager.py:753
-#: ../lib/python/Components/NimManager.py:754
+#: ../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
 msgid "No"
 msgstr "Ei"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1187
+#: ../lib/python/Screens/InfoBarGenerics.py:1210
 msgid "No HDD found or HDD not initialized!"
 msgstr ""
 "Kiintolevyä ei löydy tai\n"
 "kiintolevy alustamaton."
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1120
+#: ../lib/python/Screens/InfoBarGenerics.py:1143
 msgid "No event info found, recording indefinitely."
 msgstr "Ohjelmatietoa ei löydy, tallennetaan ilman ohjelmatietoja."
 
@@ -841,21 +853,19 @@ msgstr "Ei löytynyt moottoria ymmärtävää frontendiä."
 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:377
-#: ../lib/python/Screens/ScanSetup.py:385
-#: ../lib/python/Screens/ScanSetup.py:395
-#: ../lib/python/Screens/ScanSetup.py:396
-#: ../lib/python/Screens/ScanSetup.py:400
-#: ../lib/python/Components/NimManager.py:733
-#: ../lib/python/Components/NimManager.py:737
-#: ../lib/python/Components/NimManager.py:750
-#: ../lib/python/Components/NimManager.py:751
-#: ../lib/python/Components/NimManager.py:758
+#: ../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
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../lib/python/Components/NimManager.py:701
-#: ../lib/python/Components/NimManager.py:762
+#: ../lib/python/Components/NimManager.py:711
+#: ../lib/python/Components/NimManager.py:772
 msgid "North"
 msgstr "Pohjoinen"
 
@@ -863,12 +873,12 @@ msgstr "Pohjoinen"
 msgid "Norwegian"
 msgstr "Norjalainen"
 
-#: ../lib/python/Components/NimManager.py:675
+#: ../lib/python/Components/NimManager.py:685
 msgid "Nothing connected"
 msgstr "Ei kytketty"
 
-#: ../lib/python/Screens/ScanSetup.py:581
-#: ../lib/python/Screens/ScanSetup.py:646
+#: ../lib/python/Screens/ScanSetup.py:568
+#: ../lib/python/Screens/ScanSetup.py:633
 msgid ""
 "Nothing to scan!\n"
 "Please setup your tuner settings before you start a service scan."
@@ -876,23 +886,23 @@ msgstr ""
 "Ei mitään haettavaa!\n"
 "Määritä virittimen asetukset ennen kanavahakua."
 
-#: ../lib/python/Screens/Setup.py:94 ../lib/python/Screens/TimerEntry.py:24
+#: ../lib/python/Screens/Setup.py:86 ../lib/python/Screens/TimerEntry.py:24
 #: ../lib/python/Screens/TimeDateInput.py:15
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:74
 msgid "OK"
 msgstr "OK"
 
-#: ../lib/python/Components/NimManager.py:728
-#: ../lib/python/Components/NimManager.py:772
+#: ../lib/python/Components/NimManager.py:738
+#: ../lib/python/Components/NimManager.py:782
 msgid "Off"
 msgstr "Pois"
 
-#: ../lib/python/Components/NimManager.py:728
-#: ../lib/python/Components/NimManager.py:772
+#: ../lib/python/Components/NimManager.py:738
+#: ../lib/python/Components/NimManager.py:782
 msgid "On"
 msgstr "Päällä"
 
-#: ../lib/python/Components/NimManager.py:758
+#: ../lib/python/Components/NimManager.py:768
 msgid "One"
 msgstr "Yksi"
 
@@ -904,23 +914,28 @@ msgstr "Online-päivitys"
 msgid "Packet management"
 msgstr "Pakettienhallinta"
 
-#: ../lib/python/Screens/InfoBar.py:45
+#: ../lib/python/Screens/InfoBar.py:47
 msgid "Play recorded movies..."
 msgstr "Toista tallennetut elokuvat..."
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1034
+#: ../lib/python/Screens/InfoBarGenerics.py:1055
 msgid "Please choose an extension..."
 msgstr "Valitse laajennus..."
 
-#: ../lib/python/Screens/ChannelSelection.py:125
+#: ../lib/python/Screens/ChannelSelection.py:126
 msgid "Please enter a name for the new bouquet"
 msgstr "Anna uuden kanavanipun nimi"
 
+#: ../lib/python/Screens/ChannelSelection.py:160
+msgid "Please enter a name for the new marker"
+msgstr "Anna nimi uudelle merkille"
+
 #: ../lib/python/Screens/TimerEntry.py:320
 msgid "Please select a subservice to record..."
 msgstr "Valitse tallennettava alipalvelu..."
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1333
+#: ../lib/python/Screens/InfoBarGenerics.py:1361
+#: ../lib/python/Screens/SubservicesQuickzap.py:90
 msgid "Please select a subservice..."
 msgstr "Valitse alipalvelu..."
 
@@ -930,17 +945,20 @@ msgid ""
 "Press Bouquet +/- to resize the window.\n"
 "Press OK to go back to the TV mode or EXIT to cancel the moving."
 msgstr ""
+"Käytä nuolinappeja siirtääkseksi PiP-ikkunaa.\n"
+"Paina Bouquet +/- muuttaaksesi ikkunan kokoa.\n"
+"Paina OK päästäksesi takaisin TV-tilaan tai EXIT hylätäksesi siirron."
 
 #: ../lib/python/Screens/MovieSelection.py:79
 msgid "Please wait... Loading list..."
 msgstr "Odota... Listaa noudetaan..."
 
-#: ../lib/python/Screens/ScanSetup.py:212
+#: ../lib/python/Screens/ScanSetup.py:203
 #: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:404
 msgid "Polarity"
 msgstr "Polariteetti"
 
-#: ../lib/python/Components/NimManager.py:727
+#: ../lib/python/Components/NimManager.py:737
 msgid "Polarization"
 msgstr "Polarisaatio"
 
@@ -960,7 +978,7 @@ msgstr "Portti C"
 msgid "Port D"
 msgstr "Portti D"
 
-#: ../lib/python/Components/NimManager.py:692
+#: ../lib/python/Components/NimManager.py:702
 msgid "Positioner"
 msgstr "Moottori"
 
@@ -984,11 +1002,11 @@ msgstr "Ennalta määritelty satelliitti"
 msgid "Press OK to activate the settings."
 msgstr "Paina OK aktivoidaksesi asetukset."
 
-#: ../lib/python/Screens/ScanSetup.py:716
+#: ../lib/python/Screens/ScanSetup.py:703
 msgid "Press OK to scan"
 msgstr "Paina OK skannataksesi"
 
-#: ../lib/python/Screens/ScanSetup.py:169
+#: ../lib/python/Screens/ScanSetup.py:160
 msgid "Press OK to start the scan"
 msgstr "Paina OK aloittaaksesi skannauksen"
 
@@ -996,19 +1014,27 @@ msgstr "Paina OK aloittaaksesi skannauksen"
 msgid "Prev"
 msgstr "Edellinen"
 
-#: ../lib/python/Screens/ChannelSelection.py:447
-#: ../lib/python/Screens/ChannelSelection.py:587
+#: ../lib/python/Screens/ChannelSelection.py:476
+#: ../lib/python/Screens/ChannelSelection.py:618
 msgid "Provider"
 msgstr "Toimittaja"
 
-#: ../lib/python/Screens/ChannelSelection.py:694
+#: ../lib/python/Screens/ChannelSelection.py:725
 msgid "Providers"
 msgstr "Toimittajat"
 
+#: ../lib/python/Screens/InfoBarGenerics.py:1357
+msgid "Quickzap"
+msgstr ""
+
 #: ../lib/python/Screens/TimerEdit.py:107
 msgid "Really delete done timers?"
 msgstr "Poistetaanko menneet ajastukset?"
 
+#: ../lib/python/Screens/SubservicesQuickzap.py:101
+msgid "Really exit the subservices quickzap?"
+msgstr ""
+
 #: ../lib/python/Screens/EventView.py:74
 msgid "Recording"
 msgstr "Tallennetaan"
@@ -1025,11 +1051,11 @@ msgstr "Poista lisäosia"
 msgid "Repeat Type"
 msgstr "Toiston tyyppi"
 
-#: ../lib/python/Screens/MediaPlayer.py:345
+#: ../lib/python/Screens/MediaPlayer.py:347
 msgid "Replace current playlist"
 msgstr "Korvaa nykyinen soittolista"
 
-#: ../lib/python/Screens/Ci.py:289
+#: ../lib/python/Screens/Ci.py:312
 msgid "Reset"
 msgstr "Resetoi"
 
@@ -1038,7 +1064,7 @@ msgstr "Resetoi"
 msgid "Restore"
 msgstr "Palauta"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1241
+#: ../lib/python/Screens/InfoBarGenerics.py:1264
 msgid "Right"
 msgstr "Oikea"
 
@@ -1047,16 +1073,16 @@ msgstr "Oikea"
 msgid "Sat"
 msgstr "La"
 
-#: ../lib/python/Screens/ScanSetup.py:208
-#: ../lib/python/Screens/ScanSetup.py:221
+#: ../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
 msgid "Satellite"
 msgstr "Satelliitti"
 
-#: ../lib/python/Screens/ChannelSelection.py:446
-#: ../lib/python/Screens/ChannelSelection.py:589
+#: ../lib/python/Screens/ChannelSelection.py:475
+#: ../lib/python/Screens/ChannelSelection.py:620
 msgid "Satellites"
 msgstr "Satelliitit"
 
@@ -1065,8 +1091,8 @@ msgstr "Satelliitit"
 msgid "Saturday"
 msgstr "Lauantai"
 
-#: ../lib/python/Screens/ScanSetup.py:708
-#: ../lib/python/Screens/ScanSetup.py:712
+#: ../lib/python/Screens/ScanSetup.py:695
+#: ../lib/python/Screens/ScanSetup.py:699
 msgid "Scan NIM"
 msgstr "Skannaa NIM"
 
@@ -1078,15 +1104,15 @@ msgstr "Etsintä itään"
 msgid "Search west"
 msgstr "Etsintä länteen"
 
-#: ../lib/python/Components/NimManager.py:676
+#: ../lib/python/Components/NimManager.py:686
 msgid "Secondary cable from motorized LNB"
 msgstr "Toinen kaapeli moottorisoidulta mikropäältä"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1253
+#: ../lib/python/Screens/InfoBarGenerics.py:1276
 msgid "Select audio mode"
 msgstr "Valitse äänimuoto"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1242
+#: ../lib/python/Screens/InfoBarGenerics.py:1265
 msgid "Select audio track"
 msgstr "Valitse ääniraita"
 
@@ -1098,7 +1124,7 @@ msgstr "Valitse tallennettava kanava"
 msgid "Sequence repeat"
 msgstr "Vaiheen toisto"
 
-#: ../lib/python/Screens/ChannelSelection.py:698
+#: ../lib/python/Screens/ChannelSelection.py:729
 msgid "Services"
 msgstr "Kanavat"
 
@@ -1110,13 +1136,13 @@ msgstr "Aseta rajat"
 msgid "Settings"
 msgstr "Asetukset"
 
-#: ../lib/python/Screens/InfoBar.py:46
+#: ../lib/python/Screens/InfoBar.py:48
 msgid "Show the radio player..."
 msgstr "Näytä radiosoitin..."
 
-#: ../lib/python/Screens/InfoBar.py:47
+#: ../lib/python/Screens/InfoBar.py:49
 msgid "Show the tv player..."
-msgstr ""
+msgstr "Näytä tv..."
 
 #: ../lib/python/Screens/EventView.py:133
 msgid "Similar"
@@ -1126,12 +1152,12 @@ msgstr "Samanlainen"
 msgid "Similar broadcasts:"
 msgstr "Samantyyliset lähetykset:"
 
-#: ../lib/python/Components/NimManager.py:670
-#: ../lib/python/Components/NimManager.py:677
+#: ../lib/python/Components/NimManager.py:680
+#: ../lib/python/Components/NimManager.py:687
 msgid "Simple"
 msgstr "Yksinkertainen"
 
-#: ../lib/python/Components/NimManager.py:692
+#: ../lib/python/Components/NimManager.py:702
 msgid "Single"
 msgstr "Yksi"
 
@@ -1139,21 +1165,21 @@ msgstr "Yksi"
 msgid "Single EPG"
 msgstr "Yksi EPG"
 
-#: ../lib/python/Screens/ScanSetup.py:352
+#: ../lib/python/Screens/ScanSetup.py:343
 msgid "Single satellite"
 msgstr "Yksi satelliitti"
 
-#: ../lib/python/Screens/ScanSetup.py:352
-#: ../lib/python/Screens/ScanSetup.py:353
-#: ../lib/python/Screens/ScanSetup.py:354
+#: ../lib/python/Screens/ScanSetup.py:343
+#: ../lib/python/Screens/ScanSetup.py:344
+#: ../lib/python/Screens/ScanSetup.py:345
 msgid "Single transponder"
 msgstr "Yksi lähetin"
 
-#: ../lib/python/Components/NimManager.py:705
+#: ../lib/python/Components/NimManager.py:715
 msgid "Slot "
 msgstr "Lukija"
 
-#: ../lib/python/Components/NimManager.py:564
+#: ../lib/python/Components/NimManager.py:568
 msgid "Socket "
 msgstr "Pistoke"
 
@@ -1167,8 +1193,8 @@ msgstr ""
 "\n"
 "Valitse uusi kohde."
 
-#: ../lib/python/Components/NimManager.py:701
-#: ../lib/python/Components/NimManager.py:762
+#: ../lib/python/Components/NimManager.py:711
+#: ../lib/python/Components/NimManager.py:772
 msgid "South"
 msgstr "Etelä"
 
@@ -1180,7 +1206,7 @@ msgstr "Espanjalainen"
 msgid "Start"
 msgstr "Aloita"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1193
+#: ../lib/python/Screens/InfoBarGenerics.py:1216
 msgid "Start recording?"
 msgstr "Aloita tallennus?"
 
@@ -1200,7 +1226,7 @@ msgstr "Askel itään"
 msgid "Step west"
 msgstr "Askel länteen"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1241
+#: ../lib/python/Screens/InfoBarGenerics.py:1264
 msgid "Stereo"
 msgstr "Stereo"
 
@@ -1211,11 +1237,11 @@ msgstr "Stereo"
 msgid "Stop"
 msgstr "Pysäytä"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:935
+#: ../lib/python/Screens/InfoBarGenerics.py:955
 msgid "Stop Timeshift?"
 msgstr "Pysäytä aikasiirto?"
 
-#: ../lib/python/Screens/InfoBar.py:105
+#: ../lib/python/Screens/InfoBar.py:111
 msgid "Stop playing this movie?"
 msgstr "Pysäytä elokuvan toistaminen?"
 
@@ -1227,7 +1253,7 @@ msgstr "Tallenna sijainti"
 msgid "Stored position"
 msgstr "Tallennettu sijainti"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1271
+#: ../lib/python/Screens/InfoBarGenerics.py:1295
 msgid "Subservice list..."
 msgstr "Alipalvelulista..."
 
@@ -1241,7 +1267,7 @@ msgstr "Su"
 msgid "Sunday"
 msgstr "Sunnuntai"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1026
+#: ../lib/python/Screens/InfoBarGenerics.py:1047
 msgid "Swap services"
 msgstr "Vaihda palveluita"
 
@@ -1249,21 +1275,21 @@ msgstr "Vaihda palveluita"
 msgid "Swedish"
 msgstr "Ruotsalainen"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1276
+#: ../lib/python/Screens/InfoBarGenerics.py:1300
 msgid "Switch to next subservice"
 msgstr "Vaihda seuraavaan alipalveluun"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1277
+#: ../lib/python/Screens/InfoBarGenerics.py:1301
 msgid "Switch to previous subservice"
 msgstr "Vaihda edelliseen alipalveluun"
 
-#: ../lib/python/Screens/ScanSetup.py:211
-#: ../lib/python/Screens/ScanSetup.py:244
+#: ../lib/python/Screens/ScanSetup.py:202
+#: ../lib/python/Screens/ScanSetup.py:235
 #: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:403
 msgid "Symbol Rate"
 msgstr "Symboolinopeus"
 
-#: ../lib/python/Screens/ChannelSelection.py:706
+#: ../lib/python/Screens/ChannelSelection.py:737
 msgid "Terrestrial"
 msgstr "Maanpäällinen"
 
@@ -1271,7 +1297,7 @@ msgstr "Maanpäällinen"
 msgid "Terrestrial provider"
 msgstr "Terrestiaalioperaattori"
 
-#: ../lib/python/Components/NimManager.py:758
+#: ../lib/python/Components/NimManager.py:768
 msgid "Three"
 msgstr "Kolme"
 
@@ -1297,7 +1323,7 @@ msgstr "Aika"
 msgid "Timer Type"
 msgstr "Ajastimen tyyppi"
 
-#: ../lib/python/Screens/MediaPlayer.py:47
+#: ../lib/python/Screens/MediaPlayer.py:49
 msgid "Title:"
 msgstr "Otsikko:"
 
@@ -1314,11 +1340,11 @@ msgstr "Äänitila"
 msgid "Toneburst"
 msgstr "Äänipurske"
 
-#: ../lib/python/Components/NimManager.py:692
+#: ../lib/python/Components/NimManager.py:702
 msgid "Toneburst A/B"
 msgstr "Äänipurske A/B"
 
-#: ../lib/python/Screens/ScanSetup.py:260
+#: ../lib/python/Screens/ScanSetup.py:251
 msgid "Transmission mode"
 msgstr "Lähetystapa"
 
@@ -1326,7 +1352,7 @@ msgstr "Lähetystapa"
 msgid "Transponder"
 msgstr "Transponderi"
 
-#: ../lib/python/Screens/ScanSetup.py:206
+#: ../lib/python/Screens/ScanSetup.py:197
 msgid "Transpondertype"
 msgstr "Transponderityyppi"
 
@@ -1346,7 +1372,7 @@ msgstr "Tiistai"
 msgid "Tune"
 msgstr "Viritä"
 
-#: ../lib/python/Screens/ScanSetup.py:187
+#: ../lib/python/Screens/ScanSetup.py:178
 #: ../lib/python/Components/ServiceScan.py:75
 msgid "Tuner"
 msgstr "Viritin"
@@ -1355,17 +1381,17 @@ msgstr "Viritin"
 msgid "Turkish"
 msgstr "Turkkilainen"
 
-#: ../lib/python/Components/NimManager.py:758
+#: ../lib/python/Components/NimManager.py:768
 msgid "Two"
 msgstr "Kaksi"
 
-#: ../lib/python/Screens/ScanSetup.py:193
-#: ../lib/python/Screens/ScanSetup.py:196
-#: ../lib/python/Screens/ScanSetup.py:199
+#: ../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:697
+#: ../lib/python/Components/NimManager.py:707
 msgid "USALS"
 msgstr "USALS"
 
@@ -1387,7 +1413,7 @@ msgstr ""
 msgid "Uncommitted DiSEqC command"
 msgstr "Uncommitted DiSEqC-käsky"
 
-#: ../lib/python/Components/NimManager.py:744
+#: ../lib/python/Components/NimManager.py:754
 msgid "Universal LNB"
 msgstr "Universaali LNB"
 
@@ -1407,19 +1433,19 @@ msgstr "Käytä DHCP"
 msgid "Use usals for this sat"
 msgstr "Käytä USALS tälle satelliitille"
 
-#: ../lib/python/Components/NimManager.py:744
+#: ../lib/python/Components/NimManager.py:754
 msgid "User defined"
 msgstr "Käyttäjän määrittelemä"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1575
+#: ../lib/python/Screens/InfoBarGenerics.py:1631
 msgid "View teletext..."
-msgstr ""
+msgstr "näytä tekstitv..."
 
 #: ../lib/python/Screens/Satconfig.py:110
 msgid "Voltage mode"
 msgstr "Jännitetila"
 
-#: ../lib/python/Screens/ChannelSelection.py:710
+#: ../lib/python/Screens/ChannelSelection.py:741
 msgid "W"
 msgstr ""
 
@@ -1437,20 +1463,20 @@ msgstr "Keskiviikko"
 msgid "Weekday"
 msgstr "Viikonpäivä"
 
-#: ../lib/python/Components/NimManager.py:699
-#: ../lib/python/Components/NimManager.py:760
+#: ../lib/python/Components/NimManager.py:709
+#: ../lib/python/Components/NimManager.py:770
 msgid "West"
 msgstr "Länsi"
 
-#: ../lib/python/Screens/MediaPlayer.py:51
+#: ../lib/python/Screens/MediaPlayer.py:53
 msgid "Year:"
 msgstr "Vuosi:"
 
-#: ../lib/python/Components/NimManager.py:729
-#: ../lib/python/Components/NimManager.py:749
-#: ../lib/python/Components/NimManager.py:753
-#: ../lib/python/Components/NimManager.py:754
+#: ../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
 msgid "Yes"
 msgstr "Kyllä"
 
@@ -1458,7 +1484,7 @@ msgstr "Kyllä"
 msgid "You cannot delete this!"
 msgstr "Et voi poistaa tätä!"
 
-#: ../lib/python/Screens/MediaPlayer.py:346
+#: ../lib/python/Screens/MediaPlayer.py:348
 msgid "You selected a playlist"
 msgstr "Valitsit soittolistan"
 
@@ -1470,23 +1496,23 @@ msgstr ""
 "Front-prosessori on päivitettävä.\n"
 "Paina OK aloittaaksesi päivityksen."
 
-#: ../lib/python/Screens/ChannelSelection.py:328
+#: ../lib/python/Screens/ChannelSelection.py:357
 msgid "[bouquet edit]"
 msgstr "[kanavanippujen muokkaus]"
 
-#: ../lib/python/Screens/ChannelSelection.py:330
+#: ../lib/python/Screens/ChannelSelection.py:359
 msgid "[favourite edit]"
 msgstr "[suosikkien muokkaus]"
 
-#: ../lib/python/Screens/ChannelSelection.py:413
+#: ../lib/python/Screens/ChannelSelection.py:442
 msgid "[move mode]"
 msgstr "[siirtotila]"
 
-#: ../lib/python/Screens/ChannelSelection.py:110
+#: ../lib/python/Screens/ChannelSelection.py:111
 msgid "abort bouquet edit"
 msgstr "peruuta kanavanippujen muokkaus"
 
-#: ../lib/python/Screens/ChannelSelection.py:113
+#: ../lib/python/Screens/ChannelSelection.py:114
 msgid "abort favourites edit"
 msgstr "peruuta suosikkien muokkaus"
 
@@ -1494,30 +1520,34 @@ msgstr "peruuta suosikkien muokkaus"
 msgid "about to start"
 msgstr "aloittamassa"
 
-#: ../lib/python/Screens/ChannelSelection.py:99
-msgid "add bouquet..."
-msgstr "lisää kanavanippu..."
+#: ../lib/python/Screens/ChannelSelection.py:93
+msgid "add bouquet"
+msgstr "lisää kanavanippu"
 
-#: ../lib/python/Screens/MediaPlayer.py:295
+#: ../lib/python/Screens/MediaPlayer.py:297
 msgid "add directory to playlist"
 msgstr "lisää hakemisto soittolistalle"
 
-#: ../lib/python/Screens/MediaPlayer.py:297
+#: ../lib/python/Screens/MediaPlayer.py:299
 msgid "add file to playlist"
 msgstr "lisää tiedosto soittolistalle"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1191
-#: ../lib/python/Screens/InfoBarGenerics.py:1193
+#: ../lib/python/Screens/ChannelSelection.py:99
+msgid "add marker"
+msgstr "lisää merkki"
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1214
+#: ../lib/python/Screens/InfoBarGenerics.py:1216
 msgid "add recording (enter recording duration)"
 msgstr "tallenna (syötä tallennuksen kesto)"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1191
-#: ../lib/python/Screens/InfoBarGenerics.py:1193
+#: ../lib/python/Screens/InfoBarGenerics.py:1214
+#: ../lib/python/Screens/InfoBarGenerics.py:1216
 msgid "add recording (indefinitely)"
 msgstr "tallenna (jatkuva)"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1191
-#: ../lib/python/Screens/InfoBarGenerics.py:1193
+#: ../lib/python/Screens/InfoBarGenerics.py:1214
+#: ../lib/python/Screens/InfoBarGenerics.py:1216
 msgid "add recording (stop after current event)"
 msgstr "tallenna (lopeta nykyisen ohjelman jälkeen)"
 
@@ -1538,29 +1568,29 @@ msgstr ""
 "seuraavan varmuuskopion:\n"
 
 #: ../lib/python/Screens/MovieSelection.py:24
-#: ../lib/python/Screens/ChannelSelection.py:115
+#: ../lib/python/Screens/ChannelSelection.py:116
 msgid "back"
 msgstr "takaisin"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1191
+#: ../lib/python/Screens/InfoBarGenerics.py:1214
 msgid "change recording (duration)"
 msgstr "muokkaa tallennusta (kesto)"
 
-#: ../lib/python/Screens/ScanSetup.py:376
+#: ../lib/python/Screens/ScanSetup.py:367
 msgid "circular left"
 msgstr "Kiertopolarisaatio vasen"
 
-#: ../lib/python/Screens/ScanSetup.py:376
+#: ../lib/python/Screens/ScanSetup.py:367
 msgid "circular right"
 msgstr "Kiertopolarisaatio oikea"
 
-#: ../lib/python/Screens/MediaPlayer.py:301
+#: ../lib/python/Screens/MediaPlayer.py:303
 msgid "clear playlist"
 msgstr "tyhjennä soittolista"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:563
+#: ../lib/python/Screens/InfoBarGenerics.py:583
 msgid "continue"
-msgstr ""
+msgstr "jatka"
 
 #: ../lib/python/Screens/ChannelSelection.py:85
 msgid "copy to favourites"
@@ -1570,7 +1600,7 @@ msgstr "kopioi suosikkeihin"
 msgid "daily"
 msgstr "päivittäinen"
 
-#: ../lib/python/Screens/MediaPlayer.py:300
+#: ../lib/python/Screens/MediaPlayer.py:302
 msgid "delete"
 msgstr "poista"
 
@@ -1578,16 +1608,16 @@ msgstr "poista"
 msgid "delete..."
 msgstr "poista..."
 
-#: ../lib/python/Screens/ChannelSelection.py:106
+#: ../lib/python/Screens/ChannelSelection.py:107
 msgid "disable move mode"
 msgstr "poistu siirtotilasta"
 
 #: ../lib/python/Screens/TimerEntry.py:99
-#: ../lib/python/Screens/InfoBarGenerics.py:1191
+#: ../lib/python/Screens/InfoBarGenerics.py:1214
 msgid "do nothing"
 msgstr "älä tee mitään"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1193
+#: ../lib/python/Screens/InfoBarGenerics.py:1216
 msgid "don't record"
 msgstr "älä tallenna"
 
@@ -1595,27 +1625,27 @@ msgstr "älä tallenna"
 msgid "done!"
 msgstr "valmis!"
 
-#: ../lib/python/Components/NimManager.py:566
+#: ../lib/python/Components/NimManager.py:570
 msgid "empty/unknown"
 msgstr "tyhjä/tuntematon"
 
-#: ../lib/python/Screens/ChannelSelection.py:102
+#: ../lib/python/Screens/ChannelSelection.py:103
 msgid "enable bouquet edit"
 msgstr "ota kanavanippujen muokkaustila käyttöön"
 
-#: ../lib/python/Screens/ChannelSelection.py:104
+#: ../lib/python/Screens/ChannelSelection.py:105
 msgid "enable favourite edit"
 msgstr "ota suosikkien muokkaustila käyttöön"
 
-#: ../lib/python/Screens/ChannelSelection.py:98
+#: ../lib/python/Screens/ChannelSelection.py:100
 msgid "enable move mode"
 msgstr "ota siirtotila käyttöön"
 
-#: ../lib/python/Screens/ChannelSelection.py:109
+#: ../lib/python/Screens/ChannelSelection.py:110
 msgid "end bouquet edit"
 msgstr "lopeta kanavanippujen muokkaus"
 
-#: ../lib/python/Screens/ChannelSelection.py:112
+#: ../lib/python/Screens/ChannelSelection.py:113
 msgid "end favourites edit"
 msgstr "lopeta suosikkien muokkaus"
 
@@ -1631,27 +1661,27 @@ msgstr "täysi /etc hakemisto"
 msgid "go to deep standby"
 msgstr "mene syvään valmiustilaan"
 
-#: ../lib/python/Screens/InfoBar.py:60
+#: ../lib/python/Screens/InfoBar.py:62
 msgid "hear radio..."
-msgstr ""
+msgstr "kuuntele radiota..."
 
-#: ../lib/python/Screens/MediaPlayer.py:302
+#: ../lib/python/Screens/MediaPlayer.py:304
 msgid "hide player"
 msgstr "piilota soitin"
 
-#: ../lib/python/Screens/ScanSetup.py:376
+#: ../lib/python/Screens/ScanSetup.py:367
 msgid "horizontal"
 msgstr "horisontaali"
 
-#: ../lib/python/Screens/Ci.py:295 ../lib/python/Screens/Ci.py:315
+#: ../lib/python/Screens/Ci.py:318 ../lib/python/Screens/Ci.py:340
 msgid "init module"
 msgstr "alusta moduuli"
 
-#: ../lib/python/Screens/InfoBar.py:91
+#: ../lib/python/Screens/InfoBar.py:96
 msgid "leave movie player..."
 msgstr "poistu elokuvatoistimesta..."
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1252
+#: ../lib/python/Screens/InfoBarGenerics.py:1275
 msgid "left"
 msgstr "vasen"
 
@@ -1660,14 +1690,14 @@ msgstr "vasen"
 msgid "list"
 msgstr "listaa"
 
-#: ../lib/python/Components/NimManager.py:697
+#: ../lib/python/Components/NimManager.py:707
 msgid "manual"
 msgstr "manuaali"
 
 #: ../lib/python/Components/TimerList.py:48
 #: ../lib/python/Components/TimerList.py:53
 msgid "mins"
-msgstr "minuutit"
+msgstr "minuuttia"
 
 #: ../lib/python/Screens/InfoBarGenerics.py:260
 msgid "next channel"
@@ -1677,16 +1707,16 @@ msgstr "seuraava kanava"
 msgid "next channel in history"
 msgstr "seuraava kanava historiassa"
 
-#: ../lib/python/Screens/ScanSetup.py:355
-#: ../lib/python/Screens/ScanSetup.py:387
-#: ../lib/python/Screens/ScanSetup.py:401
-#: ../lib/python/Screens/ScanSetup.py:406
-#: ../lib/python/Screens/ScanSetup.py:702
-#: ../lib/python/Screens/ScanSetup.py:704
-#: ../lib/python/Screens/ScanSetup.py:711
+#: ../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:7
+#: ../lib/python/Components/RecordingConfig.py:8
 msgid "no"
 msgstr "ei"
 
@@ -1694,7 +1724,7 @@ msgstr "ei"
 msgid "no HDD found"
 msgstr "kiintolevyä ei löydy"
 
-#: ../lib/python/Screens/Ci.py:293 ../lib/python/Screens/Ci.py:313
+#: ../lib/python/Screens/Ci.py:316 ../lib/python/Screens/Ci.py:338
 msgid "no module found"
 msgstr "moduleita ei löydy"
 
@@ -1702,15 +1732,15 @@ msgstr "moduleita ei löydy"
 msgid "none"
 msgstr "ei yhtään"
 
+#: ../lib/python/Screens/ScanSetup.py:365
 #: ../lib/python/Screens/ScanSetup.py:374
-#: ../lib/python/Screens/ScanSetup.py:383
-#: ../lib/python/Screens/ScanSetup.py:391
+#: ../lib/python/Screens/ScanSetup.py:382
 msgid "off"
 msgstr "pois"
 
+#: ../lib/python/Screens/ScanSetup.py:365
 #: ../lib/python/Screens/ScanSetup.py:374
-#: ../lib/python/Screens/ScanSetup.py:383
-#: ../lib/python/Screens/ScanSetup.py:391
+#: ../lib/python/Screens/ScanSetup.py:382
 msgid "on"
 msgstr "päällä"
 
@@ -1724,25 +1754,25 @@ msgstr "vain /etc/enigma2 hakemisto"
 
 #: ../lib/python/Screens/InfoBarGenerics.py:263
 msgid "open servicelist"
-msgstr ""
+msgstr "avaa palvelulista"
 
 #: ../lib/python/Screens/InfoBarGenerics.py:258
 msgid "open servicelist(down)"
-msgstr ""
+msgstr "avaa palvelulista(alaspäin)"
 
 #: ../lib/python/Screens/InfoBarGenerics.py:257
 msgid "open servicelist(up)"
-msgstr ""
+msgstr "avaa palvelulista(ylöspäin)"
 
 #: ../lib/python/Components/ServiceScan.py:75
 msgid "pass"
 msgstr "hyväksytty"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:562
+#: ../lib/python/Screens/InfoBarGenerics.py:582
 msgid "pause"
-msgstr ""
+msgstr "tauko"
 
-#: ../lib/python/Screens/Ci.py:79
+#: ../lib/python/Screens/Ci.py:86
 msgid "please press OK when ready"
 msgstr "paina OK kun olet valmis"
 
@@ -1766,23 +1796,20 @@ msgstr "tallennetaan..."
 msgid "remove all new found flags"
 msgstr "poista kaikki uusi kanava-liput"
 
-#: ../lib/python/Screens/ChannelSelection.py:93
-msgid "remove bouquet"
-msgstr "poista kanavanippu"
+#: ../lib/python/Screens/ChannelSelection.py:89
+#: ../lib/python/Screens/ChannelSelection.py:94
+msgid "remove entry"
+msgstr "poista merkintä"
 
 #: ../lib/python/Screens/ChannelSelection.py:91
 msgid "remove new found flag"
 msgstr "poista uusi kanava-lippu"
 
-#: ../lib/python/Screens/ChannelSelection.py:89
-msgid "remove service"
-msgstr "poista kanava"
-
 #: ../lib/python/Screens/TimerEntry.py:100
 msgid "repeated"
 msgstr "toistuva"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1252
+#: ../lib/python/Screens/InfoBarGenerics.py:1275
 msgid "right"
 msgstr "oikea"
 
@@ -1824,43 +1851,43 @@ msgstr ""
 msgid "scan state"
 msgstr "haun tila"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:374
+#: ../lib/python/Screens/InfoBarGenerics.py:394
 msgid "show EPG..."
 msgstr "näytä EPG..."
 
-#: ../lib/python/Screens/InfoBarGenerics.py:336
+#: ../lib/python/Screens/InfoBarGenerics.py:356
 msgid "show event details"
 msgstr "näytä ohjelman tarkemmat tiedot"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:568
+#: ../lib/python/Screens/InfoBarGenerics.py:588
 msgid "skip backward"
-msgstr ""
+msgstr "siirry taaksepäin"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:565
+#: ../lib/python/Screens/InfoBarGenerics.py:585
 msgid "skip forward"
-msgstr ""
+msgstr "siirry eteenpäin"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:877
+#: ../lib/python/Screens/InfoBarGenerics.py:897
 msgid "start timeshift"
-msgstr ""
+msgstr "aloita ajansiirto"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1252
+#: ../lib/python/Screens/InfoBarGenerics.py:1275
 msgid "stereo"
 msgstr "stereo"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1191
+#: ../lib/python/Screens/InfoBarGenerics.py:1214
 msgid "stop recording"
 msgstr "lopeta tallennus"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:878
+#: ../lib/python/Screens/InfoBarGenerics.py:898
 msgid "stop timeshift"
-msgstr ""
+msgstr "Pysäytä ajansiirto"
 
-#: ../lib/python/Screens/MediaPlayer.py:299
+#: ../lib/python/Screens/MediaPlayer.py:301
 msgid "switch to filelist"
 msgstr "vaihda tiedostolistaan"
 
-#: ../lib/python/Screens/MediaPlayer.py:293
+#: ../lib/python/Screens/MediaPlayer.py:295
 msgid "switch to playlist"
 msgstr "vaihda soittolistaan"
 
@@ -1880,17 +1907,17 @@ msgstr "tuntematon kanava"
 msgid "user defined"
 msgstr "käyttäjän määrittelemä"
 
-#: ../lib/python/Screens/ScanSetup.py:376
+#: ../lib/python/Screens/ScanSetup.py:367
 msgid "vertical"
 msgstr "vertikaali"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1010
+#: ../lib/python/Screens/InfoBarGenerics.py:1031
 msgid "view extensions..."
-msgstr ""
+msgstr "näytä laajennukset..."
 
-#: ../lib/python/Screens/InfoBar.py:59
+#: ../lib/python/Screens/InfoBar.py:61
 msgid "view recordings..."
-msgstr ""
+msgstr "näytä tallenteet..."
 
 #: ../lib/python/Components/TimerList.py:57
 msgid "waiting"
@@ -1900,21 +1927,21 @@ msgstr "odottaa"
 msgid "weekly"
 msgstr "viikottainen"
 
-#: ../lib/python/Screens/ScanSetup.py:355
-#: ../lib/python/Screens/ScanSetup.py:387
-#: ../lib/python/Screens/ScanSetup.py:401
-#: ../lib/python/Screens/ScanSetup.py:406
-#: ../lib/python/Screens/ScanSetup.py:702
-#: ../lib/python/Screens/ScanSetup.py:704
-#: ../lib/python/Screens/ScanSetup.py:711
+#: ../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:7
+#: ../lib/python/Components/RecordingConfig.py:8
 msgid "yes"
 msgstr "kyllä"
 
-#: ../lib/python/Screens/ScanSetup.py:355
-#: ../lib/python/Screens/ScanSetup.py:702
+#: ../lib/python/Screens/ScanSetup.py:346
+#: ../lib/python/Screens/ScanSetup.py:689
 msgid "yes (keep feeds)"
 msgstr "kyllä (pidä feedit)"
 
@@ -1946,10 +1973,6 @@ msgstr "Verkkoasetukset"
 msgid "Games / Plugins"
 msgstr "Pelit / Lisäosat"
 
-#: ../data/
-msgid "Hide error windows"
-msgstr "Piilota virheikkunat"
-
 #: ../data/
 msgid "help..."
 msgstr "apua..."
@@ -1992,8 +2015,8 @@ msgid "TV System"
 msgstr "TV järjestelmä"
 
 #: ../data/
-msgid "#ffffff"
-msgstr ""
+msgid "Alternative radio mode"
+msgstr "Vaihtoehtoinen radiomuoto"
 
 #: ../data/
 msgid "NEXT"
@@ -2011,6 +2034,10 @@ msgstr ""
 msgid "Deep Standby"
 msgstr "Syvä valmiustila"
 
+#: ../data/
+msgid "Show positioner movement"
+msgstr "Näytä moottorin liikkuminen"
+
 #: ../data/
 msgid "Tuner Slot"
 msgstr "Viritinpaikka"
@@ -2031,10 +2058,6 @@ msgstr ""
 "Käytä ylös/alas näppäimiä kauko-ohjaimessasi valitaksesi vaihtoehdon. Paina "
 "sitten OK."
 
-#: ../data/
-msgid "Show Satposition"
-msgstr "Näytä satelliitin sijainti"
-
 #: ../data/
 msgid "Do you want to view a tutorial?"
 msgstr "Haluatko katsoa opasohjelman?"
@@ -2068,8 +2091,8 @@ msgid "Sat / Dish Setup"
 msgstr "Antenniasetukset"
 
 #: ../data/
-msgid "Visualize positioner movement"
-msgstr "Näytä kääntömoottorin liike"
+msgid "#ffffff"
+msgstr ""
 
 #: ../data/
 msgid ""
@@ -2081,21 +2104,13 @@ msgstr ""
 "Paina OK aloittaaksesi varmuuskopioinnin."
 
 #: ../data/
-msgid "Audio / Video"
-msgstr "Ääni / Kuva"
-
-#: ../data/
-msgid "Yes, do another manual scan now"
-msgstr "Kyllä, tee toinen käsinhaku nyt"
+msgid "Mute"
+msgstr "Mykistä"
 
 #: ../data/
 msgid "Service Searching"
 msgstr "Kanavahaku"
 
-#: ../data/
-msgid "Mute"
-msgstr "Mykistä"
-
 #: ../data/
 msgid ""
 "Welcome to the Image upgrade wizard. The wizard will assist you in upgrading "
@@ -2111,40 +2126,50 @@ msgid "Keyboard Map"
 msgstr "Näppäimistökartta"
 
 #: ../data/
-msgid "Keyboard Setup"
-msgstr "Näppäimistön asetukset"
+msgid "Enable multiple bouquets"
+msgstr "Käytä useaa kanavanippua"
 
 #: ../data/
-msgid "Dish"
-msgstr "Antenni"
+msgid "Keyboard Setup"
+msgstr "Näppäimistön asetukset"
 
 #: ../data/
-msgid "Record Splitsize"
-msgstr "Tallennusten tiedostokoko"
+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 "Auto show inforbar"
-msgstr "Näytä tietopalkki automaattisesti"
+msgid "Dish"
+msgstr "Antenni"
 
 #: ../data/
 msgid "Margin after record"
 msgstr "Lisäaika tallenteen loppuun (minuuttia)"
 
 #: ../data/
-msgid "Network"
-msgstr "Verkko"
-
-#: ../data/
-msgid "Invert"
-msgstr "Käänteinen"
+msgid "#ffffffff"
+msgstr ""
 
 #: ../data/
 msgid "System"
 msgstr "Järjestelmä"
 
 #: ../data/
-msgid "use power delta"
-msgstr "käytä power delta"
+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"
@@ -2155,8 +2180,8 @@ msgid "Manual Scan"
 msgstr "Käsinhaku"
 
 #: ../data/
-msgid "OSD Settings"
-msgstr "OSD asetukset"
+msgid "Timer Edit"
+msgstr "Ajastimen muokkaus"
 
 #: ../data/
 msgid "RC Menu"
@@ -2166,9 +2191,13 @@ msgstr "Kauko-ohjaimen valikko"
 msgid "No, just start my dreambox"
 msgstr "Ei, käynnistä vain Dreambox"
 
+#: ../data/
+msgid "Network..."
+msgstr "Verkko..."
+
 #: ../data/
 msgid "Tuner configuration"
-msgstr ""
+msgstr "Viritinasetukset"
 
 #: ../data/
 msgid "select Slot"
@@ -2195,12 +2224,12 @@ msgid "Exit the wizard"
 msgstr "Poistu velhosta"
 
 #: ../data/
-msgid "Fast zapping"
-msgstr "Nopea vaihto"
+msgid "OSD Settings"
+msgstr "OSD asetukset"
 
 #: ../data/
-msgid "Usage Settings"
-msgstr "Käyttöasetukset"
+msgid "RF output"
+msgstr "RF-ulostulo"
 
 #: ../data/
 msgid "Brightness"
@@ -2211,8 +2240,8 @@ msgid "Standby"
 msgstr "Valmiustila"
 
 #: ../data/
-msgid "Timer Edit"
-msgstr "Ajastimen muokkaus"
+msgid "Yes, do another manual scan now"
+msgstr "Kyllä, tee toinen käsinhaku nyt"
 
 #: ../data/
 msgid "Activate network settings"
@@ -2234,10 +2263,6 @@ msgstr "Tallenna"
 msgid "Yes, view the tutorial"
 msgstr "Kyllä, katso opasohjelma"
 
-#: ../data/
-msgid "UHF Modulator"
-msgstr "UHF modulaattori"
-
 #: ../data/
 msgid "Color Format"
 msgstr "Väriformaatti"
@@ -2247,8 +2272,8 @@ msgid "#f23d21"
 msgstr ""
 
 #: ../data/
-msgid "Enigma1 like radiomode"
-msgstr ""
+msgid "Plugin browser"
+msgstr "Lisäosien selaus"
 
 #: ../data/
 msgid "#80000000"
@@ -2260,7 +2285,7 @@ msgstr ""
 
 #: ../data/
 msgid "Timeshift"
-msgstr ""
+msgstr "Aikasiirto"
 
 #: ../data/
 msgid "Downloadable plugins"
@@ -2270,10 +2295,6 @@ msgstr "Ladattavat lisäosat"
 msgid "Subservices"
 msgstr "Alipalvelut"
 
-#: ../data/
-msgid "LCD"
-msgstr ""
-
 #: ../data/
 msgid "Timezone"
 msgstr "Aikavyöhyke"
@@ -2295,8 +2316,8 @@ msgid "Common Interface"
 msgstr ""
 
 #: ../data/
-msgid "Ask before zapping"
-msgstr "Kysy ennen vaihtoa"
+msgid "Language..."
+msgstr "Kieli..."
 
 #: ../data/
 msgid ""
@@ -2385,6 +2406,14 @@ msgstr "Verkkoasetukset"
 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 "
@@ -2399,14 +2428,6 @@ msgstr "PiP-Asetukset"
 msgid "Menu"
 msgstr "Valikko"
 
-#: ../data/
-msgid "Plugin browser"
-msgstr "Lisäosien selaus"
-
-#: ../data/
-msgid "Parental Lock"
-msgstr "Lapsilukko"
-
 #: ../data/
 msgid "Restart"
 msgstr "Uudelleenkäynnistä"
@@ -2478,10 +2499,6 @@ msgstr "Laitteesi on sammumassa. Odota..."
 msgid "WSS on 4:3"
 msgstr "WSS 4:3"
 
-#: ../data/
-msgid "Skip confirmations"
-msgstr "Ohita varmistukset"
-
 #: ../data/
 msgid "Choose bouquet"
 msgstr "Valitse kanavanippu"
@@ -2515,8 +2532,8 @@ msgid "USB"
 msgstr ""
 
 #: ../data/
-msgid "Timer log"
-msgstr "Ajastinloki"
+msgid "Invert display"
+msgstr "käänteinen näyttö"
 
 #: ../data/
 msgid "Do you want to restore your settings?"
@@ -2526,14 +2543,6 @@ msgstr "Haluatko palauttaa asetukset?"
 msgid "Please set up tuner B"
 msgstr "Aseta viritin B."
 
-#: ../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 "Delay"
 msgstr "Viive"
@@ -2542,39 +2551,17 @@ msgstr "Viive"
 msgid "Select HDD"
 msgstr "Valitse kiintolevy"
 
-#: ../data/
-msgid "#ffffffff"
-msgstr ""
-
-#: ../data/
-msgid "Setup Lock"
-msgstr "Asetuslukko"
-
 #: ../data/
 msgid "Aspect Ratio"
 msgstr "Kuvasuhde"
 
 #: ../data/
-msgid "Expert Setup"
-msgstr "Eksperttiasetukset"
-
-#: ../data/
-msgid "Language"
-msgstr "Kieli"
-
-#: ../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"
+msgid "Recordings always have priority"
+msgstr "Tallennuksilla on aina etuoikeus"
 
 #: ../data/
-msgid "Parental Control"
-msgstr "Lapsilukko"
+msgid "Customize"
+msgstr "Sovita"
 
 #: ../data/
 msgid "#389416"
@@ -2596,10 +2583,6 @@ msgstr "Valitse elokuva"
 msgid "Volume"
 msgstr "Äänenvoimakkuus"
 
-#: ../data/
-msgid "Multi bouquets"
-msgstr "Monta kanavanippua"
-
 #: ../data/
 msgid "#33294a6b"
 msgstr ""
@@ -2656,13 +2639,9 @@ msgstr ""
 msgid "What do you want to scan?"
 msgstr "Mitä haluat etsiä?"
 
-#: ../data/
-msgid "Usage settings"
-msgstr "Käyttöasetukset"
-
 #: ../data/
 msgid "Now Playing"
-msgstr ""
+msgstr "Nyt Soi"
 
 #: ../data/
 msgid "Channellist menu"
@@ -2673,8 +2652,8 @@ msgid "Audio"
 msgstr "Ääni"
 
 #: ../data/
-msgid "Do you want to do a service scan?"
-msgstr "Haluatko tehdä kanavahaun?"
+msgid "Harddisk..."
+msgstr "Kiintolevy..."
 
 #: ../data/
 msgid "NOW"
@@ -2695,15 +2674,3 @@ msgstr "Mediasoitin"
 #: ../data/
 msgid "Do you want to do another manual service scan?"
 msgstr "Haluatko tehdä uuden käsinhaun?"
-
-#~ msgid "Timeshift not possible!"
-#~ msgstr "Ajansiirto ei ole mahdollinen!"
-
-#~ msgid "open service list"
-#~ msgstr "avaa palvelulista"
-
-#~ msgid "Timeshifting"
-#~ msgstr "Ajansiirto"
-
-#~ msgid "Satelliteconfig"
-#~ msgstr "Viritinasetukset"