git.cweiske.de / enigma2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
update swedish translation
[enigma2.git] / po / no.po
diff --git a/po/no.po b/po/no.po
index 249cdc928ed604c7f93757fe1d4dcc7950d130c4..9d9e3afbd4d71688bb63efe9c90641f2e78b610e 100755 (executable)
--- a/po/no.po
+++ b/po/no.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxbox-enigma 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-11 23:48+0200\n"
+"POT-Creation-Date: 2006-10-11 17:12+0200\n"
 "PO-Revision-Date: 2006-04-24 17:15+0100\n"
 "Last-Translator: MMMMMM <theMMMMMM@gmail.com>\n"
 "Language-Team: none\n"
@@ -37,9 +37,9 @@ msgstr ""
 msgid "%d min"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:106
-#: ../lib/python/Screens/TimerEntry.py:109
-#: ../lib/python/Screens/TimeDateInput.py:49
+#: ../lib/python/Screens/TimerEntry.py:94
+#: ../lib/python/Screens/TimerEntry.py:97
+#: ../lib/python/Screens/TimeDateInput.py:35
 msgid "%d.%B %Y"
 msgstr ""
 
@@ -63,47 +63,63 @@ msgstr ""
 msgid "/var directory"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:748
+#: ../lib/python/Components/NimManager.py:763
 msgid "0 V"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:751
+#: ../lib/python/Components/NimManager.py:766
 msgid "1.0"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:751
+#: ../lib/python/Components/NimManager.py:766
 msgid "1.1"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:751
+#: ../lib/python/Components/NimManager.py:766
 msgid "1.2"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:748
+#: ../lib/python/Components/NimManager.py:763
 msgid "12 V"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:150
+#: ../lib/python/Screens/Satconfig.py:138
 msgid "12V Output"
 msgstr "12V Utgang"
 
-#: ../lib/python/Components/NimManager.py:727
+#: ../lib/python/Components/NimManager.py:741
 msgid "13 V"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:727
+#: ../lib/python/Components/NimManager.py:741
 msgid "18 V"
 msgstr ""
 
+#: ../lib/python/Components/ParentalControl.py:14
+msgid "30 minutes"
+msgstr ""
+
+#: ../lib/python/Components/ParentalControl.py:14
+msgid "5 minutes"
+msgstr ""
+
+#: ../lib/python/Components/ParentalControl.py:14
+msgid "60 minutes"
+msgstr ""
+
 #: ../lib/python/Components/TimerList.py:66
 msgid "<unknown>"
 msgstr "<ukjent>"
 
-#: ../lib/python/Components/NimManager.py:750
+#: ../lib/python/Screens/Setup.py:118
+msgid "??"
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:765
 msgid "A"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1192
+#: ../lib/python/Screens/InfoBarGenerics.py:1334
 msgid ""
 "A recording is currently running.\n"
 "What do you want to do?"
@@ -111,7 +127,7 @@ msgstr ""
 "Et opptak kjører fortsatt.\n"
 "Hva vil du gjøre?"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:506
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:511
 msgid ""
 "A recording is currently running. Please stop the recording before trying to "
 "configure the positioner."
@@ -125,47 +141,45 @@ msgstr ""
 "En timer startet ikke opptak.\n"
 "Skift program og prøv igjen?\n"
 
-#: ../lib/python/Components/NimManager.py:733
+#: ../lib/python/Components/NimManager.py:747
 msgid "AA"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:733
+#: ../lib/python/Components/NimManager.py:747
 msgid "AB"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1023
+#: ../lib/python/Screens/InfoBarGenerics.py:1173
 msgid "Activate Picture in Picture"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEdit.py:27
+#: ../lib/python/Screens/TimerEdit.py:25
 msgid "Add"
 msgstr "Legge til"
 
-#: ../lib/python/Screens/MediaPlayer.py:344
+#: ../lib/python/Screens/MediaPlayer.py:388
 msgid "Add files to playlist"
 msgstr ""
 
 #: ../lib/python/Screens/EventView.py:32
-#: ../lib/python/Screens/EpgSelection.py:60
+#: ../lib/python/Screens/EpgSelection.py:59
 msgid "Add timer"
 msgstr "Legge til timer"
 
-#: ../lib/python/Components/NimManager.py:670
-#: ../lib/python/Components/NimManager.py:678
 #: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:31
 msgid "Advanced"
 msgstr "Avansert"
 
-#: ../lib/python/Screens/TimerEntry.py:195
+#: ../lib/python/Screens/TimerEntry.py:177
 msgid "After event"
 msgstr ""
 
-#: ../lib/python/Screens/MediaPlayer.py:49
+#: ../lib/python/Screens/MediaPlayer.py:51
 msgid "Album:"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:445
-#: ../lib/python/Screens/ChannelSelection.py:591
+#: ../lib/python/Screens/ChannelSelection.py:497
+#: ../lib/python/Screens/ChannelSelection.py:647
 msgid "All"
 msgstr "Alle"
 
@@ -173,37 +187,41 @@ msgstr "Alle"
 msgid "Arabic"
 msgstr "Arabisk"
 
-#: ../lib/python/Screens/MediaPlayer.py:45
+#: ../lib/python/Screens/MediaPlayer.py:47
 msgid "Artist:"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:374
-#: ../lib/python/Screens/ScanSetup.py:377
+#: ../lib/python/Screens/InfoBarGenerics.py:1344
+msgid "Audio Options..."
+msgstr ""
+
+#: ../lib/python/Screens/ScanSetup.py:361
+#: ../lib/python/Screens/ScanSetup.py:364
+#: ../lib/python/Screens/ScanSetup.py:370
+#: ../lib/python/Screens/ScanSetup.py:372
+#: ../lib/python/Screens/ScanSetup.py:378
+#: ../lib/python/Screens/ScanSetup.py:382
 #: ../lib/python/Screens/ScanSetup.py:383
+#: ../lib/python/Screens/ScanSetup.py:384
 #: ../lib/python/Screens/ScanSetup.py:385
-#: ../lib/python/Screens/ScanSetup.py: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:386
+#: ../lib/python/Screens/ScanSetup.py:387 ../lib/python/Screens/Ci.py:22
 msgid "Auto"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:715 ../data/
+#: ../lib/python/Screens/ScanSetup.py:602 ../data/
 msgid "Automatic Scan"
 msgstr "Automatisk Søk"
 
-#: ../lib/python/Components/NimManager.py:750
+#: ../lib/python/Components/NimManager.py:765
 msgid "B"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:733
+#: ../lib/python/Components/NimManager.py:747
 msgid "BA"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:733
+#: ../lib/python/Components/NimManager.py:747
 msgid "BB"
 msgstr ""
 
@@ -219,11 +237,11 @@ msgstr ""
 msgid "Backup Mode"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:728
+#: ../lib/python/Components/NimManager.py:742
 msgid "Band"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:256
+#: ../lib/python/Screens/ScanSetup.py:244
 msgid "Bandwidth"
 msgstr "Båndbredde"
 
@@ -231,7 +249,7 @@ msgstr "Båndbredde"
 msgid "Bus: "
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:744
+#: ../lib/python/Components/NimManager.py:759
 msgid "C-Band"
 msgstr ""
 
@@ -239,18 +257,14 @@ msgstr ""
 msgid "CF Drive"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:704
+#: ../lib/python/Screens/ChannelSelection.py:760
 msgid "Cable"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:69
-msgid "Cable provider"
-msgstr "Kabelleverandør"
-
-#: ../lib/python/Screens/Setup.py:95 ../lib/python/Screens/TimerEntry.py:25
+#: ../lib/python/Screens/Setup.py:85 ../lib/python/Screens/TimerEntry.py:29
 #: ../lib/python/Screens/TimeDateInput.py:16
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:75
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:165
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:166
 msgid "Cancel"
 msgstr "Avbryte"
 
@@ -258,11 +272,32 @@ msgstr "Avbryte"
 msgid "Capacity: "
 msgstr "Kapasitet: "
 
-#: ../lib/python/Screens/TimerEntry.py:197 ../data/
+#: ../lib/python/Components/Language.py:17
+msgid "Catalan"
+msgstr ""
+
+#: ../lib/python/Screens/ChannelSelection.py:146
+#: ../lib/python/Screens/ParentalControlSetup.py:22 ../data/
+msgid "Change pin code"
+msgstr ""
+
+#: ../lib/python/Screens/ParentalControlSetup.py:79
+msgid "Change service pin"
+msgstr ""
+
+#: ../lib/python/Screens/ParentalControlSetup.py:76
+msgid "Change service pins"
+msgstr ""
+
+#: ../lib/python/Screens/ParentalControlSetup.py:70
+msgid "Change setup pin"
+msgstr ""
+
+#: ../lib/python/Screens/TimerEntry.py:179 ../data/
 msgid "Channel"
 msgstr "Kanal"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:150
+#: ../lib/python/Screens/InfoBarGenerics.py:148
 msgid "Channel:"
 msgstr "Kanal:"
 
@@ -270,54 +305,51 @@ msgstr "Kanal:"
 msgid "Choose source"
 msgstr "Velg kilde"
 
-#: ../lib/python/Components/SetupDevices.py:21
-msgid "Classic"
-msgstr "Klassisk"
-
-#: ../lib/python/Screens/TimerEdit.py:29
+#: ../lib/python/Screens/TimerEdit.py:27
 msgid "Cleanup"
 msgstr "Opprydning"
 
-#: ../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:210
+#: ../lib/python/Screens/ScanSetup.py:215
+#: ../lib/python/Screens/ScanSetup.py:237
+#: ../lib/python/Screens/ScanSetup.py:252
+#: ../lib/python/Screens/ScanSetup.py:588
 msgid "Clear before scan"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:346
+#: ../lib/python/Screens/TimerEntry.py:315
 msgid "Clear log"
 msgstr "Tøm log"
 
-#: ../lib/python/Screens/ScanSetup.py:257
+#: ../lib/python/Screens/ScanSetup.py:245
 msgid "Code rate high"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:258
+#: ../lib/python/Screens/ScanSetup.py:246
 msgid "Code rate low"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:130
-#: ../lib/python/Screens/Satconfig.py:132
+#: ../lib/python/Screens/Satconfig.py:118
+#: ../lib/python/Screens/Satconfig.py:120
 msgid "Command order"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:126
+#: ../lib/python/Screens/Satconfig.py:114
 msgid "Committed DiSEqC command"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:353
-#: ../lib/python/Screens/ScanSetup.py:354
+#: ../lib/python/Screens/ScanSetup.py:340
+#: ../lib/python/Screens/ScanSetup.py:341
+#: ../lib/python/Components/NimManager.py:789
 msgid "Complete"
 msgstr "Komplett"
 
-#: ../lib/python/Screens/Satconfig.py:49
-#: ../lib/python/Screens/Satconfig.py:155 ../data/
+#: ../lib/python/Screens/Satconfig.py:47
+#: ../lib/python/Screens/Satconfig.py:143 ../data/
 msgid "Configuration Mode"
 msgstr "Konfigurasjonsmodus"
 
-#: ../lib/python/Screens/TimerEdit.py:205
+#: ../lib/python/Screens/TimerEdit.py:208
 msgid "Conflicting timer"
 msgstr "Timerkollisjon"
 
@@ -325,31 +357,27 @@ msgstr "Timerkollisjon"
 msgid "Current version:"
 msgstr "Aktuell Versjon:"
 
-#: ../lib/python/Screens/ScanSetup.py:372
+#: ../lib/python/Screens/ScanSetup.py:359
 msgid "DVB-S"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:372
+#: ../lib/python/Screens/ScanSetup.py:359
 msgid "DVB-S2"
 msgstr ""
 
-#: ../lib/python/Components/Language.py:17
+#: ../lib/python/Components/Language.py:18
 msgid "Danish"
 msgstr ""
 
-#: ../lib/python/Screens/TimeDateInput.py:54
+#: ../lib/python/Screens/TimeDateInput.py:40
 msgid "Date"
 msgstr ""
 
-#: ../lib/python/Components/SetupDevices.py:21
-msgid "Default"
-msgstr "Standard"
-
-#: ../lib/python/Screens/TimerEdit.py:26
+#: ../lib/python/Screens/TimerEdit.py:24
 msgid "Delete"
 msgstr "Slette"
 
-#: ../lib/python/Screens/TimerEntry.py:343
+#: ../lib/python/Screens/TimerEntry.py:312
 msgid "Delete entry"
 msgstr "Slett timer"
 
@@ -357,7 +385,7 @@ msgstr "Slett timer"
 msgid "Delete failed!"
 msgstr "Sletting feilet."
 
-#: ../lib/python/Screens/TimerEntry.py:151
+#: ../lib/python/Screens/TimerEntry.py:130
 msgid "Description"
 msgstr "Beskrivelse"
 
@@ -369,42 +397,38 @@ msgstr "Gjenkjent HDD:"
 msgid "Detected NIMs:"
 msgstr "Gjenkjent Tuner:"
 
-#: ../lib/python/Components/NimManager.py:692
+#: ../lib/python/Components/NimManager.py:697
 msgid "DiSEqC A/B"
 msgstr "DiSEqC A/B"
 
-#: ../lib/python/Components/NimManager.py:692
+#: ../lib/python/Components/NimManager.py:698
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-#: ../lib/python/Screens/Satconfig.py:53
+#: ../lib/python/Screens/Satconfig.py:51
 msgid "DiSEqC Mode"
 msgstr "DiSEqC-Modus"
 
-#: ../lib/python/Screens/Satconfig.py:122
+#: ../lib/python/Screens/Satconfig.py:110
 msgid "DiSEqC mode"
 msgstr "DiSEqC-Modus"
 
-#: ../lib/python/Screens/Satconfig.py:134
+#: ../lib/python/Screens/Satconfig.py:122
 msgid "DiSEqC repeats"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:231
-#: ../lib/python/Screens/TimerEdit.py:83 ../lib/python/Components/Lcd.py:31
-#: ../lib/python/Components/SetupDevices.py:38
-#: ../lib/python/Components/SetupDevices.py:39
-#: ../lib/python/Components/SetupDevices.py:43
-#: ../lib/python/Components/SetupDevices.py:44
-#: ../lib/python/Components/SetupDevices.py:45
-#: ../lib/python/Components/SetupDevices.py:46
-#: ../lib/python/Components/SetupDevices.py:47
+#: ../lib/python/Screens/TimerEdit.py:81
 msgid "Disable"
 msgstr "Slå av"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1025
+#: ../lib/python/Screens/InfoBarGenerics.py:1171
 msgid "Disable Picture in Picture"
 msgstr ""
 
+#: ../lib/python/Screens/InfoBarGenerics.py:1128
+msgid "Disable subtitles"
+msgstr ""
+
 #: ../lib/python/Screens/PluginBrowser.py:102
 msgid ""
 "Do you really want to REMOVE\n"
@@ -438,6 +462,10 @@ msgid ""
 "After pressing OK, please wait!"
 msgstr ""
 
+#: ../lib/python/Screens/InfoBarGenerics.py:1614
+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 ""
@@ -459,11 +487,11 @@ msgstr "Nedlastbare nye plugins"
 msgid "Downloading plugin information. Please wait..."
 msgstr "Laster ned plugin informasjon. Vennligst vent..."
 
-#: ../lib/python/Components/Language.py:18
+#: ../lib/python/Components/Language.py:19
 msgid "Dutch"
 msgstr "Nederlandsk"
 
-#: ../lib/python/Screens/ChannelSelection.py:712
+#: ../lib/python/Screens/ChannelSelection.py:768
 msgid "E"
 msgstr "E"
 
@@ -472,44 +500,48 @@ msgstr "E"
 msgid "ERROR - failed to scan (%s)!"
 msgstr "FEIL - kunne ikke søke (%s)!"
 
-#: ../lib/python/Components/NimManager.py:699
-#: ../lib/python/Components/NimManager.py:760
+#: ../lib/python/Components/NimManager.py:711
+#: ../lib/python/Components/NimManager.py:782
 msgid "East"
 msgstr "Øst"
 
-#: ../lib/python/Screens/ScanSetup.py:231
-#: ../lib/python/Screens/TimerEdit.py:81 ../lib/python/Components/Lcd.py:31
-#: ../lib/python/Components/SetupDevices.py:38
-#: ../lib/python/Components/SetupDevices.py:39
-#: ../lib/python/Components/SetupDevices.py:43
-#: ../lib/python/Components/SetupDevices.py:44
-#: ../lib/python/Components/SetupDevices.py:45
-#: ../lib/python/Components/SetupDevices.py:46
-#: ../lib/python/Components/SetupDevices.py:47
+#: ../lib/python/Screens/ParentalControlSetup.py:82
+msgid "Edit services list"
+msgstr ""
+
+#: ../lib/python/Screens/TimerEdit.py:79
 msgid "Enable"
 msgstr "Slå på"
 
-#: ../lib/python/Screens/Satconfig.py:74
+#: ../lib/python/Screens/Satconfig.py:72
 msgid "Enable 5V for active antenna"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:188
+#: ../lib/python/Screens/ParentalControlSetup.py:64
+msgid "Enable parental control"
+msgstr ""
+
+#: ../lib/python/Screens/TimerEntry.py:167
 msgid "End"
 msgstr "Avslutte"
 
-#: ../lib/python/Screens/TimerEntry.py:192
+#: ../lib/python/Screens/TimerEntry.py:174
 msgid "EndTime"
 msgstr "Slutttid"
 
 #: ../lib/python/Screens/LanguageSelection.py:53
-#: ../lib/python/Components/SetupDevices.py:24
+#: ../lib/python/Components/SetupDevices.py:15
 #: ../lib/python/Components/Language.py:14
 msgid "English"
 msgstr "Engelsk"
 
-#: ../lib/python/Components/NimManager.py:673
-msgid "Equal to Socket A"
-msgstr "Likt Socket A"
+#: ../lib/python/Screens/InfoBarGenerics.py:340
+msgid "Enter main menu..."
+msgstr ""
+
+#: ../lib/python/Screens/ChannelSelection.py:146
+msgid "Enter the service pin"
+msgstr ""
 
 #: ../lib/python/Screens/Console.py:41
 msgid "Execution Progress:"
@@ -519,44 +551,44 @@ msgstr "Progresjon av utførelsen:"
 msgid "Execution finished!!"
 msgstr "Utførelse ferdig!"
 
-#: ../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
+#: ../lib/python/Screens/ScanSetup.py:202
+#: ../lib/python/Screens/ScanSetup.py:204
+#: ../lib/python/Screens/ScanSetup.py:234
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:404
 msgid "FEC"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:127
+#: ../lib/python/Screens/Satconfig.py:115
 msgid "Fast DiSEqC"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:448
+#: ../lib/python/Screens/ChannelSelection.py:500
 msgid "Favourites"
 msgstr "Favoritter"
 
-#: ../lib/python/Components/Language.py:19
+#: ../lib/python/Components/Language.py:20
 msgid "Finnish"
 msgstr ""
 
-#: ../lib/python/Components/Language.py:20
+#: ../lib/python/Components/Language.py:21
 msgid "French"
 msgstr ""
 
-#: ../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
+#: ../lib/python/Screens/ScanSetup.py:197
+#: ../lib/python/Screens/ScanSetup.py:230
+#: ../lib/python/Screens/ScanSetup.py:241
+#: ../lib/python/Screens/TimerEntry.py:139
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:400
 msgid "Frequency"
 msgstr "Frekvens"
 
-#: ../lib/python/Screens/EpgSelection.py:235
+#: ../lib/python/Screens/EpgSelection.py:234
 #: ../lib/python/Components/TimerList.py:34
 msgid "Fri"
 msgstr "Fre"
 
-#: ../lib/python/Screens/TimerEntry.py:112
-#: ../lib/python/Screens/TimerEntry.py:174
+#: ../lib/python/Screens/TimerEntry.py:100
+#: ../lib/python/Screens/TimerEntry.py:153
 msgid "Friday"
 msgstr "Fredag"
 
@@ -569,15 +601,15 @@ msgstr "Frontprosessor-Versjon: %d"
 msgid "Function not yet implemented"
 msgstr "Funksjon ikke enda implementert"
 
-#: ../lib/python/Screens/NetworkSetup.py:45 ../data/
+#: ../lib/python/Screens/NetworkSetup.py:32 ../data/
 msgid "Gateway"
 msgstr ""
 
-#: ../lib/python/Screens/MediaPlayer.py:53
+#: ../lib/python/Screens/MediaPlayer.py:55
 msgid "Genre:"
 msgstr ""
 
-#: ../lib/python/Components/SetupDevices.py:24
+#: ../lib/python/Components/SetupDevices.py:15
 #: ../lib/python/Components/Language.py:15
 msgid "German"
 msgstr "Tysk"
@@ -586,16 +618,16 @@ msgstr "Tysk"
 msgid "Getting plugin information. Please wait..."
 msgstr "Henter Plugin-Informasjon. Vennligst vent..."
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:134
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:192
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:133
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:191
 msgid "Goto 0"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:189
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:188
 msgid "Goto position"
 msgstr "Gå til posisjon"
 
-#: ../lib/python/Screens/ScanSetup.py:261
+#: ../lib/python/Screens/ScanSetup.py:249
 msgid "Guard interval mode"
 msgstr ""
 
@@ -604,20 +636,20 @@ msgstr ""
 msgid "Harddisk"
 msgstr "Harddisk"
 
-#: ../lib/python/Screens/ScanSetup.py:262
+#: ../lib/python/Screens/ScanSetup.py:250
 msgid "Hierarchy mode"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1168
-#: ../lib/python/Screens/InfoBarGenerics.py:1176
+#: ../lib/python/Screens/InfoBarGenerics.py:1310
+#: ../lib/python/Screens/InfoBarGenerics.py:1318
 msgid "How many minutes do you want to record?"
 msgstr "Hvor mange minutter vil du ta opp?"
 
-#: ../lib/python/Screens/NetworkSetup.py:42 ../data/
+#: ../lib/python/Screens/NetworkSetup.py:29 ../data/
 msgid "IP Address"
 msgstr "IP-Adresse"
 
-#: ../lib/python/Components/Language.py:21
+#: ../lib/python/Components/Language.py:22
 msgid "Icelandic"
 msgstr ""
 
@@ -630,11 +662,11 @@ msgid ""
 "In order to record a timer, the TV was switched to the recording service!\n"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:151
+#: ../lib/python/Screens/Satconfig.py:139
 msgid "Increased voltage"
 msgstr ""
 
-#: ../lib/python/Screens/Ci.py:290
+#: ../lib/python/Screens/Ci.py:295
 msgid "Init"
 msgstr ""
 
@@ -646,30 +678,38 @@ msgstr "Initialiser"
 msgid "Initializing Harddisk..."
 msgstr "Initialiserer Harddisk..."
 
-#: ../lib/python/Screens/ScanSetup.py:210
+#: ../lib/python/Screens/InputBox.py:14 ../data/
+msgid "Input"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1220
+msgid "Instant Record..."
+msgstr ""
+
+#: ../lib/python/Screens/ScanSetup.py:198
+#: ../lib/python/Screens/ScanSetup.py:231
 #: ../lib/python/Screens/ScanSetup.py:243
-#: ../lib/python/Screens/ScanSetup.py:255
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:402
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:401
 msgid "Inversion"
 msgstr ""
 
-#: ../lib/python/Components/Language.py:22
+#: ../lib/python/Components/Language.py:23
 msgid "Italian"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:119
+#: ../lib/python/Screens/Satconfig.py:107
 msgid "LNB"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:144
+#: ../lib/python/Screens/Satconfig.py:132
 msgid "LOF"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:148
+#: ../lib/python/Screens/Satconfig.py:136
 msgid "LOF/H"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:147
+#: ../lib/python/Screens/Satconfig.py:135
 msgid "LOF/L"
 msgstr ""
 
@@ -677,40 +717,36 @@ msgstr ""
 msgid "Language selection"
 msgstr "Språkvalg"
 
-#: ../lib/python/Screens/Satconfig.py:28
-#: ../lib/python/Screens/Satconfig.py:138 ../data/
+#: ../lib/python/Screens/Satconfig.py:26
+#: ../lib/python/Screens/Satconfig.py:126 ../data/
 msgid "Latitude"
 msgstr "Breddegrad"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1242
+#: ../lib/python/Screens/InfoBarGenerics.py:1384
 msgid "Left"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:184
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:183
 msgid "Limit east"
 msgstr "Grense øst"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:183
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:182
 msgid "Limit west"
 msgstr "Grense vest"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:182
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:181
 msgid "Limits off"
 msgstr "Ingen grense"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:185
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:184
 msgid "Limits on"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:26
-#: ../lib/python/Screens/Satconfig.py:136 ../data/
+#: ../lib/python/Screens/Satconfig.py:24
+#: ../lib/python/Screens/Satconfig.py:124 ../data/
 msgid "Longitude"
 msgstr "Lengdegrad"
 
-#: ../lib/python/Components/NimManager.py:674
-msgid "Loopthrough to Socket A"
-msgstr "Koblet med Tuner A"
-
 #: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:421
 msgid "Manual transponder"
 msgstr ""
@@ -719,35 +755,35 @@ msgstr ""
 msgid "Model: "
 msgstr "Modell:"
 
-#: ../lib/python/Screens/ScanSetup.py:217
-#: ../lib/python/Screens/ScanSetup.py:245
-#: ../lib/python/Screens/ScanSetup.py:259
+#: ../lib/python/Screens/ScanSetup.py:205
+#: ../lib/python/Screens/ScanSetup.py:233
+#: ../lib/python/Screens/ScanSetup.py:247
 msgid "Modulation"
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:235
+#: ../lib/python/Screens/EpgSelection.py:234
 #: ../lib/python/Components/TimerList.py:34
 msgid "Mon"
 msgstr "Man"
 
-#: ../lib/python/Screens/TimerEntry.py:104
+#: ../lib/python/Screens/TimerEntry.py:92
 msgid "Mon-Fri"
 msgstr "Man-Fre"
 
-#: ../lib/python/Screens/TimerEntry.py:112
-#: ../lib/python/Screens/TimerEntry.py:170
+#: ../lib/python/Screens/TimerEntry.py:100
+#: ../lib/python/Screens/TimerEntry.py:149
 msgid "Monday"
 msgstr "Mandag"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1026
+#: ../lib/python/Screens/InfoBarGenerics.py:1179
 msgid "Move Picture in Picture"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:175
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:174
 msgid "Move east"
 msgstr "Flytt østover"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:172
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:171
 msgid "Move west"
 msgstr "Flytt vestover"
 
@@ -759,123 +795,119 @@ msgstr "Film Meny"
 msgid "Multi EPG"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:352
+#: ../lib/python/Screens/Ci.py:306
+msgid "Multiple service support"
+msgstr ""
+
+#: ../lib/python/Screens/ScanSetup.py:339
 msgid "Multisat"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:495
+#: ../lib/python/Components/NimManager.py:480
 msgid "N/A"
 msgstr "Ikke tilgjengelig"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:486
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:491
 msgid "NIM "
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:150
+#: ../lib/python/Screens/TimerEntry.py:129
 msgid "Name"
 msgstr "Navn"
 
-#: ../lib/python/Screens/NetworkSetup.py:46 ../data/
+#: ../lib/python/Screens/NetworkSetup.py:33 ../data/
 msgid "Nameserver"
 msgstr "Navneserver"
 
-#: ../lib/python/Screens/NetworkSetup.py:44 ../data/
+#: ../lib/python/Screens/NetworkSetup.py:31 ../data/
 msgid "Netmask"
 msgstr "Nettverksmaske"
 
-#: ../lib/python/Screens/ScanSetup.py:247
-#: ../lib/python/Screens/ScanSetup.py:254
+#: ../lib/python/Screens/ScanSetup.py:235
+#: ../lib/python/Screens/ScanSetup.py:242
 msgid "Network scan"
 msgstr "Nettverkssøk"
 
-#: ../lib/python/Screens/ChannelSelection.py:696
+#: ../lib/python/Screens/ChannelSelection.py:752
 msgid "New"
 msgstr ""
 
+#: ../lib/python/Screens/ParentalControlSetup.py:218
+msgid "New pin"
+msgstr ""
+
 #: ../lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/plugin.py:33
 msgid "New version:"
 msgstr "Ny Versjon:"
 
-#: ../lib/python/Screens/EpgSelection.py:46
+#: ../lib/python/Screens/EpgSelection.py:45
 msgid "Next"
 msgstr "Neste"
 
-#: ../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/Components/NimManager.py:763
+#: ../lib/python/Screens/Ci.py:22
 msgid "No"
 msgstr "Nei"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1188
+#: ../lib/python/Screens/InfoBarGenerics.py:1330
 msgid "No HDD found or HDD not initialized!"
 msgstr ""
 "Ingen harddisk funnet eller\n"
 "Harddisk ikke initialisert."
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1121
+#: ../lib/python/Screens/InfoBarGenerics.py:1263
 msgid "No event info found, recording indefinitely."
 msgstr "Ingen EPG-data funnet. Start ubgrenset opptak."
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:503
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:508
 msgid "No positioner capable frontend found."
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:518
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:523
 msgid "No tuner is configured for use with a diseqc positioner!"
 msgstr ""
 
-#: ../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/Screens/ScanSetup.py:364
+#: ../lib/python/Screens/ScanSetup.py:372
+#: ../lib/python/Screens/ScanSetup.py:387
+#: ../lib/python/Components/NimManager.py:747
 #: ../lib/python/Components/NimManager.py:751
-#: ../lib/python/Components/NimManager.py:758
+#: ../lib/python/Components/NimManager.py:765
+#: ../lib/python/Components/NimManager.py:766
+#: ../lib/python/Components/NimManager.py:780
 msgid "None"
 msgstr "Ingen"
 
-#: ../lib/python/Components/NimManager.py:701
-#: ../lib/python/Components/NimManager.py:762
+#: ../lib/python/Components/NimManager.py:713
+#: ../lib/python/Components/NimManager.py:784
 msgid "North"
 msgstr "Nord"
 
-#: ../lib/python/Components/Language.py:23
+#: ../lib/python/Components/Language.py:24
 msgid "Norwegian"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:675
-msgid "Nothing connected"
-msgstr "Ikke noe tilkoblet"
-
-#: ../lib/python/Screens/ScanSetup.py:581
-#: ../lib/python/Screens/ScanSetup.py:646
+#: ../lib/python/Screens/ScanSetup.py:560
+#: ../lib/python/Screens/ScanSetup.py:668
 msgid ""
 "Nothing to scan!\n"
 "Please setup your tuner settings before you start a service scan."
 msgstr ""
 
-#: ../lib/python/Screens/Setup.py:94 ../lib/python/Screens/TimerEntry.py:24
+#: ../lib/python/Screens/Setup.py:84 ../lib/python/Screens/TimerEntry.py:28
 #: ../lib/python/Screens/TimeDateInput.py:15
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:74
 msgid "OK"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:728
-#: ../lib/python/Components/NimManager.py:772
+#: ../lib/python/Components/NimManager.py:742
 msgid "Off"
 msgstr "Av"
 
-#: ../lib/python/Components/NimManager.py:728
-#: ../lib/python/Components/NimManager.py:772
+#: ../lib/python/Components/NimManager.py:742
 msgid "On"
 msgstr "På"
 
-#: ../lib/python/Components/NimManager.py:758
+#: ../lib/python/Components/NimManager.py:780
 msgid "One"
 msgstr "En"
 
@@ -887,108 +919,172 @@ msgstr ""
 msgid "Packet management"
 msgstr "Pakkeforvaltning"
 
-#: ../lib/python/Screens/InfoBar.py:45
+#: ../lib/python/Components/ParentalControl.py:80 ../data/
+msgid "Parental control"
+msgstr ""
+
+#: ../lib/python/Screens/ParentalControlSetup.py:74
+msgid "Parental control type"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBar.py:48
 msgid "Play recorded movies..."
 msgstr "Spill av filmopptak..."
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1035
+#: ../lib/python/Screens/InfoBarGenerics.py:1093
 msgid "Please choose an extension..."
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:125
+#: ../lib/python/Screens/ChannelSelection.py:134
 msgid "Please enter a name for the new bouquet"
 msgstr "Vennligst skriv navn for den nye bouquet"
 
-#: ../lib/python/Screens/TimerEntry.py:320
+#: ../lib/python/Screens/ChannelSelection.py:183
+msgid "Please enter a name for the new marker"
+msgstr ""
+
+#: ../lib/python/Screens/ParentalControlSetup.py:28
+msgid "Please enter the correct pin code"
+msgstr ""
+
+#: ../lib/python/Screens/ParentalControlSetup.py:232
+msgid "Please enter the old pin code"
+msgstr ""
+
+#: ../lib/python/Screens/TimerEntry.py:289
 msgid "Please select a subservice to record..."
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1334
+#: ../lib/python/Screens/InfoBarGenerics.py:1481
+#: ../lib/python/Screens/SubservicesQuickzap.py:97
 msgid "Please select a subservice..."
 msgstr ""
 
+#: ../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 ""
+
 #: ../lib/python/Screens/MovieSelection.py:79
 msgid "Please wait... Loading list..."
 msgstr "Vennligst vent... laster liste..."
 
-#: ../lib/python/Screens/ScanSetup.py:212
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:404
+#: ../lib/python/Screens/ScanSetup.py:200
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:403
 msgid "Polarity"
 msgstr "Polaritet"
 
-#: ../lib/python/Components/NimManager.py:727
+#: ../lib/python/Components/NimManager.py:741
 msgid "Polarization"
 msgstr "Polarisasjon"
 
-#: ../lib/python/Screens/Satconfig.py:15
+#: ../lib/python/Screens/Satconfig.py:13
 msgid "Port A"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:18
+#: ../lib/python/Screens/Satconfig.py:16
 msgid "Port B"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:20
+#: ../lib/python/Screens/Satconfig.py:18
 msgid "Port C"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:21
+#: ../lib/python/Screens/Satconfig.py:19
 msgid "Port D"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:692
+#: ../lib/python/Components/NimManager.py:699
 msgid "Positioner"
 msgstr "Rotor"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:131
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:130
 msgid "Positioner fine movement"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:130
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:129
 msgid "Positioner movement"
 msgstr "Rotorbevegelser"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:133
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:132
 msgid "Positioner storage"
 msgstr "Rotorlagring"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:421
-msgid "Predefined satellite"
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:422
+msgid "Predefined transponder"
 msgstr ""
 
-#: ../lib/python/Screens/NetworkSetup.py:35
+#: ../lib/python/Screens/NetworkSetup.py:22
 msgid "Press OK to activate the settings."
 msgstr "Trykk OK for å aktivere instillingene"
 
-#: ../lib/python/Screens/ScanSetup.py:716
+#: ../lib/python/Screens/ScanSetup.py:603
 msgid "Press OK to scan"
 msgstr "Trykk OK for å søke."
 
-#: ../lib/python/Screens/ScanSetup.py:169
+#: ../lib/python/Screens/ScanSetup.py:158
 msgid "Press OK to start the scan"
 msgstr "Trykk OK for a starte søk."
 
-#: ../lib/python/Screens/EpgSelection.py:45
+#: ../lib/python/Screens/EpgSelection.py:44
 msgid "Prev"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:447
-#: ../lib/python/Screens/ChannelSelection.py:587
+#: ../lib/python/Screens/ParentalControlSetup.py:72
+msgid "Protect services"
+msgstr ""
+
+#: ../lib/python/Screens/ParentalControlSetup.py:68
+msgid "Protect setup"
+msgstr ""
+
+#: ../lib/python/Screens/ChannelSelection.py:499
+#: ../lib/python/Screens/ChannelSelection.py:643
 msgid "Provider"
 msgstr "Tilbyder"
 
-#: ../lib/python/Screens/ChannelSelection.py:694
+#: ../lib/python/Screens/ChannelSelection.py:750
 msgid "Providers"
 msgstr "Tilbydere"
 
-#: ../lib/python/Screens/TimerEdit.py:107
+#: ../lib/python/Components/NimManager.py:789
+msgid "Quick"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1477
+msgid "Quickzap"
+msgstr ""
+
+#: ../lib/python/Screens/Setup.py:145
+msgid "Really close without saving settings?"
+msgstr ""
+
+#: ../lib/python/Screens/TimerEdit.py:105
 msgid "Really delete done timers?"
 msgstr "Skal ferdige timers virkelig slettes?"
 
+#: ../lib/python/Screens/TimerEdit.py:113
+msgid "Really delete this timer?"
+msgstr ""
+
+#: ../lib/python/Screens/SubservicesQuickzap.py:108
+msgid "Really exit the subservices quickzap?"
+msgstr ""
+
 #: ../lib/python/Screens/EventView.py:74
 msgid "Recording"
 msgstr "Opptak"
 
+#: ../lib/python/Screens/ParentalControlSetup.py:219
+msgid "Reenter new pin"
+msgstr ""
+
+#: ../lib/python/Screens/ParentalControlSetup.py:81
+msgid "Remember service pin"
+msgstr ""
+
 #: ../lib/python/Screens/PluginBrowser.py:20
 msgid "Remove Plugins"
 msgstr "Fjern Plugins"
@@ -997,88 +1093,88 @@ msgstr "Fjern Plugins"
 msgid "Remove plugins"
 msgstr "Fjern plugins"
 
-#: ../lib/python/Screens/TimerEntry.py:154
+#: ../lib/python/Screens/TimerEntry.py:133
 msgid "Repeat Type"
 msgstr ""
 
-#: ../lib/python/Screens/MediaPlayer.py:345
+#: ../lib/python/Screens/MediaPlayer.py:389
 msgid "Replace current playlist"
 msgstr ""
 
-#: ../lib/python/Screens/Ci.py:289
+#: ../lib/python/Screens/Ci.py:294
 msgid "Reset"
 msgstr "Tilbakestill"
 
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:77
-#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:166
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:167
 msgid "Restore"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1242
+#: ../lib/python/Screens/InfoBarGenerics.py:1384
 msgid "Right"
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:235
+#: ../lib/python/Screens/EpgSelection.py:234
 #: ../lib/python/Components/TimerList.py:34
 msgid "Sat"
 msgstr "Lør"
 
-#: ../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:157
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:398
+#: ../lib/python/Screens/ScanSetup.py:196
+#: ../lib/python/Screens/ScanSetup.py:209
+#: ../lib/python/Screens/Satconfig.py:11 ../lib/python/Screens/Satconfig.py:61
+#: ../lib/python/Screens/Satconfig.py:145
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:397
 msgid "Satellite"
 msgstr "Satellit"
 
-#: ../lib/python/Screens/ChannelSelection.py:446
-#: ../lib/python/Screens/ChannelSelection.py:589
+#: ../lib/python/Screens/ChannelSelection.py:498
+#: ../lib/python/Screens/ChannelSelection.py:645
 msgid "Satellites"
 msgstr "Satelliter"
 
-#: ../lib/python/Screens/TimerEntry.py:112
-#: ../lib/python/Screens/TimerEntry.py:175
+#: ../lib/python/Screens/TimerEntry.py:100
+#: ../lib/python/Screens/TimerEntry.py:154
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: ../lib/python/Screens/ScanSetup.py:708
-#: ../lib/python/Screens/ScanSetup.py:712
+#: ../lib/python/Screens/ScanSetup.py:594
+#: ../lib/python/Screens/ScanSetup.py:599
 msgid "Scan NIM"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:174
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:173
 msgid "Search east"
 msgstr ""
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:173
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:172
 msgid "Search west"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:676
-msgid "Secondary cable from motorized LNB"
-msgstr ""
-
-#: ../lib/python/Screens/InfoBarGenerics.py:1254
+#: ../lib/python/Screens/InfoBarGenerics.py:1396
 msgid "Select audio mode"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1243
+#: ../lib/python/Screens/InfoBarGenerics.py:1385
 msgid "Select audio track"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:237
+#: ../lib/python/Screens/TimerEntry.py:210
 msgid "Select channel to record from"
 msgstr "Velg kanal å ta opp fra"
 
-#: ../lib/python/Screens/Satconfig.py:128
+#: ../lib/python/Screens/Satconfig.py:116
 msgid "Sequence repeat"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:698
+#: ../lib/python/Screens/Satconfig.py:67
+msgid "Service scan type needed"
+msgstr ""
+
+#: ../lib/python/Screens/ChannelSelection.py:754
 msgid "Services"
 msgstr "Kanaler"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:132
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:131
 msgid "Set limits"
 msgstr "Sett grenser"
 
@@ -1086,11 +1182,15 @@ msgstr "Sett grenser"
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: ../lib/python/Screens/InfoBar.py:46
+#: ../lib/python/Screens/ParentalControlSetup.py:197
+msgid "Show services beginning with"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBar.py:49
 msgid "Show the radio player..."
 msgstr "Vis radio spilleren"
 
-#: ../lib/python/Screens/InfoBar.py:47
+#: ../lib/python/Screens/InfoBar.py:50
 msgid "Show the tv player..."
 msgstr ""
 
@@ -1102,12 +1202,7 @@ msgstr ""
 msgid "Similar broadcasts:"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:670
-#: ../lib/python/Components/NimManager.py:677
-msgid "Simple"
-msgstr "Enkel"
-
-#: ../lib/python/Components/NimManager.py:692
+#: ../lib/python/Components/NimManager.py:695
 msgid "Single"
 msgstr "Singel"
 
@@ -1115,21 +1210,21 @@ msgstr "Singel"
 msgid "Single EPG"
 msgstr "Enkel EPG"
 
-#: ../lib/python/Screens/ScanSetup.py:352
+#: ../lib/python/Screens/ScanSetup.py:339
 msgid "Single satellite"
 msgstr "Singel satellit"
 
-#: ../lib/python/Screens/ScanSetup.py:352
-#: ../lib/python/Screens/ScanSetup.py:353
-#: ../lib/python/Screens/ScanSetup.py:354
+#: ../lib/python/Screens/ScanSetup.py:339
+#: ../lib/python/Screens/ScanSetup.py:340
+#: ../lib/python/Screens/ScanSetup.py:341
 msgid "Single transponder"
 msgstr "Singel transponder"
 
-#: ../lib/python/Components/NimManager.py:705
+#: ../lib/python/Components/NimManager.py:717
 msgid "Slot "
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:564
+#: ../lib/python/Components/NimManager.py:549
 msgid "Socket "
 msgstr "Sokkel "
 
@@ -1140,24 +1235,24 @@ msgid ""
 "Please choose an other one."
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:701
-#: ../lib/python/Components/NimManager.py:762
+#: ../lib/python/Components/NimManager.py:713
+#: ../lib/python/Components/NimManager.py:784
 msgid "South"
 msgstr "Sør"
 
-#: ../lib/python/Components/Language.py:24
+#: ../lib/python/Components/Language.py:25
 msgid "Spanish"
 msgstr "Spansk"
 
-#: ../lib/python/Screens/TimerEntry.py:182
+#: ../lib/python/Screens/TimerEntry.py:160
 msgid "Start"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1194
+#: ../lib/python/Screens/InfoBarGenerics.py:1336
 msgid "Start recording?"
 msgstr "Start opptak?"
 
-#: ../lib/python/Screens/TimerEntry.py:185
+#: ../lib/python/Screens/TimerEntry.py:165
 msgid "StartTime"
 msgstr "StartTid"
 
@@ -1165,184 +1260,198 @@ msgstr "StartTid"
 msgid "Step "
 msgstr "Steg "
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:179
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:178
 msgid "Step east"
 msgstr "Steg øst"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:178
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:177
 msgid "Step west"
 msgstr "Steg vest"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1242
+#: ../lib/python/Screens/InfoBarGenerics.py:1384
 msgid "Stereo"
 msgstr ""
 
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:166
 #: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:167
 #: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:168
 #: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:169
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:170
 msgid "Stop"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:936
+#: ../lib/python/Screens/InfoBarGenerics.py:963
 msgid "Stop Timeshift?"
 msgstr "Stopp Timeshift?"
 
-#: ../lib/python/Screens/InfoBar.py:105
+#: ../lib/python/Screens/InfoBar.py:113
 msgid "Stop playing this movie?"
 msgstr "Stoppe avspilling av denne filmen?"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:188
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:187
 msgid "Store position"
 msgstr "Lagret posisjon"
 
-#: ../lib/python/Screens/Satconfig.py:116
+#: ../lib/python/Screens/Satconfig.py:104
 msgid "Stored position"
 msgstr "Lagret posisjon"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1272
+#: ../lib/python/Screens/InfoBarGenerics.py:1414
 msgid "Subservice list..."
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:235
+#: ../lib/python/Screens/EpgSelection.py:234
 #: ../lib/python/Components/TimerList.py:34
 msgid "Sun"
 msgstr "Søn"
 
-#: ../lib/python/Screens/TimerEntry.py:112
-#: ../lib/python/Screens/TimerEntry.py:176
+#: ../lib/python/Screens/TimerEntry.py:100
+#: ../lib/python/Screens/TimerEntry.py:155
 msgid "Sunday"
 msgstr "Søndag"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1027
-msgid "Swap services"
+#: ../lib/python/Screens/InfoBarGenerics.py:1176
+msgid "Swap Services"
 msgstr ""
 
-#: ../lib/python/Components/Language.py:25
+#: ../lib/python/Components/Language.py:26
 msgid "Swedish"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1277
+#: ../lib/python/Screens/InfoBarGenerics.py:1419
 msgid "Switch to next subservice"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1278
+#: ../lib/python/Screens/InfoBarGenerics.py:1420
 msgid "Switch to previous subservice"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:211
-#: ../lib/python/Screens/ScanSetup.py:244
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:403
+#: ../lib/python/Screens/ScanSetup.py:199
+#: ../lib/python/Screens/ScanSetup.py:232
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:402
 msgid "Symbol Rate"
 msgstr "Symbolrate"
 
-#: ../lib/python/Screens/ChannelSelection.py:706
+#: ../lib/python/Screens/ChannelSelection.py:762
 msgid "Terrestrial"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:73
+#: ../lib/python/Screens/Satconfig.py:71
 msgid "Terrestrial provider"
 msgstr "Region"
 
-#: ../lib/python/Components/NimManager.py:758
+#: ../lib/python/Screens/ParentalControlSetup.py:251
+msgid "The pin code has been changed successfully."
+msgstr ""
+
+#: ../lib/python/Screens/ChannelSelection.py:153
+#: ../lib/python/Screens/ParentalControlSetup.py:40
+#: ../lib/python/Components/ParentalControl.py:141
+msgid "The pin code you entered is wrong."
+msgstr ""
+
+#: ../lib/python/Screens/ParentalControlSetup.py:253
+msgid "The pin codes you entered are different."
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:780
 msgid "Three"
 msgstr "Tre"
 
-#: ../lib/python/Screens/Satconfig.py:149
+#: ../lib/python/Screens/Satconfig.py:137
 msgid "Threshold"
 msgstr "Grense"
 
-#: ../lib/python/Screens/EpgSelection.py:235
+#: ../lib/python/Screens/EpgSelection.py:234
 #: ../lib/python/Components/TimerList.py:34
 msgid "Thu"
 msgstr "Tor"
 
-#: ../lib/python/Screens/TimerEntry.py:112
-#: ../lib/python/Screens/TimerEntry.py:173
+#: ../lib/python/Screens/TimerEntry.py:100
+#: ../lib/python/Screens/TimerEntry.py:152
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: ../lib/python/Screens/TimeDateInput.py:55
+#: ../lib/python/Screens/TimeDateInput.py:41
 msgid "Time"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:152
+#: ../lib/python/Screens/TimerEntry.py:131
 msgid "Timer Type"
 msgstr "Timer Type"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:906
-msgid "Timeshift not possible!"
-msgstr "Timeshift er ikke mulig!"
-
-#: ../lib/python/Screens/MediaPlayer.py:47
+#: ../lib/python/Screens/MediaPlayer.py:49
 msgid "Title:"
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:246
+#: ../lib/python/Screens/EpgSelection.py:245
 #: ../lib/python/Tools/FuzzyDate.py:10
 msgid "Today"
 msgstr "Idag"
 
-#: ../lib/python/Screens/Satconfig.py:111
+#: ../lib/python/Screens/Satconfig.py:99
 msgid "Tone mode"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:125
+#: ../lib/python/Screens/Satconfig.py:113
 msgid "Toneburst"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:692
+#: ../lib/python/Components/NimManager.py:696
 msgid "Toneburst A/B"
 msgstr "Toneburst A/B"
 
-#: ../lib/python/Screens/ScanSetup.py:260
+#: ../lib/python/Screens/ScanSetup.py:248
 msgid "Transmission mode"
 msgstr "Sendingstype"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:407
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:406
 msgid "Transponder"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:206
+#: ../lib/python/Screens/ScanSetup.py:194
 msgid "Transpondertype"
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:235
+#: ../lib/python/Screens/InputBox.py:168
+msgid "Tries left:"
+msgstr ""
+
+#: ../lib/python/Screens/EpgSelection.py:234
 #: ../lib/python/Components/TimerList.py:34
 msgid "Tue"
 msgstr "Tir"
 
-#: ../lib/python/Screens/TimerEntry.py:112
-#: ../lib/python/Screens/TimerEntry.py:171
+#: ../lib/python/Screens/TimerEntry.py:100
+#: ../lib/python/Screens/TimerEntry.py:150
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:129
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:161
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:396
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:128
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:160
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:395
 msgid "Tune"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:187
+#: ../lib/python/Screens/ScanSetup.py:176
 #: ../lib/python/Components/ServiceScan.py:75
 msgid "Tuner"
 msgstr ""
 
-#: ../lib/python/Components/Language.py:26
+#: ../lib/python/Components/Language.py:27
 msgid "Turkish"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:758
+#: ../lib/python/Components/NimManager.py:780
 msgid "Two"
 msgstr "To"
 
-#: ../lib/python/Screens/ScanSetup.py:193
-#: ../lib/python/Screens/ScanSetup.py:196
-#: ../lib/python/Screens/ScanSetup.py:199
+#: ../lib/python/Screens/ScanSetup.py:182
+#: ../lib/python/Screens/ScanSetup.py:185
+#: ../lib/python/Screens/ScanSetup.py:188
 msgid "Type of scan"
 msgstr "Søketype"
 
-#: ../lib/python/Components/NimManager.py:697
+#: ../lib/python/Components/NimManager.py:707
 msgid "USALS"
 msgstr "USALS"
 
@@ -1360,11 +1469,11 @@ msgstr ""
 "Vennligst les manualen.\n"
 "Feil: "
 
-#: ../lib/python/Screens/Satconfig.py:133
+#: ../lib/python/Screens/Satconfig.py:121
 msgid "Uncommitted DiSEqC command"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:744
+#: ../lib/python/Components/NimManager.py:759
 msgid "Universal LNB"
 msgstr ""
 
@@ -1376,54 +1485,54 @@ msgstr "Oppdatering avsluttet. Her er resultatet:"
 msgid "Updating... Please wait... This can take some minutes..."
 msgstr "Oppdaterer...Vennligst vent..Dette kan ta noen minutter "
 
-#: ../lib/python/Screens/NetworkSetup.py:40 ../data/
+#: ../lib/python/Screens/NetworkSetup.py:27 ../data/
 msgid "Use DHCP"
 msgstr "Motta IP-adresse (DHCP)"
 
-#: ../lib/python/Screens/Satconfig.py:113
+#: ../lib/python/Screens/Satconfig.py:101
 msgid "Use usals for this sat"
 msgstr "Bruk USALS for denne Sat"
 
-#: ../lib/python/Components/NimManager.py:744
+#: ../lib/python/Components/NimManager.py:759
 msgid "User defined"
 msgstr "Brukerdefinert"
 
-#: ../lib/python/Screens/Satconfig.py:110
+#: ../lib/python/Screens/InfoBarGenerics.py:1752
+msgid "View teletext..."
+msgstr ""
+
+#: ../lib/python/Screens/Satconfig.py:98
 msgid "Voltage mode"
 msgstr "Spenningsmodus"
 
-#: ../lib/python/Screens/ChannelSelection.py:710
+#: ../lib/python/Screens/ChannelSelection.py:766
 msgid "W"
 msgstr ""
 
-#: ../lib/python/Screens/EpgSelection.py:235
+#: ../lib/python/Screens/EpgSelection.py:234
 #: ../lib/python/Components/TimerList.py:34
 msgid "Wed"
 msgstr "Ons"
 
-#: ../lib/python/Screens/TimerEntry.py:112
-#: ../lib/python/Screens/TimerEntry.py:172
+#: ../lib/python/Screens/TimerEntry.py:100
+#: ../lib/python/Screens/TimerEntry.py:151
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: ../lib/python/Screens/TimerEntry.py:167
+#: ../lib/python/Screens/TimerEntry.py:146
 msgid "Weekday"
 msgstr "Ukedag"
 
-#: ../lib/python/Components/NimManager.py:699
-#: ../lib/python/Components/NimManager.py:760
+#: ../lib/python/Components/NimManager.py:711
+#: ../lib/python/Components/NimManager.py:782
 msgid "West"
 msgstr "Vest"
 
-#: ../lib/python/Screens/MediaPlayer.py:51
+#: ../lib/python/Screens/MediaPlayer.py:53
 msgid "Year:"
 msgstr ""
 
-#: ../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/Components/NimManager.py:763
+#: ../lib/python/Screens/Ci.py:22
 msgid "Yes"
 msgstr "Ja"
 
@@ -1431,7 +1540,11 @@ msgstr "Ja"
 msgid "You cannot delete this!"
 msgstr "Du kan ikke slette denne!."
 
-#: ../lib/python/Screens/MediaPlayer.py:346
+#: ../lib/python/Screens/InputBox.py:108
+msgid "You have to wait for"
+msgstr ""
+
+#: ../lib/python/Screens/MediaPlayer.py:390
 msgid "You selected a playlist"
 msgstr ""
 
@@ -1443,23 +1556,23 @@ msgstr ""
 "Din frontprosessor-firmware må oppgraderes.\n"
 "Trykk OK for å starte oppdatering."
 
-#: ../lib/python/Screens/ChannelSelection.py:328
+#: ../lib/python/Screens/ChannelSelection.py:380
 msgid "[bouquet edit]"
 msgstr "BouquetEditor"
 
-#: ../lib/python/Screens/ChannelSelection.py:330
+#: ../lib/python/Screens/ChannelSelection.py:382
 msgid "[favourite edit]"
 msgstr "Favoritteditor"
 
-#: ../lib/python/Screens/ChannelSelection.py:413
+#: ../lib/python/Screens/ChannelSelection.py:465
 msgid "[move mode]"
 msgstr "Flyttemodus"
 
-#: ../lib/python/Screens/ChannelSelection.py:110
+#: ../lib/python/Screens/ChannelSelection.py:119
 msgid "abort bouquet edit"
 msgstr "Avbryt Bouqueteditor"
 
-#: ../lib/python/Screens/ChannelSelection.py:113
+#: ../lib/python/Screens/ChannelSelection.py:122
 msgid "abort favourites edit"
 msgstr "Avbryt Favoritteditor"
 
@@ -1467,41 +1580,54 @@ msgstr "Avbryt Favoritteditor"
 msgid "about to start"
 msgstr "starter snart"
 
-#: ../lib/python/Screens/ChannelSelection.py:99
-msgid "add bouquet..."
-msgstr "Legg til bouquet..."
+#: ../lib/python/Screens/ChannelSelection.py:101
+msgid "add bouquet"
+msgstr ""
 
-#: ../lib/python/Screens/MediaPlayer.py:295
+#: ../lib/python/Screens/MediaPlayer.py:337
 msgid "add directory to playlist"
 msgstr ""
 
-#: ../lib/python/Screens/MediaPlayer.py:297
+#: ../lib/python/Screens/MediaPlayer.py:339
 msgid "add file to playlist"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1192
-#: ../lib/python/Screens/InfoBarGenerics.py:1194
-msgid "add recording (enter recording duration)"
+#: ../lib/python/Screens/ChannelSelection.py:107
+msgid "add marker"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1192
-#: ../lib/python/Screens/InfoBarGenerics.py:1194
+#: ../lib/python/Screens/InfoBarGenerics.py:1334
+#: ../lib/python/Screens/InfoBarGenerics.py:1336
+msgid "add recording (enter recording duration)"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1334
+#: ../lib/python/Screens/InfoBarGenerics.py:1336
 msgid "add recording (indefinitely)"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1192
-#: ../lib/python/Screens/InfoBarGenerics.py:1194
+#: ../lib/python/Screens/InfoBarGenerics.py:1334
+#: ../lib/python/Screens/InfoBarGenerics.py:1336
 msgid "add recording (stop after current event)"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:79
+#: ../lib/python/Screens/ChannelSelection.py:87
 msgid "add service to bouquet"
 msgstr "Legg kanal til bouquet"
 
-#: ../lib/python/Screens/ChannelSelection.py:81
+#: ../lib/python/Screens/ChannelSelection.py:89
 msgid "add service to favourites"
 msgstr "Legg kanal til favoritter"
 
+#: ../lib/python/Screens/ChannelSelection.py:83
+msgid "add to parental protection"
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:664
+#: ../lib/python/Components/NimManager.py:675
+msgid "advanced"
+msgstr ""
+
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:208
 msgid ""
 "are you sure you want to restore\n"
@@ -1509,35 +1635,47 @@ msgid ""
 msgstr ""
 
 #: ../lib/python/Screens/MovieSelection.py:24
-#: ../lib/python/Screens/ChannelSelection.py:115
+#: ../lib/python/Screens/ChannelSelection.py:124
 msgid "back"
 msgstr "Tilbake"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1192
+#: ../lib/python/Components/ParentalControl.py:17
+msgid "blacklist"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1334
 msgid "change recording (duration)"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:376
+#: ../lib/python/Screens/ScanSetup.py:363
 msgid "circular left"
 msgstr "Sirkulær venstre"
 
-#: ../lib/python/Screens/ScanSetup.py:376
+#: ../lib/python/Screens/ScanSetup.py:363
 msgid "circular right"
 msgstr "Sirkulær høyre"
 
-#: ../lib/python/Screens/MediaPlayer.py:301
+#: ../lib/python/Screens/MediaPlayer.py:343
 msgid "clear playlist"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:85
+#: ../lib/python/Components/ParentalControl.py:13
+msgid "complex"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:586
+msgid "continue"
+msgstr ""
+
+#: ../lib/python/Screens/ChannelSelection.py:93
 msgid "copy to favourites"
 msgstr "Kopier til favoritter"
 
-#: ../lib/python/Screens/TimerEntry.py:104
+#: ../lib/python/Screens/TimerEntry.py:92
 msgid "daily"
 msgstr "Daglig"
 
-#: ../lib/python/Screens/MediaPlayer.py:300
+#: ../lib/python/Screens/MediaPlayer.py:342
 msgid "delete"
 msgstr ""
 
@@ -1545,16 +1683,16 @@ msgstr ""
 msgid "delete..."
 msgstr "Slette..."
 
-#: ../lib/python/Screens/ChannelSelection.py:106
+#: ../lib/python/Screens/ChannelSelection.py:115
 msgid "disable move mode"
 msgstr "Slå av flyttemodus"
 
-#: ../lib/python/Screens/TimerEntry.py:99
-#: ../lib/python/Screens/InfoBarGenerics.py:1192
+#: ../lib/python/Screens/TimerEntry.py:87
+#: ../lib/python/Screens/InfoBarGenerics.py:1334
 msgid "do nothing"
 msgstr "gjør ingenting"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1194
+#: ../lib/python/Screens/InfoBarGenerics.py:1336
 msgid "don't record"
 msgstr "Ikke ta opp"
 
@@ -1562,30 +1700,34 @@ msgstr "Ikke ta opp"
 msgid "done!"
 msgstr "ferdig!"
 
-#: ../lib/python/Components/NimManager.py:566
+#: ../lib/python/Components/NimManager.py:551
 msgid "empty/unknown"
 msgstr "Tom/ukjent"
 
-#: ../lib/python/Screens/ChannelSelection.py:102
+#: ../lib/python/Screens/ChannelSelection.py:111
 msgid "enable bouquet edit"
 msgstr "Aktiver Bouqueteditor"
 
-#: ../lib/python/Screens/ChannelSelection.py:104
+#: ../lib/python/Screens/ChannelSelection.py:113
 msgid "enable favourite edit"
 msgstr "Aktiver Favoritteditor"
 
-#: ../lib/python/Screens/ChannelSelection.py:98
+#: ../lib/python/Screens/ChannelSelection.py:108
 msgid "enable move mode"
 msgstr "Aktiver flyttemodus"
 
-#: ../lib/python/Screens/ChannelSelection.py:109
+#: ../lib/python/Screens/ChannelSelection.py:118
 msgid "end bouquet edit"
 msgstr "Avslutt Bouqueteditor"
 
-#: ../lib/python/Screens/ChannelSelection.py:112
+#: ../lib/python/Screens/ChannelSelection.py:121
 msgid "end favourites edit"
 msgstr "Avslutt Favorittteditor"
 
+#: ../lib/python/Components/NimManager.py:670
+msgid "equal to Socket A"
+msgstr ""
+
 #: ../lib/python/Components/DiskInfo.py:30
 msgid "free diskspace"
 msgstr "Ledig diskplass"
@@ -1594,27 +1736,31 @@ msgstr "Ledig diskplass"
 msgid "full /etc directory"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:99
+#: ../lib/python/Screens/TimerEntry.py:87
 msgid "go to deep standby"
 msgstr ""
 
-#: ../lib/python/Screens/MediaPlayer.py:302
+#: ../lib/python/Screens/InfoBar.py:64
+msgid "hear radio..."
+msgstr ""
+
+#: ../lib/python/Screens/MediaPlayer.py:344
 msgid "hide player"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:376
+#: ../lib/python/Screens/ScanSetup.py:363
 msgid "horizontal"
 msgstr "Horisontal"
 
-#: ../lib/python/Screens/Ci.py:295 ../lib/python/Screens/Ci.py:315
+#: ../lib/python/Screens/Ci.py:300 ../lib/python/Screens/Ci.py:322
 msgid "init module"
 msgstr "Initialisere modul"
 
-#: ../lib/python/Screens/InfoBar.py:91
+#: ../lib/python/Screens/InfoBar.py:98
 msgid "leave movie player..."
 msgstr "Forlat filmavspiller..."
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1253
+#: ../lib/python/Screens/InfoBarGenerics.py:1395
 msgid "left"
 msgstr ""
 
@@ -1623,7 +1769,11 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:697
+#: ../lib/python/Components/NimManager.py:671
+msgid "loopthrough to socket A"
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:708
 msgid "manual"
 msgstr "Manuell"
 
@@ -1632,24 +1782,24 @@ msgstr "Manuell"
 msgid "mins"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:260
+#: ../lib/python/Screens/InputBox.py:108
+msgid "minutes and"
+msgstr ""
+
+#: ../lib/python/Components/ParentalControl.py:14
+msgid "never"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:258
 msgid "next channel"
 msgstr "Neste kanal"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:262
+#: ../lib/python/Screens/InfoBarGenerics.py:260
 msgid "next channel in history"
 msgstr ""
 
-#: ../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
+#: ../lib/python/Screens/ScanSetup.py:342
+#: ../lib/python/Screens/ScanSetup.py:587
 msgid "no"
 msgstr "Nei"
 
@@ -1657,7 +1807,7 @@ msgstr "Nei"
 msgid "no HDD found"
 msgstr "Ingen harddisk funnet"
 
-#: ../lib/python/Screens/Ci.py:293 ../lib/python/Screens/Ci.py:313
+#: ../lib/python/Screens/Ci.py:298 ../lib/python/Screens/Ci.py:320
 msgid "no module found"
 msgstr "Ingen modul funnet"
 
@@ -1665,19 +1815,23 @@ msgstr "Ingen modul funnet"
 msgid "none"
 msgstr "Ingen"
 
-#: ../lib/python/Screens/ScanSetup.py:374
-#: ../lib/python/Screens/ScanSetup.py:383
-#: ../lib/python/Screens/ScanSetup.py:391
+#: ../lib/python/Components/NimManager.py:672
+msgid "nothing connected"
+msgstr ""
+
+#: ../lib/python/Screens/ScanSetup.py:361
+#: ../lib/python/Screens/ScanSetup.py:370
+#: ../lib/python/Screens/ScanSetup.py:378
 msgid "off"
 msgstr "Av"
 
-#: ../lib/python/Screens/ScanSetup.py:374
-#: ../lib/python/Screens/ScanSetup.py:383
-#: ../lib/python/Screens/ScanSetup.py:391
+#: ../lib/python/Screens/ScanSetup.py:361
+#: ../lib/python/Screens/ScanSetup.py:370
+#: ../lib/python/Screens/ScanSetup.py:378
 msgid "on"
 msgstr "På"
 
-#: ../lib/python/Screens/TimerEntry.py:100
+#: ../lib/python/Screens/TimerEntry.py:88
 msgid "once"
 msgstr "En gang"
 
@@ -1685,27 +1839,39 @@ msgstr "En gang"
 msgid "only /etc/enigma2 directory"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:263
-msgid "open service list"
+#: ../lib/python/Screens/InfoBarGenerics.py:261
+msgid "open servicelist"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:256
+msgid "open servicelist(down)"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:255
+msgid "open servicelist(up)"
 msgstr ""
 
 #: ../lib/python/Components/ServiceScan.py:75
 msgid "pass"
 msgstr "Gjennomgang"
 
-#: ../lib/python/Screens/Ci.py:79
+#: ../lib/python/Screens/InfoBarGenerics.py:585
+msgid "pause"
+msgstr ""
+
+#: ../lib/python/Screens/Ci.py:82
 msgid "please press OK when ready"
 msgstr "Trykk OK når det er klart"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:259
+#: ../lib/python/Screens/InfoBarGenerics.py:257
 msgid "previous channel"
 msgstr "Forrige kanal"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:261
+#: ../lib/python/Screens/InfoBarGenerics.py:259
 msgid "previous channel in history"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:98
+#: ../lib/python/Screens/TimerEntry.py:86
 msgid "record"
 msgstr ""
 
@@ -1713,27 +1879,28 @@ msgstr ""
 msgid "recording..."
 msgstr "tar opp..."
 
-#: ../lib/python/Screens/ChannelSelection.py:87
+#: ../lib/python/Screens/ChannelSelection.py:95
 msgid "remove all new found flags"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:93
-msgid "remove bouquet"
-msgstr "Fjern bouquet"
+#: ../lib/python/Screens/ChannelSelection.py:97
+#: ../lib/python/Screens/ChannelSelection.py:102
+msgid "remove entry"
+msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:91
-msgid "remove new found flag"
+#: ../lib/python/Screens/ChannelSelection.py:85
+msgid "remove from parental protection"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:89
-msgid "remove service"
-msgstr "Fjern kanal"
+#: ../lib/python/Screens/ChannelSelection.py:99
+msgid "remove new found flag"
+msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:100
+#: ../lib/python/Screens/TimerEntry.py:88
 msgid "repeated"
 msgstr "Gjentatt"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1253
+#: ../lib/python/Screens/InfoBarGenerics.py:1395
 msgid "right"
 msgstr ""
 
@@ -1775,27 +1942,65 @@ msgstr ""
 msgid "scan state"
 msgstr "SøkeStatus"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:374
+#: ../lib/python/Components/NimManager.py:673
+msgid "second cable of motorized LNB"
+msgstr ""
+
+#: ../lib/python/Screens/InputBox.py:108
+msgid "seconds."
+msgstr ""
+
+#: ../lib/python/Screens/ParentalControlSetup.py:96
+msgid "service pin"
+msgstr ""
+
+#: ../lib/python/Screens/ParentalControlSetup.py:98
+msgid "setup pin"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:392
 msgid "show EPG..."
 msgstr "Vis EPG..."
 
-#: ../lib/python/Screens/InfoBarGenerics.py:336
+#: ../lib/python/Screens/InfoBarGenerics.py:354
 msgid "show event details"
 msgstr "Vis sendingdetaljer"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1253
+#: ../lib/python/Components/ParentalControl.py:13
+#: ../lib/python/Components/NimManager.py:663
+#: ../lib/python/Components/NimManager.py:674
+msgid "simple"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:591
+msgid "skip backward"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:588
+msgid "skip forward"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:905
+msgid "start timeshift"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1395
 msgid "stereo"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1192
+#: ../lib/python/Screens/InfoBarGenerics.py:1334
 msgid "stop recording"
 msgstr "stopp opptak"
 
-#: ../lib/python/Screens/MediaPlayer.py:299
+#: ../lib/python/Screens/InfoBarGenerics.py:906
+msgid "stop timeshift"
+msgstr ""
+
+#: ../lib/python/Screens/MediaPlayer.py:341
 msgid "switch to filelist"
 msgstr ""
 
-#: ../lib/python/Screens/MediaPlayer.py:293
+#: ../lib/python/Screens/MediaPlayer.py:335
 msgid "switch to playlist"
 msgstr ""
 
@@ -1807,45 +2012,61 @@ msgstr "Tekst"
 msgid "this recording"
 msgstr ""
 
+#: ../lib/python/Components/ParentalControl.py:80
+msgid "this service is protected by a parental control pin"
+msgstr ""
+
 #: ../lib/python/Screens/EventView.py:80
 msgid "unknown service"
 msgstr "Ukjent kanal"
 
-#: ../lib/python/Screens/TimerEntry.py:104
+#: ../lib/python/Components/ParentalControl.py:14
+msgid "until restart"
+msgstr ""
+
+#: ../lib/python/Screens/TimerEntry.py:92
 msgid "user defined"
 msgstr "Brukerdefinert"
 
-#: ../lib/python/Screens/ScanSetup.py:376
+#: ../lib/python/Screens/ScanSetup.py:363
 msgid "vertical"
 msgstr "Vertikal"
 
+#: ../lib/python/Screens/InfoBarGenerics.py:1041
+msgid "view extensions..."
+msgstr ""
+
+#: ../lib/python/Screens/InfoBar.py:63
+msgid "view recordings..."
+msgstr ""
+
+#: ../lib/python/Screens/Ci.py:167
+msgid "wait for ci..."
+msgstr ""
+
 #: ../lib/python/Components/TimerList.py:57
 msgid "waiting"
 msgstr "venter"
 
-#: ../lib/python/Screens/TimerEntry.py:104
+#: ../lib/python/Screens/TimerEntry.py:92
 msgid "weekly"
 msgstr "Ukentlig"
 
-#: ../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
+#: ../lib/python/Components/ParentalControl.py:17
+msgid "whitelist"
+msgstr ""
+
+#: ../lib/python/Screens/ScanSetup.py:342
+#: ../lib/python/Screens/ScanSetup.py:587
 msgid "yes"
 msgstr "Ja"
 
-#: ../lib/python/Screens/ScanSetup.py:355
-#: ../lib/python/Screens/ScanSetup.py:702
+#: ../lib/python/Screens/ScanSetup.py:342
+#: ../lib/python/Screens/ScanSetup.py:587
 msgid "yes (keep feeds)"
 msgstr ""
 
-#: ../lib/python/Screens/TimerEntry.py:98
+#: ../lib/python/Screens/TimerEntry.py:86
 msgid "zap"
 msgstr ""
 
@@ -1873,10 +2094,6 @@ msgstr "Nettverksinstillinger"
 msgid "Games / Plugins"
 msgstr "Spill / Plugins"
 
-#: ../data/
-msgid "Hide error windows"
-msgstr "Ikke vis feilmeldinger"
-
 #: ../data/
 msgid "help..."
 msgstr "Hjelp..."
@@ -1915,12 +2132,16 @@ msgstr "Kanalsøk"
 msgid "DiSEqC"
 msgstr ""
 
+#: ../data/
+msgid "Main menu"
+msgstr "Hovedmeny"
+
 #: ../data/
 msgid "TV System"
 msgstr "TV System"
 
 #: ../data/
-msgid "#ffffff"
+msgid "Alternative radio mode"
 msgstr ""
 
 #: ../data/
@@ -1939,6 +2160,10 @@ msgstr ""
 msgid "Deep Standby"
 msgstr "Dyp Standby"
 
+#: ../data/
+msgid "Show positioner movement"
+msgstr ""
+
 #: ../data/
 msgid "Tuner Slot"
 msgstr ""
@@ -1957,10 +2182,6 @@ msgid ""
 "press OK."
 msgstr ""
 
-#: ../data/
-msgid "Show Satposition"
-msgstr "Vis Satposisjoner"
-
 #: ../data/
 msgid "Do you want to view a tutorial?"
 msgstr "Vil du se en veiledning?"
@@ -1990,12 +2211,12 @@ msgid "#bab329"
 msgstr ""
 
 #: ../data/
-msgid "Sat / Dish Setup"
-msgstr "Sat-/Parabolinstillinger"
+msgid "Startwizard"
+msgstr ""
 
 #: ../data/
-msgid "Visualize positioner movement"
-msgstr "Vis rotorbevegelsen"
+msgid "#ffffff"
+msgstr ""
 
 #: ../data/
 msgid ""
@@ -2006,21 +2227,13 @@ msgstr ""
 "Vennligst trykk OK nå for å starte backupen."
 
 #: ../data/
-msgid "Audio / Video"
-msgstr "Audio / Video"
-
-#: ../data/
-msgid "Yes, do another manual scan now"
-msgstr "Ja, gjør et nytt manuelt søk nå"
+msgid "Mute"
+msgstr "Mute"
 
 #: ../data/
 msgid "Service Searching"
 msgstr "Kanalsøk"
 
-#: ../data/
-msgid "Mute"
-msgstr "Mute"
-
 #: ../data/
 msgid ""
 "Welcome to the Image upgrade wizard. The wizard will assist you in upgrading "
@@ -2037,39 +2250,47 @@ msgid "Keyboard Map"
 msgstr "Tastaturlayout"
 
 #: ../data/
-msgid "Keyboard Setup"
-msgstr "Tastaturinstillinger"
+msgid "Enable multiple bouquets"
+msgstr ""
 
 #: ../data/
-msgid "Dish"
-msgstr "Parabol"
+msgid "Keyboard Setup"
+msgstr "Tastaturinstillinger"
 
 #: ../data/
-msgid "Record Splitsize"
-msgstr "Split-størrelse for opptak"
+msgid ""
+"Use the left and right buttons to change an option.\n"
+"\n"
+"Please set up tuner A"
+msgstr ""
+"Bruk venstre og høyre knappene for å endre valg.\n"
+"\n"
+"Instillinger for Tuner A"
 
 #: ../data/
-msgid "Auto show inforbar"
-msgstr "Autovis Infobar"
+msgid "Dish"
+msgstr "Parabol"
 
 #: ../data/
 msgid "Margin after record"
 msgstr "Margin etter opptak"
 
 #: ../data/
-msgid "Network"
-msgstr "Nettverk"
+msgid "#ffffffff"
+msgstr ""
 
 #: ../data/
-msgid "Invert"
-msgstr "Inverter"
+msgid "System"
+msgstr ""
 
 #: ../data/
-msgid "System"
+msgid "Use power measurement"
 msgstr ""
 
 #: ../data/
-msgid "use power delta"
+msgid ""
+"Thank you for using the wizard. Your box is now ready to use.\n"
+"Please press OK to start using you Dreambox."
 msgstr ""
 
 #: ../data/
@@ -2081,8 +2302,8 @@ msgid "Manual Scan"
 msgstr "Manuelt Søk"
 
 #: ../data/
-msgid "OSD Settings"
-msgstr "OSD-Instillinger"
+msgid "Timer Edit"
+msgstr "Timereditering"
 
 #: ../data/
 msgid "RC Menu"
@@ -2092,6 +2313,10 @@ msgstr "Fjernkontroll"
 msgid "No, just start my dreambox"
 msgstr "Nei, bare start min dreambox"
 
+#: ../data/
+msgid "Network..."
+msgstr ""
+
 #: ../data/
 msgid "Tuner configuration"
 msgstr ""
@@ -2109,8 +2334,8 @@ msgid "Standby / Restart"
 msgstr "Standby / Start om"
 
 #: ../data/
-msgid "Main menu"
-msgstr "Hovedmeny"
+msgid "Standby"
+msgstr ""
 
 #: ../data/
 msgid "EPG Selection"
@@ -2121,24 +2346,24 @@ msgid "Exit the wizard"
 msgstr "Avslutt wizarden"
 
 #: ../data/
-msgid "Fast zapping"
-msgstr "Hurtig programskifte"
+msgid "OSD Settings"
+msgstr "OSD-Instillinger"
 
 #: ../data/
-msgid "Usage Settings"
-msgstr "Anvendelsesinstillinger"
+msgid "RF output"
+msgstr ""
 
 #: ../data/
 msgid "Brightness"
 msgstr "Lysstyrke"
 
 #: ../data/
-msgid "Standby"
+msgid "Parental control services Editor"
 msgstr ""
 
 #: ../data/
-msgid "Timer Edit"
-msgstr "Timereditering"
+msgid "Yes, do another manual scan now"
+msgstr "Ja, gjør et nytt manuelt søk nå"
 
 #: ../data/
 msgid "Activate network settings"
@@ -2160,10 +2385,6 @@ msgstr "Ta opp"
 msgid "Yes, view the tutorial"
 msgstr ""
 
-#: ../data/
-msgid "UHF Modulator"
-msgstr ""
-
 #: ../data/
 msgid "Color Format"
 msgstr "Fargeformat"
@@ -2173,7 +2394,7 @@ msgid "#f23d21"
 msgstr ""
 
 #: ../data/
-msgid "Enigma1 like radiomode"
+msgid "Plugin browser"
 msgstr ""
 
 #: ../data/
@@ -2197,7 +2418,7 @@ msgid "Subservices"
 msgstr "Underkanaler"
 
 #: ../data/
-msgid "LCD"
+msgid "Parental control setup"
 msgstr ""
 
 #: ../data/
@@ -2221,8 +2442,8 @@ msgid "Common Interface"
 msgstr ""
 
 #: ../data/
-msgid "Ask before zapping"
-msgstr "Spør før programskifte"
+msgid "Language..."
+msgstr ""
 
 #: ../data/
 msgid ""
@@ -2258,10 +2479,6 @@ msgstr "LCD Instillinger"
 msgid "No, scan later manually"
 msgstr "Nei, søk manuelt senere."
 
-#: ../data/
-msgid "Input"
-msgstr ""
-
 #: ../data/
 msgid "Soundcarrier"
 msgstr "Tonebærer"
@@ -2309,6 +2526,14 @@ msgstr "Nettverksinstillinger"
 msgid "Somewhere else"
 msgstr "En annen plass"
 
+#: ../data/
+msgid "Do you want to do a service scan?"
+msgstr "Vil du utføre et kanalsøk?"
+
+#: ../data/
+msgid "Timer log"
+msgstr ""
+
 #: ../data/
 msgid ""
 "Your backup succeeded. We will now continue to explain the further upgrade "
@@ -2325,14 +2550,6 @@ msgstr ""
 msgid "Menu"
 msgstr "Meny"
 
-#: ../data/
-msgid "Plugin browser"
-msgstr ""
-
-#: ../data/
-msgid "Parental Lock"
-msgstr "Foreldrelås"
-
 #: ../data/
 msgid "Restart"
 msgstr "Omstart"
@@ -2403,10 +2620,6 @@ msgstr "Din dreambox slår seg av. Vennligst vent..."
 msgid "WSS on 4:3"
 msgstr ""
 
-#: ../data/
-msgid "Skip confirmations"
-msgstr "Hopp over bekreftelser"
-
 #: ../data/
 msgid "Choose bouquet"
 msgstr "Velg bouquet"
@@ -2440,7 +2653,7 @@ msgid "USB"
 msgstr ""
 
 #: ../data/
-msgid "Timer log"
+msgid "Invert display"
 msgstr ""
 
 #: ../data/
@@ -2451,12 +2664,6 @@ msgstr "Vil du hente inn dine innstillinger?"
 msgid "Please set up tuner B"
 msgstr "Instillinger for Tuner 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 ""
-
 #: ../data/
 msgid "Delay"
 msgstr "Forsinkelse"
@@ -2465,42 +2672,24 @@ msgstr "Forsinkelse"
 msgid "Select HDD"
 msgstr "Velg harddisk"
 
-#: ../data/
-msgid "#ffffffff"
-msgstr ""
-
-#: ../data/
-msgid "Setup Lock"
-msgstr "Setup-Sperre"
-
 #: ../data/
 msgid "Aspect Ratio"
 msgstr "Breddeforhold"
 
 #: ../data/
-msgid "Expert Setup"
-msgstr "Expertinstillinger"
-
-#: ../data/
-msgid "Language"
-msgstr "Språk"
+msgid "Recordings always have priority"
+msgstr ""
 
 #: ../data/
-msgid ""
-"Use the left and right buttons to change an option.\n"
-"\n"
-"Please set up tuner A"
+msgid "Customize"
 msgstr ""
-"Bruk venstre og høyre knappene for å endre valg.\n"
-"\n"
-"Instillinger for Tuner A"
 
 #: ../data/
-msgid "Parental Control"
-msgstr "Foreldrekontroll"
+msgid "#389416"
+msgstr ""
 
 #: ../data/
-msgid "#389416"
+msgid "Pin code needed"
 msgstr ""
 
 #: ../data/
@@ -2519,10 +2708,6 @@ msgstr "Velg film"
 msgid "Volume"
 msgstr "Volum"
 
-#: ../data/
-msgid "Multi bouquets"
-msgstr ""
-
 #: ../data/
 msgid "#33294a6b"
 msgstr ""
@@ -2576,12 +2761,12 @@ msgid "AGC:"
 msgstr ""
 
 #: ../data/
-msgid "What do you want to scan?"
-msgstr "Hva vil du søke etter?"
+msgid "Sat / Dish Setup"
+msgstr "Sat-/Parabolinstillinger"
 
 #: ../data/
-msgid "Usage settings"
-msgstr "Anvendelsesinstillinger"
+msgid "What do you want to scan?"
+msgstr "Hva vil du søke etter?"
 
 #: ../data/
 msgid "Now Playing"
@@ -2596,8 +2781,8 @@ msgid "Audio"
 msgstr "Lyd"
 
 #: ../data/
-msgid "Do you want to do a service scan?"
-msgstr "Vil du utføre et kanalsøk?"
+msgid "Harddisk..."
+msgstr ""
 
 #: ../data/
 msgid "NOW"
@@ -2619,6 +2804,93 @@ msgstr ""
 msgid "Do you want to do another manual service scan?"
 msgstr "Vil du gjøre enda et manuelt kanalsøk?"
 
+#~ msgid "Cable provider"
+#~ msgstr "Kabelleverandør"
+
+#~ msgid "Classic"
+#~ msgstr "Klassisk"
+
+#~ msgid "Default"
+#~ msgstr "Standard"
+
+#~ msgid "Equal to Socket A"
+#~ msgstr "Likt Socket A"
+
+#~ msgid "Loopthrough to Socket A"
+#~ msgstr "Koblet med Tuner A"
+
+#~ msgid "Nothing connected"
+#~ msgstr "Ikke noe tilkoblet"
+
+#~ msgid "Simple"
+#~ msgstr "Enkel"
+
+#~ msgid "add bouquet..."
+#~ msgstr "Legg til bouquet..."
+
+#~ msgid "remove bouquet"
+#~ msgstr "Fjern bouquet"
+
+#~ msgid "remove service"
+#~ msgstr "Fjern kanal"
+
+#~ msgid "Hide error windows"
+#~ msgstr "Ikke vis feilmeldinger"
+
+#~ msgid "Show Satposition"
+#~ msgstr "Vis Satposisjoner"
+
+#~ msgid "Visualize positioner movement"
+#~ msgstr "Vis rotorbevegelsen"
+
+#~ msgid "Audio / Video"
+#~ msgstr "Audio / Video"
+
+#~ msgid "Record Splitsize"
+#~ msgstr "Split-størrelse for opptak"
+
+#~ msgid "Auto show inforbar"
+#~ msgstr "Autovis Infobar"
+
+#~ msgid "Network"
+#~ msgstr "Nettverk"
+
+#~ msgid "Invert"
+#~ msgstr "Inverter"
+
+#~ msgid "Fast zapping"
+#~ msgstr "Hurtig programskifte"
+
+#~ msgid "Usage Settings"
+#~ msgstr "Anvendelsesinstillinger"
+
+#~ msgid "Ask before zapping"
+#~ msgstr "Spør før programskifte"
+
+#~ msgid "Parental Lock"
+#~ msgstr "Foreldrelås"
+
+#~ msgid "Skip confirmations"
+#~ msgstr "Hopp over bekreftelser"
+
+#~ msgid "Setup Lock"
+#~ msgstr "Setup-Sperre"
+
+#~ msgid "Expert Setup"
+#~ msgstr "Expertinstillinger"
+
+#~ msgid "Language"
+#~ msgstr "Språk"
+
+#~ msgid "Parental Control"
+#~ msgstr "Foreldrekontroll"
+
+#~ msgid "Usage settings"
+#~ msgstr "Anvendelsesinstillinger"
+
+#~ msgid "Timeshift not possible!"
+#~ msgstr "Timeshift er ikke mulig!"
+
 #~ msgid "Do you really want to delete this recording?"
 #~ msgstr "Vil du virkelig slette dette opptaket?"
 
Clone of git://git.opendreambox.org/git/enigma2.git before dream multimedia removed all the engima2 sources