--- a/i18n/eric5_es.ts	Mon Feb 17 19:05:07 2014 +0100
+++ b/i18n/eric5_es.ts	Mon Feb 17 19:08:05 2014 +0100
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="2.0" language="es" sourcelanguage="">
+<!DOCTYPE TS>
+<TS version="2.0" language="es">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -1925,8 +1926,8 @@
     </message>
     <message>
         <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="142"/>
-        <source>Open in New &amp;Tab<byte value="x9"/>Ctrl+LMB</source>
-        <translation>Abrir en Nueva &amp;Pestaña<byte value="x9"/>Ctrl+LMB (botón izquierdo del ratón)</translation>
+        <source>Open in New &amp;Tab	Ctrl+LMB</source>
+        <translation>Abrir en Nueva &amp;Pestaña	Ctrl+LMB (botón izquierdo del ratón)</translation>
     </message>
     <message>
         <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="148"/>
@@ -2167,8 +2168,8 @@
     </message>
     <message>
         <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="90"/>
-        <source>Open in New &amp;Tab<byte value="x9"/>Ctrl+LMB</source>
-        <translation>Abrir en Nueva &amp;Pestaña<byte value="x9"/>Ctrl+LMB (botón izquierdo del ratón)</translation>
+        <source>Open in New &amp;Tab	Ctrl+LMB</source>
+        <translation>Abrir en Nueva &amp;Pestaña	Ctrl+LMB (botón izquierdo del ratón)</translation>
     </message>
     <message>
         <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="101"/>
@@ -15555,7 +15556,7 @@
     <name>HelpBrowser</name>
     <message>
         <location filename="../Helpviewer/HelpBrowserWV.py" line="1083"/>
-        <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source>
+        <source>Open Link in New Tab	Ctrl+LMB</source>
         <translation>Abrir enlace en Nueva Pestaña Ctrl+LMB (botón izquierdo del ratón)</translation>
     </message>
     <message>
@@ -24087,67 +24088,67 @@
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="14"/>
         <source>Mercurial Repository Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Configuración del Repositorio Mercurial</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="23"/>
         <source>Default</source>
-        <translation type="unfinished">Por defecto</translation>
+        <translation>Por defecto</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="93"/>
         <source>Upstream URL:</source>
-        <translation type="unfinished"></translation>
+        <translation>URL remota:</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="36"/>
         <source>Enter the URL of the upstream repository</source>
-        <translation type="unfinished"></translation>
+        <translation>Introducir la URL del repositorio remoto</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="107"/>
         <source>Username:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nombre de Usuario:</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="50"/>
         <source>Enter user name to acces the upstream repository</source>
-        <translation type="unfinished"></translation>
+        <translation>Introducir el nombre de usuario para acceder al repositorio remoto</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="121"/>
         <source>Password:</source>
-        <translation type="unfinished">Contraseña:</translation>
+        <translation>Contraseña:</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="138"/>
         <source>Press to show the password</source>
-        <translation type="unfinished"></translation>
+        <translation>Pulsar para mostrar la contraseña</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="87"/>
         <source>Default Push</source>
-        <translation type="unfinished"></translation>
+        <translation>Push por Defecto</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="100"/>
         <source>Enter the URL of the upstream (push) repository</source>
-        <translation type="unfinished"></translation>
+        <translation>Introducir la URL del repositorio remoto (push)</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="114"/>
         <source>Enter user name to acces the upstream (push) repository</source>
-        <translation type="unfinished"></translation>
+        <translation>Introducir el nombre de usuario para acceder al repositorio remoto (push)</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="64"/>
         <source>Enter the password to acces the upstream repository</source>
-        <translation type="unfinished"></translation>
+        <translation>Introducir la contraseña para acceder al repositorio remoto</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="128"/>
         <source>Enter the password to acces the upstream (push) repository</source>
-        <translation type="unfinished"></translation>
+        <translation>Introducir la contraseña para acceder al repositorio remoto (push)</translation>
     </message>
 </context>
 <context>
@@ -25242,117 +25243,117 @@
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="14"/>
         <source>Mercurial User Data</source>
-        <translation type="unfinished">Datos de Usuario de Mercurial</translation>
+        <translation>Datos de Usuario de Mercurial</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="23"/>
         <source>User Data</source>
-        <translation type="unfinished"></translation>
+        <translation>Datos de Usuario</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="29"/>
         <source>First Name:</source>
-        <translation type="unfinished">Nombre:</translation>
+        <translation>Nombre:</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="36"/>
         <source>Enter the first name</source>
-        <translation type="unfinished"></translation>
+        <translation>Introducir el nombre</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="43"/>
         <source>Last Name:</source>
-        <translation type="unfinished">Apellido:</translation>
+        <translation>Apellido:</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="50"/>
         <source>Enter the last name</source>
-        <translation type="unfinished"></translation>
+        <translation>Introducir el apellido</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="57"/>
         <source>Email:</source>
-        <translation type="unfinished"></translation>
+        <translation>Email:</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="64"/>
         <source>Enter the email address</source>
-        <translation type="unfinished">Introducir la dirección de correo electrónico</translation>
+        <translation>Introducir la dirección de correo electrónico</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="74"/>
         <source>Extensions</source>
-        <translation type="unfinished">Extensiones</translation>
+        <translation>Extensiones</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="80"/>
         <source>Select to activate the bookmarks extension</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionar para activar la extensión de marcadores</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="83"/>
         <source>Bookmarks</source>
-        <translation type="unfinished">Marcadores</translation>
+        <translation>Marcadores</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="90"/>
         <source>Select to activate the fetch extension</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionar para activar la extensión de fetch</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="93"/>
         <source>Fetch</source>
-        <translation type="unfinished">Fetch</translation>
+        <translation>Fetch</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="100"/>
         <source>Select to activate the GPG extension</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionar para activar la extensión de GPG</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="103"/>
         <source>GPG</source>
-        <translation type="unfinished">GPG</translation>
+        <translation>GPG</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="110"/>
         <source>Select to activate the Purge extension</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionar para activar la extensión de purge</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="113"/>
         <source>Purge</source>
-        <translation type="unfinished">Purgar</translation>
+        <translation>Purge</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="120"/>
         <source>Select to activate the queues extension</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionar para activar la extensión de queues</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="123"/>
         <source>Queues</source>
-        <translation type="unfinished">Colas</translation>
+        <translation>Queues</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="133"/>
         <source>Rebase</source>
-        <translation type="unfinished">Rebase</translation>
+        <translation>Rebase</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="140"/>
         <source>Select to activate the transplant extension</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionar para activar la extensión de transplant</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="143"/>
         <source>Transplant</source>
-        <translation type="unfinished">Transplantar</translation>
+        <translation>Transplant</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="130"/>
         <source>Select to activate the rebase extension</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionar para activar la extensión de rebase</translation>
     </message>
 </context>
 <context>
@@ -30521,23 +30522,24 @@
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="176"/>
         <source>Merge</source>
-        <translation type="unfinished">Hacer merge</translation>
+        <translation>Hacer merge</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="182"/>
         <source>Select to enforce usage of the Mercural internal merge tool</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionar para forzar el uso de la herramienta interna de Mercurial de merge</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="185"/>
         <source>&lt;b&gt;Internal Merge Tool&lt;/b&gt;
 &lt;p&gt;Select to enforce usage of the Mercural internal merge tool,which leaves conflict markers in the file in case of conflicting changes.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Herramienta Interna Merge&lt;/b&gt;
+&lt;p&gt;Seleccionar para forzar el uso de la herramienta interna de Mercurial de merge. Ésta deja los marcadores de conflicto en el archivo en caso de cambios conflictivos.&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="189"/>
         <source>Use internal merge with conflict markers</source>
-        <translation type="unfinished"></translation>
+        <translation>Utilizar merge interno con marcadores de conflicto</translation>
     </message>
 </context>
 <context>