fix non-ascii chars in service reference, follow new config stuff

[enigma2.git] / po / es.po

diff --git a/po/es.po b/po/es.po
index 4efb47b5c1f8d622f6d5519919b348d74335fd87..1105559f4a2ef34710591cfea8daba2f95b3a525 100644 (file)
--- a/po/es.po
+++ b/po/es.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-06-27 00:07+0200\n"
+"POT-Creation-Date: 2006-08-05 19:29+0000\n"
 "PO-Revision-Date: 2006-06-26 14:50+0200\n"
 "Last-Translator: Jose Juan Zapater <josej@zapater.fdns.net>\n"
 "Language-Team: none\n"
@@ -65,35 +65,35 @@ msgstr "/usr/share/enigma2 directorio"
 msgid "/var directory"
 msgstr "directorio /var"
 
-#: ../lib/python/Components/NimManager.py:750
+#: ../lib/python/Components/NimManager.py:758
 msgid "0 V"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:753
+#: ../lib/python/Components/NimManager.py:761
 msgid "1.0"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:753
+#: ../lib/python/Components/NimManager.py:761
 msgid "1.1"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:753
+#: ../lib/python/Components/NimManager.py:761
 msgid "1.2"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:750
+#: ../lib/python/Components/NimManager.py:758
 msgid "12 V"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:149
+#: ../lib/python/Screens/Satconfig.py:150
 msgid "12V Output"
 msgstr "12V Salida"
 
-#: ../lib/python/Components/NimManager.py:729
+#: ../lib/python/Components/NimManager.py:737
 msgid "13 V"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:729
+#: ../lib/python/Components/NimManager.py:737
 msgid "18 V"
 msgstr ""
 
@@ -101,11 +101,15 @@ msgstr ""
 msgid "<unknown>"
 msgstr "<desconocido>"
 
-#: ../lib/python/Components/NimManager.py:752
+#: ../lib/python/Screens/Setup.py:131
+msgid "??"
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:760
 msgid "A"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1184
+#: ../lib/python/Screens/InfoBarGenerics.py:1214
 msgid ""
 "A recording is currently running.\n"
 "What do you want to do?"
@@ -127,15 +131,15 @@ msgstr ""
 "¡Ha fallado la grabación!\n"
 "¿Desactivar TV y probar otra vez?\n"
 
-#: ../lib/python/Components/NimManager.py:735
+#: ../lib/python/Components/NimManager.py:743
 msgid "AA"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:735
+#: ../lib/python/Components/NimManager.py:743
 msgid "AB"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1021
+#: ../lib/python/Screens/InfoBarGenerics.py:1043
 msgid "Activate Picture in Picture"
 msgstr "Activar PiP"
 
@@ -143,7 +147,7 @@ msgstr "Activar PiP"
 msgid "Add"
 msgstr "Añadir"
 
-#: ../lib/python/Screens/MediaPlayer.py:326
+#: ../lib/python/Screens/MediaPlayer.py:346
 msgid "Add files to playlist"
 msgstr "Añadir ficheros a la lista"
 
@@ -152,8 +156,8 @@ msgstr "Añadir ficheros a la lista"
 msgid "Add timer"
 msgstr "Grabar"
 
-#: ../lib/python/Components/NimManager.py:672
 #: ../lib/python/Components/NimManager.py:680
+#: ../lib/python/Components/NimManager.py:688
 #: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:31
 msgid "Advanced"
 msgstr "Avanzado"
@@ -162,12 +166,12 @@ msgstr "Avanzado"
 msgid "After event"
 msgstr "Después del evento"
 
-#: ../lib/python/Screens/MediaPlayer.py:49
+#: ../lib/python/Screens/MediaPlayer.py:51
 msgid "Album:"
 msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:447
-#: ../lib/python/Screens/ChannelSelection.py:593
+#: ../lib/python/Screens/ChannelSelection.py:474
+#: ../lib/python/Screens/ChannelSelection.py:622
 msgid "All"
 msgstr "Todo"
 
@@ -175,38 +179,41 @@ msgstr "Todo"
 msgid "Arabic"
 msgstr "Arábigo"
 
-#: ../lib/python/Screens/MediaPlayer.py:45
+#: ../lib/python/Screens/MediaPlayer.py:47
 msgid "Artist:"
 msgstr "Artista:"
 
-#: ../lib/python/Screens/ScanSetup.py:318
-#: ../lib/python/Screens/ScanSetup.py:321
-#: ../lib/python/Screens/ScanSetup.py:327
-#: ../lib/python/Screens/ScanSetup.py:328
-#: ../lib/python/Screens/ScanSetup.py:329
-#: ../lib/python/Screens/ScanSetup.py:335
-#: ../lib/python/Screens/ScanSetup.py:339
-#: ../lib/python/Screens/ScanSetup.py:340
-#: ../lib/python/Screens/ScanSetup.py:341
-#: ../lib/python/Screens/ScanSetup.py:342
-#: ../lib/python/Screens/ScanSetup.py:343
-#: ../lib/python/Screens/ScanSetup.py:344
+#: ../lib/python/Screens/InfoBarGenerics.py:1224
+msgid "Audio Options..."
+msgstr ""
+
+#: ../lib/python/Screens/ScanSetup.py:365
+#: ../lib/python/Screens/ScanSetup.py:368
+#: ../lib/python/Screens/ScanSetup.py:374
+#: ../lib/python/Screens/ScanSetup.py:376
+#: ../lib/python/Screens/ScanSetup.py:382
+#: ../lib/python/Screens/ScanSetup.py:386
+#: ../lib/python/Screens/ScanSetup.py:387
+#: ../lib/python/Screens/ScanSetup.py:388
+#: ../lib/python/Screens/ScanSetup.py:389
+#: ../lib/python/Screens/ScanSetup.py:390
+#: ../lib/python/Screens/ScanSetup.py:391 ../lib/python/Screens/Ci.py:24
 msgid "Auto"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:667 ../data/
+#: ../lib/python/Screens/ScanSetup.py:702 ../data/
 msgid "Automatic Scan"
 msgstr "Búsqueda automática"
 
-#: ../lib/python/Components/NimManager.py:752
+#: ../lib/python/Components/NimManager.py:760
 msgid "B"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:735
+#: ../lib/python/Components/NimManager.py:743
 msgid "BA"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:735
+#: ../lib/python/Components/NimManager.py:743
 msgid "BB"
 msgstr ""
 
@@ -222,11 +229,11 @@ msgstr "Localización Backup"
 msgid "Backup Mode"
 msgstr "Modo Backup"
 
-#: ../lib/python/Components/NimManager.py:730
+#: ../lib/python/Components/NimManager.py:738
 msgid "Band"
 msgstr "Banda"
 
-#: ../lib/python/Screens/ScanSetup.py:248
+#: ../lib/python/Screens/ScanSetup.py:247
 msgid "Bandwidth"
 msgstr "Ancho de banda"
 
@@ -234,7 +241,7 @@ msgstr "Ancho de banda"
 msgid "Bus: "
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:746
+#: ../lib/python/Components/NimManager.py:754
 msgid "C-Band"
 msgstr "Banda-C"
 
@@ -242,7 +249,7 @@ msgstr "Banda-C"
 msgid "CF Drive"
 msgstr "Unidad CF"
 
-#: ../lib/python/Screens/ChannelSelection.py:706
+#: ../lib/python/Screens/ChannelSelection.py:735
 msgid "Cable"
 msgstr ""
 
@@ -250,7 +257,7 @@ msgstr ""
 msgid "Cable provider"
 msgstr "Proveedor de cable"
 
-#: ../lib/python/Screens/Setup.py:143 ../lib/python/Screens/TimerEntry.py:25
+#: ../lib/python/Screens/Setup.py:87 ../lib/python/Screens/TimerEntry.py:25
 #: ../lib/python/Screens/TimeDateInput.py:16
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:75
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:165
@@ -281,11 +288,11 @@ msgstr "Clásico"
 msgid "Cleanup"
 msgstr "Limpiar"
 
-#: ../lib/python/Screens/ScanSetup.py:214
-#: ../lib/python/Screens/ScanSetup.py:219
-#: ../lib/python/Screens/ScanSetup.py:241
-#: ../lib/python/Screens/ScanSetup.py:256
-#: ../lib/python/Screens/ScanSetup.py:648
+#: ../lib/python/Screens/ScanSetup.py:213
+#: ../lib/python/Screens/ScanSetup.py:218
+#: ../lib/python/Screens/ScanSetup.py:240
+#: ../lib/python/Screens/ScanSetup.py:255
+#: ../lib/python/Screens/ScanSetup.py:690
 msgid "Clear before scan"
 msgstr "Limpiar antes de buscar"
 
@@ -293,30 +300,30 @@ msgstr "Limpiar antes de buscar"
 msgid "Clear log"
 msgstr "Borrar log"
 
-#: ../lib/python/Screens/ScanSetup.py:249
+#: ../lib/python/Screens/ScanSetup.py:248
 msgid "Code rate high"
 msgstr "Velocidad de código alta"
 
-#: ../lib/python/Screens/ScanSetup.py:250
+#: ../lib/python/Screens/ScanSetup.py:249
 msgid "Code rate low"
 msgstr "Velocidad de código baja"
 
-#: ../lib/python/Screens/Satconfig.py:129
-#: ../lib/python/Screens/Satconfig.py:131
+#: ../lib/python/Screens/Satconfig.py:130
+#: ../lib/python/Screens/Satconfig.py:132
 msgid "Command order"
 msgstr "Orden de comando"
 
-#: ../lib/python/Screens/Satconfig.py:125
+#: ../lib/python/Screens/Satconfig.py:126
 msgid "Committed DiSEqC command"
 msgstr "Comando DISEqC enviado"
 
-#: ../lib/python/Screens/ScanSetup.py:297
-#: ../lib/python/Screens/ScanSetup.py:298
+#: ../lib/python/Screens/ScanSetup.py:344
+#: ../lib/python/Screens/ScanSetup.py:345
 msgid "Complete"
 msgstr "Completado"
 
 #: ../lib/python/Screens/Satconfig.py:49
-#: ../lib/python/Screens/Satconfig.py:154 ../data/
+#: ../lib/python/Screens/Satconfig.py:155 ../data/
 msgid "Configuration Mode"
 msgstr "Modo Configuración"
 
@@ -328,11 +335,11 @@ msgstr "Grabación en conflict"
 msgid "Current version:"
 msgstr "Versión actual"
 
-#: ../lib/python/Screens/ScanSetup.py:316
+#: ../lib/python/Screens/ScanSetup.py:363
 msgid "DVB-S"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:316
+#: ../lib/python/Screens/ScanSetup.py:363
 msgid "DVB-S2"
 msgstr ""
 
@@ -372,11 +379,11 @@ msgstr "HDD detectado:"
 msgid "Detected NIMs:"
 msgstr "NIMs detectados:"
 
-#: ../lib/python/Components/NimManager.py:694
+#: ../lib/python/Components/NimManager.py:702
 msgid "DiSEqC A/B"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:694
+#: ../lib/python/Components/NimManager.py:702
 msgid "DiSEqC A/B/C/D"
 msgstr ""
 
@@ -384,15 +391,15 @@ msgstr ""
 msgid "DiSEqC Mode"
 msgstr "Modo DiSEqC"
 
-#: ../lib/python/Screens/Satconfig.py:121
+#: ../lib/python/Screens/Satconfig.py:122
 msgid "DiSEqC mode"
 msgstr "modo DiSEqC"
 
-#: ../lib/python/Screens/Satconfig.py:133
+#: ../lib/python/Screens/Satconfig.py:134
 msgid "DiSEqC repeats"
 msgstr "Repetir DiSEqC"
 
-#: ../lib/python/Screens/ScanSetup.py:223
+#: ../lib/python/Screens/ScanSetup.py:222
 #: ../lib/python/Screens/TimerEdit.py:83 ../lib/python/Components/Lcd.py:31
 #: ../lib/python/Components/SetupDevices.py:38
 #: ../lib/python/Components/SetupDevices.py:39
@@ -404,7 +411,7 @@ msgstr "Repetir DiSEqC"
 msgid "Disable"
 msgstr "Desabilitar"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1023
+#: ../lib/python/Screens/InfoBarGenerics.py:1045
 msgid "Disable Picture in Picture"
 msgstr "Desactivar PiP"
 
@@ -441,6 +448,10 @@ msgid ""
 "After pressing OK, please wait!"
 msgstr ""
 
+#: ../lib/python/Screens/InfoBarGenerics.py:1493
+msgid "Do you want to resume this playback?"
+msgstr ""
+
 #: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:50
 #: ../lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py:202
 msgid ""
@@ -466,7 +477,7 @@ msgstr "Descargando información del plugin. Espere..."
 msgid "Dutch"
 msgstr "Alemán"
 
-#: ../lib/python/Screens/ChannelSelection.py:714
+#: ../lib/python/Screens/ChannelSelection.py:743
 msgid "E"
 msgstr ""
 
@@ -475,12 +486,12 @@ msgstr ""
 msgid "ERROR - failed to scan (%s)!"
 msgstr "ERROR - falló la búsqueda (%s)!"
 
-#: ../lib/python/Components/NimManager.py:701
-#: ../lib/python/Components/NimManager.py:762
+#: ../lib/python/Components/NimManager.py:709
+#: ../lib/python/Components/NimManager.py:770
 msgid "East"
 msgstr "Este"
 
-#: ../lib/python/Screens/ScanSetup.py:223
+#: ../lib/python/Screens/ScanSetup.py:222
 #: ../lib/python/Screens/TimerEdit.py:81 ../lib/python/Components/Lcd.py:31
 #: ../lib/python/Components/SetupDevices.py:38
 #: ../lib/python/Components/SetupDevices.py:39
@@ -492,8 +503,7 @@ msgstr "Este"
 msgid "Enable"
 msgstr "Activar"
 
-#: ../lib/python/Screens/ScanSetup.py:257
-#: ../lib/python/Screens/ScanSetup.py:664
+#: ../lib/python/Screens/Satconfig.py:74
 msgid "Enable 5V for active antenna"
 msgstr ""
 
@@ -511,7 +521,11 @@ msgstr "HoraFin"
 msgid "English"
 msgstr "Inglés"
 
-#: ../lib/python/Components/NimManager.py:675
+#: ../lib/python/Screens/InfoBarGenerics.py:342
+msgid "Enter main menu..."
+msgstr ""
+
+#: ../lib/python/Components/NimManager.py:683
 msgid "Equal to Socket A"
 msgstr "Igual al conector A"
 
@@ -523,18 +537,18 @@ msgstr "Progreso de ejecución:"
 msgid "Execution finished!!"
 msgstr "¡Ejecución terminó!"
 
-#: ../lib/python/Screens/ScanSetup.py:206
-#: ../lib/python/Screens/ScanSetup.py:208
-#: ../lib/python/Screens/ScanSetup.py:238
+#: ../lib/python/Screens/ScanSetup.py:205
+#: ../lib/python/Screens/ScanSetup.py:207
+#: ../lib/python/Screens/ScanSetup.py:237
 #: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:405
 msgid "FEC"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:126
+#: ../lib/python/Screens/Satconfig.py:127
 msgid "Fast DiSEqC"
 msgstr "DiSEqC Rapido"
 
-#: ../lib/python/Screens/ChannelSelection.py:450
+#: ../lib/python/Screens/ChannelSelection.py:477
 msgid "Favourites"
 msgstr "Favoritos"
 
@@ -546,9 +560,9 @@ msgstr "Finlandés"
 msgid "French"
 msgstr "Francés"
 
-#: ../lib/python/Screens/ScanSetup.py:201
-#: ../lib/python/Screens/ScanSetup.py:234
-#: ../lib/python/Screens/ScanSetup.py:245
+#: ../lib/python/Screens/ScanSetup.py:200
+#: ../lib/python/Screens/ScanSetup.py:233
+#: ../lib/python/Screens/ScanSetup.py:244
 #: ../lib/python/Screens/TimerEntry.py:160
 #: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:401
 msgid "Frequency"
@@ -577,7 +591,7 @@ msgstr "Función no implementada todavía"
 msgid "Gateway"
 msgstr "Puerta de enlace"
 
-#: ../lib/python/Screens/MediaPlayer.py:53
+#: ../lib/python/Screens/MediaPlayer.py:55
 msgid "Genre:"
 msgstr "Género:"
 
@@ -599,7 +613,7 @@ msgstr "Ir a 0"
 msgid "Goto position"
 msgstr "Ir a la posición"
 
-#: ../lib/python/Screens/ScanSetup.py:253
+#: ../lib/python/Screens/ScanSetup.py:252
 msgid "Guard interval mode"
 msgstr "Modo intervalo seguro"
 
@@ -608,12 +622,12 @@ msgstr "Modo intervalo seguro"
 msgid "Harddisk"
 msgstr "Disco duro"
 
-#: ../lib/python/Screens/ScanSetup.py:254
+#: ../lib/python/Screens/ScanSetup.py:253
 msgid "Hierarchy mode"
 msgstr "Modo jerárquico"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1160
-#: ../lib/python/Screens/InfoBarGenerics.py:1168
+#: ../lib/python/Screens/InfoBarGenerics.py:1190
+#: ../lib/python/Screens/InfoBarGenerics.py:1198
 msgid "How many minutes do you want to record?"
 msgstr "¿Cuántos minutos quiere grabar?"
 
@@ -635,11 +649,11 @@ msgid ""
 msgstr ""
 "Obligatorio para grabar, la TV fue cambiada al canal de la grabación!\n"
 
-#: ../lib/python/Screens/Satconfig.py:150
+#: ../lib/python/Screens/Satconfig.py:151
 msgid "Increased voltage"
 msgstr "Voltage incrementado"
 
-#: ../lib/python/Screens/Ci.py:290
+#: ../lib/python/Screens/Ci.py:313
 msgid "Init"
 msgstr "Iniciar"
 
@@ -651,9 +665,13 @@ msgstr "Inicializar"
 msgid "Initializing Harddisk..."
 msgstr "Inicializando Disco duro..."
 
-#: ../lib/python/Screens/ScanSetup.py:202
-#: ../lib/python/Screens/ScanSetup.py:235
-#: ../lib/python/Screens/ScanSetup.py:247
+#: ../lib/python/Screens/InfoBarGenerics.py:1100
+msgid "Instant Record..."
+msgstr ""
+
+#: ../lib/python/Screens/ScanSetup.py:201
+#: ../lib/python/Screens/ScanSetup.py:234
+#: ../lib/python/Screens/ScanSetup.py:246
 #: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:402
 msgid "Inversion"
 msgstr "Inversión"
@@ -662,19 +680,19 @@ msgstr "Inversión"
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../lib/python/Screens/Satconfig.py:118
+#: ../lib/python/Screens/Satconfig.py:119
 msgid "LNB"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:143
+#: ../lib/python/Screens/Satconfig.py:144
 msgid "LOF"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:147
+#: ../lib/python/Screens/Satconfig.py:148
 msgid "LOF/H"
 msgstr ""
 
-#: ../lib/python/Screens/Satconfig.py:146
+#: ../lib/python/Screens/Satconfig.py:147
 msgid "LOF/L"
 msgstr ""
 
@@ -683,11 +701,11 @@ msgid "Language selection"
 msgstr "Selección de Idioma"
 
 #: ../lib/python/Screens/Satconfig.py:28
-#: ../lib/python/Screens/Satconfig.py:137 ../data/
+#: ../lib/python/Screens/Satconfig.py:138 ../data/
 msgid "Latitude"
 msgstr "Latitud"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1234
+#: ../lib/python/Screens/InfoBarGenerics.py:1264
 msgid "Left"
 msgstr "Izda"
 
@@ -708,11 +726,11 @@ msgid "Limits on"
 msgstr "Límites on"
 
 #: ../lib/python/Screens/Satconfig.py:26
-#: ../lib/python/Screens/Satconfig.py:135 ../data/
+#: ../lib/python/Screens/Satconfig.py:136 ../data/
 msgid "Longitude"
 msgstr "Longitud"
 
-#: ../lib/python/Components/NimManager.py:676
+#: ../lib/python/Components/NimManager.py:684
 msgid "Loopthrough to Socket A"
 msgstr "Conectado al conector A"
 
@@ -724,9 +742,9 @@ msgstr "Transpondedor manual"
 msgid "Model: "
 msgstr "Modelo: "
 
-#: ../lib/python/Screens/ScanSetup.py:209
-#: ../lib/python/Screens/ScanSetup.py:237
-#: ../lib/python/Screens/ScanSetup.py:251
+#: ../lib/python/Screens/ScanSetup.py:208
+#: ../lib/python/Screens/ScanSetup.py:236
+#: ../lib/python/Screens/ScanSetup.py:250
 msgid "Modulation"
 msgstr "Modulación"
 
@@ -744,7 +762,7 @@ msgstr "Lun-Vie"
 msgid "Monday"
 msgstr "Lunes"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1024
+#: ../lib/python/Screens/InfoBarGenerics.py:1046
 msgid "Move Picture in Picture"
 msgstr ""
 
@@ -764,11 +782,15 @@ msgstr "Menú de Películas"
 msgid "Multi EPG"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:296
+#: ../lib/python/Screens/Ci.py:324
+msgid "Multiple service support"
+msgstr ""
+
+#: ../lib/python/Screens/ScanSetup.py:343
 msgid "Multisat"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:495
+#: ../lib/python/Components/NimManager.py:499
 msgid "N/A"
 msgstr "N/D"
 
@@ -788,12 +810,12 @@ msgstr "DNS"
 msgid "Netmask"
 msgstr "Máscara"
 
-#: ../lib/python/Screens/ScanSetup.py:239
-#: ../lib/python/Screens/ScanSetup.py:246
+#: ../lib/python/Screens/ScanSetup.py:238
+#: ../lib/python/Screens/ScanSetup.py:245
 msgid "Network scan"
 msgstr "Escanear red"
 
-#: ../lib/python/Screens/ChannelSelection.py:698
+#: ../lib/python/Screens/ChannelSelection.py:727
 msgid "New"
 msgstr "Nuevo"
 
@@ -805,20 +827,19 @@ msgstr "Nueva versión:"
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../lib/python/Components/NimManager.py:731
-#: ../lib/python/Components/NimManager.py:751
-#: ../lib/python/Components/NimManager.py:755
-#: ../lib/python/Components/NimManager.py:756
-#: ../lib/python/Components/NimManager.py:765
-#: ../lib/python/Components/NimManager.py:779
+#: ../lib/python/Screens/Ci.py:24 ../lib/python/Components/NimManager.py:739
+#: ../lib/python/Components/NimManager.py:759
+#: ../lib/python/Components/NimManager.py:763
+#: ../lib/python/Components/NimManager.py:764
+#: ../lib/python/Components/NimManager.py:773
 msgid "No"
 msgstr ""
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1180
+#: ../lib/python/Screens/InfoBarGenerics.py:1210
 msgid "No HDD found or HDD not initialized!"
 msgstr "¡HDD no encontrado o no inicializado!"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1113
+#: ../lib/python/Screens/InfoBarGenerics.py:1143
 msgid "No event info found, recording indefinitely."
 msgstr "No hay info del evento, grabando indefinidamente."
 
@@ -830,21 +851,19 @@ msgstr "No he encontado motor capaz"
 msgid "No tuner is configured for use with a diseqc positioner!"
 msgstr "No hay sintonizador configurado para usar con un motor diseqc!"
 
-#: ../lib/python/Screens/ScanSetup.py:321
-#: ../lib/python/Screens/ScanSetup.py:329
-#: ../lib/python/Screens/ScanSetup.py:339
-#: ../lib/python/Screens/ScanSetup.py:340
-#: ../lib/python/Screens/ScanSetup.py:344
-#: ../lib/python/Components/NimManager.py:735
-#: ../lib/python/Components/NimManager.py:739
-#: ../lib/python/Components/NimManager.py:752
-#: ../lib/python/Components/NimManager.py:753
+#: ../lib/python/Screens/ScanSetup.py:368
+#: ../lib/python/Screens/ScanSetup.py:376
+#: ../lib/python/Screens/ScanSetup.py:391
+#: ../lib/python/Components/NimManager.py:743
+#: ../lib/python/Components/NimManager.py:747
 #: ../lib/python/Components/NimManager.py:760
+#: ../lib/python/Components/NimManager.py:761
+#: ../lib/python/Components/NimManager.py:768
 msgid "None"
 msgstr "Ninguno"
 
-#: ../lib/python/Components/NimManager.py:703
-#: ../lib/python/Components/NimManager.py:764
+#: ../lib/python/Components/NimManager.py:711
+#: ../lib/python/Components/NimManager.py:772
 msgid "North"
 msgstr "Norte"
 
@@ -852,12 +871,12 @@ msgstr "Norte"
 msgid "Norwegian"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:677
+#: ../lib/python/Components/NimManager.py:685
 msgid "Nothing connected"
 msgstr "Nada conectado"
 
-#: ../lib/python/Screens/ScanSetup.py:525
-#: ../lib/python/Screens/ScanSetup.py:590
+#: ../lib/python/Screens/ScanSetup.py:568
+#: ../lib/python/Screens/ScanSetup.py:633
 msgid ""
 "Nothing to scan!\n"
 "Please setup your tuner settings before you start a service scan."
@@ -865,21 +884,23 @@ msgstr ""
 "Nada a buscar!\n"
 "Por favor ponga la configuración del sintonizador antes de buscar un canal."
 
-#: ../lib/python/Screens/Setup.py:142 ../lib/python/Screens/TimerEntry.py:24
+#: ../lib/python/Screens/Setup.py:86 ../lib/python/Screens/TimerEntry.py:24
 #: ../lib/python/Screens/TimeDateInput.py:15
 #: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:74
 msgid "OK"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:730
+#: ../lib/python/Components/NimManager.py:738
+#: ../lib/python/Components/NimManager.py:782
 msgid "Off"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:730
+#: ../lib/python/Components/NimManager.py:738
+#: ../lib/python/Components/NimManager.py:782
 msgid "On"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:760
+#: ../lib/python/Components/NimManager.py:768
 msgid "One"
 msgstr "Uno"
 
@@ -891,36 +912,48 @@ msgstr "Actualización-Online"
 msgid "Packet management"
 msgstr "Manejo de paquete"
 
-#: ../lib/python/Screens/InfoBar.py:48
+#: ../lib/python/Screens/InfoBar.py:47
 msgid "Play recorded movies..."
 msgstr "Reproducir películas grabadas..."
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1033
+#: ../lib/python/Screens/InfoBarGenerics.py:1055
 msgid "Please choose an extension..."
 msgstr "Por favor, elija una extensión..."
 
-#: ../lib/python/Screens/ChannelSelection.py:127
+#: ../lib/python/Screens/ChannelSelection.py:126
 msgid "Please enter a name for the new bouquet"
 msgstr "Introduzca un nombre para la nueva lista"
 
+#: ../lib/python/Screens/ChannelSelection.py:160
+msgid "Please enter a name for the new marker"
+msgstr ""
+
 #: ../lib/python/Screens/TimerEntry.py:320
 msgid "Please select a subservice to record..."
 msgstr "Por fafor selecciona un subservicio a grabar..."
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1326
+#: ../lib/python/Screens/InfoBarGenerics.py:1361
+#: ../lib/python/Screens/SubservicesQuickzap.py:90
 msgid "Please select a subservice..."
 msgstr "Por favor, selecciona un subservicio..."
 
+#: ../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 "Espere... Cargando lista..."
 
-#: ../lib/python/Screens/ScanSetup.py:204
+#: ../lib/python/Screens/ScanSetup.py:203
 #: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:404
 msgid "Polarity"
 msgstr "Polaridad"
 
-#: ../lib/python/Components/NimManager.py:729
+#: ../lib/python/Components/NimManager.py:737
 msgid "Polarization"
 msgstr "Polarización"
 
@@ -940,7 +973,7 @@ msgstr "Puerto C"
 msgid "Port D"
 msgstr "Puerto D"
 
-#: ../lib/python/Components/NimManager.py:694
+#: ../lib/python/Components/NimManager.py:702
 msgid "Positioner"
 msgstr "Motor"
 
@@ -964,11 +997,11 @@ msgstr "Satélite predefinido"
 msgid "Press OK to activate the settings."
 msgstr "Pulse OK para activar la configuración."
 
-#: ../lib/python/Screens/ScanSetup.py:668
+#: ../lib/python/Screens/ScanSetup.py:703
 msgid "Press OK to scan"
 msgstr "Pulse OK para buscar"
 
-#: ../lib/python/Screens/ScanSetup.py:161
+#: ../lib/python/Screens/ScanSetup.py:160
 msgid "Press OK to start the scan"
 msgstr "Pulse OK para comenzar la búsqued"
 
@@ -976,19 +1009,27 @@ msgstr "Pulse OK para comenzar la búsqued"
 msgid "Prev"
 msgstr "Ant"
 
-#: ../lib/python/Screens/ChannelSelection.py:449
-#: ../lib/python/Screens/ChannelSelection.py:589
+#: ../lib/python/Screens/ChannelSelection.py:476
+#: ../lib/python/Screens/ChannelSelection.py:618
 msgid "Provider"
 msgstr "Proveedor"
 
-#: ../lib/python/Screens/ChannelSelection.py:696
+#: ../lib/python/Screens/ChannelSelection.py:725
 msgid "Providers"
 msgstr "Proveedores"
 
+#: ../lib/python/Screens/InfoBarGenerics.py:1357
+msgid "Quickzap"
+msgstr ""
+
 #: ../lib/python/Screens/TimerEdit.py:107
 msgid "Really delete done timers?"
 msgstr "¿Quiere borrar las programaciones terminadas?"
 
+#: ../lib/python/Screens/SubservicesQuickzap.py:101
+msgid "Really exit the subservices quickzap?"
+msgstr ""
+
 #: ../lib/python/Screens/EventView.py:74
 msgid "Recording"
 msgstr "Grabando"
@@ -1005,11 +1046,11 @@ msgstr "Borrar plugins"
 msgid "Repeat Type"
 msgstr "Tipo de repetición"
 
-#: ../lib/python/Screens/MediaPlayer.py:327
+#: ../lib/python/Screens/MediaPlayer.py:347
 msgid "Replace current playlist"
 msgstr "Reemplazar la actual lista"
 
-#: ../lib/python/Screens/Ci.py:289
+#: ../lib/python/Screens/Ci.py:312
 msgid "Reset"
 msgstr "Resetear"
 
@@ -1018,7 +1059,7 @@ msgstr "Resetear"
 msgid "Restore"
 msgstr "Restaurar"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1234
+#: ../lib/python/Screens/InfoBarGenerics.py:1264
 msgid "Right"
 msgstr "Dcha"
 
@@ -1027,16 +1068,16 @@ msgstr "Dcha"
 msgid "Sat"
 msgstr "Sáb"
 
-#: ../lib/python/Screens/ScanSetup.py:200
-#: ../lib/python/Screens/ScanSetup.py:213
+#: ../lib/python/Screens/ScanSetup.py:199
+#: ../lib/python/Screens/ScanSetup.py:212
 #: ../lib/python/Screens/Satconfig.py:13 ../lib/python/Screens/Satconfig.py:63
-#: ../lib/python/Screens/Satconfig.py:156
+#: ../lib/python/Screens/Satconfig.py:157
 #: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:398
 msgid "Satellite"
 msgstr "Satélite"
 
-#: ../lib/python/Screens/ChannelSelection.py:448
-#: ../lib/python/Screens/ChannelSelection.py:591
+#: ../lib/python/Screens/ChannelSelection.py:475
+#: ../lib/python/Screens/ChannelSelection.py:620
 msgid "Satellites"
 msgstr "Satélites"
 
@@ -1045,8 +1086,8 @@ msgstr "Satélites"
 msgid "Saturday"
 msgstr "Sábado"
 
-#: ../lib/python/Screens/ScanSetup.py:655
-#: ../lib/python/Screens/ScanSetup.py:659
+#: ../lib/python/Screens/ScanSetup.py:695
+#: ../lib/python/Screens/ScanSetup.py:699
 msgid "Scan NIM"
 msgstr "Escanear NIM"
 
@@ -1058,15 +1099,15 @@ msgstr "Buscar este"
 msgid "Search west"
 msgstr "Buscar oeste"
 
-#: ../lib/python/Components/NimManager.py:678
+#: ../lib/python/Components/NimManager.py:686
 msgid "Secondary cable from motorized LNB"
 msgstr "Cable secundario del LNB motorizado"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1246
+#: ../lib/python/Screens/InfoBarGenerics.py:1276
 msgid "Select audio mode"
 msgstr "Seleccionar modo audio"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1235
+#: ../lib/python/Screens/InfoBarGenerics.py:1265
 msgid "Select audio track"
 msgstr "Seleccionar pista de audio"
 
@@ -1074,11 +1115,11 @@ msgstr "Seleccionar pista de audio"
 msgid "Select channel to record from"
 msgstr "Seleccione canal del que grabar"
 
-#: ../lib/python/Screens/Satconfig.py:127
+#: ../lib/python/Screens/Satconfig.py:128
 msgid "Sequence repeat"
 msgstr "Repetir secuencia"
 
-#: ../lib/python/Screens/ChannelSelection.py:700
+#: ../lib/python/Screens/ChannelSelection.py:729
 msgid "Services"
 msgstr "Canales"
 
@@ -1090,11 +1131,11 @@ msgstr "Límites activados"
 msgid "Settings"
 msgstr "Configuraciones"
 
-#: ../lib/python/Screens/InfoBar.py:49
+#: ../lib/python/Screens/InfoBar.py:48
 msgid "Show the radio player..."
 msgstr "Reproductor de radio..."
 
-#: ../lib/python/Screens/InfoBar.py:50
+#: ../lib/python/Screens/InfoBar.py:49
 msgid "Show the tv player..."
 msgstr "Mostrar el reproductor de tv"
 
@@ -1106,12 +1147,12 @@ msgstr ""
 msgid "Similar broadcasts:"
 msgstr "Emisiones similares:"
 
-#: ../lib/python/Components/NimManager.py:672
-#: ../lib/python/Components/NimManager.py:679
+#: ../lib/python/Components/NimManager.py:680
+#: ../lib/python/Components/NimManager.py:687
 msgid "Simple"
 msgstr "Sencillo"
 
-#: ../lib/python/Components/NimManager.py:694
+#: ../lib/python/Components/NimManager.py:702
 msgid "Single"
 msgstr "Uno"
 
@@ -1119,21 +1160,21 @@ msgstr "Uno"
 msgid "Single EPG"
 msgstr "EPG Sencillo"
 
-#: ../lib/python/Screens/ScanSetup.py:296
+#: ../lib/python/Screens/ScanSetup.py:343
 msgid "Single satellite"
 msgstr "Satélite único"
 
-#: ../lib/python/Screens/ScanSetup.py:296
-#: ../lib/python/Screens/ScanSetup.py:297
-#: ../lib/python/Screens/ScanSetup.py:298
+#: ../lib/python/Screens/ScanSetup.py:343
+#: ../lib/python/Screens/ScanSetup.py:344
+#: ../lib/python/Screens/ScanSetup.py:345
 msgid "Single transponder"
 msgstr "Transponder único"
 
-#: ../lib/python/Components/NimManager.py:707
+#: ../lib/python/Components/NimManager.py:715
 msgid "Slot "
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:564
+#: ../lib/python/Components/NimManager.py:568
 msgid "Socket "
 msgstr ""
 
@@ -1147,8 +1188,8 @@ msgstr ""
 "\n"
 "Por favor, elige otro."
 
-#: ../lib/python/Components/NimManager.py:703
-#: ../lib/python/Components/NimManager.py:764
+#: ../lib/python/Components/NimManager.py:711
+#: ../lib/python/Components/NimManager.py:772
 msgid "South"
 msgstr "Sur"
 
@@ -1160,7 +1201,7 @@ msgstr "Español"
 msgid "Start"
 msgstr "Inicio"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1186
+#: ../lib/python/Screens/InfoBarGenerics.py:1216
 msgid "Start recording?"
 msgstr "¿Iniciar grabación?"
 
@@ -1180,7 +1221,7 @@ msgstr "Paso este"
 msgid "Step west"
 msgstr "Paso oeste"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1234
+#: ../lib/python/Screens/InfoBarGenerics.py:1264
 msgid "Stereo"
 msgstr "Stéreo"
 
@@ -1191,11 +1232,11 @@ msgstr "Stéreo"
 msgid "Stop"
 msgstr "Parar"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:934
+#: ../lib/python/Screens/InfoBarGenerics.py:955
 msgid "Stop Timeshift?"
 msgstr "¿Parar grabación de pausa?"
 
-#: ../lib/python/Screens/InfoBar.py:114
+#: ../lib/python/Screens/InfoBar.py:111
 msgid "Stop playing this movie?"
 msgstr "¿Parar reproducción de esta película?"
 
@@ -1203,11 +1244,11 @@ msgstr "¿Parar reproducción de esta película?"
 msgid "Store position"
 msgstr "Almacenar posición"
 
-#: ../lib/python/Screens/Satconfig.py:115
+#: ../lib/python/Screens/Satconfig.py:116
 msgid "Stored position"
 msgstr "Posición almacenada"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1264
+#: ../lib/python/Screens/InfoBarGenerics.py:1295
 msgid "Subservice list..."
 msgstr "Lista de subservicios..."
 
@@ -1221,7 +1262,7 @@ msgstr "Dom"
 msgid "Sunday"
 msgstr "Domingo"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1025
+#: ../lib/python/Screens/InfoBarGenerics.py:1047
 msgid "Swap services"
 msgstr ""
 
@@ -1229,21 +1270,21 @@ msgstr ""
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1269
+#: ../lib/python/Screens/InfoBarGenerics.py:1300
 msgid "Switch to next subservice"
 msgstr "Cambiar al subservicio siguiente"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1270
+#: ../lib/python/Screens/InfoBarGenerics.py:1301
 msgid "Switch to previous subservice"
 msgstr "Cambiar al subservicio anterior"
 
-#: ../lib/python/Screens/ScanSetup.py:203
-#: ../lib/python/Screens/ScanSetup.py:236
+#: ../lib/python/Screens/ScanSetup.py:202
+#: ../lib/python/Screens/ScanSetup.py:235
 #: ../lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py:403
 msgid "Symbol Rate"
 msgstr "Velocidad de símbolo"
 
-#: ../lib/python/Screens/ChannelSelection.py:708
+#: ../lib/python/Screens/ChannelSelection.py:737
 msgid "Terrestrial"
 msgstr "Terrestre"
 
@@ -1251,11 +1292,11 @@ msgstr "Terrestre"
 msgid "Terrestrial provider"
 msgstr "Proveedor terrestre"
 
-#: ../lib/python/Components/NimManager.py:760
+#: ../lib/python/Components/NimManager.py:768
 msgid "Three"
 msgstr "Tres"
 
-#: ../lib/python/Screens/Satconfig.py:148
+#: ../lib/python/Screens/Satconfig.py:149
 msgid "Threshold"
 msgstr "Umbral"
 
@@ -1277,11 +1318,7 @@ msgstr "Hora"
 msgid "Timer Type"
 msgstr "Tipo de grabación"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:906
-msgid "Timeshift not possible!"
-msgstr "¡Pausa no posible!"
-
-#: ../lib/python/Screens/MediaPlayer.py:47
+#: ../lib/python/Screens/MediaPlayer.py:49
 msgid "Title:"
 msgstr "Título:"
 
@@ -1290,19 +1327,19 @@ msgstr "Título:"
 msgid "Today"
 msgstr "Hoy"
 
-#: ../lib/python/Screens/Satconfig.py:110
+#: ../lib/python/Screens/Satconfig.py:111
 msgid "Tone mode"
 msgstr "Modo tono"
 
-#: ../lib/python/Screens/Satconfig.py:124
+#: ../lib/python/Screens/Satconfig.py:125
 msgid "Toneburst"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:694
+#: ../lib/python/Components/NimManager.py:702
 msgid "Toneburst A/B"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:252
+#: ../lib/python/Screens/ScanSetup.py:251
 msgid "Transmission mode"
 msgstr "Modo trasmisión"
 
@@ -1310,7 +1347,7 @@ msgstr "Modo trasmisión"
 msgid "Transponder"
 msgstr "Transpondedor"
 
-#: ../lib/python/Screens/ScanSetup.py:198
+#: ../lib/python/Screens/ScanSetup.py:197
 msgid "Transpondertype"
 msgstr "Tipo de transporder"
 
@@ -1330,7 +1367,7 @@ msgstr "Martes"
 msgid "Tune"
 msgstr "Tono"
 
-#: ../lib/python/Screens/ScanSetup.py:179
+#: ../lib/python/Screens/ScanSetup.py:178
 #: ../lib/python/Components/ServiceScan.py:75
 msgid "Tuner"
 msgstr "Sintonizador"
@@ -1339,17 +1376,17 @@ msgstr "Sintonizador"
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../lib/python/Components/NimManager.py:760
+#: ../lib/python/Components/NimManager.py:768
 msgid "Two"
 msgstr "Dos"
 
-#: ../lib/python/Screens/ScanSetup.py:185
-#: ../lib/python/Screens/ScanSetup.py:188
-#: ../lib/python/Screens/ScanSetup.py:191
+#: ../lib/python/Screens/ScanSetup.py:184
+#: ../lib/python/Screens/ScanSetup.py:187
+#: ../lib/python/Screens/ScanSetup.py:190
 msgid "Type of scan"
 msgstr "Tipo de búsqued"
 
-#: ../lib/python/Components/NimManager.py:699
+#: ../lib/python/Components/NimManager.py:707
 msgid "USALS"
 msgstr ""
 
@@ -1367,11 +1404,11 @@ msgstr ""
 "Por favor mire el manual de usuario.\n"
 "Error: "
 
-#: ../lib/python/Screens/Satconfig.py:132
+#: ../lib/python/Screens/Satconfig.py:133
 msgid "Uncommitted DiSEqC command"
 msgstr "Comando DiSEqC no enviado"
 
-#: ../lib/python/Components/NimManager.py:746
+#: ../lib/python/Components/NimManager.py:754
 msgid "Universal LNB"
 msgstr "LNB Universal"
 
@@ -1387,19 +1424,23 @@ msgstr "Actualizando... Espere... Esto pude tardar varios minutos..."
 msgid "Use DHCP"
 msgstr "Usar DHCP"
 
-#: ../lib/python/Screens/Satconfig.py:112
+#: ../lib/python/Screens/Satconfig.py:113
 msgid "Use usals for this sat"
 msgstr "Usar usals para este sat"
 
-#: ../lib/python/Components/NimManager.py:746
+#: ../lib/python/Components/NimManager.py:754
 msgid "User defined"
 msgstr "Definido por el usuario"
 
-#: ../lib/python/Screens/Satconfig.py:109
+#: ../lib/python/Screens/InfoBarGenerics.py:1631
+msgid "View teletext..."
+msgstr ""
+
+#: ../lib/python/Screens/Satconfig.py:110
 msgid "Voltage mode"
 msgstr "Modo voltaje"
 
-#: ../lib/python/Screens/ChannelSelection.py:712
+#: ../lib/python/Screens/ChannelSelection.py:741
 msgid "W"
 msgstr ""
 
@@ -1417,21 +1458,20 @@ msgstr "Miércoles"
 msgid "Weekday"
 msgstr "DiaSemana"
 
-#: ../lib/python/Components/NimManager.py:701
-#: ../lib/python/Components/NimManager.py:762
+#: ../lib/python/Components/NimManager.py:709
+#: ../lib/python/Components/NimManager.py:770
 msgid "West"
 msgstr "Oeste"
 
-#: ../lib/python/Screens/MediaPlayer.py:51
+#: ../lib/python/Screens/MediaPlayer.py:53
 msgid "Year:"
 msgstr "Año:"
 
-#: ../lib/python/Components/NimManager.py:731
-#: ../lib/python/Components/NimManager.py:751
-#: ../lib/python/Components/NimManager.py:755
-#: ../lib/python/Components/NimManager.py:756
-#: ../lib/python/Components/NimManager.py:765
-#: ../lib/python/Components/NimManager.py:779
+#: ../lib/python/Screens/Ci.py:24 ../lib/python/Components/NimManager.py:739
+#: ../lib/python/Components/NimManager.py:759
+#: ../lib/python/Components/NimManager.py:763
+#: ../lib/python/Components/NimManager.py:764
+#: ../lib/python/Components/NimManager.py:773
 msgid "Yes"
 msgstr "Si"
 
@@ -1439,7 +1479,7 @@ msgstr "Si"
 msgid "You cannot delete this!"
 msgstr "¡No puede borrar esto!"
 
-#: ../lib/python/Screens/MediaPlayer.py:328
+#: ../lib/python/Screens/MediaPlayer.py:348
 msgid "You selected a playlist"
 msgstr "Tu seleccionaste un lista"
 
@@ -1451,23 +1491,23 @@ msgstr ""
 "El firmware del frontprocessor debe ser actualizado.\n"
 "Pulsa OK para comenzar la actualización."
 
-#: ../lib/python/Screens/ChannelSelection.py:330
+#: ../lib/python/Screens/ChannelSelection.py:357
 msgid "[bouquet edit]"
 msgstr "[editar lista]"
 
-#: ../lib/python/Screens/ChannelSelection.py:332
+#: ../lib/python/Screens/ChannelSelection.py:359
 msgid "[favourite edit]"
 msgstr "[editar favoritos]"
 
-#: ../lib/python/Screens/ChannelSelection.py:415
+#: ../lib/python/Screens/ChannelSelection.py:442
 msgid "[move mode]"
 msgstr "[modo mover]"
 
-#: ../lib/python/Screens/ChannelSelection.py:112
+#: ../lib/python/Screens/ChannelSelection.py:111
 msgid "abort bouquet edit"
 msgstr "abortar la edición de listas"
 
-#: ../lib/python/Screens/ChannelSelection.py:115
+#: ../lib/python/Screens/ChannelSelection.py:114
 msgid "abort favourites edit"
 msgstr "abortar la edición de favoritos"
 
@@ -1475,38 +1515,42 @@ msgstr "abortar la edición de favoritos"
 msgid "about to start"
 msgstr "para comenzar"
 
-#: ../lib/python/Screens/ChannelSelection.py:101
-msgid "add bouquet..."
-msgstr "añadir lista..."
+#: ../lib/python/Screens/ChannelSelection.py:93
+msgid "add bouquet"
+msgstr ""
 
-#: ../lib/python/Screens/MediaPlayer.py:277
+#: ../lib/python/Screens/MediaPlayer.py:297
 msgid "add directory to playlist"
 msgstr "añadir el directorio a la lista"
 
-#: ../lib/python/Screens/MediaPlayer.py:279
+#: ../lib/python/Screens/MediaPlayer.py:299
 msgid "add file to playlist"
 msgstr "añadir fichero a la lista"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1184
-#: ../lib/python/Screens/InfoBarGenerics.py:1186
+#: ../lib/python/Screens/ChannelSelection.py:99
+msgid "add marker"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1214
+#: ../lib/python/Screens/InfoBarGenerics.py:1216
 msgid "add recording (enter recording duration)"
 msgstr "añadir grabación (introduzca duración)"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1184
-#: ../lib/python/Screens/InfoBarGenerics.py:1186
+#: ../lib/python/Screens/InfoBarGenerics.py:1214
+#: ../lib/python/Screens/InfoBarGenerics.py:1216
 msgid "add recording (indefinitely)"
 msgstr "añadir grabación (indefinidamente)"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1184
-#: ../lib/python/Screens/InfoBarGenerics.py:1186
+#: ../lib/python/Screens/InfoBarGenerics.py:1214
+#: ../lib/python/Screens/InfoBarGenerics.py:1216
 msgid "add recording (stop after current event)"
 msgstr "añadir grabación (sólo evento actual)"
 
-#: ../lib/python/Screens/ChannelSelection.py:81
+#: ../lib/python/Screens/ChannelSelection.py:79
 msgid "add service to bouquet"
 msgstr "añadir canal a la lista"
 
-#: ../lib/python/Screens/ChannelSelection.py:83
+#: ../lib/python/Screens/ChannelSelection.py:81
 msgid "add service to favourites"
 msgstr "añadir canal a favoritos"
 
@@ -1519,27 +1563,31 @@ msgstr ""
 "el siguiente backup:\n"
 
 #: ../lib/python/Screens/MovieSelection.py:24
-#: ../lib/python/Screens/ChannelSelection.py:117
+#: ../lib/python/Screens/ChannelSelection.py:116
 msgid "back"
 msgstr "atrás"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1184
+#: ../lib/python/Screens/InfoBarGenerics.py:1214
 msgid "change recording (duration)"
 msgstr "cambiar la grabación (duración)"
 
-#: ../lib/python/Screens/ScanSetup.py:320
+#: ../lib/python/Screens/ScanSetup.py:367
 msgid "circular left"
 msgstr "circular izda"
 
-#: ../lib/python/Screens/ScanSetup.py:320
+#: ../lib/python/Screens/ScanSetup.py:367
 msgid "circular right"
 msgstr "circular dcha"
 
-#: ../lib/python/Screens/MediaPlayer.py:283
+#: ../lib/python/Screens/MediaPlayer.py:303
 msgid "clear playlist"
 msgstr "limpiar lista"
 
-#: ../lib/python/Screens/ChannelSelection.py:87
+#: ../lib/python/Screens/InfoBarGenerics.py:583
+msgid "continue"
+msgstr ""
+
+#: ../lib/python/Screens/ChannelSelection.py:85
 msgid "copy to favourites"
 msgstr "copiar a favoritos"
 
@@ -1547,7 +1595,7 @@ msgstr "copiar a favoritos"
 msgid "daily"
 msgstr "diariamente"
 
-#: ../lib/python/Screens/MediaPlayer.py:282
+#: ../lib/python/Screens/MediaPlayer.py:302
 msgid "delete"
 msgstr "borrar"
 
@@ -1555,16 +1603,16 @@ msgstr "borrar"
 msgid "delete..."
 msgstr "borrar..."
 
-#: ../lib/python/Screens/ChannelSelection.py:108
+#: ../lib/python/Screens/ChannelSelection.py:107
 msgid "disable move mode"
 msgstr "inabilitar modo movimiento"
 
 #: ../lib/python/Screens/TimerEntry.py:99
-#: ../lib/python/Screens/InfoBarGenerics.py:1184
+#: ../lib/python/Screens/InfoBarGenerics.py:1214
 msgid "do nothing"
 msgstr "no hacer nada"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1186
+#: ../lib/python/Screens/InfoBarGenerics.py:1216
 msgid "don't record"
 msgstr "no grabar"
 
@@ -1572,15 +1620,15 @@ msgstr "no grabar"
 msgid "done!"
 msgstr "¡hecho!"
 
-#: ../lib/python/Components/NimManager.py:566
+#: ../lib/python/Components/NimManager.py:570
 msgid "empty/unknown"
 msgstr "vacío/desconocido"
 
-#: ../lib/python/Screens/ChannelSelection.py:104
+#: ../lib/python/Screens/ChannelSelection.py:103
 msgid "enable bouquet edit"
 msgstr "habilitar edición de lista"
 
-#: ../lib/python/Screens/ChannelSelection.py:106
+#: ../lib/python/Screens/ChannelSelection.py:105
 msgid "enable favourite edit"
 msgstr "habilitar edición de favoritos"
 
@@ -1588,11 +1636,11 @@ msgstr "habilitar edición de favoritos"
 msgid "enable move mode"
 msgstr "habilitar modo movimiento"
 
-#: ../lib/python/Screens/ChannelSelection.py:111
+#: ../lib/python/Screens/ChannelSelection.py:110
 msgid "end bouquet edit"
 msgstr "fin de edición de listas"
 
-#: ../lib/python/Screens/ChannelSelection.py:114
+#: ../lib/python/Screens/ChannelSelection.py:113
 msgid "end favourites edit"
 msgstr "fin edición de favoritos"
 
@@ -1608,23 +1656,27 @@ msgstr "todo el directorio /etc"
 msgid "go to deep standby"
 msgstr "ir a pausa profunda"
 
-#: ../lib/python/Screens/MediaPlayer.py:284
+#: ../lib/python/Screens/InfoBar.py:62
+msgid "hear radio..."
+msgstr ""
+
+#: ../lib/python/Screens/MediaPlayer.py:304
 msgid "hide player"
 msgstr "ocultar reproductor"
 
-#: ../lib/python/Screens/ScanSetup.py:320
+#: ../lib/python/Screens/ScanSetup.py:367
 msgid "horizontal"
 msgstr ""
 
-#: ../lib/python/Screens/Ci.py:295 ../lib/python/Screens/Ci.py:315
+#: ../lib/python/Screens/Ci.py:318 ../lib/python/Screens/Ci.py:340
 msgid "init module"
 msgstr "iniciar módulo"
 
-#: ../lib/python/Screens/InfoBar.py:94
+#: ../lib/python/Screens/InfoBar.py:96
 msgid "leave movie player..."
 msgstr "salir del reproductor de películas..."
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1245
+#: ../lib/python/Screens/InfoBarGenerics.py:1275
 msgid "left"
 msgstr ""
 
@@ -1633,7 +1685,7 @@ msgstr ""
 msgid "list"
 msgstr "lista"
 
-#: ../lib/python/Components/NimManager.py:699
+#: ../lib/python/Components/NimManager.py:707
 msgid "manual"
 msgstr ""
 
@@ -1650,16 +1702,16 @@ msgstr "canal siguiente"
 msgid "next channel in history"
 msgstr "canal siguiente en historia"
 
-#: ../lib/python/Screens/ScanSetup.py:299
-#: ../lib/python/Screens/ScanSetup.py:331
-#: ../lib/python/Screens/ScanSetup.py:345
-#: ../lib/python/Screens/ScanSetup.py:350
-#: ../lib/python/Screens/ScanSetup.py:647
-#: ../lib/python/Screens/ScanSetup.py:649
-#: ../lib/python/Screens/ScanSetup.py:658
+#: ../lib/python/Screens/ScanSetup.py:346
+#: ../lib/python/Screens/ScanSetup.py:378
+#: ../lib/python/Screens/ScanSetup.py:392
+#: ../lib/python/Screens/ScanSetup.py:397
+#: ../lib/python/Screens/ScanSetup.py:689
+#: ../lib/python/Screens/ScanSetup.py:691
+#: ../lib/python/Screens/ScanSetup.py:698
 #: ../lib/python/Screens/TimerEntry.py:116
 #: ../lib/python/Components/Network.py:145
-#: ../lib/python/Components/RecordingConfig.py:7
+#: ../lib/python/Components/RecordingConfig.py:8
 msgid "no"
 msgstr ""
 
@@ -1667,7 +1719,7 @@ msgstr ""
 msgid "no HDD found"
 msgstr "disco no encontrado"
 
-#: ../lib/python/Screens/Ci.py:293 ../lib/python/Screens/Ci.py:313
+#: ../lib/python/Screens/Ci.py:316 ../lib/python/Screens/Ci.py:338
 msgid "no module found"
 msgstr "módulo no encontrado"
 
@@ -1675,15 +1727,15 @@ msgstr "módulo no encontrado"
 msgid "none"
 msgstr "ninguno"
 
-#: ../lib/python/Screens/ScanSetup.py:318
-#: ../lib/python/Screens/ScanSetup.py:327
-#: ../lib/python/Screens/ScanSetup.py:335
+#: ../lib/python/Screens/ScanSetup.py:365
+#: ../lib/python/Screens/ScanSetup.py:374
+#: ../lib/python/Screens/ScanSetup.py:382
 msgid "off"
 msgstr ""
 
-#: ../lib/python/Screens/ScanSetup.py:318
-#: ../lib/python/Screens/ScanSetup.py:327
-#: ../lib/python/Screens/ScanSetup.py:335
+#: ../lib/python/Screens/ScanSetup.py:365
+#: ../lib/python/Screens/ScanSetup.py:374
+#: ../lib/python/Screens/ScanSetup.py:382
 msgid "on"
 msgstr ""
 
@@ -1696,14 +1748,26 @@ msgid "only /etc/enigma2 directory"
 msgstr "solo el directorio /etc/enigma2"
 
 #: ../lib/python/Screens/InfoBarGenerics.py:263
-msgid "open service list"
-msgstr "abrir lista de canales"
+msgid "open servicelist"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:258
+msgid "open servicelist(down)"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:257
+msgid "open servicelist(up)"
+msgstr ""
 
 #: ../lib/python/Components/ServiceScan.py:75
 msgid "pass"
 msgstr "pasa"
 
-#: ../lib/python/Screens/Ci.py:79
+#: ../lib/python/Screens/InfoBarGenerics.py:582
+msgid "pause"
+msgstr ""
+
+#: ../lib/python/Screens/Ci.py:86
 msgid "please press OK when ready"
 msgstr "pulse OK cuando esté preparado"
 
@@ -1723,27 +1787,24 @@ msgstr "grabar"
 msgid "recording..."
 msgstr "grabando..."
 
-#: ../lib/python/Screens/ChannelSelection.py:89
+#: ../lib/python/Screens/ChannelSelection.py:87
 msgid "remove all new found flags"
 msgstr "borrar todas marcas encontradas"
 
-#: ../lib/python/Screens/ChannelSelection.py:95
-msgid "remove bouquet"
-msgstr "borrar lista"
+#: ../lib/python/Screens/ChannelSelection.py:89
+#: ../lib/python/Screens/ChannelSelection.py:94
+msgid "remove entry"
+msgstr ""
 
-#: ../lib/python/Screens/ChannelSelection.py:93
+#: ../lib/python/Screens/ChannelSelection.py:91
 msgid "remove new found flag"
 msgstr "borrar nueva marca encontrada"
 
-#: ../lib/python/Screens/ChannelSelection.py:91
-msgid "remove service"
-msgstr "borrar canal"
-
 #: ../lib/python/Screens/TimerEntry.py:100
 msgid "repeated"
 msgstr "repetido"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1245
+#: ../lib/python/Screens/InfoBarGenerics.py:1275
 msgid "right"
 msgstr "derecha"
 
@@ -1785,27 +1846,43 @@ msgstr ""
 msgid "scan state"
 msgstr "estado de la búsqueda"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:374
+#: ../lib/python/Screens/InfoBarGenerics.py:394
 msgid "show EPG..."
 msgstr "mostrar EPG..."
 
-#: ../lib/python/Screens/InfoBarGenerics.py:336
+#: ../lib/python/Screens/InfoBarGenerics.py:356
 msgid "show event details"
 msgstr "mostrar detalles del evento"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1245
+#: ../lib/python/Screens/InfoBarGenerics.py:588
+msgid "skip backward"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:585
+msgid "skip forward"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:897
+msgid "start timeshift"
+msgstr ""
+
+#: ../lib/python/Screens/InfoBarGenerics.py:1275
 msgid "stereo"
 msgstr "stéreo"
 
-#: ../lib/python/Screens/InfoBarGenerics.py:1184
+#: ../lib/python/Screens/InfoBarGenerics.py:1214
 msgid "stop recording"
 msgstr "parar grabación"
 
-#: ../lib/python/Screens/MediaPlayer.py:281
+#: ../lib/python/Screens/InfoBarGenerics.py:898
+msgid "stop timeshift"
+msgstr ""
+
+#: ../lib/python/Screens/MediaPlayer.py:301
 msgid "switch to filelist"
 msgstr "cambiar a lista de ficheros"
 
-#: ../lib/python/Screens/MediaPlayer.py:275
+#: ../lib/python/Screens/MediaPlayer.py:295
 msgid "switch to playlist"
 msgstr "cambiar a lista"
 
@@ -1825,10 +1902,18 @@ msgstr "servicio desconocido"
 msgid "user defined"
 msgstr "definido por el usuario"
 
-#: ../lib/python/Screens/ScanSetup.py:320
+#: ../lib/python/Screens/ScanSetup.py:367
 msgid "vertical"
 msgstr ""
 
+#: ../lib/python/Screens/InfoBarGenerics.py:1031
+msgid "view extensions..."
+msgstr ""
+
+#: ../lib/python/Screens/InfoBar.py:61
+msgid "view recordings..."
+msgstr ""
+
 #: ../lib/python/Components/TimerList.py:57
 msgid "waiting"
 msgstr "esperando"
@@ -1837,21 +1922,21 @@ msgstr "esperando"
 msgid "weekly"
 msgstr "semanalmente"
 
-#: ../lib/python/Screens/ScanSetup.py:299
-#: ../lib/python/Screens/ScanSetup.py:331
-#: ../lib/python/Screens/ScanSetup.py:345
-#: ../lib/python/Screens/ScanSetup.py:350
-#: ../lib/python/Screens/ScanSetup.py:647
-#: ../lib/python/Screens/ScanSetup.py:649
-#: ../lib/python/Screens/ScanSetup.py:658
+#: ../lib/python/Screens/ScanSetup.py:346
+#: ../lib/python/Screens/ScanSetup.py:378
+#: ../lib/python/Screens/ScanSetup.py:392
+#: ../lib/python/Screens/ScanSetup.py:397
+#: ../lib/python/Screens/ScanSetup.py:689
+#: ../lib/python/Screens/ScanSetup.py:691
+#: ../lib/python/Screens/ScanSetup.py:698
 #: ../lib/python/Screens/TimerEntry.py:116
 #: ../lib/python/Components/Network.py:145
-#: ../lib/python/Components/RecordingConfig.py:7
+#: ../lib/python/Components/RecordingConfig.py:8
 msgid "yes"
 msgstr "si"
 
-#: ../lib/python/Screens/ScanSetup.py:299
-#: ../lib/python/Screens/ScanSetup.py:647
+#: ../lib/python/Screens/ScanSetup.py:346
+#: ../lib/python/Screens/ScanSetup.py:689
 msgid "yes (keep feeds)"
 msgstr "si (conserva feeds)"
 
@@ -1883,10 +1968,6 @@ msgstr "Configuración de red"
 msgid "Games / Plugins"
 msgstr "Juegos / Plugins"
 
-#: ../data/
-msgid "Hide error windows"
-msgstr "Ocultar ventanas de error"
-
 #: ../data/
 msgid "help..."
 msgstr "ayuda..."
@@ -1929,7 +2010,7 @@ msgid "TV System"
 msgstr "Sistema de TV"
 
 #: ../data/
-msgid "#ffffff"
+msgid "Alternative radio mode"
 msgstr ""
 
 #: ../data/
@@ -1948,6 +2029,10 @@ msgstr ""
 msgid "Deep Standby"
 msgstr "Reposo profundo"
 
+#: ../data/
+msgid "Show positioner movement"
+msgstr ""
+
 #: ../data/
 msgid "Tuner Slot"
 msgstr "Slot del sintonizador"
@@ -1968,21 +2053,13 @@ msgstr ""
 "Use las teclas arriba/abajo de su mando para seleccionar una opción. "
 "Después, pulse OK."
 
-#: ../data/
-msgid "No, just start my dreambox"
-msgstr "No, sólo arranca mi dreambox"
-
-#: ../data/
-msgid "Show Satposition"
-msgstr "Mostrar la posición del satélite"
-
 #: ../data/
 msgid "Do you want to view a tutorial?"
 msgstr "¿Quiere ver un tutorial?"
 
 #: ../data/
-msgid "Setup"
-msgstr "Config"
+msgid "No, do nothing."
+msgstr "No hacer nada"
 
 #: ../data/
 msgid "#000000"
@@ -2009,8 +2086,8 @@ msgid "Sat / Dish Setup"
 msgstr "Sat / Config Ant"
 
 #: ../data/
-msgid "Visualize positioner movement"
-msgstr "Visualizar movimiento del motor"
+msgid "#ffffff"
+msgstr ""
 
 #: ../data/
 msgid ""
@@ -2021,21 +2098,13 @@ msgstr ""
 "Pulse OK para comentar el backup ahora."
 
 #: ../data/
-msgid "Audio / Video"
-msgstr "Sonido / Video"
-
-#: ../data/
-msgid "The wizard is finished now."
-msgstr "El asistente ha finalizado ahora."
+msgid "Mute"
+msgstr "Silencio"
 
 #: ../data/
 msgid "Service Searching"
 msgstr "Buscando Canal"
 
-#: ../data/
-msgid "Mute"
-msgstr "Silencio"
-
 #: ../data/
 msgid ""
 "Welcome to the Image upgrade wizard. The wizard will assist you in upgrading "
@@ -2052,40 +2121,50 @@ msgid "Keyboard Map"
 msgstr "Mapa del teclado"
 
 #: ../data/
-msgid "Keyboard Setup"
-msgstr "Config Teclado"
+msgid "Enable multiple bouquets"
+msgstr ""
 
 #: ../data/
-msgid "Dish"
-msgstr "Antena"
+msgid "Keyboard Setup"
+msgstr "Config Teclado"
 
 #: ../data/
-msgid "Record Splitsize"
-msgstr "Tamaño de partir grabación"
+msgid ""
+"Use the left and right buttons to change an option.\n"
+"\n"
+"Please set up tuner A"
+msgstr ""
+"Use los botones izq/der para cambiar una opción.\n"
+"\n"
+"Por favor configure tuner A"
 
 #: ../data/
-msgid "Auto show inforbar"
-msgstr "Auto mostrar barra info"
+msgid "Dish"
+msgstr "Antena"
 
 #: ../data/
 msgid "Margin after record"
 msgstr "Margen despues de grabar"
 
 #: ../data/
-msgid "Network"
-msgstr "Red"
-
-#: ../data/
-msgid "Invert"
-msgstr "Invertir"
+msgid "#ffffffff"
+msgstr ""
 
 #: ../data/
 msgid "System"
 msgstr "Sistema"
 
 #: ../data/
-msgid "use power delta"
-msgstr "use potencia delta"
+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 ""
+"Gracias por usar el asistente. Tu dream está ahora listo para su uso.\n"
+"Por favor, pulse OK para comenzar tu Dreambox."
 
 #: ../data/
 msgid "Test mode"
@@ -2096,29 +2175,24 @@ msgid "Manual Scan"
 msgstr "Búsqueda Manual"
 
 #: ../data/
-msgid ""
-"Welcome.\n"
-"\n"
-"This start wizard will guide you through the basic setup of your Dreambox.\n"
-"Press the OK button on your remote control to move to the next step."
-msgstr ""
-"Bienvenido.\n"
-"\n"
-"Este asistente le guiará a través de una configuración básica de su "
-"Dreambox.\n"
-"Pulse el botón OK de su mando para ir al siguiente paso."
+msgid "Timer Edit"
+msgstr "Editar Hora"
 
 #: ../data/
 msgid "RC Menu"
 msgstr "Menú RC"
 
 #: ../data/
-msgid "SNR:"
+msgid "No, just start my dreambox"
+msgstr "No, sólo arranca mi dreambox"
+
+#: ../data/
+msgid "Network..."
 msgstr ""
 
 #: ../data/
-msgid "Subservices"
-msgstr "Subservicios"
+msgid "Tuner configuration"
+msgstr ""
 
 #: ../data/
 msgid "select Slot"
@@ -2144,14 +2218,14 @@ msgstr "Selección EPG"
 msgid "Exit the wizard"
 msgstr "Salir del asistente"
 
-#: ../data/
-msgid "Fast zapping"
-msgstr "Zapin rápido"
-
 #: ../data/
 msgid "OSD Settings"
 msgstr "Config OSD"
 
+#: ../data/
+msgid "RF output"
+msgstr ""
+
 #: ../data/
 msgid "Brightness"
 msgstr "Brillo"
@@ -2160,6 +2234,10 @@ msgstr "Brillo"
 msgid "Standby"
 msgstr "Reposo"
 
+#: ../data/
+msgid "Yes, do another manual scan now"
+msgstr "Si, hacer otra búsqueda manual ahora"
+
 #: ../data/
 msgid "Activate network settings"
 msgstr "Activar configuración de red"
@@ -2180,10 +2258,6 @@ msgstr "Grabar"
 msgid "Yes, view the tutorial"
 msgstr "Si, ver el tutorial"
 
-#: ../data/
-msgid "UHF Modulator"
-msgstr "Modulador UHF"
-
 #: ../data/
 msgid "Color Format"
 msgstr "Formato de Color"
@@ -2193,13 +2267,17 @@ msgid "#f23d21"
 msgstr ""
 
 #: ../data/
-msgid "Enigma1 like radiomode"
-msgstr "Modoradio como Enigma1"
+msgid "Plugin browser"
+msgstr "Plugin navegador"
 
 #: ../data/
 msgid "#80000000"
 msgstr ""
 
+#: ../data/
+msgid "SNR:"
+msgstr ""
+
 #: ../data/
 msgid "Timeshift"
 msgstr ""
@@ -2209,12 +2287,8 @@ msgid "Downloadable plugins"
 msgstr "Plugins descargables"
 
 #: ../data/
-msgid "Do you want to view a cutlist tutorial?"
-msgstr ""
-
-#: ../data/
-msgid "LCD"
-msgstr ""
+msgid "Subservices"
+msgstr "Subservicios"
 
 #: ../data/
 msgid "Timezone"
@@ -2237,8 +2311,8 @@ msgid "Common Interface"
 msgstr "Interface común"
 
 #: ../data/
-msgid "Ask before zapping"
-msgstr "Preguntar antes de zapear"
+msgid "Language..."
+msgstr ""
 
 #: ../data/
 msgid ""
@@ -2252,10 +2326,6 @@ msgstr ""
 msgid "A/V Settings"
 msgstr "Config A/V"
 
-#: ../data/
-msgid "Usage Settings"
-msgstr "Configuración de uso"
-
 #: ../data/
 msgid ""
 "By pressing the OK Button on your remote control, the info bar is being "
@@ -2268,8 +2338,8 @@ msgid "Service scan"
 msgstr "Buscar canales"
 
 #: ../data/
-msgid "Yes, do another manual scan now"
-msgstr "Si, hacer otra búsqueda manual ahora"
+msgid "The wizard is finished now."
+msgstr "El asistente ha finalizado ahora."
 
 #: ../data/
 msgid "LCD Setup"
@@ -2331,6 +2401,14 @@ msgstr "Config Red"
 msgid "Somewhere else"
 msgstr "En alguna parte"
 
+#: ../data/
+msgid "Do you want to do a service scan?"
+msgstr "¿Quiere hacer una búsqueda de canales?"
+
+#: ../data/
+msgid "Timer log"
+msgstr "Log de grabación"
+
 #: ../data/
 msgid ""
 "Your backup succeeded. We will now continue to explain the further upgrade "
@@ -2347,14 +2425,6 @@ msgstr "PiPConfig"
 msgid "Menu"
 msgstr "Menú"
 
-#: ../data/
-msgid "Plugin browser"
-msgstr "Plugin navegador"
-
-#: ../data/
-msgid "Parental Lock"
-msgstr "Bloqueo adultos"
-
 #: ../data/
 msgid "Restart"
 msgstr "Reiniciar"
@@ -2426,10 +2496,6 @@ msgstr "Tu dreambox está reiniciando. Espera un momento..."
 msgid "WSS on 4:3"
 msgstr "WSS en 4:3"
 
-#: ../data/
-msgid "Skip confirmations"
-msgstr "Saltar confirmaciones"
-
 #: ../data/
 msgid "Choose bouquet"
 msgstr "Elegir lista"
@@ -2463,8 +2529,8 @@ msgid "USB"
 msgstr ""
 
 #: ../data/
-msgid "Timer log"
-msgstr "Log de grabación"
+msgid "Invert display"
+msgstr ""
 
 #: ../data/
 msgid "Do you want to restore your settings?"
@@ -2474,14 +2540,6 @@ msgstr "¿Quiere restaurar su configuración?"
 msgid "Please set up tuner B"
 msgstr "Por favor, configure 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 ""
-"Gracias por usar el asistente. Tu dream está ahora listo para su uso.\n"
-"Por favor, pulse OK para comenzar tu Dreambox."
-
 #: ../data/
 msgid "Delay"
 msgstr "Retardo"
@@ -2490,39 +2548,17 @@ msgstr "Retardo"
 msgid "Select HDD"
 msgstr "Seleccionar disco duro"
 
-#: ../data/
-msgid "#ffffffff"
-msgstr ""
-
-#: ../data/
-msgid "Setup Lock"
-msgstr "Bloquear config"
-
 #: ../data/
 msgid "Aspect Ratio"
 msgstr "Relación de aspecto"
 
 #: ../data/
-msgid "Expert Setup"
-msgstr "Config experta"
-
-#: ../data/
-msgid "Language"
-msgstr "Idioma"
-
-#: ../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 ""
-"Use los botones izq/der para cambiar una opción.\n"
-"\n"
-"Por favor configure tuner A"
 
 #: ../data/
-msgid "Parental Control"
-msgstr "Control Adultos"
+msgid "Customize"
+msgstr ""
 
 #: ../data/
 msgid "#389416"
@@ -2544,10 +2580,6 @@ msgstr "Seleccionar una película"
 msgid "Volume"
 msgstr "Volumen"
 
-#: ../data/
-msgid "Multi bouquets"
-msgstr "Multi listas"
-
 #: ../data/
 msgid "#33294a6b"
 msgstr ""
@@ -2557,12 +2589,21 @@ msgid "Alpha"
 msgstr ""
 
 #: ../data/
-msgid "Timer Edit"
-msgstr "Editar Hora"
+msgid ""
+"Welcome.\n"
+"\n"
+"This start wizard will guide you through the basic setup of your Dreambox.\n"
+"Press the OK button on your remote control to move to the next step."
+msgstr ""
+"Bienvenido.\n"
+"\n"
+"Este asistente le guiará a través de una configuración básica de su "
+"Dreambox.\n"
+"Pulse el botón OK de su mando para ir al siguiente paso."
 
 #: ../data/
-msgid "No, do nothing."
-msgstr "No hacer nada"
+msgid "Setup"
+msgstr "Config"
 
 #: ../data/
 msgid "This is unsupported at the moment."
@@ -2597,8 +2638,8 @@ msgid "What do you want to scan?"
 msgstr "¿Qué quieres buscar?"
 
 #: ../data/
-msgid "Usage settings"
-msgstr "Config de uso"
+msgid "Now Playing"
+msgstr ""
 
 #: ../data/
 msgid "Channellist menu"
@@ -2609,8 +2650,8 @@ msgid "Audio"
 msgstr "Sonido"
 
 #: ../data/
-msgid "Do you want to do a service scan?"
-msgstr "¿Quiere hacer una búsqueda de canales?"
+msgid "Harddisk..."
+msgstr ""
 
 #: ../data/
 msgid "NOW"
@@ -2620,10 +2661,6 @@ msgstr "AHORA"
 msgid "Yes, perform a shutdown now."
 msgstr "Si, realiza el apagado ahora."
 
-#: ../data/
-msgid "Satelliteconfig"
-msgstr "Configurar satélite"
-
 #: ../data/
 msgid "#0064c7"
 msgstr ""
@@ -2636,5 +2673,89 @@ msgstr "Reproductor"
 msgid "Do you want to do another manual service scan?"
 msgstr "¿Quieres hacer otra búsqueda manual?"
 
+#~ msgid "add bouquet..."
+#~ msgstr "añadir lista..."
+
+#~ msgid "remove bouquet"
+#~ msgstr "borrar lista"
+
+#~ msgid "remove service"
+#~ msgstr "borrar canal"
+
+#~ msgid "Hide error windows"
+#~ msgstr "Ocultar ventanas de error"
+
+#~ msgid "Show Satposition"
+#~ msgstr "Mostrar la posición del satélite"
+
+#~ msgid "Visualize positioner movement"
+#~ msgstr "Visualizar movimiento del motor"
+
+#~ msgid "Audio / Video"
+#~ msgstr "Sonido / Video"
+
+#~ msgid "Record Splitsize"
+#~ msgstr "Tamaño de partir grabación"
+
+#~ msgid "Auto show inforbar"
+#~ msgstr "Auto mostrar barra info"
+
+#~ msgid "Network"
+#~ msgstr "Red"
+
+#~ msgid "Invert"
+#~ msgstr "Invertir"
+
+#~ msgid "use power delta"
+#~ msgstr "use potencia delta"
+
+#~ msgid "Fast zapping"
+#~ msgstr "Zapin rápido"
+
+#~ msgid "Usage Settings"
+#~ msgstr "Configuración de uso"
+
+#~ msgid "UHF Modulator"
+#~ msgstr "Modulador UHF"
+
+#~ msgid "Enigma1 like radiomode"
+#~ msgstr "Modoradio como Enigma1"
+
+#~ msgid "Ask before zapping"
+#~ msgstr "Preguntar antes de zapear"
+
+#~ msgid "Parental Lock"
+#~ msgstr "Bloqueo adultos"
+
+#~ msgid "Skip confirmations"
+#~ msgstr "Saltar confirmaciones"
+
+#~ msgid "Setup Lock"
+#~ msgstr "Bloquear config"
+
+#~ msgid "Expert Setup"
+#~ msgstr "Config experta"
+
+#~ msgid "Language"
+#~ msgstr "Idioma"
+
+#~ msgid "Parental Control"
+#~ msgstr "Control Adultos"
+
+#~ msgid "Multi bouquets"
+#~ msgstr "Multi listas"
+
+#~ msgid "Usage settings"
+#~ msgstr "Config de uso"
+
+#~ msgid "Timeshift not possible!"
+#~ msgstr "¡Pausa no posible!"
+
+#~ msgid "open service list"
+#~ msgstr "abrir lista de canales"
+
+#~ msgid "Satelliteconfig"
+#~ msgstr "Configurar satélite"
+
 #~ msgid "Timeshifting"
 #~ msgstr "Pausa"