--- a/i18n/eric5_es.ts Thu Aug 01 19:12:57 2013 +0200
+++ b/i18n/eric5_es.ts Fri Aug 02 16:29:25 2013 +0200
@@ -17962,7 +17962,7 @@
<translation>El proceso hg ha terminado con código de salida {0}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1675"/>
<source>The hg process did not finish within 30s.</source>
<translation>El proceso hg no terminó en un plazo de 30s.</translation>
</message>
@@ -18017,172 +18017,172 @@
<translation>Renombrando {0}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="992"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/>
<source>Merging</source>
<translation>Haciendo un merge</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1443"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1444"/>
<source>Copying {0}</source>
<translation>Copiando {0}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1821"/>
<source>Pulling from a remote Mercurial repository</source>
<translation>Haciendo pull de un repositorio remoto Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/>
<source>Pushing to a remote Mercurial repository</source>
<translation>Haciendo push a un repositorio remoto Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1993"/>
<source>Resolving files/directories</source>
<translation>Resolviendo archivos/directorios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="887"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="888"/>
<source>Taging in the Mercurial repository</source>
<translation>Haciendo tag en el repositorio Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="938"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="939"/>
<source>Reverting changes</source>
<translation>Revirtiendo cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1247"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1248"/>
<source>Mercurial command</source>
<translation>Comando de Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2014"/>
<source>Create Branch</source>
<translation>Crear Branch</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2014"/>
<source>Enter branch name</source>
<translation>Introducir nombre de branch</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2023"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2025"/>
<source>Creating branch in the Mercurial repository</source>
<translation>Creando branch en el repositorio Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2113"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115"/>
<source>Verifying the integrity of the Mercurial repository</source>
<translation>Verificando la integridad del repositorio Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2138"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/>
<source>Showing the combined configuration settings</source>
<translation>Mostrando los ajustes de configuración combinados</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2161"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2163"/>
<source>Showing aliases for remote repositories</source>
<translation>Mostrando alias para repositorios remotos</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2184"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2186"/>
<source>Recovering from interrupted transaction</source>
<translation>Recuperando de transacción interrumpida</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2437"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2439"/>
<source>Shall the working directory be updated?</source>
<translation>¿Debe ser actualizado el directorio de trabajo?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2047"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/>
<source>Showing current branch</source>
<translation>Mostrando la branch actual</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2338"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2340"/>
<source>Create changegroup</source>
<translation>Crear changegroup</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2449"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2451"/>
<source>Apply changegroups</source>
<translation>Aplicar changegroups</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2468"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation>Subcomando bisect ({0}) inválido.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2501"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2503"/>
<source>Mercurial Bisect ({0})</source>
<translation>Mercurial Bisect ({0})</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2394"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2396"/>
<source>Preview changegroup</source>
<translation>Previsualizar changegroup</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/>
<source>Identifying project directory</source>
<translation>Identificando directorio de proyecto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/>
<source>Create .hgignore file</source>
<translation>Crear archivo .hgignore</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/>
<source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source>
<translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2535"/>
<source>Removing files from the Mercurial repository only</source>
<translation>Eliminando archivos unicamente del repositorio Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2295"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation>Archivos Changegroup de Mercurial (*.hg)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2429"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2431"/>
<source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
<translation>Archivos Changegroup de Mercurial (*.hg);;Todos los Archivos (*)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2408"/>
<source>Identifying changegroup file</source>
<translation>Identificando archivo de changegroup</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2590"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2592"/>
<source>Backing out changeset</source>
<translation>Haciendo respaldo de changeset</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2570"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572"/>
<source>No revision given. Aborting...</source>
<translation>No se ha proporcionado revisión. Abortando...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2312"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2314"/>
<source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation><p>El archivo changegroup de Mercurial <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2615"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2617"/>
<source>Rollback last transaction</source>
<translation>Hacer Rollback de la última transacción</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2610"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/>
<source>Are you sure you want to rollback the last transaction?</source>
<translation>¿Está seguro de que quiere aplicar un rollback a la última transacción?</translation>
</message>
@@ -18192,72 +18192,72 @@
<translation>Haciendo commit de cambios al repositorio Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3178"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3180"/>
<source>Mercurial Command Server</source>
<translation>Servidor de Comandos de Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3049"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3051"/>
<source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source>
<translation><p>El Servidor de Comandos de Mercurial no ha podido reiniciarse.</p><p>Razón: {0}</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3178"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3180"/>
<source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source>
<translation><p>El Servidor de Comandos de Mercurial no ha podido iniciarse.</p><p>Razón: {0}</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2684"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2686"/>
<source>Import Patch</source>
<translation>Importar Patch</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2732"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2734"/>
<source>Export Patches</source>
<translation>Exportar Patches</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2781"/>
<source>Change Phase</source>
<translation>Cambiar Fase</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/>
<source>Copy Changesets</source>
<translation>Copiar Changesets</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2859"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2861"/>
<source>Copy Changesets (Continue)</source>
<translation>Copiar Changesets (Continuar)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2975"/>
<source>Add Sub-repository</source>
<translation>Añadir Sub-repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3005"/>
<source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source>
<translation><p>No se ha podido leer el archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2956"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2958"/>
<source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source>
<translation><p>El archivo .hgsub de sub-repositorios ya contiene una entrada.</p><p>Abortando...</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3022"/>
<source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source>
<translation><p>No se ha podido escribir al archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3022"/>
<source>Remove Sub-repositories</source>
<translation>Eliminar Sub-repositorios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2992"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994"/>
<source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source>
<translation><p>El archivo de subrepositorios .hgsub no existe. Abortando...</p></translation>
</message>
@@ -18272,37 +18272,37 @@
<translation>La operación de commit afecta a archivos que tienen cambios sin guardar. ¿Continuar con la operación de commit?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="933"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="934"/>
<source>Revert changes</source>
<translation>Revertir cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="926"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="927"/>
<source>Do you really want to revert all changes to these files or directories?</source>
<translation>¿Realmente desea revertir todos los cambios a estos archivos o directorios?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="933"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="934"/>
<source>Do you really want to revert all changes of the project?</source>
<translation>¿Realmente desea revertir todos los cambios del proyecto?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2895"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2897"/>
<source>Create Unversioned Archive</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1744"/>
<source>Mercurial Side-by-Side Difference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1744"/>
<source><p>The file <b>{0}</b> could not be read.</p></source>
<translation type="unfinished"><p>El archivo <b>{0}</b> no se ha podido leer.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1676"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1677"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation type="unfinished">El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation>
</message>
@@ -20174,7 +20174,7 @@
<context>
<name>HgLogBrowserDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="57"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="58"/>
<source>Mercurial Log</source>
<translation>Registro de Mercurial</translation>
</message>
@@ -20204,17 +20204,17 @@
<translation>Seleccione el campo de filtrado</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1221"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1226"/>
<source>Revision</source>
<translation>Revisión</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1218"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1223"/>
<source>Author</source>
<translation>Autor</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/>
<source>Message</source>
<translation>Mensaje</translation>
</message>
@@ -20279,77 +20279,77 @@
<translation>&Comparar Revisiones</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="393"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="403"/>
<source>Errors</source>
<translation>Errores</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="399"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="409"/>
<source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source>
<translation><b>Errores de Mercurial log</b><p>Muestra los posibles mensajes de error del comando hg log.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="415"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="425"/>
<source>Input</source>
<translation>Input</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="437"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="447"/>
<source>Press to send the input to the hg process</source>
<translation>Pulsar para enviar el input al proceso de hg</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="440"/>
- <source>&Send</source>
- <translation>&Enviar</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="443"/>
- <source>Alt+S</source>
- <translation>Alt+S</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="450"/>
- <source>Enter data to be sent to the hg process</source>
- <translation>Introduzca los datos a enviar al proceso de hg</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="457"/>
- <source>Select to switch the input field to password mode</source>
- <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation>
+ <source>&Send</source>
+ <translation>&Enviar</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="453"/>
+ <source>Alt+S</source>
+ <translation>Alt+S</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="460"/>
+ <source>Enter data to be sent to the hg process</source>
+ <translation>Introduzca los datos a enviar al proceso de hg</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="467"/>
+ <source>Select to switch the input field to password mode</source>
+ <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="470"/>
<source>&Password Mode</source>
<translation>&Modo de contraseña</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="463"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="473"/>
<source>Alt+P</source>
<translation>Alt+P</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="117"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/>
<source>Added</source>
<translation>Añadido</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="118"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/>
<source>Deleted</source>
<translation>Borrado</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/>
<source>Modified</source>
<translation>Modificado</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="701"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="704"/>
<source>Process Generation Error</source>
<translation>Error de Generación de Proceso</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="701"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="704"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation>
</message>
@@ -20364,17 +20364,17 @@
<translation>Tags</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="503"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506"/>
<source>The hg process did not finish within 30s.</source>
<translation>El proceso hg no terminó en un plazo de 30s.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506"/>
- <source>Could not start the hg executable.</source>
- <translation>No se ha podido iniciar el ejecutable de hg.</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509"/>
+ <source>Could not start the hg executable.</source>
+ <translation>No se ha podido iniciar el ejecutable de hg.</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="512"/>
<source>Mercurial Error</source>
<translation>Error de Mercurial</translation>
</message>
@@ -20414,32 +20414,32 @@
<translation>Seleccione la branch para filtrar</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="89"/>
<source>All</source>
<translation>Todo</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="59"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="60"/>
<source>Mercurial Log (Incoming)</source>
<translation>Mercurial Log (Entrante)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="61"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="62"/>
<source>Mercurial Log (Outgoing)</source>
<translation>Mercurial Log (Saliente)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="128"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="131"/>
<source>Bookmarks</source>
<translation>Marcadores</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/>
+ <source>Press to refresh the list of changesets</source>
+ <translation>Pulsar para actualizar la lista de changesets</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="71"/>
- <source>Press to refresh the list of changesets</source>
- <translation>Pulsar para actualizar la lista de changesets</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="70"/>
<source>&Refresh</source>
<translation>Actualiza&r</translation>
</message>
@@ -20471,15 +20471,25 @@
<translation>Pulsar para copiar los changesets seleccionados a la branch actual</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1371"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1376"/>
<source>Copy Changesets</source>
<translation>Copiar Changesets</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1371"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1376"/>
<source>The project should be reread. Do this now?</source>
<translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="385"/>
+ <source>Select to show differences side-by-side</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/>
+ <source>Show differences side-by-side</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgLogDialog</name>
@@ -20499,177 +20509,187 @@
<translation><b>Log de Mercurial</b><p>Muestra la salida del comando hg log. Haciendo click en los enlaces se muestran las diferencias entre versiones.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="51"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="61"/>
<source>Errors</source>
<translation>Errores</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="57"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="67"/>
<source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source>
<translation><b>Errores de Mercurial log</b><p>Muestra los posibles mensajes de error del comando hg log.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="73"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="83"/>
<source>Input</source>
<translation>Input</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="95"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="105"/>
<source>Press to send the input to the hg process</source>
<translation>Pulse para enviar el input al proceso de hg</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="98"/>
- <source>&Send</source>
- <translation>&Enviar</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="101"/>
- <source>Alt+S</source>
- <translation>Alt+S</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="108"/>
- <source>Enter data to be sent to the hg process</source>
- <translation>Introduzca los datos a enviar al proceso de hg</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="115"/>
- <source>Select to switch the input field to password mode</source>
- <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation>
+ <source>&Send</source>
+ <translation>&Enviar</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="111"/>
+ <source>Alt+S</source>
+ <translation>Alt+S</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="118"/>
+ <source>Enter data to be sent to the hg process</source>
+ <translation>Introduzca los datos a enviar al proceso de hg</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="125"/>
+ <source>Select to switch the input field to password mode</source>
+ <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="128"/>
<source>&Password Mode</source>
<translation>&Modo de contraseña</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="121"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="131"/>
<source>Alt+P</source>
<translation>Alt+P</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="55"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="56"/>
<source><b>Processing your request, please wait...</b></source>
<translation><b>Procesando la solicitud, por favor aguarde...</b></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="65"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="66"/>
<source>Revision</source>
<translation>Revisión</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="185"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="188"/>
<source>Process Generation Error</source>
<translation>Error de Generación de Proceso</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="185"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="188"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="270"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="273"/>
<source>No log available for '{0}'</source>
<translation>No hay registros de log disponibles para '{0}'</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="303"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="306"/>
<source>diff to {0}</source>
<translation>diff con {0}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="314"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/>
<source>Branches: {0}<br />
</source>
<translation>Branches: {0}<br />
</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="316"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="319"/>
<source>Tags: {0}<br />
</source>
<translation>Tags: {0}<br />
</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="321"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="324"/>
<source>Parents: {0}<br />
</source>
<translation>Parents: {0}<br />
</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="323"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/>
<source><i>Author: {0}</i><br />
</source>
<translation><i>Autor: {0}</i><br />
</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="329"/>
<source><i>Date: {0}, {1}</i><br />
</source>
<translation><i>Fecha: {0}</i><br />
</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="340"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="343"/>
<source>Added {0}<br />
</source>
<translation>Añadido {0}<br />
</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="346"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="349"/>
<source>Modified {0}<br />
</source>
<translation>Modificado {0}<br />
</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="352"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="355"/>
<source>Deleted {0}<br />
</source>
<translation>Borrado {0}<br />
</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="236"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="239"/>
<source>The hg process did not finish within 30s.</source>
<translation>El proceso hg no terminó en un plazo de 30s.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="239"/>
- <source>Could not start the hg executable.</source>
- <translation>No se ha podido iniciar el ejecutable de hg.</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="242"/>
+ <source>Could not start the hg executable.</source>
+ <translation>No se ha podido iniciar el ejecutable de hg.</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="245"/>
<source>Mercurial Error</source>
<translation>Error de Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="336"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="339"/>
<source>Added {0} (copied from {1})<br />
</source>
<translation>Añadido {0} (copiado de {1})<br />
</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="319"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/>
<source>Bookmarks: {0}<br />
</source>
<translation>Marcadores: {0}<br />
</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="315"/>
<source>Phase: {0}<br />
</source>
<translation>Fase: {0}<br />
</translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="45"/>
+ <source>Select to show differences side-by-side</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="48"/>
+ <source>Show differences side-by-side</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgMergeDialog</name>
@@ -21118,17 +21138,17 @@
<translation>Revertir cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="647"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/>
<source>Remove from repository only</source>
<translation>Eliminar solamente del repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="638"/>
<source>Do you really want to remove these translation files from the repository?</source>
<translation>¿Realmente quiere eliminar estos archivos de traducción del repositorio?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="647"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/>
<source>Do you really want to remove these files from the repository?</source>
<translation>¿Realmente quiere eliminar estos archivos del repositorio?</translation>
</message>
@@ -59852,17 +59872,17 @@
<context>
<name>mercurial</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/>
<source><tr><td><b>Tags</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Etiquetas</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1949"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1951"/>
<source><tr><td><b>Branches</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1958"/>
<source><tr><td><b>Last author</b></td><td>{0}</td></tr>
<tr><td><b>Committed date</b></td><td>{1}</td></tr>
<tr><td><b>Committed time</b></td><td>{2}</td></tr>
@@ -59873,31 +59893,31 @@
</table></p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1937"/>
<source><tr><td><b>Tip</b></td><td></td></tr>
</source>
<translation><tr><td><b>Pista</b></td><td></td></tr>
</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1937"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/>
<source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Changeset</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1955"/>
<source><tr><td><b>Parents</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Padres</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1308"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1309"/>
<source><tr><td><b>Parent #{0}</b></td><td></td></tr>
<tr><td><b>Changeset</b></td><td>{1}</td></tr></source>
<translation><tr><td><b>Padre #{0}</b></td><td></td></tr>
<tr><td><b>Changeset</b></td><td>{1}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1324"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1325"/>
<source><tr><td><b>Last author</b></td><td>{0}</td></tr>
<tr><td><b>Committed date</b></td><td>{1}</td></tr>
<tr><td><b>Committed time</b></td><td>{2}</td></tr></source>
@@ -59923,12 +59943,12 @@
{2}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1947"/>
<source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Marcadores</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1358"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1359"/>
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
