--- a/i18n/eric5_es.ts Sat May 17 16:53:00 2014 +0200
+++ b/i18n/eric5_es.ts Sat May 17 18:18:06 2014 +0200
@@ -8792,7 +8792,7 @@
<translation>Editar punto de interrupción...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4856"/>
+ <location filename="../QScintilla/Editor.py" line="4855"/>
<source>Enable breakpoint</source>
<translation>Activar punto de interrupción</translation>
</message>
@@ -8902,197 +8902,197 @@
<translation>Autocompletar no está disponible porque no hay origen de datos para autocompletar.</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4859"/>
+ <location filename="../QScintilla/Editor.py" line="4858"/>
<source>Disable breakpoint</source>
<translation>Deshabilitar punto de interrupción</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5203"/>
+ <location filename="../QScintilla/Editor.py" line="5202"/>
<source>Code Coverage</source>
<translation>Cobertura de codigo</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5203"/>
+ <location filename="../QScintilla/Editor.py" line="5202"/>
<source>Please select a coverage file</source>
<translation>Por favor seleccione un archivo de cobertura</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5267"/>
+ <location filename="../QScintilla/Editor.py" line="5266"/>
<source>Show Code Coverage Annotations</source>
<translation>Mostrar Anotaciones de Cobertura de Código</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5260"/>
+ <location filename="../QScintilla/Editor.py" line="5259"/>
<source>All lines have been covered.</source>
<translation>Todas las líneas han sido cubiertas.</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5267"/>
+ <location filename="../QScintilla/Editor.py" line="5266"/>
<source>There is no coverage file available.</source>
<translation>No hay archivo de cobertura disponible.</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5382"/>
+ <location filename="../QScintilla/Editor.py" line="5381"/>
<source>Profile Data</source>
<translation>Datos de profiling</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5382"/>
+ <location filename="../QScintilla/Editor.py" line="5381"/>
<source>Please select a profile file</source>
<translation>Por favor seleccione un archivo de profiling</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5542"/>
+ <location filename="../QScintilla/Editor.py" line="5541"/>
<source>Syntax Error</source>
<translation>Error de sintaxis</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5542"/>
+ <location filename="../QScintilla/Editor.py" line="5541"/>
<source>No syntax error message available.</source>
<translation>No hay mensajes de error de sintaxis disponibles.</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5857"/>
+ <location filename="../QScintilla/Editor.py" line="5856"/>
<source>Macro Name</source>
<translation>Nombre de macro</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5857"/>
+ <location filename="../QScintilla/Editor.py" line="5856"/>
<source>Select a macro name:</source>
<translation>Seleccione un nombre de macro:</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5885"/>
+ <location filename="../QScintilla/Editor.py" line="5884"/>
<source>Load macro file</source>
<translation>Cargar archivo de macro</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5928"/>
+ <location filename="../QScintilla/Editor.py" line="5927"/>
<source>Macro files (*.macro)</source>
<translation>Archivos de Macro (*.macro)</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5908"/>
+ <location filename="../QScintilla/Editor.py" line="5907"/>
<source>Error loading macro</source>
<translation>Error al cargar macro</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5928"/>
+ <location filename="../QScintilla/Editor.py" line="5927"/>
<source>Save macro file</source>
<translation>Guardar archivo de macro</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5945"/>
+ <location filename="../QScintilla/Editor.py" line="5944"/>
<source>Save macro</source>
<translation>Guardar macro</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5961"/>
+ <location filename="../QScintilla/Editor.py" line="5960"/>
<source>Error saving macro</source>
<translation>Error al guardar macro</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5974"/>
+ <location filename="../QScintilla/Editor.py" line="5973"/>
<source>Start Macro Recording</source>
<translation>Comenzar grabación de macro</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5974"/>
+ <location filename="../QScintilla/Editor.py" line="5973"/>
<source>Macro recording is already active. Start new?</source>
<translation>Grabación de macro ya está activada. ¿Comenzar una nueva?</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6000"/>
+ <location filename="../QScintilla/Editor.py" line="5999"/>
<source>Macro Recording</source>
<translation>Grabando macro</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6000"/>
+ <location filename="../QScintilla/Editor.py" line="5999"/>
<source>Enter name of the macro:</source>
<translation>Introduzca el nombre de la macro:</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6134"/>
+ <location filename="../QScintilla/Editor.py" line="6133"/>
<source>File changed</source>
<translation>Archivo modificado</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6432"/>
+ <location filename="../QScintilla/Editor.py" line="6431"/>
<source>Drop Error</source>
<translation>Error al soltar</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6453"/>
+ <location filename="../QScintilla/Editor.py" line="6452"/>
<source>Resources</source>
<translation>Recursos</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6455"/>
+ <location filename="../QScintilla/Editor.py" line="6454"/>
<source>Add file...</source>
<translation>Añadir archivo...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6457"/>
+ <location filename="../QScintilla/Editor.py" line="6456"/>
<source>Add files...</source>
<translation>Añadir archivos...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6459"/>
+ <location filename="../QScintilla/Editor.py" line="6458"/>
<source>Add aliased file...</source>
<translation>Añadir archivo con un alias...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6462"/>
+ <location filename="../QScintilla/Editor.py" line="6461"/>
<source>Add localized resource...</source>
<translation>Añadir recursos localizados...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6466"/>
+ <location filename="../QScintilla/Editor.py" line="6465"/>
<source>Add resource frame</source>
<translation>Añadir ventana de recursos</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6485"/>
+ <location filename="../QScintilla/Editor.py" line="6484"/>
<source>Add file resource</source>
<translation>Añadir archivo de recursos</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6501"/>
+ <location filename="../QScintilla/Editor.py" line="6500"/>
<source>Add file resources</source>
<translation>Añadir archivo de recursos</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6529"/>
+ <location filename="../QScintilla/Editor.py" line="6528"/>
<source>Add aliased file resource</source>
<translation>Añadir archivo de recursos con un alias</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6593"/>
+ <location filename="../QScintilla/Editor.py" line="6592"/>
<source>Package Diagram</source>
<translation>Digrama de paquetes</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6593"/>
+ <location filename="../QScintilla/Editor.py" line="6592"/>
<source>Include class attributes?</source>
<translation>¿Incluir atributos de clase?</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6613"/>
+ <location filename="../QScintilla/Editor.py" line="6612"/>
<source>Imports Diagram</source>
<translation>Diagrama de imports</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6613"/>
+ <location filename="../QScintilla/Editor.py" line="6612"/>
<source>Include imports from external modules?</source>
<translation>¿Incluir los imports de módulos externos?</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6627"/>
+ <location filename="../QScintilla/Editor.py" line="6626"/>
<source>Application Diagram</source>
<translation>Diagrama de aplicación</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6627"/>
+ <location filename="../QScintilla/Editor.py" line="6626"/>
<source>Include module names?</source>
<translation>¿Incluir nombres de módulos?</translation>
</message>
@@ -9167,7 +9167,7 @@
<translation>Seleccionar el Analizador Léxico de Pygments.</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6915"/>
+ <location filename="../QScintilla/Editor.py" line="6914"/>
<source>Check spelling...</source>
<translation>Corrección ortográfica...</translation>
</message>
@@ -9177,12 +9177,12 @@
<translation>Corrección ortográfica de la selección...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6918"/>
+ <location filename="../QScintilla/Editor.py" line="6917"/>
<source>Add to dictionary</source>
<translation>Añadir al diccionario</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6920"/>
+ <location filename="../QScintilla/Editor.py" line="6919"/>
<source>Ignore All</source>
<translation>Ignorar Todo</translation>
</message>
@@ -9222,37 +9222,37 @@
<translation><p>El archivo <b>{0}</b> no puede ser guardado.<br>Causa: {1}</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5899"/>
+ <location filename="../QScintilla/Editor.py" line="5898"/>
<source><p>The macro file <b>{0}</b> could not be read.</p></source>
<translation><p>El archivo de macro <b>{0}</b> no se puede leer.</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5908"/>
+ <location filename="../QScintilla/Editor.py" line="5907"/>
<source><p>The macro file <b>{0}</b> is corrupt.</p></source>
<translation><p>El archivo de macro <b>{0}</b> está dañado</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5961"/>
+ <location filename="../QScintilla/Editor.py" line="5960"/>
<source><p>The macro file <b>{0}</b> could not be written.</p></source>
<translation><p>El archivo de macro <b>{0}</b> no se puede escribir.</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6124"/>
+ <location filename="../QScintilla/Editor.py" line="6123"/>
<source><p>The file <b>{0}</b> has been changed while it was opened in eric5. Reread it?</p></source>
<translation><p>El archivo <b>{0}</b> ha cambiado mientras estaba abierto en eric5. ¿Desea volver a cargarlo?</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6292"/>
+ <location filename="../QScintilla/Editor.py" line="6291"/>
<source>{0} (ro)</source>
<translation>{0} (ro)</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6432"/>
+ <location filename="../QScintilla/Editor.py" line="6431"/>
<source><p><b>{0}</b> is not a file.</p></source>
<translation><p><b>{0}</b> no es un archivo.</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6529"/>
+ <location filename="../QScintilla/Editor.py" line="6528"/>
<source>Alias for file <b>{0}</b>:</source>
<translation>Alias para el archivo <b>{0}</b>:</translation>
</message>
@@ -9282,22 +9282,22 @@
<translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5945"/>
+ <location filename="../QScintilla/Editor.py" line="5944"/>
<source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation><p>El archivo de macro <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5796"/>
+ <location filename="../QScintilla/Editor.py" line="5795"/>
<source>Warning: {0}</source>
<translation>Advertencia: {0}</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5803"/>
+ <location filename="../QScintilla/Editor.py" line="5802"/>
<source>Error: {0}</source>
<translation>Error: {0}</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6130"/>
+ <location filename="../QScintilla/Editor.py" line="6129"/>
<source><br><b>Warning:</b> You will lose your changes upon reopening it.</source>
<translation><br><b>Advertencia:</b> Perderá los cambios si lo reabre.</translation>
</message>
@@ -9342,27 +9342,27 @@
<translation>Cambio anterior</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7332"/>
+ <location filename="../QScintilla/Editor.py" line="7331"/>
<source>Sort Lines</source>
<translation>Ordenar Líneas</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7332"/>
+ <location filename="../QScintilla/Editor.py" line="7331"/>
<source>The selection contains illegal data for a numerical sort.</source>
<translation>La selección contiene datos ilegales para una ordenación numérica.</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5732"/>
+ <location filename="../QScintilla/Editor.py" line="5731"/>
<source>Warning</source>
<translation>Advertencia</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5732"/>
+ <location filename="../QScintilla/Editor.py" line="5731"/>
<source>No warning messages available.</source>
<translation>No hay mensajes de advertencia disponibles.</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5793"/>
+ <location filename="../QScintilla/Editor.py" line="5792"/>
<source>Style: {0}</source>
<translation>Estilo: {0}</translation>
</message>
@@ -18866,415 +18866,445 @@
<context>
<name>Hg</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="283"/>
<source>The hg process finished with the exit code {0}</source>
<translation>El proceso hg ha terminado con código de salida {0}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1770"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/>
<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/hg.py" line="286"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/>
<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/hg.py" line="314"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/>
<source>Create project repository</source>
<translation>Crear repositorio del proyecto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/>
<source>The project repository could not be created.</source>
<translation>No se ha podido crear el repositorio del proyecto.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="343"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="347"/>
<source>Creating Mercurial repository</source>
<translation>Creando repositorio Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="359"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/>
<source>Initial commit to Mercurial repository</source>
<translation>Commit inicial al repositorio Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="407"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/>
<source>Cloning project from a Mercurial repository</source>
<translation>Clonando proyecto desde un repositorio Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="620"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="624"/>
<source>Synchronizing with the Mercurial repository</source>
<translation>Sincronizando con el repositorio Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="670"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="674"/>
<source>Adding files/directories to the Mercurial repository</source>
<translation>Añadiendo archivos/directorios al repositorio Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="740"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="744"/>
<source>Removing files/directories from the Mercurial repository</source>
<translation>Eliminando archivos/directorios del repositorio Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="802"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="806"/>
<source>Renaming {0}</source>
<translation>Renombrando {0}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1066"/>
<source>Merging</source>
<translation>Haciendo un merge</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1531"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/>
<source>Copying {0}</source>
<translation>Copiando {0}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1924"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1979"/>
<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="1974"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2029"/>
<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="2103"/>
<source>Resolving files/directories</source>
- <translation>Resolviendo archivos/directorios</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1017"/>
+ <translation type="obsolete">Resolviendo archivos/directorios</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/>
<source>Reverting changes</source>
<translation>Revirtiendo cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1311"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/>
<source>Mercurial command</source>
<translation>Comando de Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/>
<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="2315"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2390"/>
<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="2340"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2415"/>
<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="2364"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2439"/>
<source>Showing aliases for remote repositories</source>
<translation>Mostrando alias para repositorios remotos</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2463"/>
<source>Recovering from interrupted transaction</source>
<translation>Recuperando de transacción interrumpida</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2682"/>
<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="2191"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2266"/>
<source>Showing current branch</source>
<translation>Mostrando la branch actual</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2539"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2614"/>
<source>Create changegroup</source>
<translation>Crear changegroup</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/>
<source>Apply changegroups</source>
<translation>Aplicar changegroups</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2637"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2712"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation>Subcomando bisect ({0}) inválido.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2742"/>
<source>Mercurial Bisect ({0})</source>
<translation>Mercurial Bisect ({0})</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2635"/>
<source>Preview changegroup</source>
<translation>Previsualizar changegroup</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2412"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2487"/>
<source>Identifying project directory</source>
<translation>Identificando directorio de proyecto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/>
<source>Create .hgignore file</source>
<translation>Crear archivo .hgignore</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/>
<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="2699"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2774"/>
<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="2496"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2571"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation>Archivos Changegroup de Mercurial (*.hg)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2674"/>
<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="2753"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2828"/>
<source>Backing out changeset</source>
<translation>Haciendo respaldo de changeset</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2733"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2808"/>
<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="2513"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2588"/>
<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="2780"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2855"/>
<source>Rollback last transaction</source>
<translation>Hacer Rollback de la última transacción</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2773"/>
- <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>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="568"/>
- <source>Committing changes to Mercurial repository</source>
- <translation>Haciendo commit de cambios al repositorio Mercurial</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3429"/>
- <source>Mercurial Command Server</source>
- <translation>Servidor de Comandos de Mercurial</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3269"/>
- <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="3429"/>
- <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="2848"/>
+ <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>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="572"/>
+ <source>Committing changes to Mercurial repository</source>
+ <translation>Haciendo commit de cambios al repositorio Mercurial</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3504"/>
+ <source>Mercurial Command Server</source>
+ <translation>Servidor de Comandos de Mercurial</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3344"/>
+ <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="3504"/>
+ <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="2923"/>
<source>Import Patch</source>
<translation>Importar Patch</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2895"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2970"/>
<source>Export Patches</source>
<translation>Exportar Patches</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2942"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3017"/>
<source>Change Phase</source>
<translation>Cambiar Fase</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3070"/>
<source>Copy Changesets</source>
<translation>Copiar Changesets</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3021"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3096"/>
<source>Copy Changesets (Continue)</source>
<translation>Copiar Changesets (Continuar)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3213"/>
<source>Add Sub-repository</source>
<translation>Añadir Sub-repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3171"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/>
<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="3119"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3194"/>
<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="3190"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3265"/>
<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="3190"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3265"/>
<source>Remove Sub-repositories</source>
<translation>Eliminar Sub-repositorios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3159"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3234"/>
<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>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="503"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/>
<source>Commit Changes</source>
<translation>Hacer Commit de Cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="503"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/>
<source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source>
<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="1011"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1015"/>
<source>Revert changes</source>
<translation>Revertir cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1002"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/>
<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="1011"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1015"/>
<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="3056"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/>
<source>Create Unversioned Archive</source>
<translation>Crear Archivo Sin Versionar</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1840"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/>
<source>Mercurial Side-by-Side Difference</source>
<translation>Diferencia Lado a Lado Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1840"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/>
<source><p>The file <b>{0}</b> could not be read.</p></source>
<translation><p>El archivo <b>{0}</b> no se ha podido leer.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1773"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/>
<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/hg.py" line="961"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/>
<source>Tagging in the Mercurial repository</source>
<translation>Haciendo tag en el repositorio Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2169"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2244"/>
<source>Created new branch <{0}>.</source>
<translation>Creada nueva branch <{0}>.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1087"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1142"/>
<source>Current branch tip</source>
<translation>Tip branch actual</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2129"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/>
<source>Cancelling uncommitted merge</source>
<translation>Cancelando merge sin commit</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3537"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3612"/>
<source>Mercurial Bookmark</source>
<translation>Marcador de Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/>
<source>Delete Bookmark</source>
<translation>Borrar Marcador</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/>
<source>Select the bookmark to be deleted:</source>
<translation>Seleccionar el marcador a borrar:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3566"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641"/>
<source>Delete Mercurial Bookmark</source>
<translation>Borrar Marcador de Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3594"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3669"/>
<source>Rename Mercurial Bookmark</source>
<translation>Renombrar Marcador de Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3627"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3702"/>
<source>Move Mercurial Bookmark</source>
<translation>Mover Marcador de Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3712"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3787"/>
<source>Pull Bookmark</source>
<translation>Pull de Marcador</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3712"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3787"/>
<source>Select the bookmark to be pulled:</source>
<translation>Seleccinar el marcador sobre el que hacer pull:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3723"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3798"/>
<source>Pulling bookmark from a remote Mercurial repository</source>
<translation>Haciendo pull de marcador desde un repositorio Mercurial remoto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3745"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/>
<source>Push Bookmark</source>
<translation>Push de Marcador</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3745"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/>
<source>Select the bookmark to be push:</source>
<translation>Seleccinar el marcador sobre el que hacer push:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3756"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/>
<source>Pushing bookmark to a remote Mercurial repository</source>
<translation>Haciendo push de marcador desde un repositorio Mercurial remoto</translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1112"/>
+ <source>Re-Merge</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/>
+ <source>Do you really want to re-merge these files or directories?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1112"/>
+ <source>Do you really want to re-merge the project?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1117"/>
+ <source>Re-Merging</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2175"/>
+ <source>Marking as 'unresolved'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/>
+ <source>Marking as 'resolved'</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgAddSubrepositoryDialog</name>
@@ -20340,6 +20370,139 @@
</message>
</context>
<context>
+ <name>HgConflictsListDialog</name>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="14"/>
+ <source>Mercurial Conflicts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="23"/>
+ <source><b>Conflicts List</b>\n<p>This shows a list of files which had or still have conflicts.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="42"/>
+ <source>Status</source>
+ <translation type="unfinished">Estado</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="47"/>
+ <source>Name</source>
+ <translation type="unfinished">Nombre</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="70"/>
+ <source>Press to mark the selected entries as 'resolved'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="245"/>
+ <source>Resolved</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="80"/>
+ <source>Press to mark the selected entries as 'unresolved'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="243"/>
+ <source>Unresolved</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="103"/>
+ <source>Press to re-merge the selected entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="106"/>
+ <source>Re-Merge</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="113"/>
+ <source>Press to edit the selected entry</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="116"/>
+ <source>Edit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="144"/>
+ <source>Errors</source>
+ <translation type="unfinished">Errores</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="163"/>
+ <source>Input</source>
+ <translation type="unfinished">Input</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="185"/>
+ <source>Press to send the input to the hg process</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="188"/>
+ <source>&Send</source>
+ <translation type="unfinished">&Enviar</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="191"/>
+ <source>Alt+S</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="198"/>
+ <source>Enter data to be sent to the hg process</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="205"/>
+ <source>Select to switch the input field to password mode</source>
+ <translation type="unfinished">Seleccionar para cambiar el campo de input a modo contraseña</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="208"/>
+ <source>&Password Mode</source>
+ <translation type="unfinished">&Modo de contraseña</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="211"/>
+ <source>Alt+P</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="53"/>
+ <source>&Refresh</source>
+ <translation type="unfinished">Actualiza&r</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="55"/>
+ <source>Press to refresh the list of conflicts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="156"/>
+ <source>Process Generation Error</source>
+ <translation type="unfinished">Error de Generación de Proceso</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="156"/>
+ <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>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="247"/>
+ <source>Unknown Status</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>HgCopyDialog</name>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="14"/>
@@ -22105,57 +22268,57 @@
<context>
<name>HgProjectBrowserHelper</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="588"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="606"/>
<source>Version Control</source>
<translation>Control de Versiones</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="600"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="618"/>
<source>Commit changes to repository...</source>
<translation>Hacer commit de los cambios al repositorio...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="607"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/>
<source>Add to repository</source>
<translation>Añadir al repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629"/>
<source>Remove from repository (and disk)</source>
<translation>Eliminar del repositorio (y del disco)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="530"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="542"/>
<source>Show log</source>
<translation>Mostrar log</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="534"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="546"/>
<source>Show log browser</source>
<translation>Mostrar navegador de log</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/>
<source>Select all local file entries</source>
<translation>Seleccionar todas las entradas de archivo locales</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="666"/>
<source>Select all versioned file entries</source>
<translation>Seleccionar todas las entradas de archivo versionadas</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="644"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="668"/>
<source>Select all local directory entries</source>
<translation>Seleccionar todas las entradas de directorio locales</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="646"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="670"/>
<source>Select all versioned directory entries</source>
<translation>Seleccionar todas las entradas de directorio versionadas</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="617"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="635"/>
<source>Show status</source>
<translation>Mostrar estado</translation>
</message>
@@ -22165,27 +22328,27 @@
<translation>Mostrar archivo anotado</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="650"/>
<source>Revert changes</source>
<translation>Revertir cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="780"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/>
<source>Remove from repository only</source>
<translation>Eliminar solamente del repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="780"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/>
<source>Do you really want to remove these files from the repository?</source>
<translation>¿Realmente quiere eliminar estos archivos del repositorio?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="525"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="537"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="527"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="539"/>
<source>Move</source>
<translation>Mover</translation>
</message>
@@ -22195,7 +22358,7 @@
<translation>Extensiones</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640"/>
<source>Show differences</source>
<translation>Mostrar diferencias</translation>
</message>
@@ -22205,7 +22368,7 @@
<translation>Mostrar diferencias lado a lado</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="644"/>
<source>Show differences (extended)</source>
<translation>Mostrar diferencias (extendido)</translation>
</message>
@@ -22215,10 +22378,20 @@
<translation>Mostrar diferencias lado a lado (extendido)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="654"/>
<source>Conflicts resolved</source>
<translation>Conflictos resueltos</translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/>
+ <source>Conflicts unresolved</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="660"/>
+ <source>Re-Merge</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgProjectHelper</name>
@@ -22513,432 +22686,432 @@
<translation><b>Revertir cambios</b><p>Revierte todos los cambios hechos al proyecto local.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/>
<source>Tag in repository</source>
<translation>Crear un Tag en el repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/>
<source>&Tag in repository...</source>
<translation>Crear un &Tag en el repositorio...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/>
- <source>Tag the local project in the repository</source>
- <translation>Crea un tag del proyecto local en el repositorio</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/>
- <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source>
- <translation><b>Crear un Tag en el repositorio</b><p>Crea un tag del proyecto local en el repositorio.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/>
- <source>List tags</source>
- <translation>Listar tags</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/>
- <source>List tags...</source>
- <translation>Listar tags...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465"/>
- <source>List tags of the project</source>
- <translation>Lista los tags del proyecto</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/>
- <source><b>List tags</b><p>This lists the tags of the project.</p></source>
- <translation><b>Listar tags</b><p>Lista los tags del proyecto.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/>
- <source>List branches</source>
- <translation>Listar branches</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/>
- <source>List branches...</source>
- <translation>Listar branches...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/>
- <source>List branches of the project</source>
- <translation>Lista las branches del proyecto</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/>
- <source><b>List branches</b><p>This lists the branches of the project.</p></source>
- <translation><b>Listar branches</b><p>Lista las branches del proyecto.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/>
- <source>Create branch</source>
- <translation>Crear branch</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/>
- <source>Create &branch...</source>
- <translation>Crear &branch...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/>
- <source>Create a new branch for the local project in the repository</source>
- <translation>Crear una nueva branch para el proyecto local en el repositorio</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/>
- <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source>
- <translation><b>Crear branch</b><p>Crea una nueva branch para el proyecto local en el repositorio.</p></translation>
+ <source>Tag the local project in the repository</source>
+ <translation>Crea un tag del proyecto local en el repositorio</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/>
+ <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source>
+ <translation><b>Crear un Tag en el repositorio</b><p>Crea un tag del proyecto local en el repositorio.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/>
+ <source>List tags</source>
+ <translation>Listar tags</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/>
+ <source>List tags...</source>
+ <translation>Listar tags...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/>
+ <source>List tags of the project</source>
+ <translation>Lista los tags del proyecto</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/>
+ <source><b>List tags</b><p>This lists the tags of the project.</p></source>
+ <translation><b>Listar tags</b><p>Lista los tags del proyecto.</p></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/>
- <source>Close branch</source>
- <translation>Cerrar branch</translation>
+ <source>List branches</source>
+ <translation>Listar branches</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/>
+ <source>List branches...</source>
+ <translation>Listar branches...</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/>
- <source>Close the current branch of the local project</source>
- <translation>Cerrar la branch actual para el proyecto local</translation>
+ <source>List branches of the project</source>
+ <translation>Lista las branches del proyecto</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/>
+ <source><b>List branches</b><p>This lists the branches of the project.</p></source>
+ <translation><b>Listar branches</b><p>Lista las branches del proyecto.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/>
+ <source>Create branch</source>
+ <translation>Crear branch</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/>
+ <source>Create &branch...</source>
+ <translation>Crear &branch...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/>
+ <source>Create a new branch for the local project in the repository</source>
+ <translation>Crear una nueva branch para el proyecto local en el repositorio</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543"/>
+ <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source>
+ <translation><b>Crear branch</b><p>Crea una nueva branch para el proyecto local en el repositorio.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/>
+ <source>Close branch</source>
+ <translation>Cerrar branch</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/>
+ <source>Close the current branch of the local project</source>
+ <translation>Cerrar la branch actual para el proyecto local</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/>
<source><b>Close branch</b><p>This closes the current branch of the local project.</p></source>
<translation><b>Cerrar branch</b><p>Cierra la branch actual del proyecto local.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/>
<source>Switch</source>
<translation>Hacer switch</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/>
<source>S&witch...</source>
<translation>Hacer s&witch...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/>
<source>Switch the working directory to another revision</source>
<translation>Hacer switch del directorio de trabajo a otra revisión</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/>
<source><b>Switch</b><p>This switches the working directory to another revision.</p></source>
<translation><b>Hacer switch</b><p>Hace un switch del directorio de trabajo a otra revisión.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/>
<source>Cleanup</source>
<translation>Limpiar (cleanup)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/>
<source>Cleanu&p</source>
<translation>Lim&piar (cleanup)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="569"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/>
<source>Cleanup the local project</source>
<translation>Limpiar (cleanup) el proyecto local</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/>
<source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source>
<translation><b>Limpieza (cleanup)</b><p>Lleva a cabo un cleanup del proyecto local.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/>
<source>Execute command</source>
<translation>Ejecutar comando</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/>
<source>E&xecute command...</source>
<translation>E&jecutar comando...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="583"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/>
<source>Execute an arbitrary Mercurial command</source>
<translation>Ejecuta un comando Mercurial arbitrario</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/>
<source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source>
<translation><b>Ejecutar comando</b><p>Abre un diálogo para introducir un comando Mercurial arbitrario.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/>
<source>Configure</source>
<translation>Configurar</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/>
<source>Configure...</source>
<translation>Configurar...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/>
<source>Show the configuration dialog with the Mercurial page selected</source>
<translation>Mostrar el diálogo de configuración con la página de Mercurial seleccionada</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/>
<source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source>
<translation><b>Configurar</b><p>Mostrar el diálogo de configuración con la página de Mercurial seleccionada.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/>
<source>Show paths</source>
<translation>Mostrar rutas</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/>
<source>Show paths...</source>
<translation>Mostrar rutas...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/>
<source>Show the aliases for remote repositories</source>
<translation>Mostrar los alias para los repositorios remotos</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/>
<source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source>
<translation><b>Mostrar rutas</b><p>Muestra los alias para los repositorios remotos.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/>
<source>Verify repository</source>
<translation>Verificar repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/>
- <source>Verify repository...</source>
- <translation>Verificar repositorio...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/>
- <source>Verify the integrity of the repository</source>
- <translation>Verificar la integridad del repositorio</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/>
- <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source>
- <translation><b>Verificar repositorio</b><p>Verifica la integridad del repositorio.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/>
- <source>Recover</source>
- <translation>Recuperar</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/>
- <source>Recover...</source>
- <translation>Recuperar...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/>
- <source>Recover from an interrupted transaction</source>
- <translation>Recuperar de una transacción interrumpida</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/>
- <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source>
- <translation><b>Recuperar</b><p>Recupera de una transacción interrumpida.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/>
- <source>Create .hgignore</source>
- <translation>Crear .hgignore</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/>
- <source>Create a .hgignore file with default values</source>
- <translation>Creare un archivo .hgignore con valores por defecto</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717"/>
- <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source>
- <translation><b>Crear .hgignore</b><p>Crea un archivo .hgignore con valores por defecto.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/>
- <source>Create changegroup</source>
- <translation>Crear changegroup</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/>
- <source>Create changegroup...</source>
- <translation>Crear changegroup...</translation>
+ <source>Verify repository...</source>
+ <translation>Verificar repositorio...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/>
+ <source>Verify the integrity of the repository</source>
+ <translation>Verificar la integridad del repositorio</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/>
+ <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source>
+ <translation><b>Verificar repositorio</b><p>Verifica la integridad del repositorio.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/>
+ <source>Recover</source>
+ <translation>Recuperar</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/>
+ <source>Recover...</source>
+ <translation>Recuperar...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/>
+ <source>Recover from an interrupted transaction</source>
+ <translation>Recuperar de una transacción interrumpida</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/>
+ <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source>
+ <translation><b>Recuperar</b><p>Recupera de una transacción interrumpida.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756"/>
+ <source>Create .hgignore</source>
+ <translation>Crear .hgignore</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/>
+ <source>Create a .hgignore file with default values</source>
+ <translation>Creare un archivo .hgignore con valores por defecto</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/>
+ <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source>
+ <translation><b>Crear .hgignore</b><p>Crea un archivo .hgignore con valores por defecto.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/>
+ <source>Create changegroup</source>
+ <translation>Crear changegroup</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/>
+ <source>Create changegroup...</source>
+ <translation>Crear changegroup...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="774"/>
<source>Create changegroup file collecting changesets</source>
<translation>Crea un archivo de changegroup recogiendo changesets</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1578"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1651"/>
<source>Apply changegroups</source>
<translation>Aplicar changegroups</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/>
<source>Apply changegroups...</source>
<translation>Aplicar changegroups...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/>
<source>Apply one or several changegroup files</source>
<translation>Aplicar uno o varios archivos de changegroup</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/>
<source>Changegroup Management</source>
<translation>Gestión de Chagegroup</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/>
<source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source>
<translation><b>Crear changegroup</b><p>Crea un archivo de changegroup recogiendo los changeset seleccionados (hg bundle).</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/>
<source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source>
<translation><b>Aplicar changegroups</b><p>Aplica uno o varios archivos de changegroup generados por la acción 'Crear changegroup' (hg unbundle).</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/>
<source>Show current branch</source>
<translation>Mostrar la branch actual</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/>
<source>Show the current branch of the project</source>
<translation>Mostrar la branch actual del proyecto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="542"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/>
<source><b>Show current branch</b><p>This shows the current branch of the project.</p></source>
<translation><b>Mostrar branch actual</b><p>Muestra la branch actual del proyecto.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/>
- <source>Mark as "good"</source>
- <translation>Marcar como "bueno"</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/>
- <source>Mark a selectable changeset as good</source>
- <translation>Marcar un changeset seleccionable como bueno</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/>
- <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source>
- <translation><b>Marcar como bueno</b><p>Marca un changeset seleccionable como bueno.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/>
- <source>Mark as "bad"</source>
- <translation>Marcar como "malo"</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="787"/>
- <source>Mark a selectable changeset as bad</source>
- <translation>Marcar un changeset seleccionable como malo</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/>
- <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source>
- <translation><b>Marcar como malo</b><p>Marca un changeset seleccionable como malo.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/>
- <source>Skip</source>
- <translation>Saltar</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/>
- <source>Reset</source>
- <translation>Reiniciar</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/>
+ <source>Mark as "good"</source>
+ <translation>Marcar como "bueno"</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/>
+ <source>Mark a selectable changeset as good</source>
+ <translation>Marcar un changeset seleccionable como bueno</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/>
+ <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source>
+ <translation><b>Marcar como bueno</b><p>Marca un changeset seleccionable como bueno.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/>
+ <source>Mark as "bad"</source>
+ <translation>Marcar como "malo"</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/>
+ <source>Mark a selectable changeset as bad</source>
+ <translation>Marcar un changeset seleccionable como malo</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/>
+ <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source>
+ <translation><b>Marcar como malo</b><p>Marca un changeset seleccionable como malo.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="843"/>
+ <source>Skip</source>
+ <translation>Saltar</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/>
+ <source>Reset</source>
+ <translation>Reiniciar</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/>
<source>Reset the bisect search data</source>
<translation>Reiniciar los datos de búsqueda de bisect</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/>
<source><b>Reset</b><p>This resets the bisect search data.</p></source>
<translation><b>Reiniciar</b><p>Reinicia los datos de búsqueda de bisect.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261"/>
<source>Bisect</source>
<translation>Bisect</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/>
<source>Mark as "good"...</source>
<translation>Marcar como "bueno"...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/>
<source>Mark as "bad"...</source>
<translation>Marcar como "malo"...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/>
<source>Preview changegroup</source>
<translation>Previsualizar changegroup</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/>
<source>Preview changegroup...</source>
<translation>Previsualizar changegroup...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/>
<source>Identify</source>
<translation>Identificar</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/>
<source>Identify...</source>
<translation>Identificar...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/>
- <source>Identify the project directory</source>
- <translation>Identificar el directorio de proyecto</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/>
- <source><b>Identify</b><p>This identifies the project directory.</p></source>
- <translation><b>Identificar</b><p>Identifica el directorio de proyecto.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/>
- <source>Preview a changegroup file containing a collection of changesets</source>
- <translation>Previsualizar un archivo de changegroup conteniendo una colección de changesets</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/>
+ <source>Identify the project directory</source>
+ <translation>Identificar el directorio de proyecto</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/>
+ <source><b>Identify</b><p>This identifies the project directory.</p></source>
+ <translation><b>Identificar</b><p>Identifica el directorio de proyecto.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/>
+ <source>Preview a changegroup file containing a collection of changesets</source>
+ <translation>Previsualizar un archivo de changegroup conteniendo una colección de changesets</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792"/>
<source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source>
<translation><b>Previsualizar changegroup</b><p>Previsualiza un archivo de changegroup conteniendo una colección de changesets.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="871"/>
<source>Back out changeset</source>
<translation>Hacer respaldo de changeset</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/>
<source>Back out changes of an earlier changeset</source>
<translation>Hacer respaldo de cambios de un changeset anterior</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/>
<source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source>
<translation><b>Hacer respaldo de changeset</b><p>Hace un respaldo de cambios de un changeset anterior.</p></translation>
</message>
@@ -22958,317 +23131,317 @@
<translation><b>Hacer push de cambios (force)</b><p>Se hace un push de los cambios desde el repositorio local a un repositorio remoto utilizando la opción 'force'.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1193"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1239"/>
<source>Specials</source>
<translation>Especial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="912"/>
<source>Serve project repository</source>
<translation>Servir repositorio de proyecto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="912"/>
<source>Serve project repository...</source>
<translation>Servir repositorio de proyecto...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="870"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/>
<source>Serve the project repository</source>
<translation>Servir el repositorio de proyecto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/>
<source><b>Serve project repository</b><p>This serves the project repository.</p></source>
<translation><b>Servir repositorio de proyecto</b><p>Esto sirve el repositorio de proyecto.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1415"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1468"/>
<source>Pull</source>
<translation>Hacer Pull</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1689"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1762"/>
<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/ProjectHelper.py" line="505"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/>
<source>Push new branch</source>
<translation>Hacer push de nueva rama</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/>
<source>Push the current branch of the local project as a new named branch</source>
<translation>Ejecutar push de la rama actual del proyecto local como una nueva rama con nombre</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/>
<source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source>
<translation><b>Hacer push de nueva rama</b><p>Hace un push de la rama actual del proyecto local como una nueva rama con nombre.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/>
<source>Rollback last transaction</source>
<translation>Rollback de última transacción</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/>
+ <source>Rollback the last transaction</source>
+ <translation>Rollback de la última transacción</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302"/>
+ <source>Extensions</source>
+ <translation>Extensiones</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/>
+ <source>Edit user configuration</source>
+ <translation>Editar configuración de usuario</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/>
+ <source>Edit user configuration...</source>
+ <translation>Editar configuración de usuario...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/>
+ <source>Show an editor to edit the user configuration file</source>
+ <translation>Mostrar un editor para editar el archivo de configuración de usuario</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/>
+ <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source>
+ <translation><b>Editar configuración de usuario</b><p>Mostrar un editor para editar el archivo de configuración de usuario.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/>
+ <source>Edit repository configuration</source>
+ <translation>Editar configuración del repositorio</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/>
+ <source>Edit repository configuration...</source>
+ <translation>Editar configuración del repositorio...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/>
+ <source>Show an editor to edit the repository configuration file</source>
+ <translation>Mostrar un editor para editar el archivo de configuración del repositorio</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/>
+ <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source>
+ <translation><b>Editar configuración del repositorio</b><p>Mostrar un editor para editar el archivo de configuración del repositorio.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/>
+ <source>Show combined configuration settings</source>
+ <translation>Mostrar ajustes de configuración combinados</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/>
+ <source>Show combined configuration settings...</source>
+ <translation>Mostrar ajustes de configuración combinados...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/>
+ <source>Show the combined configuration settings from all configuration files</source>
+ <translation>Mostrar los ajustes de configuración combinados de todos los archivos de configuración</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/>
+ <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source>
+ <translation><b>Mostrar ajustes de configuración combinados</b><p>Muestra los ajustes de configuración combinados de todos los archivos de configuración.</p></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="843"/>
- <source>Rollback the last transaction</source>
- <translation>Rollback de la última transacción</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/>
- <source>Extensions</source>
- <translation>Extensiones</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/>
- <source>Edit user configuration</source>
- <translation>Editar configuración de usuario</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/>
- <source>Edit user configuration...</source>
- <translation>Editar configuración de usuario...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/>
- <source>Show an editor to edit the user configuration file</source>
- <translation>Mostrar un editor para editar el archivo de configuración de usuario</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/>
- <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source>
- <translation><b>Editar configuración de usuario</b><p>Mostrar un editor para editar el archivo de configuración de usuario.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/>
- <source>Edit repository configuration</source>
- <translation>Editar configuración del repositorio</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/>
- <source>Edit repository configuration...</source>
- <translation>Editar configuración del repositorio...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/>
- <source>Show an editor to edit the repository configuration file</source>
- <translation>Mostrar un editor para editar el archivo de configuración del repositorio</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/>
- <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source>
- <translation><b>Editar configuración del repositorio</b><p>Mostrar un editor para editar el archivo de configuración del repositorio.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/>
- <source>Show combined configuration settings</source>
- <translation>Mostrar ajustes de configuración combinados</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/>
- <source>Show combined configuration settings...</source>
- <translation>Mostrar ajustes de configuración combinados...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/>
- <source>Show the combined configuration settings from all configuration files</source>
- <translation>Mostrar los ajustes de configuración combinados de todos los archivos de configuración</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/>
- <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source>
- <translation><b>Mostrar ajustes de configuración combinados</b><p>Muestra los ajustes de configuración combinados de todos los archivos de configuración.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/>
<source>Skip...</source>
<translation>Ignorar...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/>
<source>Skip a selectable changeset</source>
<translation>Ignorar un changeset seleccionable</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="850"/>
<source><b>Skip</b><p>This skips a selectable changeset.</p></source>
<translation><b>Ignorar</b><p>Ignora un changeset seleccionable.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1634"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1707"/>
<source>Import Patch</source>
<translation>Importar Patch</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="926"/>
<source>Import Patch...</source>
<translation>Importar Patch...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="884"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/>
<source>Import a patch from a patch file</source>
<translation>Importar un patch desde un archivo de patch</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="933"/>
<source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source>
<translation><b>Importar Patch</b><p>Importa un patch desde un archivo de patch al proyecto.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1209"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1255"/>
<source>Patch Management</source>
<translation>Gestión de Patch</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1727"/>
<source>Revert Changes</source>
<translation>Revertir cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/>
<source>Export Patches</source>
<translation>Exportar Patches</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/>
<source>Export Patches...</source>
<translation>Exportar Patches...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/>
<source>Export revisions to patch files</source>
<translation>Exportar revisiones a archivos de patch</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="902"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948"/>
<source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source>
<translation><b>Exportar Patches</b><p>Exporta revisiones del proyecto a archivos de patch.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/>
<source>Change Phase</source>
<translation>Cambiar Fase</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/>
- <source>Change Phase...</source>
- <translation>Cambiar Fase...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/>
- <source>Change the phase of revisions</source>
- <translation>Cambiar la fase de revisiones</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/>
- <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source>
- <translation><b>Cambiar Fase</b><p>Cambia la fase de revisiones.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1674"/>
- <source>Copy Changesets</source>
- <translation>Copiar Changesets</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/>
- <source>Copies changesets from another branch</source>
- <translation>Copiar changesets de otra branch</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931"/>
- <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source>
- <translation><b>Copiar Changesets</b><p>Copia changesets de otra branch encima del directorio de trabajo actual con el usuario, fecha y descripción del changeset original.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940"/>
- <source>Continue Copying Session</source>
- <translation>Continuar Sesión de Copia</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/>
- <source>Continue the last copying session after conflicts were resolved</source>
- <translation>Continuar la última sesión de copia despues de resolver los conflictos</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="947"/>
- <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source>
- <translation><b>Continuar Sesión de C opia</b><p>Continua la última sesión de copia despues de resolver los conflictos.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1268"/>
- <source>Graft</source>
- <translation>Graft</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1689"/>
- <source>Copy Changesets (Continue)</source>
- <translation>Copiar Changesets (Continuar)</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/>
- <source>Conflicts resolved</source>
- <translation>Conflictos resueltos</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/>
- <source>Con&flicts resolved</source>
- <translation>Con&flictos resueltos</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/>
- <source>Mark all conflicts of the local project as resolved</source>
- <translation>Marcar todos los conflictos del proyecto local como resueltos</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="438"/>
- <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source>
- <translation><b>Conflictos resueltos</b><p>Marca todos los conflictos del proyecto local como resueltos.</p></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/>
+ <source>Change Phase...</source>
+ <translation>Cambiar Fase...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="959"/>
+ <source>Change the phase of revisions</source>
+ <translation>Cambiar la fase de revisiones</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="962"/>
+ <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source>
+ <translation><b>Cambiar Fase</b><p>Cambia la fase de revisiones.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1747"/>
+ <source>Copy Changesets</source>
+ <translation>Copiar Changesets</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="974"/>
+ <source>Copies changesets from another branch</source>
+ <translation>Copiar changesets de otra branch</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="977"/>
+ <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source>
+ <translation><b>Copiar Changesets</b><p>Copia changesets de otra branch encima del directorio de trabajo actual con el usuario, fecha y descripción del changeset original.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/>
+ <source>Continue Copying Session</source>
+ <translation>Continuar Sesión de Copia</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990"/>
+ <source>Continue the last copying session after conflicts were resolved</source>
+ <translation>Continuar la última sesión de copia despues de resolver los conflictos</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="993"/>
+ <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source>
+ <translation><b>Continuar Sesión de C opia</b><p>Continua la última sesión de copia despues de resolver los conflictos.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1314"/>
+ <source>Graft</source>
+ <translation>Graft</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1762"/>
+ <source>Copy Changesets (Continue)</source>
+ <translation>Copiar Changesets (Continuar)</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/>
+ <source>Conflicts resolved</source>
+ <translation>Conflictos resueltos</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/>
+ <source>Con&flicts resolved</source>
+ <translation>Con&flictos resueltos</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/>
+ <source>Mark all conflicts of the local project as resolved</source>
+ <translation>Marcar todos los conflictos del proyecto local como resueltos</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/>
+ <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source>
+ <translation><b>Conflictos resueltos</b><p>Marca todos los conflictos del proyecto local como resueltos.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/>
<source>Add</source>
<translation>Añadir</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/>
<source>Add...</source>
<translation>Añadir...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/>
<source>Add a sub-repository</source>
<translation>Añadir un sub-repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1009"/>
<source><b>Add...</b><p>Add a sub-repository to the project.</p></source>
<translation><b>Añadir...</b><p>Añadir un sub-repositorio al proyecto.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/>
<source>Remove</source>
<translation>Eliminar</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/>
<source>Remove...</source>
<translation>Eliminar...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/>
<source>Remove sub-repositories</source>
<translation>Eliminar sub-repositorios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="978"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1024"/>
<source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source>
<translation><b>Eliminar...</b><p>Eliminar sub-repositorios del proyecto.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1276"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/>
<source>Sub-Repository</source>
<translation>Sub-repositorio</translation>
</message>
@@ -23298,32 +23471,32 @@
<translation><b>Mostrar sumario</b><p>Muestra información sumarial del estado del directorio de trabajo.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/>
<source>Create unversioned archive</source>
<translation>Crear archivo sin versionar</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/>
<source>Create unversioned archive...</source>
<translation>Crear archivo sin versionar...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/>
<source>Create an unversioned archive from the repository</source>
<translation>Crear un archivo sin versionar a partir del repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1040"/>
<source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source>
<translation><b>Crear archivo sin versionar...</b><p>Crea un archivo sin versionar a partir del repositorio.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/>
<source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source>
<translation><b>Rollback de última transacción</b><p>Lleva a cabo un rollback de la última transacción. Las transactiones se utilizan para encapsular los efectos de todos los comandos que crean nuevos changesets or propagan changesets existentes hacia un repository. Por ejemplo, los siguientes comandos son transaccionales, y sus efectos pueden ser revertidos (rollback):<ul><li>commit</li><li>import</li><li>pull</li><li>push (con este repositorio como destino)</li><li>unbundle</li></ul></p><p><strong>Este comando es peligroso. Utiliícelo por favor con cuidado.</strong></p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1170"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/>
<source>Administration</source>
<translation>Administración</translation>
</message>
@@ -23363,180 +23536,235 @@
<translation><b>Cancelar merge sin commit</b><p>Esto cancela un merge sin commit causando que todos los cambios se pierdan.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1002"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/>
<source>List bookmarks</source>
<translation>Listar marcadores</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1002"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/>
<source>List bookmarks...</source>
<translation>Listar marcadores...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1007"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/>
<source>List bookmarks of the project</source>
<translation>Lista marcadores del proyecto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/>
<source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source>
<translation><b>Listar marcadores</b><p>Lista los marcadores del proyecto.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/>
<source>Define bookmark</source>
<translation>Definir marcador</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/>
<source>Define bookmark...</source>
<translation>Definir marcador...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1022"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/>
<source>Define a bookmark for the project</source>
<translation>Define un marcador para el proyecto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/>
<source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source>
<translation><b>Definir marcador</b><p>Define un marcador para el proyecto.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1078"/>
<source>Delete bookmark</source>
<translation>Borrar marcador</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/>
- <source>Delete bookmark...</source>
- <translation>Borrar marcador...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/>
- <source>Delete a bookmark of the project</source>
- <translation>Borrar un marcador del proyecto</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1040"/>
- <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source>
- <translation><b>Borrar marcador</b><p>Borra un marcador del proyecto.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047"/>
- <source>Rename bookmark</source>
- <translation>Renombrar marcador</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047"/>
- <source>Rename bookmark...</source>
- <translation>Renombrar marcador...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/>
- <source>Rename a bookmark of the project</source>
- <translation>Renombrar un marcador del proyecto</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1055"/>
- <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source>
- <translation><b>Renombrar marcador</b><p>Renombra un marcador del proyecto.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/>
- <source>Move bookmark</source>
- <translation>Mover marcador</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/>
- <source>Move bookmark...</source>
- <translation>Mover marcador...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/>
- <source>Move a bookmark of the project</source>
- <translation>Mover un marcador del proyecto</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1070"/>
- <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source>
- <translation><b>Mover marcador</b><p>Mueve un marcador del proyecto.</p></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1078"/>
- <source>Show incoming bookmarks</source>
- <translation>Mostrar marcadores entrantes</translation>
+ <source>Delete bookmark...</source>
+ <translation>Borrar marcador...</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/>
- <source>Show a list of incoming bookmarks</source>
- <translation>Muestra una lista de marcadores entrantes</translation>
+ <source>Delete a bookmark of the project</source>
+ <translation>Borrar un marcador del proyecto</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1086"/>
- <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source>
- <translation><b>Mostrar marcadores entrantes</b><p>Muestra una lista de nuevos marcadores disponibles en el repositorio remoto.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/>
- <source>Pull bookmark</source>
- <translation>Pull de marcador</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1100"/>
- <source>Pull a bookmark from a remote repository</source>
- <translation>Hacer pull de marcador desde un repositorio remoto</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/>
- <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source>
- <translation><b>Hacer pull de marcador</b><p>Hace pull de un marcador desde un repositorio remoto al repositorio local.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/>
- <source>Show outgoing bookmarks</source>
- <translation>Mostrar marcadores salientes</translation>
+ <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source>
+ <translation><b>Borrar marcador</b><p>Borra un marcador del proyecto.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/>
+ <source>Rename bookmark</source>
+ <translation>Renombrar marcador</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/>
+ <source>Rename bookmark...</source>
+ <translation>Renombrar marcador...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/>
+ <source>Rename a bookmark of the project</source>
+ <translation>Renombrar un marcador del proyecto</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/>
+ <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source>
+ <translation><b>Renombrar marcador</b><p>Renombra un marcador del proyecto.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/>
+ <source>Move bookmark</source>
+ <translation>Mover marcador</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/>
+ <source>Move bookmark...</source>
+ <translation>Mover marcador...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/>
+ <source>Move a bookmark of the project</source>
+ <translation>Mover un marcador del proyecto</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/>
+ <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source>
+ <translation><b>Mover marcador</b><p>Mueve un marcador del proyecto.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124"/>
+ <source>Show incoming bookmarks</source>
+ <translation>Mostrar marcadores entrantes</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/>
+ <source>Show a list of incoming bookmarks</source>
+ <translation>Muestra una lista de marcadores entrantes</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1132"/>
+ <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source>
+ <translation><b>Mostrar marcadores entrantes</b><p>Muestra una lista de nuevos marcadores disponibles en el repositorio remoto.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1141"/>
+ <source>Pull bookmark</source>
+ <translation>Pull de marcador</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/>
+ <source>Pull a bookmark from a remote repository</source>
+ <translation>Hacer pull de marcador desde un repositorio remoto</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/>
+ <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source>
+ <translation><b>Hacer pull de marcador</b><p>Hace pull de un marcador desde un repositorio remoto al repositorio local.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1157"/>
+ <source>Show outgoing bookmarks</source>
+ <translation>Mostrar marcadores salientes</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/>
<source>Show a list of outgoing bookmarks</source>
<translation>Muestra una lista de marcadores salientes</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1165"/>
<source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source>
<translation><b>Mostrar marcadores salientes</b><p>Muestra una lista de nuevos marcadores disponibles en el repositorio local.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1174"/>
<source>Push bookmark</source>
<translation>Push de marcador</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1179"/>
<source>Push a bookmark to a remote repository</source>
<translation>Hacer push de marcador a un repositorio remoto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/>
<source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source>
<translation><b>Hacer push de marcador</b><p>Hace push de un marcador desde un repositorio local al repositorio remoto.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1239"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/>
<source>Bookmarks</source>
<translation>Marcadores</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1269"/>
<source>Tags</source>
<translation>Tags</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1230"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1276"/>
<source>Branches</source>
<translation>Branches</translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/>
+ <source>Re-Merge</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/>
+ <source>Re-Merge all conflicting, unresolved files of the project</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/>
+ <source>Show conflicts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/>
+ <source>Show conflicts...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/>
+ <source>Show a dialog listing all files with conflicts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/>
+ <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/>
+ <source>Conflicts unresolved</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/>
+ <source>Mark all conflicts of the local project as unresolved</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/>
+ <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1327"/>
+ <source>Manage Changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/>
+ <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgPurgeListDialog</name>
@@ -62485,17 +62713,17 @@
<context>
<name>mercurial</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104"/>
<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="2059"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114"/>
<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="2068"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/>
<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>
@@ -62506,31 +62734,31 @@
</table></p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2041"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/>
<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="2044"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2099"/>
<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="2064"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/>
<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="1378"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1433"/>
<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="1398"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1453"/>
<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>
@@ -62539,12 +62767,12 @@
<tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2109"/>
<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="1436"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/>
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
