--- a/eric6/i18n/eric6_es.ts Fri Aug 23 13:23:22 2019 +0200
+++ b/eric6/i18n/eric6_es.ts Fri Aug 23 13:23:36 2019 +0200
@@ -6898,7 +6898,7 @@
<message>
<location filename="../Debugger/DebugUI.py" line="597"/>
<source>&Start</source>
- <translation>&Iniciar</translation>
+ <translation type="obsolete">&Iniciar</translation>
</message>
<message>
<location filename="../Debugger/DebugUI.py" line="599"/>
@@ -7144,6 +7144,11 @@
<source>No locals available.</source>
<translation>No hay locals disponibles.</translation>
</message>
+ <message>
+ <location filename="../Debugger/DebugUI.py" line="597"/>
+ <source>Sta&rt</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>DebugViewer</name>
@@ -31278,7 +31283,7 @@
<context>
<name>Hg</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1773"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/>
<source>The hg process did not finish within 30s.</source>
<translation>El proceso hg no terminó en un plazo de 30s.</translation>
</message>
@@ -31308,420 +31313,425 @@
<translation>Clonando proyecto desde un repositorio Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="630"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/>
<source>Synchronizing with the Mercurial repository</source>
<translation>Sincronizando con el repositorio Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="680"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="691"/>
<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="749"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="760"/>
<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="810"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="821"/>
<source>Renaming {0}</source>
<translation>Renombrando {0}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1050"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1061"/>
<source>Merging</source>
<translation>Haciendo un merge</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1534"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1545"/>
<source>Copying {0}</source>
<translation>Copiando {0}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1936"/>
<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="1983"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/>
<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="999"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/>
<source>Reverting changes</source>
<translation>Revirtiendo cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1350"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1361"/>
<source>Mercurial command</source>
<translation>Comando de Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2205"/>
<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="2341"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/>
<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="2366"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2377"/>
<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="2390"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2401"/>
<source>Showing aliases for remote repositories</source>
<translation>Mostrando alias para repositorios remotos</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2414"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/>
<source>Recovering from interrupted transaction</source>
<translation>Recuperando de transacción interrumpida</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2656"/>
<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="2223"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/>
<source>Showing current branch</source>
<translation>Mostrando la branch actual</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587"/>
<source>Create changegroup</source>
<translation>Crear changegroup</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2657"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/>
<source>Apply changegroups</source>
<translation>Aplicar changegroups</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2676"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2687"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation>Subcomando bisect ({0}) inválido.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716"/>
<source>Mercurial Bisect ({0})</source>
<translation>Mercurial Bisect ({0})</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2608"/>
<source>Preview changegroup</source>
<translation>Previsualizar changegroup</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2449"/>
<source>Identifying project directory</source>
<translation>Identificando directorio de proyecto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/>
<source>Create .hgignore file</source>
<translation>Crear archivo .hgignore</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/>
<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="2737"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2748"/>
<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="2533"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2544"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation>Archivos Changegroup de Mercurial (*.hg)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2636"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2647"/>
<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="2791"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2802"/>
<source>Backing out changeset</source>
<translation>Haciendo respaldo de changeset</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2782"/>
<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="2550"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/>
<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="2818"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2829"/>
<source>Rollback last transaction</source>
<translation>Hacer Rollback de la última transacción</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2811"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2822"/>
<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="544"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="555"/>
<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="3523"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3571"/>
<source>Mercurial Command Server</source>
<translation>Servidor de Comandos de Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3378"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3426"/>
<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="3523"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3571"/>
<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="2886"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2897"/>
<source>Import Patch</source>
<translation>Importar Patch</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2938"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2949"/>
<source>Export Patches</source>
<translation>Exportar Patches</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2985"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2996"/>
<source>Change Phase</source>
<translation>Cambiar Fase</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3052"/>
<source>Copy Changesets</source>
<translation>Copiar Changesets</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3090"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3101"/>
<source>Copy Changesets (Continue)</source>
<translation>Copiar Changesets (Continuar)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3248"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3259"/>
<source>Add Sub-repository</source>
<translation>Añadir Sub-repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3281"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3292"/>
<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="3229"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/>
<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="3300"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/>
<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="3300"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/>
<source>Remove Sub-repositories</source>
<translation>Eliminar Sub-repositorios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3269"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3280"/>
<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="470"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/>
<source>Commit Changes</source>
<translation>Hacer Commit de Cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/>
<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="993"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/>
<source>Revert changes</source>
<translation>Revertir cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="984"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="995"/>
<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="993"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/>
<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="3145"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3156"/>
<source>Create Unversioned Archive</source>
<translation>Crear Archivo Sin Versionar</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/>
<source>Mercurial Side-by-Side Difference</source>
<translation>Diferencia Lado a Lado Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/>
<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="1776"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1787"/>
<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="943"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="954"/>
<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="2201"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/>
<source>Created new branch <{0}>.</source>
<translation>Creada nueva branch <{0}>.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1126"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/>
<source>Current branch tip</source>
<translation>Tip branch actual</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3689"/>
<source>Mercurial Bookmark</source>
<translation>Marcador de Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3711"/>
<source>Delete Bookmark</source>
<translation>Borrar Marcador</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3711"/>
<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="3674"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/>
<source>Delete Mercurial Bookmark</source>
<translation>Borrar Marcador de Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3755"/>
<source>Rename Mercurial Bookmark</source>
<translation>Renombrar Marcador de Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3749"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3797"/>
<source>Move Mercurial Bookmark</source>
<translation>Mover Marcador de Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3843"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3891"/>
<source>Pull Bookmark</source>
<translation>Pull de Marcador</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3843"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3891"/>
<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="3855"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3903"/>
<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="3887"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3935"/>
<source>Push Bookmark</source>
<translation>Push de Marcador</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3887"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3935"/>
<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="3899"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3947"/>
<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="1096"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1107"/>
<source>Re-Merge</source>
<translation>Re-Merge</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1087"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1098"/>
<source>Do you really want to re-merge these files or directories?</source>
<translation>¿Desea realmente hacer un re-merge de estos archivos o directorios?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1107"/>
<source>Do you really want to re-merge the project?</source>
<translation>¿Desea realmente hacer un re-merge del proyecto?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1112"/>
<source>Re-Merging</source>
<translation>Aplicando Re-Merge</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/>
<source>Marking as 'unresolved'</source>
<translation>Marcando como 'unresolved'</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/>
<source>Marking as 'resolved'</source>
<translation>Marcando como 'resolved'</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3173"/>
<source>Delete All Backups</source>
<translation>Borrar todas las Copias de Seguridad</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3173"/>
<source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source>
<translation><p>¿Desea realmente borrar todos los bundles de copia de seguridad almacenados en el área de copias de seguridad <b>{0}</b>?</p></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2161"/>
<source>Canceling uncommitted merge</source>
- <translation>Cancelando merge sin commit</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3102"/>
+ <translation type="obsolete">Cancelando merge sin commit</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3113"/>
<source>Copy Changesets (Stop)</source>
<translation>Copiar Changesets (Stop)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3115"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3126"/>
<source>Copy Changesets (Abort)</source>
<translation>Copiar Changesets (Abortar)</translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/>
+ <source>Aborting uncommitted merge</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgAddSubrepositoryDialog</name>
@@ -35485,432 +35495,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="498"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/>
<source>Tag in repository</source>
<translation>Crear un Tag en el repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/>
<source>&Tag in repository...</source>
<translation>Crear un &Tag en el repositorio...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/>
- <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="506"/>
- <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="513"/>
- <source>List tags</source>
- <translation>Listar tags</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/>
- <source>List tags...</source>
- <translation>Listar tags...</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/>
- <source>List tags of the project</source>
- <translation>Lista los tags del proyecto</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="520"/>
- <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>
+ <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="527"/>
- <source>List branches</source>
- <translation>Listar branches</translation>
+ <source>List tags</source>
+ <translation>Listar tags</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/>
- <source>List branches...</source>
- <translation>Listar branches...</translation>
+ <source>List tags...</source>
+ <translation>Listar tags...</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531"/>
- <source>List branches of the project</source>
- <translation>Lista las branches del proyecto</translation>
+ <source>List tags of the project</source>
+ <translation>Lista los tags del proyecto</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/>
- <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>
+ <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="541"/>
- <source>Create branch</source>
- <translation>Crear branch</translation>
+ <source>List branches</source>
+ <translation>Listar branches</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/>
+ <source>List branches...</source>
+ <translation>Listar branches...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="545"/>
+ <source>List branches of the project</source>
+ <translation>Lista las branches del proyecto</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/>
+ <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="555"/>
+ <source>Create branch</source>
+ <translation>Crear branch</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/>
<source>Create &branch...</source>
<translation>Crear &branch...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="560"/>
<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="549"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="563"/>
<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="574"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/>
<source>Close branch</source>
<translation>Cerrar branch</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/>
<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="582"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/>
<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="603"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/>
<source>Switch</source>
<translation>Hacer switch</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/>
<source>S&witch...</source>
<translation>Hacer s&witch...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/>
<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="611"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/>
<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="619"/>
- <source>Cleanup</source>
- <translation>Limpiar (cleanup)</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/>
- <source>Cleanu&p</source>
- <translation>Lim&piar (cleanup)</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/>
- <source>Cleanup the local project</source>
- <translation>Limpiar (cleanup) el proyecto local</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/>
- <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="633"/>
- <source>Execute command</source>
- <translation>Ejecutar comando</translation>
+ <source>Cleanup</source>
+ <translation>Limpiar (cleanup)</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/>
- <source>E&xecute command...</source>
- <translation>E&jecutar comando...</translation>
+ <source>Cleanu&p</source>
+ <translation>Lim&piar (cleanup)</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/>
- <source>Execute an arbitrary Mercurial command</source>
- <translation>Ejecuta un comando Mercurial arbitrario</translation>
+ <source>Cleanup the local project</source>
+ <translation>Limpiar (cleanup) el proyecto local</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/>
+ <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="647"/>
+ <source>Execute command</source>
+ <translation>Ejecutar comando</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/>
+ <source>E&xecute command...</source>
+ <translation>E&jecutar comando...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/>
+ <source>Execute an arbitrary Mercurial command</source>
+ <translation>Ejecuta un comando Mercurial arbitrario</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/>
<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="648"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/>
<source>Configure</source>
<translation>Configurar</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/>
<source>Configure...</source>
<translation>Configurar...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="652"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/>
<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="655"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/>
<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="708"/>
- <source>Show paths</source>
- <translation>Mostrar rutas</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/>
- <source>Show paths...</source>
- <translation>Mostrar rutas...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/>
- <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="715"/>
- <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="722"/>
- <source>Verify repository</source>
- <translation>Verificar repositorio</translation>
+ <source>Show paths</source>
+ <translation>Mostrar rutas</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/>
- <source>Verify repository...</source>
- <translation>Verificar repositorio...</translation>
+ <source>Show paths...</source>
+ <translation>Mostrar rutas...</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/>
- <source>Verify the integrity of the repository</source>
- <translation>Verificar la integridad del repositorio</translation>
+ <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="729"/>
- <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>
+ <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="736"/>
- <source>Recover</source>
- <translation>Recuperar</translation>
+ <source>Verify repository</source>
+ <translation>Verificar repositorio</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/>
- <source>Recover...</source>
- <translation>Recuperar...</translation>
+ <source>Verify repository...</source>
+ <translation>Verificar repositorio...</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/>
- <source>Recover from an interrupted transaction</source>
- <translation>Recuperar de una transacción interrumpida</translation>
+ <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="743"/>
+ <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="750"/>
+ <source>Recover</source>
+ <translation>Recuperar</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/>
+ <source>Recover...</source>
+ <translation>Recuperar...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/>
+ <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="757"/>
<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="764"/>
- <source>Create .hgignore</source>
- <translation>Crear .hgignore</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/>
- <source>Create a .hgignore file with default values</source>
- <translation>Crear un archivo .hgignore con valores por defecto</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/>
- <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="778"/>
- <source>Create changegroup</source>
- <translation>Crear changegroup</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/>
+ <source>Create .hgignore</source>
+ <translation>Crear .hgignore</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782"/>
+ <source>Create a .hgignore file with default values</source>
+ <translation>Crear un archivo .hgignore con valores por defecto</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/>
+ <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="792"/>
+ <source>Create changegroup</source>
+ <translation>Crear changegroup</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792"/>
<source>Create changegroup...</source>
<translation>Crear changegroup...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/>
<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="1839"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1863"/>
<source>Apply changegroups</source>
<translation>Aplicar changegroups</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="824"/>
<source>Apply changegroups...</source>
<translation>Aplicar changegroups...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/>
<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="1346"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1362"/>
<source>Changegroup Management</source>
<translation>Gestión de Chagegroup</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/>
<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="818"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/>
<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="589"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/>
<source>Show current branch</source>
<translation>Mostrar la branch actual</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/>
<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="596"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/>
<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="826"/>
- <source>Mark as "good"</source>
- <translation>Marcar como "bueno"</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="830"/>
- <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="833"/>
- <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="840"/>
- <source>Mark as "bad"</source>
- <translation>Marcar como "malo"</translation>
+ <source>Mark as "good"</source>
+ <translation>Marcar como "bueno"</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844"/>
- <source>Mark a selectable changeset as bad</source>
- <translation>Marcar un changeset seleccionable como malo</translation>
+ <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="847"/>
- <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>
+ <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="854"/>
- <source>Skip</source>
- <translation>Saltar</translation>
+ <source>Mark as "bad"</source>
+ <translation>Marcar como "malo"</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/>
+ <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="861"/>
+ <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="868"/>
+ <source>Skip</source>
+ <translation>Saltar</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/>
<source>Reset</source>
<translation>Reiniciar</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/>
<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="875"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/>
<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="1359"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1375"/>
<source>Bisect</source>
<translation>Bisect</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/>
- <source>Mark as "good"...</source>
- <translation>Marcar como "bueno"...</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/>
+ <source>Mark as "good"...</source>
+ <translation>Marcar como "bueno"...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/>
<source>Mark as "bad"...</source>
<translation>Marcar como "malo"...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/>
<source>Preview changegroup</source>
<translation>Previsualizar changegroup</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/>
<source>Preview changegroup...</source>
<translation>Previsualizar changegroup...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/>
<source>Identify</source>
<translation>Identificar</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/>
<source>Identify...</source>
<translation>Identificar...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/>
<source>Identify the project directory</source>
<translation>Identificar el directorio de proyecto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/>
<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="799"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/>
<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="802"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/>
<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="882"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/>
<source>Back out changeset</source>
<translation>Hacer respaldo de changeset</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/>
<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="889"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/>
<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>
@@ -35930,312 +35940,312 @@
<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="1337"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353"/>
<source>Specials</source>
<translation>Especial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/>
<source>Serve project repository</source>
<translation>Servir repositorio de proyecto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/>
- <source>Serve project repository...</source>
- <translation>Servir repositorio de proyecto...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/>
- <source>Serve the project repository</source>
- <translation>Servir el repositorio de proyecto</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/>
- <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="1656"/>
- <source>Pull</source>
- <translation>Hacer Pull</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1979"/>
- <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="557"/>
- <source>Push new branch</source>
- <translation>Hacer push de nueva rama</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/>
- <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="566"/>
- <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="896"/>
- <source>Rollback last transaction</source>
- <translation>Rollback de última transacción</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/>
- <source>Rollback the last transaction</source>
- <translation>Rollback de la última transacción</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1404"/>
- <source>Extensions</source>
- <translation>Extensiones</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/>
- <source>Edit user configuration</source>
- <translation>Editar configuración de usuario</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/>
- <source>Edit user configuration...</source>
- <translation>Editar configuración de usuario...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/>
- <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="670"/>
- <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="677"/>
- <source>Edit repository configuration</source>
- <translation>Editar configuración del repositorio</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/>
- <source>Edit repository configuration...</source>
- <translation>Editar configuración del repositorio...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/>
- <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="684"/>
- <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="692"/>
- <source>Show combined configuration settings</source>
- <translation>Mostrar ajustes de configuración combinados</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/>
- <source>Show combined configuration settings...</source>
- <translation>Mostrar ajustes de configuración combinados...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/>
- <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="700"/>
- <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="854"/>
- <source>Skip...</source>
- <translation>Ignorar...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/>
- <source>Skip a selectable changeset</source>
- <translation>Ignorar un changeset seleccionable</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/>
- <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="1895"/>
- <source>Import Patch</source>
- <translation>Importar Patch</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/>
+ <source>Serve project repository...</source>
+ <translation>Servir repositorio de proyecto...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/>
+ <source>Serve the project repository</source>
+ <translation>Servir el repositorio de proyecto</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/>
+ <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="1674"/>
+ <source>Pull</source>
+ <translation>Hacer Pull</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2003"/>
+ <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="571"/>
+ <source>Push new branch</source>
+ <translation>Hacer push de nueva rama</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576"/>
+ <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="580"/>
+ <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="910"/>
+ <source>Rollback last transaction</source>
+ <translation>Rollback de última transacción</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/>
+ <source>Rollback the last transaction</source>
+ <translation>Rollback de la última transacción</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1420"/>
+ <source>Extensions</source>
+ <translation>Extensiones</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/>
+ <source>Edit user configuration</source>
+ <translation>Editar configuración de usuario</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/>
+ <source>Edit user configuration...</source>
+ <translation>Editar configuración de usuario...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/>
+ <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="684"/>
+ <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="691"/>
+ <source>Edit repository configuration</source>
+ <translation>Editar configuración del repositorio</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/>
+ <source>Edit repository configuration...</source>
+ <translation>Editar configuración del repositorio...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/>
+ <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="698"/>
+ <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="706"/>
+ <source>Show combined configuration settings</source>
+ <translation>Mostrar ajustes de configuración combinados</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="706"/>
+ <source>Show combined configuration settings...</source>
+ <translation>Mostrar ajustes de configuración combinados...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/>
+ <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="714"/>
+ <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="868"/>
+ <source>Skip...</source>
+ <translation>Ignorar...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/>
+ <source>Skip a selectable changeset</source>
+ <translation>Ignorar un changeset seleccionable</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/>
+ <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="1919"/>
+ <source>Import Patch</source>
+ <translation>Importar Patch</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="951"/>
<source>Import Patch...</source>
<translation>Importar Patch...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/>
<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="945"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="959"/>
<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="1353"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1369"/>
<source>Patch Management</source>
<translation>Gestión de Patch</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1915"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1939"/>
<source>Revert Changes</source>
<translation>Revertir cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/>
<source>Export Patches</source>
<translation>Exportar Patches</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/>
<source>Export Patches...</source>
<translation>Exportar Patches...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/>
- <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="961"/>
- <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="968"/>
- <source>Change Phase</source>
- <translation>Cambiar Fase</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/>
- <source>Change Phase...</source>
- <translation>Cambiar Fase...</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/>
- <source>Change the phase of revisions</source>
- <translation>Cambiar la fase de revisiones</translation>
+ <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="975"/>
+ <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="982"/>
+ <source>Change Phase</source>
+ <translation>Cambiar Fase</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/>
+ <source>Change Phase...</source>
+ <translation>Cambiar Fase...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/>
+ <source>Change the phase of revisions</source>
+ <translation>Cambiar la fase de revisiones</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="989"/>
<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="1935"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1959"/>
<source>Copy Changesets</source>
<translation>Copiar Changesets</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/>
<source>Copies changesets from another branch</source>
<translation>Copiar changesets de otra branch</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1004"/>
<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="999"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/>
<source>Continue Copying Session</source>
<translation>Continuar Sesión de Copia</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/>
<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="1006"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1020"/>
<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 Copia</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="1950"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1974"/>
<source>Copy Changesets (Continue)</source>
<translation>Copiar Changesets (Continuar)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/>
<source>Conflicts resolved</source>
<translation>Conflictos resueltos</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/>
<source>Con&flicts resolved</source>
<translation>Con&flictos resueltos</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="472"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/>
<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="475"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/>
<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="1043"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/>
<source>Add</source>
<translation>Añadir</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/>
<source>Add...</source>
<translation>Añadir...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/>
<source>Add a sub-repository</source>
<translation>Añadir un sub-repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/>
<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="1058"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/>
<source>Remove</source>
<translation>Eliminar</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/>
<source>Remove...</source>
<translation>Eliminar...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077"/>
<source>Remove sub-repositories</source>
<translation>Eliminar sub-repositorios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1080"/>
<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="1424"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1440"/>
<source>Sub-Repository</source>
<translation>Sub-repositorio</translation>
</message>
@@ -36265,32 +36275,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="1074"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/>
<source>Create unversioned archive</source>
<translation>Crear archivo sin versionar</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/>
<source>Create unversioned archive...</source>
<translation>Crear archivo sin versionar...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1079"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/>
<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="1082"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/>
<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="903"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="917"/>
<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="1312"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1328"/>
<source>Administration</source>
<translation>Administración</translation>
</message>
@@ -36317,338 +36327,368 @@
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/>
<source>Cancel uncommitted merge</source>
- <translation>Cancelar merge sin commit</translation>
+ <translation type="obsolete">Cancelar merge sin commit</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/>
<source>Cancel an uncommitted merge and lose all changes</source>
- <translation>Cancelar un merge sin commit y perder todos los cambios</translation>
+ <translation type="obsolete">Cancelar un merge sin commit y perder todos los cambios</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/>
<source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source>
- <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="1090"/>
+ <translation type="obsolete"><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="1104"/>
<source>List bookmarks</source>
<translation>Listar marcadores</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/>
<source>List bookmarks...</source>
<translation>Listar marcadores...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109"/>
<source>List bookmarks of the project</source>
<translation>Lista marcadores del proyecto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1112"/>
<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="1105"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/>
<source>Define bookmark</source>
<translation>Definir marcador</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/>
<source>Define bookmark...</source>
<translation>Definir marcador...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1110"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124"/>
<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="1113"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1127"/>
<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="1120"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/>
<source>Delete bookmark</source>
<translation>Borrar marcador</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/>
<source>Delete bookmark...</source>
<translation>Borrar marcador...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1125"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1139"/>
<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="1128"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142"/>
<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="1135"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/>
<source>Rename bookmark</source>
<translation>Renombrar marcador</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/>
<source>Rename bookmark...</source>
<translation>Renombrar marcador...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1140"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/>
<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="1143"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1157"/>
<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="1150"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/>
<source>Move bookmark</source>
<translation>Mover marcador</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/>
<source>Move bookmark...</source>
<translation>Mover marcador...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1155"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/>
<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="1158"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1172"/>
<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="1166"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1180"/>
<source>Show incoming bookmarks</source>
<translation>Mostrar marcadores entrantes</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1171"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/>
<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="1174"/>
- <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="1183"/>
- <source>Pull bookmark</source>
- <translation>Pull de marcador</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1188"/>
+ <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="1197"/>
+ <source>Pull bookmark</source>
+ <translation>Pull de marcador</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202"/>
<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="1191"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1205"/>
<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="1215"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1229"/>
<source>Show outgoing bookmarks</source>
<translation>Mostrar marcadores salientes</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1220"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/>
<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="1223"/>
- <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="1232"/>
- <source>Push bookmark</source>
- <translation>Push de marcador</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1237"/>
+ <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="1246"/>
+ <source>Push bookmark</source>
+ <translation>Push de marcador</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/>
<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="1240"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1254"/>
<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="1399"/>
+ <source>Bookmarks</source>
+ <translation>Marcadores</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1383"/>
- <source>Bookmarks</source>
- <translation>Marcadores</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/>
<source>Tags</source>
<translation>Tags</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1374"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1390"/>
<source>Branches</source>
<translation>Branches</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/>
<source>Re-Merge</source>
<translation>Re-Merge</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456"/>
<source>Re-Merge all conflicting, unresolved files of the project</source>
<translation>Aplicar Re-Merge a todos los archivos con conflictos sin resolver en el proyecto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/>
<source>Show conflicts</source>
<translation>Mostrar conflictos</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/>
<source>Show conflicts...</source>
<translation>Mostrar conflictos...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/>
<source>Show a dialog listing all files with conflicts</source>
<translation>Mostrar un diálogo listando todos los archivos con conflictos</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/>
<source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source>
<translation><b>Lista de Conflictos</b>\n<p>Muestra un listado de archivos que han tenido o tienen todavía conflictos.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/>
<source>Conflicts unresolved</source>
<translation>Conflictos sin resolver</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/>
<source>Mark all conflicts of the local project as unresolved</source>
<translation>Marcar todos los conflictos del proyecto local como sin resolver</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/>
<source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source>
<translation><b>Conflictos sin resolver</b><p>Marca todos los conflictos del proyecto local como sin resolver.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="445"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="459"/>
<source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source>
<translation><b>Re-Merge</b><p>Aplica un re-merge a todos los archivos con conflictos sin resolver del proyecto, descartando cualquier intento anterior de merge.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1511"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1528"/>
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/>
<source>Pull current bookmark</source>
<translation>Pull del marcador actual</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/>
<source>Pull the current bookmark from a remote repository</source>
<translation>Hacer pull del marcador actual desde repositorio remoto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1207"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1221"/>
<source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source>
<translation><b>Pull de marcador actual<p>Ejecuta un pull del marcador actual desde un repositorio remoto al repositorio local.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1262"/>
<source>Push current bookmark</source>
<translation>Push de marcador actual</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1267"/>
<source>Push the current bookmark to a remote repository</source>
<translation>Hacer push del marcador actual hacia repositorio remoto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/>
- <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source>
- <translation><b>Push de marcador actual<p>Ejecuta un pshl del marcador actual desde 3l repositorio local hacia un repositorio remoto.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/>
- <source>Delete all backups</source>
- <translation>Borrar todas las Copias de Seguridad</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/>
+ <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source>
+ <translation><b>Push de marcador actual<p>Ejecuta un pshl del marcador actual desde 3l repositorio local hacia un repositorio remoto.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1279"/>
+ <source>Delete all backups</source>
+ <translation>Borrar todas las Copias de Seguridad</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1284"/>
<source>Delete all backup bundles stored in the backup area</source>
<translation>Borrar todos los bundles de copia de seguridad almacenados en el área de copias de seguridad</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1273"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1287"/>
<source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source>
<translation><b>Borrar todas las copias de seguridad</b><p>Borra todos los bundles de copia de seguridad almacenados en el área de copias de seguridad del repositorio.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/>
- <source>Stop Copying Session</source>
- <translation>Detener la Sesión de Copia</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1018"/>
- <source>Stop the interrupted copying session</source>
- <translation>Detener la sesión de copia interrumpida</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1028"/>
- <source>Abort Copying Session</source>
- <translation>Abortar Sesión de Copia</translation>
+ <source>Stop Copying Session</source>
+ <translation>Detener la Sesión de Copia</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/>
+ <source>Stop the interrupted copying session</source>
+ <translation>Detener la sesión de copia interrumpida</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/>
+ <source>Abort Copying Session</source>
+ <translation>Abortar Sesión de Copia</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/>
<source>Abort the interrupted copying session and rollback</source>
<translation>Abortar la sesión interrumpida de copia y hacer rollback</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/>
+ <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source>
+ <translation><b>Abortar Sesión de Copia</b><p>Aborta la sesión de copia interrumpida y hace un rollback al estado anterior de la copia.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1445"/>
+ <source>Merge Changesets</source>
+ <translation>Hacer Merge de Changesets</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1988"/>
+ <source>Copy Changesets (Stop)</source>
+ <translation>Copiar Changesets (Stop)</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2003"/>
+ <source>Copy Changesets (Abort)</source>
+ <translation>Copiar Changesets (Abortar)</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/>
- <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source>
- <translation><b>Abortar Sesión de Copia</b><p>Aborta la sesión de copia interrumpida y hace un rollback al estado anterior de la copia.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1429"/>
- <source>Merge Changesets</source>
- <translation>Hacer Merge de Changesets</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1964"/>
- <source>Copy Changesets (Stop)</source>
- <translation>Copiar Changesets (Stop)</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1979"/>
- <source>Copy Changesets (Abort)</source>
- <translation>Copiar Changesets (Abortar)</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/>
<source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source>
<translation><b>Detener Sesión de Copia</b><p>Detiene la sesión de copia interrumpida.</p></translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/>
+ <source>Commit Merge</source>
+ <translation type="unfinished">Commit Merge</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/>
+ <source>Commit a merge.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/>
+ <source><b>Commit a merge</b><p>This commits a merge working directory</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/>
+ <source>Abort Merge</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/>
+ <source>Abort an uncommitted merge and lose all changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443"/>
+ <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgPurgeListDialog</name>
@@ -47727,202 +47767,202 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="853"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="854"/>
<source>Serial Device Connect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="853"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="854"/>
<source><p>Cannot connect to device at serial port <b>{0}</b>.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="898"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="899"/>
<source>Run Script</source>
<translation type="unfinished">Ejecutar Script</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="881"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="882"/>
<source>There is no editor open. Abort...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="889"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="890"/>
<source>The current editor does not contain a script. Abort...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="898"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="899"/>
<source><p>Cannot run script.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="921"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="922"/>
<source>Open Python File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="921"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="922"/>
<source>Python3 Files (*.py);;All Files (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="965"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="966"/>
<source>Start Chart</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="965"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="966"/>
<source><p>The Chart cannot be started.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="994"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="995"/>
<source>Unsaved Chart Data</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="994"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="995"/>
<source>The chart contains unsaved data.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1046"/>
<source>Start File Manager</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1046"/>
<source><p>The File Manager cannot be started.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1096"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1097"/>
<source>Show Version</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1099"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1100"/>
<source>Show Implementation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1194"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/>
<source>Synchronize Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1107"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1108"/>
<source>Show Device Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1110"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1111"/>
<source>Show Local Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1339"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1361"/>
<source>Compile Python File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1359"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1381"/>
<source>Compile Current Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1132"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1135"/>
<source><h3>Device Version Information</h3></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1141"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1144"/>
<source>No version information available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1143"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1146"/>
<source>Device Version Information</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1166"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1169"/>
<source>unknown</source>
<translation type="unfinished">desconocido</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1173"/>
<source>Device Implementation Information</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1173"/>
<source><h3>Device Implementation Information</h3><p>This device contains <b>{0} {1}</b>.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1194"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/>
<source><p>The time of the connected device was synchronized with the local time.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1216"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1219"/>
<source><h3>Device Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1224"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1227"/>
<source><h3>Device Date and Time</h3><p>{0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1238"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1241"/>
<source>Device Date and Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1251"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/>
<source>Local Date and Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1251"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/>
<source><h3>Local Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1271"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1274"/>
<source>Error handling device</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1271"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1274"/>
<source><p>There was an error communicating with the connected device.</p><p>Method: {0}</p><p>Message: {1}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1291"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1313"/>
<source>The MicroPython cross compiler <b>mpy-cross</b> cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1309"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1331"/>
<source>Python Files (*.py);;All Files (*)</source>
<translation type="unfinished">Archivos Python (*.py);;Todos los Archivos (*)</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1319"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1341"/>
<source>The Python file <b>{0}</b> does not exist. Aborting...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1329"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1351"/>
<source>'mpy-cross' Output</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1352"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/>
<source>The current editor does not contain a Python file. Aborting...</source>
<translation type="unfinished"></translation>
</message>
@@ -47937,12 +47977,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="978"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="979"/>
<source>µPy Chart</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1058"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1059"/>
<source>µPy Files</source>
<translation type="unfinished"></translation>
</message>
@@ -78404,7 +78444,7 @@
<translation>Mostrar las versiones disponibles para descarga</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3724"/>
+ <location filename="../UI/UserInterface.py" line="3731"/>
<source>Report Bug</source>
<translation>Enviar informe de bugs</translation>
</message>
@@ -78424,7 +78464,7 @@
<translation><b>Enviar informe de Bugs...</b><p>Abre un diálogo para enviar un informe de un error (bug).</p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3278"/>
+ <location filename="../UI/UserInterface.py" line="3285"/>
<source>Unittest</source>
<translation>Test Unitario</translation>
</message>
@@ -78664,7 +78704,7 @@
<translation><b>Atajos de Teclado</b><p>Establezca los atajos de teclado para la aplicación con sus valores preferidos.</p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6313"/>
+ <location filename="../UI/UserInterface.py" line="6320"/>
<source>Export Keyboard Shortcuts</source>
<translation>Exportar Atajos de Teclado</translation>
</message>
@@ -78684,7 +78724,7 @@
<translation><b>Exportar Atajos de Teclado</b><p>Exporte los atajos de teclado de la aplicación.</p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6337"/>
+ <location filename="../UI/UserInterface.py" line="6344"/>
<source>Import Keyboard Shortcuts</source>
<translation>Importar Atajos de Teclado</translation>
</message>
@@ -78849,7 +78889,7 @@
<translation>Ven&tana</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3189"/>
+ <location filename="../UI/UserInterface.py" line="3196"/>
<source>&Toolbars</source>
<translation>&Barra de Herramientas</translation>
</message>
@@ -78859,77 +78899,77 @@
<translation>P&lugins</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3202"/>
+ <location filename="../UI/UserInterface.py" line="3209"/>
<source>&Help</source>
<translation>Ay&uda</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3277"/>
+ <location filename="../UI/UserInterface.py" line="3284"/>
<source>Tools</source>
<translation>Herramientas</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3279"/>
+ <location filename="../UI/UserInterface.py" line="3286"/>
<source>Settings</source>
<translation>Ajustes</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5111"/>
+ <location filename="../UI/UserInterface.py" line="5118"/>
<source>Help</source>
<translation>Ayuda</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3281"/>
+ <location filename="../UI/UserInterface.py" line="3288"/>
<source>Profiles</source>
<translation>Perfiles</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3282"/>
+ <location filename="../UI/UserInterface.py" line="3289"/>
<source>Plugins</source>
<translation>Plugins</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3664"/>
+ <location filename="../UI/UserInterface.py" line="3671"/>
<source><h3>Version Numbers</h3><table></source>
<translation><h3>Números de Versiones</h3><table></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7302"/>
+ <location filename="../UI/UserInterface.py" line="7309"/>
<source></table></source>
<translation></table></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3724"/>
+ <location filename="../UI/UserInterface.py" line="3731"/>
<source>Email address or mail server address is empty. Please configure your Email settings in the Preferences Dialog.</source>
<translation>La dirección de correo electrónico o la dirección del servidor de correo están en blanco. Por favor configure las opciones de Correo Electrónico en el diálogo de Preferencias.</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="4090"/>
+ <location filename="../UI/UserInterface.py" line="4097"/>
<source>Configure Tool Groups ...</source>
<translation>Configurar Grupos de Herramientas ...</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="4094"/>
+ <location filename="../UI/UserInterface.py" line="4101"/>
<source>Configure current Tool Group ...</source>
<translation>Configurar Grupo de Herramientas actual ...</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="4045"/>
+ <location filename="../UI/UserInterface.py" line="4052"/>
<source>&Builtin Tools</source>
<translation>Herramientas de serie (&builtin)</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="4062"/>
+ <location filename="../UI/UserInterface.py" line="4069"/>
<source>&Plugin Tools</source>
<translation>Herramientas de Extensión (&Plugin)</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="4210"/>
+ <location filename="../UI/UserInterface.py" line="4217"/>
<source>&Show all</source>
<translation>&Ver todo</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="4212"/>
+ <location filename="../UI/UserInterface.py" line="4219"/>
<source>&Hide all</source>
<translation>&Ocultar todo</translation>
</message>
@@ -78939,82 +78979,82 @@
<translation type="obsolete">No hay script principal definido para el proyecto actual. Abortando</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5237"/>
+ <location filename="../UI/UserInterface.py" line="5244"/>
<source>Problem</source>
<translation>Problema</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5426"/>
+ <location filename="../UI/UserInterface.py" line="5433"/>
<source>Process Generation Error</source>
<translation>Error de Generación de Proceso</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5111"/>
+ <location filename="../UI/UserInterface.py" line="5118"/>
<source>Currently no custom viewer is selected. Please use the preferences dialog to specify one.</source>
<translation>No hay visor personalizado seleccionado actualmente. Por favor, especifique uno en el diálogo de preferencias.</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5145"/>
+ <location filename="../UI/UserInterface.py" line="5152"/>
<source><p>Could not start the help viewer.<br>Ensure that it is available as <b>hh</b>.</p></source>
<translation><p>No se ha podido ejecutar el visor de ayuda.<br>Asegúrese de que esta disponible como <b>hh</b>.</p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5901"/>
+ <location filename="../UI/UserInterface.py" line="5908"/>
<source>Documentation Missing</source>
<translation>Falta documentación</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5884"/>
+ <location filename="../UI/UserInterface.py" line="5891"/>
<source>Documentation</source>
<translation>Documentación</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5709"/>
+ <location filename="../UI/UserInterface.py" line="5716"/>
<source><p>The PyQt4 documentation starting point has not been configured.</p></source>
<translation><P>El punto de entrada de documentación de PyQt4 no ha sido configurado.</p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6506"/>
+ <location filename="../UI/UserInterface.py" line="6513"/>
<source>Save tasks</source>
<translation>Guardar tareas</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6535"/>
+ <location filename="../UI/UserInterface.py" line="6542"/>
<source>Read tasks</source>
<translation>Leer tareas</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6895"/>
+ <location filename="../UI/UserInterface.py" line="6902"/>
<source>Drop Error</source>
<translation>Error de volcado</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7264"/>
+ <location filename="../UI/UserInterface.py" line="7271"/>
<source>Error during updates check</source>
<translation>Error durante la verificación de actualización</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7080"/>
+ <location filename="../UI/UserInterface.py" line="7087"/>
<source>&Cancel</source>
<translation>&Cancelar</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7245"/>
+ <location filename="../UI/UserInterface.py" line="7252"/>
<source>Update available</source>
<translation>Actualizaciones disponibles</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7264"/>
+ <location filename="../UI/UserInterface.py" line="7271"/>
<source>Could not perform updates check.</source>
<translation>No se puede llevar a cabo la verificación de actualizaciones.</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7288"/>
+ <location filename="../UI/UserInterface.py" line="7295"/>
<source><h3>Available versions</h3><table></source>
<translation><h3>Versiones disponibles</h3><table></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7339"/>
+ <location filename="../UI/UserInterface.py" line="7346"/>
<source>First time usage</source>
<translation>Usado por primera vez</translation>
</message>
@@ -79074,7 +79114,7 @@
<translation>Restaurando Gestor de Barras de Herramientas...</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5371"/>
+ <location filename="../UI/UserInterface.py" line="5378"/>
<source>External Tools</source>
<translation>Herramientas Externas</translation>
</message>
@@ -79089,22 +79129,22 @@
<translation>Visor de &Multiproyecto</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6631"/>
+ <location filename="../UI/UserInterface.py" line="6638"/>
<source>Save session</source>
<translation>Guardar sesión</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6615"/>
+ <location filename="../UI/UserInterface.py" line="6622"/>
<source>Read session</source>
<translation>Cargar sesión</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3454"/>
+ <location filename="../UI/UserInterface.py" line="3461"/>
<source><p>This part of the status bar displays the current editors encoding.</p></source>
<translation><p>Esta zona de la barra de estado muestra la codificación del editor actual.</p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3468"/>
+ <location filename="../UI/UserInterface.py" line="3475"/>
<source><p>This part of the status bar displays an indication of the current editors files writability.</p></source>
<translation><p>Esta zona de la barra de estado muestra una indicación de las propiedades de escritura de los archivos del editor.</p></translation>
</message>
@@ -79129,17 +79169,17 @@
<translation><b>Solicitar nueva Característica...</b><p>Abre un diálogo para enviar una solicitud de nueva característica.</p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3447"/>
+ <location filename="../UI/UserInterface.py" line="3454"/>
<source><p>This part of the status bar displays the current editors language.</p></source>
<translation><p>Esta zona de la barra de estado muestra el lenguaje del editor actual.</p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3475"/>
- <source><p>This part of the status bar displays the line number of the current editor.</p></source>
- <translation><p>Esta zona de la barra de estado muestra el número de línea en el editor actual.</p></translation>
- </message>
- <message>
<location filename="../UI/UserInterface.py" line="3482"/>
+ <source><p>This part of the status bar displays the line number of the current editor.</p></source>
+ <translation><p>Esta zona de la barra de estado muestra el número de línea en el editor actual.</p></translation>
+ </message>
+ <message>
+ <location filename="../UI/UserInterface.py" line="3489"/>
<source><p>This part of the status bar displays the cursor position of the current editor.</p></source>
<translation><p>Esta zona de la barra de estado muestra la posición del cursor en el editor actual.</p></translation>
</message>
@@ -79169,12 +79209,12 @@
<translation><b>Conmutar la ventana de Caja de Herramientas Horizontal</b><p>Si la ventana de Caja de Herramientas Horizontal está escondida, se muestra. Si está siendo mostrada, se cierra.</p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="4009"/>
+ <location filename="../UI/UserInterface.py" line="4016"/>
<source>Restart application</source>
<translation>Reiniciar aplicación</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="4009"/>
+ <location filename="../UI/UserInterface.py" line="4016"/>
<source>The application needs to be restarted. Do it now?</source>
<translation>La aplicación necesita ser reiniciada. ¿Desea hacerlo ahora?</translation>
</message>
@@ -79184,7 +79224,7 @@
<translation>Configurar...</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3461"/>
+ <location filename="../UI/UserInterface.py" line="3468"/>
<source><p>This part of the status bar displays the current editors eol setting.</p></source>
<translation><p>Esta zona de la barra de estado muestra la configuración actual de fin de línea (eol) para los editores.</p></translation>
</message>
@@ -79324,7 +79364,7 @@
<translation>Editor de &Iconos...</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5058"/>
+ <location filename="../UI/UserInterface.py" line="5065"/>
<source>Qt 3 support</source>
<translation>Soporte para Qt 3</translation>
</message>
@@ -79359,111 +79399,111 @@
<translation>{0} - {1} - {2} - Modo Pasivo</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3558"/>
+ <location filename="../UI/UserInterface.py" line="3565"/>
<source>External Tools/{0}</source>
<translation>Herramientas Externas/{0}</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5237"/>
+ <location filename="../UI/UserInterface.py" line="5244"/>
<source><p>The file <b>{0}</b> does not exist or is zero length.</p></source>
<translation><p>El archivo <b>{0}</b> no existe o tiene longitud nula. </p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="4961"/>
+ <location filename="../UI/UserInterface.py" line="4968"/>
<source><p>Could not start Qt-Designer.<br>Ensure that it is available as <b>{0}</b>.</p></source>
<translation><p>No se ha podido ejecutar Qt-Designer.<br>Asegúrese de que esta disponible como <b>{0}</b>.</p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5030"/>
+ <location filename="../UI/UserInterface.py" line="5037"/>
<source><p>Could not start Qt-Linguist.<br>Ensure that it is available as <b>{0}</b>.</p></source>
<translation><p>No se ha podido ejecutar Qt-Linguist.<br>Asegúrese de que esta disponible como <b>{0}</b>.</p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5083"/>
+ <location filename="../UI/UserInterface.py" line="5090"/>
<source><p>Could not start Qt-Assistant.<br>Ensure that it is available as <b>{0}</b>.</p></source>
<translation><p>No se ha podido ejecutar Qt-Assistant.<br>Asegúrese de que esta disponible como <b>{0}</b>.</p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5125"/>
+ <location filename="../UI/UserInterface.py" line="5132"/>
<source><p>Could not start custom viewer.<br>Ensure that it is available as <b>{0}</b>.</p></source>
<translation><p>No se ha podido ejecutar el visor personalizado.<br>Asegúrese de que esta disponible como <b>{0}</b>.</p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5193"/>
+ <location filename="../UI/UserInterface.py" line="5200"/>
<source><p>Could not start UI Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source>
<translation><p>No se ha podido ejecutar el Previsualizador de UI.<br>Asegúrese de que esta disponible como <b>{0}</b>.</p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5248"/>
+ <location filename="../UI/UserInterface.py" line="5255"/>
<source><p>Could not start Translation Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source>
<translation><p>No se ha podido ejecutar el Previsualizador de Traducciones.<br>Asegúrese de que esta disponible como <b>{0}</b>.</p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5269"/>
+ <location filename="../UI/UserInterface.py" line="5276"/>
<source><p>Could not start SQL Browser.<br>Ensure that it is available as <b>{0}</b>.</p></source>
<translation><p>No se ha podido iniciar el navegador SQL.<br>Asegúrese de que está disponible como <b>{0}</b>.</p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5362"/>
+ <location filename="../UI/UserInterface.py" line="5369"/>
<source>No tool entry found for external tool '{0}' in tool group '{1}'.</source>
<translation>No se ha encontrado la entrada para la herramienta externa '{0}' en el grupo de herramientas '{1}'.</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5371"/>
+ <location filename="../UI/UserInterface.py" line="5378"/>
<source>No toolgroup entry '{0}' found.</source>
<translation>No se ha encontrado la entrada para el grupo de herramientas '{0}'.</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5410"/>
+ <location filename="../UI/UserInterface.py" line="5417"/>
<source>Starting process '{0} {1}'.
</source>
<translation>Comenzando proceso '{0} {1}'.
</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5426"/>
+ <location filename="../UI/UserInterface.py" line="5433"/>
<source><p>Could not start the tool entry <b>{0}</b>.<br>Ensure that it is available as <b>{1}</b>.</p></source>
<translation><p>No se ha podido ejecutar la entrada de herramienta <b>{0}</b>.<br>Asegúrese de que esta disponible como <b>{0}</b>.</p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5502"/>
+ <location filename="../UI/UserInterface.py" line="5509"/>
<source>Process '{0}' has exited.
</source>
<translation>El proceso '{0}' ha finalizado.
</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5901"/>
+ <location filename="../UI/UserInterface.py" line="5908"/>
<source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source>
<translation><P>El punto de entrada de documentación "<b>{0}</b>" no ha podido encontrarse.</p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6506"/>
+ <location filename="../UI/UserInterface.py" line="6513"/>
<source><p>The tasks file <b>{0}</b> could not be written.</p></source>
<translation><p>El archivo de tareas <b>{0}</b> no pudo ser guardado.</p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6535"/>
+ <location filename="../UI/UserInterface.py" line="6542"/>
<source><p>The tasks file <b>{0}</b> could not be read.</p></source>
<translation><p>El archivo de tareas <b>{0}</b> no puede leerse.</p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6569"/>
+ <location filename="../UI/UserInterface.py" line="6576"/>
<source><p>The session file <b>{0}</b> could not be written.</p></source>
<translation><p>El archivo de sesión <b>{0}</b> no ha podido guardarse.</p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6615"/>
+ <location filename="../UI/UserInterface.py" line="6622"/>
<source><p>The session file <b>{0}</b> could not be read.</p></source>
<translation><p>El archivo de sesión <b></b> no ha podido ser leído.</p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6895"/>
+ <location filename="../UI/UserInterface.py" line="6902"/>
<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="../UI/UserInterface.py" line="7089"/>
+ <location filename="../UI/UserInterface.py" line="7096"/>
<source>Trying host {0}</source>
<translation>Probando host {0}</translation>
</message>
@@ -79498,7 +79538,7 @@
<translation>Alt+Shift+B</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6337"/>
+ <location filename="../UI/UserInterface.py" line="6344"/>
<source>Keyboard shortcut file (*.e4k)</source>
<translation>Archivo de atajos de teclado (*.e4k)</translation>
</message>
@@ -79538,27 +79578,27 @@
<translation><b>Documentación de Python 2</b><p>Mostrar la documentación de Python 2. Si no se ha configurado un directorio con esta documentación, la ubicación de la documentación de Python 2 se asumirá en el directorio de documentación bajo la ubicación del ejecutable configurado de Python 2 en Windows, y en <i>/usr/share/doc/packages/python/html/python-docs-html</i> para Unix. Establezca el valor de la variable de entorno PYTHON2DOCDIR para sobreescribir estas opciones. </p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7153"/>
+ <location filename="../UI/UserInterface.py" line="7160"/>
<source>Error getting versions information</source>
<translation>Error al obtener información de versiones</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7146"/>
- <source>The versions information could not be downloaded. Please go online and try again.</source>
- <translation>La información de versiones no se ha podido descargar. Póngase online por favor e inténtelo de nuevo.</translation>
- </message>
- <message>
- <location filename="../UI/UserInterface.py" line="6103"/>
- <source>Open Browser</source>
- <translation>Abrir Navegador</translation>
- </message>
- <message>
- <location filename="../UI/UserInterface.py" line="6103"/>
- <source>Could not start a web browser</source>
- <translation>No se ha podido iniciar el navegador web</translation>
- </message>
- <message>
<location filename="../UI/UserInterface.py" line="7153"/>
+ <source>The versions information could not be downloaded. Please go online and try again.</source>
+ <translation>La información de versiones no se ha podido descargar. Póngase online por favor e inténtelo de nuevo.</translation>
+ </message>
+ <message>
+ <location filename="../UI/UserInterface.py" line="6110"/>
+ <source>Open Browser</source>
+ <translation>Abrir Navegador</translation>
+ </message>
+ <message>
+ <location filename="../UI/UserInterface.py" line="6110"/>
+ <source>Could not start a web browser</source>
+ <translation>No se ha podido iniciar el navegador web</translation>
+ </message>
+ <message>
+ <location filename="../UI/UserInterface.py" line="7160"/>
<source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source>
<translation>La información de versiones no se ha podido descargar en los últimos 7 días. Póngase por favor online e inténtelo de nuevo.</translation>
</message>
@@ -79644,12 +79684,12 @@
<translation><b>Captura de Pantalla</b><p>Abre un diálogo para tomar capturas de pantalla de una región de la pantalla.</p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5339"/>
+ <location filename="../UI/UserInterface.py" line="5346"/>
<source><p>Could not start Snapshot tool.<br>Ensure that it is available as <b>{0}</b>.</p></source>
<translation><p>No se ha podido ejecutar la herramienta de Captura de Pantalla.<br>Asegúrese de que esta disponible como <b>{0}</b>.</p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7358"/>
+ <location filename="../UI/UserInterface.py" line="7365"/>
<source>Select Workspace Directory</source>
<translation>Seleccionar Directorio para el Espacio de Trabajo</translation>
</message>
@@ -80019,7 +80059,7 @@
<translation>Abrir Documentación de PyQt5</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5771"/>
+ <location filename="../UI/UserInterface.py" line="5778"/>
<source><p>The PyQt5 documentation starting point has not been configured.</p></source>
<translation><P>El punto de entrada de documentación de PyQt5 no ha sido configurado.</p></translation>
</message>
@@ -80029,7 +80069,7 @@
<translation><b>Documentación de Python 3</b><p>Mostrar la documentación de Python 3. Si no se ha configurado un directorio con lesta documentación, la ubicación de la documentación de Python 3 se asumirá en el directorio de documentación bajo la ubicación del ejecutable de Python 3 en Windows, y en <i>/usr/share/doc/packages/python/html</i> para Unix. Establezca el valor de la variable de entorno PYTHON3DOCDIR para sobreescribir estas opciones. </p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7080"/>
+ <location filename="../UI/UserInterface.py" line="7087"/>
<source>%v/%m</source>
<translation>%v/%m</translation>
</message>
@@ -80049,7 +80089,7 @@
<translation><b>Mostrar registro de errores...</b><p>Abre un diálogo mostrando el registro más reciente de errores.</p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7084"/>
+ <location filename="../UI/UserInterface.py" line="7091"/>
<source>Version Check</source>
<translation>Verificación de Versión</translation>
</message>
@@ -80119,27 +80159,27 @@
<translation><b>Documentación de API de Eric</b><p>Muestra la documentación de API de Eric. La ubicación de la documentación es el subdirectorio Documentation/Source del directorio de instalación de eric6.</p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5058"/>
+ <location filename="../UI/UserInterface.py" line="5065"/>
<source>Qt v.3 is not supported by eric6.</source>
<translation>Qt v.3 no está soportado por eric6.</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7245"/>
+ <location filename="../UI/UserInterface.py" line="7252"/>
<source>The update to <b>{0}</b> of eric6 is available at <b>{1}</b>. Would you like to get it?</source>
<translation>La actualización para <b>{0}</b> de eric6 está disponible en <b>{1}</b>. ¿Le gustaría obtenerla?</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7257"/>
+ <location filename="../UI/UserInterface.py" line="7264"/>
<source>Eric6 is up to date</source>
<translation>Eric6 está actualizado</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7257"/>
+ <location filename="../UI/UserInterface.py" line="7264"/>
<source>You are using the latest version of eric6</source>
<translation>Está utilizando la última versión de eric6</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7339"/>
+ <location filename="../UI/UserInterface.py" line="7346"/>
<source>eric6 has not been configured yet. The configuration dialog will be started.</source>
<translation>Eric6 todavía no está configurado. El diálogo de configuración va a ser iniciado.</translation>
</message>
@@ -80149,17 +80189,17 @@
<translation>Generando Barras de Herramientas para Plugins...</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="4065"/>
+ <location filename="../UI/UserInterface.py" line="4072"/>
<source>&User Tools</source>
<translation>Herramientas de &Usuario</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="4137"/>
+ <location filename="../UI/UserInterface.py" line="4144"/>
<source>No User Tools Configured</source>
<translation>No se han Configurado Herramientas de Usuario</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7100"/>
+ <location filename="../UI/UserInterface.py" line="7107"/>
<source>The versions information cannot not be downloaded because you are <b>offline</b>. Please go online and try again.</source>
<translation>La información de versiones no se puede descargar porque está <b>sin línea</b>. Por favor, póngase en línea e inténtelo de nuevo.</translation>
</message>
@@ -80204,7 +80244,7 @@
<translation><b>Guardar sesión...</b><p>Guarda la sesión actual a disco. Se muestra un diálogo para seleccionar el nombre de archivo.</p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6653"/>
+ <location filename="../UI/UserInterface.py" line="6660"/>
<source>Load session</source>
<translation>Cargar sesión</translation>
</message>
@@ -80219,17 +80259,17 @@
<translation><b>Cargar sesión...</b><p>Carga una sesión guardada en disco anteriormente. Se muestra un diálogo para seleccionar el nombre de archivo.</p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6653"/>
+ <location filename="../UI/UserInterface.py" line="6660"/>
<source>eric6 Session Files (*.e5s)</source>
<translation>Archivos de Sesión de eric6 (*.e5s)</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6700"/>
+ <location filename="../UI/UserInterface.py" line="6707"/>
<source>Crash Session found!</source>
<translation>¡Se ha hallado una sesión perdida!</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6700"/>
+ <location filename="../UI/UserInterface.py" line="6707"/>
<source>A session file of a crashed session was found. Shall this session be restored?</source>
<translation>Se ha encontrado un archivo de sesió para una sesión perdida. ¿Desea restaurar esta sesión?</translation>
</message>
@@ -80244,17 +80284,17 @@
<translation>Inicializando Plugins...</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7233"/>
+ <location filename="../UI/UserInterface.py" line="7240"/>
<source>Update Check</source>
<translation>Comprobación Actualización</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7233"/>
+ <location filename="../UI/UserInterface.py" line="7240"/>
<source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source>
<translation>Ha instalado eric directamente a partir del código fuente. No es posible comprobar la disponibilidad de una actuación.</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7223"/>
+ <location filename="../UI/UserInterface.py" line="7230"/>
<source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source>
<translation>Ésta es una snapshot release the eric6. Una release estable más reciente podría estar disponible.</translation>
</message>
@@ -80309,7 +80349,7 @@
<translation><b>Documentación de PySide2</b><p>Muestra la Documentación de PySide2. Dependiendo de la configuración, esta documentación será mostrará en el visor de ayuda interno de Eric, o se ejecutará en un navegador web, o Qt Assistant.</p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5884"/>
+ <location filename="../UI/UserInterface.py" line="5891"/>
<source><p>The PySide{0} documentation starting point has not been configured.</p></source>
<translation><P>El punto de entrada de documentación de PySide{0} no ha sido configurado.</p></translation>
</message>
@@ -80344,22 +80384,22 @@
<translation><b>Configurador de Virtualenv</b><p>Abre un diálogo para introducir todos los parámetros necesarios para crear un entorno virtual de Python utilizando virtualenv o pyvenv.</p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3128"/>
+ <location filename="../UI/UserInterface.py" line="3135"/>
<source>Left Side</source>
<translation>Lado Izquierdo</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3144"/>
+ <location filename="../UI/UserInterface.py" line="3151"/>
<source>Bottom Side</source>
<translation>Lado Inferior</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3155"/>
+ <location filename="../UI/UserInterface.py" line="3162"/>
<source>Right Side</source>
<translation>Lado Derecho</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3179"/>
+ <location filename="../UI/UserInterface.py" line="3186"/>
<source>Plug-ins</source>
<translation>Plugins</translation>
</message>
@@ -80385,17 +80425,17 @@
<translation><b>Reiniciar la IDE</b><p>Reinicia la IDE. Todos los cambios sin guardar pueden ser guardados primero. Cualquier programa de Python que esté en depuración será detenido, y las preferencias se guardarán en disco.</p></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6058"/>
+ <location filename="../UI/UserInterface.py" line="6065"/>
<source>Start Web Browser</source>
<translation>Iniciar Navegador Web</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6000"/>
+ <location filename="../UI/UserInterface.py" line="6007"/>
<source>The eric6 web browser could not be started.</source>
<translation>El navegador web de eric 6 no se ha podido iniciar.</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6058"/>
+ <location filename="../UI/UserInterface.py" line="6065"/>
<source><p>The eric6 web browser is not started.</p><p>Reason: {0}</p></source>
<translation><p>El navegador web de eric6 no se ha iniciado.</p><p>Razón: {0}</p></translation>
</message>
@@ -80410,7 +80450,7 @@
<translation>PyPI</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3493"/>
+ <location filename="../UI/UserInterface.py" line="3500"/>
<source><p>This part of the status bar allows zooming the current editor or shell.</p></source>
<translation><p>Esta zona de la barra de estado permite hacer zoom sobre el editor actual o la shell.</p></translation>
</message>
@@ -80484,6 +80524,11 @@
<source><b>MicroPython</b><p>This switches the input focus to the MicroPython window.</p></source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../UI/UserInterface.py" line="3128"/>
+ <source>Central Park</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>UserPropertiesDialog</name>
@@ -90418,17 +90463,17 @@
<context>
<name>mercurial</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2056"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/>
<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="2066"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/>
<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="2075"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/>
<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>
@@ -90439,31 +90484,31 @@
</table></p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2048"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2059"/>
<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="2051"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/>
<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="2071"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/>
<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="1416"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1427"/>
<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="1436"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1447"/>
<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>
@@ -90472,12 +90517,12 @@
<tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2061"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072"/>
<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="1470"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1481"/>
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
@@ -90494,14 +90539,14 @@
</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/>
<source><tr><td><b>Head #{0}</b></td><td></td></tr>
</source>
<translation><tr><td><b>Head #{0}</b></td><td></td></tr>
</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/>
<source><tr><td><b>Parent #{0}</b></td><td></td></tr>
</source>
<translation><tr><td><b>Parent #{0}</b></td><td></td></tr>
