code cleanup

[enigma2.git] / po / fi.po

diff --git a/po/fi.po b/po/fi.po
index b42faeed58a637aeaafe29d588d0afab98c09aae..a749caed5186ca218f691b75dca31a6d68a71a88 100755 (executable)
--- 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-06-19 06:38+0300\n"
-"PO-Revision-Date: 2006-06-19 16:18+0200\n"
+"POT-Creation-Date: 2006-07-20 20:32+0200\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
@@ -80,7 +80,7 @@ msgstr ""
 msgid "12 V"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:149
+#: ../lib/python/Screens/Satconfig.py:150
 msgid "12V Output"
 msgstr "12V lähtö"
 
@@ -96,11 +96,15 @@ msgstr ""
 msgid "<unknown>"
 msgstr "<tuntematon>"
 
+#: ../lib/python/Screens/Setup.py:128
+msgid "??"
+msgstr ""
+
 #: ../lib/python/Components/NimManager.py:750
 msgid "A"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1199
+#: ../lib/python/Screens/InfoBarGenerics.py:1211
 msgid ""
 "A recording is currently running.\n"
 "What do you want to do?"
@@ -128,7 +132,7 @@ msgstr ""
 msgid "AB"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1036
+#: ../lib/python/Screens/InfoBarGenerics.py:1042
 msgid "Activate Picture in Picture"
 msgstr "Käynnistä Kuva Kuvassa-toiminto"
 
@@ -136,7 +140,7 @@ msgstr "Käynnistä Kuva Kuvassa-toiminto"
 msgid "Add"
 msgstr "Lisää"
 
-#: ../lib/python/Screens/MediaPlayer.py:326
+#: ../lib/python/Screens/MediaPlayer.py:344
 msgid "Add files to playlist"
 msgstr "Lisää tiedostot soittolistalle"
 
@@ -159,8 +163,8 @@ msgstr "Tapahtuman jälkeen"
 msgid "Album:"
 msgstr "Albumi:"
 
-#: ../lib/python/Screens/ChannelSelection.py:447
-#: ../lib/python/Screens/ChannelSelection.py:593
+#: ../lib/python/Screens/ChannelSelection.py:474
+#: ../lib/python/Screens/ChannelSelection.py:622
 msgid "All"
 msgstr "Kaikki"
 
@@ -172,22 +176,26 @@ msgstr "Arabialainen"
 msgid "Artist:"
 msgstr "Artisti:"
 
-#: ../lib/python/Screens/ScanSetup.py:317
-#: ../lib/python/Screens/ScanSetup.py:320
-#: ../lib/python/Screens/ScanSetup.py:326
-#: ../lib/python/Screens/ScanSetup.py:327
-#: ../lib/python/Screens/ScanSetup.py:328
-#: ../lib/python/Screens/ScanSetup.py:334
-#: ../lib/python/Screens/ScanSetup.py:338
-#: ../lib/python/Screens/ScanSetup.py:339
-#: ../lib/python/Screens/ScanSetup.py:340
-#: ../lib/python/Screens/ScanSetup.py:341
-#: ../lib/python/Screens/ScanSetup.py:342
-#: ../lib/python/Screens/ScanSetup.py:343
+#: ../lib/python/Screens/InfoBarGenerics.py:1221
+msgid "Audio Options..."
+msgstr "Äänivalinnat"
+
+#: ../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/Ci.py:24
 msgid "Auto"
 msgstr "Automaattinen"
 
-#: ../lib/python/Screens/ScanSetup.py:656
+#: ../lib/python/Screens/ScanSetup.py:715
 #: ../data/
 msgid "Automatic Scan"
 msgstr "Automaattihaku"
@@ -220,7 +228,7 @@ msgstr "Mitä tallennetaan"
 msgid "Band"
 msgstr "Taajuus"
 
-#: ../lib/python/Screens/ScanSetup.py:248
+#: ../lib/python/Screens/ScanSetup.py:256
 msgid "Bandwidth"
 msgstr "Kaistanleveys"
 
@@ -236,7 +244,7 @@ msgstr "C-taajuusalue"
 msgid "CF Drive"
 msgstr "CF-Asema"
 
-#: ../lib/python/Screens/ChannelSelection.py:706
+#: ../lib/python/Screens/ChannelSelection.py:735
 msgid "Cable"
 msgstr "Kaapeli"
 
@@ -244,7 +252,7 @@ msgstr "Kaapeli"
 msgid "Cable provider"
 msgstr "Kaapeli-TV operaattori"
 
-#: ../lib/python/Screens/Setup.py:143
+#: ../lib/python/Screens/Setup.py:84
 #: ../lib/python/Screens/TimerEntry.py:25
 #: ../lib/python/Screens/TimeDateInput.py:16
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:75
@@ -261,7 +269,7 @@ msgstr "Kapasiteetti:"
 msgid "Channel"
 msgstr "Kanava"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:149
+#: ../lib/python/Screens/InfoBarGenerics.py:150
 msgid "Channel:"
 msgstr "Kanava:"
 
@@ -275,13 +283,13 @@ msgstr "Klassinen"
 
 #: ../lib/python/Screens/TimerEdit.py:29
 msgid "Cleanup"
-msgstr "Tyhjennys"
+msgstr "Puhdista"
 
-#: ../lib/python/Screens/ScanSetup.py:214
-#: ../lib/python/Screens/ScanSetup.py:219
-#: ../lib/python/Screens/ScanSetup.py:241
-#: ../lib/python/Screens/ScanSetup.py:256
-#: ../lib/python/Screens/ScanSetup.py:645
+#: ../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
 msgid "Clear before scan"
 msgstr "Tyhjennä ennen hakua"
 
@@ -289,30 +297,30 @@ msgstr "Tyhjennä ennen hakua"
 msgid "Clear log"
 msgstr "Tyhjennä loki"
 
-#: ../lib/python/Screens/ScanSetup.py:249
+#: ../lib/python/Screens/ScanSetup.py:257
 msgid "Code rate high"
 msgstr "Koodin taso korkea"
 
-#: ../lib/python/Screens/ScanSetup.py:250
+#: ../lib/python/Screens/ScanSetup.py:258
 msgid "Code rate low"
 msgstr "Koodin taso alhainen"
 
-#: ../lib/python/Screens/Satconfig.py:129
-#: ../lib/python/Screens/Satconfig.py:131
+#: ../lib/python/Screens/Satconfig.py:130
+#: ../lib/python/Screens/Satconfig.py:132
 msgid "Command order"
 msgstr "Käskyjen järjestys"
 
-#: ../lib/python/Screens/Satconfig.py:125
+#: ../lib/python/Screens/Satconfig.py:126
 msgid "Committed DiSEqC command"
 msgstr "Committed DiSEqC-käsky"
 
-#: ../lib/python/Screens/ScanSetup.py:296
-#: ../lib/python/Screens/ScanSetup.py:297
+#: ../lib/python/Screens/ScanSetup.py:353
+#: ../lib/python/Screens/ScanSetup.py:354
 msgid "Complete"
 msgstr "Valmis"
 
 #: ../lib/python/Screens/Satconfig.py:49
-#: ../lib/python/Screens/Satconfig.py:154
+#: ../lib/python/Screens/Satconfig.py:155
 #: ../data/
 msgid "Configuration Mode"
 msgstr "Muokkaustila"
@@ -325,11 +333,11 @@ msgstr "Ajastinkonflikti"
 msgid "Current version:"
 msgstr "Nykyinen versio:"
 
-#: ../lib/python/Screens/ScanSetup.py:315
+#: ../lib/python/Screens/ScanSetup.py:372
 msgid "DVB-S"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:315
+#: ../lib/python/Screens/ScanSetup.py:372
 msgid "DVB-S2"
 msgstr ""
 
@@ -381,15 +389,15 @@ msgstr "DiSEqC A/B/C/D"
 msgid "DiSEqC Mode"
 msgstr "DiSEqC-Tila"
 
-#: ../lib/python/Screens/Satconfig.py:121
+#: ../lib/python/Screens/Satconfig.py:122
 msgid "DiSEqC mode"
 msgstr "DiSEqC-tila"
 
-#: ../lib/python/Screens/Satconfig.py:133
+#: ../lib/python/Screens/Satconfig.py:134
 msgid "DiSEqC repeats"
 msgstr "DiSEqC toistoja"
 
-#: ../lib/python/Screens/ScanSetup.py:223
+#: ../lib/python/Screens/ScanSetup.py:231
 #: ../lib/python/Screens/TimerEdit.py:83
 #: ../lib/python/Components/Lcd.py:31
 #: ../lib/python/Components/SetupDevices.py:38
@@ -402,7 +410,7 @@ msgstr "DiSEqC toistoja"
 msgid "Disable"
 msgstr "Pois"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1038
+#: ../lib/python/Screens/InfoBarGenerics.py:1044
 msgid "Disable Picture in Picture"
 msgstr "Sulje Kuva Kuvassa-toiminto"
 
@@ -468,7 +476,7 @@ msgstr "Ladataan tietoja lisäosista. Odota..."
 msgid "Dutch"
 msgstr "Hollantilainen"
 
-#: ../lib/python/Screens/ChannelSelection.py:714
+#: ../lib/python/Screens/ChannelSelection.py:743
 msgid "E"
 msgstr ""
 
@@ -482,7 +490,7 @@ msgstr "VIRHE - haku epäonnistui (%s)!"
 msgid "East"
 msgstr "Itä"
 
-#: ../lib/python/Screens/ScanSetup.py:223
+#: ../lib/python/Screens/ScanSetup.py:231
 #: ../lib/python/Screens/TimerEdit.py:81
 #: ../lib/python/Components/Lcd.py:31
 #: ../lib/python/Components/SetupDevices.py:38
@@ -495,6 +503,10 @@ msgstr "Itä"
 msgid "Enable"
 msgstr "Päälle"
 
+#: ../lib/python/Screens/Satconfig.py:74
+msgid "Enable 5V for active antenna"
+msgstr "Syötä 5V aktiiviselle antennille"
+
 #: ../lib/python/Screens/TimerEntry.py:188
 msgid "End"
 msgstr "Lopeta"
@@ -509,6 +521,10 @@ msgstr "Loppuaika"
 msgid "English"
 msgstr "Englantilainen"
 
+#: ../lib/python/Screens/InfoBarGenerics.py:342
+msgid "Enter main menu..."
+msgstr "Mene päävalikkoon..."
+
 #: ../lib/python/Components/NimManager.py:673
 msgid "Equal to Socket A"
 msgstr "Kuten Kanta A"
@@ -521,22 +537,18 @@ msgstr "Toimenpiteen edistyminen:"
 msgid "Execution finished!!"
 msgstr "Toimenpide valmis!"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1373
-msgid "Extensions"
-msgstr "Laajennukset"
-
-#: ../lib/python/Screens/ScanSetup.py:206
-#: ../lib/python/Screens/ScanSetup.py:208
-#: ../lib/python/Screens/ScanSetup.py:238
+#: ../lib/python/Screens/ScanSetup.py:214
+#: ../lib/python/Screens/ScanSetup.py:216
+#: ../lib/python/Screens/ScanSetup.py:246
 #: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:405
 msgid "FEC"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:126
+#: ../lib/python/Screens/Satconfig.py:127
 msgid "Fast DiSEqC"
 msgstr "Nopea DiSEqC"
 
-#: ../lib/python/Screens/ChannelSelection.py:450
+#: ../lib/python/Screens/ChannelSelection.py:477
 msgid "Favourites"
 msgstr "Suosikit"
 
@@ -548,9 +560,9 @@ msgstr "Suomalainen"
 msgid "French"
 msgstr "Ranskalainen"
 
-#: ../lib/python/Screens/ScanSetup.py:201
-#: ../lib/python/Screens/ScanSetup.py:234
-#: ../lib/python/Screens/ScanSetup.py:245
+#: ../lib/python/Screens/ScanSetup.py:209
+#: ../lib/python/Screens/ScanSetup.py:242
+#: ../lib/python/Screens/ScanSetup.py:253
 #: ../lib/python/Screens/TimerEntry.py:160
 #: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:401
 msgid "Frequency"
@@ -602,7 +614,7 @@ msgstr ""
 msgid "Goto position"
 msgstr "Mene sijaintiin"
 
-#: ../lib/python/Screens/ScanSetup.py:253
+#: ../lib/python/Screens/ScanSetup.py:261
 msgid "Guard interval mode"
 msgstr "Suoja-aika asetus"
 
@@ -611,12 +623,12 @@ msgstr "Suoja-aika asetus"
 msgid "Harddisk"
 msgstr "Kiintolevy"
 
-#: ../lib/python/Screens/ScanSetup.py:254
+#: ../lib/python/Screens/ScanSetup.py:262
 msgid "Hierarchy mode"
 msgstr "Hierarkia-tila"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1175
-#: ../lib/python/Screens/InfoBarGenerics.py:1183
+#: ../lib/python/Screens/InfoBarGenerics.py:1187
+#: ../lib/python/Screens/InfoBarGenerics.py:1195
 msgid "How many minutes do you want to record?"
 msgstr "Kuinka monta minuuttia haluat tallentaa?"
 
@@ -637,11 +649,11 @@ msgstr "Image-päivitys"
 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:150
+#: ../lib/python/Screens/Satconfig.py:151
 msgid "Increased voltage"
 msgstr "Korotettu jännite"
 
-#: ../lib/python/Screens/Ci.py:286
+#: ../lib/python/Screens/Ci.py:313
 msgid "Init"
 msgstr "Alusta"
 
@@ -653,9 +665,13 @@ msgstr "Alusta"
 msgid "Initializing Harddisk..."
 msgstr "Alustetaan kiintolevyä..."
 
-#: ../lib/python/Screens/ScanSetup.py:202
-#: ../lib/python/Screens/ScanSetup.py:235
-#: ../lib/python/Screens/ScanSetup.py:247
+#: ../lib/python/Screens/InfoBarGenerics.py:1097
+msgid "Instant Record..."
+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/Plugins/SystemPlugins/PositionerSetup/plugin.py:402
 msgid "Inversion"
 msgstr "Käänteinen"
@@ -664,19 +680,19 @@ msgstr "Käänteinen"
 msgid "Italian"
 msgstr "Italialainen"
 
-#: ../lib/python/Screens/Satconfig.py:118
+#: ../lib/python/Screens/Satconfig.py:119
 msgid "LNB"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:143
+#: ../lib/python/Screens/Satconfig.py:144
 msgid "LOF"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:147
+#: ../lib/python/Screens/Satconfig.py:148
 msgid "LOF/H"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:146
+#: ../lib/python/Screens/Satconfig.py:147
 msgid "LOF/L"
 msgstr ""
 
@@ -686,12 +702,12 @@ msgid "Language selection"
 msgstr "Kielivalinta"
 
 #: ../lib/python/Screens/Satconfig.py:28
-#: ../lib/python/Screens/Satconfig.py:137
+#: ../lib/python/Screens/Satconfig.py:138
 #: ../data/
 msgid "Latitude"
 msgstr "leveysaste"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1249
+#: ../lib/python/Screens/InfoBarGenerics.py:1261
 msgid "Left"
 msgstr "Vasen"
 
@@ -712,7 +728,7 @@ msgid "Limits on"
 msgstr "Rajat päälle"
 
 #: ../lib/python/Screens/Satconfig.py:26
-#: ../lib/python/Screens/Satconfig.py:135
+#: ../lib/python/Screens/Satconfig.py:136
 #: ../data/
 msgid "Longitude"
 msgstr "Pituusaste"
@@ -729,9 +745,9 @@ msgstr "Manuaalinen transponderi"
 msgid "Model: "
 msgstr "Malli:"
 
-#: ../lib/python/Screens/ScanSetup.py:209
-#: ../lib/python/Screens/ScanSetup.py:237
-#: ../lib/python/Screens/ScanSetup.py:251
+#: ../lib/python/Screens/ScanSetup.py:217
+#: ../lib/python/Screens/ScanSetup.py:245
+#: ../lib/python/Screens/ScanSetup.py:259
 msgid "Modulation"
 msgstr "Modulaatio"
 
@@ -749,7 +765,7 @@ msgstr "Ma-Pe"
 msgid "Monday"
 msgstr "Maanantai"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1039
+#: ../lib/python/Screens/InfoBarGenerics.py:1045
 msgid "Move Picture in Picture"
 msgstr "Siirrä Kuva Kuvassa-toimintoa"
 
@@ -769,7 +785,11 @@ msgstr "Elokuvavalikko"
 msgid "Multi EPG"
 msgstr "Moni EPG"
 
-#: ../lib/python/Screens/ScanSetup.py:295
+#: ../lib/python/Screens/Ci.py:324
+msgid "Multiple service support"
+msgstr "Usean palvelun tuki"
+
+#: ../lib/python/Screens/ScanSetup.py:352
 msgid "Multisat"
 msgstr "Usea satelliitti"
 
@@ -795,12 +815,12 @@ msgstr "Nimipalvelin"
 msgid "Netmask"
 msgstr "Verkkomaski"
 
-#: ../lib/python/Screens/ScanSetup.py:239
-#: ../lib/python/Screens/ScanSetup.py:246
+#: ../lib/python/Screens/ScanSetup.py:247
+#: ../lib/python/Screens/ScanSetup.py:254
 msgid "Network scan"
 msgstr "Verkkohaku"
 
-#: ../lib/python/Screens/ChannelSelection.py:698
+#: ../lib/python/Screens/ChannelSelection.py:727
 msgid "New"
 msgstr "Uusi"
 
@@ -812,6 +832,7 @@ msgstr "Uusi versio:"
 msgid "Next"
 msgstr "Seuraava"
 
+#: ../lib/python/Screens/Ci.py:24
 #: ../lib/python/Components/NimManager.py:729
 #: ../lib/python/Components/NimManager.py:749
 #: ../lib/python/Components/NimManager.py:753
@@ -820,13 +841,13 @@ msgstr "Seuraava"
 msgid "No"
 msgstr "Ei"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1195
+#: ../lib/python/Screens/InfoBarGenerics.py:1207
 msgid "No HDD found or HDD not initialized!"
 msgstr ""
 "Kiintolevyä ei löydy tai\n"
 "kiintolevy alustamaton."
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1128
+#: ../lib/python/Screens/InfoBarGenerics.py:1140
 msgid "No event info found, recording indefinitely."
 msgstr "Ohjelmatietoa ei löydy, tallennetaan ilman ohjelmatietoja."
 
@@ -838,11 +859,11 @@ 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:320
-#: ../lib/python/Screens/ScanSetup.py:328
-#: ../lib/python/Screens/ScanSetup.py:338
-#: ../lib/python/Screens/ScanSetup.py:339
-#: ../lib/python/Screens/ScanSetup.py:343
+#: ../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
@@ -864,8 +885,8 @@ msgstr "Norjalainen"
 msgid "Nothing connected"
 msgstr "Ei kytketty"
 
-#: ../lib/python/Screens/ScanSetup.py:524
-#: ../lib/python/Screens/ScanSetup.py:589
+#: ../lib/python/Screens/ScanSetup.py:581
+#: ../lib/python/Screens/ScanSetup.py:646
 msgid ""
 "Nothing to scan!\n"
 "Please setup your tuner settings before you start a service scan."
@@ -873,7 +894,7 @@ msgstr ""
 "Ei mitään haettavaa!\n"
 "Määritä virittimen asetukset ennen kanavahakua."
 
-#: ../lib/python/Screens/Setup.py:142
+#: ../lib/python/Screens/Setup.py:83
 #: ../lib/python/Screens/TimerEntry.py:24
 #: ../lib/python/Screens/TimeDateInput.py:15
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:74
@@ -881,10 +902,12 @@ msgid "OK"
 msgstr "OK"
 
 #: ../lib/python/Components/NimManager.py:728
+#: ../lib/python/Components/NimManager.py:772
 msgid "Off"
 msgstr "Pois"
 
 #: ../lib/python/Components/NimManager.py:728
+#: ../lib/python/Components/NimManager.py:772
 msgid "On"
 msgstr "Päällä"
 
@@ -904,27 +927,41 @@ msgstr "Pakettienhallinta"
 msgid "Play recorded movies..."
 msgstr "Toista tallennetut elokuvat..."
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1048
+#: ../lib/python/Screens/InfoBarGenerics.py:1054
 msgid "Please choose an extension..."
 msgstr "Valitse laajennus..."
 
-#: ../lib/python/Screens/ChannelSelection.py:127
+#: ../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:1341
+#: ../lib/python/Screens/InfoBarGenerics.py:1353
 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"
+"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:204
+#: ../lib/python/Screens/ScanSetup.py:212
 #: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:404
 msgid "Polarity"
 msgstr "Polariteetti"
@@ -973,11 +1010,11 @@ msgstr "Ennalta määritelty satelliitti"
 msgid "Press OK to activate the settings."
 msgstr "Paina OK aktivoidaksesi asetukset."
 
-#: ../lib/python/Screens/ScanSetup.py:657
+#: ../lib/python/Screens/ScanSetup.py:716
 msgid "Press OK to scan"
 msgstr "Paina OK skannataksesi"
 
-#: ../lib/python/Screens/ScanSetup.py:161
+#: ../lib/python/Screens/ScanSetup.py:169
 msgid "Press OK to start the scan"
 msgstr "Paina OK aloittaaksesi skannauksen"
 
@@ -985,12 +1022,12 @@ msgstr "Paina OK aloittaaksesi skannauksen"
 msgid "Prev"
 msgstr "Edellinen"
 
-#: ../lib/python/Screens/ChannelSelection.py:449
-#: ../lib/python/Screens/ChannelSelection.py:589
+#: ../lib/python/Screens/ChannelSelection.py:476
+#: ../lib/python/Screens/ChannelSelection.py:618
 msgid "Provider"
 msgstr "Toimittaja"
 
-#: ../lib/python/Screens/ChannelSelection.py:696
+#: ../lib/python/Screens/ChannelSelection.py:725
 msgid "Providers"
 msgstr "Toimittajat"
 
@@ -998,10 +1035,6 @@ msgstr "Toimittajat"
 msgid "Really delete done timers?"
 msgstr "Poistetaanko menneet ajastukset?"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1357
-msgid "Record"
-msgstr "Tallenna"
-
 #: ../lib/python/Screens/EventView.py:74
 msgid "Recording"
 msgstr "Tallennetaan"
@@ -1018,11 +1051,11 @@ msgstr "Poista lisäosia"
 msgid "Repeat Type"
 msgstr "Toiston tyyppi"
 
-#: ../lib/python/Screens/MediaPlayer.py:327
+#: ../lib/python/Screens/MediaPlayer.py:345
 msgid "Replace current playlist"
 msgstr "Korvaa nykyinen soittolista"
 
-#: ../lib/python/Screens/Ci.py:285
+#: ../lib/python/Screens/Ci.py:312
 msgid "Reset"
 msgstr "Resetoi"
 
@@ -1031,7 +1064,7 @@ msgstr "Resetoi"
 msgid "Restore"
 msgstr "Palauta"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1249
+#: ../lib/python/Screens/InfoBarGenerics.py:1261
 msgid "Right"
 msgstr "Oikea"
 
@@ -1040,17 +1073,17 @@ msgstr "Oikea"
 msgid "Sat"
 msgstr "La"
 
-#: ../lib/python/Screens/ScanSetup.py:200
-#: ../lib/python/Screens/ScanSetup.py:213
+#: ../lib/python/Screens/ScanSetup.py:208
+#: ../lib/python/Screens/ScanSetup.py:221
 #: ../lib/python/Screens/Satconfig.py:13
 #: ../lib/python/Screens/Satconfig.py:63
-#: ../lib/python/Screens/Satconfig.py:156
+#: ../lib/python/Screens/Satconfig.py:157
 #: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:398
 msgid "Satellite"
 msgstr "Satelliitti"
 
-#: ../lib/python/Screens/ChannelSelection.py:448
-#: ../lib/python/Screens/ChannelSelection.py:591
+#: ../lib/python/Screens/ChannelSelection.py:475
+#: ../lib/python/Screens/ChannelSelection.py:620
 msgid "Satellites"
 msgstr "Satelliitit"
 
@@ -1059,8 +1092,8 @@ msgstr "Satelliitit"
 msgid "Saturday"
 msgstr "Lauantai"
 
-#: ../lib/python/Screens/ScanSetup.py:650
-#: ../lib/python/Screens/ScanSetup.py:653
+#: ../lib/python/Screens/ScanSetup.py:708
+#: ../lib/python/Screens/ScanSetup.py:712
 msgid "Scan NIM"
 msgstr "Skannaa NIM"
 
@@ -1076,11 +1109,11 @@ msgstr "Etsintä länteen"
 msgid "Secondary cable from motorized LNB"
 msgstr "Toinen kaapeli moottorisoidulta mikropäältä"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1261
+#: ../lib/python/Screens/InfoBarGenerics.py:1273
 msgid "Select audio mode"
 msgstr "Valitse äänimuoto"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1250
+#: ../lib/python/Screens/InfoBarGenerics.py:1262
 msgid "Select audio track"
 msgstr "Valitse ääniraita"
 
@@ -1088,11 +1121,11 @@ msgstr "Valitse ääniraita"
 msgid "Select channel to record from"
 msgstr "Valitse tallennettava kanava"
 
-#: ../lib/python/Screens/Satconfig.py:127
+#: ../lib/python/Screens/Satconfig.py:128
 msgid "Sequence repeat"
 msgstr "Vaiheen toisto"
 
-#: ../lib/python/Screens/ChannelSelection.py:700
+#: ../lib/python/Screens/ChannelSelection.py:729
 msgid "Services"
 msgstr "Kanavat"
 
@@ -1108,6 +1141,10 @@ msgstr "Asetukset"
 msgid "Show the radio player..."
 msgstr "Näytä radiosoitin..."
 
+#: ../lib/python/Screens/InfoBar.py:47
+msgid "Show the tv player..."
+msgstr "Näytä tv..."
+
 #: ../lib/python/Screens/EventView.py:133
 msgid "Similar"
 msgstr "Samanlainen"
@@ -1129,13 +1166,13 @@ msgstr "Yksi"
 msgid "Single EPG"
 msgstr "Yksi EPG"
 
-#: ../lib/python/Screens/ScanSetup.py:295
+#: ../lib/python/Screens/ScanSetup.py:352
 msgid "Single satellite"
 msgstr "Yksi satelliitti"
 
-#: ../lib/python/Screens/ScanSetup.py:295
-#: ../lib/python/Screens/ScanSetup.py:296
-#: ../lib/python/Screens/ScanSetup.py:297
+#: ../lib/python/Screens/ScanSetup.py:352
+#: ../lib/python/Screens/ScanSetup.py:353
+#: ../lib/python/Screens/ScanSetup.py:354
 msgid "Single transponder"
 msgstr "Yksi lähetin"
 
@@ -1170,7 +1207,7 @@ msgstr "Espanjalainen"
 msgid "Start"
 msgstr "Aloita"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1201
+#: ../lib/python/Screens/InfoBarGenerics.py:1213
 msgid "Start recording?"
 msgstr "Aloita tallennus?"
 
@@ -1190,7 +1227,7 @@ msgstr "Askel itään"
 msgid "Step west"
 msgstr "Askel länteen"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1249
+#: ../lib/python/Screens/InfoBarGenerics.py:1261
 msgid "Stereo"
 msgstr "Stereo"
 
@@ -1201,7 +1238,7 @@ msgstr "Stereo"
 msgid "Stop"
 msgstr "Pysäytä"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:949
+#: ../lib/python/Screens/InfoBarGenerics.py:955
 msgid "Stop Timeshift?"
 msgstr "Pysäytä aikasiirto?"
 
@@ -1213,19 +1250,14 @@ msgstr "Pysäytä elokuvan toistaminen?"
 msgid "Store position"
 msgstr "Tallenna sijainti"
 
-#: ../lib/python/Screens/Satconfig.py:115
+#: ../lib/python/Screens/Satconfig.py:116
 msgid "Stored position"
 msgstr "Tallennettu sijainti"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1279
+#: ../lib/python/Screens/InfoBarGenerics.py:1291
 msgid "Subservice list..."
 msgstr "Alipalvelulista..."
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1362
-#: ../data/
-msgid "Subservices"
-msgstr "Alipalvelut"
-
 #: ../lib/python/Screens/EpgSelection.py:235
 #: ../lib/python/Components/TimerList.py:34
 msgid "Sun"
@@ -1236,7 +1268,7 @@ msgstr "Su"
 msgid "Sunday"
 msgstr "Sunnuntai"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1040
+#: ../lib/python/Screens/InfoBarGenerics.py:1046
 msgid "Swap services"
 msgstr "Vaihda palveluita"
 
@@ -1244,21 +1276,21 @@ msgstr "Vaihda palveluita"
 msgid "Swedish"
 msgstr "Ruotsalainen"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1284
+#: ../lib/python/Screens/InfoBarGenerics.py:1296
 msgid "Switch to next subservice"
 msgstr "Vaihda seuraavaan alipalveluun"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1285
+#: ../lib/python/Screens/InfoBarGenerics.py:1297
 msgid "Switch to previous subservice"
 msgstr "Vaihda edelliseen alipalveluun"
 
-#: ../lib/python/Screens/ScanSetup.py:203
-#: ../lib/python/Screens/ScanSetup.py:236
+#: ../lib/python/Screens/ScanSetup.py:211
+#: ../lib/python/Screens/ScanSetup.py:244
 #: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:403
 msgid "Symbol Rate"
 msgstr "Symboolinopeus"
 
-#: ../lib/python/Screens/ChannelSelection.py:708
+#: ../lib/python/Screens/ChannelSelection.py:737
 msgid "Terrestrial"
 msgstr "Maanpäällinen"
 
@@ -1270,7 +1302,7 @@ msgstr "Terrestiaalioperaattori"
 msgid "Three"
 msgstr "Kolme"
 
-#: ../lib/python/Screens/Satconfig.py:148
+#: ../lib/python/Screens/Satconfig.py:149
 msgid "Threshold"
 msgstr "Kynnys"
 
@@ -1292,14 +1324,6 @@ msgstr "Aika"
 msgid "Timer Type"
 msgstr "Ajastimen tyyppi"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:921
-msgid "Timeshift not possible!"
-msgstr "Ajansiirto ei ole mahdollinen!"
-
-#: ../lib/python/Screens/InfoBarGenerics.py:1366
-msgid "Timeshifting"
-msgstr "Ajansiirto"
-
 #: ../lib/python/Screens/MediaPlayer.py:47
 msgid "Title:"
 msgstr "Otsikko:"
@@ -1309,11 +1333,11 @@ msgstr "Otsikko:"
 msgid "Today"
 msgstr "Tänään"
 
-#: ../lib/python/Screens/Satconfig.py:110
+#: ../lib/python/Screens/Satconfig.py:111
 msgid "Tone mode"
 msgstr "Äänitila"
 
-#: ../lib/python/Screens/Satconfig.py:124
+#: ../lib/python/Screens/Satconfig.py:125
 msgid "Toneburst"
 msgstr "Äänipurske"
 
@@ -1321,7 +1345,7 @@ msgstr "Äänipurske"
 msgid "Toneburst A/B"
 msgstr "Äänipurske A/B"
 
-#: ../lib/python/Screens/ScanSetup.py:252
+#: ../lib/python/Screens/ScanSetup.py:260
 msgid "Transmission mode"
 msgstr "Lähetystapa"
 
@@ -1329,7 +1353,7 @@ msgstr "Lähetystapa"
 msgid "Transponder"
 msgstr "Transponderi"
 
-#: ../lib/python/Screens/ScanSetup.py:198
+#: ../lib/python/Screens/ScanSetup.py:206
 msgid "Transpondertype"
 msgstr "Transponderityyppi"
 
@@ -1349,7 +1373,7 @@ msgstr "Tiistai"
 msgid "Tune"
 msgstr "Viritä"
 
-#: ../lib/python/Screens/ScanSetup.py:179
+#: ../lib/python/Screens/ScanSetup.py:187
 #: ../lib/python/Components/ServiceScan.py:75
 msgid "Tuner"
 msgstr "Viritin"
@@ -1362,9 +1386,9 @@ msgstr "Turkkilainen"
 msgid "Two"
 msgstr "Kaksi"
 
-#: ../lib/python/Screens/ScanSetup.py:185
-#: ../lib/python/Screens/ScanSetup.py:188
-#: ../lib/python/Screens/ScanSetup.py:191
+#: ../lib/python/Screens/ScanSetup.py:193
+#: ../lib/python/Screens/ScanSetup.py:196
+#: ../lib/python/Screens/ScanSetup.py:199
 msgid "Type of scan"
 msgstr "Skannauksen tyyppi"
 
@@ -1386,7 +1410,7 @@ msgstr ""
 "Katso ohjeita levyn ohjekirjasta.\n"
 "VIRHE: "
 
-#: ../lib/python/Screens/Satconfig.py:132
+#: ../lib/python/Screens/Satconfig.py:133
 msgid "Uncommitted DiSEqC command"
 msgstr "Uncommitted DiSEqC-käsky"
 
@@ -1407,7 +1431,7 @@ msgstr "Päivitetään...odota...tämä voi kestää muutaman minuutin..."
 msgid "Use DHCP"
 msgstr "Käytä DHCP"
 
-#: ../lib/python/Screens/Satconfig.py:112
+#: ../lib/python/Screens/Satconfig.py:113
 msgid "Use usals for this sat"
 msgstr "Käytä USALS tälle satelliitille"
 
@@ -1415,11 +1439,15 @@ msgstr "Käytä USALS tälle satelliitille"
 msgid "User defined"
 msgstr "Käyttäjän määrittelemä"
 
-#: ../lib/python/Screens/Satconfig.py:109
+#: ../lib/python/Screens/InfoBarGenerics.py:1595
+msgid "View teletext..."
+msgstr "näytä tekstitv..."
+
+#: ../lib/python/Screens/Satconfig.py:110
 msgid "Voltage mode"
 msgstr "Jännitetila"
 
-#: ../lib/python/Screens/ChannelSelection.py:712
+#: ../lib/python/Screens/ChannelSelection.py:741
 msgid "W"
 msgstr ""
 
@@ -1446,6 +1474,7 @@ msgstr "Länsi"
 msgid "Year:"
 msgstr "Vuosi:"
 
+#: ../lib/python/Screens/Ci.py:24
 #: ../lib/python/Components/NimManager.py:729
 #: ../lib/python/Components/NimManager.py:749
 #: ../lib/python/Components/NimManager.py:753
@@ -1458,7 +1487,7 @@ msgstr "Kyllä"
 msgid "You cannot delete this!"
 msgstr "Et voi poistaa tätä!"
 
-#: ../lib/python/Screens/MediaPlayer.py:328
+#: ../lib/python/Screens/MediaPlayer.py:346
 msgid "You selected a playlist"
 msgstr "Valitsit soittolistan"
 
@@ -1470,23 +1499,23 @@ msgstr ""
 "Front-prosessori on päivitettävä.\n"
 "Paina OK aloittaaksesi päivityksen."
 
-#: ../lib/python/Screens/ChannelSelection.py:330
+#: ../lib/python/Screens/ChannelSelection.py:357
 msgid "[bouquet edit]"
 msgstr "[kanavanippujen muokkaus]"
 
-#: ../lib/python/Screens/ChannelSelection.py:332
+#: ../lib/python/Screens/ChannelSelection.py:359
 msgid "[favourite edit]"
 msgstr "[suosikkien muokkaus]"
 
-#: ../lib/python/Screens/ChannelSelection.py:415
+#: ../lib/python/Screens/ChannelSelection.py:442
 msgid "[move mode]"
 msgstr "[siirtotila]"
 
-#: ../lib/python/Screens/ChannelSelection.py:112
+#: ../lib/python/Screens/ChannelSelection.py:111
 msgid "abort bouquet edit"
 msgstr "peruuta kanavanippujen muokkaus"
 
-#: ../lib/python/Screens/ChannelSelection.py:115
+#: ../lib/python/Screens/ChannelSelection.py:114
 msgid "abort favourites edit"
 msgstr "peruuta suosikkien muokkaus"
 
@@ -1494,38 +1523,42 @@ msgstr "peruuta suosikkien muokkaus"
 msgid "about to start"
 msgstr "aloittamassa"
 
-#: ../lib/python/Screens/ChannelSelection.py:101
-msgid "add bouquet..."
-msgstr "lisää kanavanippu..."
+#: ../lib/python/Screens/ChannelSelection.py:93
+msgid "add bouquet"
+msgstr "lisää kanavanippu"
 
-#: ../lib/python/Screens/MediaPlayer.py:277
+#: ../lib/python/Screens/MediaPlayer.py:295
 msgid "add directory to playlist"
 msgstr "lisää hakemisto soittolistalle"
 
-#: ../lib/python/Screens/MediaPlayer.py:279
+#: ../lib/python/Screens/MediaPlayer.py:297
 msgid "add file to playlist"
 msgstr "lisää tiedosto soittolistalle"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1199
-#: ../lib/python/Screens/InfoBarGenerics.py:1201
+#: ../lib/python/Screens/ChannelSelection.py:99
+msgid "add marker"
+msgstr "lisää merkki"
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1211
+#: ../lib/python/Screens/InfoBarGenerics.py:1213
 msgid "add recording (enter recording duration)"
 msgstr "tallenna (syötä tallennuksen kesto)"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1199
-#: ../lib/python/Screens/InfoBarGenerics.py:1201
+#: ../lib/python/Screens/InfoBarGenerics.py:1211
+#: ../lib/python/Screens/InfoBarGenerics.py:1213
 msgid "add recording (indefinitely)"
 msgstr "tallenna (jatkuva)"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1199
-#: ../lib/python/Screens/InfoBarGenerics.py:1201
+#: ../lib/python/Screens/InfoBarGenerics.py:1211
+#: ../lib/python/Screens/InfoBarGenerics.py:1213
 msgid "add recording (stop after current event)"
 msgstr "tallenna (lopeta nykyisen ohjelman jälkeen)"
 
-#: ../lib/python/Screens/ChannelSelection.py:81
+#: ../lib/python/Screens/ChannelSelection.py:79
 msgid "add service to bouquet"
 msgstr "lisää kanava kanavanippuun"
 
-#: ../lib/python/Screens/ChannelSelection.py:83
+#: ../lib/python/Screens/ChannelSelection.py:81
 msgid "add service to favourites"
 msgstr "lisää kanava suosikkeihin"
 
@@ -1538,27 +1571,31 @@ msgstr ""
 "seuraavan varmuuskopion:\n"
 
 #: ../lib/python/Screens/MovieSelection.py:24
-#: ../lib/python/Screens/ChannelSelection.py:117
+#: ../lib/python/Screens/ChannelSelection.py:116
 msgid "back"
 msgstr "takaisin"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1199
+#: ../lib/python/Screens/InfoBarGenerics.py:1211
 msgid "change recording (duration)"
 msgstr "muokkaa tallennusta (kesto)"
 
-#: ../lib/python/Screens/ScanSetup.py:319
+#: ../lib/python/Screens/ScanSetup.py:376
 msgid "circular left"
 msgstr "Kiertopolarisaatio vasen"
 
-#: ../lib/python/Screens/ScanSetup.py:319
+#: ../lib/python/Screens/ScanSetup.py:376
 msgid "circular right"
 msgstr "Kiertopolarisaatio oikea"
 
-#: ../lib/python/Screens/MediaPlayer.py:283
+#: ../lib/python/Screens/MediaPlayer.py:301
 msgid "clear playlist"
 msgstr "tyhjennä soittolista"
 
-#: ../lib/python/Screens/ChannelSelection.py:87
+#: ../lib/python/Screens/InfoBarGenerics.py:583
+msgid "continue"
+msgstr "jatka"
+
+#: ../lib/python/Screens/ChannelSelection.py:85
 msgid "copy to favourites"
 msgstr "kopioi suosikkeihin"
 
@@ -1566,7 +1603,7 @@ msgstr "kopioi suosikkeihin"
 msgid "daily"
 msgstr "päivittäinen"
 
-#: ../lib/python/Screens/MediaPlayer.py:282
+#: ../lib/python/Screens/MediaPlayer.py:300
 msgid "delete"
 msgstr "poista"
 
@@ -1574,16 +1611,16 @@ msgstr "poista"
 msgid "delete..."
 msgstr "poista..."
 
-#: ../lib/python/Screens/ChannelSelection.py:108
+#: ../lib/python/Screens/ChannelSelection.py:107
 msgid "disable move mode"
 msgstr "poistu siirtotilasta"
 
 #: ../lib/python/Screens/TimerEntry.py:99
-#: ../lib/python/Screens/InfoBarGenerics.py:1199
+#: ../lib/python/Screens/InfoBarGenerics.py:1211
 msgid "do nothing"
 msgstr "älä tee mitään"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1201
+#: ../lib/python/Screens/InfoBarGenerics.py:1213
 msgid "don't record"
 msgstr "älä tallenna"
 
@@ -1595,11 +1632,11 @@ msgstr "valmis!"
 msgid "empty/unknown"
 msgstr "tyhjä/tuntematon"
 
-#: ../lib/python/Screens/ChannelSelection.py:104
+#: ../lib/python/Screens/ChannelSelection.py:103
 msgid "enable bouquet edit"
 msgstr "ota kanavanippujen muokkaustila käyttöön"
 
-#: ../lib/python/Screens/ChannelSelection.py:106
+#: ../lib/python/Screens/ChannelSelection.py:105
 msgid "enable favourite edit"
 msgstr "ota suosikkien muokkaustila käyttöön"
 
@@ -1607,11 +1644,11 @@ msgstr "ota suosikkien muokkaustila käyttöön"
 msgid "enable move mode"
 msgstr "ota siirtotila käyttöön"
 
-#: ../lib/python/Screens/ChannelSelection.py:111
+#: ../lib/python/Screens/ChannelSelection.py:110
 msgid "end bouquet edit"
 msgstr "lopeta kanavanippujen muokkaus"
 
-#: ../lib/python/Screens/ChannelSelection.py:114
+#: ../lib/python/Screens/ChannelSelection.py:113
 msgid "end favourites edit"
 msgstr "lopeta suosikkien muokkaus"
 
@@ -1627,23 +1664,28 @@ msgstr "täysi /etc hakemisto"
 msgid "go to deep standby"
 msgstr "mene syvään valmiustilaan"
 
-#: ../lib/python/Screens/MediaPlayer.py:284
+#: ../lib/python/Screens/InfoBar.py:60
+msgid "hear radio..."
+msgstr "kuuntele radiota..."
+
+#: ../lib/python/Screens/MediaPlayer.py:302
 msgid "hide player"
 msgstr "piilota soitin"
 
-#: ../lib/python/Screens/ScanSetup.py:319
+#: ../lib/python/Screens/ScanSetup.py:376
 msgid "horizontal"
 msgstr "horisontaali"
 
-#: ../lib/python/Screens/Ci.py:292
+#: ../lib/python/Screens/Ci.py:318
+#: ../lib/python/Screens/Ci.py:340
 msgid "init module"
 msgstr "alusta moduuli"
 
-#: ../lib/python/Screens/InfoBar.py:85
+#: ../lib/python/Screens/InfoBar.py:91
 msgid "leave movie player..."
 msgstr "poistu elokuvatoistimesta..."
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1260
+#: ../lib/python/Screens/InfoBarGenerics.py:1272
 msgid "left"
 msgstr "vasen"
 
@@ -1659,23 +1701,23 @@ 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:259
+#: ../lib/python/Screens/InfoBarGenerics.py:260
 msgid "next channel"
 msgstr "seuraava kanava"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:261
+#: ../lib/python/Screens/InfoBarGenerics.py:262
 msgid "next channel in history"
 msgstr "seuraava kanava historiassa"
 
-#: ../lib/python/Screens/ScanSetup.py:298
-#: ../lib/python/Screens/ScanSetup.py:330
-#: ../lib/python/Screens/ScanSetup.py:344
-#: ../lib/python/Screens/ScanSetup.py:349
-#: ../lib/python/Screens/ScanSetup.py:644
-#: ../lib/python/Screens/ScanSetup.py:646
-#: ../lib/python/Screens/ScanSetup.py:652
+#: ../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/TimerEntry.py:116
 #: ../lib/python/Components/Network.py:145
 #: ../lib/python/Components/RecordingConfig.py:7
@@ -1686,7 +1728,8 @@ msgstr "ei"
 msgid "no HDD found"
 msgstr "kiintolevyä ei löydy"
 
-#: ../lib/python/Screens/Ci.py:290
+#: ../lib/python/Screens/Ci.py:316
+#: ../lib/python/Screens/Ci.py:338
 msgid "no module found"
 msgstr "moduleita ei löydy"
 
@@ -1694,15 +1737,15 @@ msgstr "moduleita ei löydy"
 msgid "none"
 msgstr "ei yhtään"
 
-#: ../lib/python/Screens/ScanSetup.py:317
-#: ../lib/python/Screens/ScanSetup.py:326
-#: ../lib/python/Screens/ScanSetup.py:334
+#: ../lib/python/Screens/ScanSetup.py:374
+#: ../lib/python/Screens/ScanSetup.py:383
+#: ../lib/python/Screens/ScanSetup.py:391
 msgid "off"
 msgstr "pois"
 
-#: ../lib/python/Screens/ScanSetup.py:317
-#: ../lib/python/Screens/ScanSetup.py:326
-#: ../lib/python/Screens/ScanSetup.py:334
+#: ../lib/python/Screens/ScanSetup.py:374
+#: ../lib/python/Screens/ScanSetup.py:383
+#: ../lib/python/Screens/ScanSetup.py:391
 msgid "on"
 msgstr "päällä"
 
@@ -1714,23 +1757,35 @@ msgstr "kerran"
 msgid "only /etc/enigma2 directory"
 msgstr "vain /etc/enigma2 hakemisto"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:262
-msgid "open service list"
+#: ../lib/python/Screens/InfoBarGenerics.py:263
+msgid "open servicelist"
 msgstr "avaa palvelulista"
 
+#: ../lib/python/Screens/InfoBarGenerics.py:258
+msgid "open servicelist(down)"
+msgstr "avaa palvelulista(alaspäin)"
+
+#: ../lib/python/Screens/InfoBarGenerics.py:257
+msgid "open servicelist(up)"
+msgstr "avaa palvelulista(ylöspäin)"
+
 #: ../lib/python/Components/ServiceScan.py:75
 msgid "pass"
 msgstr "hyväksytty"
 
-#: ../lib/python/Screens/Ci.py:79
+#: ../lib/python/Screens/InfoBarGenerics.py:582
+msgid "pause"
+msgstr "tauko"
+
+#: ../lib/python/Screens/Ci.py:86
 msgid "please press OK when ready"
 msgstr "paina OK kun olet valmis"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:258
+#: ../lib/python/Screens/InfoBarGenerics.py:259
 msgid "previous channel"
 msgstr "edellinen kanava"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:260
+#: ../lib/python/Screens/InfoBarGenerics.py:261
 msgid "previous channel in history"
 msgstr "edellinen kanava historiassa"
 
@@ -1742,27 +1797,24 @@ msgstr "tallenna"
 msgid "recording..."
 msgstr "tallennetaan..."
 
-#: ../lib/python/Screens/ChannelSelection.py:89
+#: ../lib/python/Screens/ChannelSelection.py:87
 msgid "remove all new found flags"
 msgstr "poista kaikki uusi kanava-liput"
 
-#: ../lib/python/Screens/ChannelSelection.py:95
-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:93
+#: ../lib/python/Screens/ChannelSelection.py:91
 msgid "remove new found flag"
 msgstr "poista uusi kanava-lippu"
 
-#: ../lib/python/Screens/ChannelSelection.py:91
-msgid "remove service"
-msgstr "poista kanava"
-
 #: ../lib/python/Screens/TimerEntry.py:100
 msgid "repeated"
 msgstr "toistuva"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1260
+#: ../lib/python/Screens/InfoBarGenerics.py:1272
 msgid "right"
 msgstr "oikea"
 
@@ -1804,27 +1856,43 @@ msgstr ""
 msgid "scan state"
 msgstr "haun tila"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:361
+#: ../lib/python/Screens/InfoBarGenerics.py:394
 msgid "show EPG..."
 msgstr "näytä EPG..."
 
-#: ../lib/python/Screens/InfoBarGenerics.py:323
+#: ../lib/python/Screens/InfoBarGenerics.py:356
 msgid "show event details"
 msgstr "näytä ohjelman tarkemmat tiedot"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1260
+#: ../lib/python/Screens/InfoBarGenerics.py:588
+msgid "skip backward"
+msgstr "siirry taaksepäin"
+
+#: ../lib/python/Screens/InfoBarGenerics.py:585
+msgid "skip forward"
+msgstr "siirry eteenpäin"
+
+#: ../lib/python/Screens/InfoBarGenerics.py:897
+msgid "start timeshift"
+msgstr "aloita ajansiirto"
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1272
 msgid "stereo"
 msgstr "stereo"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1199
+#: ../lib/python/Screens/InfoBarGenerics.py:1211
 msgid "stop recording"
 msgstr "lopeta tallennus"
 
-#: ../lib/python/Screens/MediaPlayer.py:281
+#: ../lib/python/Screens/InfoBarGenerics.py:898
+msgid "stop timeshift"
+msgstr "Pysäytä ajansiirto"
+
+#: ../lib/python/Screens/MediaPlayer.py:299
 msgid "switch to filelist"
 msgstr "vaihda tiedostolistaan"
 
-#: ../lib/python/Screens/MediaPlayer.py:275
+#: ../lib/python/Screens/MediaPlayer.py:293
 msgid "switch to playlist"
 msgstr "vaihda soittolistaan"
 
@@ -1845,10 +1913,18 @@ msgstr "tuntematon kanava"
 msgid "user defined"
 msgstr "käyttäjän määrittelemä"
 
-#: ../lib/python/Screens/ScanSetup.py:319
+#: ../lib/python/Screens/ScanSetup.py:376
 msgid "vertical"
 msgstr "vertikaali"
 
+#: ../lib/python/Screens/InfoBarGenerics.py:1030
+msgid "view extensions..."
+msgstr "näytä laajennukset..."
+
+#: ../lib/python/Screens/InfoBar.py:59
+msgid "view recordings..."
+msgstr "näytä tallenteet..."
+
 #: ../lib/python/Components/TimerList.py:57
 msgid "waiting"
 msgstr "odottaa"
@@ -1857,21 +1933,21 @@ msgstr "odottaa"
 msgid "weekly"
 msgstr "viikottainen"
 
-#: ../lib/python/Screens/ScanSetup.py:298
-#: ../lib/python/Screens/ScanSetup.py:330
-#: ../lib/python/Screens/ScanSetup.py:344
-#: ../lib/python/Screens/ScanSetup.py:349
-#: ../lib/python/Screens/ScanSetup.py:644
-#: ../lib/python/Screens/ScanSetup.py:646
-#: ../lib/python/Screens/ScanSetup.py:652
+#: ../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/TimerEntry.py:116
 #: ../lib/python/Components/Network.py:145
 #: ../lib/python/Components/RecordingConfig.py:7
 msgid "yes"
 msgstr "kyllä"
 
-#: ../lib/python/Screens/ScanSetup.py:298
-#: ../lib/python/Screens/ScanSetup.py:644
+#: ../lib/python/Screens/ScanSetup.py:355
+#: ../lib/python/Screens/ScanSetup.py:702
 msgid "yes (keep feeds)"
 msgstr "kyllä (pidä feedit)"
 
@@ -1903,10 +1979,6 @@ msgstr "Verkkoasetukset"
 msgid "Games / Plugins"
 msgstr "Pelit / Lisäosat"
 
-#: ../data/
-msgid "Hide error windows"
-msgstr "Piilota virheikkunat"
-
 #: ../data/
 msgid "help..."
 msgstr "apua..."
@@ -1944,8 +2016,8 @@ msgid "TV System"
 msgstr "TV järjestelmä"
 
 #: ../data/
-msgid "Visualize positioner movement"
-msgstr "Näytä kääntömoottorin liike"
+msgid "Alternative radio mode"
+msgstr "Vaihtoehtoinen radiomuoto"
 
 #: ../data/
 msgid "NEXT"
@@ -1959,6 +2031,10 @@ msgstr "Laitteessasi ei näytä olevan kiintolevyä, joten et voi varmuuskopioid
 msgid "Deep Standby"
 msgstr "Syvä valmiustila"
 
+#: ../data/
+msgid "Show positioner movement"
+msgstr "Näytä moottorin liikkuminen"
+
 #: ../data/
 msgid "Tuner Slot"
 msgstr "Viritinpaikka"
@@ -1975,10 +2051,6 @@ msgstr "Ääni"
 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 "Show Satposition"
-msgstr "Näytä satelliitin sijainti"
-
 #: ../data/
 msgid "Do you want to view a tutorial?"
 msgstr "Haluatko katsoa opasohjelman?"
@@ -1999,6 +2071,10 @@ msgstr "Tämä on vaihe 2."
 msgid "Use wizard to set up basic features"
 msgstr "Käytä Velhoa perusasetuksien luonnissa"
 
+#: ../data/
+msgid "Extensions"
+msgstr "Laajennukset"
+
 #: ../data/
 msgid "#bab329"
 msgstr ""
@@ -2020,12 +2096,8 @@ msgstr ""
 "Paina OK aloittaaksesi varmuuskopioinnin."
 
 #: ../data/
-msgid "Audio / Video"
-msgstr "Ääni / Kuva"
-
-#: ../data/
-msgid "The wizard is finished now."
-msgstr "Velho on lopettanut."
+msgid "Yes, do another manual scan now"
+msgstr "Kyllä, tee toinen käsinhaku nyt"
 
 #: ../data/
 msgid "Service Searching"
@@ -2044,29 +2116,31 @@ msgid "Keyboard Map"
 msgstr "Näppäimistökartta"
 
 #: ../data/
-msgid "Usage Settings"
-msgstr "Käyttö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 "#ffffffff"
 msgstr ""
@@ -2075,6 +2149,10 @@ msgstr ""
 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"
@@ -2111,6 +2189,14 @@ 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 "Viritinasetukset"
+
 #: ../data/
 msgid "select Slot"
 msgstr "Valitse lukija"
@@ -2136,12 +2222,12 @@ msgid "Exit the wizard"
 msgstr "Poistu velhosta"
 
 #: ../data/
-msgid "Fast zapping"
-msgstr "Nopea vaihto"
+msgid "OSD Settings"
+msgstr "OSD asetukset"
 
 #: ../data/
-msgid "Keyboard Setup"
-msgstr "Näppäimistön asetukset"
+msgid "RF output"
+msgstr "RF-ulostulo"
 
 #: ../data/
 msgid "Brightness"
@@ -2164,21 +2250,13 @@ msgid "Compact flash card"
 msgstr "Compact flash kortti"
 
 #: ../data/
-msgid "OSD Settings"
-msgstr "OSD asetukset"
+msgid "Record"
+msgstr "Tallenna"
 
 #: ../data/
 msgid "Yes, view the tutorial"
 msgstr "Kyllä, katso opasohjelma"
 
-#: ../data/
-msgid "Soundcarrier"
-msgstr "Äänenkantoaalto"
-
-#: ../data/
-msgid "UHF Modulator"
-msgstr "UHF modulaattori"
-
 #: ../data/
 msgid "Color Format"
 msgstr "Väriformaatti"
@@ -2195,13 +2273,21 @@ msgstr "Lisäosien selaus"
 msgid "#80000000"
 msgstr ""
 
+#: ../data/
+msgid "SNR:"
+msgstr ""
+
+#: ../data/
+msgid "Timeshift"
+msgstr "Aikasiirto"
+
 #: ../data/
 msgid "Downloadable plugins"
 msgstr "Ladattavat lisäosat"
 
 #: ../data/
-msgid "LCD"
-msgstr ""
+msgid "Subservices"
+msgstr "Alipalvelut"
 
 #: ../data/
 msgid "Timezone"
@@ -2224,8 +2310,8 @@ msgid "Common Interface"
 msgstr ""
 
 #: ../data/
-msgid "Ask before zapping"
-msgstr "Kysy ennen vaihtoa"
+msgid "Language..."
+msgstr "Kieli..."
 
 #: ../data/
 msgid "Restoring the settings is done. Please press OK to activate the restored settings now."
@@ -2244,8 +2330,8 @@ msgid "Service scan"
 msgstr "Kanavahaku"
 
 #: ../data/
-msgid "Yes, do another manual scan now"
-msgstr "Kyllä, tee toinen käsinhaku nyt"
+msgid "The wizard is finished now."
+msgstr "Velho on lopettanut."
 
 #: ../data/
 msgid "LCD Setup"
@@ -2260,8 +2346,8 @@ msgid "Input"
 msgstr "Syöttö"
 
 #: ../data/
-msgid "SNR:"
-msgstr ""
+msgid "Soundcarrier"
+msgstr "Äänenkantoaalto"
 
 #: ../data/
 msgid "Yes, restore the settings now"
@@ -2299,6 +2385,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 process."
 msgstr "Varmuuskopiointi onnistui. Päivitys jatkuu eteenpäin."
@@ -2311,10 +2405,6 @@ msgstr "PiP-Asetukset"
 msgid "Menu"
 msgstr "Valikko"
 
-#: ../data/
-msgid "Invert"
-msgstr "Käänteinen"
-
 #: ../data/
 msgid "Restart"
 msgstr "Uudelleenkäynnistä"
@@ -2328,8 +2418,8 @@ msgid "Timer entry"
 msgstr "Ajastintieto"
 
 #: ../data/
-msgid "Language"
-msgstr "Kieli"
+msgid "Modulator"
+msgstr "Modulaattori"
 
 #: ../data/
 msgid "Eventview"
@@ -2343,10 +2433,6 @@ msgstr "Lisäaika tallenteen alkuun (minuuttia)"
 msgid "The backup failed. Please choose a different backup location."
 msgstr "Varmuuskopiointi epäonnistui. Valitse toinen varmuuskopiontipaikka."
 
-#: ../data/
-msgid "What do you want to scan?"
-msgstr "Mitä haluat etsiä?"
-
 #: ../data/
 msgid "Keymap"
 msgstr "Näppäinkartta"
@@ -2387,10 +2473,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"
@@ -2424,8 +2506,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?"
@@ -2435,10 +2517,6 @@ msgstr "Haluatko palauttaa asetukset?"
 msgid "Please set up tuner B"
 msgstr "Aseta viritin B."
 
-#: ../data/
-msgid "use power delta"
-msgstr "käytä power delta"
-
 #: ../data/
 msgid "Delay"
 msgstr "Viive"
@@ -2447,35 +2525,17 @@ msgstr "Viive"
 msgid "Select HDD"
 msgstr "Valitse kiintolevy"
 
-#: ../data/
-msgid "Setup Lock"
-msgstr "Asetuslukko"
-
 #: ../data/
 msgid "Aspect Ratio"
 msgstr "Kuvasuhde"
 
 #: ../data/
-msgid "Expert Setup"
-msgstr "Eksperttiasetukset"
-
-#: ../data/
-msgid "Modulator"
-msgstr "Modulaattori"
-
-#: ../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"
@@ -2497,10 +2557,6 @@ msgstr "Valitse elokuva"
 msgid "Volume"
 msgstr "Äänenvoimakkuus"
 
-#: ../data/
-msgid "Multi bouquets"
-msgstr "Monta kanavanippua"
-
 #: ../data/
 msgid "#33294a6b"
 msgstr ""
@@ -2546,8 +2602,12 @@ msgid "AGC:"
 msgstr ""
 
 #: ../data/
-msgid "Usage settings"
-msgstr "Käyttöasetukset"
+msgid "What do you want to scan?"
+msgstr "Mitä haluat etsiä?"
+
+#: ../data/
+msgid "Now Playing"
+msgstr "Nyt Soi"
 
 #: ../data/
 msgid "Channellist menu"
@@ -2558,8 +2618,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"
@@ -2569,10 +2629,6 @@ msgstr "NYT"
 msgid "Yes, perform a shutdown now."
 msgstr "Kyllä, sammuta nyt."
 
-#: ../data/
-msgid "Satelliteconfig"
-msgstr "Viritinasetukset"
-
 #: ../data/
 msgid "#0064c7"
 msgstr ""
@@ -2585,7 +2641,3 @@ msgstr "Mediasoitin"
 msgid "Do you want to do another manual service scan?"
 msgstr "Haluatko tehdä uuden käsinhaun?"
 
-#: ../data/
-msgid "Parental Lock"
-msgstr "Lapsilukko"
-