From 77601f492df7c37a2dd5b98f05a4bbdaee8dd68e Mon Sep 17 00:00:00 2001
From: Daniel Thor Kristjansson <danielk@cuymedia.net>
Date: Fri, 18 May 2012 18:14:07 -0400
Subject: [PATCH 1/5] merged devel/rtp #b43eb75045

---
 mythplugins/mytharchive/i18n/mytharchive_es_es.ts |   18 +
 mythplugins/mythmusic/mythmusic/metadata.cpp      |    2 +-
 mythplugins/mythmusic/mythmusic/musiccommon.cpp   |   24 +
 mythtv/i18n/mythfrontend_es_es.ts                 |15417 ++++++++++++++++++++-
 mythtv/libs/libmythtv/tv_play.cpp                 |   31 +
 5 files changed, 15425 insertions(+), 67 deletions(-)

diff --git a/mythplugins/mytharchive/i18n/mytharchive_es_es.ts b/mythplugins/mytharchive/i18n/mytharchive_es_es.ts
index 9387d6d..42f42c4 100644
--- a/mythplugins/mytharchive/i18n/mytharchive_es_es.ts
+++ b/mythplugins/mytharchive/i18n/mytharchive_es_es.ts
@@ -1312,17 +1312,35 @@ Por Favor, Espere...</translation>
 <context>
     <name>ThumbFinder</name>
     <message>
+<<<<<<< HEAD
         <location filename="../mytharchive/thumbfinder.cpp" line="925"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../mytharchive/thumbfinder.cpp" line="939"/>
+=======
+        <location filename="../mytharchive/thumbfinder.cpp" line="938"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Exit, Save Thumbnails</source>
         <translation>Salir, Guardar Miniaturas</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../mytharchive/thumbfinder.cpp" line="926"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../mytharchive/thumbfinder.cpp" line="940"/>
+=======
+        <location filename="../mytharchive/thumbfinder.cpp" line="939"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Exit, Don&apos;t Save Thumbnails</source>
         <translation>Salir, No Guardar Miniaturas</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../mytharchive/thumbfinder.cpp" line="918"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../mytharchive/thumbfinder.cpp" line="932"/>
+=======
+        <location filename="../mytharchive/thumbfinder.cpp" line="931"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Menu</source>
         <translation>Menú</translation>
     </message>
diff --git a/mythplugins/mythmusic/mythmusic/metadata.cpp b/mythplugins/mythmusic/mythmusic/metadata.cpp
index 5cf7094..ebcd1f8 100644
--- a/mythplugins/mythmusic/mythmusic/metadata.cpp
+++ b/mythplugins/mythmusic/mythmusic/metadata.cpp
@@ -13,7 +13,7 @@
 #include <mythprogressdialog.h>
 #include <mythdownloadmanager.h>
 #include <mythlogging.h>
-#include <mythdate.h>
+#include <mythmiscutil.h>
 
 // mythmusic
 #include "metadata.h"
diff --git a/mythplugins/mythmusic/mythmusic/musiccommon.cpp b/mythplugins/mythmusic/mythmusic/musiccommon.cpp
index cc121d5..2f8b5d3 100644
--- a/mythplugins/mythmusic/mythmusic/musiccommon.cpp
+++ b/mythplugins/mythmusic/mythmusic/musiccommon.cpp
@@ -728,6 +728,7 @@ bool MusicCommon::keyPressEvent(QKeyEvent *e)
                     m_movingTracksState->DisplayState((m_moveTrackMode ? "on" : "off"));
             }
         }
+<<<<<<< HEAD
         else if (action == "SWITCHTOPLAYLIST" && m_currentView != MV_PLAYLIST)
             switchView(MV_PLAYLIST);
         else if (action == "SWITCHTOPLAYLISTEDITORTREE" && m_currentView != MV_PLAYLISTEDITORTREE)
@@ -750,6 +751,29 @@ bool MusicCommon::keyPressEvent(QKeyEvent *e)
             gPlayer->toggleRepeatMode();
             updateRepeatMode();
         }
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+=======
+        else if (action == "SWITCHTOPLAYLIST" && m_currentView != MV_PLAYLIST)
+            switchView(MV_PLAYLIST);
+        else if (action == "SWITCHTOPLAYLISTEDITORTREE" && m_currentView != MV_PLAYLISTEDITORTREE)
+            switchView(MV_PLAYLISTEDITORTREE);
+        else if (action == "SWITCHTOPLAYLISTEDITORGALLERY" && m_currentView != MV_PLAYLISTEDITORGALLERY)
+            switchView(MV_PLAYLISTEDITORGALLERY);
+        else if (action == "SWITCHTOSEARCH" && m_currentView != MV_SEARCH)
+            switchView(MV_SEARCH);
+        else if (action == "SWITCHTOVISUALISER" && m_currentView != MV_VISUALIZER)
+            switchView(MV_VISUALIZER);
+        else if (action == "TOGGLESHUFFLE")
+        {
+            gPlayer->toggleShuffleMode();
+            updateShuffleMode(true);
+        }
+        else if (action == "TOGGLEREPEAT")
+        {
+            gPlayer->toggleRepeatMode();
+            updateRepeatMode();
+        }
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         else
             handled = false;
     }
diff --git a/mythtv/i18n/mythfrontend_es_es.ts b/mythtv/i18n/mythfrontend_es_es.ts
index 2552572..5788b47 100644
--- a/mythtv/i18n/mythfrontend_es_es.ts
+++ b/mythtv/i18n/mythfrontend_es_es.ts
@@ -109,14 +109,34 @@
         <translation>Boletín</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/cc608decoder.cpp" line="1535"/>
         <source>Business</source>
         <translation>Negocios</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/backendselect.cpp" line="286"/>
+        <source>Shall I attempt to connect to this host with default database parameters?</source>
+        <translation>¿Debo intentar conectar con este nodo usando los parámetros predeterminados de la base de datos?</translation>
+=======
+        <location filename="../libs/libmyth/backendselect.cpp" line="283"/>
+        <source>Shall I attempt to connect to this host with default database parameters?</source>
+        <translation>¿Debo intentar conectar con este nodo usando los parámetros predeterminados de la base de datos?</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/cc608decoder.cpp" line="1537"/>
         <source>Classical</source>
         <translation>Clásicos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/backendselect.cpp" line="346"/>
+        <source>Please enter the backend access PIN</source>
+        <translation>Por favor, introduzca el PIN de acceso al servidor</translation>
+=======
+        <location filename="../libs/libmyth/backendselect.cpp" line="343"/>
+        <source>Please enter the backend access PIN</source>
+        <translation>Por favor, introduzca el PIN de acceso al servidor</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythtv/cc608decoder.cpp" line="1539"/>
@@ -1701,6 +1721,7 @@
 <context>
     <name>CetonDeviceID</name>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="1973"/>
         <source>Device ID</source>
         <translation>ID del Dispositivo</translation>
@@ -1719,18 +1740,59 @@
         <location filename="../programs/mythtv-setup/channeleditor.cpp" line="312"/>
         <source>Channel Name</source>
         <translation>Nombre de Canal</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1397"/>
+        <source>Change Channel</source>
+        <translation>Cambiar Canal</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1393"/>
+        <source>Record</source>
+        <translation>Grabar</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="588"/>
+        <source>Guide Options</source>
+        <translation>Opciones de la Guía</translation>
+=======
+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="588"/>
+        <source>Guide Options</source>
+        <translation>Opciones de la Guía</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/channeleditor.cpp" line="107"/>
         <source>Delete all channels on currently selected source(s).</source>
         <translation>Eliminar todos los canales en la(s) fuente(s) seleccionada(s).</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="599"/>
+        <source>Change to Channel</source>
+        <translation>Cambiar al Canal</translation>
+=======
+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="599"/>
+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1397"/>
+        <source>Change to Channel</source>
+        <translation>Cambiar al Canal</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/channeleditor.cpp" line="111"/>
         <location filename="../programs/mythtv-setup/channeleditor.cpp" line="269"/>
         <location filename="../programs/mythtv-setup/channeleditor.cpp" line="317"/>
         <source>Channel Number</source>
         <translation>Número de Canal</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="601"/>
+        <source>Record This</source>
+        <translation>Grabar Éste</translation>
+=======
+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="601"/>
+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1393"/>
+        <source>Record This</source>
+        <translation>Grabar Éste</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../programs/mythtv-setup/channeleditor.cpp" line="118"/>
@@ -1864,114 +1926,314 @@
 <context>
     <name>ChannelRecPriority</name>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/channelrecpriority.cpp" line="165"/>
         <source>Channel Options</source>
         <translation>Opciones de Canales</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5219"/>
+        <source>Commercials are flagged</source>
+        <translation>Los anuncios han sido marcados</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5242"/>
+        <source>Commercials are flagged</source>
+        <translation>Los anuncios han sido marcados</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/channelrecpriority.cpp" line="181"/>
         <source>Program List</source>
         <translation>Lista de Programas</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5220"/>
+        <source>An editing cutlist is present</source>
+        <translation>Hay una lista de cortes en edición</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5243"/>
+        <source>An editing cutlist is present</source>
+        <translation>Hay una lista de cortes en edición</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>ChannelScanner</name>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="178"/>
         <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="211"/>
         <source>Error tuning to transport</source>
         <translation>Error al sintonizar el transporte</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5221"/>
+        <source>The program is able to auto-expire</source>
+        <translation>El programa puede autoexpirar</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5244"/>
+        <source>The program is able to auto-expire</source>
+        <translation>El programa puede autoexpirar</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="233"/>
         <source>Programmer Error: Failed to handle tune complete.</source>
         <translation>Error del Programador: Fallo al tratar de completar la sintonización.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5222"/>
+        <source>Commercials are being flagged</source>
+        <translation>Se están marcando los anuncios</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5245"/>
+        <source>Commercials are being flagged</source>
+        <translation>Se están marcando los anuncios</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="266"/>
         <source>Failed to parse &apos;%1&apos;</source>
         <translation>Fallo al analizar &apos;%1&apos;</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5223"/>
+        <source>A bookmark is set</source>
+        <translation>Marcador situado</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5246"/>
+        <source>A bookmark is set</source>
+        <translation>Marcador situado</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="268"/>
         <source>Programmer Error : incorrect card type</source>
         <translation>Error del Programador: tipo de tarjeta incorrecto</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5225"/>
+        <source>Recording is in use</source>
+        <translation>La grabación está en uso</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5248"/>
+        <source>Recording is in use</source>
+        <translation>La grabación está en uso</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="269"/>
         <source>Failed to open &apos;%1&apos;</source>
         <translation>Fallo al abrir &apos;%1&apos;</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5226"/>
+        <source>Recording has been transcoded</source>
+        <translation>La grabación ha sido transcodificada</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5249"/>
+        <source>Recording has been transcoded</source>
+        <translation>La grabación ha sido transcodificada</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="296"/>
         <source>Error starting scan</source>
         <translation>Error al iniciar la exploración</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5229"/>
+        <source>Recording is in Mono</source>
+        <translation>Grabación en Mono</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5252"/>
+        <source>Recording is in Mono</source>
+        <translation>Grabación en Mono</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="317"/>
         <source>Programmer Error: No Device</source>
         <translation>Error del Programador: No hay dispositivos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5230"/>
+        <source>Recording is in Stereo</source>
+        <translation>Grabación en Estéreo</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5253"/>
+        <source>Recording is in Stereo</source>
+        <translation>Grabación en Estéreo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="377"/>
         <source>Programmer Error: Channel not created</source>
         <translation>Error del Programador: Canal no creado</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5231"/>
+        <source>Recording is in Surround Sound</source>
+        <translation>Grabación en Sonido Surround</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5254"/>
+        <source>Recording is in Surround Sound</source>
+        <translation>Grabación en Sonido Surround</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="388"/>
         <source>Channel could not be opened.</source>
         <translation>No fue posible abrir el canal.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5232"/>
+        <source>Recording is in Dolby Surround Sound</source>
+        <translation>Grabación en Sonido Dolby Surround</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5255"/>
+        <source>Recording is in Dolby Surround Sound</source>
+        <translation>Grabación en Sonido Dolby Surround</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>ChannelScannerGUI</name>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanner_gui.cpp" line="62"/>
         <source>Scanning</source>
         <translation>Explorando</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5234"/>
+        <source>Recording is Closed Captioned</source>
+        <translation>Grabación con Subtítulos</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5257"/>
+        <source>Recording is Closed Captioned</source>
+        <translation>Grabación con Subtítulos</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanner_gui.cpp" line="158"/>
         <source>ScanWizard</source>
         <translation>Asistente de Exploración</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5235"/>
+        <source>Recording has Subtitles Available</source>
+        <translation>La grabación tiene Subtítulos Disponibles</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5258"/>
+        <source>Recording has Subtitles Available</source>
+        <translation>La grabación tiene Subtítulos Disponibles</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>ChannelScannerGUIScanPane</name>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanner_gui_scan_pane.cpp" line="41"/>
         <source>Scan Progress</source>
         <translation>Progreso de la Exploración</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5236"/>
+        <source>Recording is Subtitled</source>
+        <translation>Grabación Subtitulada</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5259"/>
+        <source>Recording is Subtitled</source>
+        <translation>Grabación Subtitulada</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanner_gui_scan_pane.cpp" line="46"/>
         <source>Status</source>
         <translation>Estado</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5238"/>
+        <source>Recording is in 1080i/p High Definition</source>
+        <translation>Grabación en Alta Definición 1080i/p</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5261"/>
+        <source>Recording is in 1080i/p High Definition</source>
+        <translation>Grabación en Alta Definición 1080i/p</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanner_gui_scan_pane.cpp" line="47"/>
         <source>Tuning</source>
         <translation>Sintonizando</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5239"/>
+        <source>Recording is in 720p High Definition</source>
+        <translation>Grabación en Alta Definición 720p</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5262"/>
+        <source>Recording is in 720p High Definition</source>
+        <translation>Grabación en Alta Definición 720p</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanner_gui_scan_pane.cpp" line="61"/>
         <source>Rotor Movement</source>
         <translation>Movimiento del Rotor</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5240"/>
+        <source>Recording is in High Definition</source>
+        <translation>Grabación en Alta Definición</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5263"/>
+        <source>Recording is in High Definition</source>
+        <translation>Grabación en Alta Definición</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanner_gui_scan_pane.cpp" line="71"/>
         <source>Signal Strength</source>
         <translation>Potencia de Señal</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5241"/>
+        <source>Recording is Widescreen</source>
+        <translation>Grabación Panorámica</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5264"/>
+        <source>Recording is Widescreen</source>
+        <translation>Grabación Panorámica</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanner_gui_scan_pane.cpp" line="77"/>
         <source>Signal/Noise</source>
         <translation>Señal/Ruido</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5242"/>
+        <source>Recording is in HD using H.264 codec</source>
+        <translation>Grabación HD con códec H.264</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5265"/>
+        <source>Recording is in HD using H.264 codec</source>
+        <translation>Grabación HD con códec H.264</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanner_gui_scan_pane.cpp" line="85"/>
         <source>Scan</source>
         <translation>Exploración</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5244"/>
+        <source>Recording has been watched</source>
+        <translation>Grabación ya vista</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5267"/>
+        <source>Recording has been watched</source>
+        <translation>Grabación ya vista</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythtv/channelscan/channelscanner_gui_scan_pane.cpp" line="90"/>
@@ -2750,42 +3012,112 @@ Delete the current cut or preserved region</extracomment>
         <translation>Baja Velocidad del Rotor (grados/seg)</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/diseqcsettings.cpp" line="331"/>
         <source>To allow the approximate monitoring of rotor movement, enter the rated angular speed of the rotor when powered at 13V.</source>
         <translation>Para permitir la monitorización aproximada del movimiento del rotor, introduzca la velocidad angular del rotor al alimentarlo con 13V.</translation>
-    </message>
-    <message>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1419"/>
+        <source>Trying to automatically find this recording online...</source>
+        <translation>Tratando de buscar en línea esta grabación automáticamente...</translation>
+=======
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1542"/>
+        <source>Trying to automatically find this recording online...</source>
+        <translation>Tratando de buscar en línea esta grabación automáticamente...</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
+    </message>
+    <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/diseqcsettings.cpp" line="361"/>
         <source>Rotor High Speed (deg/sec)</source>
         <translation>Alta Velocidad del Rotor (grados/seg)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1453"/>
+        <source>Trying to manually find this recording online...</source>
+        <translation>Tratando de buscar en línea esta grabación manualmente...</translation>
+=======
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1576"/>
+        <source>Trying to manually find this recording online...</source>
+        <translation>Tratando de buscar en línea esta grabación manualmente...</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/diseqcsettings.cpp" line="362"/>
         <source>To allow the approximate monitoring of rotor movement, enter the rated angular speed of the rotor when powered at 18V.</source>
         <translation>Para permitir la monitorización aproximada del movimiento del rotor, introduzca la velocidad angular del rotor al alimentarlo con 18V.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1490"/>
+        <source>Downloading selected artwork...</source>
+        <translation>Descargando grafismos seleccionados...</translation>
+=======
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1608"/>
+        <source>Downloading selected artwork...</source>
+        <translation>Descargando grafismos seleccionados...</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/diseqcsettings.cpp" line="391"/>
         <source>E</source>
         <comment>Eastern Hemisphere</comment>
         <translation>E</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1645"/>
+        <source>You must set a reference number on this rule to set artwork.  For items without a metadata source, you can set any unique value.</source>
+        <translation>Debe establecer un número de referencia en esta regla para configurar los grafismos.  Para los elementos que no posean fuente de metadatos, puede establecer cualquier valor único.</translation>
+=======
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1763"/>
+        <source>You must set a reference number on this rule to set artwork.  For items without a metadata source, you can set any unique value.</source>
+        <translation>Debe establecer un número de referencia en esta regla para configurar los grafismos.  Para los elementos que no posean fuente de metadatos, puede establecer cualquier valor único.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/diseqcsettings.cpp" line="394"/>
         <location filename="../libs/libmythtv/diseqcsettings.cpp" line="422"/>
         <source>W</source>
         <comment>Western Hemisphere</comment>
         <translation>O</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1662"/>
+        <source>Searching for available artwork...</source>
+        <translation>Buscando grafismos disponibles...</translation>
+=======
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1780"/>
+        <source>Searching for available artwork...</source>
+        <translation>Buscando grafismos disponibles...</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/diseqcsettings.cpp" line="460"/>
         <source>Position Index %1</source>
         <translation>Índice de Posición %1</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1875"/>
+        <source>No match found for this recording. You can try entering a TVDB/TMDB number, season, and episode manually.</source>
+        <translation>No se encontraron coincidencias para esta grabación. Pruebe a introducir manualmente el número TVDB/TMDB, temporada y episodio.</translation>
+=======
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1993"/>
+        <source>No match found for this recording. You can try entering a TVDB/TMDB number, season, and episode manually.</source>
+        <translation>No se encontraron coincidencias para esta grabación. Pruebe a introducir manualmente el número TVDB/TMDB, temporada y episodio.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/diseqcsettings.cpp" line="461"/>
         <source>Orbital Position</source>
         <translation>Posición Orbital</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1921"/>
+        <source>This number, season, and episode combination does not appear to be valid (or the site may be down). Check your information and try again.</source>
+        <translation>Esta combinación de número, temporada y episiodio no parece válida (o el sitio puede estar desconectado). Compruebe su información e inténtelo de nuevo.</translation>
+=======
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2039"/>
+        <source>This number, season, and episode combination does not appear to be valid (or the site may be down). Check your information and try again.</source>
+        <translation>Esta combinación de número, temporada y episiodio no parece válida (o el sitio puede estar desconectado). Compruebe su información e inténtelo de nuevo.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythtv/diseqcsettings.cpp" line="483"/>
@@ -3051,67 +3383,182 @@ Delete the current cut or preserved region</extracomment>
         <translation>Introducir nueva categoría</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/editvideometadata.cpp" line="674"/>
         <source>Downloading selected artwork...</source>
         <translation>Descargando grafismos seleccionados...</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1115"/>
+        <source>Page Up</source>
+        <translation>Página Arriba</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1116"/>
+        <source>Page Up</source>
+        <translation>Página Arriba</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/editvideometadata.cpp" line="735"/>
         <source>Searching for available artwork...</source>
         <translation>Buscando grafismos disponibles...</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1117"/>
+        <source>Page Down</source>
+        <translation>Página Abajo</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1118"/>
+        <source>Page Down</source>
+        <translation>Página Abajo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>EditPowerSearchPopup</name>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="523"/>
         <source>(Any Program Type)</source>
         <translation>(Cualquier Tipo de Programa)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="487"/>
+        <source>Play Program</source>
+        <translation>Reproducir Programa</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="488"/>
+        <source>Play Program</source>
+        <translation>Reproducir Programa</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="525"/>
         <source>Movies</source>
         <translation>Películas</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="489"/>
+        <source>Stop Program</source>
+        <translation>Detener Programa</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="490"/>
+        <source>Stop Program</source>
+        <translation>Detener Programa</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="527"/>
         <source>Series</source>
         <translation>Series</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="491"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="591"/>
+        <source>Toggle recording status of current program</source>
+        <translation>Cambiar el estado de grabación del programa actual</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="492"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="594"/>
+        <source>Toggle recording status of current program</source>
+        <translation>Cambiar el estado de grabación del programa actual</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="529"/>
         <source>Show</source>
         <translation>Espectáculos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="493"/>
+        <source>Page the program guide back one day</source>
+        <translation>Retroceder un día en la guía de programas</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="494"/>
+        <source>Page the program guide back one day</source>
+        <translation>Retroceder un día en la guía de programas</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="531"/>
         <source>Sports</source>
         <translation>Deportes</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="495"/>
+        <source>Page the program guide forward one day</source>
+        <translation>Avanzar un día en la guía de programas</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="496"/>
+        <source>Page the program guide forward one day</source>
+        <translation>Avanzar un día en la guía de programas</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="537"/>
         <source>(Any Genre)</source>
         <translation>(Cualquier Género)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="497"/>
+        <source>Page the program guide left</source>
+        <translation>Ir a la izquierda en la guía de programas</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="498"/>
+        <source>Page the program guide left</source>
+        <translation>Ir a la izquierda en la guía de programas</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="564"/>
         <source>(Any Channel)</source>
         <translation>(Cualquier Canal)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="499"/>
+        <source>Page the program guide right</source>
+        <translation>Ir a la derecha en la guía de programas</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="500"/>
+        <source>Page the program guide right</source>
+        <translation>Ir a la derecha en la guía de programas</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>ExitPrompter</name>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/exitprompt.cpp" line="196"/>
         <source>Do you really want to exit MythTV?</source>
         <translation>¿Seguro que desea salir de MythTV?</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="501"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="593"/>
+        <source>Toggle the current channel as a favorite</source>
+        <translation>Cambiar el canal actual como favorito</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="502"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="596"/>
+        <source>Toggle the current channel as a favorite</source>
+        <translation>Cambiar el canal actual como favorito</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/exitprompt.cpp" line="205"/>
         <source>No</source>
         <translation>No</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="503"/>
+        <source>Reverse the channel order in the program guide</source>
+        <translation>Invertir el orden de los canales en la guía de programas</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="504"/>
+        <source>Reverse the channel order in the program guide</source>
+        <translation>Invertir el orden de los canales en la guía de programas</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/exitprompt.cpp" line="39"/>
         <source>If you&apos;ve added or altered channels, please run &apos;mythfilldatabase&apos; on the master backend to populate the database with guide information.</source>
         <translation>Si usted ha añadido o modificado canales, por favor, ejecute &apos;mythfilldatabase&apos; en el servidor principal, para actualizar la base de datos con la información de la guía de programas.</translation>
@@ -3123,485 +3570,1364 @@ Delete the current cut or preserved region</extracomment>
             <numerusform>¿Desea retroceder y resolver este problema?</numerusform>
             <numerusform>¿Desea retroceder y resolver estos problemas?</numerusform>
         </translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="505"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="751"/>
+        <source>Show the Program Guide</source>
+        <translation>Mostrar la Guía de Programas</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="506"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="754"/>
+        <source>Show the Program Guide</source>
+        <translation>Mostrar la Guía de Programas</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/exitprompt.cpp" line="85"/>
         <source>Yes please</source>
         <translation>Sí, por favor</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="507"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="753"/>
+        <source>Show the Program Finder</source>
+        <translation>Mostrar el Buscador de Programas</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="508"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="756"/>
+        <source>Show the Program Finder</source>
+        <translation>Mostrar el Buscador de Programas</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/exitprompt.cpp" line="86"/>
         <source>No, I know what I am doing</source>
         <translation>No, sé lo que estoy haciendo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="509"/>
+        <source>Cycle through channel groups and all channels in the program guide.</source>
+        <translation>Rotar grupos de canales y todos los canales en la guía de programas.</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="510"/>
+        <source>Cycle through channel groups and all channels in the program guide.</source>
+        <translation>Rotar grupos de canales y todos los canales en la guía de programas.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>ExpertSettingsEditor</name>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/expertsettingseditor.h" line="32"/>
         <source>Expert Settings Editor</source>
         <translation>Editor de Configuración para Expertos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="512"/>
+        <source>Switch channels without exiting guide in Live TV mode.</source>
+        <translation>Cambiar canales sin salir de la guía en el modo TV en Vivo.</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="513"/>
+        <source>Switch channels without exiting guide in Live TV mode.</source>
+        <translation>Cambiar canales sin salir de la guía en el modo TV en Vivo.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/expertsettingseditor.h" line="33"/>
         <source>Recording Pending</source>
         <translation>Pendiente de Grabación</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="514"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="595"/>
+        <source>Volume down</source>
+        <translation>Subir volumen</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="515"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="598"/>
+        <source>Volume down</source>
+        <translation>Subir volumen</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>FileAssocDialog</name>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/videofileassoc.cpp" line="372"/>
         <source>Select a file extension from this list to modify or delete its settings.</source>
         <translation>Selecciona una extensión de archivo a modificar de esta lista o elimina su configuración. </translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="516"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="597"/>
+        <source>Volume up</source>
+        <translation>Bajar volumen</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="517"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="600"/>
+        <source>Volume up</source>
+        <translation>Bajar volumen</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/videofileassoc.cpp" line="374"/>
         <source>The command to use when playing this kind of file.  To use MythTV&apos;s Internal player, use &quot;Internal&quot; as the player.  For all other players, you can use %s to substitute the filename.</source>
         <translation>Orden a usar al ejecutar esta clase de archivo.  Para usar el reproductor interno de MythTV, utilice &quot;Internal&quot; como reproductor.  Para todos los demás reproductores puede usar %s para sustituir el nombre del archivo.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="518"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="599"/>
+        <source>Mute</source>
+        <translation>Silenciar</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="519"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="602"/>
+        <source>Mute</source>
+        <translation>Silenciar</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/videofileassoc.cpp" line="378"/>
         <source>When checked, this will cause the file extension to be ignored in scans of your library.</source>
         <translation>Al marcarlo, hará que se ignoren las extensiones de archivo al explorar su biblioteca.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="520"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="603"/>
+        <source>Cycle audio channels</source>
+        <translation>Rotar canales de sonido</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="521"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="606"/>
+        <source>Cycle audio channels</source>
+        <translation>Rotar canales de sonido</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/videofileassoc.cpp" line="380"/>
         <source>When checked, this will cause the global player settings to override this one.</source>
         <translation>Al marcarlo, hará que la configuración global del reproductor tenga prioridad sobre ésta.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="522"/>
+        <source>Increase program or channel rank</source>
+        <translation>Aumentar la puntuación del programa o canal</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="523"/>
+        <source>Increase program or channel rank</source>
+        <translation>Aumentar la puntuación del programa o canal</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/videofileassoc.cpp" line="382"/>
         <source>Save and exit this screen.</source>
         <translation>Guardar y salir de esta pantalla.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="524"/>
+        <source>Decrease program or channel rank</source>
+        <translation>Disminuir la puntuación del programa o canal</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="525"/>
+        <source>Decrease program or channel rank</source>
+        <translation>Disminuir la puntuación del programa o canal</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/videofileassoc.cpp" line="383"/>
         <source>Create a new file extension.</source>
         <translation>Crear una nueva extensión de archivo.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="526"/>
+        <source>List upcoming episodes</source>
+        <translation>Mostrar lista de próximos episodios</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="527"/>
+        <source>List upcoming episodes</source>
+        <translation>Mostrar lista de próximos episodios</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/videofileassoc.cpp" line="384"/>
         <source>Delete this file extension.</source>
         <translation>Eliminar esta extensión de archivo.</translation>
-    </message>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="528"/>
+        <source>List scheduled upcoming episodes</source>
+        <translation>Mostrar lista de próximos episodios programados</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="529"/>
+        <source>List scheduled upcoming episodes</source>
+        <translation>Mostrar lista de próximos episodios programados</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
+    </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/videofileassoc.cpp" line="443"/>
         <source>Enter the new extension:</source>
         <translation>Introduzca la nueva extensión:</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="530"/>
+        <source>Show details</source>
+        <translation>Mostrar detalles</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="531"/>
+        <source>Show details</source>
+        <translation>Mostrar detalles</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>FirewireDesc</name>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="1198"/>
         <source>Description</source>
         <translation>Descripción</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="532"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="534"/>
+        <source>Switch Capture Card view</source>
+        <translation>Cambiar vista de Capturadora</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="533"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="535"/>
+        <source>Switch Capture Card view</source>
+        <translation>Cambiar vista de Capturadora</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>GeneralSetupWizard</name>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="57"/>
         <source>Anonymously submit a profile of your hardware. This helps the developers to determine where to focus their efforts.</source>
         <translation>Enviar anónimamente un perfil de su hardware. Ayuda a los desarrolladores a decidir dónde enfocar sus esfuerzos.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="536"/>
+        <source>Edit Custom Record Rule</source>
+        <translation>Editar Regla de Grabación Personalizada</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="537"/>
+        <source>Edit Custom Record Rule</source>
+        <translation>Editar Regla de Grabación Personalizada</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="60"/>
         <source>Visit your online hardware profile. (This requires that you have the MythBrowser plugin installed)</source>
         <translation>Visite su perfil de hardware en línea. (Requiere que tenga instalado el complemento MythBrowser)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="538"/>
+        <source>Change Recording Group</source>
+        <translation>Cambiar Grupo de Grabación</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="539"/>
+        <source>Change Recording Group</source>
+        <translation>Cambiar Grupo de Grabación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="62"/>
         <source>Delete your online hardware profile.</source>
         <translation>Elimina su perfil de hardware en línea.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="540"/>
+        <source>Change Group View</source>
+        <translation>Cambiar Vista de Grupo</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="541"/>
+        <source>Change Group View</source>
+        <translation>Cambiar Vista de Grupo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="64"/>
         <source>Save these changes and move on to the next configuration step.</source>
         <translation>Guardar estos cambios e ir al siguiente paso de la configuración.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="543"/>
+        <source>Exit or return to DVD menu</source>
+        <translation>Salir o regresar al menú de DVD</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="544"/>
+        <source>Exit or return to DVD menu</source>
+        <translation>Salir o regresar al menú de DVD</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="66"/>
         <source>Exit this wizard, save no changes.</source>
         <translation>Salir de este asistente, no guardar los cambios.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="545"/>
+        <source>Clear OSD</source>
+        <translation>Despejar OSD</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="546"/>
+        <source>Clear OSD</source>
+        <translation>Despejar OSD</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="151"/>
         <source>Submitting your hardware profile...</source>
         <translation>Enviando su perfil de hardware...</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="547"/>
+        <source>Pause</source>
+        <translation>Pausa</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="548"/>
+        <source>Pause</source>
+        <translation>Pausa</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="159"/>
         <source>Hardware profile submitted. Thank you for supporting MythTV!</source>
         <translation>Perfil de hardware enviado. ¡Gracias por ayudar a MythTV!</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="549"/>
+        <source>Fast Forward</source>
+        <translation>Avance Rápido</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="550"/>
+        <source>Fast Forward</source>
+        <translation>Avance Rápido</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="173"/>
         <source>Encountered a problem while submitting your profile.</source>
         <translation>Se encontró un problema al enviar su perfil.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="551"/>
+        <source>Rewind</source>
+        <translation>Rebobinar</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="552"/>
+        <source>Rewind</source>
+        <translation>Rebobinar</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="182"/>
         <source>You haven&apos;t submitted your hardware profile yet! Please submit your profile to visit it online.</source>
         <translation>¡Aún no ha enviado su perfil de hardware! Por favor, envíelo para poder visitarlo en línea.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="553"/>
+        <source>Arbitrary Seek</source>
+        <translation>Búsqueda Arbitraria</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="554"/>
+        <source>Arbitrary Seek</source>
+        <translation>Búsqueda Arbitraria</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="199"/>
         <source>No browser command set! MythTV needs a browser installed and configure to display your hardware profile.</source>
         <translation>¡No tiene configurado ningún navegador! MythTV necesita un navegador instalado y configurado para mostrar su perfil de hardware.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="555"/>
+        <source>Seek to a position in seconds</source>
+        <translation>Buscar una posición en segundos</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="556"/>
+        <source>Seek to a position in seconds</source>
+        <translation>Buscar una posición en segundos</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="230"/>
         <source>You haven&apos;t submitted your hardware profile yet!</source>
         <translation>¡Aún no ha enviado su perfil de hardware!</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="557"/>
+        <source>Channel up</source>
+        <translation>Canal Siguiente</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="558"/>
+        <source>Channel up</source>
+        <translation>Canal Siguiente</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="253"/>
         <source>Deleting your hardware profile...</source>
         <translation>Eliminando su perfil de hardware...</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="559"/>
+        <source>Channel down</source>
+        <translation>Canal Anterior</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="560"/>
+        <source>Channel down</source>
+        <translation>Canal Anterior</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="261"/>
         <source>Hardware profile deleted.</source>
         <translation>Perfil de hardware eliminado.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="561"/>
+        <source>Switch to the next favorite channel</source>
+        <translation>Cambiar al siguiente canal favorito</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="562"/>
+        <source>Switch to the next favorite channel</source>
+        <translation>Cambiar al siguiente canal favorito</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="274"/>
         <source>Encountered a problem while deleting your profile.</source>
         <translation>Se encontró un problema al eliminar su perfil.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="563"/>
+        <source>Switch to the previous channel</source>
+        <translation>Cambiar al canal anterior</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="564"/>
+        <source>Switch to the previous channel</source>
+        <translation>Cambiar al canal anterior</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>GrabberSettings</name>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/grabbersettings.cpp" line="56"/>
         <source>Select a source to use when searching for information and artwork about movies.</source>
         <translation>Seleccione una fuente para usar al buscar información y grafismos sobre películas.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="565"/>
+        <source>Jump ahead</source>
+        <translation>Saltar adelante</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="566"/>
+        <source>Jump ahead</source>
+        <translation>Saltar adelante</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/grabbersettings.cpp" line="58"/>
         <source>Select a source to use when searching for information and artwork about television.</source>
         <translation>Seleccione una fuente para usar al buscar información y grafismos sobre televisión.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="567"/>
+        <source>Jump back</source>
+        <translation>Saltar atrás</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="568"/>
+        <source>Jump back</source>
+        <translation>Saltar atrás</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/grabbersettings.cpp" line="60"/>
         <source>Select a source to use when searching for information and artwork about video games.</source>
         <translation>Seleccione una fuente para usar al buscar información y grafismos sobre videojuegos.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="569"/>
+        <source>Jump to bookmark</source>
+        <translation>Saltar a marcador</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="570"/>
+        <source>Info utilizing cutlist</source>
+        <translation>Información que utiliza la lista de cortes</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="572"/>
+        <source>Jump to bookmark</source>
+        <translation>Saltar a marcador</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/grabbersettings.cpp" line="62"/>
         <source>Save your changes and close this window.</source>
         <translation>Guardar sus cambios y cerrar esta ventana.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="571"/>
+        <source>Fast Forward (Sticky) or Forward one frame while paused</source>
+        <translation>Avance Rápido (Pegajoso) o Avanzar un fotograma si se está en pausa</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="574"/>
+        <source>Fast Forward (Sticky) or Forward one frame while paused</source>
+        <translation>Avance Rápido (Pegajoso) o Avanzar un fotograma si se está en pausa</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/grabbersettings.cpp" line="63"/>
         <source>Discard your changes and close this window.</source>
         <translation>Ignorar sus cambios y cerrar esta ventana.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="573"/>
+        <source>Rewind (Sticky) or Rewind one frame while paused</source>
+        <translation>Rebobinar (Pegajoso) o Rebobinar un fotograma si se está en pausa</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="576"/>
+        <source>Rewind (Sticky) or Rewind one frame while paused</source>
+        <translation>Rebobinar (Pegajoso) o Rebobinar un fotograma si se está en pausa</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/grabbersettings.cpp" line="65"/>
         <source>If set, the backend will attempt to perform artwork updates for recordings daily. When new seasons begin to record, this will attempt to provide you with fresh, relevant artwork while preserving the artwork assigned to old recordings.</source>
         <translation>Si se activa, el servidor tratará de actualizar los grafismos diariamente. Si se empiezan a grabar nuevas temporadas, intentará proporcionarle grafismos recientes y relevantes además de conservar los grafismos asignados a las grabaciones anteriores.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="575"/>
+        <source>Next Video Source</source>
+        <translation>Siguiente Fuente de Vídeo</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="578"/>
+        <source>Next Video Source</source>
+        <translation>Siguiente Fuente de Vídeo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/grabbersettings.cpp" line="76"/>
         <source>Searching for data sources...</source>
         <translation>Buscando fuentes de datos...</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="577"/>
+        <source>Previous Video Source</source>
+        <translation>Fuente de Vídeo Anterior</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="580"/>
+        <source>Previous Video Source</source>
+        <translation>Fuente de Vídeo Anterior</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>GuideGrid</name>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="182"/>
         <source>You don&apos;t have any channels defined in the database.
 			The program guide will have nothing to show you.</source>
         <translation>No tiene definido ningún canal en la base de datos.
 			La guía de programas no le mostrará nada.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="579"/>
+        <source>Next Input</source>
+        <translation>Siguiente Entrada</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="582"/>
+        <source>Next Input</source>
+        <translation>Siguiente Entrada</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="187"/>
         <source>Channel group &apos;%1&apos; doesn&apos;t have any channels defined.
 			The program guide will have nothing to show you.</source>
         <translation>El grupo de canales &apos;%1&apos; no tiene definido ningún canal.
 			La guía de programas no le mostrará nada..</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="581"/>
+        <source>Next Card</source>
+        <translation>Siguiente Tarjeta</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="584"/>
+        <source>Next Card</source>
+        <translation>Siguiente Tarjeta</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="588"/>
         <source>Guide Options</source>
         <translation>Opciones de la Guía</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="583"/>
+        <source>Skip Commercial</source>
+        <translation>Saltar Anuncio</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="586"/>
+        <source>Skip Commercial</source>
+        <translation>Saltar Anuncio</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="599"/>
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="1398"/>
         <source>Change to Channel</source>
         <translation>Cambiar al Canal</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="585"/>
+        <source>Skip Commercial (Reverse)</source>
+        <translation>Saltar Anuncio (Hacia Atrás)</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="588"/>
+        <source>Skip Commercial (Reverse)</source>
+        <translation>Saltar Anuncio (Hacia Atrás)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="601"/>
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="1394"/>
         <source>Record This</source>
         <translation>Grabar Éste</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="587"/>
+        <source>Jump to the start of the recording.</source>
+        <translation>Saltar al comienzo de la grabación.</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="590"/>
+        <source>Jump to the start of the recording.</source>
+        <translation>Saltar al comienzo de la grabación.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="603"/>
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="631"/>
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="1425"/>
         <source>Recording Options</source>
         <translation>Opciones de Grabación</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="589"/>
+        <source>Toggle channel browse mode</source>
+        <translation>Cambiar al modo de exploración de canales</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="592"/>
+        <source>Toggle channel browse mode</source>
+        <translation>Cambiar al modo de exploración de canales</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="607"/>
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="1429"/>
         <source>Jump to Time</source>
         <translation>Saltar a Fecha/Hora</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="601"/>
+        <source>Set the volume</source>
+        <translation>Establecer volumen</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="604"/>
+        <source>Set the volume</source>
+        <translation>Establecer volumen</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="644"/>
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="1436"/>
         <source>Edit Recording Status</source>
         <translation>Editar Estado de Grabación</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="605"/>
+        <source>Toggle audio upmixer</source>
+        <translation>Cambiar al conversor de sonido</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="608"/>
+        <source>Toggle audio upmixer</source>
+        <translation>Cambiar al conversor de sonido</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="645"/>
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="1440"/>
         <source>Edit Schedule</source>
         <translation>Editar Programación</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="607"/>
+        <source>Toggle Picture-in-Picture view</source>
+        <translation>Cambiar a vista Picture-in-Picture</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="610"/>
+        <source>Toggle Picture-in-Picture view</source>
+        <translation>Cambiar a vista Picture-in-Picture</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="2213"/>
         <source>Jump to a specific date and time in the guide</source>
         <translation>Saltar a una fecha y hora específicas en la guía</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="609"/>
+        <source>Toggle Picture-by-Picture view</source>
+        <translation>Cambiar a vista Picture-by-Picture</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="612"/>
+        <source>Toggle Picture-by-Picture view</source>
+        <translation>Cambiar a vista Picture-by-Picture</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="605"/>
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="1402"/>
         <source>Program Details</source>
         <translation>Detalles del Programa</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="611"/>
+        <source>Create Picture-in-Picture view</source>
+        <translation>Crear vista Picture-in-Picture</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="614"/>
+        <source>Create Picture-in-Picture view</source>
+        <translation>Crear vista Picture-in-Picture</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="646"/>
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="1444"/>
         <source>Show Upcoming</source>
         <translation>Mostrar Próximos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="613"/>
+        <source>Create Picture-by-Picture view</source>
+        <translation>Crear vista Picture-by-Picture</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="616"/>
+        <source>Create Picture-by-Picture view</source>
+        <translation>Crear vista Picture-by-Picture</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="647"/>
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="1448"/>
         <source>Custom Edit</source>
         <translation>Edición Personalizada</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="615"/>
+        <source>Toggle active PIP/PBP window</source>
+        <translation>Cambiar a la ventana PIP/PBP activa</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="618"/>
+        <source>Toggle active PIP/PBP window</source>
+        <translation>Cambiar a la ventana PIP/PBP activa</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="650"/>
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="1452"/>
         <source>Delete Rule</source>
         <translation>Eliminar Regla</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="617"/>
+        <source>Swap PBP/PIP Windows</source>
+        <translation>Intercambiar Ventanas PBP/PIP</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="620"/>
+        <source>Swap PBP/PIP Windows</source>
+        <translation>Intercambiar Ventanas PBP/PIP</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="609"/>
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="1406"/>
         <source>Reverse Channel Order</source>
         <translation>Invertir el Orden de los Canales</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="619"/>
+        <source>Change PxP view</source>
+        <translation>Cambiar a vista PxP</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="622"/>
+        <source>Change PxP view</source>
+        <translation>Cambiar a vista PxP</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="616"/>
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="1412"/>
         <source>Add To Channel Group</source>
         <translation>Añadir al Grupo de Canales</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="621"/>
+        <source>Toggle the video aspect ratio</source>
+        <translation>Cambiar la relación de aspecto de la imagen</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="624"/>
+        <source>Toggle the video aspect ratio</source>
+        <translation>Cambiar la relación de aspecto de la imagen</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="618"/>
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="1417"/>
         <source>Remove from Channel Group</source>
         <translation>Eliminar del Grupo de Canales</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="623"/>
+        <source>Next Preconfigured Zoom mode</source>
+        <translation>Siguiente modo de Aumento Preconfigurado</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="626"/>
+        <source>Next Preconfigured Zoom mode</source>
+        <translation>Siguiente modo de Aumento Preconfigurado</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="613"/>
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="1421"/>
         <source>Choose Channel Group</source>
         <translation>Elegir Grupo de Canales</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="625"/>
+        <source>Toggle any captions</source>
+        <translation>Conmutar subtítulos</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="628"/>
+        <source>Toggle any captions</source>
+        <translation>Conmutar subtítulos</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="1675"/>
         <source>You don&apos;t have any channel groups defined</source>
         <translation>No tiene definido ningún grupo de canales</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="627"/>
+        <source>Enable any captions</source>
+        <translation>Activar cualquier subtítulo</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="630"/>
+        <source>Enable any captions</source>
+        <translation>Activar cualquier subtítulo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="1689"/>
         <source>Select Channel Group</source>
         <translation>Seleccione Grupo de Canales</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="629"/>
+        <source>Disable any captions</source>
+        <translation>Desactivar cualquier subtítulo</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="632"/>
+        <source>Disable any captions</source>
+        <translation>Desactivar cualquier subtítulo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="2044"/>
         <source>Delete &apos;%1&apos; %2 rule?</source>
         <translation>¿Eliminar regla &apos;%1&apos; &apos;%2&apos;?</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="631"/>
+        <source>Toggle Teletext Captions</source>
+        <translation>Conmutar Subtítulos de Teletexto</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="634"/>
+        <source>Toggle Teletext Captions</source>
+        <translation>Conmutar Subtítulos de Teletexto</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>HDHomeRunConfigurationGroup</name>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="1803"/>
         <source>Recording Options</source>
         <translation>Opciones de Grabación</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="633"/>
+        <source>Toggle Subtitles</source>
+        <translation>Conmutar Subtítulos</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="636"/>
+        <source>Toggle Subtitles</source>
+        <translation>Conmutar Subtítulos</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="1788"/>
         <source>Description</source>
         <translation>Descripción</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="635"/>
+        <source>Toggle VBI CC</source>
+        <translation>Conmutar Subt. VBI</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="638"/>
+        <source>Toggle VBI CC</source>
+        <translation>Conmutar Subt. VBI</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>HDHomeRunDeviceID</name>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="1358"/>
         <source>Device ID</source>
         <translation>ID del Dispositivo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="637"/>
+        <source>Toggle ATSC CC</source>
+        <translation>Conmutar Subt. ATSC</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="640"/>
+        <source>Toggle ATSC CC</source>
+        <translation>Conmutar Subt. ATSC</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="1359"/>
         <source>Device ID of HDHomeRun device</source>
         <translation>ID del Dispositivo HDHomeRun</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="639"/>
+        <source>Toggle Teletext Menu</source>
+        <translation>Conmutar Menú de Teletexto</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="642"/>
+        <source>Toggle Teletext Menu</source>
+        <translation>Conmutar Menú de Teletexto</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>HDHomeRunDeviceIDList</name>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="1452"/>
         <location filename="../libs/libmythtv/videosource.cpp" line="1508"/>
         <location filename="../libs/libmythtv/videosource.cpp" line="1518"/>
         <source>Manually Enter IP Address</source>
         <translation>Introduzca Manualmente la Dirección IP</translation>
-    </message>
-</context>
-<context>
-    <name>HDPVRConfigurationGroup</name>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="641"/>
+        <source>Toggle External Subtitles</source>
+        <translation>Conmutar Subtítulos Externos</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="644"/>
+        <source>Toggle External Subtitles</source>
+        <translation>Conmutar Subtítulos Externos</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
+    </message>
+</context>
+<context>
+    <name>HDPVRConfigurationGroup</name>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="2221"/>
         <source>Probed info</source>
         <translation>Información obtenida</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="643"/>
+        <source>Enable External Subtitles</source>
+        <translation>Activar Subtítulos Externos</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="646"/>
+        <source>Enable External Subtitles</source>
+        <translation>Activar Subtítulos Externos</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="2238"/>
         <source>Failed to open</source>
         <translation>Fallo al abrir</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="645"/>
+        <source>Disable External Subtitles</source>
+        <translation>Desactivar Subtítulos Externos</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="648"/>
+        <source>Disable External Subtitles</source>
+        <translation>Desactivar Subtítulos Externos</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="2244"/>
         <source>Failed to probe</source>
         <translation>Fallo al explorar</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="647"/>
+        <source>Toggle Text Subtitles</source>
+        <translation>Conmutar Subtítulos de Texto</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="650"/>
+        <source>Toggle Text Subtitles</source>
+        <translation>Conmutar Subtítulos de Texto</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>HelpPopup</name>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="5247"/>
         <source>Commercials are flagged</source>
         <translation>Los anuncios han sido marcados</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="650"/>
+        <source>Play audio track 1</source>
+        <translation>Reproducir pista de sonido 1</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="653"/>
+        <source>Play audio track 1</source>
+        <translation>Reproducir pista de sonido 1</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="5248"/>
         <source>An editing cutlist is present</source>
         <translation>Hay una lista de cortes en edición</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="652"/>
+        <source>Play audio track 2</source>
+        <translation>Reproducir pista de sonido 2</translation>
     </message>
     <message>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="654"/>
+        <source>Display subtitle 1</source>
+        <translation>Mostrar subtítulo 1</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="655"/>
+        <source>Play audio track 2</source>
+        <translation>Reproducir pista de sonido 2</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="657"/>
+        <source>Display subtitle 1</source>
+        <translation>Mostrar subtítulo 1</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
+    </message>
+    <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="5249"/>
         <source>The program is able to auto-expire</source>
         <translation>El programa puede autoexpirar</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="656"/>
+        <source>Display subtitle 2</source>
+        <translation>Mostrar subtítulo 2</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="659"/>
+        <source>Display subtitle 2</source>
+        <translation>Mostrar subtítulo 2</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="5250"/>
         <source>Commercials are being flagged</source>
         <translation>Se están marcando los anuncios</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="658"/>
+        <source>Display Text Subtitle 1</source>
+        <translation>Mostrar Subtítulo de Texto 1</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="661"/>
+        <source>Display Text Subtitle 1</source>
+        <translation>Mostrar Subtítulo de Texto 1</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="5251"/>
         <source>A bookmark is set</source>
         <translation>Marcador situado</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="660"/>
+        <source>Display VBI CC1</source>
+        <translation>Mostrar Subt. VBI 1</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="663"/>
+        <source>Display VBI CC1</source>
+        <translation>Mostrar Subt. VBI 1</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="5253"/>
         <source>Recording is in use</source>
         <translation>La grabación está en uso</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="662"/>
+        <source>Display VBI CC2</source>
+        <translation>Mostrar Subt. VBI 2</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="665"/>
+        <source>Display VBI CC2</source>
+        <translation>Mostrar Subt. VBI 2</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="5254"/>
         <source>Recording has been transcoded</source>
         <translation>La grabación ha sido transcodificada</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="664"/>
+        <source>Display VBI CC3</source>
+        <translation>Mostrar Subt. VBI 3</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="667"/>
+        <source>Display VBI CC3</source>
+        <translation>Mostrar Subt. VBI 3</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="5257"/>
         <source>Recording is in Mono</source>
         <translation>Grabación en Mono</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="666"/>
+        <source>Display VBI CC4</source>
+        <translation>Mostrar Subt. VBI 4</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="669"/>
+        <source>Display VBI CC4</source>
+        <translation>Mostrar Subt. VBI 4</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="5258"/>
         <source>Recording is in Stereo</source>
         <translation>Grabación en Estéreo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="668"/>
+        <source>Display ATSC CC1</source>
+        <translation>Mostrar Subt. ATSC 1</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="671"/>
+        <source>Display ATSC CC1</source>
+        <translation>Mostrar Subt. ATSC 1</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="5259"/>
         <source>Recording is in Surround Sound</source>
         <translation>Grabación en Sonido Surround</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="670"/>
+        <source>Display ATSC CC2</source>
+        <translation>Mostrar Subt. ATSC 2</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="673"/>
+        <source>Display ATSC CC2</source>
+        <translation>Mostrar Subt. ATSC 2</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="5260"/>
         <source>Recording is in Dolby Surround Sound</source>
         <translation>Grabación en Sonido Dolby Surround</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="672"/>
+        <source>Display ATSC CC3</source>
+        <translation>Mostrar Subt. ATSC 3</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="675"/>
+        <source>Display ATSC CC3</source>
+        <translation>Mostrar Subt. ATSC 3</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="5262"/>
         <source>Recording is Closed Captioned</source>
         <translation>Grabación con Subtítulos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="674"/>
+        <source>Display ATSC CC4</source>
+        <translation>Mostrar Subt. ATSC 4</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="677"/>
+        <source>Display ATSC CC4</source>
+        <translation>Mostrar Subt. ATSC 4</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="5263"/>
         <source>Recording has Subtitles Available</source>
         <translation>La grabación tiene Subtítulos Disponibles</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="676"/>
+        <source>Enable Forced Subtitles</source>
+        <translation>Activar Subtítulos Forzados</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="679"/>
+        <source>Enable Forced Subtitles</source>
+        <translation>Activar Subtítulos Forzados</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="5264"/>
         <source>Recording is Subtitled</source>
         <translation>Grabación Subtitulada</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="678"/>
+        <source>Disable Forced Subtitles</source>
+        <translation>Desactivar Subtítulos Forzados</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="681"/>
+        <source>Disable Forced Subtitles</source>
+        <translation>Desactivar Subtítulos Forzados</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="5266"/>
         <source>Recording is in 1080i/p High Definition</source>
         <translation>Grabación en Alta Definición 1080i/p</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="681"/>
+        <source>Next audio track</source>
+        <translation>Pista de sonido siguiente</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="684"/>
+        <source>Next audio track</source>
+        <translation>Pista de sonido siguiente</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="5267"/>
         <source>Recording is in 720p High Definition</source>
         <translation>Grabación en Alta Definición 720p</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="683"/>
+        <source>Previous audio track</source>
+        <translation>Pista de sonido anterior</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="686"/>
+        <source>Previous audio track</source>
+        <translation>Pista de sonido anterior</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="5268"/>
         <source>Recording is in High Definition</source>
         <translation>Grabación en Alta Definición</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="685"/>
+        <source>Next subtitle track</source>
+        <translation>Pista de subtítulos siguiente</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="688"/>
+        <source>Next subtitle track</source>
+        <translation>Pista de subtítulos siguiente</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="5269"/>
         <source>Recording is Widescreen</source>
         <translation>Grabación Panorámica</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="687"/>
+        <source>Previous subtitle track</source>
+        <translation>Pista de subtítulos anterior</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="690"/>
+        <source>Previous subtitle track</source>
+        <translation>Pista de subtítulos anterior</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="5270"/>
         <source>Recording is in HD using H.264 codec</source>
         <translation>Grabación HD con códec H.264</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="689"/>
+        <source>Next Text track</source>
+        <translation>Pista de Texto siguiente</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="692"/>
+        <source>Next Text track</source>
+        <translation>Pista de Texto siguiente</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="5272"/>
         <source>Recording has been watched</source>
         <translation>Grabación ya vista</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="691"/>
+        <source>Previous Text track</source>
+        <translation>Pista de Texto anterior</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="694"/>
+        <source>Previous Text track</source>
+        <translation>Pista de Texto anterior</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>HtmlUI</name>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="12"/>
         <source>Installing</source>
         <translation>Instalando</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="693"/>
+        <source>Next VBI CC track</source>
+        <translation>Pista de Subt. VBI siguiente</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="696"/>
+        <source>Next VBI CC track</source>
+        <translation>Pista de Subt. VBI siguiente</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="13"/>
         <location filename="../html/htmlstrings.h" line="107"/>
         <location filename="../html/htmlstrings.h" line="122"/>
@@ -3609,577 +4935,1733 @@ Delete the current cut or preserved region</extracomment>
         <location filename="../html/htmlstrings.h" line="145"/>
         <source>Loading</source>
         <translation>Cargando</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="695"/>
+        <source>Previous VBI CC track</source>
+        <translation>Pista de Subt. VBI anterior</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="698"/>
+        <source>Previous VBI CC track</source>
+        <translation>Pista de Subt. VBI anterior</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="14"/>
         <source>No</source>
         <translation>No</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="697"/>
+        <source>Next ATSC CC track</source>
+        <translation>Pista de Subt. ATSC siguiente</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="700"/>
+        <source>Next ATSC CC track</source>
+        <translation>Pista de Subt. ATSC siguiente</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="15"/>
         <source>Package installed</source>
         <translation>Paquete instalado</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="699"/>
+        <source>Previous ATSC CC track</source>
+        <translation>Pista de Subt. ATSC anterior</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="702"/>
+        <source>Previous ATSC CC track</source>
+        <translation>Pista de Subt. ATSC anterior</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="16"/>
         <source>Unable to install package.</source>
         <translation>No fue posible instalar el paquete.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="701"/>
+        <source>Next of any captions</source>
+        <translation>Siguiente subtítulo</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="704"/>
+        <source>Next of any captions</source>
+        <translation>Siguiente subtítulo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="17"/>
         <source>Unable to retrieve setting.</source>
         <translation>No fue posible recuperar la configuración.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="704"/>
+        <source>Next video scan overidemode</source>
+        <translation>Siguiente búsqueda de vídeos en modo omisión</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="707"/>
+        <source>Next video scan overidemode</source>
+        <translation>Siguiente búsqueda de vídeos en modo omisión</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="18"/>
         <source>Unable to save setting.</source>
         <translation>No fue posible guardar la configuración.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="706"/>
+        <source>Queue the current recording for transcoding</source>
+        <translation>Poner en cola la actual grabación para transcodificarla</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="709"/>
+        <source>Queue the current recording for transcoding</source>
+        <translation>Poner en cola la actual grabación para transcodificarla</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="19"/>
         <source>Unable to send message.</source>
         <translation>No fue posible enviar el mensaje.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="708"/>
+        <source>Increase the playback speed</source>
+        <translation>Aumentar la velocidad de reproducción</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="711"/>
+        <source>Increase the playback speed</source>
+        <translation>Aumentar la velocidad de reproducción</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="20"/>
         <source>Yes</source>
         <translation>Sí</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="710"/>
+        <source>Decrease the playback speed</source>
+        <translation>Disminuir la velocidad de reproducción</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="713"/>
+        <source>Decrease the playback speed</source>
+        <translation>Disminuir la velocidad de reproducción</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="22"/>
         <source>April</source>
         <translation>Abril</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="712"/>
+        <source>Turn on time stretch control</source>
+        <translation>Activar el control de ralentización temporal</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="715"/>
+        <source>Turn on time stretch control</source>
+        <translation>Activar el control de ralentización temporal</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="23"/>
         <source>August</source>
         <translation>Agosto</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="714"/>
+        <source>Increase time stretch speed</source>
+        <translation>Aumentar la velocidad de ralentización temporal</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="717"/>
+        <source>Increase time stretch speed</source>
+        <translation>Aumentar la velocidad de ralentización temporal</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="24"/>
         <source>Current Tuner Activity</source>
         <translation>Actividad del Sintonizador Actual</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="716"/>
+        <source>Decrease time stretch speed</source>
+        <translation>Disminuir la velocidad de ralentización temporal</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="719"/>
+        <source>Decrease time stretch speed</source>
+        <translation>Disminuir la velocidad de ralentización temporal</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="25"/>
         <source>December</source>
         <translation>Diciembre</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="718"/>
+        <source>Toggle time stretch speed</source>
+        <translation>Conmutar la velocidad de ralentización temporal</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="721"/>
+        <source>Toggle time stretch speed</source>
+        <translation>Conmutar la velocidad de ralentización temporal</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="26"/>
         <source>Encoder %1 is currently idle.</source>
         <translation>El codificador %1 está ahora desocupado.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="721"/>
+        <source>Turn on audio sync adjustment controls</source>
+        <translation>Activar controles de ajuste de la sincronía del sonido</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="724"/>
+        <source>Turn on audio sync adjustment controls</source>
+        <translation>Activar controles de ajuste de la sincronía del sonido</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="27"/>
         <source>Encoder %1 is currently recording &quot;%2.&quot;  This program is being viewed.</source>
         <translation>El codificador %1 está ahora grabando &quot;%2.&quot;  Este programa se está visionando.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="724"/>
+        <source>Set the audio sync adjustment</source>
+        <translation>Establecer la sincronía de sonido</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="727"/>
+        <source>Set the audio sync adjustment</source>
+        <translation>Establecer la sincronía de sonido</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="28"/>
         <source>Encoder %1 is currently recording &quot;%2.&quot;  This recording will end at %3.</source>
         <translation>El codificador %1 está ahora grabando &quot;%2.&quot;  Esta grabación finalizará a las %3.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="727"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="740"/>
+        <source>Playback picture adjustments</source>
+        <translation>Ajustes de la imagen en reproducción</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="730"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="743"/>
+        <source>Playback picture adjustments</source>
+        <translation>Ajustes de la imagen en reproducción</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="29"/>
         <source>Encoder %1 is currently watching &quot;%2&quot; on Live TV.</source>
         <translation>El codificador %1 está ahora ofreciendo &quot;%2&quot; en la TV en Vivo.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="730"/>
+        <source>Toggle night mode</source>
+        <translation>Conmutar modo nocturno</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="733"/>
+        <source>Toggle night mode</source>
+        <translation>Conmutar modo nocturno</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="30"/>
         <source>February</source>
         <translation>Febrero</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="732"/>
+        <source>Set the picture brightness</source>
+        <translation>Establecer el brillo de la imagen</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="735"/>
+        <source>Set the picture brightness</source>
+        <translation>Establecer el brillo de la imagen</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="31"/>
         <source>Friday</source>
         <translation>Viernes</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="734"/>
+        <source>Set the picture contrast</source>
+        <translation>Establecer el contraste de la imagen</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="737"/>
+        <source>Set the picture contrast</source>
+        <translation>Establecer el contraste de la imagen</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="32"/>
         <source>January</source>
         <translation>Enero</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="738"/>
+        <source>Set the picture hue</source>
+        <translation>Establecer la tonalidad de la imagen</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="741"/>
+        <source>Set the picture hue</source>
+        <translation>Establecer la tonalidad de la imagen</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="33"/>
         <source>July</source>
         <translation>Julio</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="743"/>
+        <source>Recording picture adjustments for this channel</source>
+        <translation>Grabando ajustes de imagen para este canal</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="746"/>
+        <source>Recording picture adjustments for this channel</source>
+        <translation>Grabando ajustes de imagen para este canal</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="34"/>
         <source>June</source>
         <translation>Junio</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="746"/>
+        <source>Recording picture adjustments for this recorder</source>
+        <translation>Grabando ajustes de imagen para este grabador</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="749"/>
+        <source>Recording picture adjustments for this recorder</source>
+        <translation>Grabando ajustes de imagen para este grabador</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="35"/>
         <source>Last Ten Recordings</source>
         <translation>Últimas Diez Grabaciones</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="749"/>
+        <source>Cycle Commercial Skip mode</source>
+        <translation>Rotar modo de Salto de Anuncios</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="752"/>
+        <source>Cycle Commercial Skip mode</source>
+        <translation>Rotar modo de Salto de Anuncios</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="36"/>
         <source>March</source>
         <translation>Marzo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="755"/>
+        <source>Toggle the Sleep Timer</source>
+        <translation>Conmutar el Temporizador de Sueño</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="758"/>
+        <source>Toggle the Sleep Timer</source>
+        <translation>Conmutar el Temporizador de Sueño</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="37"/>
         <source>May</source>
         <translation>Mayo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="757"/>
+        <source>Play</source>
+        <translation>Reproducir</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="760"/>
+        <source>Play</source>
+        <translation>Reproducir</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="38"/>
         <source>Monday</source>
         <translation>Lunes</translation>
-    </message>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="759"/>
+        <source>Jump to previously played recording</source>
+        <translation>Saltar a la grabación reproducida anteriormente</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="762"/>
+        <source>Jump to previously played recording</source>
+        <translation>Saltar a la grabación reproducida anteriormente</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
+    </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="39"/>
         <source>MythTV System Overview</source>
         <translation>Resumen del Sistema MythTV</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="761"/>
+        <source>Display menu of recorded programs to jump to</source>
+        <translation>Mostrar menú de programas grabados a los que saltar</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="764"/>
+        <source>Display menu of recorded programs to jump to</source>
+        <translation>Mostrar menú de programas grabados a los que saltar</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="40"/>
         <source>November</source>
         <translation>Noviembre</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="763"/>
+        <source>Display scheduled recording list</source>
+        <translation>Mostrar lista de grabaciones programadas</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="766"/>
+        <source>Display scheduled recording list</source>
+        <translation>Mostrar lista de grabaciones programadas</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="41"/>
         <source>October</source>
         <translation>Octubre</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="765"/>
+        <source>Monitor Signal Quality</source>
+        <translation>Monitorizar la Calidad de Señal</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="768"/>
+        <source>Monitor Signal Quality</source>
+        <translation>Monitorizar la Calidad de Señal</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="42"/>
         <source>Recorded %2, %3 %4 at %5.</source>
         <translation>Se grabó %2, %3 %4 a las %5.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="768"/>
+        <source>Jump to the DVD Root Menu</source>
+        <translation>Saltar al Menú Raíz del DVD</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="771"/>
+        <source>Jump to the DVD Root Menu</source>
+        <translation>Saltar al Menú Raíz del DVD</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="43"/>
         <source>Saturday</source>
         <translation>Sábado</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="770"/>
+        <source>Jump to the Popup Menu</source>
+        <translation>Saltar al Menú Emergente</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="773"/>
+        <source>Jump to the Popup Menu</source>
+        <translation>Saltar al Menú Emergente</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="44"/>
         <source>September</source>
         <translation>Septiembre</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="772"/>
+        <source>Jump to the DVD Chapter Menu</source>
+        <translation>Saltar al Menú de Capítulos del DVD</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="775"/>
+        <source>Jump to the DVD Chapter Menu</source>
+        <translation>Saltar al Menú de Capítulos del DVD</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="45"/>
         <source>Sunday</source>
         <translation>Domingo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="774"/>
+        <source>Jump to the DVD Title Menu</source>
+        <translation>Saltar al Menú de Título del DVD</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="777"/>
+        <source>Jump to the DVD Title Menu</source>
+        <translation>Saltar al Menú de Título del DVD</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="46"/>
         <source>Thursday</source>
         <translation>Jueves</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="776"/>
+        <source>Exit Show without any prompts</source>
+        <translation>Salir sin preguntar</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="779"/>
+        <source>Exit Show without any prompts</source>
+        <translation>Salir sin preguntar</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="47"/>
         <source>Tuesday</source>
         <translation>Martes</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="778"/>
+        <source>Jump to a chapter</source>
+        <translation>Saltar a un capítulo</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="781"/>
+        <source>Jump to a chapter</source>
+        <translation>Saltar a un capítulo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="48"/>
         <source>Wednesday</source>
         <translation>Miércoles</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="780"/>
+        <source>Switch title</source>
+        <translation>Cambiar título</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="783"/>
+        <source>Switch title</source>
+        <translation>Cambiar título</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="50"/>
         <source>3rd Party Software</source>
         <translation>Software de Terceros</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="782"/>
+        <source>Switch angle</source>
+        <translation>Cambiar ángulo</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="785"/>
+        <source>Switch angle</source>
+        <translation>Cambiar ángulo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="51"/>
         <source>API</source>
         <translation>API</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="806"/>
+        <source>Save cuts</source>
+        <translation>Guardar cortes</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="809"/>
+        <source>Save cuts</source>
+        <translation>Guardar cortes</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="52"/>
         <source>Advanced Setup</source>
         <translation>Configuración Avanzada</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="808"/>
+        <source>Load cuts from detected commercials</source>
+        <translation>Cargar cortes de los anuncios detectados</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="811"/>
+        <source>Load cuts from detected commercials</source>
+        <translation>Cargar cortes de los anuncios detectados</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="53"/>
         <source>Backend Status</source>
         <translation>Estado del Servidor</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="847"/>
+        <source>Toggle audio visualisation</source>
+        <translation>Conmutar visualización del sonido</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="850"/>
+        <source>Toggle audio visualisation</source>
+        <translation>Conmutar visualización del sonido</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="54"/>
         <source>Capture Card Service</source>
         <translation>Servicio de la Capturadora</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="851"/>
+        <source>Toggle OSD playback information</source>
+        <translation>Conmutar información de reproducción del OSD</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="854"/>
+        <source>Toggle OSD playback information</source>
+        <translation>Conmutar información de reproducción del OSD</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="55"/>
         <source>Change Password</source>
         <translation>Cambiar Contraseña</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="855"/>
+        <source>No 3D</source>
+        <translation>Sin 3D</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="858"/>
+        <source>No 3D</source>
+        <translation>Sin 3D</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="56"/>
         <source>Channel Editor</source>
         <translation>Editor de Canales</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="857"/>
+        <source>3D Side by Side</source>
+        <translation>3D Lado a Lado</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="860"/>
+        <source>3D Side by Side</source>
+        <translation>3D Lado a Lado</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="57"/>
         <source>Channel Service</source>
         <translation>Servicio de Canales</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="859"/>
+        <source>Discard 3D Side by Side</source>
+        <translation>Desactivar 3D Lado a Lado</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="862"/>
+        <source>Discard 3D Side by Side</source>
+        <translation>Desactivar 3D Lado a Lado</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="58"/>
         <source>Content Service</source>
         <translation>Servicio de Contenidos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="861"/>
+        <source>3D Top and Bottom</source>
+        <translation>3D Arriba y Abajo</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="864"/>
+        <source>3D Top and Bottom</source>
+        <translation>3D Arriba y Abajo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="59"/>
         <source>DVR Service</source>
         <translation>Servicio DVR</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="863"/>
+        <source>Discard 3D Top and Bottom</source>
+        <translation>Desactivar 3D Arriba y Abajo</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="866"/>
+        <source>Discard 3D Top and Bottom</source>
+        <translation>Desactivar 3D Arriba y Abajo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="60"/>
         <source>Database</source>
         <translation>Base de Datos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="786"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="830"/>
+        <source>Menu Red</source>
+        <translation>Menú Rojo</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="789"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="833"/>
+        <source>Menu Red</source>
+        <translation>Menú Rojo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="61"/>
         <source>Database Tools</source>
         <translation>Herramientas de la Base de Datos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="736"/>
+        <source>Set the picture color</source>
+        <translation>Establecer el color de la imagen</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="739"/>
+        <source>Set the picture color</source>
+        <translation>Establecer el color de la imagen</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="62"/>
         <source>Examples</source>
         <translation>Ejemplos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="788"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="832"/>
+        <source>Menu Green</source>
+        <translation>Menú Verde</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="791"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="835"/>
+        <source>Menu Green</source>
+        <translation>Menú Verde</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="63"/>
         <source>Expert/Dev Setup</source>
         <translation>Configuración para Expertos/Desarr</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="790"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="834"/>
+        <source>Menu Yellow</source>
+        <translation>Menú Amarillo</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="793"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="837"/>
+        <source>Menu Yellow</source>
+        <translation>Menú Amarillo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="64"/>
         <source>General</source>
         <translation>General</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="792"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="836"/>
+        <source>Menu Blue</source>
+        <translation>Menú Azul</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="795"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="839"/>
+        <source>Menu Blue</source>
+        <translation>Menú Azul</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="65"/>
         <source>GetRecorded() Example</source>
         <translation>Ejemplo de GetRecorded()</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="794"/>
+        <source>Menu Exit</source>
+        <translation>Menú Salir</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="797"/>
+        <source>Menu Exit</source>
+        <translation>Menú Salir</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="66"/>
         <source>GetStorageGroups()</source>
         <translation>GetStorageGroups()</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="796"/>
+        <source>Menu Text</source>
+        <translation>Menú Texto</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="799"/>
+        <source>Menu Text</source>
+        <translation>Menú Texto</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="67"/>
         <source>Guide Data</source>
         <translation>Datos de la Guía</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="798"/>
+        <source>Menu EPG</source>
+        <translation>Menú EPG</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="801"/>
+        <source>Menu EPG</source>
+        <translation>Menú EPG</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="68"/>
         <source>Guide Data Sources</source>
         <translation>Fuentes de Datos de la Guía</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="802"/>
+        <source>Clear editing cut points</source>
+        <translation>Eliminar los puntos de corte en edición</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="805"/>
+        <source>Clear editing cut points</source>
+        <translation>Eliminar los puntos de corte en edición</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="69"/>
         <source>Guide Service</source>
         <translation>Servicio de Guía</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="804"/>
+        <source>Invert Begin/End cut points</source>
+        <translation>Invertir los puntos de corte de Comienzo/Final</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="807"/>
+        <source>Invert Begin/End cut points</source>
+        <translation>Invertir los puntos de corte de Comienzo/Final</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="70"/>
         <source>HTTP Live Streaming</source>
         <translation>Difusión HTTP en Vivo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="810"/>
+        <source>Jump to the next cut point</source>
+        <translation>Saltar al siguiente punto de corte</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="813"/>
+        <source>Jump to the next cut point</source>
+        <translation>Saltar al siguiente punto de corte</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="71"/>
         <source>Hardware Profile</source>
         <translation>Perfil de Hardware</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="812"/>
+        <source>Jump to the previous cut point</source>
+        <translation>Saltar al anterior punto de corte</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="815"/>
+        <source>Jump to the previous cut point</source>
+        <translation>Saltar al anterior punto de corte</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="72"/>
         <source>Information</source>
         <translation>Información</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="814"/>
+        <source>Jump back 10x the normal amount</source>
+        <translation>Saltar atrás 10x la cantidad normal</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="817"/>
+        <source>Jump back 10x the normal amount</source>
+        <translation>Saltar atrás 10x la cantidad normal</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="73"/>
         <source>JW Player&amp;trade;</source>
         <translation>JW Player&amp;trade;</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="816"/>
+        <source>Jump forward 10x the normal amount</source>
+        <translation>Saltar adelante 10x la cantidad normal</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="819"/>
+        <source>Jump forward 10x the normal amount</source>
+        <translation>Saltar adelante 10x la cantidad normal</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="74"/>
         <source>Job Queue</source>
         <translation>Cola de Tareas</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="820"/>
+        <source>Next Page</source>
+        <translation>Página Siguiente</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="823"/>
+        <source>Next Page</source>
+        <translation>Página Siguiente</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="75"/>
         <source>Myth Service</source>
         <translation>Servicio Myth</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="822"/>
+        <source>Previous Page</source>
+        <translation>Página Anterior</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="825"/>
+        <source>Previous Page</source>
+        <translation>Página Anterior</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="76"/>
         <source>Overview</source>
         <translation>Resumen</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="824"/>
+        <source>Next Subpage</source>
+        <translation>Siguiente Subpágina</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="827"/>
+        <source>Next Subpage</source>
+        <translation>Siguiente Subpágina</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="77"/>
         <source>Recording Devices</source>
         <translation>Dispositivos de Grabación</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="826"/>
+        <source>Previous Subpage</source>
+        <translation>Anterior Subpágina</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="829"/>
+        <source>Previous Subpage</source>
+        <translation>Anterior Subpágina</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="78"/>
         <source>Send a Message</source>
         <translation>Enviar un Mensaje</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="828"/>
+        <source>Toggle Teletext</source>
+        <translation>Conmutar Teletexto</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="831"/>
+        <source>Toggle Teletext</source>
+        <translation>Conmutar Teletexto</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="79"/>
         <source>Server Side Scripting</source>
         <translation>Guiones del Extremo Servidor</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="838"/>
+        <source>Menu White</source>
+        <translation>Menú Blanco</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="841"/>
+        <source>Menu White</source>
+        <translation>Menú Blanco</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="80"/>
         <source>Setup</source>
         <translation>Configuración</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="841"/>
+        <source>Toggle Background</source>
+        <translation>Conmutar Fondo</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="844"/>
+        <source>Toggle Background</source>
+        <translation>Conmutar Fondo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="81"/>
         <source>Setup Wizard</source>
         <translation>Asistente de Configuración</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="842"/>
+        <source>Reveal hidden Text</source>
+        <translation>Revelar texto oculto</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="845"/>
+        <source>Reveal hidden Text</source>
+        <translation>Revelar texto oculto</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="82"/>
         <location filename="../html/htmlstrings.h" line="129"/>
         <source>Storage Groups</source>
         <translation>Grupos de Almacenamiento</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1084"/>
+        <source>Up Arrow</source>
+        <translation>Flecha Arriba</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1085"/>
+        <source>Up Arrow</source>
+        <translation>Flecha Arriba</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="83"/>
         <source>System Events</source>
         <translation>Eventos del Sistema</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1086"/>
+        <source>Down Arrow</source>
+        <translation>Flecha Abajo</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1087"/>
+        <source>Down Arrow</source>
+        <translation>Flecha Abajo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="84"/>
         <source>Utilities</source>
         <translation>Aplicaciones</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1088"/>
+        <source>Left Arrow</source>
+        <translation>Flecha Izquierda</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1089"/>
+        <source>Left Arrow</source>
+        <translation>Flecha Izquierda</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="85"/>
         <source>Video Library Service</source>
         <translation>Servicio de Videoteca</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1090"/>
+        <source>Right Arrow</source>
+        <translation>Flecha Derecha</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1091"/>
+        <source>Right Arrow</source>
+        <translation>Flecha Derecha</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="86"/>
         <source>View Logs</source>
         <translation>Ver Registros</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1092"/>
+        <source>Move to next widget</source>
+        <translation>Ir al siguiente icono</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1093"/>
+        <source>Move to next widget</source>
+        <translation>Ir al siguiente icono</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="87"/>
         <source>WSDL Links</source>
         <translation>Enlaces WSDL</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1094"/>
+        <source>Move to preview widget</source>
+        <translation>Ir al icono de previsualización</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1095"/>
+        <source>Move to preview widget</source>
+        <translation>Ir al icono de previsualización</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="89"/>
         <source>Actions</source>
         <translation>Acciones</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1096"/>
+        <source>Select</source>
+        <translation>Seleccionar</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1097"/>
+        <source>Select</source>
+        <translation>Seleccionar</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="90"/>
         <source>Commercial Flagger</source>
         <translation>Marcador de Anuncios</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1098"/>
+        <source>Backspace</source>
+        <translation>Atrás</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1099"/>
+        <source>Backspace</source>
+        <translation>Atrás</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="91"/>
         <source>Commercial Flagging</source>
         <translation>Marcación de Anuncios</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1100"/>
+        <source>Escape</source>
+        <translation>Escape</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1101"/>
+        <source>Escape</source>
+        <translation>Escape</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="92"/>
         <source>Description</source>
         <translation>Descripción</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1102"/>
+        <source>Pop-up menu</source>
+        <translation>Menú emergente</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1103"/>
+        <source>Pop-up menu</source>
+        <translation>Menú emergente</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="93"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1104"/>
+        <source>More information</source>
+        <translation>Más información</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1106"/>
+        <source>Delete</source>
+        <translation>Eliminar</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1108"/>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1105"/>
+        <source>More information</source>
+        <translation>Más información</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1107"/>
+        <source>Delete</source>
+        <translation>Eliminar</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1109"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="94"/>
         <source>Transcoder</source>
         <translation>Transcodificador</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1110"/>
+        <source>Save screenshot</source>
+        <translation>Guardar captura</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1111"/>
+        <source>Save screenshot</source>
+        <translation>Guardar captura</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="95"/>
         <source>Transcoding</source>
         <translation>Transcodificando</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1112"/>
+        <source>Play a media resource</source>
+        <translation>Reproducir un recurso</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1113"/>
+        <source>Play a media resource</source>
+        <translation>Reproducir un recurso</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="96"/>
         <source>User Job #%1</source>
         <translation>Tarea de Usuario #%1</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1119"/>
+        <source>Page to top of list</source>
+        <translation>Ir al principio de la lista</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1120"/>
+        <source>Page to top of list</source>
+        <translation>Ir al principio de la lista</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="98"/>
         <source>Local Backend</source>
         <translation>Servidor Local</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1121"/>
+        <source>Page to middle of list</source>
+        <translation>Ir a la mitad de la lista</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1122"/>
+        <source>Page to middle of list</source>
+        <translation>Ir a la mitad de la lista</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="99"/>
         <source>Local Backend (IPv6)</source>
         <translation>Servidor Local (IPv6)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1123"/>
+        <source>Page to bottom of list</source>
+        <translation>Ir al final de la lista</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1124"/>
+        <source>Page to bottom of list</source>
+        <translation>Ir al final de la lista</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="100"/>
         <source>Make this server the master backend</source>
         <translation>Hacer que éste sea el servidor principal</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1126"/>
+        <source>Previous View</source>
+        <translation>Vista Anterior</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1127"/>
+        <source>Previous View</source>
+        <translation>Vista Anterior</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="101"/>
         <source>Master Backend</source>
         <translation>Servidor Principal</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1128"/>
+        <source>Next View</source>
+        <translation>Vista Siguiente</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1129"/>
+        <source>Next View</source>
+        <translation>Vista Siguiente</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="102"/>
         <source>Security PIN</source>
         <translation>PIN de seguridad</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1131"/>
+        <source>Help</source>
+        <translation>Ayuda</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1132"/>
+        <source>Help</source>
+        <translation>Ayuda</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="103"/>
         <source>Use Link-Local</source>
         <translation>Usar Enlace-Local</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1133"/>
+        <source>Eject Removable Media</source>
+        <translation>Expulsar Medios Extraíbles</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1134"/>
+        <source>Eject Removable Media</source>
+        <translation>Expulsar Medios Extraíbles</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="105"/>
         <location filename="../html/htmlstrings.h" line="116"/>
         <location filename="../html/htmlstrings.h" line="134"/>
         <location filename="../html/htmlstrings.h" line="141"/>
         <source>Filter</source>
         <translation>Filtro</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1136"/>
+        <source>Cut text from textedit</source>
+        <translation>Cortar texto del editor</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1137"/>
+        <source>Cut text from textedit</source>
+        <translation>Cortar texto del editor</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="106"/>
         <location filename="../html/htmlstrings.h" line="120"/>
         <location filename="../html/htmlstrings.h" line="137"/>
         <location filename="../html/htmlstrings.h" line="144"/>
         <source>List Files</source>
         <translation>Lista de Archivos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1138"/>
+        <source>Copy text from textedit</source>
+        <translation>Copiar texto del editor</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1139"/>
+        <source>Copy text from textedit</source>
+        <translation>Copiar texto del editor</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="108"/>
         <source>Sample Storage Group browser</source>
         <translation>Explorador del Grupo de Almacenamiento de Muestras</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1140"/>
+        <source>Paste text into textedit</source>
+        <translation>Pegar texto en el editor</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1141"/>
+        <source>Paste text into textedit</source>
+        <translation>Pegar texto en el editor</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="109"/>
         <location filename="../html/htmlstrings.h" line="146"/>
         <source>Storage Group</source>
         <translation>Grupo de Almacenamiento</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1142"/>
+        <source>Undo</source>
+        <translation>Deshacer</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1143"/>
+        <source>Undo</source>
+        <translation>Deshacer</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="111"/>
         <source>Add Stream</source>
         <translation>Añadir Emisión</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1144"/>
+        <source>Redo</source>
+        <translation>Rehacer</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1145"/>
+        <source>Redo</source>
+        <translation>Rehacer</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="112"/>
         <source>Audio</source>
         <translation>Sonido</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1146"/>
+        <source>Show incremental search dialog</source>
+        <translation>Mostrar diálogo de búsqueda progresiva</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1147"/>
+        <source>Show incremental search dialog</source>
+        <translation>Mostrar diálogo de búsqueda progresiva</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="113"/>
         <source>Bitrate</source>
         <translation>Tasa de bits</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1149"/>
+        <source>0</source>
+        <translation>0</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1150"/>
+        <source>0</source>
+        <translation>0</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="114"/>
         <source>Delete</source>
         <translation>Eliminar</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1150"/>
+        <source>1</source>
+        <translation>1</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1151"/>
+        <source>1</source>
+        <translation>1</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="115"/>
         <source>Filename</source>
         <translation>Nombre de archivo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1151"/>
+        <source>2</source>
+        <translation>2</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1152"/>
+        <source>2</source>
+        <translation>2</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="117"/>
         <source>Group</source>
         <translation>Grupo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1152"/>
+        <source>3</source>
+        <translation>3</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1153"/>
+        <source>3</source>
+        <translation>3</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="118"/>
         <location filename="../html/htmlstrings.h" line="142"/>
         <source>HTTP Live Stream Demo</source>
         <translation>Demostración de Difusión HTTP en Vivo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1153"/>
+        <source>4</source>
+        <translation>4</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1154"/>
+        <source>4</source>
+        <translation>4</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="119"/>
         <source>Height</source>
         <translation>Alto</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1154"/>
+        <source>5</source>
+        <translation>5</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1155"/>
+        <source>5</source>
+        <translation>5</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="121"/>
         <source>List Recordings</source>
         <translation>Lista de Grabaciones</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1155"/>
+        <source>6</source>
+        <translation>6</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1156"/>
+        <source>6</source>
+        <translation>6</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="123"/>
         <source>Play</source>
         <translation>Reproducir</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1156"/>
+        <source>7</source>
+        <translation>7</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1157"/>
+        <source>7</source>
+        <translation>7</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="124"/>
         <source>Recordings:</source>
         <translation>Grabaciones:</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1157"/>
+        <source>8</source>
+        <translation>8</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1158"/>
+        <source>8</source>
+        <translation>8</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="125"/>
         <source>Refresh</source>
         <translation>Refrescar</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1158"/>
+        <source>9</source>
+        <translation>9</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1159"/>
+        <source>9</source>
+        <translation>9</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="126"/>
         <source>Size</source>
         <translation>Tamaño</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1160"/>
+        <source>Turn the display on</source>
+        <translation>Encender la pantalla</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1161"/>
+        <source>Turn the display on</source>
+        <translation>Encender la pantalla</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="127"/>
         <source>Status</source>
         <translation>Estado</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1162"/>
+        <source>Turn the display off</source>
+        <translation>Apagar la pantalla</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1163"/>
+        <source>Turn the display off</source>
+        <translation>Apagar la pantalla</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="128"/>
         <source>Stop</source>
         <translation>Detener</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1165"/>
+        <source>Trigger System Key Event #1</source>
+        <translation>Activar Evento de Tecla del Sistema #1</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1166"/>
+        <source>Trigger System Key Event #1</source>
+        <translation>Activar Evento de Tecla del Sistema #1</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="130"/>
         <location filename="../html/htmlstrings.h" line="147"/>
         <source>Waiting</source>
         <translation>Esperando</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1167"/>
+        <source>Trigger System Key Event #2</source>
+        <translation>Activar Evento de Tecla del Sistema #2</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1168"/>
+        <source>Trigger System Key Event #2</source>
+        <translation>Activar Evento de Tecla del Sistema #2</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="131"/>
         <source>Width</source>
         <translation>Ancho</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1169"/>
+        <source>Trigger System Key Event #3</source>
+        <translation>Activar Evento de Tecla del Sistema #3</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1170"/>
+        <source>Trigger System Key Event #3</source>
+        <translation>Activar Evento de Tecla del Sistema #3</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="132"/>
         <source>install JW Player&amp;trade;</source>
         <translation>instalar JW Player&amp;trade;</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1171"/>
+        <source>Trigger System Key Event #4</source>
+        <translation>Activar Evento de Tecla del Sistema #4</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1172"/>
+        <source>Trigger System Key Event #4</source>
+        <translation>Activar Evento de Tecla del Sistema #4</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="135"/>
         <source>HTTP Live Stream Demo2</source>
         <translation>Demostración 2 de Difusión HTTP en Vivo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1173"/>
+        <source>Trigger System Key Event #5</source>
+        <translation>Activar Evento de Tecla del Sistema #5</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1174"/>
+        <source>Trigger System Key Event #5</source>
+        <translation>Activar Evento de Tecla del Sistema #5</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="136"/>
         <source>HTTP Live Streams Demo2</source>
         <translation>Demostración 2 de Difusión HTTP en Vivo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1175"/>
+        <source>Trigger System Key Event #6</source>
+        <translation>Activar Evento de Tecla del Sistema #6</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1176"/>
+        <source>Trigger System Key Event #6</source>
+        <translation>Activar Evento de Tecla del Sistema #6</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="139"/>
         <source>Recording Group</source>
         <translation>Grupo de Grabación</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1177"/>
+        <source>Trigger System Key Event #7</source>
+        <translation>Activar Evento de Tecla del Sistema #7</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1178"/>
+        <source>Trigger System Key Event #7</source>
+        <translation>Activar Evento de Tecla del Sistema #7</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../html/htmlstrings.h" line="143"/>
         <source>HTTP Live Streams Demo</source>
         <translation>Demostración de Difusión HTTP en Vivo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1179"/>
+        <source>Trigger System Key Event #8</source>
+        <translation>Activar Evento de Tecla del Sistema #8</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1180"/>
+        <source>Trigger System Key Event #8</source>
+        <translation>Activar Evento de Tecla del Sistema #8</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
+<<<<<<< HEAD
 </context>
 <context>
     <name>IdleScreen</name>
@@ -4190,110 +6672,312 @@ Delete the current cut or preserved region</extracomment>
             <numerusform>MythTV está desocupado y se apagará en %n segundo.</numerusform>
             <numerusform>MythTV está desocupado y se apagará en %n segundos.</numerusform>
         </translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+    <message>
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1181"/>
+        <source>Trigger System Key Event #9</source>
+        <translation>Activar Evento de Tecla del Sistema #9</translation>
+=======
+    <message>
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1182"/>
+        <source>Trigger System Key Event #9</source>
+        <translation>Activar Evento de Tecla del Sistema #9</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>ImportConfigurationGroup</name>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="1701"/>
         <source>A local file used to simulate a recording. Leave empty to use MythEvents to trigger an external program to import recording files.</source>
         <translation>Un archivo local usado para simular una grabación. Déjelo vacío para usar MythEvents para lanzar un programa externo que importe archivos de grabación.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1183"/>
+        <source>Trigger System Key Event #10</source>
+        <translation>Activar Evento de Tecla del Sistema #10</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1184"/>
+        <source>Trigger System Key Event #10</source>
+        <translation>Activar Evento de Tecla del Sistema #10</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="1709"/>
         <source>File info</source>
         <translation>Información del archivo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1187"/>
+        <source>Zoom in on browser window</source>
+        <translation>Ampliar en la ventana del navegador</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1188"/>
+        <source>Zoom in on browser window</source>
+        <translation>Ampliar en la ventana del navegador</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="1712"/>
         <source>File size</source>
         <translation>Tamaño del archivo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1189"/>
+        <source>Zoom out on browser window</source>
+        <translation>Reducir en la ventana del navegador</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1190"/>
+        <source>Zoom out on browser window</source>
+        <translation>Reducir en la ventana del navegador</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="1735"/>
         <source>%1 MB</source>
         <translation>%1 MB</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1191"/>
+        <source>Toggle where keyboard input goes to</source>
+        <translation>Cambiar a dónde va la entrada del teclado</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1192"/>
+        <source>Toggle where keyboard input goes to</source>
+        <translation>Cambiar a dónde va la entrada del teclado</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="1738"/>
         <source>File not readable</source>
         <translation>El archivo no se puede leer</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1194"/>
+        <source>Move mouse pointer up</source>
+        <translation>Mover arriba el puntero</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1195"/>
+        <source>Move mouse pointer up</source>
+        <translation>Mover arriba el puntero</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="1742"/>
         <source>File %1 does not exist</source>
         <translation>El archivo %1 no existe</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1196"/>
+        <source>Move mouse pointer down</source>
+        <translation>Mover abajo el puntero</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1197"/>
+        <source>Move mouse pointer down</source>
+        <translation>Mover abajo el puntero</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>ImportIconsWizard</name>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/importicons.cpp" line="92"/>
         <source>Name of the icon file</source>
         <translation>Nombre del archivo de icono</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1198"/>
+        <source>Move mouse pointer left</source>
+        <translation>Mover a la izquierda el puntero</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1199"/>
+        <source>Move mouse pointer left</source>
+        <translation>Mover a la izquierda el puntero</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/importicons.cpp" line="93"/>
         <source>List of possible icon files</source>
         <translation>Lista de posibles archivos de icono</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1200"/>
+        <source>Move mouse pointer right</source>
+        <translation>Mover a la derecha el puntero</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1201"/>
+        <source>Move mouse pointer right</source>
+        <translation>Mover a la derecha el puntero</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/importicons.cpp" line="94"/>
         <source>Enter text here for the manual search</source>
         <translation>Introduzca texto aquí para la búsqueda manual</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1202"/>
+        <source>Mouse Left button click</source>
+        <translation>Pulsación izquierda del ratón</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1203"/>
+        <source>Mouse Left button click</source>
+        <translation>Pulsación izquierda del ratón</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/importicons.cpp" line="95"/>
         <source>Manually search for the text</source>
         <translation>Búsqueda manual para el texto</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1205"/>
+        <source>Scroll down half a page</source>
+        <translation>Descender media página</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1206"/>
+        <source>Scroll down half a page</source>
+        <translation>Descender media página</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/importicons.cpp" line="96"/>
         <source>Skip this icon</source>
         <translation>Saltar este icono</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1207"/>
+        <source>Scroll up half a page</source>
+        <translation>Ascender media página</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1208"/>
+        <source>Scroll up half a page</source>
+        <translation>Ascender media página</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/importicons.cpp" line="131"/>
         <source>Finish</source>
         <translation>Finalizar</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1209"/>
+        <source>Scroll left half a page</source>
+        <translation>Ir a la izquierda media página</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1210"/>
+        <source>Scroll left half a page</source>
+        <translation>Ir a la izquierda media página</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/importicons.cpp" line="133"/>
         <source>Skip</source>
         <translation>Omitir</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1211"/>
+        <source>Scroll right half a page</source>
+        <translation>Ir a la derecha media página</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1212"/>
+        <source>Scroll right half a page</source>
+        <translation>Ir a la derecha media página</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/importicons.cpp" line="165"/>
         <location filename="../programs/mythtv-setup/importicons.cpp" line="460"/>
         <source>No matches found for %1</source>
         <translation>No se encontraron coincidencias para %1</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1214"/>
+        <source>Move selection to next link</source>
+        <translation>Mover selección al siguiente enlace</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1215"/>
+        <source>Move selection to next link</source>
+        <translation>Mover selección al siguiente enlace</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/importicons.cpp" line="210"/>
         <source>Icon for %1 was downloaded successfully.</source>
         <translation>El icono para %1 se descargó correctamente.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1216"/>
+        <source>Move selection to previous link</source>
+        <translation>Mover selección al anterior enlace</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1217"/>
+        <source>Move selection to previous link</source>
+        <translation>Mover selección al anterior enlace</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/importicons.cpp" line="215"/>
         <source>Failed to download the icon for %1.</source>
         <translation>Error al descargar el icono para %1.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1218"/>
+        <source>Follow selected link</source>
+        <translation>Seguir el enlace seleccionado</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1219"/>
+        <source>Follow selected link</source>
+        <translation>Seguir el enlace seleccionado</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/importicons.cpp" line="310"/>
         <source>Initializing, please wait...</source>
         <translation>Inicializando; por favor, espere...</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1220"/>
+        <source>Go back to previous page</source>
+        <translation>Volver a la página anterior</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1221"/>
+        <source>Go back to previous page</source>
+        <translation>Volver a la página anterior</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/importicons.cpp" line="373"/>
         <source>Downloading, please wait...</source>
         <translation>Descargando; por favor, espere...</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1222"/>
+        <source>Go forward to previous page</source>
+        <translation>Avanzar a la página anterior</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1223"/>
+        <source>Go forward to previous page</source>
+        <translation>Avanzar a la página anterior</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/importicons.cpp" line="393"/>
         <source>Downloading %1 / %2 : %3</source>
         <extracomment>%1 is the current channel position, * %2 is the total number of channels, * %3 is the channel name</extracomment>
         <translation>Descargando %1 / %2 : %3</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1227"/>
+        <source>System Exit</source>
+        <translation>Salir del Sistema</translation>
+=======
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1228"/>
+        <source>System Exit</source>
+        <translation>Salir del Sistema</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
+<<<<<<< HEAD
     <message numerus="yes">
         <location filename="../programs/mythtv-setup/importicons.cpp" line="401"/>
         <source>Could not find %n icon(s).</source>
@@ -4301,6 +6985,17 @@ Delete the current cut or preserved region</extracomment>
             <numerusform>No fue posible encontrar %n icono.</numerusform>
             <numerusform>No fue posible encontrar %n iconos.</numerusform>
         </translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+    <message>
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1225"/>
+        <source>Display System Exit Prompt</source>
+        <translation>Preguntar al Salir del Sistema</translation>
+=======
+    <message>
+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1226"/>
+        <source>Display System Exit Prompt</source>
+        <translation>Preguntar al Salir del Sistema</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../programs/mythtv-setup/importicons.cpp" line="456"/>
@@ -4636,9 +7331,19 @@ Delete the current cut or preserved region</extracomment>
         <translation>Seleccione grabadora de CD</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/mythmediamonitor.cpp" line="898"/>
         <source>Select a DVD writer</source>
         <translation>Seleccione grabadora de DVD</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythui/myththemedmenu.cpp" line="909"/>
+        <source>Enter password:</source>
+        <translation>Introduzca contraseña:</translation>
+=======
+        <location filename="../libs/libmythui/myththemedmenu.cpp" line="907"/>
+        <source>Enter password:</source>
+        <translation>Introduzca contraseña:</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
@@ -4837,613 +7542,2007 @@ Delete the current cut or preserved region</extracomment>
         <translation>Administrar Grabaciones / Resolver Conflictos</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1296"/>
         <source>Program Recording Priorities</source>
         <translation>Prioridades de la Grabación de Programas</translation>
-    </message>
-    <message>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="1197"/>
+        <source>% used</source>
+        <translation>% utilizado</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="1276"/>
+        <source>% used</source>
+        <translation>% utilizado</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
+    </message>
+    <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1298"/>
         <source>Manage Recording Rules</source>
         <translation>Administrar Reglas de Grabación</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2507"/>
+        <source>Are you sure you want to delete:</source>
+        <translation>¿Seguro que desea eliminar:</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2528"/>
+        <source>Are you sure you want to delete:</source>
+        <translation>¿Seguro que desea eliminar:</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1300"/>
         <source>Channel Recording Priorities</source>
         <translation>Prioridades de la Grabación de Canales</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2513"/>
+        <source>Are you sure you want to stop:</source>
+        <translation>¿Seguro que desea detener:</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2534"/>
+        <source>Are you sure you want to stop:</source>
+        <translation>¿Seguro que desea detener:</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1302"/>
         <source>TV Recording Playback</source>
         <translation>Reproducir Grabación de TV</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2660"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3120"/>
+        <source>Play</source>
+        <translation>Reproducir</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2681"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3141"/>
+        <source>Play</source>
+        <translation>Reproducir</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1304"/>
         <source>TV Recording Deletion</source>
         <translation>Eliminar Grabación de TV</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3142"/>
+        <source>Stop Recording</source>
+        <translation>Detener Grabación</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3163"/>
+        <source>Stop Recording</source>
+        <translation>Detener Grabación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1306"/>
         <source>Live TV</source>
         <translation>TV en Vivo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2679"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3092"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3164"/>
+        <source>Delete</source>
+        <translation>Eliminar</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2700"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3113"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3185"/>
+        <source>Delete</source>
+        <translation>Eliminar</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1308"/>
         <source>Live TV In Guide</source>
         <translation>TV en Vivo en la Guía</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2552"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2556"/>
+        <source>Yes, delete it</source>
+        <translation>Sí, eliminarla</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2573"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2577"/>
+        <source>Yes, delete it</source>
+        <translation>Sí, eliminarla</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1310"/>
         <source>Status Screen</source>
         <translation>Pantalla de Estado</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2362"/>
+        <source>Change Group View</source>
+        <translation>Cambiar Vista de Grupo</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2381"/>
+        <source>Change Group View</source>
+        <translation>Cambiar Vista de Grupo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1312"/>
         <source>Previously Recorded</source>
         <translation>Grabados Anteriormente</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2366"/>
+        <source>Change Group Password</source>
+        <translation>Cambiar Contraseña de Grupo</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2385"/>
+        <source>Change Group Password</source>
+        <translation>Cambiar Contraseña de Grupo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1315"/>
         <source>Standby Mode</source>
         <translation>Modo de Espera</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2693"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2906"/>
+        <source>Change Recording Group</source>
+        <translation>Cambiar Grupo de Grabación</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2714"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2927"/>
+        <source>Change Recording Group</source>
+        <translation>Cambiar Grupo de Grabación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1320"/>
         <source>The Video Default View</source>
         <translation>La Vista Predeterminada de Vídeos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2924"/>
+        <source>Edit Recording Schedule</source>
+        <translation>Editar Programación de Grabación</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2945"/>
+        <source>Edit Recording Schedule</source>
+        <translation>Editar Programación de Grabación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1322"/>
         <source>The Video Manager</source>
         <translation>El Gestor de Vídeos</translation>
-    </message>
-    <message>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="1201"/>
+        <source>, %1 GB free</source>
+        <translation>, %1 GB libres</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="1280"/>
+        <source>, %1 GB free</source>
+        <translation>, %1 GB libres</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
+    </message>
+    <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1324"/>
         <source>The Video Browser</source>
         <translation>El Explorador de Vídeos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2764"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2973"/>
+        <source>Stop Transcoding</source>
+        <translation>Detener Transcodificación</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2785"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2994"/>
+        <source>Stop Transcoding</source>
+        <translation>Detener Transcodificación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1326"/>
         <source>The Video Listings</source>
         <translation>Las Listas de Vídeos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2762"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2973"/>
+        <source>Begin Transcoding</source>
+        <translation>Iniciar Transcodificación</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2783"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2994"/>
+        <source>Begin Transcoding</source>
+        <translation>Iniciar Transcodificación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1328"/>
         <source>The Video Gallery</source>
         <translation>La Galería de Vídeos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3026"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4358"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4557"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4600"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4828"/>
+        <source>Default</source>
+        <translation>Predeterminado</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3047"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4380"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4579"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4622"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4851"/>
+        <source>Default</source>
+        <translation>Predeterminado</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1330"/>
         <source>Play an Optical Disc</source>
         <translation>Reproducir un Disco Óptico</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2544"/>
+        <source>Yes, and allow re-record</source>
+        <translation>Sí, y permitir grabar de nuevo</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2565"/>
+        <source>Yes, and allow re-record</source>
+        <translation>Sí, y permitir grabar de nuevo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1333"/>
         <source>Toggle Show Widget Borders</source>
         <translation>Cambiar Mostrar Bordes de los Iconos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2888"/>
+        <source>Play from beginning</source>
+        <translation>Reproducir desde el principio</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2909"/>
+        <source>Play from beginning</source>
+        <translation>Reproducir desde el principio</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1335"/>
         <source>Toggle Show Widget Names</source>
         <translation>Cambiar Mostrar Nombres de los Iconos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2887"/>
+        <source>Play from bookmark</source>
+        <translation>Reproducir desde el marcador</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2908"/>
+        <source>Play from bookmark</source>
+        <translation>Reproducir desde el marcador</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1337"/>
         <source>Reset All Keys</source>
         <translation>Reiniciar Todas las Teclas</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2903"/>
+        <source>Do not preserve this episode</source>
+        <translation>No conservar este episodio</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2924"/>
+        <source>Do not preserve this episode</source>
+        <translation>No conservar este episodio</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1338"/>
         <source>Reset all keys to defaults</source>
         <translation>Reiniciar todas las teclas a sus valores predeterminados</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2903"/>
+        <source>Preserve this episode</source>
+        <translation>Conservar este episodio</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2924"/>
+        <source>Preserve this episode</source>
+        <translation>Conservar este episodio</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1425"/>
         <source>MythTV&apos;s native media player.</source>
         <translation>Reproductor de medios nativo de MythTV.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3118"/>
+        <source>Play from...</source>
+        <translation>Reproducir desde...</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3139"/>
+        <source>Play from...</source>
+        <translation>Reproducir desde...</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1123"/>
         <source>Page Up</source>
         <translation>Página Arriba</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2677"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2899"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3150"/>
+        <source>Storage Options</source>
+        <translation>Opciones de Guardado</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2698"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2920"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3171"/>
+        <source>Storage Options</source>
+        <translation>Opciones de Guardado</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1125"/>
         <source>Page Down</source>
         <translation>Página Abajo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3084"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3151"/>
+        <source>Recording Options</source>
+        <translation>Opciones de Grabación</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3105"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3172"/>
+        <source>Recording Options</source>
+        <translation>Opciones de Grabación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="514"/>
         <source>Play Program</source>
         <translation>Reproducir Programa</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2678"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2943"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3152"/>
+        <source>Job Options</source>
+        <translation>Opciones de Tareas</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2699"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2964"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3173"/>
+        <source>Job Options</source>
+        <translation>Opciones de Tareas</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="516"/>
         <source>Stop Program</source>
         <translation>Detener Programa</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2661"/>
+        <source>Shuffle Play</source>
+        <translation>Reproducción Aleatoria</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2682"/>
+        <source>Shuffle Play</source>
+        <translation>Reproducción Aleatoria</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="518"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="620"/>
         <source>Toggle recording status of current program</source>
         <translation>Cambiar el estado de grabación del programa actual</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2371"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3133"/>
+        <source>Playlist options</source>
+        <translation>Opciones de la lista de reproducción</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2390"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3154"/>
+        <source>Playlist options</source>
+        <translation>Opciones de la lista de reproducción</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="520"/>
         <source>Page the program guide back one day</source>
         <translation>Retroceder un día en la guía de programas</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2382"/>
+        <source>Add this recording to Playlist</source>
+        <translation>Añadir esta grabación a la Lista de Reproducción</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2401"/>
+        <source>Add this recording to Playlist</source>
+        <translation>Añadir esta grabación a la Lista de Reproducción</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="522"/>
         <source>Page the program guide forward one day</source>
         <translation>Avanzar un día en la guía de programas</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2662"/>
+        <source>Clear Playlist</source>
+        <translation>Borrar Lista de Reproducción</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2683"/>
+        <source>Clear Playlist</source>
+        <translation>Borrar Lista de Reproducción</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="524"/>
         <source>Page the program guide left</source>
         <translation>Ir a la izquierda en la guía de programas</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2667"/>
+        <source>Toggle playlist for this Category/Title</source>
+        <translation>Conmutar lista de reproducción para esta Categoría/Título</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2688"/>
+        <source>Toggle playlist for this Category/Title</source>
+        <translation>Conmutar lista de reproducción para esta Categoría/Título</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="526"/>
         <source>Page the program guide right</source>
         <translation>Ir a la derecha en la guía de programas</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2674"/>
+        <source>Toggle playlist for this recording</source>
+        <translation>Conmutar lista de reproducción para esta grabación</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2695"/>
+        <source>Toggle playlist for this recording</source>
+        <translation>Conmutar lista de reproducción para esta grabación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="528"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="622"/>
         <source>Toggle the current channel as a favorite</source>
         <translation>Cambiar el canal actual como favorito</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3081"/>
+        <source>Recording file cannot be found</source>
+        <translation>No fue posible encontrar el archivo de grabación</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3102"/>
+        <source>Recording file cannot be found</source>
+        <translation>No fue posible encontrar el archivo de grabación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="530"/>
         <source>Reverse the channel order in the program guide</source>
         <translation>Invertir el orden de los canales en la guía de programas</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3083"/>
+        <source>Recording file contains no data</source>
+        <translation>El archivo de grabación no contiene datos</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3104"/>
+        <source>Recording file contains no data</source>
+        <translation>El archivo de grabación no contiene datos</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="532"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="780"/>
         <source>Show the Program Guide</source>
         <translation>Mostrar la Guía de Programas</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3096"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3126"/>
+        <source>Remove from Playlist</source>
+        <translation>Eliminar de la Lista de Reproducción</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3117"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3147"/>
+        <source>Remove from Playlist</source>
+        <translation>Eliminar de la Lista de Reproducción</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="534"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="782"/>
         <source>Show the Program Finder</source>
         <translation>Mostrar el Buscador de Programas</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3100"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3129"/>
+        <source>Add to Playlist</source>
+        <translation>Añadir a la Lista de Reproducción</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3121"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3150"/>
+        <source>Add to Playlist</source>
+        <translation>Añadir a la Lista de Reproducción</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="536"/>
         <source>Cycle through channel groups and all channels in the program guide.</source>
         <translation>Rotar grupos de canales y todos los canales en la guía de programas.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3003"/>
+        <source>User Job</source>
+        <translation>Tarea de Usuario</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3024"/>
+        <source>User Job</source>
+        <translation>Tarea de Usuario</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="539"/>
         <source>Switch channels without exiting guide in Live TV mode.</source>
         <translation>Cambiar canales sin salir de la guía en el modo TV en Vivo.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2785"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2798"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2811"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2824"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3004"/>
+        <source>Stop</source>
+        <translation>Detener</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2806"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2819"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2832"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2845"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3025"/>
+        <source>Stop</source>
+        <translation>Detener</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="541"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="624"/>
         <source>Volume down</source>
         <translation>Subir volumen</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2782"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2795"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2808"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2821"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3005"/>
+        <source>Begin</source>
+        <translation>Comenzar</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2803"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2816"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2829"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2842"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3026"/>
+        <source>Begin</source>
+        <translation>Comenzar</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="543"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="626"/>
         <source>Volume up</source>
         <translation>Bajar volumen</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2359"/>
+        <source>Change Group Filter</source>
+        <translation>Cambiar Filtro de Grupos</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2378"/>
+        <source>Change Group Filter</source>
+        <translation>Cambiar Filtro de Grupos</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="545"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="628"/>
         <source>Mute</source>
         <translation>Silenciar</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2377"/>
+        <source>Add this Group to Playlist</source>
+        <translation>Añadir este Grupo a la Lista de Reproducción</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2396"/>
+        <source>Add this Group to Playlist</source>
+        <translation>Añadir este Grupo a la Lista de Reproducción</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="547"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="632"/>
         <source>Cycle audio channels</source>
         <translation>Rotar canales de sonido</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="566"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4337"/>
+        <source>Groups</source>
+        <translation>Grupos</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4362"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4369"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4397"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4408"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4563"/>
+        <source>%1 [%n item(s)]</source>
+        <translation>
+            <numerusform>%1 [%n elemento]</numerusform>
+            <numerusform>%1 [%n elementos]</numerusform>
+        </translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="569"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4359"/>
+        <source>Groups</source>
+        <translation>Grupos</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4384"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4391"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4419"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4430"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4585"/>
+        <source>%1 [%n item(s)]</source>
+        <translation>
+            <numerusform>%1 [%n elemento]</numerusform>
+            <numerusform>%1 [%n elementos]</numerusform>
+        </translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="549"/>
         <source>Increase program or channel rank</source>
         <translation>Aumentar la puntuación del programa o canal</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4416"/>
+        <source>Categories</source>
+        <translation>Categorías</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4438"/>
+        <source>Categories</source>
+        <translation>Categorías</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="551"/>
         <source>Decrease program or channel rank</source>
         <translation>Disminuir la puntuación del programa o canal</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2695"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2901"/>
+        <source>Disable Auto Expire</source>
+        <translation>Desactivar Autoexpiración</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2716"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2922"/>
+        <source>Disable Auto Expire</source>
+        <translation>Desactivar Autoexpiración</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="553"/>
         <source>List upcoming episodes</source>
         <translation>Mostrar lista de próximos episodios</translation>
-    </message>
-    <message>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2696"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2901"/>
+        <source>Enable Auto Expire</source>
+        <translation>Activar Autoexpiración</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2717"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2922"/>
+        <source>Enable Auto Expire</source>
+        <translation>Activar Autoexpiración</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
+    </message>
+    <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="555"/>
         <source>List scheduled upcoming episodes</source>
         <translation>Mostrar lista de próximos episodios programados</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2694"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2907"/>
+        <source>Change Playback Group</source>
+        <translation>Cambiar Grupo de Reproducción</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2715"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2928"/>
+        <source>Change Playback Group</source>
+        <translation>Cambiar Grupo de Reproducción</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="557"/>
         <source>Show details</source>
         <translation>Mostrar detalles</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3027"/>
+        <source>Autodetect</source>
+        <translation>Detectar automáticamente</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3048"/>
+        <source>Autodetect</source>
+        <translation>Detectar automáticamente</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="559"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="561"/>
         <source>Switch Capture Card view</source>
         <translation>Cambiar vista de Capturadora</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3050"/>
+        <source>High Quality</source>
+        <translation>Calidad Alta</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3071"/>
+        <source>High Quality</source>
+        <translation>Calidad Alta</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="563"/>
         <source>Edit Custom Record Rule</source>
         <translation>Editar Regla de Grabación Personalizada</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3052"/>
+        <source>Medium Quality</source>
+        <translation>Calidad Media</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3073"/>
+        <source>Medium Quality</source>
+        <translation>Calidad Media</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="565"/>
         <source>Change Recording Group</source>
         <translation>Cambiar Grupo de Grabación</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3054"/>
+        <source>Low Quality</source>
+        <translation>Calidad Baja</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3075"/>
+        <source>Low Quality</source>
+        <translation>Calidad Baja</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="567"/>
         <source>Change Group View</source>
         <translation>Cambiar Vista de Grupo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="391"/>
+        <source>Watch List</source>
+        <translation>Lista de Visión</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="392"/>
+        <source>Watch List</source>
+        <translation>Lista de Visión</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="570"/>
         <source>Exit or return to DVD menu</source>
         <translation>Salir o regresar al menú de DVD</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="1398"/>
+        <source>There are no recordings in your current view</source>
+        <translation>No hay grabaciones en su vista actual</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="1417"/>
+        <source>There are no recordings in your current view</source>
+        <translation>No hay grabaciones en su vista actual</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="572"/>
         <source>Clear OSD</source>
         <translation>Despejar OSD</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="1397"/>
+        <source>There are no recordings available</source>
+        <translation>No hay grabaciones disponibles</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="1416"/>
+        <source>There are no recordings available</source>
+        <translation>No hay grabaciones disponibles</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="574"/>
         <source>Pause</source>
         <translation>Pausa</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3146"/>
+        <source>Mark as Unwatched</source>
+        <translation>Marcar como No Vista</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3167"/>
+        <source>Mark as Unwatched</source>
+        <translation>Marcar como No Vista</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="576"/>
         <source>Fast Forward</source>
         <translation>Avance Rápido</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3148"/>
+        <source>Mark as Watched</source>
+        <translation>Marcar como Vista</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3169"/>
+        <source>Mark as Watched</source>
+        <translation>Marcar como Vista</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="578"/>
         <source>Rewind</source>
         <translation>Rebobinar</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="1625"/>
+        <source>_NO_TITLE_</source>
+        <translation>_SIN_TÍTULO_</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="1644"/>
+        <source>_NO_TITLE_</source>
+        <translation>_SIN_TÍTULO_</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="580"/>
         <source>Arbitrary Seek</source>
         <translation>Búsqueda Arbitraria</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="1637"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4389"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4391"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4395"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4406"/>
+        <source>Unknown</source>
+        <translation>Desconocida</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="1656"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4411"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4413"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4417"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4428"/>
+        <source>Unknown</source>
+        <translation>Desconocida</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="582"/>
         <source>Seek to a position in seconds</source>
         <translation>Buscar una posición en segundos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2387"/>
+        <source>Help (Status Icons)</source>
+        <translation>Ayuda (Iconos de Estado)</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2406"/>
+        <source>Help (Status Icons)</source>
+        <translation>Ayuda (Iconos de Estado)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="584"/>
         <source>Channel up</source>
         <translation>Canal Siguiente</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2680"/>
+        <source>Delete, and allow re-record</source>
+        <translation>Eliminar y permitir grabar de nuevo</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2655"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2688"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2705"/>
+        <source>There is %n item(s) in the playlist. Actions affect all items in the playlist</source>
+        <translation>
+            <numerusform>Existe %n elemento en la lista de reproducción. Las acciones afectan a todos los elementos de la lista</numerusform>
+            <numerusform>Existen %n elementos en la lista de reproducción. Las acciones afectan a todos los elementos de la lista</numerusform>
+        </translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2701"/>
+        <source>Delete, and allow re-record</source>
+        <translation>Eliminar y permitir grabar de nuevo</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2676"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2709"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2726"/>
+        <source>There is %n item(s) in the playlist. Actions affect all items in the playlist</source>
+        <translation>
+            <numerusform>Existe %n elemento en la lista de reproducción. Las acciones afectan a todos los elementos de la lista</numerusform>
+            <numerusform>Existen %n elementos en la lista de reproducción. Las acciones afectan a todos los elementos de la lista</numerusform>
+        </translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="586"/>
         <source>Channel down</source>
         <translation>Canal Anterior</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2883"/>
+        <source>Play Options</source>
+        <translation>Opciones de Reproducción</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2904"/>
+        <source>Play Options</source>
+        <translation>Opciones de Reproducción</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="588"/>
         <source>Switch to the next favorite channel</source>
         <translation>Cambiar al siguiente canal favorito</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2920"/>
+        <source>Scheduling Options</source>
+        <translation>Opciones de Programación</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2941"/>
+        <source>Scheduling Options</source>
+        <translation>Opciones de Programación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="590"/>
         <source>Switch to the previous channel</source>
         <translation>Cambiar al canal anterior</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3159"/>
+        <source>Undelete</source>
+        <translation>Recuperar</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3180"/>
+        <source>Undelete</source>
+        <translation>Recuperar</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="592"/>
         <source>Jump ahead</source>
         <translation>Saltar adelante</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3160"/>
+        <source>Delete Forever</source>
+        <translation>Eliminar Permanentemente</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3181"/>
+        <source>Delete Forever</source>
+        <translation>Eliminar Permanentemente</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="594"/>
         <source>Jump back</source>
         <translation>Saltar atrás</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4359"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4561"/>
+        <source>Deleted</source>
+        <translation>Eliminado</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4381"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4583"/>
+        <source>Deleted</source>
+        <translation>Eliminado</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="596"/>
         <source>Info utilizing cutlist</source>
         <translation>Información que utiliza la lista de cortes</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="609"/>
+        <source>Password for group &apos;%1&apos;:</source>
+        <translation>Contraseña para el grupo &apos;%1&apos;:</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="612"/>
+        <source>Password for group &apos;%1&apos;:</source>
+        <translation>Contraseña para el grupo &apos;%1&apos;:</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="598"/>
         <source>Jump to bookmark</source>
         <translation>Saltar a marcador</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="567"/>
+        <source>Recordings</source>
+        <translation>Grabaciones</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="570"/>
+        <source>Recordings</source>
+        <translation>Grabaciones</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="600"/>
         <source>Fast Forward (Sticky) or Forward one frame while paused</source>
         <translation>Avance Rápido (Pegajoso) o Avanzar un fotograma si se está en pausa</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2509"/>
+        <source>Recording file does not exist.
+Are you sure you want to delete:</source>
+        <translation>El archivo de grabación no existe
+¿Seguro que desea eliminar:</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2530"/>
+        <source>Recording file does not exist.
+Are you sure you want to delete:</source>
+        <translation>El archivo de grabación no existe
+¿Seguro que desea eliminar:</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="602"/>
         <source>Rewind (Sticky) or Rewind one frame while paused</source>
         <translation>Rebobinar (Pegajoso) o Rebobinar un fotograma si se está en pausa</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2560"/>
+        <source>Yes, stop recording</source>
+        <translation>Sí, detener la grabación</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2581"/>
+        <source>Yes, stop recording</source>
+        <translation>Sí, detener la grabación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="604"/>
         <source>Next Video Source</source>
         <translation>Siguiente Fuente de Vídeo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2584"/>
+        <source>No, keep it</source>
+        <translation>No, conservarla</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2605"/>
+        <source>No, keep it</source>
+        <translation>No, conservarla</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="606"/>
         <source>Previous Video Source</source>
         <translation>Fuente de Vídeo Anterior</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2588"/>
+        <source>No, continue recording</source>
+        <translation>No, continuar la grabación</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2609"/>
+        <source>No, continue recording</source>
+        <translation>No, continuar la grabación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="608"/>
         <source>Next Input</source>
         <translation>Siguiente Entrada</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2616"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2622"/>
+        <source>Recording Available
+</source>
+        <translation>Grabación Disponible
+</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2637"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2643"/>
+        <source>Recording Available
+</source>
+        <translation>Grabación Disponible
+</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="610"/>
         <source>Next Card</source>
         <translation>Siguiente Tarjeta</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2243"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2617"/>
+        <source>This recording is currently in use by:</source>
+        <translation>Esta grabación está siendo utilizada por:</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="680"/>
+        <source>There is/are %n recording(s) in this display group</source>
+        <translation>
+            <numerusform>Existe %n grabación en este grupo</numerusform>
+            <numerusform>Existen %n grabaciones en este grupo</numerusform>
+        </translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2262"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2638"/>
+        <source>This recording is currently in use by:</source>
+        <translation>Esta grabación está siendo utilizada por:</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="683"/>
+        <source>There is/are %n recording(s) in this display group</source>
+        <translation>
+            <numerusform>Existe %n grabación en este grupo</numerusform>
+            <numerusform>Existen %n grabaciones en este grupo</numerusform>
+        </translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="612"/>
         <source>Skip Commercial</source>
         <translation>Saltar Anuncio</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="703"/>
+        <source>, which consume %1</source>
+        <translation>, el cuál consume %1</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="706"/>
+        <source>, which consume %1</source>
+        <translation>, el cuál consume %1</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="614"/>
         <source>Skip Commercial (Reverse)</source>
         <translation>Saltar Anuncio (Hacia Atrás)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="704"/>
+        <source>GB</source>
+        <comment>GigaBytes</comment>
+        <translation>GB</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="707"/>
+        <source>GB</source>
+        <comment>GigaBytes</comment>
+        <translation>GB</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="616"/>
         <source>Jump to the start of the recording.</source>
         <translation>Saltar al comienzo de la grabación.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="1660"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2066"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2067"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4360"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4559"/>
+        <source>Live TV</source>
+        <translation>TV en Vivo</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="1679"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2085"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2086"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4382"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4581"/>
+        <source>Live TV</source>
+        <translation>TV en Vivo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="618"/>
         <source>Toggle channel browse mode</source>
         <translation>Cambiar al modo de exploración de canales</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2222"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2237"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2242"/>
+        <source>Cannot delete
+</source>
+        <translation>No es posible eliminar
+</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2241"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2256"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2261"/>
+        <source>Cannot delete
+</source>
+        <translation>No es posible eliminar
+</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="630"/>
         <source>Set the volume</source>
         <translation>Establecer volumen</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2223"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2238"/>
+        <source>This recording is already being deleted</source>
+        <translation>Esta grabación aún está siendo eliminada</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2242"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2257"/>
+        <source>This recording is already being deleted</source>
+        <translation>Esta grabación aún está siendo eliminada</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="634"/>
         <source>Toggle audio upmixer</source>
         <translation>Cambiar al conversor de sonido</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2353"/>
+        <source>Group List Menu</source>
+        <translation>Menú de la Lista de Grupos</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2372"/>
+        <source>Group List Menu</source>
+        <translation>Menú de la Lista de Grupos</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="636"/>
         <source>Toggle Picture-in-Picture view</source>
         <translation>Cambiar a vista Picture-in-Picture</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2574"/>
+        <source>Yes, delete it and the remaining %1 list items</source>
+        <translation>Sí, eliminarla con los restantes %1 elementos de la lista</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2595"/>
+        <source>Yes, delete it and the remaining %1 list items</source>
+        <translation>Sí, eliminarla con los restantes %1 elementos de la lista</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="638"/>
         <source>Toggle Picture-by-Picture view</source>
         <translation>Cambiar a vista Picture-by-Picture</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2596"/>
+        <source>No, and keep the remaining %1 list items</source>
+        <translation>No, y mantener los restantes %1 elementos de la lista</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2617"/>
+        <source>No, and keep the remaining %1 list items</source>
+        <translation>No, y mantener los restantes %1 elementos de la lista</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="640"/>
         <source>Create Picture-in-Picture view</source>
         <translation>Crear vista Picture-in-Picture</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2623"/>
+        <source>This recording is currently Available</source>
+        <translation>Esta grabación está actualmente Disponible</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2644"/>
+        <source>This recording is currently Available</source>
+        <translation>Esta grabación está actualmente Disponible</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="642"/>
         <source>Create Picture-by-Picture view</source>
         <translation>Crear vista Picture-by-Picture</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2628"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2632"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2637"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2642"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2647"/>
+        <source>Recording Unavailable
+</source>
+        <translation>Grabación No Disponible
+</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2649"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2653"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2658"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2663"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2668"/>
+        <source>Recording Unavailable
+</source>
+        <translation>Grabación No Disponible
+</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="644"/>
         <source>Toggle active PIP/PBP window</source>
         <translation>Cambiar a la ventana PIP/PBP activa</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2629"/>
+        <source>This recording is currently being deleted and is unavailable</source>
+        <translation>Esta grabación está siendo eliminada y no está disponible</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2650"/>
+        <source>This recording is currently being deleted and is unavailable</source>
+        <translation>Esta grabación está siendo eliminada y no está disponible</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="646"/>
         <source>Swap PBP/PIP Windows</source>
         <translation>Intercambiar Ventanas PBP/PIP</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2633"/>
+        <source>This recording has been deleted and is unavailable</source>
+        <translation>Esta grabación ha sido eliminada y no está disponible</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2654"/>
+        <source>This recording has been deleted and is unavailable</source>
+        <translation>Esta grabación ha sido eliminada y no está disponible</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="648"/>
         <source>Change PxP view</source>
         <translation>Cambiar a vista PxP</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2638"/>
+        <source>The file for this recording can not be found</source>
+        <translation>No fue posible encontrar el archivo de esta grabación</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2659"/>
+        <source>The file for this recording can not be found</source>
+        <translation>No fue posible encontrar el archivo de esta grabación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="650"/>
         <source>Toggle the video aspect ratio</source>
         <translation>Cambiar la relación de aspecto de la imagen</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2643"/>
+        <source>The file for this recording is empty.</source>
+        <translation>El archivo de esta grabación está vacio.</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2664"/>
+        <source>The file for this recording is empty.</source>
+        <translation>El archivo de esta grabación está vacio.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="652"/>
         <source>Next Preconfigured Zoom mode</source>
         <translation>Siguiente modo de Aumento Preconfigurado</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2648"/>
+        <source>This recording is not yet available.</source>
+        <translation>Esta grabación aún no está disponible.</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2669"/>
+        <source>This recording is not yet available.</source>
+        <translation>Esta grabación aún no está disponible.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="654"/>
         <source>Toggle any captions</source>
         <translation>Conmutar subtítulos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2670"/>
+        <source>Toggle playlist for this Group</source>
+        <translation>Conmutar lista de reproducción para este Grupo</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2691"/>
+        <source>Toggle playlist for this Group</source>
+        <translation>Conmutar lista de reproducción para este Grupo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="656"/>
         <source>Enable any captions</source>
         <translation>Activar cualquier subtítulo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2697"/>
+        <source>Mark As Watched</source>
+        <translation>Marcar Como Vista</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2718"/>
+        <source>Mark As Watched</source>
+        <translation>Marcar Como Vista</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="658"/>
         <source>Disable any captions</source>
         <translation>Desactivar cualquier subtítulo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2698"/>
+        <source>Mark As Unwatched</source>
+        <translation>Marcar Como No Vista</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2719"/>
+        <source>Mark As Unwatched</source>
+        <translation>Marcar Como No Vista</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="660"/>
         <source>Toggle Teletext Captions</source>
         <translation>Conmutar Subtítulos de Teletexto</translation>
-    </message>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2767"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2974"/>
+        <source>Begin Commercial Detection</source>
+        <translation>Iniciar Detección de Anuncios</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2788"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2995"/>
+        <source>Begin Commercial Detection</source>
+        <translation>Iniciar Detección de Anuncios</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
+    </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="662"/>
         <source>Toggle Subtitles</source>
         <translation>Conmutar Subtítulos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2769"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2974"/>
+        <source>Stop Commercial Detection</source>
+        <translation>Detener Detección de Anuncios</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2790"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2995"/>
+        <source>Stop Commercial Detection</source>
+        <translation>Detener Detección de Anuncios</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="664"/>
         <source>Toggle VBI CC</source>
         <translation>Conmutar Subt. VBI</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2772"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2975"/>
+        <source>Begin Metadata Lookup</source>
+        <translation>Iniciar Búsqueda de Metadatos</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2793"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2996"/>
+        <source>Begin Metadata Lookup</source>
+        <translation>Iniciar Búsqueda de Metadatos</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="666"/>
         <source>Toggle ATSC CC</source>
         <translation>Conmutar Subt. ATSC</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2774"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2975"/>
+        <source>Stop Metadata Lookup</source>
+        <translation>Detener Búsqueda de Metadatos</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2795"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2996"/>
+        <source>Stop Metadata Lookup</source>
+        <translation>Detener Búsqueda de Metadatos</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="668"/>
         <source>Toggle Teletext Menu</source>
         <translation>Conmutar Menú de Teletexto</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2926"/>
+        <source>Allow this episode to re-record</source>
+        <translation>Permitir volver a grabar este episodio</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2947"/>
+        <source>Allow this episode to re-record</source>
+        <translation>Permitir volver a grabar este episodio</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="670"/>
         <source>Toggle External Subtitles</source>
         <translation>Conmutar Subtítulos Externos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2928"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3091"/>
+        <source>Show Recording Details</source>
+        <translation>Mostrar Detalles de la Grabación</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2949"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3112"/>
+        <source>Show Recording Details</source>
+        <translation>Mostrar Detalles de la Grabación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="672"/>
         <source>Enable External Subtitles</source>
         <translation>Activar Subtítulos Externos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2930"/>
+        <source>Change Recording Metadata</source>
+        <translation>Cambiar Metadatos de la Grabación</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2951"/>
+        <source>Change Recording Metadata</source>
+        <translation>Cambiar Metadatos de la Grabación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="674"/>
         <source>Disable External Subtitles</source>
         <translation>Desactivar Subtítulos Externos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2932"/>
+        <source>Custom Edit</source>
+        <translation>Edición Personalizada</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2953"/>
+        <source>Custom Edit</source>
+        <translation>Edición Personalizada</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="676"/>
         <source>Toggle Text Subtitles</source>
         <translation>Conmutar Subtítulos de Texto</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3022"/>
+        <source>Transcoding profiles</source>
+        <translation>Perfiles de Transcodificación</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3043"/>
+        <source>Transcoding profiles</source>
+        <translation>Perfiles de Transcodificación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="679"/>
         <source>Play audio track 1</source>
         <translation>Reproducir pista de sonido 1</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4426"/>
+        <source>Change Filter</source>
+        <translation>Filtro de Cambios</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4448"/>
+        <source>Change Filter</source>
+        <translation>Filtro de Cambios</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="681"/>
         <source>Play audio track 2</source>
         <translation>Reproducir pista de sonido 2</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4545"/>
+        <source>Add New</source>
+        <translation>Añadir Nuevo</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4567"/>
+        <source>Add New</source>
+        <translation>Añadir Nuevo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="683"/>
         <source>Display subtitle 1</source>
         <translation>Mostrar subtítulo 1</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4567"/>
+        <source>Select Recording Group</source>
+        <translation>Seleccione Grupo de Grabación</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4589"/>
+        <source>Select Recording Group</source>
+        <translation>Seleccione Grupo de Grabación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="685"/>
         <source>Display subtitle 2</source>
         <translation>Mostrar subtítulo 2</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4611"/>
+        <source>Select Playback Group</source>
+        <translation>Seleccione Grupo de Reproducción</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4633"/>
+        <source>Select Playback Group</source>
+        <translation>Seleccione Grupo de Reproducción</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="687"/>
         <source>Display Text Subtitle 1</source>
         <translation>Mostrar Subtítulo de Texto 1</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4762"/>
+        <source>New Recording Group</source>
+        <translation>Nuevo Grupo de Grabación</translation>
+=======
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4784"/>
+        <source>New Recording Group</source>
+        <translation>Nuevo Grupo de Grabación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="689"/>
         <source>Display VBI CC1</source>
         <translation>Mostrar Subt. VBI 1</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="643"/>
+        <source>Decoder</source>
+        <translation>Decodificador</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="571"/>
+        <source>Decoder</source>
+        <translation>Decodificador</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="691"/>
         <source>Display VBI CC2</source>
         <translation>Mostrar Subt. VBI 2</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="644"/>
+        <source>Max CPUs</source>
+        <translation>Máx CPUs</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="572"/>
+        <source>Max CPUs</source>
+        <translation>Máx CPUs</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="693"/>
         <source>Display VBI CC3</source>
         <translation>Mostrar Subt. VBI 3</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="627"/>
+        <source>Match criteria</source>
+        <translation>Criterios de coindicencia</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="555"/>
+        <source>Match criteria</source>
+        <translation>Criterios de coindicencia</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="695"/>
         <source>Display VBI CC4</source>
         <translation>Mostrar Subt. VBI 4</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="629"/>
+        <source>W</source>
+        <comment>Width</comment>
+        <translatorcomment>Anchura - *** IMPORTANT *** Spanish translators, please verify. I am pretty sure having two times A will cause problem in that screen since you won&apos;t know if it&apos;s width or height. thank you! knight</translatorcomment>
+        <translation>Ancho</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="557"/>
+        <source>W</source>
+        <comment>Width</comment>
+        <translatorcomment>Anchura - *** IMPORTANT *** Spanish translators, please verify. I am pretty sure having two times A will cause problem in that screen since you won&apos;t know if it&apos;s width or height. thank you! knight</translatorcomment>
+        <translation>Ancho</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="697"/>
         <source>Display ATSC CC1</source>
         <translation>Mostrar Subt. ATSC 1</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="631"/>
+        <source>H</source>
+        <comment>Height</comment>
+        <translatorcomment>Altura- *** IMPORTANT *** Spanish translators, please verify. I am pretty sure having two times A will cause problem in that screen since you won&apos;t know if it&apos;s width or height. thank you! knight</translatorcomment>
+        <translation>Alto</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="559"/>
+        <source>H</source>
+        <comment>Height</comment>
+        <translatorcomment>Altura- *** IMPORTANT *** Spanish translators, please verify. I am pretty sure having two times A will cause problem in that screen since you won&apos;t know if it&apos;s width or height. thank you! knight</translatorcomment>
+        <translation>Alto</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="699"/>
         <source>Display ATSC CC2</source>
         <translation>Mostrar Subt. ATSC 2</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="645"/>
+        <source>Deblocking filter</source>
+        <translation>Filtro eliminador de bloques</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="573"/>
+        <source>Deblocking filter</source>
+        <translation>Filtro eliminador de bloques</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="701"/>
         <source>Display ATSC CC3</source>
         <translation>Mostrar Subt. ATSC 3</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="646"/>
+        <source>Video renderer</source>
+        <translation>Procesador de vídeo</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="574"/>
+        <source>Video renderer</source>
+        <translation>Procesador de vídeo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="703"/>
         <source>Display ATSC CC4</source>
         <translation>Mostrar Subt. ATSC 4</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="647"/>
+        <source>OSD renderer</source>
+        <translation>Procesador de OSD</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="575"/>
+        <source>OSD renderer</source>
+        <translation>Procesador de OSD</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="705"/>
         <source>Enable Forced Subtitles</source>
         <translation>Activar Subtítulos Forzados</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="648"/>
+        <source>OSD fade</source>
+        <translation>Fundido de OSD</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="576"/>
+        <source>OSD fade</source>
+        <translation>Fundido de OSD</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="707"/>
         <source>Disable Forced Subtitles</source>
         <translation>Desactivar Subtítulos Forzados</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="649"/>
+        <source>Primary deinterlacer</source>
+        <translation>Desentrelazador principal</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="577"/>
+        <source>Primary deinterlacer</source>
+        <translation>Desentrelazador principal</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="710"/>
         <source>Next audio track</source>
         <translation>Pista de sonido siguiente</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="650"/>
+        <source>Fallback deinterlacer</source>
+        <translation>Desentrelazador alternativo</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="578"/>
+        <source>Fallback deinterlacer</source>
+        <translation>Desentrelazador alternativo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="712"/>
         <source>Previous audio track</source>
         <translation>Pista de sonido anterior</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="651"/>
+        <source>Custom filters</source>
+        <translation>Filtros personalizados</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="579"/>
+        <source>Custom filters</source>
+        <translation>Filtros personalizados</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="714"/>
         <source>Next subtitle track</source>
         <translation>Pista de subtítulos siguiente</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="656"/>
+        <source> Multithreaded decoding disabled-only one CPU will be used, please recompile with --enable-ffmpeg-pthreads to enable.</source>
+        <translation> Decodificación multihilo desactivada - Sólo se usará una CPU; por favor, recompile con --enable-ffmpeg-pthreads para activarla.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="584"/>
+        <source> Multithreaded decoding disabled-only one CPU will be used, please recompile with --enable-ffmpeg-pthreads to enable.</source>
+        <translation> Decodificación multihilo desactivada - Sólo se usará una CPU; por favor, recompile con --enable-ffmpeg-pthreads para activarla.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="716"/>
         <source>Previous subtitle track</source>
         <translation>Pista de subtítulos anterior</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="664"/>
+        <source>When unchecked the deblocking loopfilter will be disabled </source>
+        <translation>Al desmarcarla se desactivará el filtro eliminador de bloques </translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="592"/>
+        <source>When unchecked the deblocking loopfilter will be disabled </source>
+        <translation>Al desmarcarla se desactivará el filtro eliminador de bloques </translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="718"/>
         <source>Next Text track</source>
         <translation>Pista de Texto siguiente</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="665"/>
+        <source>Disabling will significantly reduce the load on the CPU when watching HD H.264 but may significantly reduce video quality.</source>
+        <translation>Desactivarlo reducirá significativamente la carga en la CPU al ver H.264 en Alta Definición pero podría reducir sensiblemente la calidad de imagen.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="593"/>
+        <source>Disabling will significantly reduce the load on the CPU when watching HD H.264 but may significantly reduce video quality.</source>
+        <translation>Desactivarlo reducirá significativamente la carga en la CPU al ver H.264 en Alta Definición pero podría reducir sensiblemente la calidad de imagen.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="720"/>
         <source>Previous Text track</source>
         <translation>Pista de Texto anterior</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="669"/>
+        <source>When unchecked the OSD will not fade away but instead will disappear abruptly.</source>
+        <translation>Al desmarcarla, el OSD no se fundirá sino que desaparecerá abruptamente.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="597"/>
+        <source>When unchecked the OSD will not fade away but instead will disappear abruptly.</source>
+        <translation>Al desmarcarla, el OSD no se fundirá sino que desaparecerá abruptamente.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="722"/>
         <source>Next VBI CC track</source>
         <translation>Pista de Subt. VBI siguiente</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="671"/>
+        <source>Uncheck this if the video studders while the OSD is fading away.</source>
+        <translation>Desmárquela si la imagen se granula mientras se funde el OSD.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="599"/>
+        <source>Uncheck this if the video studders while the OSD is fading away.</source>
+        <translation>Desmárquela si la imagen se granula mientras se funde el OSD.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="724"/>
         <source>Previous VBI CC track</source>
         <translation>Pista de Subt. VBI anterior</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="654"/>
+        <source>Maximum number of CPU cores used for video decoding and filtering.</source>
+        <translation>Número máximo de núcleos de la CPU utilizados para la decodificación y filtrado de la imagen.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="582"/>
+        <source>Maximum number of CPU cores used for video decoding and filtering.</source>
+        <translation>Número máximo de núcleos de la CPU utilizados para la decodificación y filtrado de la imagen.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythtv/tv_play.cpp" line="726"/>
@@ -5486,9 +9585,25 @@ Delete the current cut or preserved region</extracomment>
         <translation>Activar el control de ralentización temporal</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="743"/>
         <source>Increase time stretch speed</source>
         <translation>Aumentar la velocidad de ralentización temporal</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1191"/>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1199"/>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1207"/>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1215"/>
+        <source>Run &apos;%1&apos;</source>
+        <translation>Ejecutar &apos;%1&apos;</translation>
+=======
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1314"/>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1322"/>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1330"/>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1338"/>
+        <source>Run &apos;%1&apos;</source>
+        <translation>Ejecutar &apos;%1&apos;</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythtv/tv_play.cpp" line="745"/>
@@ -5921,417 +10036,1328 @@ Delete the current cut or preserved region</extracomment>
         <translation>Mostrar diálogo de búsqueda progresiva</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1157"/>
         <source>0</source>
         <translation>0</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="153"/>
+        <source>Program Listings</source>
+        <translation>Lista de Programas</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="162"/>
+        <source>Program Listings</source>
+        <translation>Lista de Programas</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1158"/>
         <source>1</source>
         <translation>1</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="154"/>
+        <source>New Title Search</source>
+        <translation>Nueva Búsqueda por Título</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="163"/>
+        <source>New Title Search</source>
+        <translation>Nueva Búsqueda por Título</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1159"/>
         <source>2</source>
         <translation>2</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="155"/>
+        <source>Title Search</source>
+        <translation>Búsqueda por Título</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="164"/>
+        <source>Title Search</source>
+        <translation>Búsqueda por Título</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1160"/>
         <source>3</source>
         <translation>3</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="156"/>
+        <source>Keyword Search</source>
+        <translation>Búsqueda por Palabra Clave</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="165"/>
+        <source>Keyword Search</source>
+        <translation>Búsqueda por Palabra Clave</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1161"/>
         <source>4</source>
         <translation>4</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="157"/>
+        <source>People Search</source>
+        <translation>Búsqueda por Persona</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="166"/>
+        <source>People Search</source>
+        <translation>Búsqueda por Persona</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1162"/>
         <source>5</source>
         <translation>5</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="158"/>
+        <source>Stored Search</source>
+        <translation>Búsqueda Guardada</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="167"/>
+        <source>Stored Search</source>
+        <translation>Búsqueda Guardada</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1163"/>
         <source>6</source>
         <translation>6</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="159"/>
+        <location filename="../programs/mythfrontend/proglist.cpp" line="160"/>
+        <source>Power Search</source>
+        <translation>Búsqueda Avanzada</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="168"/>
+        <location filename="../programs/mythfrontend/proglist.cpp" line="169"/>
+        <source>Power Search</source>
+        <translation>Búsqueda Avanzada</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1164"/>
         <source>7</source>
         <translation>7</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="161"/>
+        <source>Rule Search</source>
+        <translation>Búsqueda por Regla</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="170"/>
+        <source>Rule Search</source>
+        <translation>Búsqueda por Regla</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1165"/>
         <source>8</source>
         <translation>8</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="162"/>
+        <source>Category Search</source>
+        <translation>Búsqueda por Categoría</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="171"/>
+        <source>Category Search</source>
+        <translation>Búsqueda por Categoría</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1166"/>
         <source>9</source>
         <translation>9</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="163"/>
+        <source>Channel Search</source>
+        <translation>Búsqueda por Canal</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="172"/>
+        <source>Channel Search</source>
+        <translation>Búsqueda por Canal</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1168"/>
         <source>Turn the display on</source>
         <translation>Encender la pantalla</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="164"/>
+        <source>Movie Search</source>
+        <translation>Búsqueda por Película</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="173"/>
+        <source>Movie Search</source>
+        <translation>Búsqueda por Película</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1170"/>
         <source>Turn the display off</source>
         <translation>Apagar la pantalla</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="165"/>
+        <source>Time Search</source>
+        <translation>Búsqueda por Horario</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="174"/>
+        <source>Time Search</source>
+        <translation>Búsqueda por Horario</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1173"/>
         <source>Trigger System Key Event #1</source>
         <translation>Activar Evento de Tecla del Sistema #1</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="166"/>
+        <location filename="../programs/mythfrontend/proglist.cpp" line="726"/>
+        <source>Previously Recorded</source>
+        <translation>Grabados Anteriormente</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="175"/>
+        <location filename="../programs/mythfrontend/proglist.cpp" line="739"/>
+        <source>Previously Recorded</source>
+        <translation>Grabados Anteriormente</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1175"/>
         <source>Trigger System Key Event #2</source>
         <translation>Activar Evento de Tecla del Sistema #2</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="167"/>
+        <source>Unknown Search</source>
+        <translation>Búsqueda Desconocida</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="176"/>
+        <source>Unknown Search</source>
+        <translation>Búsqueda Desconocida</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1177"/>
         <source>Trigger System Key Event #3</source>
         <translation>Activar Evento de Tecla del Sistema #3</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="313"/>
+        <source>Delete Episode</source>
+        <translation>Eliminar Episodio</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="322"/>
+        <source>Delete Episode</source>
+        <translation>Eliminar Episodio</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1179"/>
         <source>Trigger System Key Event #4</source>
         <translation>Activar Evento de Tecla del Sistema #4</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="468"/>
+        <source>Start search from date and time</source>
+        <translation>Iniciar búsqueda desde una fecha y hora</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../programs/mythfrontend/proglist.cpp" line="940"/>
+        <source>%n star(s)</source>
+        <translation>
+            <numerusform>%n estrella</numerusform>
+            <numerusform>%n estrellas</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../programs/mythfrontend/proglist.cpp" line="945"/>
+        <source>%n star(s) and above</source>
+        <translation>
+            <numerusform>%n estrella al menos</numerusform>
+            <numerusform>%n estrellas al menos</numerusform>
+        </translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="477"/>
+        <source>Start search from date and time</source>
+        <translation>Iniciar búsqueda desde una fecha y hora</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../programs/mythfrontend/proglist.cpp" line="953"/>
+        <source>%n star(s)</source>
+        <translation>
+            <numerusform>%n estrella</numerusform>
+            <numerusform>%n estrellas</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../programs/mythfrontend/proglist.cpp" line="958"/>
+        <source>%n star(s) and above</source>
+        <translation>
+            <numerusform>%n estrella al menos</numerusform>
+            <numerusform>%n estrellas al menos</numerusform>
+        </translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1181"/>
         <source>Trigger System Key Event #5</source>
         <translation>Activar Evento de Tecla del Sistema #5</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="1005"/>
+        <source>Time</source>
+        <translation>Hora</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="1018"/>
+        <source>Time</source>
+        <translation>Hora</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1183"/>
         <source>Trigger System Key Event #6</source>
         <translation>Activar Evento de Tecla del Sistema #6</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="287"/>
+        <source>Options</source>
+        <translation>Opciones</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="296"/>
+        <source>Options</source>
+        <translation>Opciones</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1185"/>
         <source>Trigger System Key Event #7</source>
         <translation>Activar Evento de Tecla del Sistema #7</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="145"/>
+        <source>Program List</source>
+        <translation>Lista de Programas</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="154"/>
+        <source>Program List</source>
+        <translation>Lista de Programas</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1187"/>
         <source>Trigger System Key Event #8</source>
         <translation>Activar Evento de Tecla del Sistema #8</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="291"/>
+        <source>Choose Search Phrase...</source>
+        <translation>Elegir Frase de Búsqueda...</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="300"/>
+        <source>Choose Search Phrase...</source>
+        <translation>Elegir Frase de Búsqueda...</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1189"/>
         <source>Trigger System Key Event #9</source>
         <translation>Activar Evento de Tecla del Sistema #9</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="294"/>
+        <source>Sort</source>
+        <translation>Ordenar</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="303"/>
+        <source>Sort</source>
+        <translation>Ordenar</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1191"/>
         <source>Trigger System Key Event #10</source>
         <translation>Activar Evento de Tecla del Sistema #10</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="297"/>
+        <source>Record</source>
+        <translation>Grabar</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="306"/>
+        <source>Record</source>
+        <translation>Grabar</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1195"/>
         <source>Zoom in on browser window</source>
         <translation>Ampliar en la ventana del navegador</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="299"/>
+        <source>Edit Schedule</source>
+        <translation>Editar Programación</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="308"/>
+        <source>Edit Schedule</source>
+        <translation>Editar Programación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1197"/>
         <source>Zoom out on browser window</source>
         <translation>Reducir en la ventana del navegador</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="300"/>
+        <source>Program Details</source>
+        <translation>Detalles del Programa</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="309"/>
+        <source>Program Details</source>
+        <translation>Detalles del Programa</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1199"/>
         <source>Toggle where keyboard input goes to</source>
         <translation>Cambiar a dónde va la entrada del teclado</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="301"/>
+        <source>Upcoming</source>
+        <translation>Próximos</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="310"/>
+        <source>Upcoming</source>
+        <translation>Próximos</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1202"/>
         <source>Move mouse pointer up</source>
         <translation>Mover arriba el puntero</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="302"/>
+        <source>Custom Edit</source>
+        <translation>Edición Personalizada</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="311"/>
+        <source>Custom Edit</source>
+        <translation>Edición Personalizada</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1204"/>
         <source>Move mouse pointer down</source>
         <translation>Mover abajo el puntero</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="308"/>
+        <source>Delete Rule</source>
+        <translation>Eliminar Regla</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="317"/>
+        <source>Delete Rule</source>
+        <translation>Eliminar Regla</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1206"/>
         <source>Move mouse pointer left</source>
         <translation>Mover a la izquierda el puntero</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="735"/>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="748"/>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1208"/>
         <source>Move mouse pointer right</source>
         <translation>Mover a la derecha el puntero</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="282"/>
+        <source>Sort Options</source>
+        <translation>Opciones de Ordenación</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="291"/>
+        <source>Sort Options</source>
+        <translation>Opciones de Ordenación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1210"/>
         <source>Mouse Left button click</source>
         <translation>Pulsación izquierda del ratón</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="283"/>
+        <source>Reverse Sort Order</source>
+        <translation>Invertir Ordenación</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="292"/>
+        <source>Reverse Sort Order</source>
+        <translation>Invertir Ordenación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1213"/>
         <source>Scroll down half a page</source>
         <translation>Descender media página</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="284"/>
+        <source>Sort By Title</source>
+        <translation>Ordenar por Título</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="293"/>
+        <source>Sort By Title</source>
+        <translation>Ordenar por Título</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1215"/>
         <source>Scroll up half a page</source>
         <translation>Ascender media página</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="285"/>
+        <source>Sort By Time</source>
+        <translation>Ordenar por Hora</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="294"/>
+        <source>Sort By Time</source>
+        <translation>Ordenar por Hora</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1217"/>
         <source>Scroll left half a page</source>
         <translation>Ir a la izquierda media página</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="441"/>
+        <source>Select Rating</source>
+        <translation>Seleccionar Clasificación</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="450"/>
+        <source>Select Rating</source>
+        <translation>Seleccionar Clasificación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1219"/>
         <source>Scroll right half a page</source>
         <translation>Ir a la derecha media página</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="442"/>
+        <source>Select Channel</source>
+        <translation>Seleccionar Canal</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="451"/>
+        <source>Select Channel</source>
+        <translation>Seleccionar Canal</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1222"/>
         <source>Move selection to next link</source>
         <translation>Mover selección al siguiente enlace</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="443"/>
+        <source>Select Category</source>
+        <translation>Seleccionar Categoría</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="452"/>
+        <source>Select Category</source>
+        <translation>Seleccionar Categoría</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1224"/>
         <source>Move selection to previous link</source>
         <translation>Mover selección al anterior enlace</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="444"/>
+        <source>Select List</source>
+        <translation>Seleccionar Lista</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="453"/>
+        <source>Select List</source>
+        <translation>Seleccionar Lista</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1226"/>
         <source>Follow selected link</source>
         <translation>Seguir el enlace seleccionado</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="446"/>
+        <source>Select a search stored from</source>
+        <translation>Seleccione una búsqueda guardada de</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="455"/>
+        <source>Select a search stored from</source>
+        <translation>Seleccione una búsqueda guardada de</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1228"/>
         <source>Go back to previous page</source>
         <translation>Volver a la página anterior</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="447"/>
+        <source>Custom Record</source>
+        <translation>Grabación Personalizada</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="456"/>
+        <source>Custom Record</source>
+        <translation>Grabación Personalizada</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1230"/>
         <source>Go forward to previous page</source>
         <translation>Avanzar a la página anterior</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="1358"/>
+        <source>^(The |A |An )</source>
+        <comment>Regular Expression for what to ignore when sorting</comment>
+        <translation>^(El |La |Los |Las |Un |Una |Unos |Unas )</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="1376"/>
+        <source>^(The |A |An )</source>
+        <comment>Regular Expression for what to ignore when sorting</comment>
+        <translation>^(El |La |Los |Las |Un |Una |Unos |Unas )</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1235"/>
         <source>System Exit</source>
         <translation>Salir del Sistema</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="1527"/>
+        <location filename="../programs/mythfrontend/proglist.cpp" line="1556"/>
+        <source>%1 of %2</source>
+        <comment>Current position in list where %1 is the position, %2 is the total count</comment>
+        <translation>%1 de %2</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="1553"/>
+        <location filename="../programs/mythfrontend/proglist.cpp" line="1582"/>
+        <source>%1 of %2</source>
+        <comment>Current position in list where %1 is the position, %2 is the total count</comment>
+        <translation>%1 de %2</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythmainwindow.cpp" line="1233"/>
         <source>Display System Exit Prompt</source>
         <translation>Preguntar al Salir del Sistema</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="632"/>
+        <source>Delete &apos;%1&apos; %2 rule?</source>
+        <translation>¿Eliminar la regla &apos;%1&apos; %2?</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="641"/>
+        <source>Delete &apos;%1&apos; %2 rule?</source>
+        <translation>¿Eliminar la regla &apos;%1&apos; %2?</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythwelcome/main.cpp" line="36"/>
         <source>Open an Xterm window</source>
         <translation>Abrir una ventana Xterm</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="656"/>
+        <source>Delete this episode of &apos;%1&apos;?</source>
+        <translation>¿Eliminar este episodio de &apos;%1&apos;?</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="665"/>
+        <source>Delete this episode of &apos;%1&apos;?</source>
+        <translation>¿Eliminar este episodio de &apos;%1&apos;?</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythwelcome/main.cpp" line="38"/>
         <source>Show Mythshutdown settings</source>
         <translation>Mostrar la configuración de Mythshutdown</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="689"/>
+        <source>Delete all episodes of &apos;%1&apos;?</source>
+        <translation>¿Eliminar todos los episodios de &apos;%1&apos;?</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="698"/>
+        <source>Delete all episodes of &apos;%1&apos;?</source>
+        <translation>¿Eliminar todos los episodios de &apos;%1&apos;?</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythwelcome/main.cpp" line="40"/>
         <source>Start Mythtv-Setup</source>
         <translation>Iniciar la Configuración de MythTV</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="723"/>
+        <source>NOTE: removing items from this list will not delete any recordings.</source>
+        <translation>NOTA: eliminar elementos de esta lista no borrará ninguna grabación.</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="736"/>
+        <source>NOTE: removing items from this list will not delete any recordings.</source>
+        <translation>NOTA: eliminar elementos de esta lista no borrará ninguna grabación.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1351"/>
         <source>Play selected item in alternate player</source>
         <translation>Reproducir el elemento seleccionado con el reproductor alternativo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="730"/>
+        <source>Allow this episode to re-record</source>
+        <translation>Permitir que este episodio vuelva a grabarse</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="743"/>
+        <source>Allow this episode to re-record</source>
+        <translation>Permitir que este episodio vuelva a grabarse</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1353"/>
         <source>Open video filter dialog</source>
         <translation>Abrir el diálogo de filtros de vídeo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="732"/>
+        <source>Never record this episode</source>
+        <translation>Nunca grabar este episodio</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="745"/>
+        <source>Never record this episode</source>
+        <translation>Nunca grabar este episodio</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1355"/>
         <source>Change browsable in video manager</source>
         <translation>Cambiar a explorables en el administrador de vídeos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="733"/>
+        <source>Remove this episode from the list</source>
+        <translation>Eliminar este episodio de la lista</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="746"/>
+        <source>Remove this episode from the list</source>
+        <translation>Eliminar este episodio de la lista</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1357"/>
         <source>Increase Parental Level</source>
         <translation>Aumentar el Nivel Parental</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="734"/>
+        <source>Remove all episodes for this title</source>
+        <translation>Eliminar todos los episodios de la lista</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="747"/>
+        <source>Remove all episodes for this title</source>
+        <translation>Eliminar todos los episodios de la lista</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1359"/>
         <source>Decrease Parental Level</source>
         <translation>Disminuir el Nivel Parental</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="916"/>
+        <location filename="../programs/mythfrontend/proglist.cpp" line="936"/>
+        <source>All</source>
+        <translation>Todos</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="929"/>
+        <location filename="../programs/mythfrontend/proglist.cpp" line="949"/>
+        <source>All</source>
+        <translation>Todos</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1361"/>
         <source>Show Incremental Search Dialog</source>
         <translation>Mostrar Diálogo de Búsqueda Progresiva</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="919"/>
+        <source>Premieres</source>
+        <translation>Estrenos</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="932"/>
+        <source>Premieres</source>
+        <translation>Estrenos</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1363"/>
         <source>Download metadata for current item</source>
         <translation>Descargar metadatos para el elemento actual</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="922"/>
+        <source>Movies</source>
+        <translation>Películas</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="935"/>
+        <source>Movies</source>
+        <translation>Películas</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1365"/>
         <source>Display Item Detail Popup</source>
         <translation>Mostrar Emergente con los Detalles del Elemento</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="925"/>
+        <source>Series</source>
+        <translation>Series</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="938"/>
+        <source>Series</source>
+        <translation>Series</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1367"/>
         <source>Go to the first video</source>
         <translation>Ir al primer vídeo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="928"/>
+        <source>Specials</source>
+        <translation>Especiales</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="941"/>
+        <source>Specials</source>
+        <translation>Especiales</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1369"/>
         <source>Go to the last video</source>
         <translation>Ir al último vídeo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="938"/>
+        <source>Unrated</source>
+        <translation>No Clasificados</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="951"/>
+        <source>Unrated</source>
+        <translation>No Clasificados</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/main.cpp" line="1427"/>
         <source>MythDVD DVD Media Handler</source>
         <translation>Gestor de Medios DVD de MythDVD</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="962"/>
+        <source>Power Recording Rule</source>
+        <translation>Regla de Grabación Avanzada</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="975"/>
+        <source>Power Recording Rule</source>
+        <translation>Regla de Grabación Avanzada</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>MythPlayer</name>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythplayer.cpp" line="495"/>
         <source>Failed to initialize video output</source>
         <translation>Fallo al inicializar la salida de imagen</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="1008"/>
+        <source>Reverse Time</source>
+        <translation>Hora (Orden Inverso)</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="1021"/>
+        <source>Reverse Time</source>
+        <translation>Hora (Orden Inverso)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythplayer.cpp" line="577"/>
         <source>Need to switch video renderer.</source>
         <translation>Es necesario cambiar de generador de imagen.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="1011"/>
+        <source>Title</source>
+        <translation>Título</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="1024"/>
+        <source>Title</source>
+        <translation>Título</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythplayer.cpp" line="598"/>
         <source>Failed to reinitialize video output</source>
         <translation>Fallo al reinicializar la salida de imagen</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/proglist.cpp" line="1014"/>
+        <source>Reverse Title</source>
+        <translation>Título (Orden Inverso)</translation>
+=======
+        <location filename="../programs/mythfrontend/proglist.cpp" line="1027"/>
+        <source>Reverse Title</source>
+        <translation>Título (Orden Inverso)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythplayer.cpp" line="1348"/>
         <source>TXT CAP</source>
         <translation>SUB TXT</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1249"/>
+        <source>^(The |A |An )</source>
+        <translation>^(El |La |Los |Las |Un |Una |Unos |Unas )</translation>
+=======
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1361"/>
+        <source>^(The |A |An )</source>
+        <translation>^(El |La |Los |Las |Un |Una |Unos |Unas )</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythplayer.cpp" line="1368"/>
         <location filename="../libs/libmythtv/mythplayer.cpp" line="1395"/>
         <source>Text subtitles</source>
         <translation>Subtítulos de texto</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1459"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1569"/>
+        <source>Recording %1 of %2</source>
+        <translation>Grabando %1 de %2</translation>
+=======
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1557"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1667"/>
+        <source>Recording %1 of %2</source>
+        <translation>Grabando %1 de %2</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythplayer.cpp" line="1374"/>
         <source>Off</source>
         <translation>Desactivados</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="969"/>
+        <source>Delete &apos;%1&apos; %2 rule?</source>
+        <translation>¿Eliminar regla &apos;%1&apos; %2?</translation>
+=======
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1078"/>
+        <source>Delete &apos;%1&apos; %2 rule?</source>
+        <translation>¿Eliminar regla &apos;%1&apos; %2?</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythplayer.cpp" line="1398"/>
         <source>TXT %1</source>
         <translation>TXT %1</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="448"/>
+        <source>Schedule Priorities</source>
+        <translation>Prioridades de Programación</translation>
+=======
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="471"/>
+        <source>Schedule Priorities</source>
+        <translation>Prioridades de Programación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythplayer.cpp" line="1412"/>
         <source>On</source>
         <translation>Activados</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="623"/>
+        <source>Options</source>
+        <translation>Opciones</translation>
+=======
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="646"/>
+        <source>Options</source>
+        <translation>Opciones</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythplayer.cpp" line="1468"/>
         <source>No captions</source>
         <comment>CC/Teletext/Subtitle text not available</comment>
         <translation>Sin subtítulos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="632"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="688"/>
+        <source>Increase Priority</source>
+        <translation>Aumentar Prioridad</translation>
+=======
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="655"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="712"/>
+        <source>Increase Priority</source>
+        <translation>Aumentar Prioridad</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythplayer.cpp" line="1578"/>
         <source>Forced Subtitles On</source>
         <translation>Subtítulos Forzados Activados</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="633"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="692"/>
+        <source>Decrease Priority</source>
+        <translation>Disminuir Prioridad</translation>
+=======
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="656"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="716"/>
+        <source>Decrease Priority</source>
+        <translation>Disminuir Prioridad</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythplayer.cpp" line="1579"/>
         <source>Forced Subtitles Off</source>
         <translation>Subtítulos Forzados Desactivados</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="634"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="696"/>
+        <source>Sort</source>
+        <translation>Ordenar</translation>
+=======
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="657"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="720"/>
+        <source>Sort</source>
+        <translation>Ordenar</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythplayer.cpp" line="1801"/>
         <source>Failed to initialize A/V Sync</source>
         <translation>Fallo al inicializar la Sincr. A/V</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="635"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="700"/>
+        <source>Program Details</source>
+        <translation>Detalles del Programa</translation>
+=======
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="658"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="724"/>
+        <source>Program Details</source>
+        <translation>Detalles del Programa</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythplayer.cpp" line="1880"/>
         <location filename="../libs/libmythtv/mythplayer.cpp" line="2044"/>
         <source>Serious error detected in Video Output</source>
         <translation>Detectado un error grave en la Salida de Vídeo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="636"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="704"/>
+        <source>Upcoming</source>
+        <translation>Próximos</translation>
+=======
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="659"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="728"/>
+        <source>Upcoming</source>
+        <translation>Próximos</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythplayer.cpp" line="2121"/>
         <source>Video frame buffering failed too many times.</source>
         <translation>La memoria temporal de las tramas de vídeo falló demasiadas veces.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="637"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="709"/>
+        <source>Custom Edit</source>
+        <translation>Edición Personalizada</translation>
+=======
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="660"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="733"/>
+        <source>Custom Edit</source>
+        <translation>Edición Personalizada</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythplayer.cpp" line="2485"/>
         <source>Error opening switch program buffer</source>
         <translation>Error al abrir la memoria temporal del cambio de programa</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="638"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="714"/>
+        <source>Delete Rule</source>
+        <translation>Eliminar Regla</translation>
+=======
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="661"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="738"/>
+        <source>Delete Rule</source>
+        <translation>Eliminar Regla</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythplayer.cpp" line="2510"/>
         <source>Error opening switch program file</source>
         <translation>Error al abrir el archivo de cambio de programa</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="650"/>
+        <source>Sort Options</source>
+        <translation>Opciones de Ordenación</translation>
+=======
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="662"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="743"/>
+        <source>New Template</source>
+        <translation>Nueva Plantilla</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="674"/>
+        <source>Sort Options</source>
+        <translation>Opciones de Ordenación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythplayer.cpp" line="2627"/>
         <source>Error opening jump program file buffer</source>
         <translation>Error al abrir la memoria temporal del archivo de salto de programa</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="659"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="722"/>
+        <source>Reverse Sort Order</source>
+        <translation>Invertir Ordenación</translation>
+=======
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="683"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="759"/>
+        <source>Reverse Sort Order</source>
+        <translation>Invertir Ordenación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythplayer.cpp" line="2637"/>
         <source>Error opening jump program file</source>
         <translation>Error al abrir el archivo de salto de programa</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="660"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="727"/>
+        <source>Sort By Title</source>
+        <translation>Ordenar por Título</translation>
+=======
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="684"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="764"/>
+        <source>Sort By Title</source>
+        <translation>Ordenar por Título</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythplayer.cpp" line="2646"/>
         <source>Error reopening video decoder</source>
         <translation>Error al reabrir el decodificador de imagen</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="661"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="738"/>
+        <source>Sort By Priority</source>
+        <translation>Ordenar por Prioridad</translation>
+=======
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="685"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="775"/>
+        <source>Sort By Priority</source>
+        <translation>Ordenar por Prioridad</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythplayer.cpp" line="2848"/>
         <source>Irrecoverable recorder error</source>
         <translation>Error irrecuperable del grabador</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="662"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="749"/>
+        <source>Sort By Type</source>
+        <translation>Ordenar por Tipo</translation>
+=======
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="686"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="786"/>
+        <source>Sort By Type</source>
+        <translation>Ordenar por Tipo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythplayer.cpp" line="2913"/>
         <source>Not Flagged</source>
         <extracomment>The commercials/adverts have not been flagged</extracomment>
         <translation>Sin Marcar</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="663"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="760"/>
+        <source>Sort By Count</source>
+        <translation>Ordenar por Número</translation>
+=======
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="687"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="797"/>
+        <source>Sort By Count</source>
+        <translation>Ordenar por Número</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythplayer.cpp" line="3732"/>
         <source>Searching</source>
         <translation>Buscando</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="664"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="773"/>
+        <source>Sort By Record Count</source>
+        <translation>Ordenar por Número de Grabaciones</translation>
+=======
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="688"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="810"/>
+        <source>Sort By Record Count</source>
+        <translation>Ordenar por Número de Grabaciones</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythplayer.cpp" line="3799"/>
         <source>No Seektable</source>
         <translation>Sin Tabla de Búsqueda</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="665"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="784"/>
+        <source>Sort By Last Recorded</source>
+        <translation>Ordenar por Últimos Grabados</translation>
+=======
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="689"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="821"/>
+        <source>Sort By Last Recorded</source>
+        <translation>Ordenar por Últimos Grabados</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythplayer.cpp" line="3820"/>
         <source>Using previously auto-saved cuts</source>
         <translation>Usando los cortes anteriormente autoguardados</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="666"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="795"/>
+        <source>Sort By Average Delay</source>
+        <translation>Ordenar por Retardo Medio</translation>
+=======
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="690"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="832"/>
+        <source>Sort By Average Delay</source>
+        <translation>Ordenar por Retardo Medio</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythplayer.cpp" line="3864"/>
         <source>Paused</source>
         <translation>En pausa</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1496"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1503"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1510"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1631"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1642"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1653"/>
+        <source>Any</source>
+        <translation>Cualquiera</translation>
+=======
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="749"/>
+        <source>Template Name</source>
+        <translation>Nombre de Plantilla</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1594"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1601"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1608"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1729"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1740"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1751"/>
+        <source>Any</source>
+        <translation>Cualquiera</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythplayer.cpp" line="3948"/>
         <location filename="../libs/libmythtv/mythplayer.cpp" line="3985"/>
         <source>New cut added.</source>
         <translation>Nuevo corte añadido.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1124"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1472"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1590"/>
+        <source> + %1 automatic priority (%2hr)</source>
+        <translation> + %1 prioridad automática (%2hr)</translation>
+=======
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1236"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1570"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1688"/>
+        <source> + %1 automatic priority (%2hr)</source>
+        <translation> + %1 prioridad automática (%2hr)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythtv/mythplayer.cpp" line="3953"/>
@@ -6344,12 +11370,23 @@ Delete the current cut or preserved region</extracomment>
         <translation>Deshacer cambios</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythplayer.cpp" line="3990"/>
         <source>Undo - %1</source>
         <extracomment>%1 is the undo message</extracomment>
         <translation>Deshacer - %1</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/mythcontext.cpp" line="186"/>
+        <source>Failed to configure plugin %1</source>
+        <translation>Error al configurar el complemento %1</translation>
+=======
+        <location filename="../libs/libmyth/mythcontext.cpp" line="185"/>
+        <source>Failed to configure plugin %1</source>
+        <translation>Error al configurar el complemento %1</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythplayer.cpp" line="3996"/>
         <source>Redo - %1</source>
         <extracomment>%1 is the redo message</extracomment>
@@ -6362,6 +11399,15 @@ Delete the current cut or preserved region</extracomment>
             <numerusform>%n segundo</numerusform>
             <numerusform>%n segundos</numerusform>
         </translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/mythcontext.cpp" line="194"/>
+        <source>The plugin %1 has failed to run for some reason...</source>
+        <translation>El complemento %1 ha fallado al ejecutarse por alguna razón...</translation>
+=======
+        <location filename="../libs/libmyth/mythcontext.cpp" line="193"/>
+        <source>The plugin %1 has failed to run for some reason...</source>
+        <translation>El complemento %1 ha fallado al ejecutarse por alguna razón...</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythtv/mythplayer.cpp" line="4763"/>
@@ -6374,19 +11420,59 @@ Delete the current cut or preserved region</extracomment>
         <translation>Niveles de Estudio activados</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythplayer.cpp" line="5128"/>
         <source>Disabled Studio Levels</source>
         <translation>Niveles de Estudio desactivados</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/deletemap.cpp" line="82"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9480"/>
+        <source>Clear Cuts</source>
+        <translation>Borrar Cortes</translation>
+=======
+        <location filename="../libs/libmythtv/deletemap.cpp" line="82"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9534"/>
+        <source>Clear Cuts</source>
+        <translation>Borrar Cortes</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythplayer.cpp" line="5152"/>
         <source>Enabled Night Mode</source>
         <translation>Modo Nocturno activado</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/deletemap.cpp" line="90"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9412"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9446"/>
+        <source>Cut to Beginning</source>
+        <translation>Cortar hasta el Principio</translation>
+=======
+        <location filename="../libs/libmythtv/deletemap.cpp" line="90"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9466"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9500"/>
+        <source>Cut to Beginning</source>
+        <translation>Cortar hasta el Principio</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythplayer.cpp" line="5158"/>
         <source>Disabled Night Mode</source>
         <translation>Modo Nocturno desactivado</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/deletemap.cpp" line="93"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9417"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9450"/>
+        <source>Cut to End</source>
+        <translation>Cortar hasta el Final</translation>
+=======
+        <location filename="../libs/libmythtv/deletemap.cpp" line="93"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9471"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9504"/>
+        <source>Cut to End</source>
+        <translation>Cortar hasta el Final</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
@@ -6423,29 +11509,83 @@ Delete the current cut or preserved region</extracomment>
         <translation>Orden para establecer la fecha/hora de inicio automático en el BIOS. Lea el archivo README para más ejemplos.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="136"/>
         <source>Wakeup time format</source>
         <translation>Formato de la fecha/hora de arranque automático</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/deletemap.cpp" line="239"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9482"/>
+        <source>Reverse Cuts</source>
+        <translation>Invertir Cortes</translation>
+=======
+        <location filename="../libs/libmythtv/deletemap.cpp" line="258"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9536"/>
+        <source>Reverse Cuts</source>
+        <translation>Invertir Cortes</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="139"/>
         <source>The format of the time string passed to the &apos;Set Wakeup Time Command&apos; as $time. See QT::QDateTime.toString() for details. Set to &apos;time_t&apos; for seconds since epoch (use time_t for nvram_wakeup).</source>
         <translation>El formato de la cadena de fecha/hora pasada a la &apos;Orden de la Hora de Inicio Automático&apos; como $time. Ver QT::QDateTime.toString() para más detalles. Establézcalo a &apos;time_t&apos; para obtener los segundos transcurridos desde el formato &quot;época/epoch&quot; (usar time_t para nvram_wakeup).</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/deletemap.cpp" line="449"/>
+        <source>New Cut</source>
+        <translation>Nuevo Corte</translation>
+=======
+        <location filename="../libs/libmythtv/deletemap.cpp" line="468"/>
+        <source>New Cut</source>
+        <translation>Nuevo Corte</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="150"/>
         <source>nvram-wakeup Restart Command</source>
         <translation>Orden de Reinicio nvram-wakeup</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/deletemap.cpp" line="498"/>
+        <source>Move Mark</source>
+        <translation>Mover Marca</translation>
+=======
+        <location filename="../libs/libmythtv/deletemap.cpp" line="517"/>
+        <source>Move Mark</source>
+        <translation>Mover Marca</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="152"/>
         <source>Command to run if your bios requires you to reboot to allow nvram-wakeup settings to take effect. Leave blank if your bios does not require a reboot. See the README file for more examples.</source>
         <translation>Orden a ejecutar si su BIOS requiere reiniciar para que los ajustes de nvram-wakeup se hagan efectivos. Déjelo vacío si su BIOS no requiere reiniciar. Vea el archivo README para más ejemplos.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/deletemap.cpp" line="682"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9484"/>
+        <source>Load Detected Commercials</source>
+        <translation>Cargar Anuncios Detectados</translation>
+=======
+        <location filename="../libs/libmythtv/deletemap.cpp" line="701"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9538"/>
+        <source>Load Detected Commercials</source>
+        <translation>Cargar Anuncios Detectados</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="163"/>
         <source>Command to reboot</source>
         <translation>Orden para reiniciar</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/deletemap.cpp" line="714"/>
+        <source>Load Auto-saved Cuts</source>
+        <translation>Cargar Cortes Guardados Automáticamente</translation>
+=======
+        <location filename="../libs/libmythtv/deletemap.cpp" line="733"/>
+        <source>Load Auto-saved Cuts</source>
+        <translation>Cargar Cortes Guardados Automáticamente</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="165"/>
@@ -6458,9 +11598,19 @@ Delete the current cut or preserved region</extracomment>
         <translation>Orden para apagar</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="174"/>
         <source>Command to shutdown computer.</source>
         <translation>Orden para apagar el ordenador.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/deletemap.cpp" line="164"/>
+        <source>cut</source>
+        <translation>corte</translation>
+=======
+        <location filename="../libs/libmythtv/deletemap.cpp" line="173"/>
+        <source>cut</source>
+        <translation>corte</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="181"/>
@@ -6468,9 +11618,21 @@ Delete the current cut or preserved region</extracomment>
         <translation>Orden a ejecutar para iniciar el Cliente</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="184"/>
         <source>Command to start mythfrontend.</source>
         <translation>Orden para iniciar mythfrontend.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="157"/>
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="51"/>
+        <source>Not Recording</source>
+        <translation>No se está grabando</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="165"/>
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="54"/>
+        <source>Not Recording</source>
+        <translation>No se está grabando</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="191"/>
@@ -6516,14 +11678,44 @@ Delete the current cut or preserved region</extracomment>
         <translation>Grabación eliminada</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythsystemevent.cpp" line="381"/>
         <source>Recording expired</source>
         <translation>Grabación expirada</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="218"/>
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="734"/>
+        <source> is invalid or not useable.</source>
+        <translation>es inválido o no utilizable.</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="218"/>
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="737"/>
+        <source> is invalid or not useable.</source>
+        <translation>es inválido o no utilizable.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythsystemevent.cpp" line="382"/>
         <source>LiveTV started</source>
         <translation>TV en Vivo iniciada</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="220"/>
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="235"/>
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="737"/>
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="896"/>
+        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="443"/>
+        <source>Warning</source>
+        <translation>Aviso</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="220"/>
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="235"/>
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="740"/>
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="899"/>
+        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="443"/>
+        <source>Warning</source>
+        <translation>Aviso</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythtv/mythsystemevent.cpp" line="383"/>
@@ -6531,157 +11723,454 @@ Delete the current cut or preserved region</extracomment>
         <translation>Reproducción iniciada</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythsystemevent.cpp" line="384"/>
         <source>Playback stopped</source>
         <translation>Reproducción detenida</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="370"/>
+        <source>7.1</source>
+        <translation>7.1</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="371"/>
+        <source>7.1</source>
+        <translation>7.1</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythsystemevent.cpp" line="385"/>
         <source>Playback paused</source>
         <translation>Reproducción en pausa</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="430"/>
+        <source>Speaker configuration</source>
+        <translation>Configuración de altavoces</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="433"/>
+        <source>Speaker configuration</source>
+        <translation>Configuración de altavoces</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythsystemevent.cpp" line="386"/>
         <source>Playback unpaused</source>
         <translation>Reproducción reanudada</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="432"/>
+        <source>Select the maximum number of audio channels supported by your receiver and speakers.</source>
+        <translation>Seleccione el número máximo de canales de sonido admitidos por su receptor y altavoces.</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="435"/>
+        <source>Select the maximum number of audio channels supported by your receiver and speakers.</source>
+        <translation>Seleccione el número máximo de canales de sonido admitidos por su receptor y altavoces.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythsystemevent.cpp" line="387"/>
         <source>Playback program changed</source>
         <translation>Cambio de programa reproducido</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="441"/>
+        <source>Upconvert stereo to 5.1 surround</source>
+        <translation>Convertir estéreo a 5.1 envolvente</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="444"/>
+        <source>Upconvert stereo to 5.1 surround</source>
+        <translation>Convertir estéreo a 5.1 envolvente</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythsystemevent.cpp" line="388"/>
         <source>Master backend started</source>
         <translation>Servidor principal iniciado</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="443"/>
+        <source>If enabled, MythTV will upconvert stereo to 5.1 audio. You can enable or disable the upconversion during playback at any time.</source>
+        <translation>Si se activa, MythTV convertirá el sonido estéreo a 5.1. Usted puede activar o desactivar la conversión durante la reproducción en cualquier momento.</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="446"/>
+        <source>If enabled, MythTV will upconvert stereo to 5.1 audio. You can enable or disable the upconversion during playback at any time.</source>
+        <translation>Si se activa, MythTV convertirá el sonido estéreo a 5.1. Usted puede activar o desactivar la conversión durante la reproducción en cualquier momento.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythsystemevent.cpp" line="389"/>
         <source>Master backend shutdown</source>
         <translation>Servidor principal apagado</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="452"/>
+        <source>Upmix Quality</source>
+        <translation>Calidad de Conversión</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="455"/>
+        <source>Upmix Quality</source>
+        <translation>Calidad de Conversión</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythsystemevent.cpp" line="390"/>
         <source>Client connected to master backend</source>
         <translation>Cliente conectado al servidor principal</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="453"/>
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1115"/>
+        <source>Good</source>
+        <translation>Buena</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="456"/>
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1118"/>
+        <source>Good</source>
+        <translation>Buena</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythsystemevent.cpp" line="391"/>
         <source>Client disconnected from master backend</source>
         <translation>Cliente desconectado del servidor principal</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="454"/>
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1116"/>
+        <source>Best</source>
+        <translation>La mejor</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="457"/>
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1119"/>
+        <source>Best</source>
+        <translation>La mejor</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythsystemevent.cpp" line="392"/>
         <source>Slave backend connected to master</source>
         <translation>Servidor esclavo conectado al principal</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="455"/>
+        <source>Set the audio surround-upconversion quality.</source>
+        <translation>Establece la calidad de la conversión a sonido envolvente.</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="458"/>
+        <source>Set the audio surround-upconversion quality.</source>
+        <translation>Establece la calidad de la conversión a sonido envolvente.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythsystemevent.cpp" line="393"/>
         <source>Slave backend disconnected from master</source>
         <translation>Servidor esclavo desconectado del principal</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="462"/>
+        <source>Dolby Digital</source>
+        <translation>Dolby Digital</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="465"/>
+        <source>Dolby Digital</source>
+        <translation>Dolby Digital</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythsystemevent.cpp" line="394"/>
         <source>Network Control client connected</source>
         <translation>Cliente de Control por Red conectado</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1092"/>
+        <source>Enable if your amplifier or sound decoder only supports 2 channel PCM (typically an old HDMI 1.0 device). Multichannel audio will be re-encoded to AC-3 when required</source>
+        <translation>Actívela si su amplificador o decodificador de sonido sólo admite 2 canales PCM (normalmente un dispositivo HDMI 1.0 antiguo). Los canales múltiples de sonido se recodificarán a AC3 cuando sea necesario</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1095"/>
+        <source>Enable if your amplifier or sound decoder only supports 2 channel PCM (typically an old HDMI 1.0 device). Multichannel audio will be re-encoded to AC-3 when required</source>
+        <translation>Actívela si su amplificador o decodificador de sonido sólo admite 2 canales PCM (normalmente un dispositivo HDMI 1.0 antiguo). Los canales múltiples de sonido se recodificarán a AC3 cuando sea necesario</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythsystemevent.cpp" line="395"/>
         <source>Network Control client disconnected</source>
         <translation>Cliente de Control por Red desconectado</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1170"/>
+        <source>SPDIF 48kHz rate override</source>
+        <translation>Ignorar tasa de 48k SPDIF</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1173"/>
+        <source>SPDIF 48kHz rate override</source>
+        <translation>Ignorar tasa de 48k SPDIF</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythsystemevent.cpp" line="396"/>
         <source>mythfilldatabase ran</source>
         <translation>mythfilldatabase ejecutado</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="473"/>
+        <source>DTS</source>
+        <translation>DTS</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="476"/>
+        <source>DTS</source>
+        <translation>DTS</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythsystemevent.cpp" line="397"/>
         <source>Scheduler ran</source>
         <translation>Programador ejecutado</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="475"/>
+        <source>Enable if your amplifier or sound decoder supports DTS. You must use a digital connection. Uncheck if using an analog connection</source>
+        <translation>Actívela si su amplificador o decodificador de sonido admite DTS. Debe usar una conexión digital. Desmárquela si está usando una conexión analógica</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="478"/>
+        <source>Enable if your amplifier or sound decoder supports DTS. You must use a digital connection. Uncheck if using an analog connection</source>
+        <translation>Actívela si su amplificador o decodificador de sonido admite DTS. Debe usar una conexión digital. Desmárquela si está usando una conexión analógica</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythsystemevent.cpp" line="398"/>
         <source>Settings cache cleared</source>
         <translation>Caché de configuraciones borrada</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="494"/>
+        <source>TrueHD</source>
+        <translation>TrueHD</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="497"/>
+        <source>TrueHD</source>
+        <translation>TrueHD</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythsystemevent.cpp" line="399"/>
         <source>Screen created or destroyed</source>
         <translation>Pantalla creada o destruída</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="504"/>
+        <source>DTS-HD</source>
+        <translation>DTS-HD</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="507"/>
+        <source>DTS-HD</source>
+        <translation>DTS-HD</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythsystemevent.cpp" line="400"/>
         <source>Keystroke event #1</source>
         <translation>Evento de teclado #1</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="728"/>
+        <source>Audio Configuration Testing</source>
+        <translation>Prueba de la Configuración del Sonido</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="731"/>
+        <source>Audio Configuration Testing</source>
+        <translation>Prueba de la Configuración del Sonido</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythsystemevent.cpp" line="401"/>
         <source>Keystroke event #2</source>
         <translation>Evento de teclado #2</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="742"/>
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="843"/>
+        <source>Test All</source>
+        <translation>Probar Todo</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="745"/>
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="846"/>
+        <source>Test All</source>
+        <translation>Probar Todo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythsystemevent.cpp" line="402"/>
         <source>Keystroke event #3</source>
         <translation>Evento de teclado #3</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="743"/>
+        <source>Start all channels test</source>
+        <translation>Iniciar la prueba de todos los canales</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="746"/>
+        <source>Start all channels test</source>
+        <translation>Iniciar la prueba de todos los canales</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythsystemevent.cpp" line="403"/>
         <source>Keystroke event #4</source>
         <translation>Evento de teclado #4</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="756"/>
+        <source>Front Left</source>
+        <translation>Frontal Izquierdo</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="759"/>
+        <source>Front Left</source>
+        <translation>Frontal Izquierdo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythsystemevent.cpp" line="404"/>
         <source>Keystroke event #5</source>
         <translation>Evento de teclado #5</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="760"/>
+        <source>Front Right</source>
+        <translation>Frontal Derecho</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="763"/>
+        <source>Front Right</source>
+        <translation>Frontal Derecho</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythsystemevent.cpp" line="405"/>
         <source>Keystroke event #6</source>
         <translation>Evento de teclado #6</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="801"/>
+        <source>Center</source>
+        <translation>Central</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="804"/>
+        <source>Center</source>
+        <translation>Central</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythsystemevent.cpp" line="406"/>
         <source>Keystroke event #7</source>
         <translation>Evento de teclado #7</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="769"/>
+        <source>Rear Left</source>
+        <translation>Trasero Izquierdo</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="772"/>
+        <source>Rear Left</source>
+        <translation>Trasero Izquierdo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythsystemevent.cpp" line="407"/>
         <source>Keystroke event #8</source>
         <translation>Evento de teclado #8</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="793"/>
+        <source>Surround Left</source>
+        <translation>Envolvente Izquierdo</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="796"/>
+        <source>Surround Left</source>
+        <translation>Envolvente Izquierdo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythsystemevent.cpp" line="408"/>
         <source>Keystroke event #9</source>
         <translation>Evento de teclado #9</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="797"/>
+        <source>Surround Right</source>
+        <translation>Envolvente Derecho</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="800"/>
+        <source>Surround Right</source>
+        <translation>Envolvente Derecho</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythsystemevent.cpp" line="409"/>
         <source>Keystroke event #10</source>
         <translation>Evento de teclado #10</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="786"/>
+        <source>LFE</source>
+        <translation>LFE</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="789"/>
+        <source>LFE</source>
+        <translation>LFE</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/mythsystemevent.cpp" line="410"/>
         <source>Any event</source>
         <translation>Cualquier evento</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="820"/>
+        <source>Use Highest Quality Mode</source>
+        <translation>Usar el Modo de Mayor Calidad</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="823"/>
+        <source>Use Highest Quality Mode</source>
+        <translation>Usar el Modo de Mayor Calidad</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>MythTerminal</name>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/mythterminal.cpp" line="158"/>
         <source>*** Exited with status: %1 ***</source>
         <translation>*** Salida con estado: %1 ***</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="821"/>
+        <source>Use the highest audio quality settings supported by your audio card. This will be a good place to start troubleshooting potential errors</source>
+        <translation>Usar la configuración de sonido de mayor calidad admitida por su tarjeta de sonido. Es un buen punto de partida para depurar potenciales errores</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="824"/>
+        <source>Use the highest audio quality settings supported by your audio card. This will be a good place to start troubleshooting potential errors</source>
+        <translation>Usar la configuración de sonido de mayor calidad admitida por su tarjeta de sonido. Es un buen punto de partida para depurar potenciales errores</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>MythThemedDialog</name>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/mythdialogs.cpp" line="949"/>
         <source>Missing UI Element</source>
         <translation>Elemento de la IU no encontrado</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="865"/>
+        <source>Stop</source>
+        <translation>Detener</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="868"/>
+        <source>Stop</source>
+        <translation>Detener</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/mythdialogs.cpp" line="945"/>
         <source>Could not locate &apos;%1&apos; in theme &apos;%2&apos;.
 
@@ -6689,38 +12178,100 @@ Returning to the previous menu.</source>
         <translation>No se encuentra &apos;%1&apos; en el tema &apos;%2&apos;
 
 Volviendo al menú anterior.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="894"/>
+        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="441"/>
+        <source>Audio device is invalid or not useable.</source>
+        <translation>El dispositivo de sonido es inválido o no utilizable.</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="897"/>
+        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="441"/>
+        <source>Audio device is invalid or not useable.</source>
+        <translation>El dispositivo de sonido es inválido o no utilizable.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>MythThemedMenu</name>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/myththemedmenu.cpp" line="291"/>
         <source>System Menu</source>
         <translation>Menú del Sistema</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="975"/>
+        <source>Use internal volume controls</source>
+        <translation>Usar controles internos de volumen</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="978"/>
+        <source>Use internal volume controls</source>
+        <translation>Usar controles internos de volumen</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/myththemedmenu.cpp" line="302"/>
         <source>Enter standby mode</source>
         <translation>Entrar en modo de espera</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1090"/>
+        <source>Stereo PCM Only</source>
+        <translation>Sólo PCM Estéreo</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1093"/>
+        <source>Stereo PCM Only</source>
+        <translation>Sólo PCM Estéreo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/myththemedmenu.cpp" line="308"/>
         <location filename="../libs/libmythui/myththemedmenu.cpp" line="317"/>
         <source>Shutdown</source>
         <translation>Apagado</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1102"/>
+        <source>Override SRC quality</source>
+        <translation>Ignorar calidad SRC</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1105"/>
+        <source>Override SRC quality</source>
+        <translation>Ignorar calidad SRC</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/myththemedmenu.cpp" line="312"/>
         <location filename="../libs/libmythui/myththemedmenu.cpp" line="318"/>
         <source>Reboot</source>
         <translation>Reinicio</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1104"/>
+        <source>Enable to override audio sample rate conversion quality.</source>
+        <translation>Actívela para ignorar la calidad de conversión de la tasa de muestreo del sonido.</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1107"/>
+        <source>Enable to override audio sample rate conversion quality.</source>
+        <translation>Actívela para ignorar la calidad de conversión de la tasa de muestreo del sonido.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/myththemedmenu.cpp" line="325"/>
         <source>About</source>
         <translation>Acerca de</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1112"/>
+        <source>Sample rate conversion</source>
+        <translation>Conversión de la tasa de muestreo</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1115"/>
+        <source>Sample rate conversion</source>
+        <translation>Conversión de la tasa de muestreo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/myththemedmenu.cpp" line="340"/>
         <source>Revision: %1
  Branch: %2
@@ -6728,39 +12279,99 @@ Volviendo al menú anterior.</translation>
         <translation>Revisión: %1
  Rama: %2
  %3</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1113"/>
+        <source>Disabled</source>
+        <translation>Desactivada</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1116"/>
+        <source>Disabled</source>
+        <translation>Desactivada</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/myththemedmenu.cpp" line="351"/>
         <source>Ok</source>
         <translation>Aceptar</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1114"/>
+        <source>Fastest</source>
+        <translation>La más rápida</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1117"/>
+        <source>Fastest</source>
+        <translation>La más rápida</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/myththemedmenu.cpp" line="902"/>
         <source>Enter password:</source>
         <translation>Introduzca contraseña:</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1117"/>
+        <source>Set the quality of audio sample-rate conversion. &quot;Good&quot; (default) provides the best compromise between CPU usage and quality. &quot;Disabled&quot; lets the audio device handle sample-rate conversion.</source>
+        <translation>Establece la calidad de la conversión de la tasa de muestreo del sonido. &quot;Buena&quot; (predeterminada) proporciona el mejor compromiso entre uso de CPU y calidad. &quot;Desactivada&quot; permite al dispositivo de sonido manejar la conversión de la tasa de muestreo.</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1120"/>
+        <source>Set the quality of audio sample-rate conversion. &quot;Good&quot; (default) provides the best compromise between CPU usage and quality. &quot;Disabled&quot; lets the audio device handle sample-rate conversion.</source>
+        <translation>Establece la calidad de la conversión de la tasa de muestreo del sonido. &quot;Buena&quot; (predeterminada) proporciona el mejor compromiso entre uso de CPU y calidad. &quot;Desactivada&quot; permite al dispositivo de sonido manejar la conversión de la tasa de muestreo.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>MythUIBusyDialog</name>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythprogressdialog.cpp" line="15"/>
         <source>Please Wait...</source>
         <translation>Por favor, espere...</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1127"/>
+        <source>Force audio device output to 48kHz</source>
+        <translation>Forzar salida del dispositivo de sonido a 48kHz</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1130"/>
+        <source>Force audio device output to 48kHz</source>
+        <translation>Forzar salida del dispositivo de sonido a 48kHz</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>MythUIFileBrowser</name>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythuifilebrowser.cpp" line="636"/>
         <source>Parent Directory</source>
         <translation>Directorio Anterior</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1129"/>
+        <source>Force audio sample rate to 48kHz. Some audio devices will report various rates, but they ultimately crash.</source>
+        <translation>Fuerza la tasa de muestreo del sonido a 48kHz. Algunos dispositivos de sonido anuncian varias tasas, pero acaban fallando.</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1132"/>
+        <source>Force audio sample rate to 48kHz. Some audio devices will report various rates, but they ultimately crash.</source>
+        <translation>Fuerza la tasa de muestreo del sonido a 48kHz. Algunos dispositivos de sonido anuncian varias tasas, pero acaban fallando.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythuifilebrowser.cpp" line="493"/>
         <location filename="../libs/libmythui/mythuifilebrowser.cpp" line="666"/>
         <source>Parent</source>
         <translation>Anterior</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1138"/>
+        <source>Separate digital output device</source>
+        <translation>Otro dispositivo de salida digital</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1141"/>
+        <source>Separate digital output device</source>
+        <translation>Otro dispositivo de salida digital</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
+<<<<<<< HEAD
 </context>
 <context>
     <name>MythUISearchDialog</name>
@@ -6772,45 +12383,116 @@ Volviendo al menú anterior.</translation>
             <numerusform>%n coincidencia</numerusform>
             <numerusform>%n coincidencias</numerusform>
         </translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+    <message>
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1140"/>
+        <source>Use a distinct digital output device from default. (default is not checked)</source>
+        <translation>Usar un dispositivo de salida digital diferente del predeterminado (no está marcada, por defecto)</translation>
+=======
+    <message>
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1143"/>
+        <source>Use a distinct digital output device from default. (default is not checked)</source>
+        <translation>Usar un dispositivo de salida digital diferente del predeterminado (no está marcada, por defecto)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>MythWebPage</name>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="303"/>
         <source>Error loading page: %1</source>
         <translation>Error al cargar la página: %1</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1150"/>
+        <source>Digital output device</source>
+        <translation>Dispositivo de salida digital</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1153"/>
+        <source>Digital output device</source>
+        <translation>Dispositivo de salida digital</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>MythWebView</name>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="541"/>
         <source>Enter filename to save file</source>
         <translation>Introducir el nombre del archivo para guardarlo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1161"/>
+        <source>Audio output device to use for digital audio. This value is currently only used with ALSA and DirectX sound output.</source>
+        <translation>Dispositivo de salida de sonido a usar para el sonido digital. Este valor sólo se usa con salidas de sonido ALSA y DirectX.</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1164"/>
+        <source>Audio output device to use for digital audio. This value is currently only used with ALSA and DirectX sound output.</source>
+        <translation>Dispositivo de salida de sonido a usar para el sonido digital. Este valor sólo se usa con salidas de sonido ALSA y DirectX.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="574"/>
         <source>Downloading...</source>
         <translation>Descargando...</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1172"/>
+        <source>ALSA only. By default, let ALSA determine the passthrough sampling rate. If checked set the sampling rate to 48kHz for passthrough. (default is not checked)</source>
+        <translation>Sólo ALSA. Por defecto, permite a ALSA decidir la tasa de muestreo transparente. Si se activa, establecer la tasa de muestreo a 48kHz para el modo transparente (no está marcada, por defecto)</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1175"/>
+        <source>ALSA only. By default, let ALSA determine the passthrough sampling rate. If checked set the sampling rate to 48kHz for passthrough. (default is not checked)</source>
+        <translation>Sólo ALSA. Por defecto, permite a ALSA decidir la tasa de muestreo transparente. Si se activa, establecer la tasa de muestreo a 48kHz para el modo transparente (no está marcada, por defecto)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="611"/>
         <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="703"/>
         <source>Play the file</source>
         <translation>Reproducir el archivo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1182"/>
+        <source>HBR passthrough support</source>
+        <translation>Admitir HBR transparente</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1185"/>
+        <source>HBR passthrough support</source>
+        <translation>Admitir HBR transparente</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="634"/>
         <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="708"/>
         <source>Download the file</source>
         <translation>Descargar el archivo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1184"/>
+        <source>HBR support is required for TrueHD and DTS-HD passthrough. If unchecked, Myth will limit the passthrough bitrate to 6.144Mbit/s.This will disable True-HD passthrough, however will allow DTS-HD content to be sent as DTS-HD Hi-Res. (default is checked)</source>
+        <translation>Se requiere HBR para TrueHD y DTS-HD en modo transparente. Si no se activa, MythTV limitará la tasa de bits transparente a 6.144Mbit/s. Esto desactivará la transparencia True-HD. Sin embargo, permitirá que se envíen contenidos DTS-HD como DTS-HD en Alta Resolución (marcada por defecto)</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1187"/>
+        <source>HBR support is required for TrueHD and DTS-HD passthrough. If unchecked, Myth will limit the passthrough bitrate to 6.144Mbit/s.This will disable True-HD passthrough, however will allow DTS-HD content to be sent as DTS-HD Hi-Res. (default is checked)</source>
+        <translation>Se requiere HBR para TrueHD y DTS-HD en modo transparente. Si no se activa, MythTV limitará la tasa de bits transparente a 6.144Mbit/s. Esto desactivará la transparencia True-HD. Sin embargo, permitirá que se envíen contenidos DTS-HD como DTS-HD en Alta Resolución (marcada por defecto)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="638"/>
         <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="706"/>
         <source>Download and play the file</source>
         <translation>Descargar y reproducir el archivo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1030"/>
+        <source>Changing the volume adjusts the selected mixer.</source>
+        <translation>Los cambios en el volumen ajustan el mezclador selecionado.</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1033"/>
+        <source>Changing the volume adjusts the selected mixer.</source>
+        <translation>Los cambios en el volumen ajustan el mezclador selecionado.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="670"/>
@@ -6849,69 +12531,191 @@ Volviendo al menú anterior.</translation>
         <translation>Hora de finalización del periodo %1</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="25"/>
         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="45"/>
         <source>Period %1 end time. Defines a period the master backend should be awake. Set both Start &amp; End times to 00:00 to disable.</source>
         <translation>Hora de finalización del periodo %1. Define un periodo en el que el servidor principal debe estar funcionando. Establezca a 00:00 las horas de Inicio y Finalización para desactivarla.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4883"/>
+        <source>Blank Frame + Scene Change</source>
+        <translation>Fotograma Vacío + Cambio de Escena</translation>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4882"/>
+        <source>Blank Frame + Scene Change</source>
+        <translation>Fotograma Vacío + Cambio de Escena</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="54"/>
         <source>Automatically Start mythfrontend</source>
         <translation>Iniciar mythfrontend automáticamente</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4891"/>
+        <source>Scene Change Detection</source>
+        <translation>Detección de Cambio de Escena</translation>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4890"/>
+        <source>Scene Change Detection</source>
+        <translation>Detección de Cambio de Escena</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="56"/>
         <source>Mythwelcome will automatically start mythfrontend if it is determined that it was not started to record a program.</source>
         <translation>Mythwelcome iniciará mythfrontend automáticamente si se determina que no fue arrancado para grabar un programa.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1496"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2679"/>
+        <source>Language</source>
+        <translation>Idioma</translation>
+=======
+        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1496"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2543"/>
+        <source>Language</source>
+        <translation>Idioma</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="65"/>
         <source>Shutdown with Master Backend</source>
         <translation>Apagar con el Servidor Principal</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1435"/>
+        <source>Channel ordering</source>
+        <translation>Orden de canales</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1354"/>
+        <source>Channel ordering</source>
+        <translation>Orden de canales</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="67"/>
         <source>Mythwelcome will automatically shutdown this computer when the master backend shuts down. Should only be set on frontend only machines</source>
         <translation>Mythwelcome apagará automáticamente este ordenador cuando el servidor principal se desactive. Debe activarse exclusivamente en máquinas que sólo ejecuten clientes</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1466"/>
+        <source>Scan displacement (X)</source>
+        <translation>Desplazamiento de haz (X)</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1385"/>
+        <source>Scan displacement (X)</source>
+        <translation>Desplazamiento de haz (X)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="76"/>
         <source>Date Format</source>
         <translation>Formato de Fecha</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1468"/>
+        <source>Adjust this to move the image horizontally.</source>
+        <translation>Ajústelo para mover la imágen horizontalmente.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1387"/>
+        <source>Adjust this to move the image horizontally.</source>
+        <translation>Ajústelo para mover la imágen horizontalmente.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="78"/>
         <source>This is the format to use to display the date. See http://doc.trolltech.com/3.3/qdate.html#toString for a list of valid format specifiers.</source>
         <translation>Formato a usar para mostrar la fecha. Ver en: http://doc.trolltech.com/3.3/qdate.html#toString una lista de formatos válidos.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1475"/>
+        <source>Scan displacement (Y)</source>
+        <translation>Desplazamiento de haz (Y)</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1394"/>
+        <source>Scan displacement (Y)</source>
+        <translation>Desplazamiento de haz (Y)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="94"/>
         <source>MythWelcome Settings</source>
         <translation>Configuración de MythWelcome</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1477"/>
+        <source>Adjust this to move the image vertically.</source>
+        <translation>Ajústelo para mover la imágen verticalmente.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1396"/>
+        <source>Adjust this to move the image vertically.</source>
+        <translation>Ajústelo para mover la imágen verticalmente.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="96"/>
         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="101"/>
         <source>Daily Wakeup/ShutDown Period %1</source>
         <translation>Periodo diario de Arranque/Apagado %1</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1584"/>
+        <source>Action on playback exit</source>
+        <translation>Acción al salir de la reproducción</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1478"/>
+        <source>Action on playback exit</source>
+        <translation>Acción al salir de la reproducción</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>MythWizard</name>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/mythwizard.cpp" line="123"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1585"/>
+        <source>Just exit</source>
+        <translation>Sólo salir</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1479"/>
+        <source>Just exit</source>
+        <translation>Sólo salir</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/mythwizard.cpp" line="124"/>
         <source>&lt; &amp;Back</source>
         <translation>&lt; &amp;Atrás</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1586"/>
+        <source>Save position and exit</source>
+        <translation>Guardar posición y salir</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1480"/>
+        <source>Save position and exit</source>
+        <translation>Guardar posición y salir</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/mythwizard.cpp" line="125"/>
         <source>&amp;Next &gt;</source>
         <translation>&amp;Siguiente &gt;</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1600"/>
+        <source>Prompt at end of recording</source>
+        <translation>Preguntar al final de la grabación</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1494"/>
+        <source>Prompt at end of recording</source>
+        <translation>Preguntar al final de la grabación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmyth/mythwizard.cpp" line="126"/>
@@ -6943,9 +12747,37 @@ Volviendo al menú anterior.</translation>
 <context>
     <name>PhrasePopup</name>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="47"/>
         <source>Select Search</source>
         <translation>Seleccionar Búsqueda</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythmetadata/globals.cpp" line="23"/>
+        <location filename="../libs/libmythmetadata/videoutils.cpp" line="17"/>
+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="250"/>
+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="331"/>
+        <location filename="../libs/libmythtv/transporteditor.cpp" line="580"/>
+        <location filename="../libs/libmythtv/transporteditor.cpp" line="670"/>
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="703"/>
+        <location filename="../libs/libmythtv/videoouttypes.h" line="296"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1380"/>
+        <location filename="../programs/mythfrontend/videofilter.cpp" line="805"/>
+        <source>None</source>
+        <translation>Ninguno</translation>
+=======
+        <location filename="../libs/libmythmetadata/globals.cpp" line="23"/>
+        <location filename="../libs/libmythmetadata/videoutils.cpp" line="17"/>
+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="250"/>
+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="331"/>
+        <location filename="../libs/libmythtv/transporteditor.cpp" line="580"/>
+        <location filename="../libs/libmythtv/transporteditor.cpp" line="670"/>
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="704"/>
+        <location filename="../libs/libmythtv/videoouttypes.h" line="296"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1316"/>
+        <location filename="../programs/mythfrontend/videofilter.cpp" line="805"/>
+        <source>None</source>
+        <translation>Ninguno</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="48"/>
@@ -6953,9 +12785,21 @@ Volviendo al menú anterior.</translation>
         <translation>&lt;Nueva Búsqueda&gt;</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="49"/>
         <source>Edit</source>
         <translation>Editar</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1322"/>
+        <location filename="../programs/mythfrontend/videofilter.cpp" line="812"/>
+        <source>Season/Episode</source>
+        <translation>Temporada/Episodio</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1258"/>
+        <location filename="../programs/mythfrontend/videofilter.cpp" line="812"/>
+        <source>Season/Episode</source>
+        <translation>Temporada/Episodio</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="53"/>
@@ -6986,181 +12830,492 @@ Volviendo al menú anterior.</translation>
         <translation>Coincidencia en título (expresión regular)</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/playgroup.cpp" line="56"/>
         <source>Automatically set new recording rules to use this group if the title matches this regular expression. For example, &quot;(News|CNN)&quot; would match any title in which &quot;News&quot; or &quot;CNN&quot; appears.</source>
         <translation>Establecer automáticamente nuevas reglas de grabación para usar este grupo si el título coincide con esta expresión regular.  Por ejemplo, &quot;(News|CNN)&quot; coincidirá con cualquier título en el que aparezca &quot;News&quot; o &quot;CNN&quot;.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1744"/>
+        <source>Halt command</source>
+        <translation>Orden de apagado</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1638"/>
+        <source>Halt command</source>
+        <translation>Orden de apagado</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/playgroup.cpp" line="69"/>
         <location filename="../libs/libmythtv/playgroup.cpp" line="82"/>
         <location filename="../libs/libmythtv/playgroup.cpp" line="95"/>
         <location filename="../libs/libmythtv/playgroup.cpp" line="110"/>
         <source>(default)</source>
         <translation>(predeterminado)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1900"/>
+        <source>GUI X offset</source>
+        <translation>Desplazamiento X de la GUI</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1794"/>
+        <source>GUI X offset</source>
+        <translation>Desplazamiento X de la GUI</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/playgroup.cpp" line="72"/>
         <source>Skip ahead (seconds)</source>
         <translation>Saltar adelante (segundos)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1910"/>
+        <source>GUI Y offset</source>
+        <translation>Desplazamiento Y de la GUI</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1804"/>
+        <source>GUI Y offset</source>
+        <translation>Desplazamiento Y de la GUI</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/playgroup.cpp" line="73"/>
         <source>How many seconds to skip forward on a fast forward.</source>
         <translation>Cuántos segundos se saltará adelante en el avance rápido.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2180"/>
+        <source>Date format</source>
+        <translation>Formato de fecha</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2074"/>
+        <source>Date format</source>
+        <translation>Formato de fecha</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/playgroup.cpp" line="85"/>
         <source>Skip back (seconds)</source>
         <translation>Saltar atrás (segundos)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2221"/>
+        <source>Your preferred date format.</source>
+        <translation>Su formato de fecha preferido.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2115"/>
+        <source>Your preferred date format.</source>
+        <translation>Su formato de fecha preferido.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/playgroup.cpp" line="86"/>
         <source>How many seconds to skip backward on a rewind.</source>
         <translation>Cuántos segundos se saltará atrás al rebobinar.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2264"/>
+        <source>Your preferred short date format.</source>
+        <translation>Su formato corto de fecha preferido.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2158"/>
+        <source>Your preferred short date format.</source>
+        <translation>Su formato corto de fecha preferido.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/playgroup.cpp" line="98"/>
         <source>Jump amount (minutes)</source>
         <translation>Cantidad de salto (minutos)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2272"/>
+        <source>Time format</source>
+        <translation>Formato de Hora</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2166"/>
+        <source>Time format</source>
+        <translation>Formato de Hora</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/playgroup.cpp" line="99"/>
         <source>How many minutes to jump forward or backward when the jump keys are pressed.</source>
         <translation>Cuántos minutos se saltará atrás o adelante al pulsar las teclas de salto.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2328"/>
+        <source>Long channel format</source>
+        <translation>Formato largo de canal</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2222"/>
+        <source>Long channel format</source>
+        <translation>Formato largo de canal</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/playgroup.cpp" line="114"/>
         <source>Time stretch (speed x 100)</source>
         <translation>Ralentización temporal (velocidad x 100)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2342"/>
+        <source>Allow Live TV to move scheduled shows</source>
+        <translation>Permitir que la TV en Vivo reasigne grabaciones programadas</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2236"/>
+        <source>Allow Live TV to move scheduled shows</source>
+        <translation>Permitir que la TV en Vivo reasigne grabaciones programadas</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/playgroup.cpp" line="115"/>
         <source>Initial playback speed with adjusted audio. Use 100 for normal speed, 50 for half speed and 200 for double speed.</source>
         <translation>Velocidad de reproducción inicial con el sonido ajustado. Use 100 para velocidad normal, 50 para velocidad media y 200 para velocidad doble.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2344"/>
+        <source>If enabled, scheduled recordings will be moved to other cards (where possible), so that Live TV will not be interrupted.</source>
+        <translation>Si se activa, las grabaciones programadas serán asignadas a otras tarjetas (mientras sea posible), de forma que la TV en Vivo no sea interrumpida.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2238"/>
+        <source>If enabled, scheduled recordings will be moved to other cards (where possible), so that Live TV will not be interrupted.</source>
+        <translation>Si se activa, las grabaciones programadas serán asignadas a otras tarjetas (mientras sea posible), de forma que la TV en Vivo no sea interrumpida.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/playgroup.cpp" line="145"/>
         <source>%1 Group</source>
         <comment>Play Group</comment>
         <extracomment>%1 is the name of the playgroup</extracomment>
         <translation>Grupo %1</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2386"/>
+        <source>Browse/change channels from Channel Group</source>
+        <translation>Explorar/cambiar canales desde el Grupo de Canales</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2280"/>
+        <source>Browse/change channels from Channel Group</source>
+        <translation>Explorar/cambiar canales desde el Grupo de Canales</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>PlayGroupEditor</name>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/playgroup.cpp" line="234"/>
         <source>Playback Groups</source>
         <translation>Grupos de Reproducción</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2387"/>
+        <source>If enabled, Live TV will browse or change channels from the selected channel group. The &quot;All Channels&quot; channel group may be selected to browse all channels.</source>
+        <translation>Si se activa, la TV en Vivo explorará o cambiará los canales desde el grupo de canales seleccionado. El grupo &quot;Todos los Canales&quot; podrá ser elegido para navegar por todos los canales.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2281"/>
+        <source>If enabled, Live TV will browse or change channels from the selected channel group. The &quot;All Channels&quot; channel group may be selected to browse all channels.</source>
+        <translation>Si se activa, la TV en Vivo explorará o cambiará los canales desde el grupo de canales seleccionado. El grupo &quot;Todos los Canales&quot; podrá ser elegido para navegar por todos los canales.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/playgroup.cpp" line="281"/>
         <source>Delete playback group:
 &apos;%1&apos;?</source>
         <translation>¿Eliminar el grupo de reproducción:
 &apos;%1&apos;?</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2422"/>
+        <source>Reschedule higher priorities</source>
+        <translation>Reprogramar prioridades más altas</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2316"/>
+        <source>Reschedule higher priorities</source>
+        <translation>Reprogramar prioridades más altas</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/playgroup.cpp" line="310"/>
         <source>Default</source>
         <translation>Predeterminado</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2423"/>
+        <source>Move higher priority programs to other cards and showings when resolving conflicts. This can be used to record lower priority programs that would otherwise not be recorded, but risks missing a higher priority program if the schedule changes.</source>
+        <translation>Reasignar los programas de mayor prioridad a otras tarjetas y horarios al resolver conflictos. Esto puede usarse para grabar programas de prioridad menor que, de otra forma, no serían grabados pero hay riesgo de perder programas de prioridad mayor si cambia la programación.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2317"/>
+        <source>Move higher priority programs to other cards and showings when resolving conflicts. This can be used to record lower priority programs that would otherwise not be recorded, but risks missing a higher priority program if the schedule changes.</source>
+        <translation>Reasignar los programas de mayor prioridad a otras tarjetas y horarios al resolver conflictos. Esto puede usarse para grabar programas de prioridad menor que, de otra forma, no serían grabados pero hay riesgo de perder programas de prioridad mayor si cambia la programación.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/playgroup.cpp" line="247"/>
         <source>Create New Playback Group</source>
         <translation>Crear Nuevo Grupo de Reproducción</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2435"/>
+        <source>Avoid back to back recordings</source>
+        <translation>Evitar grabaciones contiguas</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2329"/>
+        <source>Avoid back to back recordings</source>
+        <translation>Evitar grabaciones contiguas</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/playgroup.cpp" line="286"/>
         <source>Yes, delete group</source>
         <translation>Sí, eliminar grupo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2436"/>
+        <source>Selects the situations where the scheduler will avoid assigning shows to the same card if their end time and start time match. This will be allowed when necessary in order to resolve conflicts.</source>
+        <translation>Selecciona las situaciones en las que el programador evitará asignar programas a la misma tarjeta si coinciden sus horas de inicio y finalización. Esto se permitirá cuando sea necesario para resolver conflictos.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2330"/>
+        <source>Selects the situations where the scheduler will avoid assigning shows to the same card if their end time and start time match. This will be allowed when necessary in order to resolve conflicts.</source>
+        <translation>Selecciona las situaciones en las que el programador evitará asignar programas a la misma tarjeta si coinciden sus horas de inicio y finalización. Esto se permitirá cuando sea necesario para resolver conflictos.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/playgroup.cpp" line="287"/>
         <source>No, Don&apos;t delete group</source>
         <translation>No, no eliminar el grupo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2441"/>
+        <source>Different Channels</source>
+        <translation>En Canales Diferentes</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2335"/>
+        <source>Different Channels</source>
+        <translation>En Canales Diferentes</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/playgroup.cpp" line="248"/>
         <source>Enter group name or press SELECT to enter text via the On Screen Keyboard</source>
         <translation>Introduzca el nombre del grupo o pulse SELECT para introducir texto con el Teclado de Pantalla</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2480"/>
+        <source>Preferred input priority</source>
+        <translation>Prioridad para entradas preferentes</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2344"/>
+        <source>Preferred input priority</source>
+        <translation>Prioridad para entradas preferentes</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/playgroup.cpp" line="319"/>
         <source>(Create new group)</source>
         <translation>(Crear nuevo grupo)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2491"/>
+        <source>HDTV recording priority</source>
+        <translation>Prioridad para grabaciones HDTV</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2355"/>
+        <source>HDTV recording priority</source>
+        <translation>Prioridad para grabaciones HDTV</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>PlaybackBox</name>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2532"/>
         <source>Are you sure you want to delete:</source>
         <translation>¿Seguro que desea eliminar:</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2501"/>
+        <source>Widescreen recording priority</source>
+        <translation>Prioridad para grabaciones panorámicas</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2365"/>
+        <source>Widescreen recording priority</source>
+        <translation>Prioridad para grabaciones panorámicas</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2538"/>
         <source>Are you sure you want to stop:</source>
         <translation>¿Seguro que desea detener:</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2511"/>
+        <source>Automatic priority range (+/-)</source>
+        <translation>Intervalo de prioridades automáticas (+/-)</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2375"/>
+        <source>Automatic priority range (+/-)</source>
+        <translation>Intervalo de prioridades automáticas (+/-)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2685"/>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="3145"/>
         <source>Play</source>
         <translation>Reproducir</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2524"/>
+        <source>Sign language recording priority</source>
+        <translation>Prioridad para grabaciones en lengua de signos</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2388"/>
+        <source>Sign language recording priority</source>
+        <translation>Prioridad para grabaciones en lengua de signos</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="3167"/>
         <source>Stop Recording</source>
         <translation>Detener Grabación</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2546"/>
+        <source>Subtitles/CC recording priority</source>
+        <translation>Prioridad de grabaciones con subtítulos</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2410"/>
+        <source>Subtitles/CC recording priority</source>
+        <translation>Prioridad de grabaciones con subtítulos</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2704"/>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="3117"/>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="3189"/>
         <source>Delete</source>
         <translation>Eliminar</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2558"/>
+        <source>Hard of hearing priority</source>
+        <translation>Prioridad para sordos</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2422"/>
+        <source>Hard of hearing priority</source>
+        <translation>Prioridad para sordos</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2576"/>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2580"/>
         <source>Yes, delete it</source>
         <translation>Sí, eliminarla</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2570"/>
+        <source>Audio described priority</source>
+        <translation>Prioridad para audio descriptivo</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2434"/>
+        <source>Audio described priority</source>
+        <translation>Prioridad para audio descriptivo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2385"/>
         <source>Change Group View</source>
         <translation>Cambiar Vista de Grupo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2581"/>
+        <source>Single recordings priority</source>
+        <translation>Prioridad para grabaciones únicas</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2445"/>
+        <source>Single recordings priority</source>
+        <translation>Prioridad para grabaciones únicas</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2389"/>
         <source>Change Group Password</source>
         <translation>Cambiar Contraseña de Grupo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2582"/>
+        <source>Single recordings will receive this additional recording priority value.</source>
+        <translation>Las grabaciones únicas recibirán este valor adicional en la prioridad de grabación.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2446"/>
+        <source>Single recordings will receive this additional recording priority value.</source>
+        <translation>Las grabaciones únicas recibirán este valor adicional en la prioridad de grabación.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2718"/>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2931"/>
         <source>Change Recording Group</source>
         <translation>Cambiar Grupo de Grabación</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2592"/>
+        <source>Weekslot recordings priority</source>
+        <translation>Prioridad para grabaciones semanales</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2456"/>
+        <source>Weekslot recordings priority</source>
+        <translation>Prioridad para grabaciones semanales</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2949"/>
         <source>Edit Recording Schedule</source>
         <translation>Editar Programación de Grabación</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2593"/>
+        <source>Weekslot recordings will receive this additional recording priority value.</source>
+        <translation>Las grabaciones semanales recibirán este valor adicional en la prioridad de grabación.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2457"/>
+        <source>Weekslot recordings will receive this additional recording priority value.</source>
+        <translation>Las grabaciones semanales recibirán este valor adicional en la prioridad de grabación.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2789"/>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2998"/>
         <source>Stop Transcoding</source>
         <translation>Detener Transcodificación</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2603"/>
+        <source>Timeslot recordings priority</source>
+        <translation>Prioridad para grabaciones horarias</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2467"/>
+        <source>Timeslot recordings priority</source>
+        <translation>Prioridad para grabaciones horarias</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2787"/>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2998"/>
         <source>Begin Transcoding</source>
         <translation>Iniciar Transcodificación</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2604"/>
+        <source>Timeslot recordings will receive this additional recording priority value.</source>
+        <translation>Las grabaciones horarias recibirán este valor adicional en la prioridad de grabación.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2468"/>
+        <source>Timeslot recordings will receive this additional recording priority value.</source>
+        <translation>Las grabaciones horarias recibirán este valor adicional en la prioridad de grabación.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="3051"/>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="4385"/>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="4584"/>
@@ -7168,116 +13323,326 @@ Volviendo al menú anterior.</translation>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="4856"/>
         <source>Default</source>
         <translation>Predeterminado</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2614"/>
+        <source>Channel recordings priority</source>
+        <translation>Prioridad para grabaciones por canal</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2478"/>
+        <source>Channel recordings priority</source>
+        <translation>Prioridad para grabaciones por canal</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2568"/>
         <source>Yes, and allow re-record</source>
         <translation>Sí, y permitir grabar de nuevo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2615"/>
+        <source>Channel recordings will receive this additional recording priority value.</source>
+        <translation>Las grabaciones por canal recibirán este valor adicional en la prioridad de grabación.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2479"/>
+        <source>Channel recordings will receive this additional recording priority value.</source>
+        <translation>Las grabaciones por canal recibirán este valor adicional en la prioridad de grabación.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2913"/>
         <source>Play from beginning</source>
         <translation>Reproducir desde el principio</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2625"/>
+        <source>All recordings priority</source>
+        <translation>Prioridad para &apos;todas&apos; las grabaciones</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2489"/>
+        <source>All recordings priority</source>
+        <translation>Prioridad para &apos;todas&apos; las grabaciones</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2912"/>
         <source>Play from bookmark</source>
         <translation>Reproducir desde el marcador</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2626"/>
+        <source>The &apos;All&apos; recording type will receive this additional recording priority value.</source>
+        <translation>El tipo de grabación &apos;Todas&apos; recibirá este valor adicional en la prioridad de grabación.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2490"/>
+        <source>The &apos;All&apos; recording type will receive this additional recording priority value.</source>
+        <translation>El tipo de grabación &apos;Todas&apos; recibirá este valor adicional en la prioridad de grabación.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2928"/>
         <source>Do not preserve this episode</source>
         <translation>No conservar este episodio</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2636"/>
+        <source>Find one recordings priority</source>
+        <translation>Prioridad para grabaciones Buscar Una</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2500"/>
+        <source>Find one recordings priority</source>
+        <translation>Prioridad para grabaciones Buscar Una</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2928"/>
         <source>Preserve this episode</source>
         <translation>Conservar este episodio</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2648"/>
+        <source>Override recordings priority</source>
+        <translation>Prioridad para ignorar grabaciones</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2512"/>
+        <source>Override recordings priority</source>
+        <translation>Prioridad para ignorar grabaciones</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="3143"/>
         <source>Play from...</source>
         <translation>Reproducir desde...</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2649"/>
+        <source>Override recordings will receive this additional recording priority value.</source>
+        <translation>Ignorar grabaciones recibirá este valor adicional en la prioridad de grabación.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2513"/>
+        <source>Override recordings will receive this additional recording priority value.</source>
+        <translation>Ignorar grabaciones recibirá este valor adicional en la prioridad de grabación.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2702"/>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2924"/>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="3175"/>
         <source>Storage Options</source>
         <translation>Opciones de Guardado</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2660"/>
+        <source>The program guide starts on this channel if it is run from outside of Live TV mode.</source>
+        <translation>La guía de programas comenzará en este canal si se ejecuta desde fuera del modo TV en Vivo.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2524"/>
+        <source>The program guide starts on this channel if it is run from outside of Live TV mode.</source>
+        <translation>La guía de programas comenzará en este canal si se ejecuta desde fuera del modo TV en Vivo.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="3109"/>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="3176"/>
         <source>Recording Options</source>
         <translation>Opciones de Grabación</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2668"/>
+        <source>Record threshold</source>
+        <translation>Umbral de grabación</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2532"/>
+        <source>Record threshold</source>
+        <translation>Umbral de grabación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2703"/>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2968"/>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="3177"/>
         <source>Job Options</source>
         <translation>Opciones de Tareas</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2670"/>
+        <source>Pressing SELECT on a show that is at least this many minutes into the future will schedule a recording.</source>
+        <translation>Pulsar SELECT en un programa situado al menos esta cantidad de minutos en el futuro programará una grabación.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2534"/>
+        <source>Pressing SELECT on a show that is at least this many minutes into the future will schedule a recording.</source>
+        <translation>Pulsar SELECT en un programa situado al menos esta cantidad de minutos en el futuro programará una grabación.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2686"/>
         <source>Shuffle Play</source>
         <translation>Reproducción Aleatoria</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2730"/>
+        <source>Guide language #%1</source>
+        <translation>Idioma #%1 de la guía</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2594"/>
+        <source>Guide language #%1</source>
+        <translation>Idioma #%1 de la guía</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2394"/>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="3158"/>
         <source>Playlist options</source>
         <translation>Opciones de la lista de reproducción</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2735"/>
+        <source>Your #%1 preferred language for Program Guide data and captions.</source>
+        <translation>Su idioma #%1 preferido para los datos de la Guía de Programas y los subítulos.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2599"/>
+        <source>Your #%1 preferred language for Program Guide data and captions.</source>
+        <translation>Su idioma #%1 preferido para los datos de la Guía de Programas y los subítulos.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2405"/>
         <source>Add this recording to Playlist</source>
         <translation>Añadir esta grabación a la Lista de Reproducción</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2753"/>
+        <source>Network Remote Control port</source>
+        <translation>Puerto de Control Remoto por Red</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2617"/>
+        <source>Network Remote Control port</source>
+        <translation>Puerto de Control Remoto por Red</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2687"/>
         <source>Clear Playlist</source>
         <translation>Borrar Lista de Reproducción</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2755"/>
+        <source>This specifies what port the network remote Control interface will listen on for new connections.</source>
+        <translation>Especifica en qué puerto escuchará la interfaz del Control Remoto por Red en busca de nuevas conexiones.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2619"/>
+        <source>This specifies what port the network remote Control interface will listen on for new connections.</source>
+        <translation>Especifica en qué puerto escuchará la interfaz del Control Remoto por Red en busca de nuevas conexiones.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2692"/>
         <source>Toggle playlist for this Category/Title</source>
         <translation>Conmutar lista de reproducción para esta Categoría/Título</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2763"/>
+        <source>UDP notify port</source>
+        <translation>Puerto de notificaciones UDP</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2627"/>
+        <source>UDP notify port</source>
+        <translation>Puerto de notificaciones UDP</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2699"/>
         <source>Toggle playlist for this recording</source>
         <translation>Conmutar lista de reproducción para esta grabación</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2787"/>
+        <source>This enables support for monitoring your CD/DVD drives for new disks and launching the proper plugin to handle them. Requires restart.</source>
+        <translation>Activa la capacidad de monitorizar sus unidades de CD/DVD a la búsqueda de nuevos discos y ejecutando el complemento apropiado para manejarlos. Requiere reiniciar.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2651"/>
+        <source>This enables support for monitoring your CD/DVD drives for new disks and launching the proper plugin to handle them. Requires restart.</source>
+        <translation>Activa la capacidad de monitorizar sus unidades de CD/DVD a la búsqueda de nuevos discos y ejecutando el complemento apropiado para manejarlos. Requiere reiniciar.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="3106"/>
         <source>Recording file cannot be found</source>
         <translation>No fue posible encontrar el archivo de grabación</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2797"/>
+        <source>Ignore devices</source>
+        <translation>Ignorar dispositivos</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2661"/>
+        <source>Ignore devices</source>
+        <translation>Ignorar dispositivos</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="3108"/>
         <source>Recording file contains no data</source>
         <translation>El archivo de grabación no contiene datos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2799"/>
+        <source>If there are any devices that you do not want to be monitored, list them here with commas in-between. The plugins will ignore them. Requires restart.</source>
+        <translation>Si existen dispositivos que usted no desea monitorizar, inclúyalos aquí separados por comas. Los complementos los ignorarán. Requiere reiniciar.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2663"/>
+        <source>If there are any devices that you do not want to be monitored, list them here with commas in-between. The plugins will ignore them. Requires restart.</source>
+        <translation>Si existen dispositivos que usted no desea monitorizar, inclúyalos aquí separados por comas. Los complementos los ignorarán. Requiere reiniciar.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="3121"/>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="3151"/>
         <source>Remove from Playlist</source>
         <translation>Eliminar de la Lista de Reproducción</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2832"/>
+        <source>Sort titles</source>
+        <translation>Ordenar títulos</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2696"/>
+        <source>Sort titles</source>
+        <translation>Ordenar títulos</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="3125"/>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="3154"/>
         <source>Add to Playlist</source>
         <translation>Añadir a la Lista de Reproducción</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2835"/>
+        <source>By recording priority</source>
+        <translation>Por prioridad de grabación</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2699"/>
+        <source>By recording priority</source>
+        <translation>Por prioridad de grabación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="3028"/>
         <source>User Job</source>
         <translation>Tarea de Usuario</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2837"/>
+        <source>Sets the title sorting order when the view is set to Titles only.</source>
+        <translation>Establece la ordenación de títulos cuando la vista es &apos;Sólo Títulos&apos;.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2701"/>
+        <source>Sets the title sorting order when the view is set to Titles only.</source>
+        <translation>Establece la ordenación de títulos cuando la vista es &apos;Sólo Títulos&apos;.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2810"/>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2823"/>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2836"/>
@@ -7285,8 +13650,18 @@ Volviendo al menú anterior.</translation>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="3029"/>
         <source>Stop</source>
         <translation>Detener</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2859"/>
+        <source>If enabled, the &apos;Watch List&apos; will be the initial view each time you enter the Watch Recordings screen</source>
+        <translation>Si se activa, la &apos;Lista de Visionado&apos; será la vista inicial cada vez que entre en la pantalla de Ver Grabaciones</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2723"/>
+        <source>If enabled, the &apos;Watch List&apos; will be the initial view each time you enter the Watch Recordings screen</source>
+        <translation>Si se activa, la &apos;Lista de Visionado&apos; será la vista inicial cada vez que entre en la pantalla de Ver Grabaciones</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2807"/>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2820"/>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2833"/>
@@ -7294,23 +13669,63 @@ Volviendo al menú anterior.</translation>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="3030"/>
         <source>Begin</source>
         <translation>Comenzar</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2870"/>
+        <source>Set this if you turn off Auto-Expire only for recordings that you&apos;ve seen and intend to keep. This option will exclude these recordings from the &apos;Watch List&apos;.</source>
+        <translation>Márquela si desactiva la Autoexpiración sólo para las grabaciones que ya ha visto y pretende conservar. Esta opción excluirá dichas grabaciones de la &apos;Lista de Visionado&apos;.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2734"/>
+        <source>Set this if you turn off Auto-Expire only for recordings that you&apos;ve seen and intend to keep. This option will exclude these recordings from the &apos;Watch List&apos;.</source>
+        <translation>Márquela si desactiva la Autoexpiración sólo para las grabaciones que ya ha visto y pretende conservar. Esta opción excluirá dichas grabaciones de la &apos;Lista de Visionado&apos;.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2382"/>
         <source>Change Group Filter</source>
         <translation>Cambiar Filtro de Grupos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2927"/>
+        <source>Display time</source>
+        <translation>Mostrar hora</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2791"/>
+        <source>Display time</source>
+        <translation>Mostrar hora</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2400"/>
         <source>Add this Group to Playlist</source>
         <translation>Añadir este Grupo a la Lista de Reproducción</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2936"/>
+        <source>Display recording status</source>
+        <translation>Mostrar estado de grabación</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2800"/>
+        <source>Display recording status</source>
+        <translation>Mostrar estado de grabación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="570"/>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="4364"/>
         <source>Groups</source>
         <translation>Grupos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2946"/>
+        <source>Display menus</source>
+        <translation>Mostrar menús</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2810"/>
+        <source>Display menus</source>
+        <translation>Mostrar menús</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
+<<<<<<< HEAD
     <message numerus="yes">
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="4389"/>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="4396"/>
@@ -7322,81 +13737,233 @@ Volviendo al menú anterior.</translation>
             <numerusform>%1 [%n elemento]</numerusform>
             <numerusform>%1 [%n elementos]</numerusform>
         </translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+    <message>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2955"/>
+        <source>Menu pop-up time</source>
+        <translation>TIempo de emergencia del menú</translation>
+=======
+    <message>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2819"/>
+        <source>Menu pop-up time</source>
+        <translation>TIempo de emergencia del menú</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="4443"/>
         <source>Categories</source>
         <translation>Categorías</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2956"/>
+        <source>How many seconds the menu will remain visible after navigation.</source>
+        <translation>Cuántos segundos permanecerá visible el menú tras la navegación.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2820"/>
+        <source>How many seconds the menu will remain visible after navigation.</source>
+        <translation>Cuántos segundos permanecerá visible el menú tras la navegación.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2720"/>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2926"/>
         <source>Disable Auto Expire</source>
         <translation>Desactivar Autoexpiración</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2965"/>
+        <source>Display music artist and title</source>
+        <translation>Mostrar artista y título</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2829"/>
+        <source>Display music artist and title</source>
+        <translation>Mostrar artista y título</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2721"/>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2926"/>
         <source>Enable Auto Expire</source>
         <translation>Activar Autoexpiración</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2985"/>
+        <source>Display channel information</source>
+        <translation>Mostrar información de canales</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2849"/>
+        <source>Display channel information</source>
+        <translation>Mostrar información de canales</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2719"/>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2932"/>
         <source>Change Playback Group</source>
         <translation>Cambiar Grupo de Reproducción</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2994"/>
+        <source>Display volume information</source>
+        <translation>Mostrar información de volumen</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2858"/>
+        <source>Display volume information</source>
+        <translation>Mostrar información de volumen</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="3052"/>
         <source>Autodetect</source>
         <translation>Detectar automáticamente</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3004"/>
+        <source>Display generic information</source>
+        <translation>Mostrar información genérica</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2868"/>
+        <source>Display generic information</source>
+        <translation>Mostrar información genérica</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="3075"/>
         <source>High Quality</source>
         <translation>Calidad Alta</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3013"/>
+        <source>Backlight always on</source>
+        <translation>Luz de fondo siempre encendida</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2877"/>
+        <source>Backlight always on</source>
+        <translation>Luz de fondo siempre encendida</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="3077"/>
         <source>Medium Quality</source>
         <translation>Calidad Media</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3023"/>
+        <source>Heartbeat always on</source>
+        <translation>Parpadeo siempre activo</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2887"/>
+        <source>Heartbeat always on</source>
+        <translation>Parpadeo siempre activo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="3079"/>
         <source>Low Quality</source>
         <translation>Calidad Baja</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3032"/>
+        <source>Display large clock</source>
+        <translation>Mostrar reloj grande</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2896"/>
+        <source>Display large clock</source>
+        <translation>Mostrar reloj grande</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="393"/>
         <source>Watch List</source>
         <translation>Lista de Visión</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3041"/>
+        <source>LCD key order</source>
+        <translation>Orden de teclas LCD</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2905"/>
+        <source>LCD key order</source>
+        <translation>Orden de teclas LCD</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="1417"/>
         <source>There are no recordings in your current view</source>
         <translation>No hay grabaciones en su vista actual</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3114"/>
+        <source>If enabled, QuickTime will correct the gamma of the video to match your monitor. Turning this off can save some CPU cycles.</source>
+        <translation>Si se activa, QuickTime corregirá la gamma de la imagen hasta ajustarla a su monitor. Desactivarlo puede ahorrar algunos ciclos de CPU.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2978"/>
+        <source>If enabled, QuickTime will correct the gamma of the video to match your monitor. Turning this off can save some CPU cycles.</source>
+        <translation>Si se activa, QuickTime corregirá la gamma de la imagen hasta ajustarla a su monitor. Desactivarlo puede ahorrar algunos ciclos de CPU.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="1416"/>
         <source>There are no recordings available</source>
         <translation>No hay grabaciones disponibles</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3125"/>
+        <source>If enabled, video will be scaled to fit your window or screen. If unchecked, video will never be made larger than its actual pixel size.</source>
+        <translation>Si se activa, la imagen se ajustará a su ventana o pantalla. Si no se marca, la imagen nunca será mayor que su tamaño de píxel actual.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2989"/>
+        <source>If enabled, video will be scaled to fit your window or screen. If unchecked, video will never be made larger than its actual pixel size.</source>
+        <translation>Si se activa, la imagen se ajustará a su ventana o pantalla. Si no se marca, la imagen nunca será mayor que su tamaño de píxel actual.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="3171"/>
         <source>Mark as Unwatched</source>
         <translation>Marcar como No Vista</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3149"/>
+        <source>If enabled, video will be displayed in the main GUI window. Disable this when you only want video on the desktop or in a floating window. Only valid when &quot;Use GUI size for TV playback&quot; and &quot;Run the frontend in a window&quot; are checked.</source>
+        <translation>Si se activa, la imagen se mostrará en la ventana GUI principal. Desactívelo si sólo desea la imagen en el escritorio o en una ventana flotante. Sólo es válido cuando están marcadas &quot;Usar el tamaño de la GUI para reproducir TV&quot; y &quot;Ejecutar el cliente en una ventana&quot;.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3013"/>
+        <source>If enabled, video will be displayed in the main GUI window. Disable this when you only want video on the desktop or in a floating window. Only valid when &quot;Use GUI size for TV playback&quot; and &quot;Run the frontend in a window&quot; are checked.</source>
+        <translation>Si se activa, la imagen se mostrará en la ventana GUI principal. Desactívelo si sólo desea la imagen en el escritorio o en una ventana flotante. Sólo es válido cuando están marcadas &quot;Usar el tamaño de la GUI para reproducir TV&quot; y &quot;Ejecutar el cliente en una ventana&quot;.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="3173"/>
         <source>Mark as Watched</source>
         <translation>Marcar como Vista</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3205"/>
+        <source>If enabled, video will be displayed in a floating window. Only valid when &quot;Use GUI size for TV playback&quot; and &quot;Run the frontend in a window&quot; are checked.</source>
+        <translation>Si se activa, la imagen se mostrará en una ventana flotante. Sólo es válido cuando están marcadas &quot;Usar el tamaño de la GUI para reproducir TV&quot; y &quot;Ejecutar el cliente en una ventana&quot;.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3069"/>
+        <source>If enabled, video will be displayed in a floating window. Only valid when &quot;Use GUI size for TV playback&quot; and &quot;Run the frontend in a window&quot; are checked.</source>
+        <translation>Si se activa, la imagen se mostrará en una ventana flotante. Sólo es válido cuando están marcadas &quot;Usar el tamaño de la GUI para reproducir TV&quot; y &quot;Ejecutar el cliente en una ventana&quot;.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="1644"/>
         <source>_NO_TITLE_</source>
         <translation>_SIN_TÍTULO_</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3260"/>
+        <source>If enabled, video will be displayed in the application&apos;s dock icon. Only valid when &quot;Use GUI size for TV playback&quot; and &quot;Run the frontend in a window&quot; are checked.</source>
+        <translation>Si se activa, la imagen se mostrará en el icono de bandeja de la aplicación. Sólo es válido cuando están marcadas &quot;Usar el tamaño de la GUI para reproducir TV&quot; y &quot;Ejecutar el cliente en una ventana&quot;.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3124"/>
+        <source>If enabled, video will be displayed in the application&apos;s dock icon. Only valid when &quot;Use GUI size for TV playback&quot; and &quot;Run the frontend in a window&quot; are checked.</source>
+        <translation>Si se activa, la imagen se mostrará en el icono de bandeja de la aplicación. Sólo es válido cuando están marcadas &quot;Usar el tamaño de la GUI para reproducir TV&quot; y &quot;Ejecutar el cliente en una ventana&quot;.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="1656"/>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="4416"/>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="4418"/>
@@ -7404,13 +13971,35 @@ Volviendo al menú anterior.</translation>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="4433"/>
         <source>Unknown</source>
         <translation>Desconocida</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3300"/>
+        <source>If enabled, video will be displayed on the desktop, behind the Finder icons. Only valid when &quot;Use GUI size for TV playback&quot; and &quot;Run the frontend in a window&quot; are checked.</source>
+        <translation>Si se activa, la imagen se mostrará en el escritorio, tras los iconos de Finder. Sólo es válido cuando están marcadas &quot;Usar el tamaño de la GUI para reproducir TV&quot; y &quot;Ejecutar el cliente en una ventana&quot;.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3164"/>
+        <source>If enabled, video will be displayed on the desktop, behind the Finder icons. Only valid when &quot;Use GUI size for TV playback&quot; and &quot;Run the frontend in a window&quot; are checked.</source>
+        <translation>Si se activa, la imagen se mostrará en el escritorio, tras los iconos de Finder. Sólo es válido cuando están marcadas &quot;Usar el tamaño de la GUI para reproducir TV&quot; y &quot;Ejecutar el cliente en una ventana&quot;.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2410"/>
         <source>Help (Status Icons)</source>
         <translation>Ayuda (Iconos de Estado)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3507"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3515"/>
+        <source>Mac OS X Video Settings</source>
+        <translation>Configuración de Imagen de Mac OS X</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3371"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3379"/>
+        <source>Mac OS X Video Settings</source>
+        <translation>Configuración de Imagen de Mac OS X</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2705"/>
         <source>Delete, and allow re-record</source>
         <translation>Eliminar y permitir grabar de nuevo</translation>
@@ -7424,13 +14013,33 @@ Volviendo al menú anterior.</translation>
             <numerusform>Existe %n elemento en la lista de reproducción. Las acciones afectan a todos los elementos de la lista</numerusform>
             <numerusform>Existen %n elementos en la lista de reproducción. Las acciones afectan a todos los elementos de la lista</numerusform>
         </translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3533"/>
+        <source>On-screen Display</source>
+        <translation>Pantalla</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3397"/>
+        <source>On-screen Display</source>
+        <translation>Pantalla</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2908"/>
         <source>Play Options</source>
         <translation>Opciones de Reproducción</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3568"/>
+        <source>General (Auto-Expire)</source>
+        <translation>General (Auto-Expiración)</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3429"/>
+        <source>General (Auto-Expire)</source>
+        <translation>General (Auto-Expiración)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2945"/>
         <source>Scheduling Options</source>
         <translation>Opciones de Programación</translation>
@@ -7439,17 +14048,83 @@ Volviendo al menú anterior.</translation>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="3184"/>
         <source>Undelete</source>
         <translation>Recuperar</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3619"/>
+        <source>Default Job Queue Settings for New Scheduled Recordings</source>
+        <translation>Configuración Predeterminada de la Cola de Trabajos para Nuevas Grabaciones Programadas</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3692"/>
+        <source>Theme</source>
+        <translation>Tema</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3528"/>
+        <source>Theme</source>
+        <translation>Tema</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="3185"/>
         <source>Delete Forever</source>
         <translation>Eliminar Permanentemente</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2658"/>
+        <source>Guide starts at channel</source>
+        <translation>La Guía comienza en el canal</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2522"/>
+        <source>Guide starts at channel</source>
+        <translation>La Guía comienza en el canal</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="4386"/>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="4588"/>
         <source>Deleted</source>
         <translation>Eliminado</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="2725"/>
+        <location filename="../libs/libmyth/programinfo.cpp" line="4070"/>
+        <location filename="../libs/libmyth/programtypes.cpp" line="211"/>
+        <location filename="../libs/libmythmetadata/globals.cpp" line="6"/>
+        <location filename="../libs/libmythmetadata/globals.cpp" line="7"/>
+        <location filename="../libs/libmythmetadata/globals.cpp" line="8"/>
+        <location filename="../libs/libmythmetadata/globals.cpp" line="9"/>
+        <location filename="../libs/libmythmetadata/globals.cpp" line="10"/>
+        <location filename="../libs/libmythmetadata/globals.cpp" line="11"/>
+        <location filename="../libs/libmythmetadata/globals.cpp" line="12"/>
+        <location filename="../libs/libmythtv/jobqueue.h" line="24"/>
+        <location filename="../libs/libmythtv/videoouttypes.h" line="132"/>
+        <location filename="../libs/libmythtv/videoouttypes.h" line="155"/>
+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="41"/>
+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="42"/>
+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1032"/>
+        <location filename="../programs/mythfrontend/videofilter.cpp" line="798"/>
+        <source>Unknown</source>
+        <translation>Desconocido</translation>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="2724"/>
+        <location filename="../libs/libmyth/programinfo.cpp" line="4069"/>
+        <location filename="../libs/libmyth/programtypes.cpp" line="223"/>
+        <location filename="../libs/libmythmetadata/globals.cpp" line="6"/>
+        <location filename="../libs/libmythmetadata/globals.cpp" line="7"/>
+        <location filename="../libs/libmythmetadata/globals.cpp" line="8"/>
+        <location filename="../libs/libmythmetadata/globals.cpp" line="9"/>
+        <location filename="../libs/libmythmetadata/globals.cpp" line="10"/>
+        <location filename="../libs/libmythmetadata/globals.cpp" line="11"/>
+        <location filename="../libs/libmythmetadata/globals.cpp" line="12"/>
+        <location filename="../libs/libmythtv/jobqueue.h" line="24"/>
+        <location filename="../libs/libmythtv/videoouttypes.h" line="132"/>
+        <location filename="../libs/libmythtv/videoouttypes.h" line="155"/>
+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="41"/>
+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="42"/>
+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1032"/>
+        <location filename="../programs/mythfrontend/videofilter.cpp" line="798"/>
+        <source>Unknown</source>
+        <translation>Desconocido</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="613"/>
@@ -7457,31 +14132,93 @@ Volviendo al menú anterior.</translation>
         <translation>Contraseña para el grupo &apos;%1&apos;:</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="571"/>
         <source>Recordings</source>
         <translation>Grabaciones</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="226"/>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="1356"/>
+        <location filename="../libs/libmythtv/transporteditor.cpp" line="554"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="993"/>
+        <location filename="../libs/libmythtv/videoouttypes.h" line="202"/>
+        <location filename="../libs/libmythtv/videoouttypes.h" line="266"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="203"/>
+        <source>Off</source>
+        <translation>Desactivada</translation>
+=======
+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="226"/>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="1356"/>
+        <location filename="../libs/libmythtv/transporteditor.cpp" line="554"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="996"/>
+        <location filename="../libs/libmythtv/videoouttypes.h" line="202"/>
+        <location filename="../libs/libmythtv/videoouttypes.h" line="266"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="203"/>
+        <source>Off</source>
+        <translation>Desactivada</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2534"/>
         <source>Recording file does not exist.
 Are you sure you want to delete:</source>
         <translation>El archivo de grabación no existe
 ¿Seguro que desea eliminar:</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3487"/>
+        <source>Seeking</source>
+        <translation>Buscando</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3351"/>
+        <source>Seeking</source>
+        <translation>Buscando</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2584"/>
         <source>Yes, stop recording</source>
         <translation>Sí, detener la grabación</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3359"/>
+        <source>General</source>
+        <translation>General</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3223"/>
+        <source>General</source>
+        <translation>General</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2608"/>
         <source>No, keep it</source>
         <translation>No, conservarla</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3644"/>
+        <source>Program Guide</source>
+        <translation>Guía de Programas</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3482"/>
+        <source>Program Guide</source>
+        <translation>Guía de Programas</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2612"/>
         <source>No, continue recording</source>
         <translation>No, continuar la grabación</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3738"/>
+        <source>Localization</source>
+        <translation>Localización</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3574"/>
+        <source>Localization</source>
+        <translation>Localización</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../programs/mythfrontend/playbackbox.cpp" line="2640"/>
@@ -7785,22 +14522,58 @@ Are you sure you want to delete:</source>
         <translation>Desmárquela si la imagen se granula mientras se funde el OSD.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="562"/>
         <source>Maximum number of CPU cores used for video decoding and filtering.</source>
         <translation>Número máximo de núcleos de la CPU utilizados para la decodificación y filtrado de la imagen.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="1543"/>
+        <location filename="../libs/libmyth/programinfo.cpp" line="1548"/>
+        <location filename="../libs/libmyth/programtypes.cpp" line="192"/>
+        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1519"/>
+        <source>Repeat</source>
+        <translation>Repetir</translation>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="1545"/>
+        <location filename="../libs/libmyth/programinfo.cpp" line="1550"/>
+        <location filename="../libs/libmyth/programtypes.cpp" line="200"/>
+        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1519"/>
+        <source>Repeat</source>
+        <translation>Repetir</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>PlayerSettings</name>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="87"/>
         <source>This is the command used for any file whose extension is not specifically defined. You may also enter the name of one of the playback plugins such as &apos;Internal&apos;.</source>
         <translation>Esta orden se utilizará para todo archivo cuya extensión no se haya definido específicamente. También puede introducir el nombre de uno de los complementos de reproducción, como &apos;Internal&apos;.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="188"/>
+        <source>Conflicting</source>
+        <translation>En Conflicto</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="196"/>
+        <source>Conflicting</source>
+        <translation>En Conflicto</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="92"/>
         <source>This can be any command to launch a DVD  player. Internal is the default.  For other players, %d will be substituted for the DVD device (e.g. /dev/dvd).</source>
         <translation>Puede ser cualquier orden que permita iniciar el reproductor DVD. Por defecto es &apos;Internal&apos;. Para otros reproductores, %d será sustituído por el dispositivo DVD (p.ej.: /dev/dvd).</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="170"/>
+        <source>Will Record</source>
+        <translation>Por Grabar</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="178"/>
+        <source>Will Record</source>
+        <translation>Por Grabar</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="96"/>
@@ -7828,49 +14601,132 @@ Are you sure you want to delete:</source>
         <translation>Salir sin guardar la configuración</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="113"/>
         <source>Save settings and Exit</source>
         <translation>Guardar la configuración y Salir</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1345"/>
+        <source>Reverse direction in fast forward/rewind</source>
+        <translation>Invertir dirección en avance rápido/rebobinado</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1281"/>
+        <source>Reverse direction in fast forward/rewind</source>
+        <translation>Invertir dirección en avance rápido/rebobinado</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="170"/>
         <source>No Region</source>
         <translation>Sin Región</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="2884"/>
+        <source>Not Flagged</source>
+        <translation>Sin Marcar</translation>
+=======
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="2867"/>
+        <source>Not Flagged</source>
+        <translation>Sin Marcar</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="174"/>
         <source>Region A: The Americas, Southeast Asia, Japan</source>
         <translation>Región A: América, Sureste Asiático, Japón</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1944"/>
+        <source>Use GUI size for TV playback</source>
+        <translation>Usar el tamaño de la GUI para reproducir TV</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1838"/>
+        <source>Use GUI size for TV playback</source>
+        <translation>Usar el tamaño de la GUI para reproducir TV</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="179"/>
         <source>Region B: Europe, Middle East, Africa, Oceania</source>
         <translation>Región B: Europa, Oriente Medio, África, Oceanía</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2785"/>
+        <source>Monitor CD/DVD</source>
+        <translation>Monitorizar CD/DVD</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2649"/>
+        <source>Monitor CD/DVD</source>
+        <translation>Monitorizar CD/DVD</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="184"/>
         <source>Region C: Eastern Europe, Central and South Asia</source>
         <translation>Región C: Europa Oriental, Asia Central y Sur</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="164"/>
+        <source>Recorded</source>
+        <translation>Grabado</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="172"/>
+        <source>Recorded</source>
+        <translation>Grabado</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>PowerSearchPopup</name>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="259"/>
         <source>Select Search</source>
         <translation>Seleccionar Búsqueda</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="2736"/>
+        <location filename="../libs/libmyth/programtypes.cpp" line="166"/>
+        <source>Recording</source>
+        <translation>Grabando</translation>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="2735"/>
+        <location filename="../libs/libmyth/programtypes.cpp" line="174"/>
+        <source>Recording</source>
+        <translation>Grabando</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="260"/>
         <source>&lt;New Search&gt;</source>
         <translation>&lt;Nueva Búsqueda&gt;</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="180"/>
+        <source>Max Recordings</source>
+        <translation>Máx nº de Grabaciones</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="188"/>
+        <source>Max Recordings</source>
+        <translation>Máx nº de Grabaciones</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="275"/>
         <source>Edit</source>
         <translation>Editar</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="182"/>
+        <source>Manual Cancel</source>
+        <translation>Cancelación Manual</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="190"/>
+        <source>Manual Cancel</source>
+        <translation>Cancelación Manual</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="276"/>
         <source>Delete</source>
         <translation>Eliminar</translation>
@@ -7879,34 +14735,89 @@ Are you sure you want to delete:</source>
         <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="277"/>
         <source>Record</source>
         <translation>Grabar</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="186"/>
+        <source>Missed Future</source>
+        <translation>No Aparece Próximamente</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmyth/programtypes.cpp" line="196"/>
+        <source>Low Disk Space</source>
+        <translation>Poco Espacio en Disco</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="204"/>
+        <source>Low Disk Space</source>
+        <translation>Poco Espacio en Disco</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>ProfileGroup</name>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/profilegroup.cpp" line="48"/>
         <source>ProfileGroup</source>
         <translation>Grupo de Perfiles</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="198"/>
+        <source>Tuner Busy</source>
+        <translation>Sintonizador Ocupado</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="206"/>
+        <source>Tuner Busy</source>
+        <translation>Sintonizador Ocupado</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/profilegroup.cpp" line="104"/>
         <source>Transcoders</source>
         <translation>Transcodificadores</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="219"/>
+        <source>This showing is not scheduled to record</source>
+        <translation>No está previsto grabar este programa </translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="231"/>
+        <source>This showing is not scheduled to record</source>
+        <translation>No está previsto grabar este programa </translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>ProfileGroupEditor</name>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/profilegroup.cpp" line="169"/>
         <source>New Profile Group Name</source>
         <translation>Nuevo Nombre de Grupo de Perfiles</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="229"/>
+        <source>This showing will be recorded.</source>
+        <translation>Este programa se grabará.</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="241"/>
+        <source>This showing will be recorded.</source>
+        <translation>Este programa se grabará.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/profilegroup.cpp" line="237"/>
         <source>(Create new profile group)</source>
         <translation>(Crear nuevo grupo de perfiles)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="232"/>
+        <source>This showing is being recorded.</source>
+        <translation>Este programa se está grabando.</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="244"/>
+        <source>This showing is being recorded.</source>
+        <translation>Este programa se está grabando.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/profilegroup.cpp" line="289"/>
         <source>Delete profile group:
 &apos;%1&apos;?</source>
@@ -7917,26 +14828,72 @@ Are you sure you want to delete:</source>
         <location filename="../libs/libmythtv/profilegroup.cpp" line="295"/>
         <source>Yes, delete group</source>
         <translation>Sí, eliminar el grupo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="235"/>
+        <source>The channel is being tuned.</source>
+        <translation>El canal está sintonizándose.</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmyth/programtypes.cpp" line="238"/>
+        <source>This showing was recorded.</source>
+        <translation>Este programa fue grabado.</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="258"/>
+        <source>This showing was recorded.</source>
+        <translation>Este programa fue grabado.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/profilegroup.cpp" line="296"/>
         <source>No, Don&apos;t delete group</source>
         <translation>No, no eliminar el grupo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="246"/>
+        <location filename="../libs/libmyth/programtypes.cpp" line="251"/>
+        <source>This showing was not recorded because the master backend was hung or not running.</source>
+        <translation>Este programa no fue grabado porque el servidor principal estaba colgado o no estaba ejecutándose.</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="266"/>
+        <source>This showing was not recorded because the master backend was hung or not running.</source>
+        <translation>Este programa no fue grabado porque el servidor principal estaba colgado o no estaba ejecutándose.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>ProgDetails</name>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/progdetails.cpp" line="278"/>
         <source>Title</source>
         <translation>Título</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="261"/>
+        <source>There wasn&apos;t enough disk space available.</source>
+        <translation>No hubo suficiente espacio en disco disponible.</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="281"/>
+        <source>There wasn&apos;t enough disk space available.</source>
+        <translation>No hubo suficiente espacio en disco disponible.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/progdetails.cpp" line="281"/>
         <source>Title Pronounce</source>
         <translation>Pronunciación del Título</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="265"/>
+        <source>The tuner card was already being used.</source>
+        <translation>La sintonizadora ya estaba en uso.</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="285"/>
+        <source>The tuner card was already being used.</source>
+        <translation>La sintonizadora ya estaba en uso.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/progdetails.cpp" line="288"/>
         <source>Part %1 of %2, </source>
         <translation>Parte %1 de %2, </translation>
@@ -7948,51 +14905,150 @@ Are you sure you want to delete:</source>
             <numerusform>%n estrella</numerusform>
             <numerusform>%n estrellas</numerusform>
         </translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="268"/>
+        <source>The recorder failed to record.</source>
+        <translation>El grabador falló al grabar.</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="288"/>
+        <source>The recorder failed to record.</source>
+        <translation>El grabador falló al grabar.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/progdetails.cpp" line="304"/>
         <source>Mono</source>
         <translation>Mono</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="271"/>
+        <source>The status of this showing is unknown.</source>
+        <translation>El estado de este programa es desconocido.</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="291"/>
+        <source>The status of this showing is unknown.</source>
+        <translation>El estado de este programa es desconocido.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/progdetails.cpp" line="306"/>
         <source>Stereo</source>
         <translation>Estéreo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="280"/>
+        <source>This showing will not be recorded because </source>
+        <translation>Este programa no se grabará porque </translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="300"/>
+        <source>This showing will not be recorded because </source>
+        <translation>Este programa no se grabará porque </translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/progdetails.cpp" line="308"/>
         <source>Surround Sound</source>
         <translation>Sonido Surround</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="282"/>
+        <source>This showing was not recorded because </source>
+        <translation>Este programa no fue grabado porque </translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="302"/>
+        <source>This showing was not recorded because </source>
+        <translation>Este programa no fue grabado porque </translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/progdetails.cpp" line="310"/>
         <source>Dolby Sound</source>
         <translation>Sonido Dolby</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="287"/>
+        <source>it was manually set to not record.</source>
+        <translation>se estableció manualmente que no se grabase.</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="307"/>
+        <source>it was manually set to not record.</source>
+        <translation>se estableció manualmente que no se grabase.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/progdetails.cpp" line="312"/>
         <source>Audio for Hearing Impaired</source>
         <translation>Sonido para Discapacitados Auditivos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="290"/>
+        <source>this episode was previously recorded according to the duplicate policy chosen for this title.</source>
+        <translation>este episodio fue grabado anteriormente, según la política de duplicados elegida para este título.</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="310"/>
+        <source>this episode was previously recorded according to the duplicate policy chosen for this title.</source>
+        <translation>este episodio fue grabado anteriormente, según la política de duplicados elegida para este título.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/progdetails.cpp" line="314"/>
         <source>Audio for Visually Impaired</source>
         <translation>Sonido para Discapacitados Visuales</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="295"/>
+        <source>this episode was previously recorded and is still available in the list of recordings.</source>
+        <translation>este episodio fue grabado anteriormente y aún está disponible en la lista de grabaciones.</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="315"/>
+        <source>this episode was previously recorded and is still available in the list of recordings.</source>
+        <translation>este episodio fue grabado anteriormente y aún está disponible en la lista de grabaciones.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/progdetails.cpp" line="317"/>
         <source>HDTV</source>
         <translation>HDTV</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="304"/>
+        <source>too many recordings of this program have already been recorded.</source>
+        <translation>este programa se ha grabado ya demasiadas veces.</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="324"/>
+        <source>too many recordings of this program have already been recorded.</source>
+        <translation>este programa se ha grabado ya demasiadas veces.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/progdetails.cpp" line="319"/>
         <source>Widescreen</source>
         <translation>Panorámico</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="337"/>
+        <source>This showing will not be recorded.</source>
+        <translation>Este programa no se grabará.</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="357"/>
+        <source>This showing will not be recorded.</source>
+        <translation>Este programa no se grabará.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/progdetails.cpp" line="321"/>
         <source>AVC/H.264</source>
         <translation>AVC/H.264</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="339"/>
+        <source>This showing was not recorded.</source>
+        <translation>Este programa no fue grabado.</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="359"/>
+        <source>This showing was not recorded.</source>
+        <translation>Este programa no fue grabado.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../programs/mythfrontend/progdetails.cpp" line="323"/>
@@ -9110,6 +16166,7 @@ Are you sure you want to delete:</source>
         <translation>Usar el Modo de Mayor Calidad</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="826"/>
         <source>Use the highest audio quality settings supported by your audio card. This will be a good place to start troubleshooting potential errors</source>
         <translation>Usar la configuración de sonido de mayor calidad admitida por su tarjeta de sonido. Es un buen punto de partida para depurar potenciales errores</translation>
@@ -9374,6 +16431,49 @@ Are you sure you want to delete:</source>
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1756"/>
         <source>GUI X offset</source>
         <translation>Desplazamiento X de la GUI</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/settings.cpp" line="806"/>
+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="224"/>
+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="237"/>
+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="249"/>
+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="302"/>
+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="317"/>
+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="330"/>
+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="360"/>
+        <location filename="../libs/libmythtv/channelscan/modulationsetting.h" line="59"/>
+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1058"/>
+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1085"/>
+        <location filename="../libs/libmythtv/transporteditor.cpp" line="552"/>
+        <location filename="../libs/libmythtv/transporteditor.cpp" line="566"/>
+        <location filename="../libs/libmythtv/transporteditor.cpp" line="579"/>
+        <location filename="../libs/libmythtv/transporteditor.cpp" line="639"/>
+        <location filename="../libs/libmythtv/transporteditor.cpp" line="655"/>
+        <location filename="../libs/libmythtv/transporteditor.cpp" line="669"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2297"/>
+        <source>Auto</source>
+        <translation>Automática</translation>
+=======
+        <location filename="../libs/libmyth/settings.cpp" line="806"/>
+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="224"/>
+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="237"/>
+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="249"/>
+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="302"/>
+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="317"/>
+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="330"/>
+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="360"/>
+        <location filename="../libs/libmythtv/channelscan/modulationsetting.h" line="59"/>
+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1058"/>
+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1085"/>
+        <location filename="../libs/libmythtv/transporteditor.cpp" line="552"/>
+        <location filename="../libs/libmythtv/transporteditor.cpp" line="566"/>
+        <location filename="../libs/libmythtv/transporteditor.cpp" line="579"/>
+        <location filename="../libs/libmythtv/transporteditor.cpp" line="639"/>
+        <location filename="../libs/libmythtv/transporteditor.cpp" line="655"/>
+        <location filename="../libs/libmythtv/transporteditor.cpp" line="669"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2191"/>
+        <source>Auto</source>
+        <translation>Automática</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1766"/>
@@ -9706,14 +16806,39 @@ Are you sure you want to delete:</source>
         <translation>TIempo de emergencia del menú</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2861"/>
         <source>How many seconds the menu will remain visible after navigation.</source>
         <translation>Cuántos segundos permanecerá visible el menú tras la navegación.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3460"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3480"/>
+        <source>View Recordings</source>
+        <translation>Ver Grabaciones</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3324"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3344"/>
+        <source>View Recordings</source>
+        <translation>Ver Grabaciones</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2870"/>
         <source>Display music artist and title</source>
         <translation>Mostrar artista y título</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythmetadata/bluraymetadata.cpp" line="103"/>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="4740"/>
+        <source>%1 of %2</source>
+        <translation>%1 de %2</translation>
+=======
+        <location filename="../libs/libmythmetadata/bluraymetadata.cpp" line="103"/>
+        <location filename="../libs/libmythtv/deletemap.cpp" line="189"/>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="4727"/>
+        <source>%1 of %2</source>
+        <translation>%1 de %2</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2890"/>
@@ -9736,82 +16861,243 @@ Are you sure you want to delete:</source>
         <translation>Luz de fondo siempre encendida</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2928"/>
         <source>Heartbeat always on</source>
         <translation>Parpadeo siempre activo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4893"/>
+        <source>Logo Detection</source>
+        <translation>Detección de Logotipo</translation>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4892"/>
+        <source>Logo Detection</source>
+        <translation>Detección de Logotipo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2937"/>
         <source>Display large clock</source>
         <translation>Mostrar reloj grande</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/audioplayer.cpp" line="138"/>
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="593"/>
+        <source>Unable to create AudioOutput.</source>
+        <translation>No fue posible crear AudioOutput.</translation>
+=======
+        <location filename="../libs/libmythtv/audioplayer.cpp" line="138"/>
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="596"/>
+        <source>Unable to create AudioOutput.</source>
+        <translation>No fue posible crear AudioOutput.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2946"/>
         <source>LCD key order</source>
         <translation>Orden de teclas LCD</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="178"/>
+        <source>Earlier Showing</source>
+        <translation>Emisión Anterior</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="186"/>
+        <source>Earlier Showing</source>
+        <translation>Emisión Anterior</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="3019"/>
         <source>If enabled, QuickTime will correct the gamma of the video to match your monitor. Turning this off can save some CPU cycles.</source>
         <translation>Si se activa, QuickTime corregirá la gamma de la imagen hasta ajustarla a su monitor. Desactivarlo puede ahorrar algunos ciclos de CPU.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="190"/>
+        <source>Later Showing</source>
+        <translation>Emisión Posterior</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="198"/>
+        <source>Later Showing</source>
+        <translation>Emisión Posterior</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="3030"/>
         <source>If enabled, video will be scaled to fit your window or screen. If unchecked, video will never be made larger than its actual pixel size.</source>
         <translation>Si se activa, la imagen se ajustará a su ventana o pantalla. Si no se marca, la imagen nunca será mayor que su tamaño de píxel actual.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="300"/>
+        <source>this episode will be recorded at an earlier time instead.</source>
+        <translation>este episodio se grabará a una hora más temprana.</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="320"/>
+        <source>this episode will be recorded at an earlier time instead.</source>
+        <translation>este episodio se grabará a una hora más temprana.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="3054"/>
         <source>If enabled, video will be displayed in the main GUI window. Disable this when you only want video on the desktop or in a floating window. Only valid when &quot;Use GUI size for TV playback&quot; and &quot;Run the frontend in a window&quot; are checked.</source>
         <translation>Si se activa, la imagen se mostrará en la ventana GUI principal. Desactívelo si sólo desea la imagen en el escritorio o en una ventana flotante. Sólo es válido cuando están marcadas &quot;Usar el tamaño de la GUI para reproducir TV&quot; y &quot;Ejecutar el cliente en una ventana&quot;.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="994"/>
+        <source>30m</source>
+        <translation>30m</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="997"/>
+        <source>30m</source>
+        <translation>30m</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="3110"/>
         <source>If enabled, video will be displayed in a floating window. Only valid when &quot;Use GUI size for TV playback&quot; and &quot;Run the frontend in a window&quot; are checked.</source>
         <translation>Si se activa, la imagen se mostrará en una ventana flotante. Sólo es válido cuando están marcadas &quot;Usar el tamaño de la GUI para reproducir TV&quot; y &quot;Ejecutar el cliente en una ventana&quot;.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="995"/>
+        <source>1h</source>
+        <translation>1h</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="998"/>
+        <source>1h</source>
+        <translation>1h</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="3165"/>
         <source>If enabled, video will be displayed in the application&apos;s dock icon. Only valid when &quot;Use GUI size for TV playback&quot; and &quot;Run the frontend in a window&quot; are checked.</source>
         <translation>Si se activa, la imagen se mostrará en el icono de bandeja de la aplicación. Sólo es válido cuando están marcadas &quot;Usar el tamaño de la GUI para reproducir TV&quot; y &quot;Ejecutar el cliente en una ventana&quot;.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="996"/>
+        <source>1h30m</source>
+        <translation>1h30m</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="999"/>
+        <source>1h30m</source>
+        <translation>1h30m</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="3205"/>
         <source>If enabled, video will be displayed on the desktop, behind the Finder icons. Only valid when &quot;Use GUI size for TV playback&quot; and &quot;Run the frontend in a window&quot; are checked.</source>
         <translation>Si se activa, la imagen se mostrará en el escritorio, tras los iconos de Finder. Sólo es válido cuando están marcadas &quot;Usar el tamaño de la GUI para reproducir TV&quot; y &quot;Ejecutar el cliente en una ventana&quot;.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="997"/>
+        <source>2h</source>
+        <translation>2h</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="1000"/>
+        <source>2h</source>
+        <translation>2h</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="3287"/>
         <source>AirPlay Settings</source>
         <translation>Configuración de AirPlay</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8422"/>
+        <source>MythTV was set to sleep after %1 minutes and will exit in %d seconds.
+Do you wish to continue watching?</source>
+        <translation>MythTV fue programado para dormir tras %1 minutos y lo hará en %d segundos.
+¿Desea seguir utilizándolo?</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8477"/>
+        <source>MythTV was set to sleep after %1 minutes and will exit in %d seconds.
+Do you wish to continue watching?</source>
+        <translation>MythTV fue programado para dormir tras %1 minutos y lo hará en %d segundos.
+¿Desea seguir utilizándolo?</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="3422"/>
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="3430"/>
         <source>Mac OS X Video Settings</source>
         <translation>Configuración de Imagen de Mac OS X</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8486"/>
+        <source>MythTV has been idle for %1 minutes and will exit in %d seconds. Are you still watching?</source>
+        <translation>MythTV ha estado desocupado durante %1 minutos y lo hará en %d segundos. ¿Sigue utilizándolo?</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8541"/>
+        <source>MythTV has been idle for %1 minutes and will exit in %d seconds. Are you still watching?</source>
+        <translation>MythTV ha estado desocupado durante %1 minutos y lo hará en %d segundos. ¿Sigue utilizándolo?</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="3448"/>
         <source>On-screen Display</source>
         <translation>Pantalla</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9401"/>
+        <source>Edit Cut Points</source>
+        <translation>Editar Puntos de Corte</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9455"/>
+        <source>Edit Cut Points</source>
+        <translation>Editar Puntos de Corte</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="3479"/>
         <source>General (Auto-Expire)</source>
         <translation>General (Auto-Expiración)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9407"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9442"/>
+        <source>Move Previous Cut End Here</source>
+        <translation>Mover Aquí el Final de Corte Anterior</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9461"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9496"/>
+        <source>Move Previous Cut End Here</source>
+        <translation>Mover Aquí el Final de Corte Anterior</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="3577"/>
         <source>Theme</source>
         <translation>Tema</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9421"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9454"/>
+        <source>Move Next Cut Start Here</source>
+        <translation>Mover Aquí el Siguiente Inicio de Corte</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9475"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9508"/>
+        <source>Move Next Cut Start Here</source>
+        <translation>Mover Aquí el Siguiente Inicio de Corte</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2484"/>
         <source>Guide starts at channel</source>
         <translation>La Guía comienza en el canal</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9428"/>
+        <source>Move Start of Cut Here</source>
+        <translation>Mover Aquí el Inicio de Corte</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9482"/>
+        <source>Move Start of Cut Here</source>
+        <translation>Mover Aquí el Inicio de Corte</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="2732"/>
         <location filename="../libs/libmyth/programinfo.cpp" line="4077"/>
         <location filename="../libs/libmyth/programtypes.cpp" line="224"/>
@@ -9831,8 +17117,18 @@ Are you sure you want to delete:</source>
         <location filename="../programs/mythfrontend/videofilter.cpp" line="798"/>
         <source>Unknown</source>
         <translation>Desconocido</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9431"/>
+        <source>Move End of Cut Here</source>
+        <translation>Mover Aquí el Final de Corte</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9485"/>
+        <source>Move End of Cut Here</source>
+        <translation>Mover Aquí el Final de Corte</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="226"/>
         <location filename="../libs/libmythtv/transporteditor.cpp" line="554"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="1023"/>
@@ -9841,57 +17137,174 @@ Are you sure you want to delete:</source>
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="195"/>
         <source>Off</source>
         <translation>Desactivada</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9435"/>
+        <source>Delete This Cut</source>
+        <translation>Eliminar Este Corte</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9489"/>
+        <source>Delete This Cut</source>
+        <translation>Eliminar Este Corte</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="3403"/>
         <source>Seeking</source>
         <translation>Buscando</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9457"/>
+        <source>Add New Cut</source>
+        <translation>Añadir Nuevo Corte</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9511"/>
+        <source>Add New Cut</source>
+        <translation>Añadir Nuevo Corte</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="3263"/>
         <source>General</source>
         <translation>General</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9460"/>
+        <source>Join Surrounding Cuts</source>
+        <translation>Unir los Cortes de Alrededor</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9514"/>
+        <source>Join Surrounding Cuts</source>
+        <translation>Unir los Cortes de Alrededor</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="3531"/>
         <source>Program Guide</source>
         <translation>Guía de Programas</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9473"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9479"/>
+        <source>Cut List Options</source>
+        <translation>Opciones de la Lista de Cortes</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9527"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9533"/>
+        <source>Cut List Options</source>
+        <translation>Opciones de la Lista de Cortes</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="3625"/>
         <source>Localization</source>
         <translation>Localización</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9488"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9501"/>
+        <source>Exit Without Saving</source>
+        <translation>Salir Sin Grabar</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9542"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9555"/>
+        <source>Exit Without Saving</source>
+        <translation>Salir Sin Grabar</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingprofile.h" line="67"/>
         <source>Profile name</source>
         <translation>Nombre de perfil</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9490"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9503"/>
+        <source>Save Cuts</source>
+        <translation>Guardar Cortes</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9544"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9557"/>
+        <source>Save Cuts</source>
+        <translation>Guardar Cortes</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="78"/>
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="473"/>
         <source>Codec</source>
         <translation>Códec</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9492"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9499"/>
+        <source>Save Cuts and Exit</source>
+        <translation>Guardar Cortes y Salir</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9546"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9553"/>
+        <source>Save Cuts and Exit</source>
+        <translation>Guardar Cortes y Salir</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="116"/>
         <source>Sampling rate</source>
         <translation>Tasa de muestreo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9498"/>
+        <source>Exit Recording Editor</source>
+        <translation>Salir del Editor de Grabaciones</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9552"/>
+        <source>Exit Recording Editor</source>
+        <translation>Salir del Editor de Grabaciones</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="117"/>
         <source>Sets the audio sampling rate for your DSP. Ensure that you choose a sampling rate appropriate for your device.  btaudio may only allow 32000.</source>
         <translation>Establece la tasa de muestreo de sonido de su DSP. Asegúrese de que elige una tasa de muestreo apropiada para su dispositivo. btaudio sólo permite 32000.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12204"/>
+        <source>Cannot delete program </source>
+        <translation>No es posible eliminar el programa </translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12266"/>
+        <source>Cannot delete program </source>
+        <translation>No es posible eliminar el programa </translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="180"/>
         <source>Type</source>
         <translation>Tipo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12213"/>
+        <source>because it is not a recording.</source>
+        <translation>porque no es una grabación.</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12275"/>
+        <source>because it is not a recording.</source>
+        <translation>porque no es una grabación.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="197"/>
         <source>Sets the audio type</source>
         <translation>Establece el tipo de sonido</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12217"/>
+        <source>because it is in use by</source>
+        <translation>porque está siendo utilizado por</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12279"/>
+        <source>because it is in use by</source>
+        <translation>porque está siendo utilizado por</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="244"/>
@@ -9919,14 +17332,58 @@ Are you sure you want to delete:</source>
         <translation>Calidad MP3</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="91"/>
         <source>The higher the slider number, the lower the quality of the audio. Better quality audio (lower numbers) requires more CPU.</source>
         <translation>A mayor valor, menor será la calidad del sonido. Una mayor calidad de sonido (valores bajos) requiere más CPU.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3067"/>
+        <source>LCD device display</source>
+        <translation>Dispositivo LCD</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2931"/>
+        <source>LCD device display</source>
+        <translation>Dispositivo LCD</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="106"/>
         <source>Recording volume of the capture card.</source>
         <translation>Volumen de grabación de la capturadora.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="1519"/>
+        <location filename="../libs/libmyth/programinfo.cpp" line="1523"/>
+        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="64"/>
+        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="296"/>
+        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="394"/>
+        <location filename="../libs/libmythtv/channelsettings.cpp" line="132"/>
+        <location filename="../libs/libmythtv/recordingrule.cpp" line="45"/>
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1151"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="76"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1716"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2084"/>
+        <source>Default</source>
+        <translation>Predeterminado</translation>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="1521"/>
+        <location filename="../libs/libmyth/programinfo.cpp" line="1525"/>
+        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="64"/>
+        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="296"/>
+        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="394"/>
+        <location filename="../libs/libmythtv/channelsettings.cpp" line="132"/>
+        <location filename="../libs/libmythtv/recordingrule.cpp" line="50"/>
+        <location filename="../libs/libmythtv/recordingrule.cpp" line="311"/>
+        <location filename="../libs/libmythtv/recordingrule.cpp" line="525"/>
+        <location filename="../libs/libmythtv/recordingrule.cpp" line="605"/>
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1154"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="76"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1610"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1978"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="133"/>
+        <source>Default</source>
+        <translation>Predeterminado</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="331"/>
@@ -9955,37 +17412,107 @@ Are you sure you want to delete:</source>
         <translation>Cuanto mayor, mejor calidad.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="497"/>
         <source>Luma filter</source>
         <translation>Filtro de Luminancia</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1358"/>
+        <source>Menu theme</source>
+        <translation>Tema del menú</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1294"/>
+        <source>Menu theme</source>
+        <translation>Tema del menú</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="499"/>
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="512"/>
         <source>Lower is better.</source>
         <translation>Mejor cuanto menor sea.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2314"/>
+        <source>Channel format</source>
+        <translation>Formato de canal</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2208"/>
+        <source>Channel format</source>
+        <translation>Formato de canal</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="510"/>
         <source>Chroma filter</source>
         <translation>Filtro de Color</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2315"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2329"/>
+        <source>number</source>
+        <translation>número</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2209"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2223"/>
+        <source>number</source>
+        <translation>número</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="537"/>
         <source>Scale bitrate for frame size</source>
         <translation>Ajustar la tasa de bits al tamaño de fotograma</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2316"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2330"/>
+        <source>number callsign</source>
+        <translation>número, ID de emisora</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2210"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2224"/>
+        <source>number callsign</source>
+        <translation>número, ID de emisora</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="552"/>
         <source>Minimum quality</source>
         <translation>Calidad mínima</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2317"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2331"/>
+        <source>number name</source>
+        <translation>número, nombre</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2211"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2225"/>
+        <source>number name</source>
+        <translation>número, nombre</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="554"/>
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="568"/>
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="583"/>
         <source>Modifying the default may have severe consequences.</source>
         <translation>Modificar el valor predeterminado puede tener graves consecuencias.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1437"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2318"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2332"/>
+        <source>callsign</source>
+        <translation>ID de emisora</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1356"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2212"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2226"/>
+        <source>callsign</source>
+        <translation>ID de emisora</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="566"/>
@@ -10043,6 +17570,7 @@ Are you sure you want to delete:</source>
         <translation>Calidad</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="774"/>
         <source>Horizontal Decimation</source>
         <translation>Diezmo Horizontal</translation>
@@ -10077,13 +17605,63 @@ Are you sure you want to delete:</source>
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="869"/>
         <source>MPEG-2 Hardware Encoder</source>
         <translation>Codificador Hardware MPEG-2</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="216"/>
+        <source>Run metadata lookup</source>
+        <translation>Ejecutar búsqueda de metadatos</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="218"/>
+        <source>This is the default value used for the automatic metadata lookup setting when a new scheduled recording is created.</source>
+        <translation>Valor predeterminado a usar en la configuración de la búsqueda automática de metadatos al programar una nueva grabación.</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="227"/>
+        <source>Run commercial detection</source>
+        <translation>Ejecutar la detección de anuncios</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="229"/>
+        <source>This is the default value used for the automatic commercial detection setting when a new scheduled recording is created.</source>
+        <translation>Valor predeterminado a usar en la configuración de la detección automática de anuncios al programar una nueva grabación.</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="240"/>
+        <source>This is the default value used for the automatic-transcode setting when a new scheduled recording is created.</source>
+        <translation>Valor predeterminado a usar en la configuración de la transcodificación automática al programar una nueva grabación.</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="249"/>
+        <source>Default transcoder</source>
+        <translation>Transcodificador predeterminado</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="261"/>
+        <source>Deferral days for auto transcode jobs</source>
+        <translation>Aplazamiento en días de las tareas de transcodificación automática</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="216"/>
+        <source>Deferral days for auto transcode jobs</source>
+        <translation>Aplazamiento en días de las tareas de transcodificación automática</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="1016"/>
         <source>Record Full TS?</source>
         <translation>¿Grabar TS Completo?</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="262"/>
+        <source>If non-zero, automatic transcode jobs will be scheduled to run this many days after a recording completes instead of immediately afterwards.</source>
+        <translation>Si no es cero, se programarán trabajos de transcodificación automática para que se ejecuten el número de días especificados después de conmpletar una grabación en lugar de inmediatamente después.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="217"/>
+        <source>If non-zero, automatic transcode jobs will be scheduled to run this many days after a recording completes instead of immediately afterwards.</source>
+        <translation>Si no es cero, se programarán trabajos de transcodificación automática para que se ejecuten el número de días especificados después de conmpletar una grabación en lugar de inmediatamente después.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="1018"/>
         <source>If set, extra files will be created for each recording with the name of the recording followed by &apos;.ts&apos; and a number. These extra files represent the full contents of the transport stream used to generate the recording.</source>
         <translation>Al activarse se crearán archivos extra para cada grabación con el nombre de ésta seguido de .ts y un número. Representarán el contenido completo del transporte de datos usado para generar la grabación.</translation>
@@ -10092,34 +17670,99 @@ Are you sure you want to delete:</source>
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="1061"/>
         <source>Width</source>
         <translation>Ancho</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="272"/>
+        <source>Run user job #%1</source>
+        <translation>Ejecutar tarea de usuario #%1</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="288"/>
+        <source>Strict commercial detection</source>
+        <translation>Detección estricta de anuncios</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="227"/>
+        <source>Strict commercial detection</source>
+        <translation>Detección estricta de anuncios</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="1088"/>
         <source>Height</source>
         <translation>Alto</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="290"/>
+        <source>Enable stricter commercial detection code. Disable if some commercials are not being detected.</source>
+        <translation>Activar un código de detección de anuncios más estricto. Desactivarlo si no se detectan algunos anuncios.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="229"/>
+        <source>Enable stricter commercial detection code. Disable if some commercials are not being detected.</source>
+        <translation>Activar un código de detección de anuncios más estricto. Desactivarlo si no se detectan algunos anuncios.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="1111"/>
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="1113"/>
         <source>Image size</source>
         <translation>Tamaño de imágen</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="298"/>
+        <source>Commercial skip automatic rewind amount (secs)</source>
+        <translation>Rebobinado automático (en segundos)  del salto de anuncios</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="237"/>
+        <source>Commercial skip automatic rewind amount (secs)</source>
+        <translation>Rebobinado automático (en segundos)  del salto de anuncios</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="160"/>
         <source>If enabled, then immediately after rewinding, only skip forward the same amount as skipping backwards.</source>
         <translation>Si se activa, inmediatamente después de rebobinar, avanzar la misma cantidad retrocedida.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="299"/>
+        <source>MythTV will automatically rewind this many seconds after performing a commercial skip.</source>
+        <translation>MythTV rebobinará automáticamente este número de segundos tras ejecutar un salto de anuncios.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="238"/>
+        <source>MythTV will automatically rewind this many seconds after performing a commercial skip.</source>
+        <translation>MythTV rebobinará automáticamente este número de segundos tras ejecutar un salto de anuncios.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="196"/>
         <source>Notify, but do not skip</source>
         <translation>Notificar, pero no saltar</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="308"/>
+        <source>Commercial skip notify amount (secs)</source>
+        <translation>Notificación (en segundos) de salto de anuncios</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="247"/>
+        <source>Commercial skip notify amount (secs)</source>
+        <translation>Notificación (en segundos) de salto de anuncios</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="197"/>
         <source>Automatically Skip</source>
         <translation>Saltar Automáticamente</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="309"/>
+        <source>MythTV will act like a commercial begins this many seconds early. This can be useful when commercial notification is used in place of automatic skipping.</source>
+        <translation>MythTV actuará como si un anuncio empezara con estos segundos de antelación. Puede ser útil si se utiliza la notificación de anuncios en lugar del salto automático.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="248"/>
+        <source>MythTV will act like a commercial begins this many seconds early. This can be useful when commercial notification is used in place of automatic skipping.</source>
+        <translation>MythTV actuará como si un anuncio empezara con estos segundos de antelación. Puede ser útil si se utiliza la notificación de anuncios en lugar del salto automático.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/mythdialogs.cpp" line="701"/>
         <location filename="../libs/libmyth/storagegroupeditor.cpp" line="38"/>
         <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1461"/>
@@ -10128,91 +17771,261 @@ Are you sure you want to delete:</source>
         <location filename="../programs/mythfrontend/viewschedulediff.cpp" line="142"/>
         <source>OK</source>
         <translation>Aceptar</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="320"/>
+        <source>Maximum commercial skip (secs)</source>
+        <translation>Salto máximo de anuncios (en segundos)</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="259"/>
+        <source>Maximum commercial skip (secs)</source>
+        <translation>Salto máximo de anuncios (en segundos)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="1549"/>
         <location filename="../libs/libmyth/programinfo.cpp" line="1554"/>
         <location filename="../libs/libmyth/programtypes.cpp" line="201"/>
         <source>Repeat</source>
         <translation>Repetir</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="321"/>
+        <source>MythTV will discourage long manual commercial skips. Skips which are longer than this will require the user to hit the SKIP key twice. Automatic commercial skipping is not affected by this limit.</source>
+        <translation>MythTV desaconseja los saltos largos de anuncios ejecutados manualmente. Los saltos mayores que esta cantidad requieren que el usuario pulse dos veces la tecla SKIP. Este límite no afecta al salto automático de anuncios.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="260"/>
+        <source>MythTV will discourage long manual commercial skips. Skips which are longer than this will require the user to hit the SKIP key twice. Automatic commercial skipping is not affected by this limit.</source>
+        <translation>MythTV desaconseja los saltos largos de anuncios ejecutados manualmente. Los saltos mayores que esta cantidad requieren que el usuario pulse dos veces la tecla SKIP. Este límite no afecta al salto automático de anuncios.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="197"/>
         <source>Conflicting</source>
         <translation>En Conflicto</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="332"/>
+        <source>Merge short commercial breaks (secs)</source>
+        <translation>Unir las pausas comerciales cortas (en segundos)</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="271"/>
+        <source>Merge short commercial breaks (secs)</source>
+        <translation>Unir las pausas comerciales cortas (en segundos)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="179"/>
         <source>Will Record</source>
         <translation>Por Grabar</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="344"/>
+        <source>Extra disk space (GB)</source>
+        <translation>Espacio extra de disco (GB)</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="283"/>
+        <source>Extra disk space (GB)</source>
+        <translation>Espacio extra de disco (GB)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videoouttypes.h" line="189"/>
         <source>Top Left</source>
         <translation>Arriba Izquierda</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="345"/>
+        <source>Extra disk space (in gigabytes) beyond what MythTV requires that you want to keep free on the recording file systems.</source>
+        <translation>Espacio extra de disco (en gigabytes) que desee mantener libre en los sistemas de archivos de grabación aparte del que necesite MythTV.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="284"/>
+        <source>Extra disk space (in gigabytes) beyond what MythTV requires that you want to keep free on the recording file systems.</source>
+        <translation>Espacio extra de disco (en gigabytes) que desee mantener libre en los sistemas de archivos de grabación aparte del que necesite MythTV.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videoouttypes.h" line="190"/>
         <source>Bottom Left</source>
         <translation>Abajo Izquierda</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="356"/>
+        <source>Auto-Expire instead of delete recording</source>
+        <translation>Auto-Expirar en vez de eliminar grabación</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="295"/>
+        <source>Auto-Expire instead of delete recording</source>
+        <translation>Auto-Expirar en vez de eliminar grabación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videoouttypes.h" line="191"/>
         <source>Top Right</source>
         <translation>Arriba Derecha</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="358"/>
+        <source>If enabled, move deleted recordings to the &apos;Deleted&apos; recgroup and turn on autoexpire instead of deleting immediately.</source>
+        <translation>Si se activa, mueve las grabaciones eliminadas al grupo de grabación &apos;Eliminadas&apos; y activa la autoexpiración en vez de eliminarlas inmediatamente.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="297"/>
+        <source>If enabled, move deleted recordings to the &apos;Deleted&apos; recgroup and turn on autoexpire instead of deleting immediately.</source>
+        <translation>Si se activa, mueve las grabaciones eliminadas al grupo de grabación &apos;Eliminadas&apos; y activa la autoexpiración en vez de eliminarlas inmediatamente.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videoouttypes.h" line="192"/>
         <source>Bottom Right</source>
         <translation>Abajo Derecha</translation>
-    </message>
-    <message>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="386"/>
+        <source>If enabled, delete recordings in the order which they were originally deleted.</source>
+        <translation>Si se activa, eliminar las grabaciones en el orden en que fueron originalmente eliminadas.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="325"/>
+        <source>If enabled, delete recordings in the order which they were originally deleted.</source>
+        <translation>Si se activa, eliminar las grabaciones en el orden en que fueron originalmente eliminadas.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
+    </message>
+    <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="68"/>
         <source>Location of PIP Video window.</source>
         <translation>Posición de la ventana de Vídeo PIP.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="419"/>
+        <source>Auto-Expire method</source>
+        <translation>Método de Auto-Expiración</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="358"/>
+        <source>Auto-Expire method</source>
+        <translation>Método de Auto-Expiración</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1261"/>
         <source>Reverse direction in fast forward/rewind</source>
         <translation>Invertir dirección en avance rápido/rebobinado</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="420"/>
+        <source>Oldest show first</source>
+        <translation>Primero el programa más antiguo</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="359"/>
+        <source>Oldest show first</source>
+        <translation>Primero el programa más antiguo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1800"/>
         <source>Use GUI size for TV playback</source>
         <translation>Usar el tamaño de la GUI para reproducir TV</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="421"/>
+        <source>Lowest priority first</source>
+        <translation>Primero la de menor prioridad</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="360"/>
+        <source>Lowest priority first</source>
+        <translation>Primero la de menor prioridad</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2690"/>
         <source>Monitor CD/DVD</source>
         <translation>Monitorizar CD/DVD</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="422"/>
+        <source>Weighted time/priority combination</source>
+        <translation>Combinación ponderada tiempo/prioridad</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="361"/>
+        <source>Weighted time/priority combination</source>
+        <translation>Combinación ponderada tiempo/prioridad</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="173"/>
         <source>Recorded</source>
         <translation>Grabado</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="423"/>
+        <source>Method used to determine which recorded shows to delete first. Live TV recordings will always expire before normal recordings.</source>
+        <translation>Método usado para decidir qué grabaciones eliminar primero. Las grabaciones de la TV en Vivo siempre expirarán antes que las grabaciones normales.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="362"/>
+        <source>Method used to determine which recorded shows to delete first. Live TV recordings will always expire before normal recordings.</source>
+        <translation>Método usado para decidir qué grabaciones eliminar primero. Las grabaciones de la TV en Vivo siempre expirarán antes que las grabaciones normales.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="2743"/>
         <location filename="../libs/libmyth/programtypes.cpp" line="175"/>
         <source>Recording</source>
         <translation>Grabando</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="433"/>
+        <source>Watched before unwatched</source>
+        <translation>Las vistas antes que las no vistas</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="372"/>
+        <source>Watched before unwatched</source>
+        <translation>Las vistas antes que las no vistas</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="189"/>
         <source>Max Recordings</source>
         <translation>Máx nº de Grabaciones</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="435"/>
+        <source>If enabled, programs that have been marked as watched will be expired before programs that have not been watched.</source>
+        <translation>Si se activa, los programas marcados como vistos expirarán antes que los que no hayan sido vistos.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="374"/>
+        <source>If enabled, programs that have been marked as watched will be expired before programs that have not been watched.</source>
+        <translation>Si se activa, los programas marcados como vistos expirarán antes que los que no hayan sido vistos.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="191"/>
         <source>Manual Cancel</source>
         <translation>Cancelación Manual</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="444"/>
+        <source>Priority weight</source>
+        <translation>Peso de prioridad</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="383"/>
+        <source>Priority weight</source>
+        <translation>Peso de prioridad</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="205"/>
         <source>Low Disk Space</source>
         <translation>Poco Espacio en Disco</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="445"/>
+        <source>The number of days bonus a program gets for each priority point. This is only used when the Weighted time/priority Auto-Expire method is selected.</source>
+        <translation>El número de días de bonificación que recibirá un programa por cada punto de prioridad. Sólo se usa al seleccionar el método de Auto-Expiración con tiempo/prioridad ponderados.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="384"/>
+        <source>The number of days bonus a program gets for each priority point. This is only used when the Weighted time/priority Auto-Expire method is selected.</source>
+        <translation>El número de días de bonificación que recibirá un programa por cada punto de prioridad. Sólo se usa al seleccionar el método de Auto-Expiración con tiempo/prioridad ponderados.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="207"/>
         <source>Tuner Busy</source>
         <translation>Sintonizador Ocupado</translation>
@@ -10231,104 +18044,318 @@ Are you sure you want to delete:</source>
         <location filename="../libs/libmyth/programtypes.cpp" line="245"/>
         <source>This showing is being recorded.</source>
         <translation>Este programa se está grabando.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="455"/>
+        <source>Auto-Expire default</source>
+        <translation>Auto-Expiración predeterminada</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="457"/>
+        <source>If enabled, any new recording schedules will be marked as eligible for auto-expiration. Existing schedules will keep their current value.</source>
+        <translation>Si se activa, cualquier programación nueva será marcada como candidata a la auto-expiración. Las programaciones existentes mantendrán su valor actual.</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="466"/>
+        <source>Live TV max age (days)</source>
+        <translation>Máxima edad de la TV en Vivo (en días)</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="394"/>
+        <source>Live TV max age (days)</source>
+        <translation>Máxima edad de la TV en Vivo (en días)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="259"/>
         <source>This showing was recorded.</source>
         <translation>Este programa fue grabado.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="467"/>
+        <source>Auto-Expire will force expiration of Live TV recordings when they are this many days old. Live TV recordings may also be expired early if necessary to free up disk space.</source>
+        <translation>La Auto-Expiración forzará la expiración de las grabaciones de la TV en Vivo cuando tengan esta edad en días. También podrán expirar antes si es necesario para liberar espacio en disco.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="395"/>
+        <source>Auto-Expire will force expiration of Live TV recordings when they are this many days old. Live TV recordings may also be expired early if necessary to free up disk space.</source>
+        <translation>La Auto-Expiración forzará la expiración de las grabaciones de la TV en Vivo cuando tengan esta edad en días. También podrán expirar antes si es necesario para liberar espacio en disco.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="267"/>
         <source>This showing was not recorded because the master backend was hung or not running.</source>
         <translation>Este programa no fue grabado porque el servidor principal estaba colgado o no estaba ejecutándose.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="480"/>
+        <source>New recording free disk space threshold (MB)</source>
+        <translation>Nuevo umbral de espacio libre en disco para grabaciones (MB)</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="408"/>
+        <source>New recording free disk space threshold (MB)</source>
+        <translation>Nuevo umbral de espacio libre en disco para grabaciones (MB)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="282"/>
         <source>There wasn&apos;t enough disk space available.</source>
         <translation>No hubo suficiente espacio en disco disponible.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="482"/>
+        <source>MythTV will stop scheduling new recordings on a backend when its free disk space (in megabytes) falls below this value.</source>
+        <translation>MythTV dejará de programar nuevas grabaciones en un servidor cuando su espacio libre en disco (en megabytes) esté por debajo de este valor.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="410"/>
+        <source>MythTV will stop scheduling new recordings on a backend when its free disk space (in megabytes) falls below this value.</source>
+        <translation>MythTV dejará de programar nuevas grabaciones en un servidor cuando su espacio libre en disco (en megabytes) esté por debajo de este valor.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="286"/>
         <source>The tuner card was already being used.</source>
         <translation>La sintonizadora ya estaba en uso.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="493"/>
+        <source>Re-record watched</source>
+        <translation>Regrabar vistos</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="421"/>
+        <source>Re-record watched</source>
+        <translation>Regrabar vistos</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="289"/>
         <source>The recorder failed to record.</source>
         <translation>El grabador falló al grabar.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="495"/>
+        <source>If enabled, programs that have been marked as watched and are Auto-Expired will be re-recorded if they are shown again.</source>
+        <translation>Si se activa, los programas que hayan sido marcados como vistos y hayan Auto-Expirado serán regrabados si vuelven a exhibirse.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="423"/>
+        <source>If enabled, programs that have been marked as watched and are Auto-Expired will be re-recorded if they are shown again.</source>
+        <translation>Si se activa, los programas que hayan sido marcados como vistos y hayan Auto-Expirado serán regrabados si vuelven a exhibirse.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="292"/>
         <source>The status of this showing is unknown.</source>
         <translation>El estado de este programa es desconocido.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="504"/>
+        <source>Time to record before start of show (secs)</source>
+        <translation>Tiempo de grabación antes de comenzar el programa (segundos)</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="432"/>
+        <source>Time to record before start of show (secs)</source>
+        <translation>Tiempo de grabación antes de comenzar el programa (segundos)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="301"/>
         <source>This showing will not be recorded because </source>
         <translation>Este programa no se grabará porque </translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="517"/>
+        <source>Time to record past end of show (secs)</source>
+        <translation>Tiempo de grabación tras finalizar el programa (segundos)</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="445"/>
+        <source>Time to record past end of show (secs)</source>
+        <translation>Tiempo de grabación tras finalizar el programa (segundos)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="303"/>
         <source>This showing was not recorded because </source>
         <translation>Este programa no fue grabado porque </translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="555"/>
+        <source>Record past end of show (mins)</source>
+        <translation>Grabar pasado el final del programa (min.)</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="483"/>
+        <source>Record past end of show (mins)</source>
+        <translation>Grabar pasado el final del programa (min.)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="308"/>
         <source>it was manually set to not record.</source>
         <translation>se estableció manualmente que no se grabase.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="557"/>
+        <source>For the specified category, an attempt will be made to extend the recording by the specified number of minutes. It is ignored when two shows have been scheduled without enough time in-between.</source>
+        <translation>Para la categoría especificada, se intentará extender el tiempo de grabación el número indicado de minutos. Será ignorado al grabar dos programas sin haber suficiente tiempo entre ambos.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="485"/>
+        <source>For the specified category, an attempt will be made to extend the recording by the specified number of minutes. It is ignored when two shows have been scheduled without enough time in-between.</source>
+        <translation>Para la categoría especificada, se intentará extender el tiempo de grabación el número indicado de minutos. Será ignorado al grabar dos programas sin haber suficiente tiempo entre ambos.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="311"/>
         <source>this episode was previously recorded according to the duplicate policy chosen for this title.</source>
         <translation>este episodio fue grabado anteriormente, según la política de duplicados elegida para este título.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="661"/>
+        <source>Example custom filter list: &apos;ivtc,denoise3d&apos;</source>
+        <translation>Ejemplo de lista personalizada de filtros: &apos;ivtc,denoise3d&apos;</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="589"/>
+        <source>Example custom filter list: &apos;ivtc,denoise3d&apos;</source>
+        <translation>Ejemplo de lista personalizada de filtros: &apos;ivtc,denoise3d&apos;</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="316"/>
         <source>this episode was previously recorded and is still available in the list of recordings.</source>
         <translation>este episodio fue grabado anteriormente y aún está disponible en la lista de grabaciones.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1250"/>
+        <source>Sorry, playback group
+name cannot be blank.</source>
+        <translation>Lo siento, el nombre del grupo de
+reproducción no puede dejarse vacío.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1186"/>
+        <source>Sorry, playback group
+name cannot be blank.</source>
+        <translation>Lo siento, el nombre del grupo de
+reproducción no puede dejarse vacío.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="325"/>
         <source>too many recordings of this program have already been recorded.</source>
         <translation>este programa se ha grabado ya demasiadas veces.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1320"/>
+        <source>Sort episodes</source>
+        <translation>Ordenar episodios</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1256"/>
+        <source>Sort episodes</source>
+        <translation>Ordenar episodios</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="358"/>
         <source>This showing will not be recorded.</source>
         <translation>Este programa no se grabará.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1323"/>
+        <source>Original air date</source>
+        <translation>Fecha de estreno original</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1259"/>
+        <source>Original air date</source>
+        <translation>Fecha de estreno original</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="360"/>
         <source>This showing was not recorded.</source>
         <translation>Este programa no fue grabado.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1347"/>
+        <source>If enabled, pressing the sticky rewind key in fast forward mode switches to rewind mode, and vice versa. If disabled, it will decrease the current speed or switch to play mode if the speed can&apos;t be decreased further.</source>
+        <translation>Si se activa, pulsar la tecla pegajosa de rebobinado en el modo avance rápido conmutará al modo rebobinado, y viceversa. Si se desactiva, disminuirá la velocidad actual o cambiará al modo reproducción si la velocidad no puede disminuirse más.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1283"/>
+        <source>If enabled, pressing the sticky rewind key in fast forward mode switches to rewind mode, and vice versa. If disabled, it will decrease the current speed or switch to play mode if the speed can&apos;t be decreased further.</source>
+        <translation>Si se activa, pulsar la tecla pegajosa de rebobinado en el modo avance rápido conmutará al modo rebobinado, y viceversa. Si se desactiva, disminuirá la velocidad actual o cambiará al modo reproducción si la velocidad no puede disminuirse más.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/channeleditor.cpp" line="28"/>
         <source>Channel Options</source>
         <translation>Opciónes de los Canales</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1381"/>
+        <source>PAL teletext</source>
+        <translation>Teletexto PAL</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1317"/>
+        <source>PAL teletext</source>
+        <translation>Teletexto PAL</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelsettings.cpp" line="66"/>
         <source>Video Source</source>
         <translation>Fuente de Vídeo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1382"/>
+        <source>NTSC closed caption</source>
+        <translation>Subtítulos NTSC</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1318"/>
+        <source>NTSC closed caption</source>
+        <translation>Subtítulos NTSC</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelsettings.cpp" line="45"/>
         <location filename="../programs/mythtv-setup/channeleditor.cpp" line="62"/>
         <source>Channel Name</source>
         <translation>Nombre del Canal</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1384"/>
+        <source>If enabled, this overrides the mythtv-setup setting used during recording when decoding captions.</source>
+        <translation>Si se activa, se ignorará la configuración de mythtv-setup usada durante las grabaciones al decodificar subtítulos.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1320"/>
+        <source>If enabled, this overrides the mythtv-setup setting used during recording when decoding captions.</source>
+        <translation>Si se activa, se ignorará la configuración de mythtv-setup usada durante las grabaciones al decodificar subtítulos.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelsettings.cpp" line="55"/>
         <source>Channel Number</source>
         <translation>Número de Canal</translation>
-    </message>
-    <message>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1393"/>
+        <source>Subtitle text zoom percentage</source>
+        <translation>Porcentaje de ampliación de los subtítulos</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1329"/>
+        <source>Subtitle text zoom percentage</source>
+        <translation>Porcentaje de ampliación de los subtítulos</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
+    </message>
+    <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelsettings.cpp" line="84"/>
         <source>[Not Selected]</source>
         <translation>[No Seleccionado]</translation>
-    </message>
-    <message>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1395"/>
+        <source>Use this to enlarge or shrink text based subtitles.</source>
+        <translation>Úselo para agrandar o encoger los subtítulos de texto.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1331"/>
+        <source>Use this to enlarge or shrink text based subtitles.</source>
+        <translation>Úselo para agrandar o encoger los subtítulos de texto.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
+    </message>
+    <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelsettings.cpp" line="119"/>
         <source>Callsign</source>
         <translation>ID de Emisora</translation>
@@ -10347,8 +18374,33 @@ Are you sure you want to delete:</source>
         <location filename="../libs/libmythtv/channelsettings.cpp" line="200"/>
         <source>Icon</source>
         <translation>Icono</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1407"/>
+        <source>Subtitle Font</source>
+        <translation>Tipo de Subtítulos</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1408"/>
+        <source>The font to use for text based subtitles.</source>
+        <translation>El tipo de letra a usar en los subtítulos de texto.</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1484"/>
+        <source>Black background for closed captioning</source>
+        <translation>Fondo negro para los subtítulos</translation>
     </message>
     <message>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1498"/>
+        <source>If enabled, captions will be displayed when playing back recordings or watching Live TV. Closed Captioning can be turned on or off by pressing &quot;T&quot; during playback.</source>
+        <translation>Si se activa, los subtítulos se mostrarán al reproducir grabaciones o ver la TV en Vivo. Podrán activarse pulsando &quot;T&quot; durante la reproducción.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1405"/>
+        <source>If enabled, captions will be displayed when playing back recordings or watching Live TV. Closed Captioning can be turned on or off by pressing &quot;T&quot; during playback.</source>
+        <translation>Si se activa, los subtítulos se mostrarán al reproducir grabaciones o ver la TV en Vivo. Podrán activarse pulsando &quot;T&quot; durante la reproducción.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
+    </message>
+    <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelsettings.cpp" line="212"/>
         <source>Video filters</source>
         <translation>Filtros de Imagen</translation>
@@ -10357,211 +18409,586 @@ Are you sure you want to delete:</source>
         <location filename="../libs/libmythtv/channelsettings.cpp" line="242"/>
         <source>XMLTV ID</source>
         <translation>ID XMLTV</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1512"/>
+        <source>If enabled, the newer EIA-708 captions will be preferred over the older EIA-608 captions in ATSC streams.</source>
+        <translation>Si se activa, se preferirán los más recientes subtítulos EIA-708 frente a los antiguos EIA-608 en las tramas ATSC.</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1522"/>
+        <source>Enable interactive TV</source>
+        <translation>Activar TV Interactiva</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1416"/>
+        <source>Enable interactive TV</source>
+        <translation>Activar TV Interactiva</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelsettings.cpp" line="298"/>
         <source>Commercial Detection Method</source>
         <translation>Método de Detección de Anuncios</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1524"/>
+        <source>If enabled, interactive TV applications (MHEG) will be activated. This is used for teletext and logos for radio and channels that are currently off-air.</source>
+        <translation>Si se activa, se utilizarán las aplicaciones de TV interactiva (MHEG). Se usa en los teletextos y logotipos de radio y en los canales que no estén emitiendo.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1418"/>
+        <source>If enabled, interactive TV applications (MHEG) will be activated. This is used for teletext and logos for radio and channels that are currently off-air.</source>
+        <translation>Si se activa, se utilizarán las aplicaciones de TV interactiva (MHEG). Se usa en los teletextos y logotipos de radio y en los canales que no estén emitiendo.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelsettings.cpp" line="320"/>
         <source>If enabled, the channel will be visible in the EPG.</source>
         <translation>Si se activa, el canal será visible en la EPG.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1534"/>
+        <source>Always use browse mode in Live TV</source>
+        <translation>Usar siempre el modo exploración en la TV en Vivo</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1428"/>
+        <source>Always use browse mode in Live TV</source>
+        <translation>Usar siempre el modo exploración en la TV en Vivo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelsettings.cpp" line="332"/>
         <source>If enabled, guide information for this channel will be updated using &apos;Over-the-Air&apos; program listings.</source>
         <translation>Si se activa, la información de guía para este canal se actualizará usando listas de programas &apos;Over-The-Air&apos;.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1537"/>
+        <source>If enabled, browse mode will automatically be activated whenever you use channel up/down while watching Live TV.</source>
+        <translation>Si se activa, se usará automáticamente el modo exploración al recorrer los canales en la TV en Vivo.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1431"/>
+        <source>If enabled, browse mode will automatically be activated whenever you use channel up/down while watching Live TV.</source>
+        <translation>Si se activa, se usará automáticamente el modo exploración al recorrer los canales en la TV en Vivo.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelsettings.cpp" line="350"/>
         <source>Specify either the exact frequency (in kHz) or a valid channel for your &apos;TV Format&apos;.</source>
         <translation>Especifique la frecuencia exacta (en kHz) o un canal válido para su &apos;Formato de TV&apos;.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1561"/>
+        <source>If enabled, automatically clear the bookmark on a recording when the recording is played back. If disabled, you can mark the beginning with rewind then save position.</source>
+        <translation>Si se activa, elimina automáticamente el marcador de una grabación al volver a reproducir ésta. Si se desactiva, puede marcar el comienzo rebobinando y guardando luego la posición.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1455"/>
+        <source>If enabled, automatically clear the bookmark on a recording when the recording is played back. If disabled, you can mark the beginning with rewind then save position.</source>
+        <translation>Si se activa, elimina automáticamente el marcador de una grabación al volver a reproducir ésta. Si se desactiva, puede marcar el comienzo rebobinando y guardando luego la posición.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelsettings.cpp" line="363"/>
         <source>Finetune</source>
         <translation>Sintonía fina</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1573"/>
+        <source>During playback the SELECT key (Enter or Space) will alternate between &quot;Bookmark Saved&quot; and &quot;Bookmark Cleared&quot;. If disabled, the SELECT key will save the current position for each keypress.</source>
+        <translation>Durante la reproducción, la tecla SELECT (Intro o Espacio) alternará entre &quot;Marcador Situado&quot; y &quot;Marcador Eliminado&quot;. Si se desactiva, la tecla SELECT guardará la posición actual en cada pulsación.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1467"/>
+        <source>During playback the SELECT key (Enter or Space) will alternate between &quot;Bookmark Saved&quot; and &quot;Bookmark Cleared&quot;. If disabled, the SELECT key will save the current position for each keypress.</source>
+        <translation>Durante la reproducción, la tecla SELECT (Intro o Espacio) alternará entre &quot;Marcador Situado&quot; y &quot;Marcador Eliminado&quot;. Si se desactiva, la tecla SELECT guardará la posición actual en cada pulsación.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelsettings.cpp" line="364"/>
         <source>Value to be added to your desired frequency (in kHz) for &apos;fine tuning&apos;.</source>
         <translation>Valor a añadir a su frecuencia deseada (en kHz) para lograr una &apos;sintonía fina&apos;.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1590"/>
+        <source>If set to prompt, a menu will be displayed when you exit playback mode. The options available will allow you to save your position, delete the recording, or continue watching.</source>
+        <translation>Si se activa preguntar, se mostrará un menú al salir del modo reproducción. Las opciones disponibles le permitirán guardar su posición, eliminar la grabación o continuar el visionado.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1484"/>
+        <source>If set to prompt, a menu will be displayed when you exit playback mode. The options available will allow you to save your position, delete the recording, or continue watching.</source>
+        <translation>Si se activa preguntar, se mostrará un menú al salir del modo reproducción. Las opciones disponibles le permitirán guardar su posición, eliminar la grabación o continuar el visionado.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelsettings.cpp" line="376"/>
         <location filename="../libs/libmythtv/videoouttypes.h" line="303"/>
         <source>Contrast</source>
         <translation>Contraste</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1602"/>
+        <source>If enabled, a menu will be displayed allowing you to delete the recording when it has finished playing.</source>
+        <translation>Si se activa, se mostrará un menú que le permitirá eliminar la grabación al finalizar su reproducción.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1496"/>
+        <source>If enabled, a menu will be displayed allowing you to delete the recording when it has finished playing.</source>
+        <translation>Si se activa, se mostrará un menú que le permitirá eliminar la grabación al finalizar su reproducción.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelsettings.cpp" line="387"/>
         <location filename="../libs/libmythtv/videoouttypes.h" line="301"/>
         <source>Brightness</source>
         <translation>Brillo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1611"/>
+        <source>Jump to program OSD</source>
+        <translation>Saltar a la OSD del programa</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1505"/>
+        <source>Jump to program OSD</source>
+        <translation>Saltar a la OSD del programa</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelsettings.cpp" line="398"/>
         <location filename="../libs/libmythtv/videoouttypes.h" line="305"/>
         <source>Color</source>
         <translation>Color</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1613"/>
+        <source>Set the choice between viewing the current recording group in the OSD, or showing the &apos;Watch Recording&apos; screen when &apos;Jump to Program&apos; is activated. If enabled, the recordings are shown in the OSD</source>
+        <translation>Elegir entre ver el grupo de grabación actual en la OSD, o mostrar la pantalla &apos;Ver Grabación&apos; al activar &apos;Saltar al Programa&apos;. Si se activa, las grabaciones se mostrarán en la OSD</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1507"/>
+        <source>Set the choice between viewing the current recording group in the OSD, or showing the &apos;Watch Recording&apos; screen when &apos;Jump to Program&apos; is activated. If enabled, the recordings are shown in the OSD</source>
+        <translation>Elegir entre ver el grupo de grabación actual en la OSD, o mostrar la pantalla &apos;Ver Grabación&apos; al activar &apos;Saltar al Programa&apos;. Si se activa, las grabaciones se mostrarán en la OSD</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelsettings.cpp" line="408"/>
         <location filename="../libs/libmythtv/videoouttypes.h" line="307"/>
         <source>Hue</source>
         <translation>Tono</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1625"/>
+        <source>Continue playback when embedded</source>
+        <translation>Continuar la reproducción al incrustar</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1519"/>
+        <source>Continue playback when embedded</source>
+        <translation>Continuar la reproducción al incrustar</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelsettings.cpp" line="529"/>
         <source>Channel Options - Video4Linux</source>
         <translation>Opciones de Canales - Video4Linux</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1627"/>
+        <source>If enabled, TV playback continues when the TV window is embedded in the upcoming program list or recorded list. The default is to pause the recorded show when embedded.</source>
+        <translation>Si se activa, la reproducción de la TV continuará cuando la ventana se incruste en la lista de programas o en la lista de grabados. Por defecto, el programa grabado se pondrá en pausa al incrustar.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1521"/>
+        <source>If enabled, TV playback continues when the TV window is embedded in the upcoming program list or recorded list. The default is to pause the recorded show when embedded.</source>
+        <translation>Si se activa, la reproducción de la TV continuará cuando la ventana se incruste en la lista de programas o en la lista de grabados. Por defecto, el programa grabado se pondrá en pausa al incrustar.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelsettings.cpp" line="547"/>
         <source>Channel Options - Raw Transport Stream</source>
         <translation>Opciones de Canales - Transporte de Datos en Bruto</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1640"/>
+        <source>If enabled, when you exit near the end of a recording it will be marked as watched. The automatic detection is not foolproof, so do not enable this setting if you don&apos;t want an unwatched recording marked as watched.</source>
+        <translation>Si se activa, al salir cerca del final de una grabación, ésta se marcará como vista. La detección automática no es infalible, así que no active esto si no desea que una grabación no vista sea marcada como vista.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1534"/>
+        <source>If enabled, when you exit near the end of a recording it will be marked as watched. The automatic detection is not foolproof, so do not enable this setting if you don&apos;t want an unwatched recording marked as watched.</source>
+        <translation>Si se activa, al salir cerca del final de una grabación, ésta se marcará como vista. La detección automática no es infalible, así que no active esto si no desea que una grabación no vista sea marcada como vista.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="57"/>
         <source>Ignore Signal Timeout</source>
         <translation>Ignorar Caducidad de Señal</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1651"/>
+        <source>Live TV idle timeout (mins)</source>
+        <translation>Tiempo muerto de la TV en Vivo (minutos)</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1545"/>
+        <source>Live TV idle timeout (mins)</source>
+        <translation>Tiempo muerto de la TV en Vivo (minutos)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="59"/>
         <source>This option allows you to slow down the scan for broken drivers, such as the DVB drivers for the Leadtek LR6650 DVB card.</source>
         <translation>Esta opción le permite ralentizar la exploración en controladores defectuosos, como los controladores DVB de la tarjeta Leadtek LR6650.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1653"/>
+        <source>Exit Live TV automatically if left idle for the specified number of minutes. 0 disables the timeout.</source>
+        <translation>Salir automáticamente de la TV en Vivo si ésta no se ha usado durante el tiempo especificado en minutos. 0 desactiva la opción.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1547"/>
+        <source>Exit Live TV automatically if left idle for the specified number of minutes. 0 disables the timeout.</source>
+        <translation>Salir automáticamente de la TV en Vivo si ésta no se ha usado durante el tiempo especificado en minutos. 0 desactiva la opción.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="70"/>
         <source>Search new Transports</source>
         <translation>Buscar nuevos Transportes</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1690"/>
+        <source>If enabled, you can use a virtual keyboard in MythTV&apos;s line edit boxes. To use, hit SELECT (Enter or Space) while a line edit is in focus.</source>
+        <translation>Si se activa, podrá usar un teclado virtual en las cajas de edición de MythTV. Para usarlo, pulse SELECT (Intro o Espacio) mientras el foco esté sobre una caja de edición.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1584"/>
+        <source>If enabled, you can use a virtual keyboard in MythTV&apos;s line edit boxes. To use, hit SELECT (Enter or Space) while a line edit is in focus.</source>
+        <translation>Si se activa, podrá usar un teclado virtual en las cajas de edición de MythTV. Para usarlo, pulse SELECT (Intro o Espacio) mientras el foco esté sobre una caja de edición.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="72"/>
         <source>Digital transmissions may signal other available Transports. If this option is enabled the scanner scans all signaled transports for new/updated channels.</source>
         <translation>Las transmisiones digitales pueden señalizar la presencia de otros Transportes disponibles. Si se activa esta opción, el escáner explorará todos los transportes señalizados en busca de canales nuevos/actualizados.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1699"/>
+        <source>Idle time before entering standby mode (minutes)</source>
+        <translation>Tiempo de desocupación antes de entrar en modo de espera (minutos)</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1593"/>
+        <source>Idle time before entering standby mode (minutes)</source>
+        <translation>Tiempo de desocupación antes de entrar en modo de espera (minutos)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="84"/>
         <source>Desired Services</source>
         <translation>Servicios Deseados</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1701"/>
+        <source>Number of minutes to wait when the frontend is idle before entering standby mode. Standby mode allows the backend to power down if configured to do so. Any remote or mouse input will cause the countdown to start again and/or exit idle mode. Video playback suspends the countdown. A value of zero prevents the frontend automatically entering standby.</source>
+        <translation>Minutos a esperar cuando el cliente esté desocupado antes de entrar en el modo de espera. Éste permite al servidor apagar la máquina si está configurado para ello. Cualquier entrada de control remoto o ratón reiniciará la cuenta atrás y/o hará que se salga del modo desocupado. La reproducción de vídeos suspenderá la cuenta atrás. El valor cero impide que el cliente entre automáticamente en espera.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1595"/>
+        <source>Number of minutes to wait when the frontend is idle before entering standby mode. Standby mode allows the backend to power down if configured to do so. Any remote or mouse input will cause the countdown to start again and/or exit idle mode. Video playback suspends the countdown. A value of zero prevents the frontend automatically entering standby.</source>
+        <translation>Minutos a esperar cuando el cliente esté desocupado antes de entrar en el modo de espera. Éste permite al servidor apagar la máquina si está configurado para ello. Cualquier entrada de control remoto o ratón reiniciará la cuenta atrás y/o hará que se salga del modo desocupado. La reproducción de vídeos suspenderá la cuenta atrás. El valor cero impide que el cliente entre automáticamente en espera.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="85"/>
         <source>TV - Adds A/V services only, TV+Radio - Adds all services with audio, All - Adds all services (including data only services).</source>
         <translation>TV - Sólo añade servicios A/V, TV+Radio - Añade todos los servicios con sonido, Todos - Añade todos los servicios (incluyendo servicios exclusivamente de datos).</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1715"/>
+        <source>Customize exit menu options</source>
+        <translation>Personalizar opciones del menú de salida</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1609"/>
+        <source>Customize exit menu options</source>
+        <translation>Personalizar opciones del menú de salida</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="90"/>
         <source>TV</source>
         <translation>TV</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1734"/>
+        <source>Optional. Script to run if you select the reboot option from the exit menu, if the option is displayed. You must configure an exit key to display the exit menu.</source>
+        <translation>Opcional, Guión a ejecutar si selecciona la opción de reinicio en el menú de salida, si aparece dicha opción. Debe configurar una tecla que muestre el menú de salida.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1628"/>
+        <source>Optional. Script to run if you select the reboot option from the exit menu, if the option is displayed. You must configure an exit key to display the exit menu.</source>
+        <translation>Opcional, Guión a ejecutar si selecciona la opción de reinicio en el menú de salida, si aparece dicha opción. Debe configurar una tecla que muestre el menú de salida.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="91"/>
         <source>TV+Radio</source>
         <translation>TV+Radio</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1746"/>
+        <source>Optional. Script to run if you select the shutdown option from the exit menu, if the option is displayed. You must configure an exit key to display the exit menu.</source>
+        <translation>Opcional, Guión a ejecutar si selecciona la opción de apagado en el menú de salida, si aparece dicha opción. Debe configurar una tecla que muestre el menú de salida.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1640"/>
+        <source>Optional. Script to run if you select the shutdown option from the exit menu, if the option is displayed. You must configure an exit key to display the exit menu.</source>
+        <translation>Opcional, Guión a ejecutar si selecciona la opción de apagado en el menú de salida, si aparece dicha opción. Debe configurar una tecla que muestre el menú de salida.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="115"/>
         <source>Unencrypted Only</source>
         <translation>Sólo No Codificados</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1756"/>
+        <source>LIRC daemon socket</source>
+        <translation>Conector del demonio LIRC</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1650"/>
+        <source>LIRC daemon socket</source>
+        <translation>Conector del demonio LIRC</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="117"/>
         <source>If set, only non-encrypted channels will be added during the scan.</source>
         <translation>Si se activa, durante la exploración sólo se añadirán los canales no codificados.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1773"/>
+        <source>Screen shot path</source>
+        <translation>Ruta de capturas</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1667"/>
+        <source>Screen shot path</source>
+        <translation>Ruta de capturas</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="128"/>
         <source>Test Decryptability</source>
         <translation>Probar Decodificabilidad</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1782"/>
+        <source>Setup PIN code</source>
+        <translation>Configurar código PIN</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1676"/>
+        <source>Setup PIN code</source>
+        <translation>Configurar código PIN</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="130"/>
         <source>Test all channels to see if they can be decrypted with installed CAM/smartcard. Sometimes the encrypted flag is set spuriously. Attention: Enabling this option increases the scan time for each encrypted channel by a couple of seconds.</source>
         <translation>Probar todos los canales para ver si pueden decodificarse usando el CAM o tarjeta inteligente instalados. A veces, la marca de codificación se activa erróneamente. Atención: activar esta opción prolonga un par de segundos el tiempo de exploración de cada canal codificado.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1783"/>
+        <source>This PIN is used to control access to the setup menus. If you want to use this feature, then setting the value to all numbers will make your life much easier. Set it to blank to disable.</source>
+        <translation>Este PIN se usa para controlar el acceso a los menús de configuración. Si desea usar esta característica, hará su vida mucho más fácil. Déjelo vacío para desactivarlo.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1677"/>
+        <source>This PIN is used to control access to the setup menus. If you want to use this feature, then setting the value to all numbers will make your life much easier. Set it to blank to disable.</source>
+        <translation>Este PIN se usa para controlar el acceso a los menús de configuración. Si desea usar esta característica, hará su vida mucho más fácil. Déjelo vacío para desactivarlo.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="143"/>
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="154"/>
         <location filename="../libs/libmythtv/channelsettings.cpp" line="348"/>
         <location filename="../libs/libmythtv/transporteditor.cpp" line="452"/>
         <source>Frequency</source>
         <translation>Frecuencia</translation>
-    </message>
-    <message>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1793"/>
+        <source>Require setup PIN</source>
+        <translation>Requerir PIN de configuración</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1687"/>
+        <source>Require setup PIN</source>
+        <translation>Requerir PIN de configuración</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
+    </message>
+    <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="144"/>
         <source>Frequency (Option has no default)
 The frequency for this channel in kHz.</source>
         <translation>Frecuencia (esta opción no tiene valor predeterminado)
 La frecuencia de este canal en kHz.</translation>
-    </message>
-    <message>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1795"/>
+        <source>If enabled, you will not be able to return to this screen and reset the Setup PIN without first entering the current PIN.</source>
+        <translation>Si se activa, usted no podrá regresar a esta pantalla y reiniciar el PIN de Configuración sin introducir primero el PIN actual.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1689"/>
+        <source>If enabled, you will not be able to return to this screen and reset the Setup PIN without first entering the current PIN.</source>
+        <translation>Si se activa, usted no podrá regresar a esta pantalla y reiniciar el PIN de Configuración sin introducir primero el PIN actual.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
+    </message>
+    <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="155"/>
         <source>Frequency (Option has no default)
 The frequency for this channel in Hz.</source>
         <translation>Frecuencia (esta opción no tiene valor predeterminado)
 La frecuencia de este canal en Hz.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1819"/>
+        <source>Monitor aspect ratio</source>
+        <translation>Relación de aspecto del monitor</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1713"/>
+        <source>Monitor aspect ratio</source>
+        <translation>Relación de aspecto del monitor</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="165"/>
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="185"/>
         <location filename="../libs/libmythtv/transporteditor.cpp" line="465"/>
         <source>Symbol Rate</source>
         <translation>Tasa de Símbolos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1823"/>
+        <source>The aspect ratio of a Xinerama display cannot be queried from the display, so it must be specified.</source>
+        <translation>La relación de aspecto de una pantalla Xinerama no puede obtenerse a partir de la misma, así que debe especificarse.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1717"/>
+        <source>The aspect ratio of a Xinerama display cannot be queried from the display, so it must be specified.</source>
+        <translation>La relación de aspecto de una pantalla Xinerama no puede obtenerse a partir de la misma, así que debe especificarse.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="167"/>
         <source>Symbol Rate (symbols/second).
 Most DVB-S transponders transmit at 27.5 million symbols per second.</source>
         <translation>Tasa de Símbolos (símbolos/segundo).
 La mayoría de los transpondedores DVB-S transmiten a 27,5 millones de símbolos por segundo.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1832"/>
+        <source>Letterboxing color</source>
+        <translation>Color de franjas</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1726"/>
+        <source>Letterboxing color</source>
+        <translation>Color de franjas</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="187"/>
         <source>Symbol Rate (symbols/second).
 Most DVB-C transports transmit at 6.9 or 6.875 million symbols per second.</source>
         <translation>Tasa de Símbolos (símbolos/segundo).
 La mayoría de los transportes DVB-C transmiten a 6,9 ó 6,875 millones de símbolos por segundo.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1847"/>
+        <source>Video aspect override</source>
+        <translation>Ignorar relación de aspecto de la imagen</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1741"/>
+        <source>Video aspect override</source>
+        <translation>Ignorar relación de aspecto de la imagen</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="205"/>
         <location filename="../libs/libmythtv/transporteditor.cpp" line="486"/>
         <source>Polarity</source>
         <translation>Polaridad</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1878"/>
+        <source>GUI width (pixels)</source>
+        <translation>Ancho de la GUI (píxeles)</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1772"/>
+        <source>GUI width (pixels)</source>
+        <translation>Ancho de la GUI (píxeles)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="207"/>
         <location filename="../libs/libmythtv/transporteditor.cpp" line="488"/>
         <source>Horizontal</source>
         <translation>Horizontal</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1880"/>
+        <source>The width of the GUI. Do not make the GUI wider than your actual screen resolution. Set to 0 to automatically scale to fullscreen.</source>
+        <translation>El ancho de la GUI. No haga que la GUI sea más ancha que su actual resolución de pantalla. Déjelo a cero para ajustarlo automáticamente a pantalla completa.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1774"/>
+        <source>The width of the GUI. Do not make the GUI wider than your actual screen resolution. Set to 0 to automatically scale to fullscreen.</source>
+        <translation>El ancho de la GUI. No haga que la GUI sea más ancha que su actual resolución de pantalla. Déjelo a cero para ajustarlo automáticamente a pantalla completa.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="208"/>
         <location filename="../libs/libmythtv/transporteditor.cpp" line="489"/>
         <source>Vertical</source>
         <translation>Vertical</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1889"/>
+        <source>GUI height (pixels)</source>
+        <translation>Alto de la GUI (píxeles)</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1783"/>
+        <source>GUI height (pixels)</source>
+        <translation>Alto de la GUI (píxeles)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="209"/>
         <location filename="../libs/libmythtv/transporteditor.cpp" line="490"/>
         <source>Right Circular</source>
         <translation>Circular a la Derecha</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1891"/>
+        <source>The height of the GUI. Do not make the GUI taller than your actual screen resolution. Set to 0 to automatically scale to fullscreen.</source>
+        <translation>El alto de la GUI. No haga que la GUI sea más alta que su actual resolución de pantalla. Déjelo a cero para ajustarlo automáticamente a pantalla completa.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1785"/>
+        <source>The height of the GUI. Do not make the GUI taller than your actual screen resolution. Set to 0 to automatically scale to fullscreen.</source>
+        <translation>El alto de la GUI. No haga que la GUI sea más alta que su actual resolución de pantalla. Déjelo a cero para ajustarlo automáticamente a pantalla completa.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="210"/>
         <location filename="../libs/libmythtv/transporteditor.cpp" line="491"/>
         <source>Left Circular</source>
         <translation>Circular a la Izquierda</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1902"/>
+        <source>The horizontal offset where the GUI will be displayed. May only work if run in a window.</source>
+        <translation>El desplazamiento horizontal donde se mostrará la GUI. Podría funcionar sólo si se ejecuta en una ventana.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1796"/>
+        <source>The horizontal offset where the GUI will be displayed. May only work if run in a window.</source>
+        <translation>El desplazamiento horizontal donde se mostrará la GUI. Podría funcionar sólo si se ejecuta en una ventana.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="219"/>
         <location filename="../libs/libmythtv/transporteditor.cpp" line="548"/>
         <source>Inversion</source>
         <translation>Inversión</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1912"/>
+        <source>The vertical offset where the GUI will be displayed.</source>
+        <translation>El desplazamiento vertical donde se mostrará la GUI.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1806"/>
+        <source>The vertical offset where the GUI will be displayed.</source>
+        <translation>El desplazamiento vertical donde se mostrará la GUI.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/settings.cpp" line="806"/>
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="224"/>
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="237"/>
@@ -10582,88 +19009,248 @@ La mayoría de los transportes DVB-C transmiten a 6,9 ó 6,875 millones de símb
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2153"/>
         <source>Auto</source>
         <translation>Automática</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1921"/>
+        <source>Display size - width</source>
+        <translation>Tamaño de pantalla - ancho</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1815"/>
+        <source>Display size - width</source>
+        <translation>Tamaño de pantalla - ancho</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="225"/>
         <location filename="../libs/libmythtv/transporteditor.cpp" line="553"/>
         <source>On</source>
         <translation>Activada</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1932"/>
+        <source>Display size - height</source>
+        <translation>Tamaño de pantalla - alto</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1826"/>
+        <source>Display size - height</source>
+        <translation>Tamaño de pantalla - alto</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="235"/>
         <location filename="../libs/libmythtv/transporteditor.cpp" line="564"/>
         <source>Bandwidth</source>
         <translation>Ancho de Banda</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2029"/>
+        <source>Video output</source>
+        <translation>Salida de vídeo</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1923"/>
+        <source>Video output</source>
+        <translation>Salida de vídeo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="343"/>
         <source>Mod Sys</source>
         <translation>Sist.Modulación</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2048"/>
+        <source>Default refresh rate when watching a video. Leave at &quot;Auto&quot; to automatically use the best available</source>
+        <translation>Tasa de refresco predeterminada al visionar un vídeo. Déjela en &quot;Auto&quot; para usar automáticamente la mejor disponible</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1942"/>
+        <source>Default refresh rate when watching a video. Leave at &quot;Auto&quot; to automatically use the best available</source>
+        <translation>Tasa de refresco predeterminada al visionar un vídeo. Déjela en &quot;Auto&quot; para usar automáticamente la mejor disponible</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="344"/>
         <source>Modulation system (Default: DVB-S)</source>
         <translation>Sistema de modulación (por defecto: DVB-S)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2051"/>
+        <source>Refresh rate when watching a video at a specific resolution. Leave at &quot;Auto&quot; to automatically use the best available</source>
+        <translation>Tasa de refresco al visionar un vídeo a una resolución específica. Déjela en &quot;Auto&quot; para usar automáticamente la mejor disponible</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1945"/>
+        <source>Refresh rate when watching a video at a specific resolution. Leave at &quot;Auto&quot; to automatically use the best available</source>
+        <translation>Tasa de refresco al visionar un vídeo a una resolución específica. Déjela en &quot;Auto&quot; para usar automáticamente la mejor disponible</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="355"/>
         <source>Roll-off</source>
         <translation>Caída</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2081"/>
+        <source>Leave at &quot;Default&quot; to use ratio reported by the monitor. Set to 16:9 or 4:3 to force a specific aspect ratio.</source>
+        <translation>Déjela &quot;Predeterminada&quot; para usar la relación indicada por el monitor. Establézcala a 16:9 ó 4:3 para forzar una relación de aspecto específica.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1975"/>
+        <source>Leave at &quot;Default&quot; to use ratio reported by the monitor. Set to 16:9 or 4:3 to force a specific aspect ratio.</source>
+        <translation>Déjela &quot;Predeterminada&quot; para usar la relación indicada por el monitor. Establézcala a 16:9 ó 4:3 para forzar una relación de aspecto específica.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="356"/>
         <source>Roll-off factor (Default: 0.35)</source>
         <translation>Factor de caída (por defecto: 0,35)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2145"/>
+        <source>Hide mouse cursor in MythTV</source>
+        <translation>Ocultar el cursor del ratón en MythTV</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2039"/>
+        <source>Hide mouse cursor in MythTV</source>
+        <translation>Ocultar el cursor del ratón en MythTV</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/modulationsetting.h" line="40"/>
         <source>Terrestrial</source>
         <translation>Terrestre</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2147"/>
+        <source>Toggles mouse cursor visibility for touchscreens. By default MythTV will auto-hide the cursor if the mouse doesn&apos;t move for a period, this setting disables the cursor entirely.</source>
+        <translation>Conmuta la visibilidad del cursor del ratón en las pantallas táctiles. Por defecto, MythTV ocultará el cursor automáticamente. Si el ratón no se mueve durante un periodo de tiempo, se desactivará el cursor completamente.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2041"/>
+        <source>Toggles mouse cursor visibility for touchscreens. By default MythTV will auto-hide the cursor if the mouse doesn&apos;t move for a period, this setting disables the cursor entirely.</source>
+        <translation>Conmuta la visibilidad del cursor del ratón en las pantallas táctiles. Por defecto, MythTV ocultará el cursor automáticamente. Si el ratón no se mueve durante un periodo de tiempo, se desactivará el cursor completamente.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/modulationsetting.h" line="45"/>
         <location filename="../libs/libmythtv/channelscan/modulationsetting.h" line="74"/>
         <location filename="../libs/libmythtv/channelscan/modulationsetting.h" line="100"/>
         <location filename="../libs/libmythtv/transporteditor.cpp" line="506"/>
         <source>Modulation</source>
         <translation>Modulación</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2170"/>
+        <source>If disabled, the video playback window can be resized</source>
+        <translation>Si se desactiva, la ventana de reproducción de vídeo podrá cambiarse de tamaño</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2064"/>
+        <source>If disabled, the video playback window can be resized</source>
+        <translation>Si se desactiva, la ventana de reproducción de vídeo podrá cambiarse de tamaño</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/modulationsetting.h" line="47"/>
         <source>Modulation, 8-VSB, QAM-256, etc.</source>
         <translation>Modulación: 8-VSB, QAM-256, etc.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2229"/>
+        <source>Short date format</source>
+        <translation>Formato corto de fecha</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2123"/>
+        <source>Short date format</source>
+        <translation>Formato corto de fecha</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/modulationsetting.h" line="48"/>
         <source>Most cable systems in the United States use QAM-256 or QAM-64, but some mixed systems may use 8-VSB for over-the-air channels.</source>
         <translation>La mayor parte de los sistemas por cable en los Estados Unidos usan QAM-256 o QAM-64, pero algunos sistemas mixtos pueden usar 8-VSB para canales aéreos.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2286"/>
+        <source>Your preferred time format. You must choose a format with &quot;AM&quot; or &quot;PM&quot; in it, otherwise your time display will be 24-hour or &quot;military&quot; time.</source>
+        <translation>Su formato de hora preferido. Debe elegir un formato con &quot;AM&quot; o &quot;PM&quot;, si no, se mostrará la hora en formato 24 horas o &quot;militar&quot;.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2180"/>
+        <source>Your preferred time format. You must choose a format with &quot;AM&quot; or &quot;PM&quot; in it, otherwise your time display will be 24-hour or &quot;military&quot; time.</source>
+        <translation>Su formato de hora preferido. Debe elegir un formato con &quot;AM&quot; o &quot;PM&quot;, si no, se mostrará la hora en formato 24 horas o &quot;militar&quot;.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/modulationsetting.h" line="75"/>
         <source>Modulation (Default: Auto)</source>
         <translation>Modulación (por defecto: Automática)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2295"/>
+        <source>Paint engine</source>
+        <translation>Motor de trazado</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2189"/>
+        <source>Paint engine</source>
+        <translation>Motor de trazado</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/modulationsetting.h" line="85"/>
         <source>Constellation</source>
         <translation>Constelación</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2296"/>
+        <source>Qt</source>
+        <translation>Qt</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2190"/>
+        <source>Qt</source>
+        <translation>Qt</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/modulationsetting.h" line="86"/>
         <source>Constellation (Default: Auto)</source>
         <translation>Constelación (por defecto: Automática)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2299"/>
+        <source>OpenGL</source>
+        <translation>OpenGL</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2193"/>
+        <source>OpenGL</source>
+        <translation>OpenGL</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/modulationsetting.h" line="102"/>
         <source>Modulation, QPSK, 8PSK, QAM-16</source>
         <translation>Modulación: QPSK, 8PSK, QAM-16</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2302"/>
+        <source>Direct3D</source>
+        <translation>Direct3D</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2196"/>
+        <source>Direct3D</source>
+        <translation>Direct3D</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/modulationsetting.h" line="103"/>
         <source>Most DVB-S transponders use QPSK, while DVB-S2 use 8PSK. QAM-16 is not available for DVB-S2 transports.</source>
         <translation>La mayoría de los transpondedores DVB-S usan QPSK, mientras que DVB-S2 usa 8PSK. Los transportes DVB-S2 no disponen de QAM-16.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2304"/>
+        <source>This selects what MythTV uses to draw. Choosing &apos;Auto&apos; is recommended, unless running on systems with broken OpenGL implementations (broken hardware or drivers or windowing systems) where only Qt works.</source>
+        <translation>Selecciona lo que MythTV utilizará para trazar los gráficos. Se recomienda elegir &apos;Auto&apos;, a menos que se ejecute en sistemas con una implementación defectuosa de OpenGL (hardware, controladores o sistemas de ventanas defectuosos) en los que sólo funcione Qt.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2198"/>
+        <source>This selects what MythTV uses to draw. Choosing &apos;Auto&apos; is recommended, unless running on systems with broken OpenGL implementations (broken hardware or drivers or windowing systems) where only Qt works.</source>
+        <translation>Selecciona lo que MythTV utilizará para trazar los gráficos. Se recomienda elegir &apos;Auto&apos;, a menos que se ejecute en sistemas con una implementación defectuosa de OpenGL (hardware, controladores o sistemas de ventanas defectuosos) en los que sólo funcione Qt.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="269"/>
         <location filename="../libs/libmythtv/transporteditor.cpp" line="600"/>
         <source>FEC</source>
@@ -10680,29 +19267,88 @@ La mayoría de los transportes DVB-C transmiten a 6,9 ó 6,875 millones de símb
         <location filename="../libs/libmythtv/transporteditor.cpp" line="626"/>
         <source>HP Coderate</source>
         <translation>Tasa de Código AP</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <source>Enable GUI Effects</source>
+        <translation type="obsolete">Activar Efectos de la GUI</translation>
+    </message>
+    <message>
+        <source>This selects whether to use any effects defined by the theme (Note: not all the paint engines allow animations to be used).</source>
+        <translation type="obsolete">Selecciona el uso o no de los efectos definidos por el tema (Nota: no todos los motores de trazado permiten usar animaciones).</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2319"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2333"/>
+        <source>name</source>
+        <translation>nombre</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2213"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2227"/>
+        <source>name</source>
+        <translation>nombre</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="300"/>
         <location filename="../libs/libmythtv/transporteditor.cpp" line="637"/>
         <source>Guard Interval</source>
         <translation>Intervalo de Guarda</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2320"/>
+        <source>Your preferred channel format.</source>
+        <translation>Su formato de canal preferido.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2214"/>
+        <source>Your preferred channel format.</source>
+        <translation>Su formato de canal preferido.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="315"/>
         <location filename="../libs/libmythtv/transporteditor.cpp" line="653"/>
         <source>Trans. Mode</source>
         <translation>Modo Transmisión</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2765"/>
+        <source>MythTV will listen for connections from the &quot;mythutil&quot; program on this port.</source>
+        <translation>MythTV atenderá conexiones del programa &quot;mythutil&quot; en este puerto.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2629"/>
+        <source>MythTV will listen for connections from the &quot;mythutil&quot; program on this port.</source>
+        <translation>MythTV atenderá conexiones del programa &quot;mythutil&quot; en este puerto.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="328"/>
         <location filename="../libs/libmythtv/transporteditor.cpp" line="667"/>
         <source>Hierarchy</source>
         <translation>Jerarquía</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3692"/>
+        <source>Screen Settings</source>
+        <translation>Configuración de Pantalla</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3528"/>
+        <source>Screen Settings</source>
+        <translation>Configuración de Pantalla</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelsettings.cpp" line="416"/>
         <source>Channel Options - Common</source>
         <translation>Opciones de Canales - Comunes</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2334"/>
+        <source>Your preferred long channel format.</source>
+        <translation>Su formato largo de canal preferido.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2228"/>
+        <source>Your preferred long channel format.</source>
+        <translation>Su formato largo de canal preferido.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythtv/profilegroup.h" line="63"/>
@@ -10721,29 +19367,79 @@ La mayoría de los transportes DVB-C transmiten a 6,9 ó 6,875 millones de símb
         <translation>Tipo de Tarjeta</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="2455"/>
         <source>Card type</source>
         <translation>Tipo de tarjeta</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="49"/>
+        <source>Override Recording</source>
+        <translation>Ignorar Grabación</translation>
+=======
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="50"/>
+        <source>Override Recording</source>
+        <translation>Ignorar Grabación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="2456"/>
         <source>Change the cardtype to the appropriate type for the capture card you are configuring.</source>
         <translation>Cambie el tipo de tarjeta al apropiado para la capturadora que está configurando.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="172"/>
+        <source>Don&apos;t Record</source>
+        <translation>No Grabar</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="180"/>
+        <source>Don&apos;t Record</source>
+        <translation>No Grabar</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="2467"/>
         <source>MJPEG capture card (Matrox G200, DC10)</source>
         <translation>Capturadora MJPEG (Matrox G200, DC10)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1955"/>
+        <source>Separate video modes for GUI and TV playback</source>
+        <translation>Modos de vídeo separados para la GUI y la TV</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1849"/>
+        <source>Separate video modes for GUI and TV playback</source>
+        <translation>Modos de vídeo separados para la GUI y la TV</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="2858"/>
         <source>Use DishNet long-term EIT data</source>
         <translation>Usar datos EIT a largo plazo de DishNet</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2096"/>
+        <source>Video Mode Settings</source>
+        <translation>Configuración de Modos de Vídeo</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1990"/>
+        <source>Video Mode Settings</source>
+        <translation>Configuración de Modos de Vídeo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="2945"/>
         <source>Input groups are only needed when two or more cards share the same resource such as a FireWire card and an analog card input controlling the same set top box.</source>
         <translation>Los grupos de entradas sólo son necesarios cuando dos o más tarjetas comparten el mismo recurso, como una tarjeta FireWire y una entrada de tarjeta analógica que controlen el mismo equipo.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4868"/>
+        <source>Commercial Free</source>
+        <translation>Sin Anuncios</translation>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4867"/>
+        <source>Commercial Free</source>
+        <translation>Sin Anuncios</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythtv/videosource.cpp" line="3248"/>
@@ -10756,33 +19452,98 @@ La mayoría de los transportes DVB-C transmiten a 6,9 ó 6,875 millones de símb
         <translation>(Nueva fuente de vídeo)</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="206"/>
         <location filename="../libs/libmythtv/videosource.cpp" line="221"/>
         <location filename="../programs/mythtv-setup/backendsettings.cpp" line="162"/>
         <source>Channel frequency table</source>
         <translation>Tabla de frecuencias de canales</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/recordingrule.cpp" line="639"/>
+        <source>Title Search</source>
+        <translation>Búsqueda por Título</translation>
+=======
+        <location filename="../libs/libmythtv/recordingrule.cpp" line="314"/>
+        <location filename="../libs/libmythtv/recordingrule.cpp" line="516"/>
+        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="131"/>
+        <source>Default (Template)</source>
+        <translation>Predeterminada (Plantilla)</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/recordingrule.cpp" line="318"/>
+        <source> (Template)</source>
+        <translation> (Plantilla)</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/recordingrule.cpp" line="742"/>
+        <source>Title Search</source>
+        <translation>Búsqueda por Título</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="212"/>
         <source>Use default unless this source uses a different frequency table than the system wide table defined in the General settings.</source>
         <translation>Use el valor predeterminado, a menos que esta fuente utilice una tabla de frecuencias distinta de la definida en la Configuración General.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/recordingrule.cpp" line="642"/>
+        <source>Keyword Search</source>
+        <translation>Búsqueda por Clave</translation>
+=======
+        <location filename="../libs/libmythtv/recordingrule.cpp" line="745"/>
+        <source>Keyword Search</source>
+        <translation>Búsqueda por Clave</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.h" line="121"/>
         <source>Data Direct lineup</source>
         <translation>Alineación Data Direct</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/recordingrule.cpp" line="645"/>
+        <source>People Search</source>
+        <translation>Búsqueda por Persona</translation>
+=======
+        <location filename="../libs/libmythtv/recordingrule.cpp" line="748"/>
+        <source>People Search</source>
+        <translation>Búsqueda por Persona</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.h" line="264"/>
         <source>Video source name</source>
         <translation>Nombre de la fuente de vídeo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/recordingrule.cpp" line="648"/>
+        <source>Unknown Search</source>
+        <translation>Búsqueda Desconocida</translation>
+=======
+        <location filename="../libs/libmythtv/recordingrule.cpp" line="751"/>
+        <source>Unknown Search</source>
+        <translation>Búsqueda Desconocida</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.h" line="756"/>
         <source>Starting Live TV channel.</source>
         <translation>Iniciando canal de la TV en VIvo.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/recordingrule.cpp" line="482"/>
+        <source>(%1 or later) %3</source>
+        <comment>e.g. (Sunday or later) program subtitle</comment>
+        <translation>(%1 o posterior) %3</translation>
+=======
+        <location filename="../libs/libmythtv/recordingrule.cpp" line="580"/>
+        <source>(%1 or later) %3</source>
+        <comment>e.g. (Sunday or later) program subtitle</comment>
+        <translation>(%1 o posterior) %3</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="720"/>
         <source>Video device</source>
         <translation>Dispositivo de vídeo</translation>
@@ -10791,19 +19552,54 @@ La mayoría de los transportes DVB-C transmiten a 6,9 ó 6,875 millones de símb
         <location filename="../libs/libmythtv/videosource.cpp" line="821"/>
         <source>VBI device</source>
         <translation>Dispositivo VBI</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="1456"/>
+        <source>GB</source>
+        <comment>GigaBytes</comment>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../libs/libmyth/programtypes.cpp" line="316"/>
+        <source>this episode is a repeat.</source>
+        <translation>este episodio es una repetición.</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="336"/>
+        <source>this episode is a repeat.</source>
+        <translation>este episodio es una repetición.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="894"/>
         <source>Audio device</source>
         <translation>Dispositivo de sonido</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="308"/>
+        <source>another program with a higher priority will be recorded.</source>
+        <translation>se grabará otro programa con una prioridad mayor.</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="328"/>
+        <source>another program with a higher priority will be recorded.</source>
+        <translation>se grabará otro programa con una prioridad mayor.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="904"/>
         <location filename="../libs/libmythtv/videosource.cpp" line="952"/>
         <location filename="../libs/libmythtv/videosource.cpp" line="2559"/>
         <location filename="../libs/libmythtv/videosource.cpp" line="2570"/>
         <source>(None)</source>
         <translation>(Ninguno)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="312"/>
+        <source>this episode will be recorded at a later time.</source>
+        <translation>este episodio será grabado posteriormente.</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="332"/>
+        <source>this episode will be recorded at a later time.</source>
+        <translation>este episodio será grabado posteriormente.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythtv/videosource.cpp" line="983"/>
@@ -10822,14 +19618,34 @@ La mayoría de los transportes DVB-C transmiten a 6,9 ó 6,875 millones de símb
         <translation>Dispositivo de captura</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="2558"/>
         <source>Video source</source>
         <translation>Fuente de vídeo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="705"/>
+        <source>Linear blend</source>
+        <translation>Mezcla lineal</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="706"/>
+        <source>Linear blend</source>
+        <translation>Mezcla lineal</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="2581"/>
         <source>Input</source>
         <translation>Entrada</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="721"/>
+        <source>One field</source>
+        <translation>Un campo</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="722"/>
+        <source>One field</source>
+        <translation>Un campo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythtv/videosource.cpp" line="2718"/>
@@ -10847,39 +19663,109 @@ La mayoría de los transportes DVB-C transmiten a 6,9 ó 6,875 millones de símb
         <translation>Presintonizar el canal</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.h" line="755"/>
         <source>Starting channel</source>
         <translation>Canal de inicio</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1946"/>
+        <source>If enabled, use the above size for TV, otherwise use full screen.</source>
+        <translation>Si se activa, usar este tamaño para la TV, si no, usar la pantalla completa.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1840"/>
+        <source>If enabled, use the above size for TV, otherwise use full screen.</source>
+        <translation>Si se activa, usar este tamaño para la TV, si no, usar la pantalla completa.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="2892"/>
         <source>Connect source to input</source>
         <translation>Conectar fuente a la entrada</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1957"/>
+        <source>Switch X Window video modes for TV. Requires &quot;xrandr&quot; support.</source>
+        <translation>Conmutar modos de vídeo X Window para la TV. Requiere el uso de &quot;xrandr&quot;.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1851"/>
+        <source>Switch X Window video modes for TV. Requires &quot;xrandr&quot; support.</source>
+        <translation>Conmutar modos de vídeo X Window para la TV. Requiere el uso de &quot;xrandr&quot;.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/backendsettings.cpp" line="136"/>
         <source>TV format</source>
         <translation>Formato de TV</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2159"/>
+        <source>Toggles between windowed and borderless operation.</source>
+        <translation>Cambia entre el modo ventana y el modo sin borde.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2053"/>
+        <source>Toggles between windowed and borderless operation.</source>
+        <translation>Cambia entre el modo ventana y el modo sin borde.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/backendsettings.cpp" line="142"/>
         <source>The TV standard to use for viewing TV.</source>
         <translation>La norma de TV que utiliza para ver ésta.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3340"/>
+        <source>This starts the program guide immediately upon starting to watch Live TV.</source>
+        <translation>Inicia la guía de programas inmediatamente al comenzar a ver la TV en Vivo.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3204"/>
+        <source>This starts the program guide immediately upon starting to watch Live TV.</source>
+        <translation>Inicia la guía de programas inmediatamente al comenzar a ver la TV en Vivo.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/backendsettings.cpp" line="149"/>
         <source>VBI format</source>
         <translation>Formato VBI</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="812"/>
+        <source>Directed By</source>
+        <translation>Dirigida Por</translation>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="816"/>
+        <source>Directed By</source>
+        <translation>Dirigida Por</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/backendsettings.cpp" line="413"/>
         <source>Number of times the frontend will try to wake up the master backend.</source>
         <translation>Número de veces que el cliente intentará despertar al servidor principal.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3339"/>
+        <source>Show the program guide when starting Live TV</source>
+        <translation>Mostrar la guía de programas al iniciar la TV en Vivo</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3203"/>
+        <source>Show the program guide when starting Live TV</source>
+        <translation>Mostrar la guía de programas al iniciar la TV en Vivo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/backendsettings.cpp" line="509"/>
         <source>Wakeup time format</source>
         <translation>Formato de hora del arranque automático</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3496"/>
+        <source>Commercial Skip</source>
+        <translation>Salto de Anuncios</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3360"/>
+        <source>Commercial Skip</source>
+        <translation>Salto de Anuncios</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../programs/mythtv-setup/backendsettings.cpp" line="531"/>
@@ -10902,98 +19788,300 @@ La mayoría de los transportes DVB-C transmiten a 6,9 ó 6,875 millones de símb
         <translation>Configuración del Servidor - Dirección del Nodo</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/backendsettings.cpp" line="956"/>
         <source>Shutdown/Wakeup Options</source>
         <translation>Opciones de Apagado/Arranque Automático</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="364"/>
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="431"/>
+        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="294"/>
+        <source>Stereo</source>
+        <translation>Estéreo</translation>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="365"/>
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="434"/>
+        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="294"/>
+        <source>Stereo</source>
+        <translation>Estéreo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="1071"/>
         <source>Wait for SEQ start header.</source>
         <translation>Esperar la cabecera SEQ de inicio.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1324"/>
+        <source>Program ID</source>
+        <translation>ID de Programa</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1260"/>
+        <source>Program ID</source>
+        <translation>ID de Programa</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/backendsettings.cpp" line="553"/>
         <source>Block shutdown before client connected</source>
         <translation>Bloquear apagado hasta que se conecte un cliente</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/recordingrule.cpp" line="252"/>
+        <location filename="../libs/libmythtv/recordingrule.cpp" line="636"/>
+        <source>Power Search</source>
+        <translation>Búsqueda Avanzada</translation>
+=======
+        <location filename="../libs/libmythtv/recordingrule.cpp" line="342"/>
+        <location filename="../libs/libmythtv/recordingrule.cpp" line="739"/>
+        <source>Power Search</source>
+        <translation>Búsqueda Avanzada</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="1086"/>
         <source>Open DVB card on demand</source>
         <translation>Abrir tarjeta DVB bajo demanda</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3123"/>
+        <source>Scale video as necessary</source>
+        <translation>Ajustar imagen según necesidad</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2987"/>
+        <source>Scale video as necessary</source>
+        <translation>Ajustar imagen según necesidad</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="3376"/>
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="3396"/>
         <source>View Recordings</source>
         <translation>Ver Grabaciones</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3134"/>
+        <source>Frames to skip in fullscreen mode</source>
+        <translation>Fotogramas a saltar en modo pantalla completa</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2998"/>
+        <source>Frames to skip in fullscreen mode</source>
+        <translation>Fotogramas a saltar en modo pantalla completa</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythmetadata/bluraymetadata.cpp" line="103"/>
         <source>%1 of %2</source>
         <translation>%1 de %2</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3136"/>
+        <source>Video displayed in fullscreen or non-windowed mode will skip this many frames for each frame drawn. Set to 0 to show every frame. Only valid when either &quot;Use GUI size for TV playback&quot; or &quot;Run the frontend in a window&quot; is not checked.</source>
+        <translation>La imagen mostrada en pantalla completa o en modo sin ventana saltará este número de fotogramas por cada uno dibujado. Fíjelo a 0 para mostrar todos los fotogramas. Sólo es válido cuando no estén marcados &apos;Usar el tamaño de la GUI para reproducir la TV&apos; o &apos;Ejecutar el cliente en una ventana&apos;.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3000"/>
+        <source>Video displayed in fullscreen or non-windowed mode will skip this many frames for each frame drawn. Set to 0 to show every frame. Only valid when either &quot;Use GUI size for TV playback&quot; or &quot;Run the frontend in a window&quot; is not checked.</source>
+        <translation>La imagen mostrada en pantalla completa o en modo sin ventana saltará este número de fotogramas por cada uno dibujado. Fíjelo a 0 para mostrar todos los fotogramas. Sólo es válido cuando no estén marcados &apos;Usar el tamaño de la GUI para reproducir la TV&apos; o &apos;Ejecutar el cliente en una ventana&apos;.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="77"/>
         <source>All Programs</source>
         <translation>Todos los Programas</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3147"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3184"/>
+        <source>Video in main window</source>
+        <translation>Imagen en la ventana principal</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3011"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3048"/>
+        <source>Video in main window</source>
+        <translation>Imagen en la ventana principal</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/commbreakmap.cpp" line="234"/>
         <location filename="../libs/libmythtv/commbreakmap.cpp" line="359"/>
         <source>Skip %1</source>
         <translation>Saltar %1</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3160"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3215"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3270"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3310"/>
+        <source>Frames to skip</source>
+        <translation>Fotogramas a saltar</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3024"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3079"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3134"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3174"/>
+        <source>Frames to skip</source>
+        <translation>Fotogramas a saltar</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/commbreakmap.cpp" line="236"/>
         <source>Commercial: %1</source>
         <translation>Anuncio: %1</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3162"/>
+        <source>Video in the main window will skip this many frames for each frame drawn. Set to 0 to show every frame.</source>
+        <translation>La imagen en la ventana principal saltará este número de fotogramas por cada uno dibujado. Fíjelo a 0 para mostrarlos todos.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3026"/>
+        <source>Video in the main window will skip this many frames for each frame drawn. Set to 0 to show every frame.</source>
+        <translation>La imagen en la ventana principal saltará este número de fotogramas por cada uno dibujado. Fíjelo a 0 para mostrarlos todos.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/commbreakmap.cpp" line="294"/>
         <location filename="../libs/libmythtv/commbreakmap.cpp" line="338"/>
         <source>At End, cannot Skip.</source>
         <translation>En el Final. No es posible Saltar.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3171"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3226"/>
+        <source>Opacity</source>
+        <translation>Opacidad</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3035"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3090"/>
+        <source>Opacity</source>
+        <translation>Opacidad</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4910"/>
         <source>Logo Detection</source>
         <translation>Detección de Logotipo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3173"/>
+        <source>The opacity of the main window. Set to 100 for completely opaque, set to 0 for completely transparent.</source>
+        <translation>La opacidad de la ventana principal. Fíjela a 100 para dejarla completamente opaca, o a 0 para que sea completamente transparente.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3037"/>
+        <source>The opacity of the main window. Set to 100 for completely opaque, set to 0 for completely transparent.</source>
+        <translation>La opacidad de la ventana principal. Fíjela a 100 para dejarla completamente opaca, o a 0 para que sea completamente transparente.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/audioplayer.cpp" line="138"/>
         <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="598"/>
         <source>Unable to create AudioOutput.</source>
         <translation>No fue posible crear AudioOutput.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3203"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3239"/>
+        <source>Video in floating window</source>
+        <translation>Imagen en ventana flotante</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3067"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3103"/>
+        <source>Video in floating window</source>
+        <translation>Imagen en ventana flotante</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="187"/>
         <source>Earlier Showing</source>
         <translation>Emisión Anterior</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3217"/>
+        <source>Video in the floating window will skip this many frames for each frame drawn. Set to 0 to show every frame.</source>
+        <translation>La imagen en ventana flotante saltará este número de fotogramas por cada uno dibujado. Fíjelo a 0 para mostrar todos.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3081"/>
+        <source>Video in the floating window will skip this many frames for each frame drawn. Set to 0 to show every frame.</source>
+        <translation>La imagen en ventana flotante saltará este número de fotogramas por cada uno dibujado. Fíjelo a 0 para mostrar todos.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="199"/>
         <source>Later Showing</source>
         <translation>Emisión Posterior</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3228"/>
+        <source>The opacity of the floating window. Set to 100 for completely opaque, set to 0 for completely transparent.</source>
+        <translation>La opacidad de la ventana flotante. Fíjela a 100 para que sea completamente opaca, o a 0 para que sea completamente transparente.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3092"/>
+        <source>The opacity of the floating window. Set to 100 for completely opaque, set to 0 for completely transparent.</source>
+        <translation>La opacidad de la ventana flotante. Fíjela a 100 para que sea completamente opaca, o a 0 para que sea completamente transparente.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="321"/>
         <source>this episode will be recorded at an earlier time instead.</source>
         <translation>este episodio se grabará a una hora más temprana.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3258"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3283"/>
+        <source>Video in the dock</source>
+        <translation>Imagen en la bandeja</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3122"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3147"/>
+        <source>Video in the dock</source>
+        <translation>Imagen en la bandeja</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="1024"/>
         <source>30m</source>
         <translation>30m</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3272"/>
+        <source>Video in the dock icon will skip this many frames for each frame drawn. Set to 0 to show every frame.</source>
+        <translation>La imagen en la bandeja saltará este número de fotogramas por cada uno dibujado. Ajústelo a 0 para mostrarlos todos.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3136"/>
+        <source>Video in the dock icon will skip this many frames for each frame drawn. Set to 0 to show every frame.</source>
+        <translation>La imagen en la bandeja saltará este número de fotogramas por cada uno dibujado. Ajústelo a 0 para mostrarlos todos.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="1025"/>
         <source>1h</source>
         <translation>1h</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3298"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3323"/>
+        <source>Video on the desktop</source>
+        <translation>Imagen en el escritorio</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3162"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3187"/>
+        <source>Video on the desktop</source>
+        <translation>Imagen en el escritorio</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="1026"/>
         <source>1h30m</source>
         <translation>1h30m</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3312"/>
+        <source>Video on the desktop will skip this many frames for each frame drawn. Set to 0 to show every frame.</source>
+        <translation>La imagen en el escritorio saltará este número de fotogramas por cada uno dibujado. Fíjelo a 0 para mostrar todos.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3176"/>
+        <source>Video on the desktop will skip this many frames for each frame drawn. Set to 0 to show every frame.</source>
+        <translation>La imagen en el escritorio saltará este número de fotogramas por cada uno dibujado. Fíjelo a 0 para mostrar todos.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythtv/tv_play.cpp" line="1027"/>
@@ -11099,9 +20187,19 @@ Do you wish to continue watching?</source>
         <translation>porque está siendo utilizado por</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelsettings.cpp" line="319"/>
         <source>Visible</source>
         <translation>Visible</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3112"/>
+        <source>Enable gamma correction for video</source>
+        <translation>Activar corrección de gamma para la imagen</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2976"/>
+        <source>Enable gamma correction for video</source>
+        <translation>Activar corrección de gamma para la imagen</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="595"/>
@@ -11109,16 +20207,37 @@ Do you wish to continue watching?</source>
         <translation>Activar codificación DCT entrelazada</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="611"/>
         <source>Enable interlaced motion estimation</source>
         <translation>Activar estimación de movimiento entrelazado</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="32"/>
+        <source>Single Record</source>
+        <translation>Grabación Individual</translation>
+=======
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="33"/>
+        <source>Single Record</source>
+        <translation>Grabación Individual</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2972"/>
         <source>LCD device display</source>
         <translation>Dispositivo LCD</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="34"/>
+        <source>Record Daily</source>
+        <translation>Grabar Diariamente</translation>
+=======
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="35"/>
+        <source>Record Daily</source>
+        <translation>Grabar Diariamente</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="1525"/>
         <location filename="../libs/libmyth/programinfo.cpp" line="1529"/>
         <location filename="../libs/libmyth/storagegroupeditor.cpp" line="64"/>
@@ -11139,54 +20258,153 @@ Do you wish to continue watching?</source>
         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2412"/>
         <source>Default</source>
         <translation>Predeterminado</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="36"/>
+        <source>Record Weekly</source>
+        <translation>Grabar Semanalmente</translation>
+=======
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="37"/>
+        <source>Record Weekly</source>
+        <translation>Grabar Semanalmente</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="317"/>
         <source>User ID</source>
         <translation>ID de Usuario</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="38"/>
+        <source>Channel Record</source>
+        <translation>Grabación por Canal</translation>
+=======
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="39"/>
+        <source>Channel Record</source>
+        <translation>Grabación por Canal</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/dbsettings.cpp" line="145"/>
         <location filename="../libs/libmythtv/videosource.cpp" line="329"/>
         <source>Password</source>
         <translation>Contraseña</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="40"/>
+        <source>Record All</source>
+        <translation>Grabar Todos</translation>
+=======
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="41"/>
+        <source>Record All</source>
+        <translation>Grabar Todos</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="966"/>
         <source>Do not adjust volume</source>
         <translation>No ajustar el volumen</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="42"/>
+        <source>Find One</source>
+        <translation>Buscar Uno</translation>
+=======
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="43"/>
+        <source>Find One</source>
+        <translation>Buscar Uno</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="2257"/>
         <source>Capture Card Setup</source>
         <translation>Configuración de Capturadoras</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="44"/>
+        <source>Find Daily</source>
+        <translation>Buscar Diariamente</translation>
+=======
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="45"/>
+        <source>Find Daily</source>
+        <translation>Buscar Diariamente</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.h" line="131"/>
         <source>Retrieve Lineups</source>
         <translation>Descargar Alineaciones</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="46"/>
+        <source>Find Weekly</source>
+        <translation>Buscar Semanalmente</translation>
+=======
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="47"/>
+        <source>Find Weekly</source>
+        <translation>Buscar Semanalmente</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1274"/>
         <source>Menu theme</source>
         <translation>Tema del menú</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="174"/>
+        <source>Previously Recorded</source>
+        <translation>Grabado Anteriormente</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="182"/>
+        <source>Previously Recorded</source>
+        <translation>Grabado Anteriormente</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2170"/>
         <source>Channel format</source>
         <translation>Formato de canal</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="176"/>
+        <source>Currently Recorded</source>
+        <translation>Grabado Actualmente</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="184"/>
+        <source>Currently Recorded</source>
+        <translation>Grabado Actualmente</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2171"/>
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2185"/>
         <source>number</source>
         <translation>número</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="194"/>
+        <source>Inactive</source>
+        <translation>Inactivo</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="202"/>
+        <source>Inactive</source>
+        <translation>Inactivo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2172"/>
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2186"/>
         <source>number callsign</source>
         <translation>número, ID de emisora</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="319"/>
+        <source>this recording rule is inactive.</source>
+        <translation>esta regla de grabación está inactiva.</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="339"/>
+        <source>this recording rule is inactive.</source>
+        <translation>esta regla de grabación está inactiva.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2173"/>
@@ -11207,14 +20425,58 @@ Do you wish to continue watching?</source>
         <translation>Actívelo si MythTV reproduce el sonido de forma ruidosa. Afecta a los sintonizadores digitales y a los codificadores hardware. No afecta a los digitalizadores de vídeo (MPEG-4/RTJPEG). MythTV conservará datos de sonido extra en sus memorias temporales internas para evitar este fallo.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="65"/>
         <source>PIP video location</source>
         <translation>Posición del vídeo PIP</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="92"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1807"/>
+        <location filename="../programs/mythfrontend/videofilter.cpp" line="678"/>
+        <location filename="../programs/mythfrontend/videofilter.cpp" line="694"/>
+        <location filename="../programs/mythfrontend/videofilter.cpp" line="707"/>
+        <location filename="../programs/mythfrontend/videofilter.cpp" line="720"/>
+        <location filename="../programs/mythfrontend/videofilter.cpp" line="734"/>
+        <location filename="../programs/mythfrontend/videofilter.cpp" line="749"/>
+        <location filename="../programs/mythfrontend/videofilter.cpp" line="766"/>
+        <location filename="../programs/mythfrontend/videofilter.cpp" line="780"/>
+        <location filename="../programs/mythfrontend/videofilter.cpp" line="788"/>
+        <location filename="../programs/mythfrontend/videofilter.cpp" line="796"/>
+        <location filename="../programs/mythfrontend/videofilter.cpp" line="803"/>
+        <source>All</source>
+        <translation>Todos</translation>
+=======
+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="92"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1701"/>
+        <location filename="../programs/mythfrontend/videofilter.cpp" line="678"/>
+        <location filename="../programs/mythfrontend/videofilter.cpp" line="694"/>
+        <location filename="../programs/mythfrontend/videofilter.cpp" line="707"/>
+        <location filename="../programs/mythfrontend/videofilter.cpp" line="720"/>
+        <location filename="../programs/mythfrontend/videofilter.cpp" line="734"/>
+        <location filename="../programs/mythfrontend/videofilter.cpp" line="749"/>
+        <location filename="../programs/mythfrontend/videofilter.cpp" line="766"/>
+        <location filename="../programs/mythfrontend/videofilter.cpp" line="780"/>
+        <location filename="../programs/mythfrontend/videofilter.cpp" line="788"/>
+        <location filename="../programs/mythfrontend/videofilter.cpp" line="796"/>
+        <location filename="../programs/mythfrontend/videofilter.cpp" line="803"/>
+        <source>All</source>
+        <translation>Todos</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="116"/>
         <source>If enabled, always prompt the user for the initial filter to apply when entering the Watch Recordings screen.</source>
         <translation>Si se activa, preguntar siempre al usuario por el filtro inicial a aplicar cuando entre en la pantalla Ver Grabaciones.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2637"/>
+        <source>Find One, Find Weekly and Find Daily recording types will receive this additional recording priority value.</source>
+        <translation>Los tipos de grabación Buscar Uno, Buscar Semanalmente y Buscar Diariamente recibirán está prioridad adicional de grabación.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2501"/>
+        <source>Find One, Find Weekly and Find Daily recording types will receive this additional recording priority value.</source>
+        <translation>Los tipos de grabación Buscar Uno, Buscar Semanalmente y Buscar Diariamente recibirán está prioridad adicional de grabación.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="127"/>
@@ -11222,86 +20484,286 @@ Do you wish to continue watching?</source>
         <translation>Si se activa, recordar el último filtro seleccionado en lugar de mostrar el filtro predeterminado cuando entre en la pantalla de reproducción.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="138"/>
         <source>If enabled, use the name of the display filter currently applied in place of the term &quot;All Programs&quot; in the playback screen.</source>
         <translation>Si se activa, usar el nombre del filtro de imagen aplicado actualmente en lugar del término &quot;Todos los Programas&quot; en la pantalla de reproducción.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1321"/>
+        <source>Record date</source>
+        <translation>Fecha de grabación</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1257"/>
+        <source>Record date</source>
+        <translation>Fecha de grabación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="158"/>
         <source>Smart fast forwarding</source>
         <translation>Avance Rápido Inteligente</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1325"/>
+        <source>Selects how to sort a shows episodes</source>
+        <translation>Seleccione cómo ordenar los episodios de un programa</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1261"/>
+        <source>Selects how to sort a shows episodes</source>
+        <translation>Seleccione cómo ordenar los episodios de un programa</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="169"/>
         <source>Commercial detection method</source>
         <translation>Método de detección de anuncios</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="117"/>
+        <source>S</source>
+        <comment>RecTypeChar kSingleRecord</comment>
+        <translation>S</translation>
+=======
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="52"/>
+        <source>Template Recording</source>
+        <translation>Grabación de Plantilla</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="122"/>
+        <source>S</source>
+        <comment>RecTypeChar kSingleRecord</comment>
+        <translation>S</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="184"/>
         <source>Enable experimental speedup of commercial detection</source>
         <translation>Activar la aceleración experimental de la detección de anuncios</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="119"/>
+        <source>T</source>
+        <comment>RecTypeChar kTimeslotRecord</comment>
+        <translation>T</translation>
+=======
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="124"/>
+        <source>T</source>
+        <comment>RecTypeChar kTimeslotRecord</comment>
+        <translation>T</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="186"/>
         <source>If enabled, experimental commercial detection speedups will be enabled.</source>
         <translation>Si se activa, se permitirá el uso de aceleraciones experimentales en la detección de anuncios.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="121"/>
+        <source>W</source>
+        <comment>RecTypeChar kWeekslotRecord</comment>
+        <translation>W</translation>
+=======
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="126"/>
+        <source>W</source>
+        <comment>RecTypeChar kWeekslotRecord</comment>
+        <translation>W</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="194"/>
         <source>Automatically skip commercials</source>
         <translation>Saltar anuncios automáticamente</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="123"/>
+        <source>C</source>
+        <comment>RecTypeChar kChannelRecord</comment>
+        <translation>C</translation>
+=======
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="128"/>
+        <source>C</source>
+        <comment>RecTypeChar kChannelRecord</comment>
+        <translation>C</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="198"/>
         <source>Automatically skip commercial breaks that have been flagged during automatic commercial detection or by the mythcommflag program, or just notify that a commercial has been detected.</source>
         <translation>Saltar automáticamente las pausas comerciales que hayan sido marcadas durante la detección automática de anuncios o por el programa mythcommflag, o simplemente notificar que se ha detectado un anuncio.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="125"/>
+        <source>A</source>
+        <comment>RecTypeChar kAllRecord</comment>
+        <translation>A</translation>
+=======
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="130"/>
+        <source>A</source>
+        <comment>RecTypeChar kAllRecord</comment>
+        <translation>A</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="208"/>
         <source>Deferral days for auto transcode jobs</source>
         <translation>Aplazamiento en días de las tareas de transcodificación automática</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="127"/>
+        <source>F</source>
+        <comment>RecTypeChar kFindOneRecord</comment>
+        <translation>F</translation>
+=======
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="132"/>
+        <source>F</source>
+        <comment>RecTypeChar kFindOneRecord</comment>
+        <translation>F</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="209"/>
         <source>If non-zero, automatic transcode jobs will be scheduled to run this many days after a recording completes instead of immediately afterwards.</source>
         <translation>Si no es cero, se programarán trabajos de transcodificación automática para que se ejecuten el número de días especificados después de conmpletar una grabación en lugar de inmediatamente después.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="129"/>
+        <source>d</source>
+        <comment>RecTypeChar kFindDailyRecord</comment>
+        <translation>d</translation>
+=======
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="134"/>
+        <source>d</source>
+        <comment>RecTypeChar kFindDailyRecord</comment>
+        <translation>d</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="219"/>
         <source>Strict commercial detection</source>
         <translation>Detección estricta de anuncios</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="131"/>
+        <source>w</source>
+        <comment>RecTypeChar kFindWeeklyRecord</comment>
+        <translation>w</translation>
+=======
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="136"/>
+        <source>w</source>
+        <comment>RecTypeChar kFindWeeklyRecord</comment>
+        <translation>w</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="221"/>
         <source>Enable stricter commercial detection code. Disable if some commercials are not being detected.</source>
         <translation>Activar un código de detección de anuncios más estricto. Desactivarlo si no se detectan algunos anuncios.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="134"/>
+        <source>O</source>
+        <comment>RecTypeChar kOverrideRecord/kDontRecord</comment>
+        <translation>O</translation>
+=======
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="139"/>
+        <source>O</source>
+        <comment>RecTypeChar kOverrideRecord/kDontRecord</comment>
+        <translation>O</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="229"/>
         <source>Commercial skip automatic rewind amount (secs)</source>
         <translation>Rebobinado automático (en segundos)  del salto de anuncios</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="80"/>
+        <source>R</source>
+        <comment>RecStatusChar rsRecorded</comment>
+        <translation>R</translation>
+=======
+        <location filename="../libs/libmyth/recordingtypes.cpp" line="142"/>
+        <source>t</source>
+        <comment>RecTypeChar kTemplateRecord</comment>
+        <translation>t</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmyth/programtypes.cpp" line="82"/>
+        <source>R</source>
+        <comment>RecStatusChar rsRecorded</comment>
+        <translation>R</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="230"/>
         <source>MythTV will automatically rewind this many seconds after performing a commercial skip.</source>
         <translation>MythTV rebobinará automáticamente este número de segundos tras ejecutar un salto de anuncios.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="92"/>
+        <source>X</source>
+        <comment>RecStatusChar rsDontRecord</comment>
+        <translation>X</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="94"/>
+        <source>X</source>
+        <comment>RecStatusChar rsDontRecord</comment>
+        <translation>X</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="239"/>
         <source>Commercial skip notify amount (secs)</source>
         <translation>Notificación (en segundos) de salto de anuncios</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="95"/>
+        <source>P</source>
+        <comment>RecStatusChar rsPreviousRecording</comment>
+        <translation>P</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="97"/>
+        <source>P</source>
+        <comment>RecStatusChar rsPreviousRecording</comment>
+        <translation>P</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="240"/>
         <source>MythTV will act like a commercial begins this many seconds early. This can be useful when commercial notification is used in place of automatic skipping.</source>
         <translation>MythTV actuará como si un anuncio empezara con estos segundos de antelación. Puede ser útil si se utiliza la notificación de anuncios en lugar del salto automático.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="98"/>
+        <source>R</source>
+        <comment>RecStatusChar rsCurrentRecording</comment>
+        <translation>R</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="100"/>
+        <source>R</source>
+        <comment>RecStatusChar rsCurrentRecording</comment>
+        <translation>R</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="251"/>
         <source>Maximum commercial skip (secs)</source>
         <translation>Salto máximo de anuncios (en segundos)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="122"/>
+        <source>r</source>
+        <comment>RecStatusChar rsRepeat</comment>
+        <translation>r</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="124"/>
+        <source>r</source>
+        <comment>RecStatusChar rsRepeat</comment>
+        <translation>r</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="252"/>
         <source>MythTV will discourage long manual commercial skips. Skips which are longer than this will require the user to hit the SKIP key twice. Automatic commercial skipping is not affected by this limit.</source>
         <translation>MythTV desaconseja los saltos largos de anuncios ejecutados manualmente. Los saltos mayores que esta cantidad requieren que el usuario pulse dos veces la tecla SKIP. Este límite no afecta al salto automático de anuncios.</translation>
@@ -11310,13 +20772,43 @@ Do you wish to continue watching?</source>
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="263"/>
         <source>Merge short commercial breaks (secs)</source>
         <translation>Unir las pausas comerciales cortas (en segundos)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="101"/>
+        <source>E</source>
+        <comment>RecStatusChar rsEarlierShowing</comment>
+        <translation>E</translation>
     </message>
     <message>
+        <location filename="../libs/libmyth/programtypes.cpp" line="86"/>
+        <source>t</source>
+        <comment>RecStatusChar rsTuning</comment>
+        <translation>t</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="103"/>
+        <source>E</source>
+        <comment>RecStatusChar rsEarlierShowing</comment>
+        <translation>E</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
+    </message>
+    <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="275"/>
         <source>Extra disk space (GB)</source>
         <translation>Espacio extra de disco (GB)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="104"/>
+        <source>T</source>
+        <comment>RecStatusChar rsTooManyRecordings</comment>
+        <translation>T</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="106"/>
+        <source>T</source>
+        <comment>RecStatusChar rsTooManyRecordings</comment>
+        <translation>T</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="276"/>
         <source>Extra disk space (in gigabytes) beyond what MythTV requires that you want to keep free on the recording file systems.</source>
         <translation>Espacio extra de disco (en gigabytes) que desee mantener libre en los sistemas de archivos de grabación aparte del que necesite MythTV.</translation>
@@ -11325,26 +20817,91 @@ Do you wish to continue watching?</source>
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="287"/>
         <source>Auto-Expire instead of delete recording</source>
         <translation>Auto-Expirar en vez de eliminar grabación</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="113"/>
+        <source>m</source>
+        <comment>RecStatusChar rsMissedFuture</comment>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmyth/programtypes.cpp" line="116"/>
+        <source>C</source>
+        <comment>RecStatusChar rsConflict</comment>
+        <translation>C</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="118"/>
+        <source>C</source>
+        <comment>RecStatusChar rsConflict</comment>
+        <translation>C</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="289"/>
         <source>If enabled, move deleted recordings to the &apos;Deleted&apos; recgroup and turn on autoexpire instead of deleting immediately.</source>
         <translation>Si se activa, mueve las grabaciones eliminadas al grupo de grabación &apos;Eliminadas&apos; y activa la autoexpiración en vez de eliminarlas inmediatamente.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="119"/>
+        <source>L</source>
+        <comment>RecStatusChar rsLaterShowing</comment>
+        <translation>L</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="121"/>
+        <source>L</source>
+        <comment>RecStatusChar rsLaterShowing</comment>
+        <translation>L</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="338"/>
         <source>Auto-Expire method</source>
         <translation>Método de Auto-Expiración</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="128"/>
+        <source>K</source>
+        <comment>RecStatusChar rsLowDiskSpace</comment>
+        <translation>K</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="130"/>
+        <source>K</source>
+        <comment>RecStatusChar rsLowDiskSpace</comment>
+        <translation>K</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="339"/>
         <source>Oldest show first</source>
         <translation>Primero el programa más antiguo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="131"/>
+        <source>B</source>
+        <comment>RecStatusChar rsTunerBusy</comment>
+        <translation>B</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="133"/>
+        <source>B</source>
+        <comment>RecStatusChar rsTunerBusy</comment>
+        <translation>B</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="340"/>
         <source>Lowest priority first</source>
         <translation>Primero la de menor prioridad</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="125"/>
+        <source>x</source>
+        <comment>RecStatusChar rsInactive</comment>
+        <translation>x</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="127"/>
+        <source>x</source>
+        <comment>RecStatusChar rsInactive</comment>
+        <translation>x</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="341"/>
@@ -11407,29 +20964,79 @@ Do you wish to continue watching?</source>
         <translation>Si se activa, los programas que hayan sido marcados como vistos y hayan Auto-Expirado serán regrabados si vuelven a exhibirse.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="412"/>
         <source>Time to record before start of show (secs)</source>
         <translation>Tiempo de grabación antes de comenzar el programa (segundos)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2773"/>
+        <source>Enable realtime priority threads</source>
+        <translation>Activar hilos de prioridad en tiempo real</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2637"/>
+        <source>Enable realtime priority threads</source>
+        <translation>Activar hilos de prioridad en tiempo real</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="425"/>
         <source>Time to record past end of show (secs)</source>
         <translation>Tiempo de grabación tras finalizar el programa (segundos)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2774"/>
+        <source>When running mythfrontend with root privileges, some threads can be given enhanced priority. Disable this if mythfrontend freezes during video playback.</source>
+        <translation>Al ejecutar mythfrontend con privilegios de root, algunos hilos pueden recibir mayor prioridad. Desactívelo si mythfrontend se cuelga durante la reproducción.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2638"/>
+        <source>When running mythfrontend with root privileges, some threads can be given enhanced priority. Disable this if mythfrontend freezes during video playback.</source>
+        <translation>Al ejecutar mythfrontend con privilegios de root, algunos hilos pueden recibir mayor prioridad. Desactívelo si mythfrontend se cuelga durante la reproducción.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="463"/>
         <source>Record past end of show (mins)</source>
         <translation>Grabar pasado el final del programa (min.)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3054"/>
+        <source>Enable LCD device</source>
+        <translation>Activar dispositivo LCD</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2918"/>
+        <source>Enable LCD device</source>
+        <translation>Activar dispositivo LCD</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="465"/>
         <source>For the specified category, an attempt will be made to extend the recording by the specified number of minutes. It is ignored when two shows have been scheduled without enough time in-between.</source>
         <translation>Para la categoría especificada, se intentará extender el tiempo de grabación el número indicado de minutos. Será ignorado al grabar dos programas sin haber suficiente tiempo entre ambos.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="506"/>
+        <source>This global setting allows the recorder to start before the scheduled start time. It does not affect the scheduler. It is ignored when two shows have been scheduled without enough time in between.</source>
+        <translation>Este ajuste global permite al grabador iniciarse antes de la hora programada. No afecta al programador. No tiene efecto si entre dos programas no hay suficiente tiempo de separación.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="434"/>
+        <source>This global setting allows the recorder to start before the scheduled start time. It does not affect the scheduler. It is ignored when two shows have been scheduled without enough time in between.</source>
+        <translation>Este ajuste global permite al grabador iniciarse antes de la hora programada. No afecta al programador. No tiene efecto si entre dos programas no hay suficiente tiempo de separación.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="569"/>
         <source>Example custom filter list: &apos;ivtc,denoise3d&apos;</source>
         <translation>Ejemplo de lista personalizada de filtros: &apos;ivtc,denoise3d&apos;</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="519"/>
+        <source>This global setting allows the recorder to record beyond the scheduled end time. It does not affect the scheduler. It is ignored when two shows have been scheduled without enough time in between.</source>
+        <translation>Este ajuste global permite al grabador actuar más allá de la hora de finalización programada. No afecta al programador. No tiene efecto si entre dos programas no hay suficiente tiempo de separación.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="447"/>
+        <source>This global setting allows the recorder to record beyond the scheduled end time. It does not affect the scheduler. It is ignored when two shows have been scheduled without enough time in between.</source>
+        <translation>Este ajuste global permite al grabador actuar más allá de la hora de finalización programada. No afecta al programador. No tiene efecto si entre dos programas no hay suficiente tiempo de separación.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1166"/>
@@ -11489,99 +21096,297 @@ reproducción no puede dejarse vacío.</translation>
         <translation>Usar siempre el modo exploración en la TV en Vivo</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1401"/>
         <source>If enabled, browse mode will automatically be activated whenever you use channel up/down while watching Live TV.</source>
         <translation>Si se activa, se usará automáticamente el modo exploración al recorrer los canales en la TV en Vivo.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1810"/>
+        <source>Run on the specified screen or spanning all screens.</source>
+        <translation>Ejecutar en la pantalla especificada o abarcar todas.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1704"/>
+        <source>Run on the specified screen or spanning all screens.</source>
+        <translation>Ejecutar en la pantalla especificada o abarcar todas.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1425"/>
         <source>If enabled, automatically clear the bookmark on a recording when the recording is played back. If disabled, you can mark the beginning with rewind then save position.</source>
         <translation>Si se activa, elimina automáticamente el marcador de una grabación al volver a reproducir ésta. Si se desactiva, puede marcar el comienzo rebobinando y guardando luego la posición.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1966"/>
+        <source>In X</source>
+        <translation>En X</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1860"/>
+        <source>In X</source>
+        <translation>En X</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1437"/>
         <source>During playback the SELECT key (Enter or Space) will alternate between &quot;Bookmark Saved&quot; and &quot;Bookmark Cleared&quot;. If disabled, the SELECT key will save the current position for each keypress.</source>
         <translation>Durante la reproducción, la tecla SELECT (Intro o Espacio) alternará entre &quot;Marcador Situado&quot; y &quot;Marcador Eliminado&quot;. Si se desactiva, la tecla SELECT guardará la posición actual en cada pulsación.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1969"/>
+        <source>Horizontal resolution of video which needs a special output resolution.</source>
+        <translation>Resolución horizontal de la imagen que necesita una resolución de salida especial.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1863"/>
+        <source>Horizontal resolution of video which needs a special output resolution.</source>
+        <translation>Resolución horizontal de la imagen que necesita una resolución de salida especial.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1454"/>
         <source>If set to prompt, a menu will be displayed when you exit playback mode. The options available will allow you to save your position, delete the recording, or continue watching.</source>
         <translation>Si se activa preguntar, se mostrará un menú al salir del modo reproducción. Las opciones disponibles le permitirán guardar su posición, eliminar la grabación o continuar el visionado.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1978"/>
+        <source>In Y</source>
+        <translation>En Y</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1872"/>
+        <source>In Y</source>
+        <translation>En Y</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1466"/>
         <source>If enabled, a menu will be displayed allowing you to delete the recording when it has finished playing.</source>
         <translation>Si se activa, se mostrará un menú que le permitirá eliminar la grabación al finalizar su reproducción.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1981"/>
+        <source>Vertical resolution of video which needs a special output resolution.</source>
+        <translation>Resolución vertical de la imagen que necesita una resolución de salida especial.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1875"/>
+        <source>Vertical resolution of video which needs a special output resolution.</source>
+        <translation>Resolución vertical de la imagen que necesita una resolución de salida especial.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1475"/>
         <source>Jump to program OSD</source>
         <translation>Saltar a la OSD del programa</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1989"/>
+        <source>GUI</source>
+        <translation>GUI</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1883"/>
+        <source>GUI</source>
+        <translation>GUI</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1477"/>
         <source>Set the choice between viewing the current recording group in the OSD, or showing the &apos;Watch Recording&apos; screen when &apos;Jump to Program&apos; is activated. If enabled, the recordings are shown in the OSD</source>
         <translation>Elegir entre ver el grupo de grabación actual en la OSD, o mostrar la pantalla &apos;Ver Grabación&apos; al activar &apos;Saltar al Programa&apos;. Si se activa, las grabaciones se mostrarán en la OSD</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1991"/>
+        <source>Resolution of screen when not watching a video.</source>
+        <translation>Resolución de la pantalla cuando no se esté visionando un vídeo.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1885"/>
+        <source>Resolution of screen when not watching a video.</source>
+        <translation>Resolución de la pantalla cuando no se esté visionando un vídeo.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1489"/>
         <source>Continue playback when embedded</source>
         <translation>Continuar la reproducción al incrustar</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2021"/>
+        <source>Default screen resolution when watching a video.</source>
+        <translation>Resolución de pantalla predeterminada al visionar un vídeo.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1915"/>
+        <source>Default screen resolution when watching a video.</source>
+        <translation>Resolución de pantalla predeterminada al visionar un vídeo.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1491"/>
         <source>If enabled, TV playback continues when the TV window is embedded in the upcoming program list or recorded list. The default is to pause the recorded show when embedded.</source>
         <translation>Si se activa, la reproducción de la TV continuará cuando la ventana se incruste en la lista de programas o en la lista de grabados. Por defecto, el programa grabado se pondrá en pausa al incrustar.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2023"/>
+        <source>Screen resolution when watching a video at a specific resolution.</source>
+        <translation>Resolución de pantalla al ver un vídeo con una resolución específica.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1917"/>
+        <source>Screen resolution when watching a video at a specific resolution.</source>
+        <translation>Resolución de pantalla al ver un vídeo con una resolución específica.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1504"/>
         <source>If enabled, when you exit near the end of a recording it will be marked as watched. The automatic detection is not foolproof, so do not enable this setting if you don&apos;t want an unwatched recording marked as watched.</source>
         <translation>Si se activa, al salir cerca del final de una grabación, ésta se marcará como vista. La detección automática no es infalible, así que no active esto si no desea que una grabación no vista sea marcada como vista.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2030"/>
+        <source>Output</source>
+        <translation>Salida</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1924"/>
+        <source>Output</source>
+        <translation>Salida</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1515"/>
         <source>Live TV idle timeout (mins)</source>
         <translation>Tiempo muerto de la TV en Vivo (minutos)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2057"/>
+        <source>Rate</source>
+        <translation>Tasa</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1951"/>
+        <source>Rate</source>
+        <translation>Tasa</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1517"/>
         <source>Exit Live TV automatically if left idle for the specified number of minutes. 0 disables the timeout.</source>
         <translation>Salir automáticamente de la TV en Vivo si ésta no se ha usado durante el tiempo especificado en minutos. 0 desactiva la opción.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2069"/>
+        <source>Aspect ratio when watching a video.</source>
+        <translation>Relación de aspecto al ver un vídeo.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1963"/>
+        <source>Aspect ratio when watching a video.</source>
+        <translation>Relación de aspecto al ver un vídeo.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1554"/>
         <source>If enabled, you can use a virtual keyboard in MythTV&apos;s line edit boxes. To use, hit SELECT (Enter or Space) while a line edit is in focus.</source>
         <translation>Si se activa, podrá usar un teclado virtual en las cajas de edición de MythTV. Para usarlo, pulse SELECT (Intro o Espacio) mientras el foco esté sobre una caja de edición.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2076"/>
+        <source>Aspect</source>
+        <translation>Aspecto</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1970"/>
+        <source>Aspect</source>
+        <translation>Aspecto</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1563"/>
         <source>Idle time before entering standby mode (minutes)</source>
         <translation>Tiempo de desocupación antes de entrar en modo de espera (minutos)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/signalmonitor.cpp" line="197"/>
+        <location filename="../libs/libmythtv/signalmonitorvalue.cpp" line="28"/>
+        <source>Signal Lock</source>
+        <translation>Sintonización de Señal</translation>
+=======
+        <location filename="../libs/libmythtv/signalmonitor.cpp" line="199"/>
+        <location filename="../libs/libmythtv/signalmonitorvalue.cpp" line="28"/>
+        <source>Signal Lock</source>
+        <translation>Sintonización de Señal</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1565"/>
         <source>Number of minutes to wait when the frontend is idle before entering standby mode. Standby mode allows the backend to power down if configured to do so. Any remote or mouse input will cause the countdown to start again and/or exit idle mode. Video playback suspends the countdown. A value of zero prevents the frontend automatically entering standby.</source>
         <translation>Minutos a esperar cuando el cliente esté desocupado antes de entrar en el modo de espera. Éste permite al servidor apagar la máquina si está configurado para ello. Cualquier entrada de control remoto o ratón reiniciará la cuenta atrás y/o hará que se salga del modo desocupado. La reproducción de vídeos suspenderá la cuenta atrás. El valor cero impide que el cliente entre automáticamente en espera.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/signalmonitor.cpp" line="199"/>
+        <source>Signal Power</source>
+        <translation>Potencia de Señal</translation>
+=======
+        <location filename="../libs/libmythtv/signalmonitor.cpp" line="201"/>
+        <source>Signal Power</source>
+        <translation>Potencia de Señal</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1579"/>
         <source>Customize exit menu options</source>
         <translation>Personalizar opciones del menú de salida</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/signalmonitor.cpp" line="201"/>
+        <source>Script Status</source>
+        <translation>Estado del Guión</translation>
+=======
+        <location filename="../libs/libmythtv/signalmonitor.cpp" line="203"/>
+        <source>Script Status</source>
+        <translation>Estado del Guión</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
+<<<<<<< HEAD
     <message>
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1598"/>
         <source>Optional. Script to run if you select the reboot option from the exit menu, if the option is displayed. You must configure an exit key to display the exit menu.</source>
         <translation>Opcional, Guión a ejecutar si selecciona la opción de reinicio en el menú de salida, si aparece dicha opción. Debe configurar una tecla que muestre el menú de salida.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+    <message>
+        <location filename="../libs/libmyth/programtypes.cpp" line="107"/>
+        <source>c</source>
+        <comment>RecStatusChar rsCancelled</comment>
+        <translation>c</translation>
+=======
+    <message>
+        <location filename="../libs/libmyth/programtypes.cpp" line="109"/>
+        <source>c</source>
+        <comment>RecStatusChar rsCancelled</comment>
+        <translation>c</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1610"/>
         <source>Optional. Script to run if you select the shutdown option from the exit menu, if the option is displayed. You must configure an exit key to display the exit menu.</source>
         <translation>Opcional, Guión a ejecutar si selecciona la opción de apagado en el menú de salida, si aparece dicha opción. Debe configurar una tecla que muestre el menú de salida.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="137"/>
+        <source>N</source>
+        <comment>RecStatusChar rsNotListed</comment>
+        <translation>N</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="139"/>
+        <source>N</source>
+        <comment>RecStatusChar rsNotListed</comment>
+        <translation>N</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1620"/>
         <source>LIRC daemon socket</source>
         <translation>Conector del demonio LIRC</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="202"/>
+        <source>Not Listed</source>
+        <translation>No Listado</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="210"/>
+        <source>Not Listed</source>
+        <translation>No Listado</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1637"/>
@@ -11699,6 +21504,7 @@ reproducción no puede dejarse vacío.</translation>
         <translation>Su formato de hora preferido. Debe elegir un formato con &quot;AM&quot; o &quot;PM&quot;, si no, se mostrará la hora en formato 24 horas o &quot;militar&quot;.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2151"/>
         <source>Paint engine</source>
         <translation>Motor de trazado</translation>
@@ -11707,109 +21513,325 @@ reproducción no puede dejarse vacío.</translation>
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2152"/>
         <source>Qt</source>
         <translation>Qt</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="252"/>
+        <source>This is the default value used for the transcoder setting when a new scheduled recording is created.</source>
+        <translation>Valor predeterminado a usar para la configuración del transcodificador al programar una nueva grabación.</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="368"/>
+        <source>Time to retain deleted recordings (days)</source>
+        <translation>Tiempo de retención de grabaciones eliminados (días)</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="307"/>
+        <source>Time to retain deleted recordings (days)</source>
+        <translation>Tiempo de retención de grabaciones eliminados (días)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2155"/>
         <source>OpenGL</source>
         <translation>OpenGL</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="369"/>
+        <source>Determines the maximum number of days before undeleting a recording will become impossible. A value of zero means the recording will be permanently deleted between 5 and 20 minutes later. A value of minus one means recordings will be retained until space is required. A recording will always be removed before this time if the space is needed for a new recording.</source>
+        <translation>Determina el número máximo de días antes de que la recuperación de una grabación eliminada sea irreversible. Un valor de cero significa que la grabación será eliminada de forma permanente entre 5 y 20 minutos después. Un valor de menos uno significa que las grabaciones se conservarán hasta que se necesite espacio. Las grabaciones se eliminarán antes de ese tiempo si se necesita espacio para una nueva.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="308"/>
+        <source>Determines the maximum number of days before undeleting a recording will become impossible. A value of zero means the recording will be permanently deleted between 5 and 20 minutes later. A value of minus one means recordings will be retained until space is required. A recording will always be removed before this time if the space is needed for a new recording.</source>
+        <translation>Determina el número máximo de días antes de que la recuperación de una grabación eliminada sea irreversible. Un valor de cero significa que la grabación será eliminada de forma permanente entre 5 y 20 minutos después. Un valor de menos uno significa que las grabaciones se conservarán hasta que se necesite espacio. Las grabaciones se eliminarán antes de ese tiempo si se necesita espacio para una nueva.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2158"/>
         <source>Direct3D</source>
         <translation>Direct3D</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="529"/>
+        <source>Category of shows to be extended</source>
+        <translation>Categoría de programas a extender</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="457"/>
+        <source>Category of shows to be extended</source>
+        <translation>Categoría de programas a extender</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2160"/>
         <source>This selects what MythTV uses to draw. Choosing &apos;Auto&apos; is recommended, unless running on systems with broken OpenGL implementations (broken hardware or drivers or windowing systems) where only Qt works.</source>
         <translation>Selecciona lo que MythTV utilizará para trazar los gráficos. Se recomienda elegir &apos;Auto&apos;, a menos que se ejecute en sistemas con una implementación defectuosa de OpenGL (hardware, controladores o sistemas de ventanas defectuosos) en los que sólo funcione Qt.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="569"/>
+        <source>Category record over-time</source>
+        <translation>Categoría grabación prorrogada</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="497"/>
+        <source>Category record over-time</source>
+        <translation>Categoría grabación prorrogada</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2175"/>
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2189"/>
         <source>name</source>
         <translation>nombre</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1332"/>
+        <source>Fast forward/rewind reposition amount</source>
+        <translation>Cantidad de reposición para el avance rápido/rebobinado</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1268"/>
+        <source>Fast forward/rewind reposition amount</source>
+        <translation>Cantidad de reposición para el avance rápido/rebobinado</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2176"/>
         <source>Your preferred channel format.</source>
         <translation>Su formato de canal preferido.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1334"/>
+        <source>When exiting sticky keys fast forward/rewind mode, reposition this many 1/100th seconds before resuming normal playback. This compensates for the reaction time between seeing where to resume playback and actually exiting seeking.</source>
+        <translation>Al salir del modo teclas pegajosas en el avance rápido/rebobinado, reposicionar estas centésimas de segundo antes de volver a la reproducción normal. Esto compensa el tiempo de reacción entre ver dónde continuar la reproducción y salir efectivamente de la búsqueda.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1270"/>
+        <source>When exiting sticky keys fast forward/rewind mode, reposition this many 1/100th seconds before resuming normal playback. This compensates for the reaction time between seeing where to resume playback and actually exiting seeking.</source>
+        <translation>Al salir del modo teclas pegajosas en el avance rápido/rebobinado, reposicionar estas centésimas de segundo antes de volver a la reproducción normal. Esto compensa el tiempo de reacción entre ver dónde continuar la reproducción y salir efectivamente de la búsqueda.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2591"/>
         <source>MythTV will listen for connections from the &quot;mythutil&quot; program on this port.</source>
         <translation>MythTV atenderá conexiones del programa &quot;mythutil&quot; en este puerto.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2928"/>
+        <source>Display current time on idle LCD display. </source>
+        <translation>Muestra la hora actual en pantalla LCD desocupada. </translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2792"/>
+        <source>Display current time on idle LCD display. </source>
+        <translation>Muestra la hora actual en pantalla LCD desocupada. </translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="3577"/>
         <source>Screen Settings</source>
         <translation>Configuración de Pantalla</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2947"/>
+        <source>Display selected menu on LCD display. </source>
+        <translation>Muestra el menú seleccionado en la pantalla LCD. </translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2811"/>
+        <source>Display selected menu on LCD display. </source>
+        <translation>Muestra el menú seleccionado en la pantalla LCD. </translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2190"/>
         <source>Your preferred long channel format.</source>
         <translation>Su formato largo de canal preferido.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2975"/>
+        <source>Items</source>
+        <translation>Elementos</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2839"/>
+        <source>Items</source>
+        <translation>Elementos</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelsettings.cpp" line="213"/>
         <source>Filters to be used when recording from this channel.  Not used with hardware encoding cards.</source>
         <translation>Filtros a usar cuando se grabe de este canal. No se usa con tarjetas con codificación por hardware.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2976"/>
+        <source>Artist - Title</source>
+        <translation>Artista - Título</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2840"/>
+        <source>Artist - Title</source>
+        <translation>Artista - Título</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelsettings.cpp" line="227"/>
         <source>Playback filters</source>
         <translation>Filtros de reproducción</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2977"/>
+        <source>Artist [Album] Title</source>
+        <translation>Artista [Álbum] Título</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2841"/>
+        <source>Artist [Album] Title</source>
+        <translation>Artista [Álbum] Título</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelsettings.cpp" line="228"/>
         <source>Filters to be used when recordings from this channel are viewed.  Start with a plus to append to the global playback filters.</source>
         <translation>Filtros a usar cuando las grabaciones de este canal sean vistas. Comience con un + para añadirlos a los filtros de reproducción globales.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2978"/>
+        <source>Which items to show when playing music.</source>
+        <translation>Qué elementos mostrar al reproducir música.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2842"/>
+        <source>Which items to show when playing music.</source>
+        <translation>Qué elementos mostrar al reproducir música.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/recordingtypes.cpp" line="50"/>
         <source>Override Recording</source>
         <translation>Ignorar Grabación</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3055"/>
+        <source>Use an LCD display to view MythTV status information.</source>
+        <translation>Usar una pantalla LCD para mostrar la información de estado de MythTV.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2919"/>
+        <source>Use an LCD display to view MythTV status information.</source>
+        <translation>Usar una pantalla LCD para mostrar la información de estado de MythTV.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="181"/>
         <source>Don&apos;t Record</source>
         <translation>No Grabar</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3560"/>
+        <source>General (Basic)</source>
+        <translation>General (Básico)</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3421"/>
+        <source>General (Basic)</source>
+        <translation>General (Básico)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1811"/>
         <source>Separate video modes for GUI and TV playback</source>
         <translation>Modos de vídeo separados para la GUI y la TV</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3596"/>
+        <source>General (Jobs)</source>
+        <translation>General (Tareas)</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3456"/>
+        <source>General (Jobs)</source>
+        <translation>General (Tareas)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1952"/>
         <source>Video Mode Settings</source>
         <translation>Configuración de Modos de Vídeo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3627"/>
+        <source>General (Advanced)</source>
+        <translation>General (Avanzado)</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3465"/>
+        <source>General (Advanced)</source>
+        <translation>General (Avanzado)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4885"/>
         <source>Commercial Free</source>
         <translation>Sin Anuncios</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="1503"/>
+        <source>Re-Record</source>
+        <translation>Regrabar</translation>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="1505"/>
+        <source>Re-Record</source>
+        <translation>Regrabar</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/backendsettings.cpp" line="563"/>
         <source>Startup command</source>
         <translation>Orden de Inicio</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="140"/>
+        <source>V</source>
+        <comment>RecStatusChar rsNeverRecord</comment>
+        <translation>n</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="142"/>
+        <source>V</source>
+        <comment>RecStatusChar rsNeverRecord</comment>
+        <translation>n</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/backendsettings.cpp" line="565"/>
         <source>This command is executed right after starting the BE. As a parameter &apos;$status&apos; is replaced by either &apos;auto&apos; if the machine was started automatically or &apos;user&apos; if a user switched it on.</source>
         <translation>Esta orden se ejecuta tras iniciar el servidor. Como parámetro, &apos;$status&apos; será reemplazado por &apos;auto&apos; si la máquina fue iniciada automáticamente o &apos;user&apos; si un usuario la encendió.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="204"/>
+        <source>Never Record</source>
+        <translation>Nunca Grabar</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="212"/>
+        <source>Never Record</source>
+        <translation>Nunca Grabar</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingrule.cpp" line="319"/>
         <location filename="../libs/libmythtv/recordingrule.cpp" line="521"/>
         <location filename="../programs/mythfrontend/programrecpriority.cpp" line="131"/>
         <source>Default (Template)</source>
         <translation>Predeterminada (Plantilla)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="326"/>
+        <source>it was marked to never be recorded.</source>
+        <translation>fue marcado para no ser grabado nunca.</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="346"/>
+        <source>it was marked to never be recorded.</source>
+        <translation>fue marcado para no ser grabado nunca.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingrule.cpp" line="323"/>
         <source> (Template)</source>
         <translation> (Plantilla)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3024"/>
+        <source>Turn on the LCD heartbeat.</source>
+        <translation>Activar el parpadeo del LCD.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2888"/>
+        <source>Turn on the LCD heartbeat.</source>
+        <translation>Activar el parpadeo del LCD.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythtv/recordingrule.cpp" line="771"/>
@@ -11832,12 +21854,25 @@ reproducción no puede dejarse vacío.</translation>
         <translation>Búsqueda Desconocida</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingrule.cpp" line="594"/>
         <source>(%1 or later) %3</source>
         <comment>e.g. (Sunday or later) program subtitle</comment>
         <translation>(%1 o posterior) %3</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="77"/>
+        <source>A</source>
+        <comment>RecStatusChar rsAborted</comment>
+        <translation></translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="79"/>
+        <source>A</source>
+        <comment>RecStatusChar rsAborted</comment>
+        <translation></translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="337"/>
         <source>this episode is a repeat.</source>
         <translation>este episodio es una repetición.</translation>
@@ -11846,31 +21881,119 @@ reproducción no puede dejarse vacío.</translation>
         <location filename="../libs/libmyth/programtypes.cpp" line="329"/>
         <source>another program with a higher priority will be recorded.</source>
         <translation>se grabará otro programa con una prioridad mayor.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="110"/>
+        <source>M</source>
+        <comment>RecStatusChar rsMissed</comment>
+        <translation></translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="112"/>
+        <source>M</source>
+        <comment>RecStatusChar rsMissed</comment>
+        <translation></translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="333"/>
         <source>this episode will be recorded at a later time.</source>
         <translation>este episodio será grabado posteriormente.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="162"/>
+        <location filename="../libs/libmythtv/jobqueue.h" line="40"/>
+        <source>Aborted</source>
+        <translation>Abortado</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="170"/>
+        <location filename="../libs/libmythtv/jobqueue.h" line="40"/>
+        <source>Aborted</source>
+        <translation>Abortado</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="1657"/>
         <source>Record using the &quot;%1&quot; profile</source>
         <translation>Grabar usando el perfil &quot;%1&quot;</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="168"/>
+        <source>Tuning</source>
+        <translation>Sintonizando</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="176"/>
+        <source>Tuning</source>
+        <translation>Sintonizando</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="2738"/>
         <source>If specified, this command will be run to change the channel for inputs which have an external tuner device such as a cable box. The first argument will be the channel number.</source>
         <translation>Si se especifica, esta orden se ejecutará para cambiar el canal en entradas que posean un sintonizador externo, como un receptor de TV por cable. El primer argumento será el número de canal.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="184"/>
+        <source>Missed</source>
+        <translation>Perdido</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="192"/>
+        <source>Missed</source>
+        <translation>Perdido</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="2754"/>
         <source>Leave this blank unless you have an external tuner that is connected to the tuner input of your card. If so, you will need to specify the preset channel for the signal (normally 3 or 4).</source>
         <translation>Déjelo vacío a menos que posea un sintonizador externo conectado a la entrada de su tarjeta. Si es así, necesitará especificar el canal preconfigurado para la señal (normalmente 3 ó 4).</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="241"/>
+        <source>This showing was recorded but was aborted before recording was completed.</source>
+        <translation>Este programa estuvo grabándose pero fue abortado antes de completar la grabación.</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="218"/>
+        <source>Other Recording</source>
+        <translation>Otras Grabaciones</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmyth/programtypes.cpp" line="220"/>
+        <source>Other Tuning</source>
+        <translation>Otra Sintonización</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmyth/programtypes.cpp" line="247"/>
+        <source>The showing is being tuned.</source>
+        <translation>El programa está sintonizándose.</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmyth/programtypes.cpp" line="250"/>
+        <source>This showing is being recorded on a different channel.</source>
+        <translation>Este programa está grabándose en un canal diferente.</translation>
     </message>
     <message>
+        <location filename="../libs/libmyth/programtypes.cpp" line="254"/>
+        <source>The showing is being tuned on a different channel.</source>
+        <translation>Este programa está sintonizándose en un canal diferente.</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmyth/programtypes.cpp" line="261"/>
+        <source>This showing was recorded but was aborted before recording was completed.</source>
+        <translation>Este programa estuvo grabándose pero fue abortado antes de completar la grabación.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
+    </message>
+    <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="706"/>
         <source>Linear blend</source>
         <translation>Mezcla lineal</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="256"/>
+        <source>This showing was not recorded because it was manually cancelled.</source>
+        <translation>Este programa no se grabó porque fue manualmente cancelado.</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="276"/>
+        <source>This showing was not recorded because it was manually cancelled.</source>
+        <translation>Este programa no se grabó porque fue manualmente cancelado.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="722"/>
@@ -11878,42 +22001,112 @@ reproducción no puede dejarse vacío.</translation>
         <translation>Un campo</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/backendsettings.cpp" line="596"/>
         <source>Low</source>
         <translation>Bajo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2696"/>
+        <source>Your preferred language for the user interface.</source>
+        <translation>Su idioma preferido para la interfaz de usuario.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2560"/>
+        <source>Your preferred language for the user interface.</source>
+        <translation>Su idioma preferido para la interfaz de usuario.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/backendsettings.cpp" line="597"/>
         <source>Medium</source>
         <translation>Medio</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2937"/>
+        <source>Display current recordings information on LCD display.</source>
+        <translation>Mostrar información de las grabaciones actuales en la pantalla LCD.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2801"/>
+        <source>Display current recordings information on LCD display.</source>
+        <translation>Mostrar información de las grabaciones actuales en la pantalla LCD.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/frequencytablesetting.cpp" line="40"/>
         <location filename="../libs/libmythtv/channelscan/frequencytablesetting.cpp" line="42"/>
         <location filename="../libs/libmythtv/channelscan/frequencytablesetting.cpp" line="44"/>
         <location filename="../programs/mythtv-setup/backendsettings.cpp" line="598"/>
         <source>High</source>
         <translation>Alto</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2966"/>
+        <source>Display playing artist and song title in MythMusic on LCD display.</source>
+        <translation>Mostrar título y artista de la canción reproducida en MythMusic en la pantalla LCD.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2830"/>
+        <source>Display playing artist and song title in MythMusic on LCD display.</source>
+        <translation>Mostrar título y artista de la canción reproducida en MythMusic en la pantalla LCD.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1802"/>
         <source>If enabled, use the above size for TV, otherwise use full screen.</source>
         <translation>Si se activa, usar este tamaño para la TV, si no, usar la pantalla completa.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2986"/>
+        <source>Display tuned channel information on LCD display.</source>
+        <translation>Mostrar información del canal sintonizado en la pantalla LCD.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2850"/>
+        <source>Display tuned channel information on LCD display.</source>
+        <translation>Mostrar información del canal sintonizado en la pantalla LCD.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1813"/>
         <source>Switch X Window video modes for TV. Requires &quot;xrandr&quot; support.</source>
         <translation>Conmutar modos de vídeo X Window para la TV. Requiere el uso de &quot;xrandr&quot;.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3005"/>
+        <source>Display generic information on LCD display.</source>
+        <translation>Mostrar información genérica en la pantalla LCD.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2869"/>
+        <source>Display generic information on LCD display.</source>
+        <translation>Mostrar información genérica en la pantalla LCD.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2015"/>
         <source>Toggles between windowed and borderless operation.</source>
         <translation>Cambia entre el modo ventana y el modo sin borde.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3014"/>
+        <source>Turn on the backlight permanently on the LCD display.</source>
+        <translation>Encender permanentemente la luz de fondo de la pantalla LCD.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2878"/>
+        <source>Turn on the backlight permanently on the LCD display.</source>
+        <translation>Encender permanentemente la luz de fondo de la pantalla LCD.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="3245"/>
         <source>This starts the program guide immediately upon starting to watch Live TV.</source>
         <translation>Inicia la guía de programas inmediatamente al comenzar a ver la TV en Vivo.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3043"/>
+        <source>Enter the 6 Keypad Return Codes for your LCD keypad in the order in which you want the functions up/down/left/right/yes/no to operate. (See lcdproc/server/drivers/hd44780.c/keyMapMatrix[] or the matrix for your display)</source>
+        <translation>Introduzca los 6 Códigos de Retorno de Teclado de su teclado LCD en el orden en que desee que operen las funciones arriba/abajo/izquierda/derecha/sí/no. (Ver lcdproc/server/drivers/hd44780.c/keyMapMatrix[] o la matriz de su pantalla)</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2907"/>
+        <source>Enter the 6 Keypad Return Codes for your LCD keypad in the order in which you want the functions up/down/left/right/yes/no to operate. (See lcdproc/server/drivers/hd44780.c/keyMapMatrix[] or the matrix for your display)</source>
+        <translation>Introduzca los 6 Códigos de Retorno de Teclado de su teclado LCD en el orden en que desee que operen las funciones arriba/abajo/izquierda/derecha/sí/no. (Ver lcdproc/server/drivers/hd44780.c/keyMapMatrix[] o la matriz de su pantalla)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmyth/programinfo.cpp" line="815"/>
@@ -11931,19 +22124,53 @@ reproducción no puede dejarse vacío.</translation>
         <translation>Salto de Anuncios</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/backendsettings.cpp" line="575"/>
         <source>Maximum simultaneous jobs on this backend</source>
         <translation>Máximo nº de tareas simultáneas en este servidor</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videoouttypes.h" line="205"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1820"/>
+        <source>4:3</source>
+        <translation>4:3</translation>
+=======
+        <location filename="../libs/libmythtv/videoouttypes.h" line="205"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1714"/>
+        <source>4:3</source>
+        <translation>4:3</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/backendsettings.cpp" line="576"/>
         <source>The Job Queue will be limited to running this many simultaneous jobs on this backend.</source>
         <translation>La Cola de Tareas se limitará a ejecutar esta cantidad de tareas simultáneas en este servidor.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videoouttypes.h" line="207"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1821"/>
+        <source>16:9</source>
+        <translation>16:9</translation>
+=======
+        <location filename="../libs/libmythtv/videoouttypes.h" line="207"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1715"/>
+        <source>16:9</source>
+        <translation>16:9</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/backendsettings.cpp" line="668"/>
         <source>The command to run whenever this User Job number is scheduled.</source>
         <translation>Orden a ejecutar cuando se programe este número de Tarea de Usuario.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1822"/>
+        <source>16:10</source>
+        <translation>16:10</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1716"/>
+        <source>16:10</source>
+        <translation>16:10</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../programs/mythtv-setup/backendsettings.cpp" line="1019"/>
@@ -11951,16 +22178,46 @@ reproducción no puede dejarse vacío.</translation>
         <translation>Cola de Tareas (global)</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="365"/>
         <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="434"/>
         <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="295"/>
         <source>Stereo</source>
         <translation>Estéreo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2995"/>
+        <source>Display volume level information on LCD display.</source>
+        <translation>Mostrar información de volumen en la pantalla LCD.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2859"/>
+        <source>Display volume level information on LCD display.</source>
+        <translation>Mostrar información de volumen en la pantalla LCD.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1240"/>
         <source>Program ID</source>
         <translation>ID de Programa</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="2740"/>
+        <location filename="../libs/libmythtv/deletemap.cpp" line="102"/>
+        <location filename="../libs/libmythtv/deletemap.cpp" line="471"/>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="3935"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="959"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1201"/>
+        <source>Delete</source>
+        <translation>Eliminar</translation>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="2739"/>
+        <location filename="../libs/libmythtv/deletemap.cpp" line="102"/>
+        <location filename="../libs/libmythtv/deletemap.cpp" line="490"/>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="3910"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="887"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1137"/>
+        <source>Delete</source>
+        <translation>Eliminar</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythtv/recordingrule.cpp" line="347"/>
@@ -12014,10 +22271,20 @@ reproducción no puede dejarse vacío.</translation>
         <translation>La opacidad de la ventana principal. Fíjela a 100 para dejarla completamente opaca, o a 0 para que sea completamente transparente.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="3108"/>
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="3144"/>
         <source>Video in floating window</source>
         <translation>Imagen en ventana flotante</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="668"/>
+        <source>Standard will use ffmpeg library.</source>
+        <translation>Estándar usará la biblioteca ffmpeg.</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="669"/>
+        <source>Standard will use ffmpeg library.</source>
+        <translation>Estándar usará la biblioteca ffmpeg.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="3122"/>
@@ -12104,9 +22371,19 @@ reproducción no puede dejarse vacío.</translation>
         <translation>Identificador personalizado</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/dbsettings.cpp" line="183"/>
         <source>An identifier to use while saving the settings for this frontend.</source>
         <translation>Identificador a usar cuando se guarde la configuración de este cliente.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1688"/>
+        <source>Use line edit virtual keyboards</source>
+        <translation>Usar teclados virtuales</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1582"/>
+        <source>Use line edit virtual keyboards</source>
+        <translation>Usar teclados virtuales</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmyth/dbsettings.cpp" line="196"/>
@@ -12191,19 +22468,49 @@ reproducción no puede dejarse vacío.</translation>
         <translation>Buscar Diariamente</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/recordingtypes.cpp" line="47"/>
         <source>Find Weekly</source>
         <translation>Buscar Semanalmente</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="2729"/>
+        <source>Playing</source>
+        <translation>Reproduciendo</translation>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="2728"/>
+        <source>Playing</source>
+        <translation>Reproduciendo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="183"/>
         <source>Previously Recorded</source>
         <translation>Grabado Anteriormente</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="2744"/>
+        <source>Transcoding</source>
+        <translation>Transcodificando</translation>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="2743"/>
+        <source>Transcoding</source>
+        <translation>Transcodificando</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="185"/>
         <source>Currently Recorded</source>
         <translation>Grabado Actualmente</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="2731"/>
+        <source>PIP</source>
+        <translation></translation>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="2730"/>
+        <source>PIP</source>
+        <translation></translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmyth/programtypes.cpp" line="203"/>
@@ -12342,28 +22649,72 @@ reproducción no puede dejarse vacío.</translation>
         <translation>R</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="95"/>
         <source>X</source>
         <comment>RecStatusChar rsDontRecord</comment>
         <translation>X</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2184"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2233"/>
+        <source>Samples are shown using today&apos;s date.</source>
+        <translation>Los ejemplos se muestran con la fecha de hoy.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2078"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2127"/>
+        <source>Samples are shown using today&apos;s date.</source>
+        <translation>Los ejemplos se muestran con la fecha de hoy.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="98"/>
         <source>P</source>
         <comment>RecStatusChar rsPreviousRecording</comment>
         <translation>P</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2190"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2239"/>
+        <source>Samples are shown using tomorrow&apos;s date.</source>
+        <translation>Los ejemplos se muestran con la fecha de mañana.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2084"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2133"/>
+        <source>Samples are shown using tomorrow&apos;s date.</source>
+        <translation>Los ejemplos se muestran con la fecha de mañana.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="101"/>
         <source>R</source>
         <comment>RecStatusChar rsCurrentRecording</comment>
         <translation>R</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2743"/>
+        <source>Enable Network Remote Control interface</source>
+        <translation>Activar la interfaz de Control Remoto por Red</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2607"/>
+        <source>Enable Network Remote Control interface</source>
+        <translation>Activar la interfaz de Control Remoto por Red</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="125"/>
         <source>r</source>
         <comment>RecStatusChar rsRepeat</comment>
         <translation>r</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2744"/>
+        <source>This enables support for controlling mythfrontend over the network.</source>
+        <translation>Activa el control de mythfrontend a través de la red.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2608"/>
+        <source>This enables support for controlling mythfrontend over the network.</source>
+        <translation>Activa el control de mythfrontend a través de la red.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmyth/programtypes.cpp" line="104"/>
@@ -12384,16 +22735,36 @@ reproducción no puede dejarse vacío.</translation>
         <translation>C</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="122"/>
         <source>L</source>
         <comment>RecStatusChar rsLaterShowing</comment>
         <translation>L</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4881"/>
+        <source>All Available Methods</source>
+        <translation>Todos los Métodos Disponibles</translation>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4880"/>
+        <source>All Available Methods</source>
+        <translation>Todos los Métodos Disponibles</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="131"/>
         <source>K</source>
         <comment>RecStatusChar rsLowDiskSpace</comment>
         <translation>K</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4889"/>
+        <source>Blank Frame Detection</source>
+        <translation>Detección de Fotograma Vacío</translation>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4888"/>
+        <source>Blank Frame Detection</source>
+        <translation>Detección de Fotograma Vacío</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmyth/programtypes.cpp" line="134"/>
@@ -12418,9 +22789,19 @@ reproducción no puede dejarse vacío.</translation>
         <translation>200Mbps</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="1233"/>
         <source>400Mbps</source>
         <translation>400Mbps</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="671"/>
+        <source>Mac hardware will try to use the graphics processor - this may hang or crash your Mac!</source>
+        <translation>El hardware de Mac intentará usar el procesador gráfico - ¡Esto podría colgar o reiniciar su Mac!</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="672"/>
+        <source>Mac hardware will try to use the graphics processor - this may hang or crash your Mac!</source>
+        <translation>El hardware de Mac intentará usar el procesador gráfico - ¡Esto podría colgar o reiniciar su Mac!</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="206"/>
@@ -12437,23 +22818,55 @@ Most cards can autodetect this now, so leave it at Auto unless it won&apos;t wor
 La mayoría de las tarjetas la detectan automáticamente, así que déjela en Auto a no ser que no funcione.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="236"/>
         <source>Bandwidth (Default: Auto)
 </source>
         <translation>Ancho de Banda (Por defecto: Auto)
 </translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="143"/>
+        <source>F</source>
+        <comment>RecStatusChar rsOffLine</comment>
+        <translation></translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="145"/>
+        <source>F</source>
+        <comment>RecStatusChar rsOffLine</comment>
+        <translation></translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="270"/>
         <location filename="../libs/libmythtv/transporteditor.cpp" line="601"/>
         <source>Forward Error Correction (Default: Auto)</source>
         <translation>Corrección de Errores hacia Delante - FEC (Por defecto: Auto)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="206"/>
+        <source>Recorder Off-Line</source>
+        <translation>Grabador Fuera de Línea</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="214"/>
+        <source>Recorder Off-Line</source>
+        <translation>Grabador Fuera de Línea</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="281"/>
         <location filename="../libs/libmythtv/transporteditor.cpp" line="614"/>
         <source>Low Priority Code Rate (Default: Auto)</source>
         <translation>Tasa de Códigos de Baja Prioridad (Por defecto: Auto)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="329"/>
+        <source>the backend recorder is off-line.</source>
+        <translation>el servidor grabador está fuera de línea.</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="349"/>
+        <source>the backend recorder is off-line.</source>
+        <translation>el servidor grabador está fuera de línea.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="291"/>
@@ -12939,9 +23352,21 @@ La mayoría de las tarjetas la detectan automáticamente, así que déjela en Au
         <translation>Sintonizando</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="193"/>
         <source>Missed</source>
         <translation>Perdido</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="1600"/>
+        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1534"/>
+        <source>Video</source>
+        <translation>Vídeos</translation>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="1602"/>
+        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1534"/>
+        <source>Video</source>
+        <translation>Vídeos</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmyth/programtypes.cpp" line="219"/>
@@ -13053,14 +23478,34 @@ La mayoría de las tarjetas la detectan automáticamente, así que déjela en Au
         <translation>16:10</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="3394"/>
         <source>(Delete all video sources)</source>
         <translation>(Eliminar todas las fuentes de vídeo)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="4526"/>
+        <source>Position</source>
+        <translation>Posición</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="4535"/>
+        <source>Position</source>
+        <translation>Posición</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2900"/>
         <source>Display volume level information on LCD display.</source>
         <translation>Mostrar información de volumen en la pantalla LCD.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="3784"/>
+        <source>No Seektable</source>
+        <translation>Sin Tabla de Búsqueda</translation>
+=======
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="3759"/>
+        <source>No Seektable</source>
+        <translation>Sin Tabla de Búsqueda</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmyth/programinfo.cpp" line="2747"/>
@@ -13100,9 +23545,21 @@ La mayoría de las tarjetas la detectan automáticamente, así que déjela en Au
         <translation>Número de hilos</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="663"/>
         <source>Threads to use for software encoding.</source>
         <translation>Hilos a usar para codificación por software.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9757"/>
+        <source>UNKNOWN%1</source>
+        <comment>Synthesized callsign</comment>
+        <translation>DESCONOCIDO%1</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9811"/>
+        <source>UNKNOWN%1</source>
+        <comment>Synthesized callsign</comment>
+        <translation>DESCONOCIDO%1</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="664"/>
@@ -13131,11 +23588,22 @@ La mayoría de las tarjetas la detectan automáticamente, así que déjela en Au
         <translation>Tabla de Frecuencias</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelscan/frequencytablesetting.cpp" line="50"/>
         <source>Frequency table to use.</source>
         <translation>Tabla de Frecuencias a usar.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1496"/>
+        <source>Always display closed captioning or subtitles</source>
+        <translation>Siempre mostrar subtítulos</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1403"/>
+        <source>Always display closed captioning or subtitles</source>
+        <translation>Siempre mostrar subtítulos</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/cardutil.cpp" line="1836"/>
         <source>Could not query inputs.</source>
         <translation>No fue posible consultar las entradas.</translation>
@@ -13159,42 +23627,143 @@ La mayoría de las tarjetas la detectan automáticamente, así que déjela en Au
         <location filename="../libs/libmythtv/cardutil.cpp" line="2391"/>
         <source>Invalid Device ID or address.</source>
         <translation>ID de Dispositivo o dirección no válidos.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2451"/>
+        <source>Default &apos;Start Early&apos; minutes for new recording rules</source>
+        <translation>Minutos predeterminados para &apos;Comenzar Antes&apos; en nuevas reglas de grabación</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2453"/>
+        <source>Set this to &apos;0&apos; unless you expect that the majority of your show times will not match your TV listings. This sets the initial start early or start late time when rules are created. These can then be adjusted per recording rule.</source>
+        <translation>Déjelo a &apos;0&apos; a menos que espere que la mayoría de los horarios reales no coincidan con los horarios listados. Ajusta el comenzar a grabar antes o después de la hora programada al crear las reglas. Luego podrá particularizarse para cada regla de grabación.</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2466"/>
+        <source>Default &apos;End Late&apos; minutes for new recording rules</source>
+        <translation>Minutos predeterminados para &apos;Terminar Después&apos; en nuevas reglas de grabación</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2468"/>
+        <source>Set this to &apos;0&apos; unless you expect that the majority of your show times will not match your TV listings. This sets the initial end late or end early time when rules are created. These can then be adjusted per recording rule.</source>
+        <translation>Déjelo a &apos;0&apos; a menos que espere que la mayoría de los horarios reales no coincidan con los horarios listados. Ajusta el finalizar la grabación antes o después de la hora programada al crear las reglas. Luego podrá particularizarse para cada regla de grabación.</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2481"/>
+        <source>Additional priority when a showing matches the preferred input selected in the &apos;Scheduling Options&apos; section of the recording rule.</source>
+        <translation>Prioridad adicional a aplicar cuando un programa coincida con la entrada preferida seleccionada en la sección &apos;Opciones de Programación&apos; de la regla de grabación.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2345"/>
+        <source>Additional priority when a showing matches the preferred input selected in the &apos;Scheduling Options&apos; section of the recording rule.</source>
+        <translation>Prioridad adicional a aplicar cuando un programa coincida con la entrada preferida seleccionada en la sección &apos;Opciones de Programación&apos; de la regla de grabación.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/cardutil.cpp" line="2403"/>
         <source>, firmware: %2</source>
         <translation>, firmware: %2</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2492"/>
+        <source>Additional priority when a showing is marked as an HDTV broadcast in the TV listings.</source>
+        <translation>Prioridad adicional a aplicar cuando un programa esté marcado como emisión HDTV en las listas.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2356"/>
+        <source>Additional priority when a showing is marked as an HDTV broadcast in the TV listings.</source>
+        <translation>Prioridad adicional a aplicar cuando un programa esté marcado como emisión HDTV en las listas.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="1051"/>
         <source>Subtype</source>
         <translation>Subtipo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2833"/>
+        <source>Alphabetically</source>
+        <translation>Alfabéticamente</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2697"/>
+        <source>Alphabetically</source>
+        <translation>Alfabéticamente</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="1060"/>
         <source>Frontend ID</source>
         <translation>ID del Cliente</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3634"/>
+        <source>General (Channel Groups)</source>
+        <translation>General (Grupos de Canales)</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3472"/>
+        <source>General (Channel Groups)</source>
+        <translation>General (Grupos de Canales)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="1158"/>
         <source>Cable box model</source>
         <translation>Modelo de decodificador de cable</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3654"/>
+        <source>Scheduler Options</source>
+        <translation>Opciones del Programador</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3492"/>
+        <source>Scheduler Options</source>
+        <translation>Opciones del Programador</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="1217"/>
         <source>Connection Type</source>
         <translation>Tipo de Conexión</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3667"/>
+        <source>Accessibility Options</source>
+        <translation>Opciones de Accesibilidad</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3503"/>
+        <source>Accessibility Options</source>
+        <translation>Opciones de Accesibilidad</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="1230"/>
         <source>Speed</source>
         <translation>Velocidad</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3677"/>
+        <source>Recording Type Priority Settings</source>
+        <translation>Configuración de la Prioridad del Tipo de Grabación</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3513"/>
+        <source>Recording Type Priority Settings</source>
+        <translation>Configuración de la Prioridad del Tipo de Grabación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/cardutil.cpp" line="1959"/>
         <location filename="../libs/libmythtv/cardutil.cpp" line="1992"/>
         <source>Could not open &apos;%1&apos; to probe its inputs.</source>
         <translation>No fue posible abrir &apos;%1&apos; para analizar sus entradas.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythmetadata/videometadata.cpp" line="1092"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="378"/>
+        <source>^(The |A |An )</source>
+        <translation>^(El |La |Los |Las |Un |Una |Unos |Unas )</translation>
+=======
+        <location filename="../libs/libmythmetadata/videometadata.cpp" line="1092"/>
+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="379"/>
+        <source>^(The |A |An )</source>
+        <translation>^(El |La |Los |Las |Un |Una |Unos |Unas )</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythtv/cardutil.cpp" line="2033"/>
@@ -13212,9 +23781,21 @@ La mayoría de las tarjetas la detectan automáticamente, así que déjela en Au
         <translation>Normalmente sólo funciona con canales DVB o ATSC,</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="493"/>
         <source>and generally provides data only for the next few days.</source>
         <translation>y por lo general sólo proporciona datos para unos pocos días.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/teletextscreen.cpp" line="637"/>
+        <source>Page Not Available</source>
+        <comment>Requested Teletext page not available</comment>
+        <translation>Página No Disponible</translation>
+=======
+        <location filename="../libs/libmythtv/teletextscreen.cpp" line="642"/>
+        <source>Page Not Available</source>
+        <comment>Requested Teletext page not available</comment>
+        <translation>Página No Disponible</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythtv/videosource.cpp" line="485"/>
@@ -13227,14 +23808,34 @@ La mayoría de las tarjetas la detectan automáticamente, así que déjela en Au
         <translation>Reproduciendo</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="2751"/>
         <source>Transcoding</source>
         <translation>Transcodificando</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1436"/>
+        <source>channel number</source>
+        <translation>número de canal</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1355"/>
+        <source>channel number</source>
+        <translation>número de canal</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="2738"/>
         <source>PIP</source>
         <translation>PIP</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3033"/>
+        <source>On multiline displays try and display the time as large as possible.</source>
+        <translation>En pantallas multilínea tratar de mostrar la hora en el mayor tamaño posible.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2897"/>
+        <source>On multiline displays try and display the time as large as possible.</source>
+        <translation>En pantallas multilínea tratar de mostrar la hora en el mayor tamaño posible.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../programs/mythfrontend/viewschedulediff.cpp" line="112"/>
@@ -13273,10 +23874,20 @@ La mayoría de las tarjetas la detectan automáticamente, así que déjela en Au
         <translation>Los ejemplos se muestran con la fecha de hoy.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2046"/>
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2095"/>
         <source>Samples are shown using tomorrow&apos;s date.</source>
         <translation>Los ejemplos se muestran con la fecha de mañana.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4896"/>
+        <source>Experimental</source>
+        <translation>Experimental</translation>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4895"/>
+        <source>Experimental</source>
+        <translation>Experimental</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2569"/>
@@ -13360,11 +23971,24 @@ La mayoría de las tarjetas la detectan automáticamente, así que déjela en Au
         <translation>Grabador Fuera de Línea</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="350"/>
         <source>the backend recorder is off-line.</source>
         <translation>el servidor grabador está fuera de línea.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="134"/>
+        <source>f</source>
+        <comment>RecStatusChar rsFailed</comment>
+        <translation>f</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="136"/>
+        <source>f</source>
+        <comment>RecStatusChar rsFailed</comment>
+        <translation>f</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="2861"/>
         <source>If you point your satellite dish toward DishNet&apos;s birds, you may wish to enable this feature. For best results, enable general EIT collection as well.</source>
         <translation>Si apunta su parabólica hacia satélites de DishNet, puede que desee activar esta característica. Para un mejor resultado, active también la recolección general de datos EIT.</translation>
@@ -13373,11 +23997,36 @@ La mayoría de las tarjetas la detectan automáticamente, así que déjela en Au
         <location filename="../libs/libmythtv/eithelper.cpp" line="522"/>
         <source>Sports</source>
         <translation>Deportes</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="146"/>
+        <source>O</source>
+        <comment>RecStatusChar rsOtherShowing</comment>
+        <translation>O</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmyth/programtypes.cpp" line="200"/>
+        <source>Recorder Failed</source>
+        <translation>Fallo en el Grabador</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="208"/>
+        <source>Recorder Failed</source>
+        <translation>Fallo en el Grabador</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="1610"/>
         <source>Video</source>
         <translation>Vídeos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="208"/>
+        <source>Other Showing</source>
+        <translation>Otro Horario</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="216"/>
+        <source>Other Showing</source>
+        <translation>Otro Horario</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythtv/channelsettings.cpp" line="168"/>
@@ -13699,16 +24348,41 @@ Compruebe que el vídeo exista</translation>
         <translation>Las Fuentes de Vídeo a las que se conecta este Transporte son incompatibles; por favor, cree fuentes de vídeo aparte para estas tarjetas. </translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/transporteditor.cpp" line="427"/>
         <source>Digital TV Standard</source>
         <translation>Estándar de TV Digital</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videosource.cpp" line="2716"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2440"/>
+        <source>Never</source>
+        <translation>Nunca</translation>
+=======
+        <location filename="../libs/libmythtv/videosource.cpp" line="2716"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2334"/>
+        <source>Never</source>
+        <translation>Nunca</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/transporteditor.cpp" line="428"/>
         <source>Guiding standard to use for making sense of the data streams after they have been demodulated, error corrected and demultiplexed.</source>
         <translation>Estándar a usar para interpretar las tramas de datos una vez que éstas hayan sido demoduladas, corregidas de errores y expandidas.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videosource.cpp" line="2718"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2442"/>
+        <source>Always</source>
+        <translation>Siempre</translation>
+=======
+        <location filename="../libs/libmythtv/videosource.cpp" line="2718"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2336"/>
+        <source>Always</source>
+        <translation>Siempre</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/transporteditor.cpp" line="438"/>
         <source>OpenCable</source>
         <translation>OpenCable</translation>
@@ -13717,76 +24391,215 @@ Compruebe que el vídeo exista</translation>
         <location filename="../libs/libmythtv/transporteditor.cpp" line="441"/>
         <source>MPEG</source>
         <translation>MPEG</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1294"/>
+        <source>Sort all sub-titles/multi-titles Ascending</source>
+        <translation>Ordenar todos los subtítulos/multitítulos Ascendentemente</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1230"/>
+        <source>Sort all sub-titles/multi-titles Ascending</source>
+        <translation>Ordenar todos los subtítulos/multitítulos Ascendentemente</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/transporteditor.cpp" line="453"/>
         <source>Frequency (Option has no default).
 The frequency for this channel in</source>
         <translation>Frecuencia (esta opción no tiene valor por defecto)
 La frecuencia de este canal en</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1295"/>
+        <source>Sort all sub-titles/multi-titles Descending</source>
+        <translation>Ordenar todos los subtítulos/multitítulos Descendentemente</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1231"/>
+        <source>Sort all sub-titles/multi-titles Descending</source>
+        <translation>Ordenar todos los subtítulos/multitítulos Descendentemente</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/transporteditor.cpp" line="467"/>
         <source>Symbol Rate (symbols/sec).
 Most DVB-S transponders transmit at 27.5 million symbols per second.</source>
         <translation>Tasa de Símbolos (símbolos/segundo).
 La mayoría de los transpondedores DVB-S transmiten a 27,5 millones de símbolos por segundo.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1296"/>
+        <source>Sort sub-titles Descending, multi-titles Ascending</source>
+        <translation>Ordenar subtítulos Descendentemente, y los multitítulos Ascendentemente</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1232"/>
+        <source>Sort sub-titles Descending, multi-titles Ascending</source>
+        <translation>Ordenar subtítulos Descendentemente, y los multitítulos Ascendentemente</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/transporteditor.cpp" line="507"/>
         <source>Modulation, aka Constellation</source>
         <translation>Modulación o Constelación</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1297"/>
+        <source>Sort sub-titles Ascending, multi-titles Descending</source>
+        <translation>Ordenar subtítulos Ascendentemente, y los multitítulos Descendentemente</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1233"/>
+        <source>Sort sub-titles Ascending, multi-titles Descending</source>
+        <translation>Ordenar subtítulos Ascendentemente, y los multitítulos Descendentemente</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/transporteditor.cpp" line="516"/>
         <source>QAM Auto</source>
         <translation>QAM Automática</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1299"/>
+        <source>Selects how to sort show episodes. Sub-titles refers to the episodes listed under a specific show title. Multi-title refers to sections (e.g. &quot;All Programs&quot;) which list multiple titles. Sections in parentheses are not affected.</source>
+        <translation>Selecciona cómo ordenar los episodios. Los subtítulos se refieren a los episodios listados bajo un título específico de programa. Los multítulos se refieren a las secciones (p.ej. &quot;Todos los Programas&quot;) que poseen títulos múltiples. Las secciones entre paréntesis no se ven afectadas.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1235"/>
+        <source>Selects how to sort show episodes. Sub-titles refers to the episodes listed under a specific show title. Multi-title refers to sections (e.g. &quot;All Programs&quot;) which list multiple titles. Sections in parentheses are not affected.</source>
+        <translation>Selecciona cómo ordenar los episodios. Los subtítulos se refieren a los episodios listados bajo un título específico de programa. Los multítulos se refieren a las secciones (p.ej. &quot;Todos los Programas&quot;) que poseen títulos múltiples. Las secciones entre paréntesis no se ven afectadas.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="137"/>
         <source>f</source>
         <comment>RecStatusChar rsFailed</comment>
         <translation>f</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1306"/>
+        <source>Episode sort orderings</source>
+        <translation>Orden de episodios</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1242"/>
+        <source>Episode sort orderings</source>
+        <translation>Orden de episodios</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="209"/>
         <source>Recorder Failed</source>
         <translation>Fallo en el Grabador</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2845"/>
+        <source>Include the &apos;Watch List&apos; group</source>
+        <translation>Incluir el grupo &apos;Lista de Visión&apos;</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2709"/>
+        <source>Include the &apos;Watch List&apos; group</source>
+        <translation>Incluir el grupo &apos;Lista de Visión&apos;</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programtypes.cpp" line="217"/>
         <source>Other Showing</source>
         <translation>Otro Horario</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2847"/>
+        <source>The &apos;Watch List&apos; is an abbreviated list of recordings sorted to highlight series and shows that need attention in order to keep up to date.</source>
+        <translation>La &apos;&apos;Lista de Visión&apos; es una lista abreviada de grabaciones ordenadas para resaltar series y programas que necesiten atención para mantenerse al día.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2711"/>
+        <source>The &apos;Watch List&apos; is an abbreviated list of recordings sorted to highlight series and shows that need attention in order to keep up to date.</source>
+        <translation>La &apos;&apos;Lista de Visión&apos; es una lista abreviada de grabaciones ordenadas para resaltar series y programas que necesiten atención para mantenerse al día.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="371"/>
         <source>SAP/Bilingual</source>
         <translation>SAP/Bilingüe</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2857"/>
+        <source>Start from the Watch List view</source>
+        <translation>Iniciar desde la vista Lista de Visión</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2721"/>
+        <source>Start from the Watch List view</source>
+        <translation>Iniciar desde la vista Lista de Visión</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="373"/>
         <source>Main Language</source>
         <translation>Idioma Principal</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2868"/>
+        <source>Exclude recordings not set for Auto-Expire</source>
+        <translation>Excluir grabaciones no configuradas para Auto-Expirar</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2732"/>
+        <source>Exclude recordings not set for Auto-Expire</source>
+        <translation>Excluir grabaciones no configuradas para Auto-Expirar</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="374"/>
         <source>SAP Language</source>
         <translation>Idioma SAP</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2880"/>
+        <source>Maximum days counted in the score</source>
+        <translation>Máximo número de días contados en la puntuación</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2744"/>
+        <source>Maximum days counted in the score</source>
+        <translation>Máximo número de días contados en la puntuación</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="375"/>
         <source>Dual</source>
         <translation>Dual</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2882"/>
+        <source>The &apos;Watch List&apos; scores are based on 1 point equals one day since recording. This option limits the maximum score due to age and affects other weighting factors.</source>
+        <translation>La puntuación de la &apos;Lista de Visión&apos; consiste en 1 punto por cada día transcurrido desde la grabación. Esta opción limita la puntuación máxima debida a la edad y afecta a otros factores de ponderación.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2746"/>
+        <source>The &apos;Watch List&apos; scores are based on 1 point equals one day since recording. This option limits the maximum score due to age and affects other weighting factors.</source>
+        <translation>La puntuación de la &apos;Lista de Visión&apos; consiste en 1 punto por cada día transcurrido desde la grabación. Esta opción limita la puntuación máxima debida a la edad y afecta a otros factores de ponderación.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="378"/>
         <source>Chooses the language(s) to record when two languages are broadcast. Only Layer II supports the recording of two languages (Dual).Requires ivtv 0.4.0 or later.</source>
         <translation>Elige el(los) idioma(s) a grabar cuando se emiten dos. Sólo la Capa II permite la grabación de dos idiomas (Dual). Requiere ivtv 0.4.0 o posterior.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2892"/>
+        <source>Days to exclude weekly episodes after delete</source>
+        <translation>Días a excluir episodios semanalaes tras eliminarlos</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2756"/>
+        <source>Days to exclude weekly episodes after delete</source>
+        <translation>Días a excluir episodios semanalaes tras eliminarlos</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="523"/>
         <source>Bitrate (kb/s)</source>
         <translation>Tasa de Bits (kb/s)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2894"/>
+        <source>When an episode is deleted or marked as watched, other episodes of the series are excluded from the &apos;Watch List&apos; for this interval of time. Daily shows also have a smaller interval based on this setting.</source>
+        <translation>Al eliminar o marcar un episodio como visto, otros episodios de la serie serán excluídos de la &apos;Lista de Vistos&apos; durante este intervalo de tiempo. Los programas diarios también poseen un pequeño intervalo basado en esta configuración.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2758"/>
+        <source>When an episode is deleted or marked as watched, other episodes of the series are excluded from the &apos;Watch List&apos; for this interval of time. Daily shows also have a smaller interval based on this setting.</source>
+        <translation>Al eliminar o marcar un episodio como visto, otros episodios de la serie serán excluídos de la &apos;Lista de Vistos&apos; durante este intervalo de tiempo. Los programas diarios también poseen un pequeño intervalo basado en esta configuración.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="525"/>
@@ -13814,9 +24627,19 @@ La mayoría de los transpondedores DVB-S transmiten a 27,5 millones de símbolos
         <translation>Si se activa, el codificador MPEG4 usará las opciones de codificación de &apos;alta calidad&apos;. Requiere un procesamiento mucho mayor pero podría resultar en una imagen mejor.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="682"/>
         <source>Avg. Bitrate (kb/s)</source>
         <translation>Tasa Media de Bits (kb/s)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4870"/>
+        <source>Use Global Setting</source>
+        <translation>Usar la Configuración Global</translation>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4869"/>
+        <source>Use Global Setting</source>
+        <translation>Usar la Configuración Global</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="685"/>
@@ -13824,9 +24647,19 @@ La mayoría de los transpondedores DVB-S transmiten a 27,5 millones de símbolos
         <translation>Tasa media de bits en kilobits/segundo. Como orientación, 2200 kb/s son aproximadamente 1 GB/hora.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="703"/>
         <source>Max. Bitrate (kb/s)</source>
         <translation>Tasa Máxima de Bits (kb/s)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2070"/>
+        <source>Aspect ratio when watching a video at a specific resolution.</source>
+        <translation>Relación de aspecto al ver un vídeo con una resolución específica.</translation>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1964"/>
+        <source>Aspect ratio when watching a video at a specific resolution.</source>
+        <translation>Relación de aspecto al ver un vídeo con una resolución específica.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythtv/recordingprofile.cpp" line="706"/>
@@ -13883,49 +24716,152 @@ en lugar de sólo &apos;mythfilldatabase&apos;.
 Su capturador no proporciona números de canal, así que tendrá que definirlos manualmente.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="463"/>
         <source>Warning.</source>
         <translation>Aviso.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/mythcontext.cpp" line="162"/>
+        <source>Could not find specified tuner (%1).</source>
+        <translation>No fue posible encontrar el sintonizador especificado (%1).</translation>
+=======
+        <location filename="../libs/libmyth/mythcontext.cpp" line="161"/>
+        <source>Could not find specified tuner (%1).</source>
+        <translation>No fue posible encontrar el sintonizador especificado (%1).</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="659"/>
         <source>Video Source Setup</source>
         <translation>Configuración de las Fuentes de Vídeo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/mythcontext.cpp" line="165"/>
+        <source>Specified tuner (%1) is already in use.</source>
+        <translation>El sintonizador especificado (%1) ya está en uso.</translation>
+=======
+        <location filename="../libs/libmyth/mythcontext.cpp" line="164"/>
+        <source>Specified tuner (%1) is already in use.</source>
+        <translation>El sintonizador especificado (%1) ya está en uso.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="883"/>
         <source>File path</source>
         <translation>Ruta de archivo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/mythcontext.cpp" line="170"/>
+        <source>All tuners are currently in use. If you want to watch TV, you can cancel one of the in-progress recordings from the delete menu</source>
+        <translation>Todos los sintonizadores están en uso. Si desea ver la TV, puede cancelar una de las grabaciones en curso desde el menú eliminar</translation>
+=======
+        <location filename="../libs/libmyth/mythcontext.cpp" line="169"/>
+        <source>All tuners are currently in use. If you want to watch TV, you can cancel one of the in-progress recordings from the delete menu</source>
+        <translation>Todos los sintonizadores están en uso. Si desea ver la TV, puede cancelar una de las grabaciones en curso desde el menú eliminar</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="915"/>
         <source>Signal timeout (ms)</source>
         <translation>Tiempo de señal (ms)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/mythcontext.cpp" line="614"/>
+        <source>Cannot find (ping) database host %1 on the network</source>
+        <translation>No fue posible encontrar (ping) el nodo %1 de la base de datos en la red</translation>
+=======
+        <location filename="../libs/libmyth/mythcontext.cpp" line="371"/>
+        <source>No UPnP backends found</source>
+        <comment>Backend Setup</comment>
+        <translation>No se encontraron servidores UPnP</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmyth/mythcontext.cpp" line="685"/>
+        <source>Cannot find (ping) database host %1 on the network</source>
+        <comment>Backend Setup</comment>
+        <translation>No fue posible encontrar (ping) el nodo %1 de la base de datos en la red</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="917"/>
         <source>Maximum time (in milliseconds) MythTV waits for a signal when scanning for channels.</source>
         <translation>Tiempo máximo (en milisegundos) que MythTV esperará por una señal al buscar canales.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/mythcontext.cpp" line="951"/>
+        <source>The connection to the master backend server has gone away for some reason. Is it running?</source>
+        <translation>La conexión al servidor principal se ha perdido por alguna razón. ¿Está ejecutándose?</translation>
+=======
+        <location filename="../libs/libmyth/mythcontext.cpp" line="700"/>
+        <source>Cannot login to database</source>
+        <comment>Backend Setup</comment>
+        <translation>No fue posible acceder a la base de datos</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmyth/mythcontext.cpp" line="1002"/>
+        <source>The connection to the master backend server has gone away for some reason. Is it running?</source>
+        <translation>La conexión al servidor principal se ha perdido por alguna razón. ¿Está ejecutándose?</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="930"/>
         <source>Tuning timeout (ms)</source>
         <translation>Tiempo de sintonización (ms)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/mythcontext.cpp" line="955"/>
+        <source>Could not connect to the master backend server. Is it running?  Is the IP address set for it in mythtv-setup correct?</source>
+        <translation>No fue posible conectar con el servidor principal. ¿Está ejecutándose? ¿Su dirección IP fue correctamente definida en mythtv-setup?</translation>
+=======
+        <location filename="../libs/libmyth/mythcontext.cpp" line="1006"/>
+        <source>Could not connect to the master backend server. Is it running?  Is the IP address set for it in mythtv-setup correct?</source>
+        <translation>No fue posible conectar con el servidor principal. ¿Está ejecutándose? ¿Su dirección IP fue correctamente definida en mythtv-setup?</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="932"/>
         <source>Maximum time (in milliseconds) MythTV waits for a channel lock when scanning for channels during setup, or for issuing a warning in Live TV mode.</source>
         <translation>Tiempo máximo (en milisegundos) que MythTV esperará por una sintonización al buscar canales durante la configuración, o para emitir un aviso en el modo TV en Vivo.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/mythcontext.cpp" line="1054"/>
+        <source>This application is not compatible with the installed MythTV libraries.</source>
+        <translation>Esta aplicación no es compatible con las bibliotecas de MythTV instaladas.</translation>
+=======
+        <location filename="../libs/libmyth/mythcontext.cpp" line="1105"/>
+        <source>This application is not compatible with the installed MythTV libraries.</source>
+        <translation>Esta aplicación no es compatible con las bibliotecas de MythTV instaladas.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="946"/>
         <source>Force audio sampling rate</source>
         <translation>Forzar tasa de muestreo del sonido</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/mythcontext.cpp" line="1137"/>
+        <source>Plugin %1 is not compatible with the installed MythTV libraries.</source>
+        <translation>El complemento %1 no es compatible con las bibliotecas de MythTV instaladas.</translation>
+=======
+        <location filename="../libs/libmyth/mythcontext.cpp" line="1188"/>
+        <source>Plugin %1 is not compatible with the installed MythTV libraries.</source>
+        <translation>El complemento %1 no es compatible con las bibliotecas de MythTV instaladas.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="948"/>
         <source>If non-zero, override the audio sampling rate in the recording profile when this card is used.  Use this if your capture card does not support all of the standard rates.</source>
         <translation>Si no es cero, ignorar la tasa de muestreo de sonido situada en el perfil de grabación al usar esta tarjeta.  Úselo si su capturadora no admite todas las tasas estándar.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/mythcontext.cpp" line="982"/>
+        <source>The server uses network protocol version %1, but this client only understands version %2.  Make sure you are running compatible versions of the backend and frontend.</source>
+        <translation>El servidor usa el protocolo de red versión %1, pero este cliente sólo comprende la versión %2.  Asegúrese de que está ejecutando versiones compatibles del servidor y el cliente.</translation>
+=======
+        <location filename="../libs/libmyth/mythcontext.cpp" line="1033"/>
+        <source>The server uses network protocol version %1, but this client only understands version %2.  Make sure you are running compatible versions of the backend and frontend.</source>
+        <translation>El servidor usa el protocolo de red versión %1, pero este cliente sólo comprende la versión %2.  Asegúrese de que está ejecutando versiones compatibles del servidor y el cliente.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythtv/videosource.cpp" line="981"/>
@@ -13958,14 +24894,34 @@ Su capturador no proporciona números de canal, así que tendrá que definirlos
         <translation>Retardo de sintonización DVB (ms)</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="1119"/>
         <source>Some Linux DVB drivers, in particular for the Hauppauge Nova-T, require that we slow down the tuning process by specifying a delay (in milliseconds).</source>
         <translation>Algunos controladores DVB de Linux, en concreto los de la Hauppauge Nova-T, requieren que ralenticemos el proceso de sintonización especificando un retardo (en milisegundos).</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="322"/>
+        <source>this rule does not match any showings in the current program listings.</source>
+        <translation>este regla no coincide con ningún horario de las listas de programas actuales.</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="342"/>
+        <source>this rule does not match any showings in the current program listings.</source>
+        <translation>este regla no coincide con ningún horario de las listas de programas actuales.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="1133"/>
         <source>GUID</source>
         <translation>GUÍA</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programtypes.cpp" line="332"/>
+        <source>this episode will be recorded on a different channel in this time slot.</source>
+        <translation>este episodio se grabará en un canal diferente en esta franja horaria.</translation>
+=======
+        <location filename="../libs/libmyth/programtypes.cpp" line="352"/>
+        <source>this episode will be recorded on a different channel in this time slot.</source>
+        <translation>este episodio se grabará en un canal diferente en esta franja horaria.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmythtv/videosource.cpp" line="1159"/>
@@ -13988,207 +24944,626 @@ Su capturador no proporciona números de canal, así que tendrá que definirlos
         <translation>ID de Dispositivo y Número de Sintonizador de los dispositivos HDHomeRun disponibles.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="1571"/>
         <source>ASI device</source>
         <translation>Dispositivo ASI</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="1887"/>
+        <source>MythTV wants to record these programs in %d seconds:</source>
+        <translation>MythTV desea grabar estos programas en %d segundos:</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="1892"/>
+        <source>MythTV wants to record these programs in %d seconds:</source>
+        <translation>MythTV desea grabar estos programas en %d segundos:</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="1630"/>
         <source>Warning: unable to open</source>
         <translation>Aviso: no fue posible abrir</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="1913"/>
+        <source>&quot;%1&quot; on %2</source>
+        <translation>&quot;%1&quot; en %2</translation>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="1918"/>
+        <source>&quot;%1&quot; on %2</source>
+        <translation>&quot;%1&quot; en %2</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="2470"/>
         <source>MPEG-2 encoder card</source>
         <translation>Codificadora MPEG-2</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1388"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="1926"/>
+        <source>Do you want to:</source>
+        <translation>¿Desea:</translation>
+=======
+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1388"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="1931"/>
+        <source>Do you want to:</source>
+        <translation>¿Desea:</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="2500"/>
         <source>Network recorder</source>
         <translation>Grabador de red</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_rec.cpp" line="3608"/>
+        <source>On known multiplex...</source>
+        <translation>En el mismo múltiple...</translation>
+=======
+        <location filename="../libs/libmythtv/tv_rec.cpp" line="3626"/>
+        <source>On known multiplex...</source>
+        <translation>En el mismo múltiple...</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="2504"/>
         <source>DVEO ASI recorder</source>
         <translation>Grabador DVEO ASI</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="707"/>
+        <source>Kernel</source>
+        <translation>Núcleo</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="708"/>
+        <source>Kernel</source>
+        <translation>Núcleo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="2509"/>
         <source>Ceton Cablecard tuner </source>
         <translation>Sintonizador de Tarjeta de Cable Ceton</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="709"/>
+        <source>Kernel (2x)</source>
+        <translation>Núcleo (2x)</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="710"/>
+        <source>Kernel (2x)</source>
+        <translation>Núcleo (2x)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="2512"/>
         <source>Import test recorder</source>
         <translation>Importar grabador de prueba</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="711"/>
+        <source>Greedy HighMotion</source>
+        <translation>Conservador - Mucho Movimiento</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="712"/>
+        <source>Greedy HighMotion</source>
+        <translation>Conservador - Mucho Movimiento</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="2513"/>
         <source>Demo test recorder</source>
         <translation>Grabador de prueba de demostración</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="713"/>
+        <source>Greedy HighMotion (2x)</source>
+        <translation>Conservador - Mucho Movimiento (2x)</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="714"/>
+        <source>Greedy HighMotion (2x)</source>
+        <translation>Conservador - Mucho Movimiento (2x)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="2543"/>
         <source>Display name (optional)</source>
         <translation>Nombre mostrado (opcional)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="715"/>
+        <source>Yadif</source>
+        <translation>Yadif</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="716"/>
+        <source>Yadif</source>
+        <translation>Yadif</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="2544"/>
         <source>This name is displayed on screen when Live TV begins and when changing the selected input or card. If you use this, make sure the information is unique for each input.</source>
         <translation>Este nombre se mostrará en la pantalla al iniciar la TV en Vivo y al cambiar la tarjeta o entrada seleccionada. Si lo usa, asegúrese de que la información sea única para cada entrada.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="717"/>
+        <source>Yadif (2x)</source>
+        <translation>Yadif (2x)</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="718"/>
+        <source>Yadif (2x)</source>
+        <translation>Yadif (2x)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="2592"/>
         <source>Input group</source>
         <translation>Grupo de entradas</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="719"/>
+        <source>Bob (2x)</source>
+        <translation>Bob (2x)</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="720"/>
+        <source>Bob (2x)</source>
+        <translation>Bob (2x)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="2636"/>
         <source>Generic</source>
         <translation>Genérica</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="723"/>
+        <source>Interlaced (2x)</source>
+        <translation>Entrelazado (2x)</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="724"/>
+        <source>Interlaced (2x)</source>
+        <translation>Entrelazado (2x)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="1234"/>
         <source>800Mbps</source>
         <translation>800Mbps</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="725"/>
+        <source>Linear blend (HW)</source>
+        <translation>Mezcla lineal (HW)</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="726"/>
+        <source>Linear blend (HW)</source>
+        <translation>Mezcla lineal (HW)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="1541"/>
         <source>M3U URL</source>
         <translation>URL M3U</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="727"/>
+        <source>Kernel (HW)</source>
+        <translation>Núcleo (HW)</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="728"/>
+        <source>Kernel (HW)</source>
+        <translation>Núcleo (HW)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="1542"/>
         <source>URL of M3U containing IPTV channel URLs.</source>
         <translation>El URL de M3U que contiene los URL de los canales IPTV.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="729"/>
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="741"/>
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="753"/>
+        <source>Bob (2x, HW)</source>
+        <translation>Bob (2x, HW)</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="730"/>
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="742"/>
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="754"/>
+        <source>Bob (2x, HW)</source>
+        <translation>Bob (2x, HW)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="2714"/>
         <source>Use quick tuning</source>
         <translation>Usar sintonización rápida</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="731"/>
+        <source>One field (HW)</source>
+        <translation>Un campo (HW)</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="732"/>
+        <source>One field (HW)</source>
+        <translation>Un campo (HW)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="2715"/>
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2296"/>
         <source>Never</source>
         <translation>Nunca</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="733"/>
+        <source>Kernel (2x, HW)</source>
+        <translation>Núcleo (2x, HW)</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="734"/>
+        <source>Kernel (2x, HW)</source>
+        <translation>Núcleo (2x, HW)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videosource.cpp" line="2717"/>
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2298"/>
         <source>Always</source>
         <translation>Siempre</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="735"/>
+        <source>Linear blend (2x, HW)</source>
+        <translation>Mezcla lineal (2x, HW)</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="736"/>
+        <source>Linear blend (2x, HW)</source>
+        <translation>Mezcla lineal (2x, HW)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1210"/>
         <source>Sort all sub-titles/multi-titles Ascending</source>
         <translation>Ordenar todos los subtítulos/multitítulos Ascendentemente</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1194"/>
+        <source>Video rendering method</source>
+        <translation>Método de generación de imagen</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1207"/>
+        <source>Video rendering method</source>
+        <translation>Método de generación de imagen</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1211"/>
         <source>Sort all sub-titles/multi-titles Descending</source>
         <translation>Ordenar todos los subtítulos/multitítulos Descendentemente</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1200"/>
+        <source>Render video offscreen. Used internally.</source>
+        <translation>Generar imagen fuera de pantalla. Usado internamente.</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1213"/>
+        <source>Render video offscreen. Used internally.</source>
+        <translation>Generar imagen fuera de pantalla. Usado internamente.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1212"/>
         <source>Sort sub-titles Descending, multi-titles Ascending</source>
         <translation>Ordenar subtítulos Descendentemente, y los multitítulos Ascendentemente</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1204"/>
+        <source>Use X11 pixel copy to render video. This is not recommended if any other option is available. The video will not be scaled to fit the screen. This will work with all X11 servers, local and remote.</source>
+        <translation>Usar la copia de píxeles X11 para generar la imagen. No se recomienda si se dispone de cualquier otra opción. La imagen no será ajustada a la pantalla. Funcionará con todos los servidores X11, locales y remotos.</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1217"/>
+        <source>Use X11 pixel copy to render video. This is not recommended if any other option is available. The video will not be scaled to fit the screen. This will work with all X11 servers, local and remote.</source>
+        <translation>Usar la copia de píxeles X11 para generar la imagen. No se recomienda si se dispone de cualquier otra opción. La imagen no será ajustada a la pantalla. Funcionará con todos los servidores X11, locales y remotos.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1213"/>
         <source>Sort sub-titles Ascending, multi-titles Descending</source>
         <translation>Ordenar subtítulos Ascendentemente, y los multitítulos Descendentemente</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1211"/>
+        <source>Use X11 shared memory pixel transfer to render video. This is only recommended over the X11 pixel copy renderer. The video will not be scaled to fit the screen. This works with most local X11 servers.</source>
+        <translation>Usar la transferencia de píxeles con memoria compartida X11 para generar la imagen. Sólo se recomienda por encima del generador por copia de píxeles X11. La imagen no será ajustada a la pantalla. Funcionará con la mayoría de servidores X11 locales.</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1224"/>
+        <source>Use X11 shared memory pixel transfer to render video. This is only recommended over the X11 pixel copy renderer. The video will not be scaled to fit the screen. This works with most local X11 servers.</source>
+        <translation>Usar la transferencia de píxeles con memoria compartida X11 para generar la imagen. Sólo se recomienda por encima del generador por copia de píxeles X11. La imagen no será ajustada a la pantalla. Funcionará con la mayoría de servidores X11 locales.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1215"/>
         <source>Selects how to sort show episodes. Sub-titles refers to the episodes listed under a specific show title. Multi-title refers to sections (e.g. &quot;All Programs&quot;) which list multiple titles. Sections in parentheses are not affected.</source>
         <translation>Selecciona cómo ordenar los episodios. Los subtítulos se refieren a los episodios listados bajo un título específico de programa. Los multítulos se refieren a las secciones (p.ej. &quot;Todos los Programas&quot;) que poseen títulos múltiples. Las secciones entre paréntesis no se ven afectadas.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1218"/>
+        <source>This is the standard video renderer for X11 systems. It uses XVideo hardware assist for scaling, color conversion. If the hardware offers picture controls the renderer supports them.</source>
+        <translation>Éste es el generador estándar de imagen para los sistemas X11. Usa asistencia hardware XVideo para el ajuste. Si el hardware ofrece controles de imagen, el generador los admitirá.</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1231"/>
+        <source>This is the standard video renderer for X11 systems. It uses XVideo hardware assist for scaling, color conversion. If the hardware offers picture controls the renderer supports them.</source>
+        <translation>Éste es el generador estándar de imagen para los sistemas X11. Usa asistencia hardware XVideo para el ajuste. Si el hardware ofrece controles de imagen, el generador los admitirá.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1222"/>
         <source>Episode sort orderings</source>
         <translation>Orden de episodios</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1224"/>
+        <source>Windows video renderer based on Direct3D. Requires video card compatible with Direct3D 9. This is the preferred renderer for current Windows systems.</source>
+        <translation>Generador de imagen Windows basado en Direct3D. Requiere una tarjeta de vídeo compatible con Direct3D 9. Es el generador preferido para los sistemas Windows.</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1237"/>
+        <source>Windows video renderer based on Direct3D. Requires video card compatible with Direct3D 9. This is the preferred renderer for current Windows systems.</source>
+        <translation>Generador de imagen Windows basado en Direct3D. Requiere una tarjeta de vídeo compatible con Direct3D 9. Es el generador preferido para los sistemas Windows.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2750"/>
         <source>Include the &apos;Watch List&apos; group</source>
         <translation>Incluir el grupo &apos;Lista de Visión&apos;</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1230"/>
+        <source>This is the standard video render for Macintosh OS X systems.</source>
+        <translation>Éste es el generador de imagen estándar para los sistemas Macintosh OS X.</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1243"/>
+        <source>This is the standard video render for Macintosh OS X systems.</source>
+        <translation>Éste es el generador de imagen estándar para los sistemas Macintosh OS X.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2752"/>
         <source>The &apos;Watch List&apos; is an abbreviated list of recordings sorted to highlight series and shows that need attention in order to keep up to date.</source>
         <translation>La &apos;&apos;Lista de Visión&apos; es una lista abreviada de grabaciones ordenadas para resaltar series y programas que necesiten atención para mantenerse al día.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1234"/>
+        <source>This is the only video renderer for the MacAccel decoder.</source>
+        <translation>Éste es el único generador de imagen para el decodificador MacAccel.</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1247"/>
+        <source>This is the only video renderer for the MacAccel decoder.</source>
+        <translation>Éste es el único generador de imagen para el decodificador MacAccel.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2762"/>
         <source>Start from the Watch List view</source>
         <translation>Iniciar desde la vista Lista de Visión</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1333"/>
+        <source>This deinterlacer attempts to synchronize with interlaced displays whose size and refresh rate exactly match the video source. It has low CPU requirements.</source>
+        <translation>Este desentrelazador intenta sincronizar pantallas entrelazadas cuyo tamaño y tasa de refresco sean iguales a los de la fuente de vídeo. Posee bajos requisitos de CPU.</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1346"/>
+        <source>This deinterlacer attempts to synchronize with interlaced displays whose size and refresh rate exactly match the video source. It has low CPU requirements.</source>
+        <translation>Este desentrelazador intenta sincronizar pantallas entrelazadas cuyo tamaño y tasa de refresco sean iguales a los de la fuente de vídeo. Posee bajos requisitos de CPU.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2773"/>
         <source>Exclude recordings not set for Auto-Expire</source>
         <translation>Excluir grabaciones no configuradas para Auto-Expirar</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="681"/>
+        <source>DXVA2 will use the graphics hardware to accelerate video decoding and playback (requires Windows Vista or later).</source>
+        <translation>DXVA2 usará el hardware de gráficos para acelerar la decodificación y reproducción de imagen (requiere Windows Vista o posterior).</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="682"/>
+        <source>DXVA2 will use the graphics hardware to accelerate video decoding and playback (requires Windows Vista or later).</source>
+        <translation>DXVA2 usará el hardware de gráficos para acelerar la decodificación y reproducción de imagen (requiere Windows Vista o posterior).</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2785"/>
         <source>Maximum days counted in the score</source>
         <translation>Máximo número de días contados en la puntuación</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="660"/>
+        <source>Processing method used to decode video.</source>
+        <translation>Método de procesamiento utilizado para decodificar la imagen.</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="646"/>
+        <source>Mac VDA hardware acceleration</source>
+        <translation>Aceleración hardware VDA de Mac</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="661"/>
+        <source>Processing method used to decode video.</source>
+        <translation>Método de procesamiento utilizado para decodificar la imagen.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2787"/>
         <source>The &apos;Watch List&apos; scores are based on 1 point equals one day since recording. This option limits the maximum score due to age and affects other weighting factors.</source>
         <translation>La puntuación de la &apos;Lista de Visión&apos; consiste en 1 punto por cada día transcurrido desde la grabación. Esta opción limita la puntuación máxima debida a la edad y afecta a otros factores de ponderación.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="687"/>
+        <source>VAAPI will attempt to use the graphics hardware to accelerate video decoding.</source>
+        <translation>VAAPI intentará usar el hardware de gráficos para acelerar la decodificación de imagen.</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="688"/>
+        <source>VAAPI will attempt to use the graphics hardware to accelerate video decoding.</source>
+        <translation>VAAPI intentará usar el hardware de gráficos para acelerar la decodificación de imagen.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2797"/>
         <source>Days to exclude weekly episodes after delete</source>
         <translation>Días a excluir episodios semanalaes tras eliminarlos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="692"/>
+        <source>VDA will attempt to use the graphics hardware to accelerate video decoding. (H264 only, requires Mac OS 10.6.3)</source>
+        <translation>VDA tratará de usar el hardware de gráficos para acelerar la decodificación de la imagen (sólo H264, requiere Mac OS 10.6.3)</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="693"/>
+        <source>VDA will attempt to use the graphics hardware to accelerate video decoding. (H264 only, requires Mac OS 10.6.3)</source>
+        <translation>VDA tratará de usar el hardware de gráficos para acelerar la decodificación de la imagen (sólo H264, requiere Mac OS 10.6.3)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2799"/>
         <source>When an episode is deleted or marked as watched, other episodes of the series are excluded from the &apos;Watch List&apos; for this interval of time. Daily shows also have a smaller interval based on this setting.</source>
         <translation>Al eliminar o marcar un episodio como visto, otros episodios de la serie serán excluídos de la &apos;Lista de Vistos&apos; durante este intervalo de tiempo. Los programas diarios también poseen un pequeño intervalo basado en esta configuración.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="737"/>
+        <source>Interlaced (2x, HW)</source>
+        <translation>Entrelazado (2x, HW)</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="738"/>
+        <source>Interlaced (2x, HW)</source>
+        <translation>Entrelazado (2x, HW)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/backendsettings.cpp" line="835"/>
         <source>Use &apos;mythfilldatabase&apos; or the name of a custom script that will populate the program guide info for all your video sources.</source>
         <translation>Use &apos;mythfilldatabase&apos; o el nombre de un guión personalizado que rellenará la guía de programas con información para todas sus fuentes de vídeo.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="739"/>
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="751"/>
+        <source>One Field (1x, HW)</source>
+        <translation>Un Campo (1x, HW)</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="740"/>
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="752"/>
+        <source>One Field (1x, HW)</source>
+        <translation>Un Campo (1x, HW)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythtv-setup/checksetup.cpp" line="62"/>
         <location filename="../programs/mythtv-setup/checksetup.cpp" line="86"/>
         <source>No Storage Group directories are defined.  You must add at least one directory to the Default Storage Group where new recordings will be stored.</source>
         <translation>No se han definido directorios de Grupo de Almacenamiento. Debe añadir al menos un directorio al Grupo de Almacenamiento Predeterminado para almacenar nuevas grabaciones.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="743"/>
+        <source>Temporal (1x, HW)</source>
+        <translation>Temporal (1x, HW)</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="744"/>
+        <source>Temporal (1x, HW)</source>
+        <translation>Temporal (1x, HW)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelsettings.cpp" line="299"/>
         <source>Changes the method of commercial detection used for recordings on this channel or skips detection by marking the channel as Commercial Free.</source>
         <translation>Cambia el método de la detección de anuncios usado para las grabaciones de este canal u omite la detección marcando el canal como Libre de Anuncios.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="745"/>
+        <source>Temporal (2x, HW)</source>
+        <translation>Temporal (2x, HW)</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="746"/>
+        <source>Temporal (2x, HW)</source>
+        <translation>Temporal (2x, HW)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4887"/>
         <source>Use Global Setting</source>
         <translation>Usar la Configuración Global</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="747"/>
+        <source>Advanced (1x, HW)</source>
+        <translation>Avanzado (1x, HW)</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="748"/>
+        <source>Advanced (1x, HW)</source>
+        <translation>Avanzado (1x, HW)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/channelsettings.cpp" line="519"/>
         <source>Channel Options - Filters</source>
         <translation>Opciones de Canales - Filtros</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="749"/>
+        <source>Advanced (2x, HW)</source>
+        <translation>Avanzado (2x, HW)</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="750"/>
+        <source>Advanced (2x, HW)</source>
+        <translation>Avanzado (2x, HW)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1926"/>
         <source>Aspect ratio when watching a video at a specific resolution.</source>
         <translation>Relación de aspecto al ver un vídeo con una resolución específica.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1075"/>
+        <source>VDPAU High Quality</source>
+        <comment>Sample: VDPAU high quality</comment>
+        <translation>VDPAU Alta Calidad</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1076"/>
+        <source>VDPAU High Quality</source>
+        <comment>Sample: VDPAU high quality</comment>
+        <translation>VDPAU Alta Calidad</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/dbsettings.cpp" line="68"/>
         <source>Backend Server Wakeup settings</source>
         <translation>Configuración del Inicio Automático del Servidor</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1083"/>
+        <source>VDPAU Normal</source>
+        <comment>Sample: VDPAU average quality</comment>
+        <translation>VDPAU Normal</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1084"/>
+        <source>VDPAU Normal</source>
+        <comment>Sample: VDPAU average quality</comment>
+        <translation>VDPAU Normal</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/dbsettings.cpp" line="92"/>
         <source>MythTV could not connect to the database. Please verify your database settings below.</source>
         <translation>MythTV no pudo conectarse a la base de datos. Por favor, verifique la configuración de su base de datos a continuación.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1095"/>
+        <source>VDPAU Slim</source>
+        <comment>Sample: VDPAU low power GPU</comment>
+        <translation>VDPAU Reducido</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1096"/>
+        <source>VDPAU Slim</source>
+        <comment>Sample: VDPAU low power GPU</comment>
+        <translation>VDPAU Reducido</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmyth/dbsettings.cpp" line="98"/>
@@ -14206,121 +25581,355 @@ Su capturador no proporciona números de canal, así que tendrá que definirlos
         <translation>Probar la conectividad básica del nodo usando la orden ping. Desactívelo si su nodo o red no admite paquetes ping (ICMP ECHO)</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/dbsettings.cpp" line="125"/>
         <location filename="../programs/mythtv-setup/backendsettings.cpp" line="80"/>
         <location filename="../programs/mythtv-setup/backendsettings.cpp" line="114"/>
         <source>Port</source>
         <translation>Puerto</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1147"/>
+        <source>OpenGL High Quality</source>
+        <comment>Sample: OpenGL high quality</comment>
+        <translation>OpenGL Calidad Alta</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1146"/>
+        <source>OpenGL High Quality</source>
+        <comment>Sample: OpenGL high quality</comment>
+        <translation>OpenGL Calidad Alta</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/dbsettings.cpp" line="126"/>
         <source>The port number the database is running on.  Leave blank if using the default port (3306).</source>
         <translation>El número de puerto en el que se está ejecutando la base de datos.  Déjelo vacío si está usando el puerto predeterminado (3306).</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1155"/>
+        <source>OpenGL Normal</source>
+        <comment>Sample: OpenGL average quality</comment>
+        <translation>OpenGL Normal</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1154"/>
+        <source>OpenGL Normal</source>
+        <comment>Sample: OpenGL average quality</comment>
+        <translation>OpenGL Normal</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/dbsettings.cpp" line="132"/>
         <source>Database name</source>
         <translation>Nombre de la base de datos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1163"/>
+        <source>OpenGL Slim</source>
+        <comment>Sample: OpenGL low power GPU</comment>
+        <translation>OpenGL Reducida</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1162"/>
+        <source>OpenGL Slim</source>
+        <comment>Sample: OpenGL low power GPU</comment>
+        <translation>OpenGL Reducida</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/dbsettings.cpp" line="214"/>
         <source>The command executed on this frontend to wake up the database server (eg. sudo /etc/init.d/mysql restart).</source>
         <translation>La orden ejecutada en este cliente para despertar al servidor de bases de datos (p.ej. sudo /etc/init.d/mysql restart).</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1239"/>
+        <source>This video renderer uses OpenGL for scaling and color conversion with full picture controls. The GPU can be used for deinterlacing. This requires a faster GPU than XVideo.</source>
+        <translation>Este generador de imagen usa OpenGL para el ajuste y conversión de colores e incluye controles de imagen. La GPU puede usarse para desentrelazar. Esto requiere una GPU más rápida que XVideo.</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1173"/>
+        <source>VAAPI Normal</source>
+        <comment>Sample: VAAPI average quality</comment>
+        <translation>VAAPI Normal</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1252"/>
+        <source>This video renderer uses OpenGL for scaling and color conversion with full picture controls. The GPU can be used for deinterlacing. This requires a faster GPU than XVideo.</source>
+        <translation>Este generador de imagen usa OpenGL para el ajuste y conversión de colores e incluye controles de imagen. La GPU puede usarse para desentrelazar. Esto requiere una GPU más rápida que XVideo.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/dbsettings.cpp" line="243"/>
         <source>Required fields are marked with an asterisk (*).</source>
         <translation>Los campos obligatorios están marcados con asterisco (*).</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1259"/>
+        <source>This video renderer uses VAAPI for video decoding and OpenGL for scaling and color conversion.</source>
+        <translation>Este generador de imagen usa VAAPI para decodificar la imagen y OpenGL para el ajuste y conversión de color.</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1272"/>
+        <source>This video renderer uses VAAPI for video decoding and OpenGL for scaling and color conversion.</source>
+        <translation>Este generador de imagen usa VAAPI para decodificar la imagen y OpenGL para el ajuste y conversión de color.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/mythcontext.cpp" line="163"/>
         <source>Could not find specified tuner (%1).</source>
         <translation>No fue posible encontrar el sintonizador especificado (%1).</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1295"/>
+        <source>This deinterlacer requires the display to be capable of twice the frame rate as the source video.</source>
+        <translation>Este desentrelazador requiere que la pantalla sea capaz de doblar la tasa de fotogramas respecto de la fuente de vídeo.</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1308"/>
+        <source>This deinterlacer requires the display to be capable of twice the frame rate as the source video.</source>
+        <translation>Este desentrelazador requiere que la pantalla sea capaz de doblar la tasa de fotogramas respecto de la fuente de vídeo.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/mythcontext.cpp" line="166"/>
         <source>Specified tuner (%1) is already in use.</source>
         <translation>El sintonizador especificado (%1) ya está en uso.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1300"/>
+        <source>Perform no deinterlacing.</source>
+        <translation>No desentrelazar.</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1313"/>
+        <source>Perform no deinterlacing.</source>
+        <translation>No desentrelazar.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/mythcontext.cpp" line="171"/>
         <source>All tuners are currently in use. If you want to watch TV, you can cancel one of the in-progress recordings from the delete menu</source>
         <translation>Todos los sintonizadores están en uso. Si desea ver la TV, puede cancelar una de las grabaciones en curso desde el menú eliminar</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1301"/>
+        <source>Use this with an interlaced display whose resolution exactly matches the video size. This is incompatible with MythTV zoom modes.</source>
+        <translation>Úselo con una pantalla entrelazada cuya resolución sea igual al tamaño de la imagen. Es incompatible con los modos de ampliación de MythTV.</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1314"/>
+        <source>Use this with an interlaced display whose resolution exactly matches the video size. This is incompatible with MythTV zoom modes.</source>
+        <translation>Úselo con una pantalla entrelazada cuya resolución sea igual al tamaño de la imagen. Es incompatible con los modos de ampliación de MythTV.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/mythcontext.cpp" line="373"/>
         <source>No UPnP backends found</source>
         <comment>Backend Setup</comment>
         <translation>No se encontraron servidores UPnP</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1306"/>
+        <source>Shows only one of the two fields in the frame. This looks good when displaying a high motion 1080i video on a 720p display.</source>
+        <translation>Muestra sólo uno de los dos campos de cada fotograma. Proporciona una buena imagen al mostrar un vídeo 1080i de mucho movimiento en una pantalla 720p.</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1319"/>
+        <source>Shows only one of the two fields in the frame. This looks good when displaying a high motion 1080i video on a 720p display.</source>
+        <translation>Muestra sólo uno de los dos campos de cada fotograma. Proporciona una buena imagen al mostrar un vídeo 1080i de mucho movimiento en una pantalla 720p.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/mythcontext.cpp" line="688"/>
         <source>Cannot find (ping) database host %1 on the network</source>
         <comment>Backend Setup</comment>
         <translation>No fue posible encontrar (ping) el nodo %1 de la base de datos en la red</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1311"/>
+        <source>Shows one field of the frame followed by the other field displaced vertically.</source>
+        <translation>Muestra un campo del fotograma seguido por el otro campo desplazado verticalmente.</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1324"/>
+        <source>Shows one field of the frame followed by the other field displaced vertically.</source>
+        <translation>Muestra un campo del fotograma seguido por el otro campo desplazado verticalmente.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/mythcontext.cpp" line="703"/>
         <source>Cannot login to database</source>
         <comment>Backend Setup</comment>
         <translation>No fue posible acceder a la base de datos</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1316"/>
+        <source>Blends the odd and even fields linearly into one frame.</source>
+        <translation>Mezcla linealmente los campos pares e impares en un sólo fotograma.</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1329"/>
+        <source>Blends the odd and even fields linearly into one frame.</source>
+        <translation>Mezcla linealmente los campos pares e impares en un sólo fotograma.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/mythcontext.cpp" line="1005"/>
         <source>The connection to the master backend server has gone away for some reason. Is it running?</source>
         <translation>La conexión al servidor principal se ha perdido por alguna razón. ¿Está ejecutándose?</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1319"/>
+        <source>This filter disables deinterlacing when the two fields are similar, and performs linear deinterlacing otherwise.</source>
+        <translation>Este filtro desactiva el desentrelazado cuando los dos campos son similares, y realiza un desentrelazado lineal en los demás casos.</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1332"/>
+        <source>This filter disables deinterlacing when the two fields are similar, and performs linear deinterlacing otherwise.</source>
+        <translation>Este filtro desactiva el desentrelazado cuando los dos campos son similares, y realiza un desentrelazado lineal en los demás casos.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/mythcontext.cpp" line="1009"/>
         <source>Could not connect to the master backend server. Is it running?  Is the IP address set for it in mythtv-setup correct?</source>
         <translation>No fue posible conectar con el servidor principal. ¿Está ejecutándose? ¿Su dirección IP fue correctamente definida en mythtv-setup?</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1323"/>
+        <source>(Hardware Accelerated)</source>
+        <translation>(Acelerado por Hardware)</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1336"/>
+        <source>(Hardware Accelerated)</source>
+        <translation>(Acelerado por Hardware)</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/mythcontext.cpp" line="1108"/>
         <source>This application is not compatible with the installed MythTV libraries.</source>
         <translation>Esta aplicación no es compatible con las bibliotecas de MythTV instaladas.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1325"/>
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1329"/>
+        <source>This deinterlacer uses several fields to reduce motion blur. It has increased CPU requirements.</source>
+        <translation>lEste desentrelazador usa varios campos para reducir la difuminación del movimiento. Posee mayores requisitos de CPU.</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1338"/>
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1342"/>
+        <source>This deinterlacer uses several fields to reduce motion blur. It has increased CPU requirements.</source>
+        <translation>lEste desentrelazador usa varios campos para reducir la difuminación del movimiento. Posee mayores requisitos de CPU.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/mythcontext.cpp" line="1191"/>
         <source>Plugin %1 is not compatible with the installed MythTV libraries.</source>
         <translation>El complemento %1 no es compatible con las bibliotecas de MythTV instaladas.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1338"/>
+        <source>This deinterlacer uses several fields to reduce motion blur. </source>
+        <translation>Este desentrelazador usa varios campor para reducir la difuminación del movimiento. </translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1351"/>
+        <source>This deinterlacer uses several fields to reduce motion blur. </source>
+        <translation>Este desentrelazador usa varios campor para reducir la difuminación del movimiento. </translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/mythcontext.cpp" line="1036"/>
         <source>The server uses network protocol version %1, but this client only understands version %2.  Make sure you are running compatible versions of the backend and frontend.</source>
         <translation>El servidor usa el protocolo de red versión %1, pero este cliente sólo comprende la versión %2.  Asegúrese de que está ejecutando versiones compatibles del servidor y el cliente.</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1341"/>
+        <source>This deinterlacer uses multiple fields to reduce motion blur and smooth edges. </source>
+        <translation>Este desentrelazador usa múltiples campos para reducir la difuminación del movimiento y suavizar los bordes. </translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1354"/>
+        <source>This deinterlacer uses multiple fields to reduce motion blur and smooth edges. </source>
+        <translation>Este desentrelazador usa múltiples campos para reducir la difuminación del movimiento y suavizar los bordes. </translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythbase/mythcorecontext.cpp" line="201"/>
         <source>This application is not compatible with the installed MythTV libraries. Please recompile after a make distclean</source>
         <translation>Esta aplicación no es compatible con las bibliotecas de MythTV instaladas. Por favor, recompile tras ejecutar &apos;make distclean&apos;</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1398"/>
+        <source>&apos;%1&apos; has not been documented yet.</source>
+        <translation>&apos;%1&apos; aún no ha sido documentado.</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1411"/>
+        <source>&apos;%1&apos; has not been documented yet.</source>
+        <translation>&apos;%1&apos; aún no ha sido documentado.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/avformatdecoder.cpp" line="3669"/>
         <source> (Audio Description)</source>
         <comment>Audio described for the visually impaired</comment>
         <translation> (Descripción Sonora)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1420"/>
+        <source>OSD rendering method</source>
+        <translation>Método de generación de la OSD</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1433"/>
+        <source>OSD rendering method</source>
+        <translation>Método de generación de la OSD</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/avformatdecoder.cpp" line="3673"/>
         <source> (Commentary)</source>
         <comment>Audio commentary track</comment>
         <translation> (Comentarios)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1426"/>
+        <source>Render the OSD using the XVideo chromakey feature.This renderer does not alpha blend but is the fastest OSD renderer for XVideo.</source>
+        <translation>Genera la OSD usando la característica &apos;chromakey&apos; de XVideo. Este generador no produce transparencia, pero es el más rápido para XVideo.</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1439"/>
+        <source>Render the OSD using the XVideo chromakey feature.This renderer does not alpha blend but is the fastest OSD renderer for XVideo.</source>
+        <translation>Genera la OSD usando la característica &apos;chromakey&apos; de XVideo. Este generador no produce transparencia, pero es el más rápido para XVideo.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/avformatdecoder.cpp" line="3710"/>
         <source>Subtitle</source>
         <translation>Subtítulo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1430"/>
+        <source>Note: nVidia hardware after the 5xxx series does not have XVideo chromakey support.</source>
+        <translation>Nota: el hardware nVidia posterior a la serie 5xxx no admite &apos;chromakey&apos; de XVideo.</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1443"/>
+        <source>Note: nVidia hardware after the 5xxx series does not have XVideo chromakey support.</source>
+        <translation>Nota: el hardware nVidia posterior a la serie 5xxx no admite &apos;chromakey&apos; de XVideo.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/avformatdecoder.cpp" line="3712"/>
         <source> (forced)</source>
         <translation> (forzado)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1437"/>
+        <source>Software OSD rendering uses your CPU to alpha blend the OSD.</source>
+        <translation>La generación de la OSD por software usa su CPU para hacer transparente la OSD.</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1450"/>
+        <source>Software OSD rendering uses your CPU to alpha blend the OSD.</source>
+        <translation>La generación de la OSD por software usa su CPU para hacer transparente la OSD.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/cardutil.cpp" line="2115"/>
         <source>New Input</source>
         <translation>Nueva Entrada</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1443"/>
+        <source>Uses OpenGL to alpha blend the OSD onto the video.</source>
+        <translation>Usa OpenGL para hacer transparente la OSD sobre la imagen.</translation>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1456"/>
+        <source>Uses OpenGL to alpha blend the OSD onto the video.</source>
+        <translation>Usa OpenGL para hacer transparente la OSD sobre la imagen.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../libs/libmyth/programtypes.cpp" line="343"/>
@@ -14921,282 +26530,648 @@ Su capturador no proporciona números de canal, así que tendrá que definirlos
         <translation>5.1</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="264"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="238"/>
+        <source>Run transcoder</source>
+        <translation>Ejecutar el transcodificador</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="277"/>
+        <source>This is the default value used for the &apos;Run %1&apos; setting when a new scheduled recording is created.</source>
+        <translation>Valor predeterminado usado para &apos;Ejecutar %1&apos; al programar una nueva grabación.</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="333"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="272"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Treat consecutive commercial breaks shorter than this as one break when skipping forward. Useful if you have to skip a few times during breaks. Applies to automatic skipping as well. Set to 0 to disable.</source>
         <translation>Tratar las pausas publicitarias consecutivas menores que esta cantidad como una sola pausa al saltar adelante. Resulta útil si usted tiene que saltar unas cuantas veces durante las pausas. Aplicable también al salto automático. Establézcalo a 0 para desactivarlo.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="319"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="384"/>
+        <source>Expire in deleted order</source>
+        <translation>Expirar en el orden de eliminación</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="399"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="323"/>
+        <source>Expire in deleted order</source>
+        <translation>Expirar en el orden de eliminación</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="338"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>DeletedExpireOptions</source>
         <translation>Opciones de Expiración de Eliminadas</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="507"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="599"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="527"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Profile Item</source>
         <translation>Elemento de Perfil</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="777"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="869"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="797"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Main deinterlacing method.</source>
         <translation>Método principal de desentrelazado.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="784"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="876"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="804"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Fallback deinterlacing method.</source>
         <translation>Método alternativo de desentrelazado.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="810"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="902"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="830"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>&amp;</source>
         <comment>and</comment>
         <translation>y</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="813"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="905"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="833"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>if rez</source>
         <translation>si la res</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="866"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/deletemap.cpp" line="169"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="958"/>
+=======
+        <location filename="../libs/libmythtv/deletemap.cpp" line="184"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="886"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="889"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="981"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="909"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Add New Entry</source>
         <translation>Añadir Nueva Entrada</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1037"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1129"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1057"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Playback Profiles</source>
         <translation>Perfiles de Reproducción</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1106"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1190"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1126"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Current Video Playback Profile</source>
         <translation>Perfil de Reproducción Actual</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1116"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1200"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1136"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Add New</source>
         <translation>Añadir Nuevo</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1155"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1239"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1175"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Enter Playback Group Name</source>
         <translation>Introduzca el Nombre del Grupo de Reproducción</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1168"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1252"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1188"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Sorry, playback group name
 &apos;%1&apos; is already being used.</source>
         <translation>Lo siento, el nombre del grupo de reproducción
 &apos;%1&apos; ya está en uso.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1173"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1257"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1193"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1333"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1444"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1363"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Vertical scaling</source>
         <translation>Ajuste vertical</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1335"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1446"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1365"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Adjust this if the image does not fill your screen vertically. Range -100% to 100%</source>
         <translation>Ajústelo si la imagen no llena verticalmente su pantalla. Intervalo: -100% a 100%</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1344"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1455"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1374"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Horizontal scaling</source>
         <translation>Ajuste horizontal</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1346"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1457"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1376"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Adjust this if the image does not fill your screen horizontally. Range -100% to 100%</source>
         <translation>Ajústelo si la imagen no llena horizontalmente su pantalla. Intervalo: -100% a 100%</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1451"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1486"/>
+        <source>If enabled, captions will be displayed over a black background for better contrast.</source>
+        <translation>Si se activa, los subtítulos se mostrarán sobre fondo negro para lograr un mejor contraste.</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1509"/>
+        <source>Prefer EIA-708 over EIA-608 captions</source>
+        <translation>Preferir subtítulos EIA-708 en vez de EIA-608</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1587"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1481"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Always prompt (excluding Live TV)</source>
         <translation>Preguntar siempre (excepto TV en Vivo)</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1452"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1588"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1482"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Always prompt (including Live TV)</source>
         <translation>Preguntar siempre (incluyendo TV en Vivo)</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1453"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1589"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1483"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Prompt for Live TV only</source>
         <translation>Preguntar sólo en la TV en Vivo</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1502"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1638"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1532"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Automatically mark a recording as watched</source>
         <translation>Marcar automáticamente una grabación como vista</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1581"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1717"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1611"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Show quit</source>
         <translation>Mostrar salir</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1582"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1718"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1612"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Show quit and shutdown</source>
         <translation>Mostrar salir y apagar</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1583"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1719"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1613"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Show quit, reboot and shutdown</source>
         <translation>Mostrar salir, reiniciar y apagar</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1584"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1720"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1614"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Show shutdown</source>
         <translation>Mostrar apagar</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1585"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1721"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1615"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Show reboot</source>
         <translation>Mostrar reiniciar</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1586"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1722"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1616"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Show reboot and shutdown</source>
         <translation>Mostrar reiniciar y apagar</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1587"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1723"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1617"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>By default, only remote frontends are shown the shutdown option on the exit menu. Here you can force specific shutdown and reboot options to be displayed.</source>
         <translation>Por defecto, sólo en los clientes remotos se muestra la opción de apagado en el menú de salida. Aquí puede forzar que se muestren opciones específicas de apagado y reinicio.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1596"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1732"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1626"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Reboot command</source>
         <translation>Orden de reinicio</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1692"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1836"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1730"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>By default MythTV uses black letterboxing to match broadcaster letterboxing, but those with plasma screens may prefer gray to minimize burn-in.</source>
         <translation>Por defecto, MythTV usa franjas negras para coincidir con las del emisor, pero los que usen pantallas de plasma pueden preferir las grises para minimizar el desgaste.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1696"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1840"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1734"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Currently only works with XVideo video renderer.</source>
         <translation>Por ahora sólo funciona con el generador de imagen XVideo.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1706"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1850"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1744"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>When enabled, these will override the aspect ratio specified by any broadcaster for all video streams.</source>
         <translation>Si se activa, se ignorará la relación de aspecto especificada por las emisoras de tramas de vídeo.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1716"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1860"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1754"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Zoom</source>
         <translation>Ampliación</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1723"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1867"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1761"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>When enabled, these will apply a predefined zoom to all video playback in MythTV.</source>
         <translation>Si se activa, se aplicará una ampliación predefinida a todas las reproducciones de vídeo en MythTV.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1779"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1923"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1817"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Horizontal size of the monitor or TV. Used to calculate the actual aspect ratio of the display. This will override the DisplaySize from the system.</source>
         <translation>Tamaño horizontal del monitor o TV. Se usa para calcular la relación de aspecto real de la pantalla. Ignorará el atributo &quot;DisplaySize&quot; del sistema.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1790"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1934"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1828"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Vertical size of the monitor or TV. Used to calculate the actual aspect ratio of the display. This will override the DisplaySize from the system.</source>
         <translation>Tamaño vertical del monitor o TV. Se usa para calcular la relación de aspecto real de la pantalla. Ignorará el atributo &quot;DisplaySize&quot; del sistema.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2209"/>
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2257"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2353"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2401"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2247"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2295"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Remember last channel group</source>
         <translation>Recordar el último grupo de canales</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2210"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2354"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2248"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>If enabled, the EPG will initially display only the channels from the last channel group selected. Pressing &quot;4&quot; will toggle channel group.</source>
         <translation>Si se activa, la EPG mostrará inicialmente sólo los canales del último grupo de canales seleccionado. Pulsar &quot;4&quot; cambiará el grupo de canales.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2220"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2364"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2258"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Default channel group</source>
         <translation>Grupo de canales predeterminado</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2233"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2377"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2271"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Default channel group to be shown in the the EPGPressing GUIDE key will toggle channel group.</source>
         <translation>Grupo de canales predeterminado a mostrar en la EPG. Pulsar el botón GUIDE cambiará el grupo de canales.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2328"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2502"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2366"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Additional priority when a showing is marked as widescreen in the TV listings.</source>
         <translation>Prioridad adicional a aplicar cuando un programa esté marcado como panorámico en las listas de TV.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2351"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2525"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2389"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Additional priority when a showing is marked as having in-vision sign language.</source>
         <translation>Prioridad adicional a aplicar cuando un programa esté marcado por incluir lengua de signos.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2361"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2535"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2399"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>In-vision Subtitles Recording Priority</source>
         <translation>Prioridad de Grabación de Subtítulos de Signos</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2362"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2536"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2400"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Additional priority when a showing is marked as having in-vision subtitles.</source>
         <translation>Prioridad adicional a aplicar cuando un programa esté marcado por incluir subtítulos de signos.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2373"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2547"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2411"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Additional priority when a showing is marked as having subtitles or closed captioning (CC) available.</source>
         <translation>Prioridad adicional a aplicar cuando un programa esté marcado por incluir subtítulos.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2385"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2559"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2423"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Additional priority when a showing is marked as having support for viewers with impaired hearing.</source>
         <translation>Prioridad adicional a aplicar cuando un programa esté marcado por incluir ayuda para espectadores con discapacidad auditiva.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2397"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2571"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2435"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Additional priority when a showing is marked as being Audio Described.</source>
         <translation>Prioridad adicional a aplicar cuando un programa esté marcado por incluir Descripción mediante Sonido.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2691"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2786"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2650"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source> (and other removable devices)</source>
         <translation> (y otros dispositivos extraíbles)</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2717"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2812"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2676"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>MythMediaMonitor</source>
         <translation>MythMediaMonitor</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="3257"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3352"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3216"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Settings Access</source>
         <translation>Acceso a la Configuración</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="3298"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3373"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3237"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Shutdown/Reboot Settings</source>
         <translation>Configuración del Apagado/Reinicio</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="3316"/>
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="3343"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3400"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3427"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3264"/>
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3291"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>General Playback</source>
         <translation>Reproducción General</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="3387"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3471"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3335"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Recording Groups</source>
         <translation>Grupos de Grabación</translation>
     </message>
@@ -15781,7 +27756,62 @@ Su capturador no proporciona números de canal, así que tendrá que definirlos
         <translation>Cola de Tareas (Específica del Servidor)</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/mythmediamonitor.cpp" line="256"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="358"/>
+        <source>Tuner %1 is recording:
+</source>
+        <translation>El sintonizador %1 está grabando:
+</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="369"/>
+        <source>Tuner %1 is not recording</source>
+        <translation>El sintonizador %1 no está grabando</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="80"/>
+        <source>Date Format</source>
+        <translation>Formato de Fecha</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="82"/>
+        <source>This is the format to use to display the date. See http://doc.trolltech.com/3.3/qdate.html#toString for a list of valid format specifiers.</source>
+        <translation>Formato a usar para mostrar la fecha. Ver en: http://doc.trolltech.com/3.3/qdate.html#toString una lista de formatos válidos.</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmyth/mythcontext.cpp" line="627"/>
+        <source>Cannot login to database?</source>
+        <translation>¿No es posible acceder a la base de datos?</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmyth/mythmediamonitor.cpp" line="248"/>
+=======
+        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="358"/>
+        <source>Tuner %1 is recording:
+</source>
+        <translation>El sintonizador %1 está grabando:
+</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="369"/>
+        <source>Tuner %1 is not recording</source>
+        <translation>El sintonizador %1 no está grabando</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="80"/>
+        <source>Date Format</source>
+        <translation>Formato de Fecha</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="82"/>
+        <source>This is the format to use to display the date. See http://doc.trolltech.com/3.3/qdate.html#toString for a list of valid format specifiers.</source>
+        <translation>Formato a usar para mostrar la fecha. Ver en: http://doc.trolltech.com/3.3/qdate.html#toString una lista de formatos válidos.</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmyth/mythmediamonitor.cpp" line="248"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Unable to open or close the empty drive %1.
 
 You may have to use the eject button under its tray.</source>
@@ -15789,35 +27819,301 @@ You may have to use the eject button under its tray.</source>
 
 Tendrá que usar el botón de expulsión de la bandeja.</translation>
     </message>
+<<<<<<< HEAD
+    <message>
+        <location filename="../libs/libmythtv/decoderbase.cpp" line="1058"/>
+        <source>TXT File</source>
+        <comment>Text File</comment>
+        <translation>Archivo TXT</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+    <message>
+        <location filename="../libs/libmythtv/decoderbase.cpp" line="1018"/>
+        <source>TXT File</source>
+        <comment>Text File</comment>
+        <translation>Archivo TXT</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="483"/>
+        <source>Failed to initialize video output</source>
+        <translation>Fallo al inicializar la salida de imagen</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="583"/>
+        <source>Failed to reinitialize video output</source>
+        <translation>Fallo al reinicializar la salida de imagen</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="562"/>
+        <source>Need to switch video renderer.</source>
+        <translation>Es necesario cambiar de generador de imagen.</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="1561"/>
+        <source>Forced Subtitles On</source>
+        <translation>Subtítulos Forzados Activados</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="1562"/>
+        <source>Forced Subtitles Off</source>
+        <translation>Subtítulos Forzados Desactivados</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="1784"/>
+        <source>Failed to initialize A/V Sync</source>
+        <translation>Fallo al inicializar la Sincr. A/V</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="1863"/>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="2027"/>
+        <source>Serious error detected in Video Output</source>
+        <translation>Detectado un error grave en la Salida de Vídeo</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="2103"/>
+        <source>Video frame buffering failed too many times.</source>
+        <translation>La memoria temporal de las tramas de vídeo falló demasiadas veces.</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="2477"/>
+        <source>Error opening switch program buffer</source>
+        <translation>Error al abrir la memoria temporal del cambio de programa</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="2502"/>
+        <source>Error opening switch program file</source>
+        <translation>Error al abrir el archivo de cambio de programa</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="2611"/>
+        <source>Error opening jump program file buffer</source>
+        <translation>Error al abrir la memoria temporal del archivo de salto de programa</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="2621"/>
+        <source>Error opening jump program file</source>
+        <translation>Error al abrir el archivo de salto de programa</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="2630"/>
+        <source>Error reopening video decoder</source>
+        <translation>Error al reabrir el decodificador de imagen</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="2822"/>
+        <source>Irrecoverable recorder error</source>
+        <translation>Error irrecuperable del grabador</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="3714"/>
+        <source>Searching</source>
+        <translation>Buscando</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="3805"/>
+        <source>Using previously auto-saved cuts</source>
+        <translation>Usando los cortes anteriormente autoguardados</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="3929"/>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="3967"/>
+        <source>New cut added.</source>
+        <translation>Nuevo corte añadido.</translation>
+=======
+    <message>
+        <location filename="../libs/libmythtv/decoderbase.cpp" line="1018"/>
+        <source>TXT File</source>
+        <comment>Text File</comment>
+        <translation>Archivo TXT</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="483"/>
+        <source>Failed to initialize video output</source>
+        <translation>Fallo al inicializar la salida de imagen</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="583"/>
+        <source>Failed to reinitialize video output</source>
+        <translation>Fallo al reinicializar la salida de imagen</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="562"/>
+        <source>Need to switch video renderer.</source>
+        <translation>Es necesario cambiar de generador de imagen.</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="1561"/>
+        <source>Forced Subtitles On</source>
+        <translation>Subtítulos Forzados Activados</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="1562"/>
+        <source>Forced Subtitles Off</source>
+        <translation>Subtítulos Forzados Desactivados</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="1784"/>
+        <source>Failed to initialize A/V Sync</source>
+        <translation>Fallo al inicializar la Sincr. A/V</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="1863"/>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="2027"/>
+        <source>Serious error detected in Video Output</source>
+        <translation>Detectado un error grave en la Salida de Vídeo</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="2103"/>
+        <source>Video frame buffering failed too many times.</source>
+        <translation>La memoria temporal de las tramas de vídeo falló demasiadas veces.</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="2460"/>
+        <source>Error opening switch program buffer</source>
+        <translation>Error al abrir la memoria temporal del cambio de programa</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="2485"/>
+        <source>Error opening switch program file</source>
+        <translation>Error al abrir el archivo de cambio de programa</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="2594"/>
+        <source>Error opening jump program file buffer</source>
+        <translation>Error al abrir la memoria temporal del archivo de salto de programa</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="2604"/>
+        <source>Error opening jump program file</source>
+        <translation>Error al abrir el archivo de salto de programa</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="2613"/>
+        <source>Error reopening video decoder</source>
+        <translation>Error al reabrir el decodificador de imagen</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="2805"/>
+        <source>Irrecoverable recorder error</source>
+        <translation>Error irrecuperable del grabador</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="3689"/>
+        <source>Searching</source>
+        <translation>Buscando</translation>
+    </message>
     <message>
-        <location filename="../libs/libmythtv/decoderbase.cpp" line="1058"/>
-        <source>TXT File</source>
-        <comment>Text File</comment>
-        <translation>Archivo TXT</translation>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="3780"/>
+        <source>Using previously auto-saved cuts</source>
+        <translation>Usando los cortes anteriormente autoguardados</translation>
     </message>
     <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="3904"/>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="3942"/>
+        <source>New cut added.</source>
+        <translation>Nuevo corte añadido.</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
+    </message>
+    <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="9849"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="9868"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="3940"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9486"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9505"/>
+=======
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="3915"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9540"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9559"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Undo Changes</source>
         <translation>Deshacer Cambios</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="9828"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="3971"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9465"/>
+=======
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="3946"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9519"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Undo</source>
         <translation>Deshacer</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="9832"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="3976"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9469"/>
+=======
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="3951"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9523"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Redo</source>
         <translation>Rehacer</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="4593"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="4974"/>
+        <source>Enabled Studio Levels</source>
+        <translation>Niveles de Estudio Activados</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="4975"/>
+        <source>Disabled Studio Levels</source>
+        <translation>Niveles de Estudio Desactivados</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="4999"/>
+        <source>Enabled Night Mode</source>
+        <translation>Activar Modo Nocturno</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="5005"/>
+        <source>Disabled Night Mode</source>
+        <translation>Desactivar Modo Nocturno</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="4529"/>
+=======
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="4962"/>
+        <source>Enabled Studio Levels</source>
+        <translation>Niveles de Estudio Activados</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="4963"/>
+        <source>Disabled Studio Levels</source>
+        <translation>Niveles de Estudio Desactivados</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="4987"/>
+        <source>Enabled Night Mode</source>
+        <translation>Activar Modo Nocturno</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="4993"/>
+        <source>Disabled Night Mode</source>
+        <translation>Desactivar Modo Nocturno</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="4538"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Bookmark Saved</source>
         <translation>Marcador Guardado</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="4583"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="4519"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="4528"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Bookmark Cleared</source>
         <translation>Marcador Eliminado</translation>
     </message>
@@ -16098,12 +28394,24 @@ Tendrá que usar el botón de expulsión de la bandeja.</translation>
         <translation>Nueva Zelanda</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4902"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4885"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4884"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Blank Frame + Logo Detection</source>
         <translation>Fotograma Vacío + Detección de Logotipo</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4904"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4887"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4886"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Scene Change + Logo Detection</source>
         <translation>Cambio de Escena + Detección de Logotipo</translation>
     </message>
@@ -16161,9 +28469,19 @@ Tendrá que usar el botón de expulsión de la bandeja.</translation>
         <translation>Error: falló el manejador de tramas</translation>
     </message>
     <message numerus="yes">
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="1481"/>
         <location filename="../libs/libmyth/programinfo.cpp" line="1486"/>
         <location filename="../libs/libmythtv/recordingrule.cpp" line="566"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="1475"/>
+        <location filename="../libs/libmyth/programinfo.cpp" line="1480"/>
+        <location filename="../libs/libmythtv/recordingrule.cpp" line="458"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="1477"/>
+        <location filename="../libs/libmyth/programinfo.cpp" line="1482"/>
+        <location filename="../libs/libmythtv/recordingrule.cpp" line="556"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>%n hour(s)</source>
         <translation>
             <numerusform>%n hora</numerusform>
@@ -16171,11 +28489,31 @@ Tendrá que usar el botón de expulsión de la bandeja.</translation>
         </translation>
     </message>
     <message numerus="yes">
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="1470"/>
         <location filename="../libs/libmyth/programinfo.cpp" line="1479"/>
         <location filename="../libs/libmythmetadata/metadatacommon.cpp" line="427"/>
         <location filename="../libs/libmythtv/recordingrule.cpp" line="557"/>
         <location filename="../libs/libmythtv/recordingrule.cpp" line="561"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="1464"/>
+        <location filename="../libs/libmyth/programinfo.cpp" line="1473"/>
+        <location filename="../libs/libmythmetadata/metadatacommon.cpp" line="426"/>
+        <location filename="../libs/libmythtv/deletemap.cpp" line="130"/>
+        <location filename="../libs/libmythtv/deletemap.cpp" line="131"/>
+        <location filename="../libs/libmythtv/deletemap.cpp" line="132"/>
+        <location filename="../libs/libmythtv/recordingrule.cpp" line="449"/>
+        <location filename="../libs/libmythtv/recordingrule.cpp" line="453"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="1466"/>
+        <location filename="../libs/libmyth/programinfo.cpp" line="1475"/>
+        <location filename="../libs/libmythmetadata/metadatacommon.cpp" line="426"/>
+        <location filename="../libs/libmythtv/deletemap.cpp" line="130"/>
+        <location filename="../libs/libmythtv/deletemap.cpp" line="131"/>
+        <location filename="../libs/libmythtv/deletemap.cpp" line="132"/>
+        <location filename="../libs/libmythtv/recordingrule.cpp" line="547"/>
+        <location filename="../libs/libmythtv/recordingrule.cpp" line="551"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>%n minute(s)</source>
         <translation>
             <numerusform>%n minuto</numerusform>
@@ -16183,18 +28521,40 @@ Tendrá que usar el botón de expulsión de la bandeja.</translation>
         </translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="868"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="865"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="869"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Manual Record</source>
         <translation>Grabación Manual</translation>
     </message>
+<<<<<<< HEAD
     <message>
         <location filename="../libs/libmyth/programinfo.cpp" line="1463"/>
         <source>%1 GB</source>
         <comment>GigaBytes</comment>
         <translation>%1 GB</translation>
     </message>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+=======
+    <message>
+        <location filename="../libs/libmyth/programinfo.cpp" line="1459"/>
+        <source>%1 GB</source>
+        <comment>GigaBytes</comment>
+        <translation>%1 GB</translation>
+    </message>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     <message numerus="yes">
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="1574"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="1566"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="1568"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>%n star(s)</source>
         <translation>
             <numerusform>%n estrella</numerusform>
@@ -16202,227 +28562,461 @@ Tendrá que usar el botón de expulsión de la bandeja.</translation>
         </translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="1614"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="1604"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="1606"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>DVD</source>
         <translation>DVD</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="1618"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="1608"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="1610"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>HTTP Streaming</source>
         <translation>Difusión HTTP</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="1622"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="1612"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="1614"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>RTSP Streaming</source>
         <translation>Difusión RTSP</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="1626"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="1616"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="1618"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Blu-ray Disc</source>
         <translation>Disco Blu-ray</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="1631"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="1621"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="1623"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Recording</source>
         <comment>Recorded file, object not action</comment>
         <translation>Grabación</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="2745"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="2738"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="2737"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>File transfer</source>
         <translation>Transferencia de archivos</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="2749"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="2742"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="2741"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Commercial Detection</source>
         <translation>Detección de Anuncios</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="2753"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="2746"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="2745"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Preview Generation</source>
         <translation>Generación de Previsualización</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="2755"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="2748"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="2747"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>User Job</source>
         <translation>Tarea de Usuario</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4304"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4295"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4294"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Default</source>
         <comment>Recording Profile Default</comment>
         <translation>Predeterminado</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4305"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4296"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4295"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>High Quality</source>
         <comment>Recording Profile High Quality</comment>
         <translation>Calidad Alta</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4306"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4297"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4296"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Live TV</source>
         <comment>Recording Profile Live TV</comment>
         <translation>TV en Vivo</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4307"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4298"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4297"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Low Quality</source>
         <comment>Recording Profile Low Quality</comment>
         <translation>Calidad Baja</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4308"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4299"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4298"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Medium Quality</source>
         <comment>Recording Profile Medium Quality</comment>
         <translation>Calidad Media</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4309"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4300"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4299"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>MPEG-2</source>
         <comment>Recording Profile MPEG-2</comment>
         <translation>MPEG-2</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4310"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4301"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4300"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>RTjpeg/MPEG-4</source>
         <comment>Recording Profile RTjpeg/MPEG-4</comment>
         <translation>RTjpeg/MPEG-4</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4332"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4323"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4322"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Software Encoders (V4L based)</source>
         <comment>Recording Profile Group Name</comment>
         <translation>Codificadores Software (basados en V4L)</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4336"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4327"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4326"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>USB MPEG-4 Encoder (Plextor ConvertX, etc)</source>
         <comment>Recording Profile Group Name</comment>
         <translation>Codificador MPEG-4 USB (Plextor ConvertX, etc.)</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4341"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4332"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4331"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>All</source>
         <comment>Recording Group All Programs -- short form</comment>
         <translation>Todos</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4342"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4333"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4332"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Live TV</source>
         <comment>Recording Group Live TV</comment>
         <translation>TV en Vivo</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4348"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4339"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4338"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Live TV</source>
         <comment>Storage Group Name</comment>
         <translation>TV en Vivo</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4314"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4305"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4304"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>CRC IP Recorders</source>
         <comment>Recording Profile Group Name</comment>
         <translation>Grabadores CRC IP</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4316"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4307"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4306"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>FireWire Input</source>
         <comment>Recording Profile Group Name</comment>
         <translation>Entrada FireWire</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4318"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4309"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4308"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Freebox Input</source>
         <comment>Recording Profile Group Name</comment>
         <translation>Entrada Freebox</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4320"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4311"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4310"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Hardware DVB Encoders</source>
         <comment>Recording Profile Group Name</comment>
         <translation>Codificadores DVB Hardware</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4322"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4313"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4312"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Hardware HDTV</source>
         <comment>Recording Profile Group Name</comment>
         <translation>HDTV Hardware</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4324"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4315"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4314"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Hardware MJPEG Encoders (Matrox G200-TV, Miro DC10, etc)</source>
         <comment>Recording Profile Group Name</comment>
         <translation>Codificadores MJPEG Hardware (Matrox G200-TV, Miro DC10, etc.)</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4326"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4317"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4316"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>HD-PVR Recorders</source>
         <comment>Recording Profile Group Name</comment>
         <translation>Grabadores HD-PVR</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4328"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4319"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4318"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>HDHomeRun Recorders</source>
         <comment>Recording Profile Group Name</comment>
         <translation>Grabadores HDHomeRun</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4330"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4321"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4320"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>MPEG-2 Encoders (PVR-x50, PVR-500)</source>
         <comment>Recording Profile Group Name</comment>
         <translation>Codificadores MPEG-2 (PVR-x50, PVR-500)</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4334"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4325"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4324"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Transcoders</source>
         <comment>Recording Profile Group Name</comment>
         <translation>Transcodificadores</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4340"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4331"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4330"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>All Programs</source>
         <comment>Recording Group All Programs</comment>
         <translation>Todos los Programas</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4343"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4334"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4333"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Default</source>
         <comment>Recording Group Default</comment>
         <translation>Predeterminado</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4344"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4335"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4334"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Deleted</source>
         <comment>Recording Group Deleted</comment>
         <translation>Eliminado</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4347"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4338"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4337"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Default</source>
         <comment>Storage Group Name</comment>
         <translation>Predeterminado</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4349"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4340"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4339"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Thumbnails</source>
         <comment>Storage Group Name</comment>
         <translation>Miniaturas</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4350"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4341"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4340"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>DB Backups</source>
         <comment>Storage Group Name</comment>
         <translation>Copias de Seguridad de la BD</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4353"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4344"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4343"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Default</source>
         <comment>Playback Group Name</comment>
         <translation>Predeterminado</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="4915"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="4898"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="4897"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Pre &amp; Post Roll</source>
         <translation>Pre y Post Visualización</translation>
     </message>
@@ -16500,12 +29094,24 @@ Tendrá que usar el botón de expulsión de la bandeja.</translation>
         <translation>Reducido</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1260"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1246"/>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1259"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>This video renderer uses OpenGL for scaling and color conversion. It uses faster OpenGL functionality when available but at the expense of picture controls and GPU based deinterlacing.</source>
         <translation>Este generador de imagen usa OpenGL para el ajuste y conversión de colores. Usa funciones OpenGL más rápidas si están disponibles pero a expensas de los controles de imagen y desentralazado mediante GPU.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1267"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1253"/>
+=======
+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1266"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>This is the only video renderer for NVidia VDPAU decoding.</source>
         <translation>Éste es el único generador de imagen para la decodificación VDPAU de NVidia.</translation>
     </message>
@@ -16650,7 +29256,15 @@ Tendrá que usar el botón de expulsión de la bandeja.</translation>
     </message>
     <message>
         <location filename="../libs/libmythtv/jobqueue.h" line="30"/>
+<<<<<<< HEAD
         <location filename="../programs/mythcommflag/main.cpp" line="436"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="3849"/>
+        <location filename="../programs/mythcommflag/main.cpp" line="434"/>
+=======
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="3824"/>
+        <location filename="../programs/mythcommflag/main.cpp" line="434"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Paused</source>
         <translation>En Pausa</translation>
     </message>
@@ -16711,72 +29325,156 @@ Tendrá que usar el botón de expulsión de la bandeja.</translation>
         <translation>Si se activa, el foco se situará en la lista de grupos; si no, por defecto, el foco estará sobre las grabaciones.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="438"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="530"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="458"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>For a special category (e.g. &quot;Sports event&quot;), request that shows be autoextended. Only works if a show&apos;s category can be determined.</source>
         <translation>Para una categoría especial (p. ej.: &quot;Evento deportivo&quot;), solicita la extensión automática de la grabación. Sólo funciona si es posible determinar la categoría del programa.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1295"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1379"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1315"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Decode VBI format</source>
         <translation>Formato de decodificación de VBI</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1310"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1421"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1340"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Subtitle Codec</source>
         <translation>Códec de Subtítulos</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1410"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1546"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1440"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Browse all channels</source>
         <translation>Explorar todos los canales</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1413"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1549"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1443"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>If enabled, browse mode will shows channels on all available recording devices, instead of showing channels on just the current recorder.</source>
         <translation>Si se activa, el modo de exploración mostrará los canales de todos los dispositivos de grabación disponibles, en lugar de mostrar sólo los del grabador actual.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1423"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1559"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1453"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Clear bookmark on playback</source>
         <translation>Eliminar el marcador al reproducir</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1435"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1571"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1465"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Alternate clear and save bookmark</source>
         <translation>Alternar entre eliminar y situar el marcador</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1627"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1763"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1657"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>UNIX socket or IP address[:port] to connect in order to communicate with the LIRC Daemon.</source>
         <translation>Conector UNIX o dirección IP[:puerto] al que conectarse para la comunicación con el Demonio LIRC.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1639"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1775"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1669"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Path to screenshot storage location. Should be writable by the frontend</source>
         <translation>Ruta a la ubicación de almacenamiento de las capturas de pantalla. El cliente debe tener permiso de escritura</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1664"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1808"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1702"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Display on screen</source>
         <translation>Mostrar en pantalla</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1973"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2117"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2011"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Overrides for specific video sizes</source>
         <translation>Excepciones para tamaños específicos de imagen</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2013"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2157"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2051"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Use window border</source>
         <translation>Usar borde de ventana</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2024"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2168"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2062"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Use fixed window size</source>
         <translation>Usar tamaño fijo de ventana</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2338"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2512"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2376"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Up to this number of priority points may be added for titles that are usually watched soon after recording or subtracted for titles that are often watched several days or weeks later.</source>
         <translation>El máximo número de puntos de prioridad que podrán sumarse a los títulos que normalmente se visionan poco después de su grabación o restarse a los títulos que normalmente se visionan varios días o semanas después.</translation>
     </message>
@@ -16786,82 +29484,178 @@ Tendrá que usar el botón de expulsión de la bandeja.</translation>
         <translation>Sistema de Sonido</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="469"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="464"/>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="467"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Enable if your amplifier or sound decoder supports AC-3/Dolby Digital. You must use a digital connection. Uncheck if using an analog connection.</source>
         <translation>Actívela si su amplificador o decodificador de sonido admite AC3/Dolby Digital. Debe usar una conexión digital. Desmárquela si está usando una conexión analógica.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="489"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="484"/>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="487"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>E-AC-3</source>
         <translation>E-AC-3</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="491"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="486"/>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="489"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Enable if your amplifier or sound decoder supports E-AC-3 (DD+). You must use a HDMI connection.</source>
         <translation>Actívela si su amplificador o decodificador de sonido admite E-AC3 (DD+). Debe usar una conexión HDMI.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="501"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="496"/>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="499"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Enable if your amplifier or sound decoder supports Dolby TrueHD. You must use a HDMI connection.</source>
         <translation>Actívela si su amplificador o decodificador de sonido admite Dolby TrueHD. Debe usar una conexión HDMI.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="511"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="506"/>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="509"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Enable if your amplifier or sound decoder supports DTS-HD. You must use a HDMI connection.</source>
         <translation>Actívela si su amplificador o decodificador de sonido admite DTS-HD. Debe usar una conexión HDMI.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="982"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="977"/>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="980"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>If enabled, MythTV will control the PCM and master mixer volume. Disable this option if you prefer to control the volume externally (for example, using your amplifier) or if you use an external mixer program.</source>
         <translation>Si se activa, MythTV controlará el volumen del mezclador PCM y del principal. Desactive esta opción si prefiere controlar el volumen externamente (por ejemplo, usando su amplificador) o si usa un programa mezclador externo.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="992"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="987"/>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="990"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Mixer device</source>
         <translation>Dispositivo mezclador</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1013"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1008"/>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1011"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Setting the mixer device to &quot;software&quot; lets MythTV control the volume of all audio at the expense of a slight quality loss.</source>
         <translation>Especificar el dispositivo mezclador como &quot;software&quot; hace que MythTV controle el volumen de todo el sonido a expensas de una ligera pérdida de calidad.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1027"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1022"/>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1025"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Mixer controls</source>
         <translation>Controles del mezclador</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1042"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1037"/>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1040"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Master mixer volume</source>
         <translation>Volumen del mezclador principal</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1044"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1039"/>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1042"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Initial volume for the Master mixer. This affects all sound created by the audio device. Note: Do not set this too low.</source>
         <translation>Volumen inicial del mezclador Principal. Afecta a todo el sonido creado por ese dispositivo. Nota: No lo especifique demasiado bajo.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1053"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1048"/>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1051"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>PCM mixer volume</source>
         <translation>Volumen del mezclador PCM</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1055"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1050"/>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1053"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Initial volume for PCM output. Using the volume keys in MythTV will adjust this parameter.</source>
         <translation>Volumen inicial de la salida PCM. Al usar las teclas de volumen en MythTV se ajustará este parámetro.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1063"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1058"/>
+=======
+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1061"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Audio Mixer</source>
         <translation>Mezclador de Sonido</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="3270"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3366"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3230"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Media Monitor</source>
         <translation>Monitor de Medios</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="3277"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3382"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3246"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Remote Control</source>
         <translation>Control Remoto</translation>
     </message>
@@ -16947,8 +29741,24 @@ Tendrá que usar el botón de expulsión de la bandeja.</translation>
         <translation>Configuración de MythTV</translation>
     </message>
     <message numerus="yes">
+<<<<<<< HEAD
         <location filename="../libs/libmythmetadata/metadatacommon.cpp" line="428"/>
         <location filename="../libs/libmythtv/osd.cpp" line="780"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythmetadata/metadatacommon.cpp" line="427"/>
+        <location filename="../libs/libmythtv/deletemap.cpp" line="127"/>
+        <location filename="../libs/libmythtv/deletemap.cpp" line="128"/>
+        <location filename="../libs/libmythtv/deletemap.cpp" line="129"/>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="4736"/>
+        <location filename="../libs/libmythtv/osd.cpp" line="768"/>
+=======
+        <location filename="../libs/libmythmetadata/metadatacommon.cpp" line="427"/>
+        <location filename="../libs/libmythtv/deletemap.cpp" line="127"/>
+        <location filename="../libs/libmythtv/deletemap.cpp" line="128"/>
+        <location filename="../libs/libmythtv/deletemap.cpp" line="129"/>
+        <location filename="../libs/libmythtv/mythplayer.cpp" line="4723"/>
+        <location filename="../libs/libmythtv/osd.cpp" line="780"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>%n second(s)</source>
         <translation>
             <numerusform>%n segundo</numerusform>
@@ -16961,7 +29771,13 @@ Tendrá que usar el botón de expulsión de la bandeja.</translation>
         <translation>Reproducir</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/programinfo.cpp" line="2740"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/programinfo.cpp" line="2733"/>
+=======
+        <location filename="../libs/libmyth/programinfo.cpp" line="2732"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>PBP</source>
         <translation>PBP</translation>
     </message>
@@ -16982,8 +29798,16 @@ Tendrá que usar el botón de expulsión de la bandeja.</translation>
     </message>
     <message>
         <location filename="../libs/libmythtv/channelgroup.cpp" line="201"/>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2226"/>
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="1472"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2370"/>
+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1471"/>
+=======
+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2264"/>
+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1471"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <location filename="../programs/mythfrontend/guidegrid.cpp" line="1705"/>
         <source>All Channels</source>
         <translation>Todos los Canales</translation>
@@ -17391,31 +30215,84 @@ Tendrá que usar el botón de expulsión de la bandeja.</translation>
         <translation>Tipo de Exploración</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/ringbuffer.cpp" line="1338"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/mythbdplayer.cpp" line="244"/>
+        <location filename="../libs/libmythtv/mythdvdplayer.cpp" line="633"/>
+        <source>Angle %1</source>
+        <translation>Ángulo %1</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythbdplayer.cpp" line="267"/>
+        <source>Failed to switch title.</source>
+        <translation>Fallo al cambiar de título.</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1325"/>
+=======
+        <location filename="../libs/libmythtv/mythbdplayer.cpp" line="244"/>
+        <location filename="../libs/libmythtv/mythdvdplayer.cpp" line="633"/>
+        <source>Angle %1</source>
+        <translation>Ángulo %1</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/mythbdplayer.cpp" line="267"/>
+        <source>Failed to switch title.</source>
+        <translation>Fallo al cambiar de título.</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1326"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>&gt;1Gbps</source>
         <translation>&gt;1 Gbps</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/ringbuffer.cpp" line="1342"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1329"/>
+=======
+        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1330"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>%1Mbps</source>
         <translation>%1 Mbps</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/ringbuffer.cpp" line="1342"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1329"/>
+=======
+        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1330"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>%1MHz</source>
         <translation>%1 MHz</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/ringbuffer.cpp" line="1348"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1335"/>
+=======
+        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1336"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>%1kHz</source>
         <translation>%1 kHz</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/ringbuffer.cpp" line="1348"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1335"/>
+=======
+        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1336"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>%1kbps</source>
         <translation>%1 kbps</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/ringbuffer.cpp" line="1354"/>
         <source>%1bps</source>
         <translation>%1 bps</translation>
@@ -17552,11 +30429,30 @@ Tendrá que usar el botón de expulsión de la bandeja.</translation>
         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2114"/>
         <source>Look for duplicates in current and previous recordings</source>
         <translation>Buscar duplicados en grabaciones actuales y anteriores</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1341"/>
+        <source>%1bps</source>
+        <translation>%1 bps</translation>
+=======
+        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1342"/>
+        <source>%1bps</source>
+        <translation>%1 bps</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2117"/>
         <source>Look for duplicates in current recordings only</source>
         <translation>Buscar duplicados sólo en grabaciones actuales</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1341"/>
+        <source>%1Hz</source>
+        <translation>%1 Hz</translation>
+=======
+        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1342"/>
+        <source>%1Hz</source>
+        <translation>%1 Hz</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2120"/>
@@ -17590,10 +30486,20 @@ Tendrá que usar el botón de expulsión de la bandeja.</translation>
         <translation>Grabar usando el perfil %1</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2345"/>
         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2568"/>
         <source>Include in the &quot;%1&quot; recording group</source>
         <translation>Incluir en el grupo de grabación &quot;%1&quot;</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythmetadata/parentalcontrols.cpp" line="309"/>
+        <source>Parental PIN:</source>
+        <translation>PIN Parental:</translation>
+=======
+        <location filename="../libs/libmythmetadata/parentalcontrols.cpp" line="308"/>
+        <source>Parental PIN:</source>
+        <translation>PIN Parental:</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2347"/>
@@ -17633,6 +30539,44 @@ Tendrá que usar el botón de expulsión de la bandeja.</translation>
         <source>Run &apos;%1&apos;</source>
         <translation>Ejecutar &apos;%1&apos;</translation>
     </message>
+<<<<<<< HEAD
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+</context>
+<context>
+    <name>RatingsToPL</name>
+=======
+    <message>
+        <location filename="../libs/libmythupnp/mythxmlclient.cpp" line="102"/>
+        <source>Version Mismatch</source>
+        <comment>UPNP Errors</comment>
+        <translation>Diferentes Versiones</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythupnp/mythxmlclient.cpp" line="123"/>
+        <source>Not Authorized</source>
+        <comment>UPNP Errors</comment>
+        <translation>Sin Autorización</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmythupnp/mythxmlclient.cpp" line="127"/>
+        <source>Unknown Error</source>
+        <comment>UPNP Errors</comment>
+        <translation>Error Desconocido</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="302"/>
+        <source>5.1 Channel Audio</source>
+        <translation>Sonido de Canal 5.1</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="310"/>
+        <source>7.1 Channel Audio</source>
+        <translation>Sonido de Canal 7.1</translation>
+    </message>
+</context>
+<context>
+    <name>RatingsToPL</name>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     <message>
         <location filename="../libs/libmythtv/mythplayer.cpp" line="4963"/>
         <source>Error opening remote stream buffer</source>
@@ -17766,124 +30710,346 @@ Tendrá que usar el botón de expulsión de la bandeja.</translation>
     </message>
 </context>
 <context>
-    <name>ScanWizardConfig</name>
+    <name>ScanWizardConfig</name>
+    <message>
+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="36"/>
+        <source>Scan Configuration</source>
+        <translation>Configuración de la Exploración</translation>
+    </message>
+</context>
+<context>
+    <name>SchedFilterEditor</name>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="47"/>
+        <source>New episode</source>
+        <translation>Nuevo episodio</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="48"/>
+        <source>Identifiable episode</source>
+        <translation>Episodio identificable</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="49"/>
+        <source>First showing</source>
+        <translation>Estreno</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="50"/>
+        <source>Prime time</source>
+        <translation>Máxima audiencia</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="53"/>
+        <source>This episode</source>
+        <translation>Este episodio</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="54"/>
+        <source>This series</source>
+        <translation>Esta serie</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="51"/>
+        <source>Commercial free</source>
+        <translation>Sin Anuncios</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="52"/>
+        <source>High definition</source>
+        <translation>Alta definición</translation>
+    </message>
+</context>
+<context>
+<<<<<<< HEAD
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+    <name>SchedOptEditor</name>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="544"/>
+        <source>Use any available input</source>
+        <translation>Usar cualquier entrada disponible</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="550"/>
+        <source>Prefer input %1</source>
+        <translation>Preferir la entrada %1</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="567"/>
+        <source>Match duplicates using subtitle &amp; description</source>
+        <translation>Buscar duplicados usando subtítulo y descripción</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="571"/>
+        <source>Match duplicates using subtitle then description</source>
+        <translation>Buscar duplicados usando subtítulo y luego descripción</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="575"/>
+        <source>Match duplicates using subtitle</source>
+        <translation>Buscar duplicados usando subtítulo</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="578"/>
+        <source>Match duplicates using description</source>
+        <translation>Buscar duplicados usando descripción</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="581"/>
+        <source>Don&apos;t match duplicates</source>
+        <translation>No buscar duplicados</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="589"/>
+        <source>Look for duplicates in current and previous recordings</source>
+        <translation>Buscar duplicados en grabaciones actuales y anteriores</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="593"/>
+        <source>Look for duplicates in current recordings only</source>
+        <translation>Buscar duplicados sólo en grabaciones actuales</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="597"/>
+        <source>Look for duplicates in previous recordings only</source>
+        <translation>Buscar duplicados sólo en grabaciones anteriores</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="604"/>
+        <source>Record new episodes only</source>
+        <translation>Grabar sólo nuevos episodios</translation>
+    </message>
+</context>
+<context>
+=======
+    <name>SchedOptEditor</name>
     <message>
-        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="36"/>
-        <source>Scan Configuration</source>
-        <translation>Configuración de la Exploración</translation>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="667"/>
+        <source>Use any available input</source>
+        <translation>Usar cualquier entrada disponible</translation>
     </message>
-</context>
-<context>
-    <name>SchedFilterEditor</name>
     <message>
-        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="47"/>
-        <source>New episode</source>
-        <translation>Nuevo episodio</translation>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="673"/>
+        <source>Prefer input %1</source>
+        <translation>Preferir la entrada %1</translation>
     </message>
     <message>
-        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="48"/>
-        <source>Identifiable episode</source>
-        <translation>Episodio identificable</translation>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="690"/>
+        <source>Match duplicates using subtitle &amp; description</source>
+        <translation>Buscar duplicados usando subtítulo y descripción</translation>
     </message>
     <message>
-        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="49"/>
-        <source>First showing</source>
-        <translation>Estreno</translation>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="694"/>
+        <source>Match duplicates using subtitle then description</source>
+        <translation>Buscar duplicados usando subtítulo y luego descripción</translation>
     </message>
     <message>
-        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="50"/>
-        <source>Prime time</source>
-        <translation>Máxima audiencia</translation>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="698"/>
+        <source>Match duplicates using subtitle</source>
+        <translation>Buscar duplicados usando subtítulo</translation>
     </message>
     <message>
-        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="53"/>
-        <source>This episode</source>
-        <translation>Este episodio</translation>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="701"/>
+        <source>Match duplicates using description</source>
+        <translation>Buscar duplicados usando descripción</translation>
     </message>
     <message>
-        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="54"/>
-        <source>This series</source>
-        <translation>Esta serie</translation>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="704"/>
+        <source>Don&apos;t match duplicates</source>
+        <translation>No buscar duplicados</translation>
     </message>
     <message>
-        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="51"/>
-        <source>Commercial free</source>
-        <translation>Sin Anuncios</translation>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="712"/>
+        <source>Look for duplicates in current and previous recordings</source>
+        <translation>Buscar duplicados en grabaciones actuales y anteriores</translation>
     </message>
     <message>
-        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="52"/>
-        <source>High definition</source>
-        <translation>Alta definición</translation>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="716"/>
+        <source>Look for duplicates in current recordings only</source>
+        <translation>Buscar duplicados sólo en grabaciones actuales</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="720"/>
+        <source>Look for duplicates in previous recordings only</source>
+        <translation>Buscar duplicados sólo en grabaciones anteriores</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="727"/>
+        <source>Record new episodes only</source>
+        <translation>Grabar sólo nuevos episodios</translation>
     </message>
 </context>
 <context>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     <name>ScheduleCommon</name>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="222"/>
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="385"/>
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="497"/>
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="536"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="219"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="374"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="487"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="526"/>
+=======
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="222"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="383"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="495"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="534"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Reactivate</source>
         <translation>Reactivar</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="225"/>
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="538"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="222"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="528"/>
+=======
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="225"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="536"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Stop recording</source>
         <translation>Detener grabación</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="236"/>
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="423"/>
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="507"/>
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="545"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="233"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="413"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="497"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="535"/>
+=======
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="236"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="421"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="505"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="543"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Don&apos;t record</source>
         <translation>No grabar</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="264"/>
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="447"/>
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="509"/>
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="547"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="259"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="437"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="499"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="537"/>
+=======
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="264"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="445"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="507"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="545"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Never record</source>
         <translation>Nunca grabar</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="277"/>
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="302"/>
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="556"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="270"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="293"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="546"/>
+=======
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="277"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="302"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="554"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Modify Recording Options</source>
         <translation>Modificar Opciones de Grabación</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="282"/>
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="452"/>
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="519"/>
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="566"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="275"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="442"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="509"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="556"/>
+=======
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="282"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="450"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="517"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="564"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Edit Options</source>
         <translation>Editar Opciones</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="288"/>
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="459"/>
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="523"/>
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="570"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="281"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="449"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="513"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="560"/>
+=======
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="288"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="457"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="521"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="568"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Add Override</source>
         <translation>Añadir Excepción</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="307"/>
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="467"/>
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="518"/>
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="565"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="298"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="457"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="508"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="555"/>
+=======
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="307"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="465"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="516"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="563"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Edit Override</source>
         <translation>Editar Excepción</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="309"/>
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="469"/>
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="516"/>
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="554"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="300"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="459"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="506"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="544"/>
+=======
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="309"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="467"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="514"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="552"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Clear Override</source>
         <translation>Eliminar Excepción</translation>
     </message>
@@ -17893,14 +31059,30 @@ Tendrá que usar el botón de expulsión de la bandeja.</translation>
         <translation>Los siguientes programas serán grabados en su lugar:</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="402"/>
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="499"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="392"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="489"/>
+=======
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="400"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="497"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Record anyway</source>
         <translation>Grabar de todas formas</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="407"/>
         <location filename="../programs/mythfrontend/schedulecommon.cpp" line="505"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="397"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="495"/>
+=======
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="405"/>
+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="503"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Forget Previous</source>
         <translation>Olvidar Anteriores</translation>
     </message>
@@ -17908,6 +31090,7 @@ Tendrá que usar el botón de expulsión de la bandeja.</translation>
 <context>
     <name>ScheduleEditor</name>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="254"/>
         <source>Delete this recording rule template</source>
         <translation>Eliminar esta plantilla de regla de grabación</translation>
@@ -17919,60 +31102,136 @@ Tendrá que usar el botón de expulsión de la bandeja.</translation>
     </message>
     <message>
         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="264"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="199"/>
+=======
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="206"/>
+        <source>Delete this recording rule template</source>
+        <translation>Eliminar esta plantilla de regla de grabación</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="210"/>
+        <source>Modify this recording rule template</source>
+        <translation>Modificar esta plantilla de regla de grabación</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="216"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Record this showing with normal options</source>
         <translation>Grabar este programa con opciones normales</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="267"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="202"/>
+=======
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="219"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Record this showing with override options</source>
         <translation>Grabar este programa con opciones excepcionales</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="270"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="205"/>
+=======
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="222"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Do not allow this showing to be recorded</source>
         <translation>No permitir que se grabe este programa</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="279"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="213"/>
+=======
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="230"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Do not record this program</source>
         <translation>No grabar este programa</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="284"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="218"/>
+=======
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="235"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Record only this showing</source>
         <translation>Grabar sólo este programa</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="288"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="222"/>
+=======
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="239"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Record one showing of this title</source>
         <translation>Grabar un solo programa con este título</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="292"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="226"/>
+=======
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="243"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Record in this timeslot every week</source>
         <translation>Grabar en esta franja horaria semanalmente</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="296"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="230"/>
+=======
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="247"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Record one showing of this title every week</source>
         <translation>Grabar un programa con este título semanalmente</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="300"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="234"/>
+=======
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="251"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Record in this timeslot every day</source>
         <translation>Grabar en esta franja horaria diariamente</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="304"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="238"/>
+=======
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="255"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Record one showing of this title every day</source>
         <translation>Grabar un programa con este título diariamente</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="308"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="242"/>
+=======
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="259"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Record at any time on this channel</source>
         <translation>Grabar en cualquier momento en este canal</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="507"/>
         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="590"/>
         <source>Upcoming Episodes</source>
@@ -18025,19 +31284,41 @@ Tendrá que usar el botón de expulsión de la bandeja.</translation>
         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="827"/>
         <source>Metadata Options</source>
         <translation>Opciones de Metadatos</translation>
-    </message>
-    <message>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="246"/>
+        <source>Record at any time on any channel</source>
+        <translation>Grabar en cualquier momento y en cualquier canal</translation>
+=======
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="263"/>
+        <source>Record at any time on any channel</source>
+        <translation>Grabar en cualquier momento y en cualquier canal</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
+    </message>
+    <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="496"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="338"/>
+=======
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="369"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Schedule Information</source>
         <translation>Información de Programación</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="506"/>
         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="588"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="347"/>
+=======
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="378"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Program Details</source>
         <translation>Detalles del Programa</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="575"/>
         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="832"/>
         <source>Use Template</source>
@@ -18064,14 +31345,69 @@ Tendrá que usar el botón de expulsión de la bandeja.</translation>
         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="846"/>
         <source>No templates available</source>
         <translation>No hay plantillas disponibles</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="348"/>
+        <source>Upcoming episodes</source>
+        <translation>Próximos episodios</translation>
+=======
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="379"/>
+        <source>Upcoming episodes</source>
+        <translation>Próximos episodios</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="850"/>
         <source>Template Options</source>
         <translation>Opciones de Plantilla</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="349"/>
+        <source>Upcoming recordings</source>
+        <translation>Próximas grabaciones</translation>
+=======
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="380"/>
+        <source>Upcoming recordings</source>
+        <translation>Próximas grabaciones</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
+    </message>
+    <message>
+<<<<<<< HEAD
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="862"/>
+        <source>Default</source>
+        <translation>Predeterminada</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="350"/>
+        <source>Previously scheduled</source>
+        <translation>Anteriormente programadas</translation>
+=======
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="381"/>
+        <source>Previously scheduled</source>
+        <translation>Anteriormente programadas</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="428"/>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="541"/>
+        <source>Use Template</source>
+        <translation>Usar Plantilla</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="533"/>
+        <source>Options</source>
+        <translation>Opciones</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="555"/>
+        <source>No templates available</source>
+        <translation>No hay plantillas disponibles</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="559"/>
+        <source>Template Options</source>
+        <translation>Opciones de Plantilla</translation>
     </message>
     <message>
-        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="862"/>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="571"/>
         <source>Default</source>
         <translation>Predeterminada</translation>
     </message>
@@ -18079,27 +31415,62 @@ Tendrá que usar el botón de expulsión de la bandeja.</translation>
 <context>
     <name>SchemaUpgradeWizard</name>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/schemawizard.cpp" line="154"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/schemawizard.cpp" line="132"/>
+        <source>%1 database schema is old. Waiting to see if DB is being upgraded.</source>
+        <translation>El esquema %1 de la base de datos es obsoleto. Esperando a ver si la BD puede actualizarse.</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmyth/schemawizard.cpp" line="199"/>
+=======
+        <location filename="../libs/libmyth/schemawizard.cpp" line="153"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Exit</source>
         <translation>Salir</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/schemawizard.cpp" line="156"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/schemawizard.cpp" line="201"/>
+=======
+        <location filename="../libs/libmyth/schemawizard.cpp" line="155"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Upgrade</source>
         <translation>Actualizar</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/schemawizard.cpp" line="244"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/schemawizard.cpp" line="289"/>
+=======
+        <location filename="../libs/libmyth/schemawizard.cpp" line="243"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>There are also other clients using this database. They should be shut down first.</source>
         <translation>Otros clientes están usando también esta base de datos. Deberían apagarse antes de proceder.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/schemawizard.cpp" line="247"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/schemawizard.cpp" line="292"/>
+=======
+        <location filename="../libs/libmyth/schemawizard.cpp" line="246"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Error: This version of Myth%1 requires MySQL %2.%3.%4 or later.  You seem to be running MySQL version %5.</source>
         <translation>Error: Esta versión de Myth%1 requiere MySQL %2.%3.%4 o posterior. Al parecer, está ejecutándose MySQL versión %5.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/schemawizard.cpp" line="315"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/schemawizard.cpp" line="360"/>
+=======
+        <location filename="../libs/libmyth/schemawizard.cpp" line="314"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Error: MythTV cannot upgrade the schema of this datatase because other clients are using it.
 
 Please shut them down before upgrading.</source>
@@ -18108,49 +31479,103 @@ Please shut them down before upgrading.</source>
 Por favor, apáguelos antes de actualizar.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/schemawizard.cpp" line="322"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/schemawizard.cpp" line="367"/>
+=======
+        <location filename="../libs/libmyth/schemawizard.cpp" line="321"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Warning: MythTV wants to upgrade your database,</source>
         <translation>Aviso: MythTV desea actualizar su base de datos,</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/schemawizard.cpp" line="323"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/schemawizard.cpp" line="368"/>
+=======
+        <location filename="../libs/libmyth/schemawizard.cpp" line="322"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>for the %1 schema, from %2 to %3.</source>
         <translation>para el esquema %1, del %2 al %3.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/schemawizard.cpp" line="337"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/schemawizard.cpp" line="382"/>
+=======
+        <location filename="../libs/libmyth/schemawizard.cpp" line="336"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>This version of MythTV requires an updated database. </source>
         <translation>Esta versión de MythTV requiere una base de datos actualizada. </translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/schemawizard.cpp" line="338"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/schemawizard.cpp" line="383"/>
+=======
+        <location filename="../libs/libmyth/schemawizard.cpp" line="337"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>(schema is %1 versions behind)</source>
         <translation>(el esquema está atrasado %1 versiones)</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/schemawizard.cpp" line="339"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/schemawizard.cpp" line="384"/>
+=======
+        <location filename="../libs/libmyth/schemawizard.cpp" line="338"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Please run mythtv-setup or mythbackend to update your database.</source>
         <translation>Por favor, ejecute mythtv-setup o mythbackend para actualizar su base de datos.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/schemawizard.cpp" line="351"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/schemawizard.cpp" line="396"/>
+=======
+        <location filename="../libs/libmyth/schemawizard.cpp" line="350"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Error: MythTV database has newer %1 schema (%2) than expected (%3).</source>
         <translation>Error: la base de datos de MythTV tiene un esquema %1 más reciente (%2) que el esperado (%3).</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/schemawizard.cpp" line="358"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/schemawizard.cpp" line="403"/>
+=======
+        <location filename="../libs/libmyth/schemawizard.cpp" line="357"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>MythTV was unable to backup your database.</source>
         <translation>MythTV no pudo hacer una copia de seguridad de su base de datos.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/schemawizard.cpp" line="365"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/schemawizard.cpp" line="410"/>
+=======
+        <location filename="../libs/libmyth/schemawizard.cpp" line="364"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Database Host: %1
 Database Name: %2</source>
         <translation>Nodo de la Base de Datos: %1
 Nombre de la Base de Datos: %2</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/schemawizard.cpp" line="395"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/schemawizard.cpp" line="440"/>
+=======
+        <location filename="../libs/libmyth/schemawizard.cpp" line="394"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>If your system becomes unstable, a database backup file called
 %1
 is located in %2</source>
@@ -18159,7 +31584,13 @@ is located in %2</source>
 en %2</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/schemawizard.cpp" line="400"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmyth/schemawizard.cpp" line="445"/>
+=======
+        <location filename="../libs/libmyth/schemawizard.cpp" line="399"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>This cannot be un-done, so having a database backup would be a good idea.</source>
         <translation>Esta acción no podrá deshacerse, por lo que sería buena idea tener una copia de la base de datos.</translation>
     </message>
@@ -18841,941 +32272,2224 @@ del Grupo de Almacenamiento?</translation>
     </message>
     <message>
         <location filename="../libs/libmyth/storagegroupeditor.cpp" line="305"/>
+<<<<<<< HEAD
         <source>Delete &apos;%1&apos; Storage Group?
 (from remote hosts)</source>
         <translation>¿Eliminar el Grupo de Almacenamiento &apos;%1&apos;?
 (de nodos remotos)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <source>(from remote hosts)</source>
+        <translation>(de los nodos remotos)</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="309"/>
+        <source>(from all hosts</source>
+        <translation>(de todos los nodos</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="316"/>
+        <source>Yes, delete group</source>
+        <translation>Sí, eliminar el grupo</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="317"/>
+        <source>No, Don&apos;t delete group</source>
+        <translation>No, no eliminar el grupo</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="427"/>
+        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="437"/>
+        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="443"/>
+        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="453"/>
+        <source>(Create %1 group)</source>
+        <translation>(Crear grupo %1)</translation>
+    </message>
+</context>
+<context>
+    <name>StoreOptEditor</name>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="865"/>
+        <source>Record using the %1 profile</source>
+        <translation>Grabar usando el perfil %1</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="884"/>
+        <source>Create a new recording group</source>
+        <translation>Crear un nuevo grupo de grabación</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="920"/>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1057"/>
+        <source>Include in the &quot;%1&quot; recording group</source>
+        <translation>Incluir en el grupo de grabación &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="921"/>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="923"/>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="929"/>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="951"/>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="954"/>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="960"/>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="974"/>
+        <source>Default</source>
+        <translation>Predeterminado</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="950"/>
+        <source>Store in the &quot;%1&quot; storage group</source>
+        <translation>Guardar en el grupo de almacenamiento &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="962"/>
+        <source>Live TV</source>
+        <translation>TV en Vivo</translation>
+=======
+        <source>(from remote hosts)</source>
+        <translation>(de los nodos remotos)</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="309"/>
+        <source>(from all hosts</source>
+        <translation>(de todos los nodos</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="316"/>
+        <source>Yes, delete group</source>
+        <translation>Sí, eliminar el grupo</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="317"/>
+        <source>No, Don&apos;t delete group</source>
+        <translation>No, no eliminar el grupo</translation>
+    </message>
+    <message>
+        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="427"/>
+        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="437"/>
+        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="443"/>
+        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="453"/>
+        <source>(Create %1 group)</source>
+        <translation>(Crear grupo %1)</translation>
+    </message>
+</context>
+<context>
+    <name>StoreOptEditor</name>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="988"/>
+        <source>Record using the %1 profile</source>
+        <translation>Grabar usando el perfil %1</translation>
     </message>
     <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1007"/>
+        <source>Create a new recording group</source>
+        <translation>Crear un nuevo grupo de grabación</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1043"/>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1180"/>
+        <source>Include in the &quot;%1&quot; recording group</source>
+        <translation>Incluir en el grupo de grabación &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1044"/>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1046"/>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1052"/>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1074"/>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1077"/>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1083"/>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1097"/>
+        <source>Default</source>
+        <translation>Predeterminado</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1073"/>
+        <source>Store in the &quot;%1&quot; storage group</source>
+        <translation>Guardar en el grupo de almacenamiento &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1085"/>
+        <source>Live TV</source>
+        <translation>TV en Vivo</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
+    </message>
+    <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/storagegroupeditor.cpp" line="309"/>
         <source>Delete &apos;%1&apos; Storage Group?
 (from all hosts)</source>
         <translation>¿Eliminar el Grupo de Almacenamiento &apos;%1&apos;?
 (de todos los nodos)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1032"/>
+        <source>Create New Recording Group. Enter group name: </source>
+        <translation>Crear un Nuevo Grupo de Grabación. Introducir el nombre del grupo:</translation>
+=======
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1155"/>
+        <source>Create New Recording Group. Enter group name: </source>
+        <translation>Crear un Nuevo Grupo de Grabación. Introducir el nombre del grupo:</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/storagegroupeditor.cpp" line="316"/>
         <source>Yes, delete group</source>
         <translation>Sí, eliminar el grupo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="973"/>
+        <source>Use &quot;%1&quot; playback group settings</source>
+        <translation>Usar la configuración del grupo de reproducción &quot;%1&quot;</translation>
+=======
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1096"/>
+        <source>Use &quot;%1&quot; playback group settings</source>
+        <translation>Usar la configuración del grupo de reproducción &quot;%1&quot;</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/storagegroupeditor.cpp" line="317"/>
         <source>No, Don&apos;t delete group</source>
         <translation>No, no eliminar el grupo</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="996"/>
+        <source>Don&apos;t record if this would exceed the max episodes</source>
+        <translation>No grabar si va a superarse el número máximo de episodios</translation>
+=======
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1119"/>
+        <source>Don&apos;t record if this would exceed the max episodes</source>
+        <translation>No grabar si va a superarse el número máximo de episodios</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmyth/storagegroupeditor.cpp" line="427"/>
         <location filename="../libs/libmyth/storagegroupeditor.cpp" line="437"/>
         <location filename="../libs/libmyth/storagegroupeditor.cpp" line="443"/>
         <location filename="../libs/libmyth/storagegroupeditor.cpp" line="453"/>
         <source>(Create %1 group)</source>
         <translation>(Crear grupo %1)</translation>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="999"/>
+        <source>Delete oldest if this would exceed the max episodes</source>
+        <translation>Eliminar el más antiguo si va a superarse el número máximo de episodios</translation>
+=======
+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1122"/>
+        <source>Delete oldest if this would exceed the max episodes</source>
+        <translation>Eliminar el más antiguo si va a superarse el número máximo de episodios</translation>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
     </message>
 </context>
 <context>
     <name>TV</name>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="1780"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="1746"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="1751"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Record and watch while it records</source>
         <translation>Grabar y ver mientras se graba</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="1781"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="1747"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="1752"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Let it record and go back to the Main Menu</source>
         <translation>Dejar grabar y volver al Menú Principal</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="1785"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="1751"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="1756"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Don&apos;t let it record, I want to watch TV</source>
         <translation>No grabar, quiero ver la TV</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="12534"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12145"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12207"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Save this position and go to the menu</source>
         <translation>Guardar esta posición e ir al menú</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="12536"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12147"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12209"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Do not save, just exit to the menu</source>
         <translation>No guardar, sólo salir al menú</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="12547"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12158"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12220"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Keep watching</source>
         <translation>Seguir viendo</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="12544"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12155"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12217"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Delete this recording</source>
         <translation>Eliminar esta grabación</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="10925"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="10974"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10554"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10603"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10608"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10657"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Adjust Picture</source>
         <translation>Ajustar Imagen</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="5008"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="8539"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="9645"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="4860"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8210"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9282"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="4878"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8265"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9336"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Adjust Volume</source>
         <translation>Ajustar Volumen</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="8739"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8377"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8432"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Mute On</source>
         <translation>Sin Sonido</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="8738"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8376"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8431"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Mute Off</source>
         <translation>Con Sonido</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="6034"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="7672"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5782"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7342"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5800"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7396"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Paused</source>
         <translation>En Pausa</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="7672"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7342"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7396"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Position</source>
         <translation>Posición</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="6278"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11320"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="12354"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="12439"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5960"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10946"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11973"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12052"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6006"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11000"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12027"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12112"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Jump Ahead</source>
         <translation>Salto Adelante</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="6281"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11321"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="12366"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="12394"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5962"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10947"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11983"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12009"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6009"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11001"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12039"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12067"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Jump Back</source>
         <translation>Salto Atrás</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="6491"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6170"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6219"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Stopping Transcode</source>
         <translation>Detener Transcodificación</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="6509"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6188"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6237"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Transcoding</source>
         <translation>Transcodificación</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="6180"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5893"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5913"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Forward</source>
         <translation>Avance</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="4885"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="6201"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="6205"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="4819"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5910"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5912"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="4830"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5934"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5938"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Skip Ahead</source>
         <translation>Salto Adelante</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="6179"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5892"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5912"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Rewind</source>
         <translation>Rebobinar</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="4889"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="6194"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="4821"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5905"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="4834"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5927"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Skip Back</source>
         <translation>Salto Atrás</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="6333"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6012"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6061"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Speed 3X</source>
         <translation>Velocidad 3X</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="6334"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6013"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6062"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Speed 2X</source>
         <translation>Velocidad 2X</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="6336"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6015"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6064"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Speed 1/3X</source>
         <translation>Velocidad 1/3X</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="6337"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6016"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6065"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Speed 1/8X</source>
         <translation>Velocidad 1/8X</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="6338"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6017"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6066"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Speed 1/16X</source>
         <translation>Velocidad 1/16X</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="6676"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6355"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6404"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Skip</source>
         <translation>Saltar</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="9936"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9573"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9627"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>This program is currently being edited</source>
         <translation>Este programa se está editando</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="9939"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9576"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9630"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Continue Editing</source>
         <translation>Continuar Editando</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="9940"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9577"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9631"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Do not edit</source>
         <translation>No editar</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="9495"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="9518"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9135"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9158"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9189"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9212"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Record</source>
         <translation>Grabar</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="6260"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="6294"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5946"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5974"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5989"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6022"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Jump To</source>
         <translation>Saltar a</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11980"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11599"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11653"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Auto-Expire OFF</source>
         <translation>Auto-Expiración Desactivada</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11985"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11604"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11658"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Auto-Expire ON</source>
         <translation>Auto-Expiración Activada</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="10452"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10083"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10137"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Zoom Mode ON</source>
         <translation>Modo Ampliación Activado</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="8740"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8378"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8433"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Left Channel Muted</source>
         <translation>Canal Izquierdo Silenciado</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="8741"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8379"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8434"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Right Channel Muted</source>
         <translation>Canal Derecho Silenciado</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="8769"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8407"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8462"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Sleep </source>
         <translation>Dormir </translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11836"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11455"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11509"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Program Guide</source>
         <translation>Guía de Programas</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11700"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11768"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11321"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11387"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11375"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11441"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Picture-in-Picture</source>
         <translation>Picture-in-Picture</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11787"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11406"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11460"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Change Active Window</source>
         <translation>Cambiar Ventana Activa</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11342"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10968"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11022"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Previous Channel</source>
         <translation>Canal Anterior</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11636"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11261"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11315"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Edit Recording</source>
         <translation>Editar Grabación</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11325"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11419"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10951"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11045"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11005"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11099"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Commercial Auto-Skip</source>
         <translation>Salto Automático de Anuncios</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11641"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11262"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11316"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Turn Auto-Expire OFF</source>
         <translation>Desactivar Autoexpiración</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11642"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11263"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11317"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Turn Auto-Expire ON</source>
         <translation>Activar Autoexpiración</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="10916"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="10941"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10545"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10570"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10599"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10624"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Change Aspect Ratio</source>
         <translation>Cambiar Relación de Aspecto</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="10922"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10551"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10605"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Manual Zoom Mode</source>
         <translation>Modo Ampliación Manual</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11649"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11270"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11324"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Stop Transcoding</source>
         <translation>Detener Transcodificación</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11653"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11662"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11274"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11283"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11328"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11337"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Begin Transcoding</source>
         <translation>Iniciar Transcodificación</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="4227"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="4881"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="4169"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="4817"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="4174"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="4826"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Jump to Beginning</source>
         <translation>Saltar al Inicio</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="6502"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6181"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6230"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Try Again</source>
         <translation>Intentar de Nuevo</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="8620"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11695"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11723"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8291"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11316"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11342"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8346"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11370"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11396"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Adjust Time Stretch</source>
         <translation>Ajustar Velocidad</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11726"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11345"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11399"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Adjust</source>
         <translation>Ajustar</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11727"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11346"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11400"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>0.5X</source>
         <translation>0,5X</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11728"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11347"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11401"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>0.9X</source>
         <translation>0,9X</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11729"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11348"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11402"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>1.0X</source>
         <translation>1,0X</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11730"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11349"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11403"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>1.1X</source>
         <translation>1,1X</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11734"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11353"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11407"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>1.5X</source>
         <translation>1,5X</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11704"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11739"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="12205"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="12207"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11325"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11358"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11824"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11826"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11379"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11412"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11878"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11880"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Sleep</source>
         <translation>Dormir</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11741"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11360"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11414"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Sleep Off</source>
         <translation>No Dormir</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11731"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11350"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11404"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>1.2X</source>
         <translation>1,2X</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11732"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11351"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11405"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>1.3X</source>
         <translation>1,3X</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11733"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11352"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11406"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>1.4X</source>
         <translation>1,4X</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="6442"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6121"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6170"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Forward %1X</source>
         <translation>Adelante %1X</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="6452"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6131"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6180"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Rewind %1X</source>
         <translation>Rebobinar %1X</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="8703"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8341"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8396"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Audio Sync</source>
         <translation>Sincr. Sonido</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="8703"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="10808"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8341"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10437"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8396"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10491"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Adjust Audio Sync</source>
         <translation>Ajustar Sincr. Sonido</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="7929"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7600"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7655"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>No Lock</source>
         <translation>No Sintonizado</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="4221"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="4158"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="4168"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Jump to Bookmark</source>
         <translation>Saltar al Marcador</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="7929"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7600"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7655"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Partial Lock</source>
         <translation>Sintonización Parcial</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="7930"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7601"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7656"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Lock</source>
         <translation>Sintonizado</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="8031"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="12240"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="12621"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7702"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11859"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12232"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7757"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11913"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12294"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>OK</source>
         <translation>Aceptar</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="10803"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="10834"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10432"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10463"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10486"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10517"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Select Audio Track</source>
         <translation>Seleccione la Pista de Sonido</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="7932"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7603"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7658"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Signal %1%</source>
         <translation>Señal %1%</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="4181"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="4117"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="4128"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Seek:</source>
         <translation>Búsqueda:</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="7121"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6798"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6849"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>CC:</source>
         <translation>SUB:</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="9530"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9170"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9224"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Cancel Record</source>
         <translation>Cancelar Grabación</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="2418"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="2382"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="2389"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>%1 Settings</source>
         <translation>Ajustes %1</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="7121"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6798"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6849"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>TXT:</source>
         <translation>TXT:</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="7125"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6802"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6853"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Seek:</source>
         <comment>seek to location</comment>
         <translation>Búsqueda:</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="7934"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7605"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7660"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>S/N %1dB</source>
         <translation>S/R %1dB</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="7936"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7607"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7662"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>BE %1</source>
         <comment>Bit Errors</comment>
         <translation>EB %1</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="6331"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6010"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6059"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Speed 16X</source>
         <translation>Velocidad 16X</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="6332"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6011"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6060"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Speed 8X</source>
         <translation>Velocidad 8X</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="12424"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12037"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12097"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Skip Still Frame</source>
         <translation>Saltar Fotograma</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="12450"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12061"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12123"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Next Title</source>
         <translation>Título Siguiente</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11336"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10962"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11016"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>DVD Root Menu</source>
         <translation>Menú Raíz del DVD</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11837"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11456"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11510"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Program Finder</source>
         <translation>Buscador de Programas</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11839"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11458"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11512"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Edit Recording Schedule</source>
         <translation>Editar Programación de Grabado</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="12405"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12018"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12078"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Previous Title</source>
         <translation>Título Anterior</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="12382"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11997"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12055"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Skip Back Not Allowed</source>
         <translation>Salto Atrás No Permitido</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11504"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11540"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11130"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11166"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11184"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11220"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Jump to Program</source>
         <translation>Saltar a Programa</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11541"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11856"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11167"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11475"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11221"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11529"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Recorded Program</source>
         <translation>Programa Grabado</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11663"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11284"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11338"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Default</source>
         <translation>Predeterminada</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11664"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11285"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11339"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Autodetect</source>
         <translation>Autodetectar</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11665"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11286"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11340"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>High Quality</source>
         <translation>Calidad Alta</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11666"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11287"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11341"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Medium Quality</source>
         <translation>Calidad Media</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11667"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11288"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11342"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Low Quality</source>
         <translation>Calidad Baja</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11198"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10827"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10881"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Toggle Teletext Menu</source>
         <translation>Conmutar Menú de Teletexto</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11725"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11344"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11398"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Toggle</source>
         <translation>Conmutar</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11070"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10699"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10753"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>(I)</source>
         <comment>Interlaced (Normal)</comment>
         <translation>(E)</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11072"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10701"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10755"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>(i)</source>
         <comment>Interlaced (Reversed)</comment>
         <translation>(e)</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11074"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10703"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10757"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>(P)</source>
         <comment>Progressive</comment>
         <translation>(P)</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11019"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11064"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10648"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10693"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10702"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10747"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Video Scan</source>
         <translation>Exploración de Imagen</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11079"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10708"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10762"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Detect</source>
         <translation>Detectar</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11081"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10710"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10764"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Progressive</source>
         <translation>Progresiva</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11083"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10712"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10766"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Interlaced (Normal)</source>
         <translation>Entrelazada (Normal)</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11085"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10714"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10768"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Interlaced (Reversed)</source>
         <translation>Entrelazada (Inversa)</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11169"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11206"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10798"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10832"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10852"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10886"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Select Subtitle</source>
         <translation>Seleccione Subtítulo</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11187"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11255"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10816"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10881"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10870"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10935"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Select VBI CC</source>
         <translation>Seleccione SUB VBI</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11181"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11244"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10810"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10870"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10864"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10924"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Select ATSC CC</source>
         <translation>Seleccione SUB ATSC</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="7938"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7609"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7664"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Rotor %1%</source>
         <translation>Rotor %1%</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="3367"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="3327"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="3338"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>End Of Recording</source>
         <translation>Fin de la Grabación</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="2833"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="2797"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="2804"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Last Program: %1 Doesn&apos;t Exist</source>
         <translation>Último Programa: %1 No Existe</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="8098"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="8553"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7769"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8224"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7824"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8279"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>DVD</source>
         <translation>DVD</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="8103"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7774"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7829"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Menu</source>
         <translation>Menú</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="8107"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7778"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7833"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Still Frame</source>
         <translation>Fotograma</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="8118"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7789"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7844"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Title: %1 (%2)</source>
         <translation>Título: %1 (%2)</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="8119"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7790"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7845"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Chapter: %1/%2</source>
         <translation>Capítulo: %1/%2</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11338"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10964"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11018"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>DVD Chapter Menu</source>
         <translation>Menú de Capítulos del DVD</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="1777"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="1743"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="1748"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>MythTV wants to record &quot;%1&quot; on %2 in %d seconds. Do you want to:</source>
         <translation>MythTV desea grabar &apos;%1&apos; en %2 dentro de %d segundos. ¿Quiere:</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="1782"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="1748"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="1753"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Let them record and go back to the Main Menu</source>
         <translation>Dejar que se graben y volver al Menú Principal</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="1783"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="1749"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="1754"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Record it later, I want to watch TV</source>
         <translation>Grabarlo más tarde, quiero ver la TV</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="1784"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="1750"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="1755"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Record them later, I want to watch TV</source>
         <translation>Grabarlos más tarde, quiero ver la TV</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="1786"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="1752"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="1757"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Don&apos;t let them record, I want to watch TV</source>
         <translation>No dejar que se graben, quiero ver la TV</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="8791"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="8854"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8429"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8492"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8484"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8547"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="10811"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="10845"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10440"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10474"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10494"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10528"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Visualisation</source>
         <translation>Visualización</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="10820"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10449"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10503"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Disable Audio Upmixer</source>
         <translation>Desactivar Conversor de Sonido</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="10825"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10454"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10508"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Enable Audio Upmixer</source>
         <translation>Activar Conversor de Sonido</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="10846"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11001"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10475"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10630"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10529"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10684"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="10919"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="10956"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10548"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10585"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10602"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10639"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Adjust Fill</source>
         <translation>Ajustar Relleno</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="10932"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11000"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10561"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10629"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10615"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10683"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>3D</source>
         <translation>3D</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11004"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10633"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10687"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Side by Side</source>
         <translation>Lado a Lado</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11007"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10636"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10690"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Discard Side by Side</source>
         <translation>Desactivar Lado a Lado</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11010"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10639"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10693"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Top and Bottom</source>
         <translation>Arriba y Abajo</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11013"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10642"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10696"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Discard Top and Bottom</source>
         <translation>Desactivar Arriba y Abajo</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11222"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10848"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10902"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Disable External Subtitles</source>
         <translation>Desactivar Subtítulos Externos</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11227"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10853"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10907"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Enable External Subtitles</source>
         <translation>Activar Subtítulos Externos</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11525"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11557"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11151"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11183"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11205"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11237"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Switch Input</source>
         <translation>Cambiar Entrada</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11576"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11202"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11256"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>C</source>
         <comment>Card</comment>
         <translatorcomment>Tarjeta</translatorcomment>
         <translation>T</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11577"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11203"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11257"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>I</source>
         <comment>Input</comment>
         <translatorcomment>Entrada</translatorcomment>
         <translation>E</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11532"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11588"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11158"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11214"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11212"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11268"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Switch Source</source>
         <translation>Cambiar Fuente</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11838"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11457"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11511"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Upcoming Recordings</source>
         <translation>Próximas Grabaciones</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="12530"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12141"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12203"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>You are exiting %1</source>
         <translation>Está saliendo de %1</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="12540"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12151"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12213"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Exit %1</source>
         <translation>Salir %1</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="3974"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="3934"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="3945"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Zoom Committed</source>
         <translation>Ampliación Ejecutada</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="3992"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="3952"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="3963"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Zoom Ignored</source>
         <translation>Ampliación Ignorada</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="5546"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5296"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5314"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Creating PBP</source>
         <translation>Creando PBP</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="5546"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5296"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5314"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Creating PIP</source>
         <translation>Creando PIP</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="5547"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5297"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5315"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Cannot create PBP</source>
         <translation>No fue posible crear la PBP</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="5547"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5297"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5315"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Cannot create PIP</source>
         <translation>No fue posible crear la PIP</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="5566"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5316"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5334"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Stopping PIP</source>
         <translation>Deteniendo PIP</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="5566"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5316"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5334"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Stopping PBP</source>
         <translation>Deteniendo PBP</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="5576"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5326"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5344"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Stopping all PIPs</source>
         <translation>Deteniendo todas las PIPs</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="5576"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5326"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5344"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Stopping all PBPs</source>
         <translation>Deteniendo todas las PBPs</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="5623"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5373"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5391"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Too many views to switch</source>
         <translation>Demasiadas vistas a cambiar</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="6036"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5784"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5802"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Aux Paused</source>
         <translation>Aux En Pausa</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="6552"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6231"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6280"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Jump Chapter</source>
         <translation>Saltar Capítulo</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="6677"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6356"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6405"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Searching</source>
         <translation>Buscando</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="6655"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6334"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6383"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Switch Angle</source>
         <translation>Cambiar Ángulo</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="1542"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="1543"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="1508"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="1509"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="1513"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="1514"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>External Subtitles</source>
         <translation>Subtítulos Externos</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="4659"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="12706"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="4595"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12317"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="4604"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12379"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Are you sure you want to delete:</source>
         <translation>¿Seguro que desea eliminar:</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="8022"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7693"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7748"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>You should have received a channel lock by now. You can continue to wait for a signal, or you can change the channel with %1 or %2, change video source (%3), inputs (%4), etc.</source>
         <translation>El canal ya debería estar sintonizado. Puede continuar esperando la señal, o puede cambiar el canal con %1 o %2, cambiar la fuente de vídeo (%3), las entradas (%4), etc.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="8547"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="10906"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="10913"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8218"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10535"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10542"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8273"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10589"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10596"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Video</source>
         <translation>Imagen</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="8550"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8221"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8276"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>TV</source>
         <translation>TV</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="8620"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8291"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8346"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Time Stretch</source>
         <translation>Ajustar Velocidad</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="8648"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8319"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8374"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Upmixer On</source>
         <translation>Conversor Activado</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="8648"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8319"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8374"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Upmixer Off</source>
         <translation>Conversor Desactivado</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="8674"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11200"/>
         <source>Adjust Subtitle Zoom</source>
@@ -19789,284 +34503,629 @@ del Grupo de Almacenamiento?</translation>
     <message>
         <location filename="../libs/libmythtv/tv_play.cpp" line="8792"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="8855"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8430"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8493"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8485"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8548"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="9165"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8803"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8858"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>PiP</source>
         <comment>Picture-in-Picture</comment>
         <translation>PiP</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="9166"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8804"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8859"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>PbP</source>
         <comment>Picture-by-Picture</comment>
         <translation>PbP</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="9168"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8806"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8861"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Disabling %1 for recording</source>
         <translation>Desactivando la grabación en %1</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="9740"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9377"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9431"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Active Changed</source>
         <translation>Cambiada la Ventana Activa</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="9873"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9510"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="9564"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="10741"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10370"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10424"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Playback Menu</source>
         <translation>Menú de Reproducción</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="10793"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="10800"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10422"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10429"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10476"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10483"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Audio</source>
         <translation>Sonido</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="10935"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11029"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10564"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10658"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10618"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10712"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Advanced</source>
         <translation>Avanzada</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="10981"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10610"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10664"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Disable studio levels</source>
         <translation>Desactivar niveles de estudio</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="10982"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10611"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10665"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Enable studio levels</source>
         <translation>Activar niveles de estudio</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="10994"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10623"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10677"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Disable Night Mode</source>
         <translation>Desactivar Modo Nocturno</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="10994"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10623"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10677"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Enable Night Mode</source>
         <translation>Activar Modo Nocturno</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11024"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11034"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10653"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10663"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10707"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10717"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Deinterlacer</source>
         <translation>Desentrelazador</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11143"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11151"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10772"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10780"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10826"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10834"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Subtitles</source>
         <translation>Subtítulos</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11161"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10790"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10844"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Disable Forced Subtitles</source>
         <translation>Desactivar Subtítulos Forzados</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11166"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10795"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10849"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Enable Forced Subtitles</source>
         <translation>Activar Subtítulos Forzados</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11175"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11217"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10804"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10843"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10858"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10897"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Text Subtitles</source>
         <translation>Subtítulos de Texto</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11193"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11266"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10822"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10892"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10876"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10946"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Select Teletext CC</source>
         <translation>Seleccionar SUB Teletexto</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11310"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11317"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10936"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10943"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10990"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10997"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Navigate</source>
         <translation>Navegar</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11331"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10957"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11011"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Top menu</source>
         <translation>Menú principal</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11332"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10958"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11012"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Popup menu</source>
         <translation>Menú emergente</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11337"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10963"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11017"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>DVD Title Menu</source>
         <translation>Menú de Título del DVD</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11346"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11363"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10972"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10989"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11026"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11043"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Chapter</source>
         <translation>Capítulo</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11351"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11405"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10977"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11031"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11031"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11085"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Angle</source>
         <translation>Ángulo</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11356"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11388"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10982"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11014"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11036"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11068"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Title</source>
         <translation>Título</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11497"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11503"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11123"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11129"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11177"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11183"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Source</source>
         <translation>Fuente</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11612"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11619"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11237"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11244"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11291"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11298"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Jobs</source>
         <translation>Tareas</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11631"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11256"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11310"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Edit Channel</source>
         <translation>Editar Canal</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11685"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11691"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11306"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11312"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11360"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11366"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Playback</source>
         <translation>Reproducir</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11693"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11314"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11368"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Play</source>
         <translation>Reproducir</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11693"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11314"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11368"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Pause</source>
         <translation>Pausa</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11709"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11754"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11330"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11373"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11384"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11427"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Channel Groups</source>
         <translation>Grupos de Canales</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11714"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11335"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11389"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Toggle Browse Mode</source>
         <translation>Conmutar Modo Exploración</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11716"/>
         <source>Cancel Playlist</source>
         <translation>Cancelar la Lista de Reproducción</translation>
     </message>
     <message>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11717"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11336"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11390"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Playback data</source>
         <translation>Datos de reproducción</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11755"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11374"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11428"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>All Channels</source>
         <translation>Todos los Canales</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11775"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11394"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11448"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Open Live TV PIP</source>
         <translation>Abrir PIP para la TV en Vivo</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11777"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11396"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11450"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Open Live TV PBP</source>
         <translation>Abrir PBP para la TV en Vivo</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11781"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11400"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11454"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Open Recording PIP</source>
         <translation>Abrir PIP en Grabación</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11783"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11402"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11456"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Open Recording PBP</source>
         <translation>Abrir PBP en Grabación</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11794"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11413"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11467"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Close PBP</source>
         <translation>Cerrar PBP</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11794"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11413"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11467"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Close PIP</source>
         <translation>Cerrar PIP</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11798"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11417"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11471"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Close PBPs</source>
         <translation>Cerrar PBPs</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11798"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11417"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11471"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Close PIPs</source>
         <translation>Cerrar PIPs</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11802"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11807"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11421"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11426"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11475"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11480"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Swap Windows</source>
         <translation>Intercambiar Ventanas</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11815"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11434"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11488"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Switch to PIP</source>
         <translation>Cambiar a PIP</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11815"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11434"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11488"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Switch to PBP</source>
         <translation>Cambiar a PBP</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="12665"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12276"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12338"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>No, keep it</source>
         <translation>No, conservarla</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="10960"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10589"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10643"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Auto Detect</source>
         <translation>Detectar Automáticamente</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="4533"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="4469"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="4478"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Visualisation Off</source>
         <translation>Visualización Desactivada</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="5008"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="8539"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="4860"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8210"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="4878"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="8265"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Volume</source>
         <translation>Volumen</translation>
     </message>
     <message numerus="yes">
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="5517"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5267"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5285"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Sorry, PBP only supports %n video stream(s)</source>
         <translation>
             <numerusform>Lo siento, la PBP sólo admite %n trama de vídeo</numerusform>
@@ -20074,7 +35133,13 @@ del Grupo de Almacenamiento?</translation>
         </translation>
     </message>
     <message numerus="yes">
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="5524"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5274"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5292"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Sorry, PIP only supports %n video stream(s)</source>
         <translation>
             <numerusform>Lo siento, la PIP sólo admite %n trama de vídeo</numerusform>
@@ -20082,97 +35147,215 @@ del Grupo de Almacenamiento?</translation>
         </translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="5529"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5279"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="5297"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Sorry, cannot mix PBP and PIP views</source>
         <translation>Lo siento, no es posible mezclar las vistas PBP y PIP</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="6639"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6318"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="6367"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Switch Title</source>
         <translation>Cambiar Título</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11154"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10783"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10837"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Disable Subtitles</source>
         <translation>Desactivar Subtítulos</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11156"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10785"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="10839"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Enable Subtitles</source>
         <translation>Activar Subtítulos</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="11828"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11835"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11447"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11454"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11501"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11508"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Schedule</source>
         <translation>Programación</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="12218"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11837"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11891"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>MythTV is already using all available inputs for the channel you selected. If you want to watch an in-progress recording, select one from the playback menu.  If you want to watch Live TV, cancel one of the in-progress recordings from the delete menu.</source>
         <translation>MythTV ya está utilizando todas las entradas disponibles para el canal que ha seleccionado. Si desea ver una grabación en curso, selecciónela desde el menú de reproducción. Si desea ver la TV en Vivo, cancele una de las grabaciones en curso desde el menú de eliminación.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="12227"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11846"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11900"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Error: MythTV is using all inputs, but there are no active recordings?</source>
         <translation>Error: ¿MythTV está utilizando todas las entradas, pero no hay grabaciones en curso?</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="12231"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11850"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11904"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>MythTV has no capture cards defined. Please run the mythtv-setup program.</source>
         <translation>MythTV no tiene capturadoras definidas. Por favor, ejecute el programas mythtv-setup.</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="12514"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12125"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12187"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Live TV</source>
         <translation>TV en Vivo</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="12516"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12127"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12189"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>this DVD</source>
         <translation>este DVD</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="12520"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12131"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12193"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>this Video</source>
         <translation>este Vídeo</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="12524"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12135"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12197"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>this recording</source>
         <translation>esta grabación</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="12652"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12263"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12325"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Delete it, but allow it to re-record</source>
         <translation>Eliminarla, pero permitir grabarla de nuevo</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="12654"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12265"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12327"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Delete it</source>
         <translation>Eliminarla</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="12656"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12267"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12329"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Save it so I can watch it again</source>
         <translation>Guardarla para poder verla de nuevo</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="12661"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12272"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12334"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Yes, and allow re-record</source>
         <translation>Sí, y permitir grabarla de nuevo</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="12663"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12274"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="12336"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Yes, delete it</source>
         <translation>Sí, eliminarla</translation>
     </message>
     <message numerus="yes">
+<<<<<<< HEAD
         <location filename="../libs/libmythtv/tv_play.cpp" line="8078"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11742"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11744"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11746"/>
         <location filename="../libs/libmythtv/tv_play.cpp" line="11748"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7749"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11361"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11363"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11365"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11367"/>
+=======
+        <location filename="../libs/libmythtv/tv_play.cpp" line="7804"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11415"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11417"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11419"/>
+        <location filename="../libs/libmythtv/tv_play.cpp" line="11421"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <location filename="../libs/libmythtv/tvbrowsehelper.cpp" line="28"/>
         <location filename="../libs/libmythtv/tvbrowsehelper.cpp" line="311"/>
         <source>%n minute(s)</source>
@@ -25700,19 +40883,37 @@ Si selecciona &quot;Usar el Reproductor Predeterminado&quot;, el reproductor mar
         <translation> %1x%2</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/videodlg.cpp" line="3469"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/videodlg.cpp" line="3462"/>
+=======
+        <location filename="../programs/mythfrontend/videodlg.cpp" line="3466"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Are you sure you want to permanently delete:
 %1</source>
         <translation>¿Seguro que desea eliminar permanentemente:
 %1</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/videodlg.cpp" line="3507"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/videodlg.cpp" line="3500"/>
+=======
+        <location filename="../programs/mythfrontend/videodlg.cpp" line="3504"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Failed to delete file</source>
         <translation>Fallo al eliminar el archivo</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/videodlg.cpp" line="3756"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/videodlg.cpp" line="3749"/>
+=======
+        <location filename="../programs/mythfrontend/videodlg.cpp" line="3753"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>There are no videos in the database, would you like to scan your video directories now?</source>
         <translation>No hay vídeos en la base de datos; ¿le gustaría explorar ahora sus directorios de vídeos?</translation>
     </message>
@@ -25902,13 +41103,25 @@ Si ya no existen, por favor, elimínelos</translation>
 <context>
     <name>ViewScheduled</name>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="485"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="480"/>
+=======
+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="483"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>No Conflicts</source>
         <translation>No Hay Conflictos</translation>
     </message>
     <message>
         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="316"/>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="492"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="487"/>
+=======
+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="490"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>All</source>
         <translation>Todas</translation>
     </message>
@@ -25929,70 +41142,142 @@ Si ya no existen, por favor, elimínelos</translation>
     </message>
     <message>
         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="211"/>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="724"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="719"/>
+=======
+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="722"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Show Important</source>
         <translation>Mostrar Importantes</translation>
     </message>
     <message>
         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="213"/>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="728"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="723"/>
+=======
+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="726"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Show All</source>
         <translation>Mostrar Todas</translation>
     </message>
     <message>
         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="214"/>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="732"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="727"/>
+=======
+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="730"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Program Details</source>
         <translation>Detalles del Programa</translation>
     </message>
     <message>
         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="215"/>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="736"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="731"/>
+=======
+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="734"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Upcoming by title</source>
         <translation>Próximas por Título</translation>
     </message>
     <message>
         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="216"/>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="740"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="735"/>
+=======
+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="738"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Upcoming scheduled</source>
         <translation>Próximas programadas</translation>
     </message>
     <message>
         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="217"/>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="744"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="739"/>
+=======
+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="742"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Custom Edit</source>
         <translation>Edición Personalizada</translation>
     </message>
     <message>
         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="218"/>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="748"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="743"/>
+=======
+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="746"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Delete Rule</source>
         <translation>Eliminar Regla</translation>
     </message>
     <message>
         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="219"/>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="752"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="747"/>
+=======
+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="750"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Show Cards</source>
         <translation>Mostrar Tarjetas</translation>
     </message>
     <message>
         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="220"/>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="756"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="751"/>
+=======
+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="754"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Show Inputs</source>
         <translation>Mostrar Entradas</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="494"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="489"/>
+=======
+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="492"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Important</source>
         <translation>Importantes</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="563"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="558"/>
+=======
+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="561"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Delete &apos;%1&apos; %2 rule?</source>
         <translation>¿Eliminar la regla &apos;%1&apos; &apos;%2&apos;?</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="478"/>
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="473"/>
+=======
+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="476"/>
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
         <source>Conflict %1</source>
         <translation>Conflicto %1</translation>
     </message>
diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp
index 57f900d..bf8e7cc 100644
--- a/mythtv/libs/libmythtv/tv_play.cpp
+++ b/mythtv/libs/libmythtv/tv_play.cpp
@@ -8641,6 +8641,7 @@ void TV::EnableUpmix(PlayerContext *ctx, bool enable, bool toggle)
         SetOSDMessage(ctx, enabled ? tr("Upmixer On") : tr("Upmixer Off"));
 }
 
+<<<<<<< HEAD
 void TV::ChangeSubtitleZoom(PlayerContext *ctx, int dir)
 {
     ctx->LockDeletePlayer(__FILE__, __LINE__);
@@ -8674,6 +8675,36 @@ void TV::ChangeSubtitleZoom(PlayerContext *ctx, int dir)
     }
 }
 
+||||||| parent of b43eb75... Merge remote branch 'origin/master' into devel/rtp
+=======
+void TV::ChangeSubtitleZoom(PlayerContext *ctx, int dir)
+{
+    ctx->LockDeletePlayer(__FILE__, __LINE__);
+    if (!ctx->player)
+    {
+        ctx->UnlockDeletePlayer(__FILE__, __LINE__);
+        return;
+    }
+
+    subtitleZoomAdjustment = true;
+    bool showing = ctx->player->GetCaptionsEnabled();
+    int newval = gCoreContext->GetNumSetting("OSDCC708TextZoom", 100) + dir;
+    newval = max(50, newval);
+    newval = min(200, newval);
+    ctx->UnlockDeletePlayer(__FILE__, __LINE__);
+
+    if (showing && !browsehelper->IsBrowsing())
+    {
+        UpdateOSDStatus(ctx, tr("Adjust Subtitle Zoom"), tr("Subtitle Zoom"),
+                        QString::number(newval),
+                        kOSDFunctionalType_SubtitleZoomAdjust,
+                        "%", newval * 1000 / 200, kOSDTimeout_Long);
+        SetUpdateOSDPosition(false);
+        gCoreContext->SaveSetting("OSDCC708TextZoom", newval);
+    }
+}
+
+>>>>>>> b43eb75... Merge remote branch 'origin/master' into devel/rtp
 // dir in 10ms jumps
 void TV::ChangeAudioSync(PlayerContext *ctx, int dir, int newsync)
 {
-- 
1.7.5.4