improve parental control retry count

[enigma2.git] / po / fr.po

diff --git a/po/fr.po b/po/fr.po
index 52b63282b042e4d702b1c06a11a060b22af88acb..1edbadffd6dee4b534af12c1bcb3341d41771bb8 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: enigma 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-12 00:57+0200\n"
+"POT-Creation-Date: 2006-10-11 17:12+0200\n"
 "PO-Revision-Date: 2006-06-13 18:14+0200\n"
 "Last-Translator: DonHora <donhora@myrealbox.com>\n"
 "Language-Team: french\n"
@@ -35,9 +35,9 @@ msgid "%d min"
 msgstr "%d min"
 
 # Ex : 25/12/2006\r
-#: ../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 "%d/%m/%Y"
 
@@ -63,47 +63,63 @@ msgstr "répertoire /usr/share/enigma2"
 msgid "/var directory"
 msgstr "répertoire /var"
 
-#: ../lib/python/Components/NimManager.py:748
+#: ../lib/python/Components/NimManager.py:763
 msgid "0 V"
 msgstr "0 V"
 
-#: ../lib/python/Components/NimManager.py:751
+#: ../lib/python/Components/NimManager.py:766
 msgid "1.0"
 msgstr "1.0"
 
-#: ../lib/python/Components/NimManager.py:751
+#: ../lib/python/Components/NimManager.py:766
 msgid "1.1"
 msgstr "1.1"
 
-#: ../lib/python/Components/NimManager.py:751
+#: ../lib/python/Components/NimManager.py:766
 msgid "1.2"
 msgstr "1.2"
 
-#: ../lib/python/Components/NimManager.py:748
+#: ../lib/python/Components/NimManager.py:763
 msgid "12 V"
 msgstr "12 V"
 
-#: ../lib/python/Screens/Satconfig.py:150
+#: ../lib/python/Screens/Satconfig.py:138
 msgid "12V Output"
 msgstr "Sortie 12 V"
 
-#: ../lib/python/Components/NimManager.py:727
+#: ../lib/python/Components/NimManager.py:741
 msgid "13 V"
 msgstr "13 V"
 
-#: ../lib/python/Components/NimManager.py:727
+#: ../lib/python/Components/NimManager.py:741
 msgid "18 V"
 msgstr "18 V"
 
+#: ../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 "<inconnu>"
 
-#: ../lib/python/Components/NimManager.py:750
+#: ../lib/python/Screens/Setup.py:118
+msgid "??"
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:765
 msgid "A"
 msgstr "A"
 
-#: ../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 ""
 "Un enregistrement est en cours.\n"
 "Que voulez-vous faire ?"
 
-#: ../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."
@@ -127,47 +143,45 @@ msgstr ""
 "Un programme n'a pas pu s'enregistrer !\n"
 "Désactiver la TV et réessayer ?\n"
 
-#: ../lib/python/Components/NimManager.py:733
+#: ../lib/python/Components/NimManager.py:747
 msgid "AA"
 msgstr "AA"
 
-#: ../lib/python/Components/NimManager.py:733
+#: ../lib/python/Components/NimManager.py:747
 msgid "AB"
 msgstr "AB"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1023
+#: ../lib/python/Screens/InfoBarGenerics.py:1173
 msgid "Activate Picture in Picture"
 msgstr "Activer l'incrustation d'image"
 
-#: ../lib/python/Screens/TimerEdit.py:27
+#: ../lib/python/Screens/TimerEdit.py:25
 msgid "Add"
 msgstr "Ajouter"
 
-#: ../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 "Programmer"
 
-#: ../lib/python/Components/NimManager.py:670
-#: ../lib/python/Components/NimManager.py:678
 #: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:31
 msgid "Advanced"
 msgstr "Avancé"
 
-#: ../lib/python/Screens/TimerEntry.py:195
+#: ../lib/python/Screens/TimerEntry.py:177
 msgid "After event"
 msgstr "Après l'émission"
 
-#: ../lib/python/Screens/MediaPlayer.py:49
+#: ../lib/python/Screens/MediaPlayer.py:51
 msgid "Album:"
 msgstr "Album :"
 
-#: ../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 "Toutes"
 
@@ -175,41 +189,41 @@ msgstr "Toutes"
 msgid "Arabic"
 msgstr "Arabe"
 
-#: ../lib/python/Screens/MediaPlayer.py:45
+#: ../lib/python/Screens/MediaPlayer.py:47
 msgid "Artist:"
 msgstr "Artiste :"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1202
+#: ../lib/python/Screens/InfoBarGenerics.py:1344
 msgid "Audio Options..."
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:374
-#: ../lib/python/Screens/ScanSetup.py:377
+#: ../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 "Auto"
 
-#: ../lib/python/Screens/ScanSetup.py:715 ../data/
+#: ../lib/python/Screens/ScanSetup.py:602 ../data/
 msgid "Automatic Scan"
 msgstr "Recherche automatique"
 
-#: ../lib/python/Components/NimManager.py:750
+#: ../lib/python/Components/NimManager.py:765
 msgid "B"
 msgstr "B"
 
-#: ../lib/python/Components/NimManager.py:733
+#: ../lib/python/Components/NimManager.py:747
 msgid "BA"
 msgstr "BA"
 
-#: ../lib/python/Components/NimManager.py:733
+#: ../lib/python/Components/NimManager.py:747
 msgid "BB"
 msgstr "BB"
 
@@ -225,11 +239,11 @@ msgstr "Emplacement de la sauvegarde"
 msgid "Backup Mode"
 msgstr "Mode de sauvegarde"
 
-#: ../lib/python/Components/NimManager.py:728
+#: ../lib/python/Components/NimManager.py:742
 msgid "Band"
 msgstr "Bande"
 
-#: ../lib/python/Screens/ScanSetup.py:256
+#: ../lib/python/Screens/ScanSetup.py:244
 msgid "Bandwidth"
 msgstr "Bande passante"
 
@@ -237,7 +251,7 @@ msgstr "Bande passante"
 msgid "Bus: "
 msgstr "Bus : "
 
-#: ../lib/python/Components/NimManager.py:744
+#: ../lib/python/Components/NimManager.py:759
 msgid "C-Band"
 msgstr "Bande C"
 
@@ -245,18 +259,14 @@ msgstr "Bande C"
 msgid "CF Drive"
 msgstr "Lecteur CF"
 
-#: ../lib/python/Screens/ChannelSelection.py:704
+#: ../lib/python/Screens/ChannelSelection.py:760
 msgid "Cable"
 msgstr "Câble"
 
-#: ../lib/python/Screens/Satconfig.py:69
-msgid "Cable provider"
-msgstr "Câblopérateur"
-
-#: ../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 "Annuler"
 
@@ -264,11 +274,32 @@ msgstr "Annuler"
 msgid "Capacity: "
 msgstr "Capacité : "
 
-#: ../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 "Chaîne"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:150
+#: ../lib/python/Screens/InfoBarGenerics.py:148
 msgid "Channel:"
 msgstr "Chaîne : "
 
@@ -276,57 +307,54 @@ msgstr "Chaîne : "
 msgid "Choose source"
 msgstr "Choisissez la source"
 
-#: ../lib/python/Components/SetupDevices.py:21
-msgid "Classic"
-msgstr "Classique"
-
-#: ../lib/python/Screens/TimerEdit.py:29
+#: ../lib/python/Screens/TimerEdit.py:27
 msgid "Cleanup"
 msgstr "Nettoyage"
 
 # Effacer ou vider ?\r
-#: ../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 "Effacer avant de rechercher"
 
-#: ../lib/python/Screens/TimerEntry.py:346
+#: ../lib/python/Screens/TimerEntry.py:315
 msgid "Clear log"
 msgstr "Effacer le journal"
 
-#: ../lib/python/Screens/ScanSetup.py:257
+#: ../lib/python/Screens/ScanSetup.py:245
 msgid "Code rate high"
 msgstr "Débit symbole haut"
 
-#: ../lib/python/Screens/ScanSetup.py:258
+#: ../lib/python/Screens/ScanSetup.py:246
 msgid "Code rate low"
 msgstr "Débit symbole bas"
 
 # TODO : À traduire\r
-#: ../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 ""
 
 # TODO : À vérifier\r
-#: ../lib/python/Screens/Satconfig.py:126
+#: ../lib/python/Screens/Satconfig.py:114
 msgid "Committed DiSEqC command"
 msgstr "Commande DiSEqC validée"
 
-#: ../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 "Terminé"
 
-#: ../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 "Mode de configuration"
 
-#: ../lib/python/Screens/TimerEdit.py:205
+#: ../lib/python/Screens/TimerEdit.py:208
 msgid "Conflicting timer"
 msgstr "Programmation conflictuelle"
 
@@ -334,31 +362,27 @@ msgstr "Programmation conflictuelle"
 msgid "Current version:"
 msgstr "Version actuelle : "
 
-#: ../lib/python/Screens/ScanSetup.py:372
+#: ../lib/python/Screens/ScanSetup.py:359
 msgid "DVB-S"
 msgstr "DVB-S"
 
-#: ../lib/python/Screens/ScanSetup.py:372
+#: ../lib/python/Screens/ScanSetup.py:359
 msgid "DVB-S2"
 msgstr "DVB-S2"
 
-#: ../lib/python/Components/Language.py:17
+#: ../lib/python/Components/Language.py:18
 msgid "Danish"
 msgstr "Danois"
 
-#: ../lib/python/Screens/TimeDateInput.py:54
+#: ../lib/python/Screens/TimeDateInput.py:40
 msgid "Date"
 msgstr "Date"
 
-#: ../lib/python/Components/SetupDevices.py:21
-msgid "Default"
-msgstr "Défaut"
-
-#: ../lib/python/Screens/TimerEdit.py:26
+#: ../lib/python/Screens/TimerEdit.py:24
 msgid "Delete"
 msgstr "Effacer"
 
-#: ../lib/python/Screens/TimerEntry.py:343
+#: ../lib/python/Screens/TimerEntry.py:312
 msgid "Delete entry"
 msgstr "Effacer l'entrée"
 
@@ -366,7 +390,7 @@ msgstr "Effacer l'entrée"
 msgid "Delete failed!"
 msgstr "L'effacement a échoué !"
 
-#: ../lib/python/Screens/TimerEntry.py:151
+#: ../lib/python/Screens/TimerEntry.py:130
 msgid "Description"
 msgstr "Description"
 
@@ -378,43 +402,39 @@ msgstr "DD détecté : "
 msgid "Detected NIMs:"
 msgstr "NIM détectés : "
 
-#: ../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 "Mode DiSEqC"
 
-#: ../lib/python/Screens/Satconfig.py:122
+#: ../lib/python/Screens/Satconfig.py:110
 msgid "DiSEqC mode"
 msgstr "Mode DiSEqC"
 
 # TODO : À traduire\r
-#: ../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 "Désactiver"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1025
+#: ../lib/python/Screens/InfoBarGenerics.py:1171
 msgid "Disable Picture in Picture"
 msgstr "Désactiver l'incrustation d'image"
 
+#: ../lib/python/Screens/InfoBarGenerics.py:1128
+msgid "Disable subtitles"
+msgstr ""
+
 #: ../lib/python/Screens/PluginBrowser.py:102
 msgid ""
 "Do you really want to REMOVE\n"
@@ -450,6 +470,10 @@ msgstr ""
 "Voulez-vous sauvegarder maintenant ?\n"
 "Après avoir appuyé sur OK, veuillez patienter !"
 
+#: ../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 ""
@@ -471,11 +495,11 @@ msgstr "Nouveaux plugins téléchargables"
 msgid "Downloading plugin information. Please wait..."
 msgstr "Téléchargement des informations sur les plugins. Patientez SVP..."
 
-#: ../lib/python/Components/Language.py:18
+#: ../lib/python/Components/Language.py:19
 msgid "Dutch"
 msgstr "Hollandais"
 
-#: ../lib/python/Screens/ChannelSelection.py:712
+#: ../lib/python/Screens/ChannelSelection.py:768
 msgid "E"
 msgstr "E"
 
@@ -484,48 +508,48 @@ msgstr "E"
 msgid "ERROR - failed to scan (%s)!"
 msgstr "ERREUR - échec lors de l'analyse (%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 "Est"
 
-#: ../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 "Activer"
 
-#: ../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 "Fin"
 
-#: ../lib/python/Screens/TimerEntry.py:192
+#: ../lib/python/Screens/TimerEntry.py:174
 msgid "EndTime"
 msgstr "Fin"
 
 #: ../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 "Anglais"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:322
+#: ../lib/python/Screens/InfoBarGenerics.py:340
 msgid "Enter main menu..."
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:673
-msgid "Equal to Socket A"
-msgstr "Pareil que l'emplacement A"
+#: ../lib/python/Screens/ChannelSelection.py:146
+msgid "Enter the service pin"
+msgstr ""
 
 #: ../lib/python/Screens/Console.py:41
 msgid "Execution Progress:"
@@ -535,45 +559,45 @@ msgstr "Avancement de l'exécution :"
 msgid "Execution finished!!"
 msgstr "Exécution terminée !"
 
-#: ../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 "FEC"
 
 # TODO : À traduire\r
-#: ../lib/python/Screens/Satconfig.py:127
+#: ../lib/python/Screens/Satconfig.py:115
 msgid "Fast DiSEqC"
 msgstr "DiSEqC rapide"
 
-#: ../lib/python/Screens/ChannelSelection.py:448
+#: ../lib/python/Screens/ChannelSelection.py:500
 msgid "Favourites"
 msgstr "Favoris"
 
-#: ../lib/python/Components/Language.py:19
+#: ../lib/python/Components/Language.py:20
 msgid "Finnish"
 msgstr "Finlandais"
 
-#: ../lib/python/Components/Language.py:20
+#: ../lib/python/Components/Language.py:21
 msgid "French"
 msgstr "Français"
 
-#: ../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 "Fréquence"
 
-#: ../lib/python/Screens/EpgSelection.py:235
+#: ../lib/python/Screens/EpgSelection.py:234
 #: ../lib/python/Components/TimerList.py:34
 msgid "Fri"
 msgstr "Ven"
 
-#: ../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 "Vendredi"
 
@@ -586,15 +610,15 @@ msgstr "Version du frontprocessor : %d"
 msgid "Function not yet implemented"
 msgstr "Fonction non implémentée pour l'instant"
 
-#: ../lib/python/Screens/NetworkSetup.py:45 ../data/
+#: ../lib/python/Screens/NetworkSetup.py:32 ../data/
 msgid "Gateway"
 msgstr "Passerelle"
 
-#: ../lib/python/Screens/MediaPlayer.py:53
+#: ../lib/python/Screens/MediaPlayer.py:55
 msgid "Genre:"
 msgstr "Genre :"
 
-#: ../lib/python/Components/SetupDevices.py:24
+#: ../lib/python/Components/SetupDevices.py:15
 #: ../lib/python/Components/Language.py:15
 msgid "German"
 msgstr "Allemand"
@@ -603,17 +627,17 @@ msgstr "Allemand"
 msgid "Getting plugin information. Please wait..."
 msgstr "Récupération des informations du plugin. Patientez SVP..."
 
-#: ../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 "Aller à 0"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:189
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:188
 msgid "Goto position"
 msgstr "Aller à la position"
 
 # TODO : À vérifier\r
-#: ../lib/python/Screens/ScanSetup.py:261
+#: ../lib/python/Screens/ScanSetup.py:249
 msgid "Guard interval mode"
 msgstr "Intervalle de garde"
 
@@ -623,20 +647,20 @@ msgid "Harddisk"
 msgstr "Disque dur"
 
 # TODO : À vérifier\r
-#: ../lib/python/Screens/ScanSetup.py:262
+#: ../lib/python/Screens/ScanSetup.py:250
 msgid "Hierarchy mode"
 msgstr "Hiérarchie"
 
-#: ../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 "Combien de minutes voulez-vous enregistrer ?"
 
-#: ../lib/python/Screens/NetworkSetup.py:42 ../data/
+#: ../lib/python/Screens/NetworkSetup.py:29 ../data/
 msgid "IP Address"
 msgstr "Adresse IP"
 
-#: ../lib/python/Components/Language.py:21
+#: ../lib/python/Components/Language.py:22
 msgid "Icelandic"
 msgstr "Islandais"
 
@@ -651,11 +675,11 @@ msgstr ""
 "Afin d'enregistrer une émission programmée, la TV zappera sur la chaîne "
 "enregistrée !\n"
 
-#: ../lib/python/Screens/Satconfig.py:151
+#: ../lib/python/Screens/Satconfig.py:139
 msgid "Increased voltage"
 msgstr "Augmenter la tension"
 
-#: ../lib/python/Screens/Ci.py:290
+#: ../lib/python/Screens/Ci.py:295
 msgid "Init"
 msgstr "Initialiser"
 
@@ -667,34 +691,38 @@ msgstr "Initialiser"
 msgid "Initializing Harddisk..."
 msgstr "Initialisation du disque sur..."
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1078
+#: ../lib/python/Screens/InputBox.py:14 ../data/
+msgid "Input"
+msgstr "Entrée"
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1220
 msgid "Instant Record..."
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:210
+#: ../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 "Inversion"
 
-#: ../lib/python/Components/Language.py:22
+#: ../lib/python/Components/Language.py:23
 msgid "Italian"
 msgstr "Italien"
 
-#: ../lib/python/Screens/Satconfig.py:119
+#: ../lib/python/Screens/Satconfig.py:107
 msgid "LNB"
 msgstr "LNB"
 
-#: ../lib/python/Screens/Satconfig.py:144
+#: ../lib/python/Screens/Satconfig.py:132
 msgid "LOF"
 msgstr "LOF"
 
-#: ../lib/python/Screens/Satconfig.py:148
+#: ../lib/python/Screens/Satconfig.py:136
 msgid "LOF/H"
 msgstr "LOF/H"
 
-#: ../lib/python/Screens/Satconfig.py:147
+#: ../lib/python/Screens/Satconfig.py:135
 msgid "LOF/L"
 msgstr "LOF/L"
 
@@ -702,41 +730,37 @@ msgstr "LOF/L"
 msgid "Language selection"
 msgstr "Sélection de la langue"
 
-#: ../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 "Latitude"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1242
+#: ../lib/python/Screens/InfoBarGenerics.py:1384
 msgid "Left"
 msgstr "Gauche"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:184
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:183
 msgid "Limit east"
 msgstr "Limite est"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:183
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:182
 msgid "Limit west"
 msgstr "Limite ouest"
 
 # TODO: À vérifier\r
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:182
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:181
 msgid "Limits off"
 msgstr "Désactiver les limites"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:185
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:184
 msgid "Limits on"
 msgstr "Limites activées"
 
-#: ../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 "Longitude"
 
-#: ../lib/python/Components/NimManager.py:674
-msgid "Loopthrough to Socket A"
-msgstr "Boucle vers l'emplacement A"
-
 #: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:421
 msgid "Manual transponder"
 msgstr "Transpondeur manuel"
@@ -745,35 +769,35 @@ msgstr "Transpondeur manuel"
 msgid "Model: "
 msgstr "Modèle : "
 
-#: ../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 "Modulation"
 
-#: ../lib/python/Screens/EpgSelection.py:235
+#: ../lib/python/Screens/EpgSelection.py:234
 #: ../lib/python/Components/TimerList.py:34
 msgid "Mon"
 msgstr "Lun"
 
-#: ../lib/python/Screens/TimerEntry.py:104
+#: ../lib/python/Screens/TimerEntry.py:92
 msgid "Mon-Fri"
 msgstr "Lun-Ven"
 
-#: ../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 "Lundi"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1026
+#: ../lib/python/Screens/InfoBarGenerics.py:1179
 msgid "Move Picture in Picture"
 msgstr "Déplacer l'incrustation d'image"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:175
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:174
 msgid "Move east"
 msgstr "Déplacer vers l'est"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:172
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:171
 msgid "Move west"
 msgstr "Déplacer vers l'ouest"
 
@@ -785,101 +809,99 @@ msgstr "Menu des films"
 msgid "Multi EPG"
 msgstr "Multi guide"
 
-#: ../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 "Multisat"
 
-#: ../lib/python/Components/NimManager.py:495
+#: ../lib/python/Components/NimManager.py:480
 msgid "N/A"
 msgstr "N/A"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:486
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:491
 msgid "NIM "
 msgstr "NIM "
 
-#: ../lib/python/Screens/TimerEntry.py:150
+#: ../lib/python/Screens/TimerEntry.py:129
 msgid "Name"
 msgstr "Nom"
 
-#: ../lib/python/Screens/NetworkSetup.py:46 ../data/
+#: ../lib/python/Screens/NetworkSetup.py:33 ../data/
 msgid "Nameserver"
 msgstr "Serveur de noms"
 
-#: ../lib/python/Screens/NetworkSetup.py:44 ../data/
+#: ../lib/python/Screens/NetworkSetup.py:31 ../data/
 msgid "Netmask"
 msgstr "Masque de sous réseau"
 
-#: ../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 "Analyse du réseau"
 
 # TODO : Vérifier si on parle d'une chaîne (féminin / masculin)\r
-#: ../lib/python/Screens/ChannelSelection.py:696
+#: ../lib/python/Screens/ChannelSelection.py:752
 msgid "New"
 msgstr "Nouvelle"
 
+#: ../lib/python/Screens/ParentalControlSetup.py:218
+msgid "New pin"
+msgstr ""
+
 #: ../lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/plugin.py:33
 msgid "New version:"
 msgstr "Nouvelle version : "
 
-#: ../lib/python/Screens/EpgSelection.py:46
+#: ../lib/python/Screens/EpgSelection.py:45
 msgid "Next"
 msgstr "Suivant"
 
-#: ../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 "Non"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1188
+#: ../lib/python/Screens/InfoBarGenerics.py:1330
 msgid "No HDD found or HDD not initialized!"
 msgstr "Aucun disque dur trouvé ou disque dur non initialisé !"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1121
+#: ../lib/python/Screens/InfoBarGenerics.py:1263
 msgid "No event info found, recording indefinitely."
 msgstr "Aucune information trouvée sur l'émission, enregistre indéfiniment."
 
 # TODO : À traduire (frontend)\r
-#: ../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 "Aucun tuner n'est configuré pour utiliser un positionneur DiSEqC !"
 
-#: ../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 "Aucun"
 
-#: ../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 "Norvégien"
 
-#: ../lib/python/Components/NimManager.py:675
-msgid "Nothing connected"
-msgstr "Rien n'est connecté"
-
-#: ../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."
@@ -887,23 +909,21 @@ msgstr ""
 "Rien à rechercher !\n"
 "Veuillez paramétrer votre tuner avant de démarrer une recherche de chaînes."
 
-#: ../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 "OK"
 
-#: ../lib/python/Components/NimManager.py:728
-#: ../lib/python/Components/NimManager.py:772
+#: ../lib/python/Components/NimManager.py:742
 msgid "Off"
 msgstr "Arrêt"
 
-#: ../lib/python/Components/NimManager.py:728
-#: ../lib/python/Components/NimManager.py:772
+#: ../lib/python/Components/NimManager.py:742
 msgid "On"
 msgstr "Marche"
 
-#: ../lib/python/Components/NimManager.py:758
+#: ../lib/python/Components/NimManager.py:780
 msgid "One"
 msgstr "Un"
 
@@ -915,110 +935,174 @@ msgstr "Mise à jour en ligne"
 msgid "Packet management"
 msgstr "Gestion des paquets"
 
-#: ../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 "Lire les films enregistrés..."
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1035
+#: ../lib/python/Screens/InfoBarGenerics.py:1093
 msgid "Please choose an extension..."
 msgstr "Veuillez choisir une extension..."
 
-#: ../lib/python/Screens/ChannelSelection.py:125
+#: ../lib/python/Screens/ChannelSelection.py:134
 msgid "Please enter a name for the new bouquet"
 msgstr "Veuillez entrer un nom pour le bouquet"
 
+#: ../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 ""
+
 # Sous-service ?\r
-#: ../lib/python/Screens/TimerEntry.py:320
+#: ../lib/python/Screens/TimerEntry.py:289
 msgid "Please select a subservice to record..."
 msgstr "Veuillez choisir un sous-service à enregistrer..."
 
 # Sous-service ?\r
-#: ../lib/python/Screens/InfoBarGenerics.py:1334
+#: ../lib/python/Screens/InfoBarGenerics.py:1481
+#: ../lib/python/Screens/SubservicesQuickzap.py:97
 msgid "Please select a subservice..."
 msgstr "Veuillez choisir un sous-service..."
 
+#: ../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 "Veuillez patienter... Chargement de la 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 "Polarité"
 
-#: ../lib/python/Components/NimManager.py:727
+#: ../lib/python/Components/NimManager.py:741
 msgid "Polarization"
 msgstr "Polarisation"
 
-#: ../lib/python/Screens/Satconfig.py:15
+#: ../lib/python/Screens/Satconfig.py:13
 msgid "Port A"
 msgstr "Port A"
 
-#: ../lib/python/Screens/Satconfig.py:18
+#: ../lib/python/Screens/Satconfig.py:16
 msgid "Port B"
 msgstr "Port B"
 
-#: ../lib/python/Screens/Satconfig.py:20
+#: ../lib/python/Screens/Satconfig.py:18
 msgid "Port C"
 msgstr "Port C"
 
-#: ../lib/python/Screens/Satconfig.py:21
+#: ../lib/python/Screens/Satconfig.py:19
 msgid "Port D"
 msgstr "Port D"
 
-#: ../lib/python/Components/NimManager.py:692
+#: ../lib/python/Components/NimManager.py:699
 msgid "Positioner"
 msgstr "Positionneur"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:131
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:130
 msgid "Positioner fine movement"
 msgstr "Mouvement fin du positionneur"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:130
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:129
 msgid "Positioner movement"
 msgstr "Mouvement du positionneur"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:133
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:132
 msgid "Positioner storage"
 msgstr "Stockage du positionneur"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:421
-msgid "Predefined satellite"
-msgstr "Satellite prédéfini"
+#: ../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 "Appuyez sur OK pour activer les paramètres."
 
-#: ../lib/python/Screens/ScanSetup.py:716
+#: ../lib/python/Screens/ScanSetup.py:603
 msgid "Press OK to scan"
 msgstr "Appuyez sur OK pour analyser"
 
-#: ../lib/python/Screens/ScanSetup.py:169
+#: ../lib/python/Screens/ScanSetup.py:158
 msgid "Press OK to start the scan"
 msgstr "Appuyez sur OK pour commencer l'analyse"
 
-#: ../lib/python/Screens/EpgSelection.py:45
+#: ../lib/python/Screens/EpgSelection.py:44
 msgid "Prev"
 msgstr "Précédent"
 
-#: ../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 "Fournisseur"
 
-#: ../lib/python/Screens/ChannelSelection.py:694
+#: ../lib/python/Screens/ChannelSelection.py:750
 msgid "Providers"
 msgstr "Fournisseurs"
 
-#: ../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 "Enlever les enregistrements effectués ?"
 
+#: ../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 "Enregistrement"
 
+#: ../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 "Enlever des plugins"
@@ -1027,89 +1111,89 @@ msgstr "Enlever des plugins"
 msgid "Remove plugins"
 msgstr "Enlever des plugins"
 
-#: ../lib/python/Screens/TimerEntry.py:154
+#: ../lib/python/Screens/TimerEntry.py:133
 msgid "Repeat Type"
 msgstr "Type de répétition"
 
-#: ../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 "Réinitialiser"
 
 #: ../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 "Restaurer"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1242
+#: ../lib/python/Screens/InfoBarGenerics.py:1384
 msgid "Right"
 msgstr "Droite"
 
-#: ../lib/python/Screens/EpgSelection.py:235
+#: ../lib/python/Screens/EpgSelection.py:234
 #: ../lib/python/Components/TimerList.py:34
 msgid "Sat"
 msgstr "Sam"
 
-#: ../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 "Satellite"
 
-#: ../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 "Satellites"
 
-#: ../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 "Samedi"
 
-#: ../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 "Analyse NIM"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:174
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:173
 msgid "Search east"
 msgstr "Rechercher à l'est"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:173
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:172
 msgid "Search west"
 msgstr "Rechercher à l'ouest"
 
-#: ../lib/python/Components/NimManager.py:676
-msgid "Secondary cable from motorized LNB"
-msgstr "Second câble depuis un LNB motorisé"
-
-#: ../lib/python/Screens/InfoBarGenerics.py:1254
+#: ../lib/python/Screens/InfoBarGenerics.py:1396
 msgid "Select audio mode"
 msgstr "Sélectionnez le mode audio"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1243
+#: ../lib/python/Screens/InfoBarGenerics.py:1385
 msgid "Select audio track"
 msgstr "Selectionnez la piste audio"
 
-#: ../lib/python/Screens/TimerEntry.py:237
+#: ../lib/python/Screens/TimerEntry.py:210
 msgid "Select channel to record from"
 msgstr "Sélectionnez la chaîne à enregistrer"
 
 # TODO : À traduire\r
-#: ../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 "Chaînes"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:132
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:131
 msgid "Set limits"
 msgstr "Fixer les limites"
 
@@ -1117,11 +1201,15 @@ msgstr "Fixer les limites"
 msgid "Settings"
 msgstr "Paramètres"
 
-#: ../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 "Afficher la radio..."
 
-#: ../lib/python/Screens/InfoBar.py:47
+#: ../lib/python/Screens/InfoBar.py:50
 msgid "Show the tv player..."
 msgstr ""
 
@@ -1133,12 +1221,7 @@ msgstr "Similaire"
 msgid "Similar broadcasts:"
 msgstr "Émissions semblables : "
 
-#: ../lib/python/Components/NimManager.py:670
-#: ../lib/python/Components/NimManager.py:677
-msgid "Simple"
-msgstr "Simple"
-
-#: ../lib/python/Components/NimManager.py:692
+#: ../lib/python/Components/NimManager.py:695
 msgid "Single"
 msgstr "Simple"
 
@@ -1146,23 +1229,23 @@ msgstr "Simple"
 msgid "Single EPG"
 msgstr "Guide simple"
 
-#: ../lib/python/Screens/ScanSetup.py:352
+#: ../lib/python/Screens/ScanSetup.py:339
 msgid "Single satellite"
 msgstr "Satellite seul"
 
-#: ../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 "Transpondeur simple"
 
 # TODO: Voir si il faut franciser\r
-#: ../lib/python/Components/NimManager.py:705
+#: ../lib/python/Components/NimManager.py:717
 msgid "Slot "
 msgstr ""
 
 # TODO: Voir si il faut franciser\r
-#: ../lib/python/Components/NimManager.py:564
+#: ../lib/python/Components/NimManager.py:549
 msgid "Socket "
 msgstr ""
 
@@ -1176,24 +1259,24 @@ msgstr ""
 "\n"
 "Veuillez en choisir un autre."
 
-#: ../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 "Sud"
 
-#: ../lib/python/Components/Language.py:24
+#: ../lib/python/Components/Language.py:25
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: ../lib/python/Screens/TimerEntry.py:182
+#: ../lib/python/Screens/TimerEntry.py:160
 msgid "Start"
 msgstr "Début"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1194
+#: ../lib/python/Screens/InfoBarGenerics.py:1336
 msgid "Start recording?"
 msgstr "Démarrer l'enregistrement ?"
 
-#: ../lib/python/Screens/TimerEntry.py:185
+#: ../lib/python/Screens/TimerEntry.py:165
 msgid "StartTime"
 msgstr "Début"
 
@@ -1202,190 +1285,203 @@ msgid "Step "
 msgstr "Étape"
 
 # Step == cran || étape ?\r
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:179
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:178
 msgid "Step east"
 msgstr ""
 
 # Step == cran || étape ?\r
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:178
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:177
 msgid "Step west"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1242
+#: ../lib/python/Screens/InfoBarGenerics.py:1384
 msgid "Stereo"
 msgstr "Stéréo"
 
+#: ../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 "Stop"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:936
+#: ../lib/python/Screens/InfoBarGenerics.py:963
 msgid "Stop Timeshift?"
 msgstr "Arrêter la pause du direct ?"
 
-#: ../lib/python/Screens/InfoBar.py:105
+#: ../lib/python/Screens/InfoBar.py:113
 msgid "Stop playing this movie?"
 msgstr "Arrêter la lecture du film ?"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:188
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:187
 msgid "Store position"
 msgstr "Enregistrer la position"
 
-#: ../lib/python/Screens/Satconfig.py:116
+#: ../lib/python/Screens/Satconfig.py:104
 msgid "Stored position"
 msgstr "Position enregistrée"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1272
+#: ../lib/python/Screens/InfoBarGenerics.py:1414
 msgid "Subservice list..."
 msgstr "Liste des sous-services..."
 
-#: ../lib/python/Screens/EpgSelection.py:235
+#: ../lib/python/Screens/EpgSelection.py:234
 #: ../lib/python/Components/TimerList.py:34
 msgid "Sun"
 msgstr "Dim"
 
-#: ../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 "Dimanche"
 
-# TODO: À vérifier\r
-#: ../lib/python/Screens/InfoBarGenerics.py:1027
-msgid "Swap services"
-msgstr "Échanger les chaînes"
+#: ../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 "Suédois"
 
 # TODO : Vérifier subservice\r
-#: ../lib/python/Screens/InfoBarGenerics.py:1277
+#: ../lib/python/Screens/InfoBarGenerics.py:1419
 msgid "Switch to next subservice"
 msgstr "Basculer vers le sous-service suivant"
 
 # TODO : Vérifier subservice\r
-#: ../lib/python/Screens/InfoBarGenerics.py:1278
+#: ../lib/python/Screens/InfoBarGenerics.py:1420
 msgid "Switch to previous subservice"
 msgstr "Basculer vers le sous-service précédent"
 
-#: ../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 "Débit symbole"
 
-#: ../lib/python/Screens/ChannelSelection.py:706
+#: ../lib/python/Screens/ChannelSelection.py:762
 msgid "Terrestrial"
 msgstr "Terrestre"
 
-#: ../lib/python/Screens/Satconfig.py:73
+#: ../lib/python/Screens/Satconfig.py:71
 msgid "Terrestrial provider"
 msgstr "Opérateur terrestre"
 
-#: ../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 "Trois"
 
-#: ../lib/python/Screens/Satconfig.py:149
+#: ../lib/python/Screens/Satconfig.py:137
 msgid "Threshold"
 msgstr "Seuil"
 
-#: ../lib/python/Screens/EpgSelection.py:235
+#: ../lib/python/Screens/EpgSelection.py:234
 #: ../lib/python/Components/TimerList.py:34
 msgid "Thu"
 msgstr "Jeu"
 
-#: ../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 "Jeudi"
 
-#: ../lib/python/Screens/TimeDateInput.py:55
+#: ../lib/python/Screens/TimeDateInput.py:41
 msgid "Time"
 msgstr "Heure"
 
-#: ../lib/python/Screens/TimerEntry.py:152
+#: ../lib/python/Screens/TimerEntry.py:131
 msgid "Timer Type"
 msgstr "Type"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:906
-msgid "Timeshift not possible!"
-msgstr "Pause du direct impossible !"
-
-#: ../lib/python/Screens/MediaPlayer.py:47
+#: ../lib/python/Screens/MediaPlayer.py:49
 msgid "Title:"
 msgstr "Titre :"
 
-#: ../lib/python/Screens/EpgSelection.py:246
+#: ../lib/python/Screens/EpgSelection.py:245
 #: ../lib/python/Tools/FuzzyDate.py:10
 msgid "Today"
 msgstr "Aujourd'hui"
 
 # TODO : À traduire\r
-#: ../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 "Toneburst"
 
-#: ../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 "Mode de transmission"
 
-#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:407
+#: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:406
 msgid "Transponder"
 msgstr "Transpondeur"
 
-#: ../lib/python/Screens/ScanSetup.py:206
+#: ../lib/python/Screens/ScanSetup.py:194
 msgid "Transpondertype"
 msgstr "Type de transpondeur"
 
-#: ../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 "Mar"
 
-#: ../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 "Mardi"
 
 # À vérifier\r
-#: ../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 "Accorder"
 
-#: ../lib/python/Screens/ScanSetup.py:187
+#: ../lib/python/Screens/ScanSetup.py:176
 #: ../lib/python/Components/ServiceScan.py:75
 msgid "Tuner"
 msgstr "Tuner"
 
-#: ../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 "Deux"
 
-#: ../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 "Type d'analyse"
 
-#: ../lib/python/Components/NimManager.py:697
+#: ../lib/python/Components/NimManager.py:707
 msgid "USALS"
 msgstr "USALS"
 
@@ -1403,11 +1499,11 @@ msgstr ""
 "Veuillez vous référer au manuel.\n"
 "Erreur : "
 
-#: ../lib/python/Screens/Satconfig.py:133
+#: ../lib/python/Screens/Satconfig.py:121
 msgid "Uncommitted DiSEqC command"
 msgstr "Commande DiSEqC non validée"
 
-#: ../lib/python/Components/NimManager.py:744
+#: ../lib/python/Components/NimManager.py:759
 msgid "Universal LNB"
 msgstr "LNB universel"
 
@@ -1420,60 +1516,56 @@ msgid "Updating... Please wait... This can take some minutes..."
 msgstr ""
 "Mise à jour... Veuillez patienter... Ceci peut prendre quelques minutes..."
 
-#: ../lib/python/Screens/NetworkSetup.py:40 ../data/
+#: ../lib/python/Screens/NetworkSetup.py:27 ../data/
 msgid "Use DHCP"
 msgstr "Utiliser DHCP"
 
-#: ../lib/python/Screens/Satconfig.py:113
+#: ../lib/python/Screens/Satconfig.py:101
 msgid "Use usals for this sat"
 msgstr "Utiliser USALS pour ce satellite"
 
-#: ../lib/python/Components/NimManager.py:744
+#: ../lib/python/Components/NimManager.py:759
 msgid "User defined"
 msgstr "Défini par l'utilisateur"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1576
+#: ../lib/python/Screens/InfoBarGenerics.py:1752
 msgid "View teletext..."
 msgstr ""
 
 # TODO : À traduire\r
-#: ../lib/python/Screens/Satconfig.py:110
+#: ../lib/python/Screens/Satconfig.py:98
 msgid "Voltage mode"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:710
+#: ../lib/python/Screens/ChannelSelection.py:766
 msgid "W"
 msgstr "O"
 
-#: ../lib/python/Screens/EpgSelection.py:235
+#: ../lib/python/Screens/EpgSelection.py:234
 #: ../lib/python/Components/TimerList.py:34
 msgid "Wed"
 msgstr "Mer"
 
-#: ../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 "Mercredi"
 
 # TODO: À vérifier\r
-#: ../lib/python/Screens/TimerEntry.py:167
+#: ../lib/python/Screens/TimerEntry.py:146
 msgid "Weekday"
 msgstr "Jours ouvrables"
 
-#: ../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 "Ouest"
 
-#: ../lib/python/Screens/MediaPlayer.py:51
+#: ../lib/python/Screens/MediaPlayer.py:53
 msgid "Year:"
 msgstr "Année :"
 
-#: ../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 "Oui"
 
@@ -1481,7 +1573,11 @@ msgstr "Oui"
 msgid "You cannot delete this!"
 msgstr "Vous ne pouvez effacer ceci !"
 
-#: ../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 ""
 
@@ -1493,23 +1589,23 @@ msgstr ""
 "Le logiciel de votre frontprocessor doit être mis à jour.\n"
 "Veuillez appuyer sur OK pour commencer la mise à jour."
 
-#: ../lib/python/Screens/ChannelSelection.py:328
+#: ../lib/python/Screens/ChannelSelection.py:380
 msgid "[bouquet edit]"
 msgstr "[édition des bouquets]"
 
-#: ../lib/python/Screens/ChannelSelection.py:330
+#: ../lib/python/Screens/ChannelSelection.py:382
 msgid "[favourite edit]"
 msgstr "[édition des favoris]"
 
-#: ../lib/python/Screens/ChannelSelection.py:413
+#: ../lib/python/Screens/ChannelSelection.py:465
 msgid "[move mode]"
 msgstr "[mode déplacement]"
 
-#: ../lib/python/Screens/ChannelSelection.py:110
+#: ../lib/python/Screens/ChannelSelection.py:119
 msgid "abort bouquet edit"
 msgstr "abandonner l'édition des bouquets"
 
-#: ../lib/python/Screens/ChannelSelection.py:113
+#: ../lib/python/Screens/ChannelSelection.py:122
 msgid "abort favourites edit"
 msgstr "abandonner l'édition des favoris"
 
@@ -1518,43 +1614,56 @@ msgstr "abandonner l'édition des favoris"
 msgid "about to start"
 msgstr "sur le point de commencer"
 
-#: ../lib/python/Screens/ChannelSelection.py:99
-msgid "add bouquet..."
-msgstr "ajouter un 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 "ajouter le répertoire à la liste de lecture"
 
-#: ../lib/python/Screens/MediaPlayer.py:297
+#: ../lib/python/Screens/MediaPlayer.py:339
 msgid "add file to playlist"
 msgstr "ajouter le fichier à la liste de lecture"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1192
-#: ../lib/python/Screens/InfoBarGenerics.py:1194
+#: ../lib/python/Screens/ChannelSelection.py:107
+msgid "add marker"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1334
+#: ../lib/python/Screens/InfoBarGenerics.py:1336
 msgid "add recording (enter recording duration)"
 msgstr "ajout d'enregistrement (entrer la durée d'enregistrement)"
 
-#: ../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 (indefinitely)"
 msgstr "ajout d'enregistrement (indéfiniment)"
 
-#: ../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 "ajout d'enregistrement (arrêter après l'émission en cours)"
 
 # TODO: Vérifier « cette »\r
-#: ../lib/python/Screens/ChannelSelection.py:79
+#: ../lib/python/Screens/ChannelSelection.py:87
 msgid "add service to bouquet"
 msgstr "ajouter cette chaîne au bouquet"
 
 # TODO: Vérifier « cette »\r
-#: ../lib/python/Screens/ChannelSelection.py:81
+#: ../lib/python/Screens/ChannelSelection.py:89
 msgid "add service to favourites"
 msgstr "ajouter cette chaîne aux favoris"
 
+#: ../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"
@@ -1564,41 +1673,49 @@ msgstr ""
 "la sauvegarde suivante :\n"
 
 #: ../lib/python/Screens/MovieSelection.py:24
-#: ../lib/python/Screens/ChannelSelection.py:115
+#: ../lib/python/Screens/ChannelSelection.py:124
 msgid "back"
 msgstr "retour"
 
-#: ../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 "modifier un enregistrement (durée)"
 
 # TODO: À vérifier\r
-#: ../lib/python/Screens/ScanSetup.py:376
+#: ../lib/python/Screens/ScanSetup.py:363
 msgid "circular left"
 msgstr "circulaire à gauche"
 
 # TODO: À vérifier\r
-#: ../lib/python/Screens/ScanSetup.py:376
+#: ../lib/python/Screens/ScanSetup.py:363
 msgid "circular right"
 msgstr "circulaire à droite"
 
-#: ../lib/python/Screens/MediaPlayer.py:301
+#: ../lib/python/Screens/MediaPlayer.py:343
 msgid "clear playlist"
 msgstr "effacer la liste de lecture"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:563
+#: ../lib/python/Components/ParentalControl.py:13
+msgid "complex"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:586
 msgid "continue"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:85
+#: ../lib/python/Screens/ChannelSelection.py:93
 msgid "copy to favourites"
 msgstr "copier dans les favoris"
 
-#: ../lib/python/Screens/TimerEntry.py:104
+#: ../lib/python/Screens/TimerEntry.py:92
 msgid "daily"
 msgstr "quotidien"
 
-#: ../lib/python/Screens/MediaPlayer.py:300
+#: ../lib/python/Screens/MediaPlayer.py:342
 msgid "delete"
 msgstr "effacer"
 
@@ -1606,16 +1723,16 @@ msgstr "effacer"
 msgid "delete..."
 msgstr "effacer..."
 
-#: ../lib/python/Screens/ChannelSelection.py:106
+#: ../lib/python/Screens/ChannelSelection.py:115
 msgid "disable move mode"
 msgstr "désactiver le mode déplacement"
 
-#: ../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 "ne rien faire"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1194
+#: ../lib/python/Screens/InfoBarGenerics.py:1336
 msgid "don't record"
 msgstr "ne pas enregistrer"
 
@@ -1623,30 +1740,34 @@ msgstr "ne pas enregistrer"
 msgid "done!"
 msgstr "terminé !"
 
-#: ../lib/python/Components/NimManager.py:566
+#: ../lib/python/Components/NimManager.py:551
 msgid "empty/unknown"
 msgstr "vide/inconnu"
 
-#: ../lib/python/Screens/ChannelSelection.py:102
+#: ../lib/python/Screens/ChannelSelection.py:111
 msgid "enable bouquet edit"
 msgstr "activer l'édition des bouquets"
 
-#: ../lib/python/Screens/ChannelSelection.py:104
+#: ../lib/python/Screens/ChannelSelection.py:113
 msgid "enable favourite edit"
 msgstr "activer l'édition des favoris"
 
-#: ../lib/python/Screens/ChannelSelection.py:98
+#: ../lib/python/Screens/ChannelSelection.py:108
 msgid "enable move mode"
 msgstr "activer le mode déplacement"
 
-#: ../lib/python/Screens/ChannelSelection.py:109
+#: ../lib/python/Screens/ChannelSelection.py:118
 msgid "end bouquet edit"
 msgstr "terminer l'édition des bouquets"
 
-#: ../lib/python/Screens/ChannelSelection.py:112
+#: ../lib/python/Screens/ChannelSelection.py:121
 msgid "end favourites edit"
 msgstr "terminer l'édition des favoris"
 
+#: ../lib/python/Components/NimManager.py:670
+msgid "equal to Socket A"
+msgstr ""
+
 #: ../lib/python/Components/DiskInfo.py:30
 msgid "free diskspace"
 msgstr "espace disque libre"
@@ -1655,31 +1776,31 @@ msgstr "espace disque libre"
 msgid "full /etc directory"
 msgstr "répertoire /etc entier"
 
-#: ../lib/python/Screens/TimerEntry.py:99
+#: ../lib/python/Screens/TimerEntry.py:87
 msgid "go to deep standby"
 msgstr "mettre en veille profonde"
 
-#: ../lib/python/Screens/InfoBar.py:60
+#: ../lib/python/Screens/InfoBar.py:64
 msgid "hear radio..."
 msgstr ""
 
-#: ../lib/python/Screens/MediaPlayer.py:302
+#: ../lib/python/Screens/MediaPlayer.py:344
 msgid "hide player"
 msgstr "cacher le lecteur"
 
-#: ../lib/python/Screens/ScanSetup.py:376
+#: ../lib/python/Screens/ScanSetup.py:363
 msgid "horizontal"
 msgstr "horizontale"
 
-#: ../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 "initialiser le module"
 
-#: ../lib/python/Screens/InfoBar.py:91
+#: ../lib/python/Screens/InfoBar.py:98
 msgid "leave movie player..."
 msgstr "quitter le lecteur..."
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1253
+#: ../lib/python/Screens/InfoBarGenerics.py:1395
 msgid "left"
 msgstr "gauche"
 
@@ -1688,7 +1809,11 @@ msgstr "gauche"
 msgid "list"
 msgstr "liste"
 
-#: ../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 "manuel"
 
@@ -1697,24 +1822,24 @@ msgstr "manuel"
 msgid "mins"
 msgstr "min"
 
-#: ../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 "chaîne suivante"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:262
+#: ../lib/python/Screens/InfoBarGenerics.py:260
 msgid "next channel in history"
 msgstr "chaîne suivante dans l'historique"
 
-#: ../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 "non"
 
@@ -1722,7 +1847,7 @@ msgstr "non"
 msgid "no HDD found"
 msgstr "aucun disque dur trouvé"
 
-#: ../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 "aucun module trouvé"
 
@@ -1730,19 +1855,23 @@ msgstr "aucun module trouvé"
 msgid "none"
 msgstr "aucun"
 
-#: ../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 "arrêt"
 
-#: ../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 "marche"
 
-#: ../lib/python/Screens/TimerEntry.py:100
+#: ../lib/python/Screens/TimerEntry.py:88
 msgid "once"
 msgstr "une fois"
 
@@ -1750,15 +1879,15 @@ msgstr "une fois"
 msgid "only /etc/enigma2 directory"
 msgstr "seulement le répertoire /etc/enigma2"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:263
+#: ../lib/python/Screens/InfoBarGenerics.py:261
 msgid "open servicelist"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:258
+#: ../lib/python/Screens/InfoBarGenerics.py:256
 msgid "open servicelist(down)"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:257
+#: ../lib/python/Screens/InfoBarGenerics.py:255
 msgid "open servicelist(up)"
 msgstr ""
 
@@ -1766,24 +1895,24 @@ msgstr ""
 msgid "pass"
 msgstr "passe"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:562
+#: ../lib/python/Screens/InfoBarGenerics.py:585
 msgid "pause"
 msgstr ""
 
-#: ../lib/python/Screens/Ci.py:79
+#: ../lib/python/Screens/Ci.py:82
 msgid "please press OK when ready"
 msgstr "veuillez appuyer sur OK quand vous êtes prêt(e)"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:259
+#: ../lib/python/Screens/InfoBarGenerics.py:257
 msgid "previous channel"
 msgstr "chaîne précédente"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:261
+#: ../lib/python/Screens/InfoBarGenerics.py:259
 msgid "previous channel in history"
 msgstr "chaîne précédente dans l'historique"
 
 # TODO: À vérifier\r
-#: ../lib/python/Screens/TimerEntry.py:98
+#: ../lib/python/Screens/TimerEntry.py:86
 msgid "record"
 msgstr "enregistre"
 
@@ -1792,28 +1921,29 @@ msgid "recording..."
 msgstr "enregistrement..."
 
 # TODO: À vérifier\r
-#: ../lib/python/Screens/ChannelSelection.py:87
+#: ../lib/python/Screens/ChannelSelection.py:95
 msgid "remove all new found flags"
 msgstr "enlever tous les indicateurs de nouvelle chaîne"
 
-#: ../lib/python/Screens/ChannelSelection.py:93
-msgid "remove bouquet"
-msgstr "enlever le bouquet"
+#: ../lib/python/Screens/ChannelSelection.py:97
+#: ../lib/python/Screens/ChannelSelection.py:102
+msgid "remove entry"
+msgstr ""
+
+#: ../lib/python/Screens/ChannelSelection.py:85
+msgid "remove from parental protection"
+msgstr ""
 
 # TODO: À vérifier\r
-#: ../lib/python/Screens/ChannelSelection.py:91
+#: ../lib/python/Screens/ChannelSelection.py:99
 msgid "remove new found flag"
 msgstr "enlever l'indicateur de nouvelle chaîne"
 
-#: ../lib/python/Screens/ChannelSelection.py:89
-msgid "remove service"
-msgstr "enlever la chaîne"
-
-#: ../lib/python/Screens/TimerEntry.py:100
+#: ../lib/python/Screens/TimerEntry.py:88
 msgid "repeated"
 msgstr "répété"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1253
+#: ../lib/python/Screens/InfoBarGenerics.py:1395
 msgid "right"
 msgstr "droite"
 
@@ -1855,43 +1985,65 @@ msgstr ""
 msgid "scan state"
 msgstr "état de l'analyse"
 
-#: ../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 "afficher le guide"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:336
+#: ../lib/python/Screens/InfoBarGenerics.py:354
 msgid "show event details"
 msgstr "afficher les détails de l'émission"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:568
+#: ../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:565
+#: ../lib/python/Screens/InfoBarGenerics.py:588
 msgid "skip forward"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:878
+#: ../lib/python/Screens/InfoBarGenerics.py:905
 msgid "start timeshift"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1253
+#: ../lib/python/Screens/InfoBarGenerics.py:1395
 msgid "stereo"
 msgstr "stéréo"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1192
+#: ../lib/python/Screens/InfoBarGenerics.py:1334
 msgid "stop recording"
 msgstr "arrêter l'enregistrement"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:879
+#: ../lib/python/Screens/InfoBarGenerics.py:906
 msgid "stop timeshift"
 msgstr ""
 
-#: ../lib/python/Screens/MediaPlayer.py:299
+#: ../lib/python/Screens/MediaPlayer.py:341
 msgid "switch to filelist"
 msgstr "basculer vers la liste des fichiers"
 
-#: ../lib/python/Screens/MediaPlayer.py:293
+#: ../lib/python/Screens/MediaPlayer.py:335
 msgid "switch to playlist"
 msgstr "basculer vers la liste de lecture"
 
@@ -1903,53 +2055,61 @@ msgstr "texte"
 msgid "this recording"
 msgstr "cet enregistrement"
 
+#: ../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 "chaîne inconnue"
 
-#: ../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 "défini par l'utilisateur"
 
-#: ../lib/python/Screens/ScanSetup.py:376
+#: ../lib/python/Screens/ScanSetup.py:363
 msgid "vertical"
 msgstr "verticale"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1011
+#: ../lib/python/Screens/InfoBarGenerics.py:1041
 msgid "view extensions..."
 msgstr ""
 
-#: ../lib/python/Screens/InfoBar.py:59
+#: ../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 "en attente"
 
-#: ../lib/python/Screens/TimerEntry.py:104
+#: ../lib/python/Screens/TimerEntry.py:92
 msgid "weekly"
 msgstr "hebdomadaire"
 
-#: ../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 "oui"
 
-#: ../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 "oui (garder les feeds)"
 
-#: ../lib/python/Screens/TimerEntry.py:98
+#: ../lib/python/Screens/TimerEntry.py:86
 msgid "zap"
 msgstr "zap"
 
@@ -1977,11 +2137,6 @@ msgstr "Paramétrage réseau"
 msgid "Games / Plugins"
 msgstr "Jeux / Plugins"
 
-# TODO: erreur : pluriel ou singulier\r
-#: ../data/
-msgid "Hide error windows"
-msgstr "Cacher les fenêtres d'erreurs"
-
 #: ../data/
 msgid "help..."
 msgstr "aide..."
@@ -2021,13 +2176,17 @@ msgstr "Recherche des chaînes"
 msgid "DiSEqC"
 msgstr "DiSEqC"
 
+#: ../data/
+msgid "Main menu"
+msgstr "Menu principal"
+
 #: ../data/
 msgid "TV System"
 msgstr "Système TV"
 
 #: ../data/
-msgid "#ffffff"
-msgstr "#ffffff"
+msgid "Alternative radio mode"
+msgstr ""
 
 #: ../data/
 msgid "NEXT"
@@ -2045,6 +2204,10 @@ msgstr ""
 msgid "Deep Standby"
 msgstr "Veille profonde"
 
+#: ../data/
+msgid "Show positioner movement"
+msgstr ""
+
 # TODO: Voir si il faut franciser slot\r
 #: ../data/
 msgid "Tuner Slot"
@@ -2066,10 +2229,6 @@ msgstr ""
 "Utilisez les boutons haut/bas de votre télécommande pour sélectionner une "
 "option. Après cela, appuyez sur OK."
 
-#: ../data/
-msgid "Show Satposition"
-msgstr "Afficher la position du satellite"
-
 #: ../data/
 msgid "Do you want to view a tutorial?"
 msgstr "Voulez-vous voir un tutoriel ?"
@@ -2100,12 +2259,12 @@ msgid "#bab329"
 msgstr "#bab329"
 
 #: ../data/
-msgid "Sat / Dish Setup"
-msgstr "Paramétrage satellite / parabole"
+msgid "Startwizard"
+msgstr ""
 
 #: ../data/
-msgid "Visualize positioner movement"
-msgstr "Visualiser le mouvement du positionneur"
+msgid "#ffffff"
+msgstr "#ffffff"
 
 #: ../data/
 msgid ""
@@ -2117,21 +2276,13 @@ msgstr ""
 "Veuillez appuyer sur OK pour démarrer la sauvegarde."
 
 #: ../data/
-msgid "Audio / Video"
-msgstr "Audio / Vidéo"
-
-#: ../data/
-msgid "Yes, do another manual scan now"
-msgstr "Oui, faire une autre recherche manuelle maintenant"
+msgid "Mute"
+msgstr "Sourdine"
 
 #: ../data/
 msgid "Service Searching"
 msgstr "Recherche des chaînes"
 
-#: ../data/
-msgid "Mute"
-msgstr "Sourdine"
-
 #: ../data/
 msgid ""
 "Welcome to the Image upgrade wizard. The wizard will assist you in upgrading "
@@ -2148,42 +2299,51 @@ msgid "Keyboard Map"
 msgstr "Agencement du clavier"
 
 #: ../data/
-msgid "Keyboard Setup"
-msgstr "Paramétrage du clavier"
+msgid "Enable multiple bouquets"
+msgstr ""
 
 #: ../data/
-msgid "Dish"
-msgstr "Parabole"
+msgid "Keyboard Setup"
+msgstr "Paramétrage du clavier"
 
-# TODO: À améliorer\r
 #: ../data/
-msgid "Record Splitsize"
-msgstr "Taille de découpe des enregistrements"
+msgid ""
+"Use the left and right buttons to change an option.\n"
+"\n"
+"Please set up tuner A"
+msgstr ""
+"Utilisez les boutons gauche et droit pour changer une option\n"
+"\n"
+"Veuillez paramétrer le tuner A"
 
 #: ../data/
-msgid "Auto show inforbar"
-msgstr "Afficher automatiquement la barre d'infos"
+msgid "Dish"
+msgstr "Parabole"
 
 #: ../data/
 msgid "Margin after record"
 msgstr "Marge après enregistrement"
 
 #: ../data/
-msgid "Network"
-msgstr "Réseau"
-
-#: ../data/
-msgid "Invert"
-msgstr "Inverser"
+msgid "#ffffffff"
+msgstr "#ffffffff"
 
 #: ../data/
 msgid "System"
 msgstr "Système"
 
-# TODO: À vérifier\r
 #: ../data/
-msgid "use power delta"
-msgstr "utiliser le delta puissance"
+msgid "Use power measurement"
+msgstr ""
+
+#: ../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 ""
+"Merci d'avoir utilisé l'assistant. Votre Dreambox est maintenant prête à "
+"l'usage.\n"
+"Veuillez appuyer sur OK pour commencer à l'utiliser."
 
 #: ../data/
 msgid "Test mode"
@@ -2193,9 +2353,10 @@ msgstr "Mode test"
 msgid "Manual Scan"
 msgstr "Recherche manuelle"
 
+# TODO: À améliorer ?\r
 #: ../data/
-msgid "OSD Settings"
-msgstr "Paramètres OSD"
+msgid "Timer Edit"
+msgstr "Édition des programmations"
 
 # TODO: À vérifier\r
 #: ../data/
@@ -2206,6 +2367,10 @@ msgstr "Menu télécommande"
 msgid "No, just start my dreambox"
 msgstr "Non, juste démarrer ma Dreambox"
 
+#: ../data/
+msgid "Network..."
+msgstr ""
+
 #: ../data/
 msgid "Tuner configuration"
 msgstr ""
@@ -2224,8 +2389,8 @@ msgid "Standby / Restart"
 msgstr "Veille / Redémarrage"
 
 #: ../data/
-msgid "Main menu"
-msgstr "Menu principal"
+msgid "Standby"
+msgstr "Veille"
 
 # TODO: Voir si il faut franciser\r
 #: ../data/
@@ -2237,26 +2402,24 @@ msgid "Exit the wizard"
 msgstr "Quitter l'assistant"
 
 #: ../data/
-msgid "Fast zapping"
-msgstr "Zapping rapide"
+msgid "OSD Settings"
+msgstr "Paramètres OSD"
 
-# TODO: À vérifier\r
 #: ../data/
-msgid "Usage Settings"
-msgstr "Paramétrage d'usage"
+msgid "RF output"
+msgstr ""
 
 #: ../data/
 msgid "Brightness"
 msgstr "Luminosité"
 
 #: ../data/
-msgid "Standby"
-msgstr "Veille"
+msgid "Parental control services Editor"
+msgstr ""
 
-# TODO: À améliorer ?\r
 #: ../data/
-msgid "Timer Edit"
-msgstr "Édition des programmations"
+msgid "Yes, do another manual scan now"
+msgstr "Oui, faire une autre recherche manuelle maintenant"
 
 #: ../data/
 msgid "Activate network settings"
@@ -2278,10 +2441,6 @@ msgstr "Enregistrer"
 msgid "Yes, view the tutorial"
 msgstr "Oui, voir le tutoriel"
 
-#: ../data/
-msgid "UHF Modulator"
-msgstr "Modulateur UHF"
-
 #: ../data/
 msgid "Color Format"
 msgstr "Format de couleur"
@@ -2291,8 +2450,8 @@ msgid "#f23d21"
 msgstr "#f23d21"
 
 #: ../data/
-msgid "Enigma1 like radiomode"
-msgstr ""
+msgid "Plugin browser"
+msgstr "Navigateur de plugins"
 
 #: ../data/
 msgid "#80000000"
@@ -2316,8 +2475,8 @@ msgid "Subservices"
 msgstr "Sous services"
 
 #: ../data/
-msgid "LCD"
-msgstr "LCD"
+msgid "Parental control setup"
+msgstr ""
 
 #: ../data/
 msgid "Timezone"
@@ -2341,8 +2500,8 @@ msgid "Common Interface"
 msgstr "Interface commune"
 
 #: ../data/
-msgid "Ask before zapping"
-msgstr "Demander avant de zapper"
+msgid "Language..."
+msgstr ""
 
 #: ../data/
 msgid ""
@@ -2380,10 +2539,6 @@ msgstr "Paramétrage LCD"
 msgid "No, scan later manually"
 msgstr "Non, rechercher manuellement plus tard"
 
-#: ../data/
-msgid "Input"
-msgstr "Entrée"
-
 #: ../data/
 msgid "Soundcarrier"
 msgstr "Porteuse sonore"
@@ -2432,6 +2587,15 @@ msgstr "Paramétrage réseau"
 msgid "Somewhere else"
 msgstr "Ailleurs"
 
+#: ../data/
+msgid "Do you want to do a service scan?"
+msgstr "Voulez-vous faire une recherche des chaînes ?"
+
+# TODO: À vérifier\r
+#: ../data/
+msgid "Timer log"
+msgstr "Journal des enregistrements"
+
 #: ../data/
 msgid ""
 "Your backup succeeded. We will now continue to explain the further upgrade "
@@ -2449,14 +2613,6 @@ msgstr "Paramétrage PiP"
 msgid "Menu"
 msgstr "Menu"
 
-#: ../data/
-msgid "Plugin browser"
-msgstr "Navigateur de plugins"
-
-#: ../data/
-msgid "Parental Lock"
-msgstr "Verrouillage parental"
-
 #: ../data/
 msgid "Restart"
 msgstr "Redémarrer"
@@ -2531,10 +2687,6 @@ msgstr "Votre Dreambox s'éteint. Veuillez patienter..."
 msgid "WSS on 4:3"
 msgstr ""
 
-#: ../data/
-msgid "Skip confirmations"
-msgstr "Passer les confirmations"
-
 #: ../data/
 msgid "Choose bouquet"
 msgstr "Choisir le bouquet"
@@ -2567,10 +2719,9 @@ msgstr "Oui, faire une recherche manuelle maintenant"
 msgid "USB"
 msgstr "USB"
 
-# TODO: À vérifier\r
 #: ../data/
-msgid "Timer log"
-msgstr "Journal des enregistrements"
+msgid "Invert display"
+msgstr ""
 
 #: ../data/
 msgid "Do you want to restore your settings?"
@@ -2580,15 +2731,6 @@ msgstr "Voulez-vous restaurer vos paramètres ?"
 msgid "Please set up tuner B"
 msgstr "Veuillez paramétrer le 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 ""
-"Merci d'avoir utilisé l'assistant. Votre Dreambox est maintenant prête à "
-"l'usage.\n"
-"Veuillez appuyer sur OK pour commencer à l'utiliser."
-
 #: ../data/
 msgid "Delay"
 msgstr "Délai"
@@ -2597,45 +2739,26 @@ msgstr "Délai"
 msgid "Select HDD"
 msgstr "Sélectionnez le disque dur"
 
-#: ../data/
-msgid "#ffffffff"
-msgstr "#ffffffff"
-
-# À vérifier\r
-#: ../data/
-msgid "Setup Lock"
-msgstr "Paramétrer le verrou"
-
 #: ../data/
 msgid "Aspect Ratio"
 msgstr "Ratio d'aspect"
 
 #: ../data/
-msgid "Expert Setup"
-msgstr "Paramétrage expert"
-
-#: ../data/
-msgid "Language"
-msgstr "Langue"
-
-#: ../data/
-msgid ""
-"Use the left and right buttons to change an option.\n"
-"\n"
-"Please set up tuner A"
+msgid "Recordings always have priority"
 msgstr ""
-"Utilisez les boutons gauche et droit pour changer une option\n"
-"\n"
-"Veuillez paramétrer le tuner A"
 
 #: ../data/
-msgid "Parental Control"
-msgstr "Contrôle parental"
+msgid "Customize"
+msgstr ""
 
 #: ../data/
 msgid "#389416"
 msgstr "#389416"
 
+#: ../data/
+msgid "Pin code needed"
+msgstr ""
+
 #: ../data/
 msgid "VCR scart"
 msgstr "Prise péritel du magnétoscope"
@@ -2652,10 +2775,6 @@ msgstr "Sélectionnez un film"
 msgid "Volume"
 msgstr "Volume"
 
-#: ../data/
-msgid "Multi bouquets"
-msgstr "Multi bouquets"
-
 #: ../data/
 msgid "#33294a6b"
 msgstr "#33294a6b"
@@ -2712,12 +2831,12 @@ msgid "AGC:"
 msgstr "AGC :"
 
 #: ../data/
-msgid "What do you want to scan?"
-msgstr "Que voulez-vous rechercher ?"
+msgid "Sat / Dish Setup"
+msgstr "Paramétrage satellite / parabole"
 
 #: ../data/
-msgid "Usage settings"
-msgstr "Paramétrages d'usage"
+msgid "What do you want to scan?"
+msgstr "Que voulez-vous rechercher ?"
 
 #: ../data/
 msgid "Now Playing"
@@ -2733,8 +2852,8 @@ msgid "Audio"
 msgstr "Audio"
 
 #: ../data/
-msgid "Do you want to do a service scan?"
-msgstr "Voulez-vous faire une recherche des chaînes ?"
+msgid "Harddisk..."
+msgstr ""
 
 #: ../data/
 msgid "NOW"
@@ -2756,6 +2875,120 @@ msgstr "Lecteur multimédia"
 msgid "Do you want to do another manual service scan?"
 msgstr "Voulez-vous faire une autre recherche manuelle de chaînes ?"
 
+#~ msgid "Cable provider"
+#~ msgstr "Câblopérateur"
+
+#~ msgid "Classic"
+#~ msgstr "Classique"
+
+#~ msgid "Default"
+#~ msgstr "Défaut"
+
+#~ msgid "Equal to Socket A"
+#~ msgstr "Pareil que l'emplacement A"
+
+#~ msgid "Loopthrough to Socket A"
+#~ msgstr "Boucle vers l'emplacement A"
+
+#~ msgid "Nothing connected"
+#~ msgstr "Rien n'est connecté"
+
+#~ msgid "Predefined satellite"
+#~ msgstr "Satellite prédéfini"
+
+#~ msgid "Secondary cable from motorized LNB"
+#~ msgstr "Second câble depuis un LNB motorisé"
+
+#~ msgid "Simple"
+#~ msgstr "Simple"
+
+# TODO: À vérifier\r
+#~ msgid "Swap services"
+#~ msgstr "Échanger les chaînes"
+
+#~ msgid "add bouquet..."
+#~ msgstr "ajouter un bouquet..."
+
+#~ msgid "remove bouquet"
+#~ msgstr "enlever le bouquet"
+
+#~ msgid "remove service"
+#~ msgstr "enlever la chaîne"
+
+# TODO: erreur : pluriel ou singulier\r
+#~ msgid "Hide error windows"
+#~ msgstr "Cacher les fenêtres d'erreurs"
+
+#~ msgid "Show Satposition"
+#~ msgstr "Afficher la position du satellite"
+
+#~ msgid "Visualize positioner movement"
+#~ msgstr "Visualiser le mouvement du positionneur"
+
+#~ msgid "Audio / Video"
+#~ msgstr "Audio / Vidéo"
+
+# TODO: À améliorer\r
+#~ msgid "Record Splitsize"
+#~ msgstr "Taille de découpe des enregistrements"
+
+#~ msgid "Auto show inforbar"
+#~ msgstr "Afficher automatiquement la barre d'infos"
+
+#~ msgid "Network"
+#~ msgstr "Réseau"
+
+#~ msgid "Invert"
+#~ msgstr "Inverser"
+
+# TODO: À vérifier\r
+#~ msgid "use power delta"
+#~ msgstr "utiliser le delta puissance"
+
+#~ msgid "Fast zapping"
+#~ msgstr "Zapping rapide"
+
+# TODO: À vérifier\r
+#~ msgid "Usage Settings"
+#~ msgstr "Paramétrage d'usage"
+
+#~ msgid "UHF Modulator"
+#~ msgstr "Modulateur UHF"
+
+#~ msgid "LCD"
+#~ msgstr "LCD"
+
+#~ msgid "Ask before zapping"
+#~ msgstr "Demander avant de zapper"
+
+#~ msgid "Parental Lock"
+#~ msgstr "Verrouillage parental"
+
+#~ msgid "Skip confirmations"
+#~ msgstr "Passer les confirmations"
+
+# À vérifier\r
+#~ msgid "Setup Lock"
+#~ msgstr "Paramétrer le verrou"
+
+#~ msgid "Expert Setup"
+#~ msgstr "Paramétrage expert"
+
+#~ msgid "Language"
+#~ msgstr "Langue"
+
+#~ msgid "Parental Control"
+#~ msgstr "Contrôle parental"
+
+#~ msgid "Multi bouquets"
+#~ msgstr "Multi bouquets"
+
+#~ msgid "Usage settings"
+#~ msgstr "Paramétrages d'usage"
+
+#~ msgid "Timeshift not possible!"
+#~ msgstr "Pause du direct impossible !"
+
 #~ msgid "open service list"
 #~ msgstr "afficher la liste des chaînes"