--- a/i18n/eric6_es.ts Sat Jan 28 18:04:14 2017 +0100
+++ b/i18n/eric6_es.ts Sat Jan 28 19:21:31 2017 +0100
@@ -21581,7 +21581,7 @@
<context>
<name>Hg</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1822"/>
<source>The hg process did not finish within 30s.</source>
<translation>El proceso hg no terminó en un plazo de 30s.</translation>
</message>
@@ -21631,147 +21631,147 @@
<translation>Renombrando {0}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1090"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1057"/>
<source>Merging</source>
<translation>Haciendo un merge</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1612"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/>
<source>Copying {0}</source>
<translation>Copiando {0}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2013"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968"/>
<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="2067"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2022"/>
<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="1045"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1012"/>
<source>Reverting changes</source>
<translation>Revirtiendo cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1392"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1359"/>
<source>Mercurial command</source>
<translation>Comando de Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230"/>
<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="2423"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378"/>
<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="2448"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2403"/>
<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="2472"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2427"/>
<source>Showing aliases for remote repositories</source>
<translation>Mostrando alias para repositorios remotos</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2451"/>
<source>Recovering from interrupted transaction</source>
<translation>Recuperando de transacción interrumpida</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2718"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/>
<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="2304"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2259"/>
<source>Showing current branch</source>
<translation>Mostrando la branch actual</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2649"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2604"/>
<source>Create changegroup</source>
<translation>Crear changegroup</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2730"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/>
<source>Apply changegroups</source>
<translation>Aplicar changegroups</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2748"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation>Subcomando bisect ({0}) inválido.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2778"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2727"/>
<source>Mercurial Bisect ({0})</source>
<translation>Mercurial Bisect ({0})</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2670"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2625"/>
<source>Preview changegroup</source>
<translation>Previsualizar changegroup</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2520"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2475"/>
<source>Identifying project directory</source>
<translation>Identificando directorio de proyecto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/>
<source>Create .hgignore file</source>
<translation>Crear archivo .hgignore</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/>
<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="2810"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2759"/>
<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="2606"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation>Archivos Changegroup de Mercurial (*.hg)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2710"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/>
<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="2864"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813"/>
<source>Backing out changeset</source>
<translation>Haciendo respaldo de changeset</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2844"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2793"/>
<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="2623"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2578"/>
<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="2891"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2840"/>
<source>Rollback last transaction</source>
<translation>Hacer Rollback de la última transacción</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/>
<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>
@@ -21781,72 +21781,72 @@
<translation>Haciendo commit de cambios al repositorio Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/>
<source>Mercurial Command Server</source>
<translation>Servidor de Comandos de Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3401"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3350"/>
<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="3546"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/>
<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="2959"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2908"/>
<source>Import Patch</source>
<translation>Importar Patch</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3006"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2955"/>
<source>Export Patches</source>
<translation>Exportar Patches</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3053"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3002"/>
<source>Change Phase</source>
<translation>Cambiar Fase</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3106"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3055"/>
<source>Copy Changesets</source>
<translation>Copiar Changesets</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3132"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/>
<source>Copy Changesets (Continue)</source>
<translation>Copiar Changesets (Continuar)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/>
<source>Add Sub-repository</source>
<translation>Añadir Sub-repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3303"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/>
<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="3251"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3200"/>
<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="3322"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/>
<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="3322"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/>
<source>Remove Sub-repositories</source>
<translation>Eliminar Sub-repositorios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/>
<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>
@@ -21861,157 +21861,157 @@
<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="1039"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/>
<source>Revert changes</source>
<translation>Revertir cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1030"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="997"/>
<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="1039"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/>
<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="3167"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/>
<source>Create Unversioned Archive</source>
<translation>Crear Archivo Sin Versionar</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1892"/>
<source>Mercurial Side-by-Side Difference</source>
<translation>Diferencia Lado a Lado Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1892"/>
<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="1858"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/>
<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="989"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/>
<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="2282"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/>
<source>Created new branch <{0}>.</source>
<translation>Creada nueva branch <{0}>.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1166"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1133"/>
<source>Current branch tip</source>
<translation>Tip branch actual</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2197"/>
<source>Cancelling uncommitted merge</source>
<translation>Cancelando merge sin commit</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3614"/>
<source>Mercurial Bookmark</source>
<translation>Marcador de Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/>
<source>Delete Bookmark</source>
<translation>Borrar Marcador</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/>
<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="3698"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3647"/>
<source>Delete Mercurial Bookmark</source>
<translation>Borrar Marcador de Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3731"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3680"/>
<source>Rename Mercurial Bookmark</source>
<translation>Renombrar Marcador de Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3773"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/>
<source>Move Mercurial Bookmark</source>
<translation>Mover Marcador de Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/>
<source>Pull Bookmark</source>
<translation>Pull de Marcador</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/>
<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="3880"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3829"/>
<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="3912"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/>
<source>Push Bookmark</source>
<translation>Push de Marcador</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/>
<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="3924"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3873"/>
<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="1136"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/>
<source>Re-Merge</source>
<translation>Re-Merge</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1127"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1094"/>
<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="1136"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/>
<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="1141"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/>
<source>Re-Merging</source>
<translation>Aplicando Re-Merge</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2168"/>
<source>Marking as 'unresolved'</source>
<translation>Marcando como 'unresolved'</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/>
<source>Marking as 'resolved'</source>
<translation>Marcando como 'resolved'</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/>
<source>Delete All Backups</source>
<translation>Borrar todas las Copias de Seguridad</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/>
<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>
@@ -24925,116 +24925,116 @@
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="64"/>
<source><b>Processing your request, please wait...</b></source>
- <translation><b>Procesando la solicitud, por favor aguarde...</b></translation>
+ <translation type="obsolete"><b>Procesando la solicitud, por favor aguarde...</b></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="74"/>
<source>Revision</source>
- <translation>Revisión</translation>
+ <translation type="obsolete">Revisión</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="215"/>
<source>Process Generation Error</source>
- <translation>Error de Generación de Proceso</translation>
+ <translation type="obsolete">Error de Generación de Proceso</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="215"/>
<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>
+ <translation type="obsolete">El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="306"/>
<source>No log available for '{0}'</source>
- <translation>No hay registros de log disponibles para '{0}'</translation>
+ <translation type="obsolete">No hay registros de log disponibles para '{0}'</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="344"/>
<source>diff to {0}</source>
- <translation>diff con {0}</translation>
+ <translation type="obsolete">diff con {0}</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="358"/>
<source>Tags: {0}<br />
</source>
- <translation>Tags: {0}<br />
+ <translation type="obsolete">Tags: {0}<br />
</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="364"/>
<source>Parents: {0}<br />
</source>
- <translation>Parents: {0}<br />
+ <translation type="obsolete">Parents: {0}<br />
</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="367"/>
<source><i>Author: {0}</i><br />
</source>
- <translation><i>Autor: {0}</i><br />
+ <translation type="obsolete"><i>Autor: {0}</i><br />
</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="371"/>
<source><i>Date: {0}, {1}</i><br />
</source>
- <translation><i>Fecha: {0}</i><br />
+ <translation type="obsolete"><i>Fecha: {0}</i><br />
</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="387"/>
<source>Added {0}<br />
</source>
- <translation>Añadido {0}<br />
+ <translation type="obsolete">Añadido {0}<br />
</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="393"/>
<source>Modified {0}<br />
</source>
- <translation>Modificado {0}<br />
+ <translation type="obsolete">Modificado {0}<br />
</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="399"/>
<source>Deleted {0}<br />
</source>
- <translation>Borrado {0}<br />
+ <translation type="obsolete">Borrado {0}<br />
</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="270"/>
<source>The hg process did not finish within 30s.</source>
- <translation>El proceso hg no terminó en un plazo de 30s.</translation>
+ <translation type="obsolete">El proceso hg no terminó en un plazo de 30s.</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="273"/>
<source>Could not start the hg executable.</source>
- <translation>No se ha podido iniciar el ejecutable de hg.</translation>
+ <translation type="obsolete">No se ha podido iniciar el ejecutable de hg.</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="276"/>
<source>Mercurial Error</source>
- <translation>Error de Mercurial</translation>
+ <translation type="obsolete">Error de Mercurial</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="382"/>
<source>Added {0} (copied from {1})<br />
</source>
- <translation>Añadido {0} (copiado de {1})<br />
+ <translation type="obsolete">Añadido {0} (copiado de {1})<br />
</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="361"/>
<source>Bookmarks: {0}<br />
</source>
- <translation>Marcadores: {0}<br />
+ <translation type="obsolete">Marcadores: {0}<br />
</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="352"/>
<source>Phase: {0}<br />
</source>
- <translation>Fase: {0}<br />
+ <translation type="obsolete">Fase: {0}<br />
</translation>
</message>
<message>
@@ -25051,7 +25051,7 @@
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="355"/>
<source>Branch: {0}<br />
</source>
- <translation>Branch: {0}<br />
+ <translation type="obsolete">Branch: {0}<br />
</translation>
</message>
</context>
@@ -25415,87 +25415,87 @@
<context>
<name>HgProjectBrowserHelper</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="605"/>
<source>Version Control</source>
<translation>Control de Versiones</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="617"/>
<source>Commit changes to repository...</source>
<translation>Hacer commit de los cambios al repositorio...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/>
<source>Add to repository</source>
<translation>Añadir al repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="628"/>
<source>Remove from repository (and disk)</source>
<translation>Eliminar del repositorio (y del disco)</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="548"/>
<source>Show log</source>
- <translation>Mostrar log</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="552"/>
+ <translation type="obsolete">Mostrar log</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="544"/>
<source>Show log browser</source>
<translation>Mostrar navegador de log</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="663"/>
<source>Select all local file entries</source>
<translation>Seleccionar todas las entradas de archivo locales</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="665"/>
<source>Select all versioned file entries</source>
<translation>Seleccionar todas las entradas de archivo versionadas</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/>
<source>Select all local directory entries</source>
<translation>Seleccionar todas las entradas de directorio locales</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="669"/>
<source>Select all versioned directory entries</source>
<translation>Seleccionar todas las entradas de directorio versionadas</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/>
<source>Show status</source>
<translation>Mostrar estado</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="347"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="343"/>
<source>Show annotated file</source>
<translation>Mostrar archivo anotado</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/>
<source>Revert changes</source>
<translation>Revertir cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/>
<source>Remove from repository only</source>
<translation>Eliminar solamente del repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/>
<source>Do you really want to remove these files from the repository?</source>
<translation>¿Realmente quiere eliminar estos archivos del repositorio?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="543"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="539"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="541"/>
<source>Move</source>
<translation>Mover</translation>
</message>
@@ -25505,42 +25505,42 @@
<translation>Extensiones</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="647"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="639"/>
<source>Show differences</source>
<translation>Mostrar diferencias</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="333"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="329"/>
<source>Show differences side-by-side</source>
<translation>Mostrar diferencias lado a lado</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="651"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="643"/>
<source>Show differences (extended)</source>
<translation>Mostrar diferencias (extendido)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="338"/>
<source>Show differences side-by-side (extended)</source>
<translation>Mostrar diferencias lado a lado (extendido)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="661"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="653"/>
<source>Conflicts resolved</source>
<translation>Conflictos resueltos</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="656"/>
<source>Conflicts unresolved</source>
<translation>Conflictos sin resolver</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="659"/>
<source>Re-Merge</source>
<translation>Re-Merge</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="680"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="672"/>
<source>Configure...</source>
<translation>Configurar...</translation>
</message>
@@ -25689,581 +25689,566 @@
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/>
- <source>Show log</source>
- <translation>Mostrar log</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/>
- <source>Show &log</source>
- <translation>Mostrar &log</translation>
+ <source>Show log browser</source>
+ <translation>Mostrar navegador de log</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/>
- <source>Show the log of the local project</source>
- <translation>Mostrar el log del proyecto local</translation>
+ <source>Show a dialog to browse the log of the local project</source>
+ <translation>Mostrar un diálogo para navegar el log del proyecto local</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/>
<source><b>Show log</b><p>This shows the log of the local project.</p></source>
- <translation><b>Mostrar log</b><p>Muestra el log del proyecto local.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/>
- <source>Show log browser</source>
- <translation>Mostrar navegador de log</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/>
- <source>Show a dialog to browse the log of the local project</source>
- <translation>Mostrar un diálogo para navegar el log del proyecto local</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/>
+ <translation type="obsolete"><b>Mostrar log</b><p>Muestra el log del proyecto local.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/>
<source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source>
<translation><b>Mostrar navegador de log</b><p>Muestra un diálogo para navegar el log del proyecto local. Al principio se muestra un número limitado de entradas. Se pueden recuperar más entradas despues.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/>
<source>Show &difference</source>
<translation>Mostrar &diferencia</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/>
<source>Show the difference of the local project to the repository</source>
<translation>Muestra las diferencias entre el proyecto local y el repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/>
<source>Show the difference of revisions of the project to the repository</source>
<translation>Muestra la diferencia de revisiones entre el proyecto local y el repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="343"/>
<source>Show heads</source>
<translation>Mostrar heads</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/>
<source>Show the heads of the repository</source>
<translation>Mostrar los heads del repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/>
<source><b>Show heads</b><p>This shows the heads of the repository.</p></source>
<translation><b>Mostrar heads</b><p>Muestra los heads del repositorio.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="372"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="357"/>
<source>Show parents</source>
<translation>Mostrar parents</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/>
<source>Show the parents of the repository</source>
<translation>Mostrar los parents del repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/>
<source><b>Show parents</b><p>This shows the parents of the repository.</p></source>
<translation><b>Mostrar parents</b><p>Muestra los parents del repositorio.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="386"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="371"/>
<source>Show tip</source>
<translation>Mostrar tip</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/>
+ <source>Show the tip of the repository</source>
+ <translation>Mostrar el tip del repositorio</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="378"/>
+ <source><b>Show tip</b><p>This shows the tip of the repository.</p></source>
+ <translation><b>Mostrar tip</b><p>Muestra el tip del repositorio.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/>
+ <source>Merge</source>
+ <translation>Hacer merge</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/>
+ <source>Mer&ge changes...</source>
+ <translation>Hacer mer&ge de los cambios...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/>
+ <source>Merge changes of a revision into the local project</source>
+ <translation>Hacer merge de los cambios de una revision en el proyecto local</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/>
+ <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source>
+ <translation><b>Merge</b><p>Hace un merge de los cambios de una revision en el proyecto local.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/>
+ <source>Show status</source>
+ <translation>Mostrar estado</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/>
+ <source>Show the status of the local project</source>
+ <translation>Mostrar el estado del proyecto local</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="320"/>
+ <source><b>Show status</b><p>This shows the status of the local project.</p></source>
+ <translation><b>Mostrar estado</b><p>Muestra el estado del proyecto local.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="385"/>
+ <source>Revert changes</source>
+ <translation>Revertir cambios</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="385"/>
+ <source>Re&vert changes</source>
+ <translation>Re&vertir cambios</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/>
- <source>Show the tip of the repository</source>
- <translation>Mostrar el tip del repositorio</translation>
+ <source>Revert all changes made to the local project</source>
+ <translation>Revertir todos los cambios hechos al proyecto local</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/>
- <source><b>Show tip</b><p>This shows the tip of the repository.</p></source>
- <translation><b>Mostrar tip</b><p>Muestra el tip del repositorio.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/>
- <source>Merge</source>
- <translation>Hacer merge</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/>
- <source>Mer&ge changes...</source>
- <translation>Hacer mer&ge de los cambios...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/>
- <source>Merge changes of a revision into the local project</source>
- <translation>Hacer merge de los cambios de una revision en el proyecto local</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/>
- <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source>
- <translation><b>Merge</b><p>Hace un merge de los cambios de una revision en el proyecto local.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/>
- <source>Show status</source>
- <translation>Mostrar estado</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/>
- <source>Show the status of the local project</source>
- <translation>Mostrar el estado del proyecto local</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/>
- <source><b>Show status</b><p>This shows the status of the local project.</p></source>
- <translation><b>Mostrar estado</b><p>Muestra el estado del proyecto local.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/>
- <source>Revert changes</source>
- <translation>Revertir cambios</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/>
- <source>Re&vert changes</source>
- <translation>Re&vertir cambios</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/>
- <source>Revert all changes made to the local project</source>
- <translation>Revertir todos los cambios hechos al proyecto local</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/>
<source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source>
<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="492"/>
+ <source>Tag in repository</source>
+ <translation>Crear un Tag en el repositorio</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/>
+ <source>&Tag in repository...</source>
+ <translation>Crear un &Tag en el repositorio...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/>
+ <source>Tag the local project in the repository</source>
+ <translation>Crea un tag del proyecto local en el repositorio</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/>
+ <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source>
+ <translation><b>Crear un Tag en el repositorio</b><p>Crea un tag del proyecto local en el repositorio.</p></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/>
- <source>Tag in repository</source>
- <translation>Crear un Tag en el repositorio</translation>
+ <source>List tags</source>
+ <translation>Listar tags</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/>
- <source>&Tag in repository...</source>
- <translation>Crear un &Tag en el repositorio...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/>
- <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="515"/>
- <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="522"/>
- <source>List tags</source>
- <translation>Listar tags</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/>
<source>List tags...</source>
<translation>Listar tags...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/>
<source>List tags of the project</source>
<translation>Lista los tags del proyecto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/>
<source><b>List tags</b><p>This lists the tags of the project.</p></source>
<translation><b>Listar tags</b><p>Lista los tags del proyecto.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/>
<source>List branches</source>
<translation>Listar branches</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/>
<source>List branches...</source>
<translation>Listar branches...</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/>
+ <source>List branches of the project</source>
+ <translation>Lista las branches del proyecto</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/>
+ <source><b>List branches</b><p>This lists the branches of the project.</p></source>
+ <translation><b>Listar branches</b><p>Lista las branches del proyecto.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/>
+ <source>Create branch</source>
+ <translation>Crear branch</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/>
+ <source>Create &branch...</source>
+ <translation>Crear &branch...</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/>
- <source>List branches of the project</source>
- <translation>Lista las branches del proyecto</translation>
+ <source>Create a new branch for the local project in the repository</source>
+ <translation>Crear una nueva branch para el proyecto local en el repositorio</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543"/>
- <source><b>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="550"/>
- <source>Create branch</source>
- <translation>Crear branch</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/>
- <source>Create &branch...</source>
- <translation>Crear &branch...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/>
- <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="558"/>
<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="582"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/>
<source>Close branch</source>
<translation>Cerrar branch</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/>
<source>Close the current branch of the local project</source>
<translation>Cerrar la branch actual para el proyecto local</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/>
<source><b>Close branch</b><p>This closes the current branch of the local project.</p></source>
<translation><b>Cerrar branch</b><p>Cierra la branch actual del proyecto local.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/>
<source>Switch</source>
<translation>Hacer switch</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/>
<source>S&witch...</source>
<translation>Hacer s&witch...</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/>
+ <source>Switch the working directory to another revision</source>
+ <translation>Hacer switch del directorio de trabajo a otra revisión</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/>
+ <source><b>Switch</b><p>This switches the working directory to another revision.</p></source>
+ <translation><b>Hacer switch</b><p>Hace un switch del directorio de trabajo a otra revisión.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/>
+ <source>Cleanup</source>
+ <translation>Limpiar (cleanup)</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/>
+ <source>Cleanu&p</source>
+ <translation>Lim&piar (cleanup)</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/>
- <source>Switch the working directory to another revision</source>
- <translation>Hacer switch del directorio de trabajo a otra revisión</translation>
+ <source>Cleanup the local project</source>
+ <translation>Limpiar (cleanup) el proyecto local</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/>
- <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="626"/>
- <source>Cleanup</source>
- <translation>Limpiar (cleanup)</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/>
- <source>Cleanu&p</source>
- <translation>Lim&piar (cleanup)</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/>
- <source>Cleanup the local project</source>
- <translation>Limpiar (cleanup) el proyecto local</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/>
<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="625"/>
+ <source>Execute command</source>
+ <translation>Ejecutar comando</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/>
+ <source>E&xecute command...</source>
+ <translation>E&jecutar comando...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/>
+ <source>Execute an arbitrary Mercurial command</source>
+ <translation>Ejecuta un comando Mercurial arbitrario</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/>
+ <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source>
+ <translation><b>Ejecutar comando</b><p>Abre un diálogo para introducir un comando Mercurial arbitrario.</p></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/>
- <source>Execute command</source>
- <translation>Ejecutar comando</translation>
+ <source>Configure</source>
+ <translation>Configurar</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/>
- <source>E&xecute command...</source>
- <translation>E&jecutar comando...</translation>
+ <source>Configure...</source>
+ <translation>Configurar...</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/>
- <source>Execute an arbitrary Mercurial command</source>
- <translation>Ejecuta un comando Mercurial arbitrario</translation>
+ <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="647"/>
- <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="655"/>
- <source>Configure</source>
- <translation>Configurar</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/>
- <source>Configure...</source>
- <translation>Configurar...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/>
- <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="662"/>
<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="715"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/>
<source>Show paths</source>
<translation>Mostrar rutas</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/>
<source>Show paths...</source>
<translation>Mostrar rutas...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/>
<source>Show the aliases for remote repositories</source>
<translation>Mostrar los alias para los repositorios remotos</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/>
<source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source>
<translation><b>Mostrar rutas</b><p>Muestra los alias para los repositorios remotos.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/>
<source>Verify repository</source>
<translation>Verificar repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/>
<source>Verify repository...</source>
<translation>Verificar repositorio...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/>
<source>Verify the integrity of the repository</source>
<translation>Verificar la integridad del repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/>
<source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source>
<translation><b>Verificar repositorio</b><p>Verifica la integridad del repositorio.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/>
<source>Recover</source>
<translation>Recuperar</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/>
<source>Recover...</source>
<translation>Recuperar...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/>
<source>Recover from an interrupted transaction</source>
<translation>Recuperar de una transacción interrumpida</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/>
<source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source>
<translation><b>Recuperar</b><p>Recupera de una transacción interrumpida.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756"/>
<source>Create .hgignore</source>
<translation>Crear .hgignore</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/>
+ <source>Create a .hgignore file with default values</source>
+ <translation>Crear un archivo .hgignore con valores por defecto</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/>
+ <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source>
+ <translation><b>Crear .hgignore</b><p>Crea un archivo .hgignore con valores por defecto.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/>
+ <source>Create changegroup</source>
+ <translation>Crear changegroup</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/>
+ <source>Create changegroup...</source>
+ <translation>Crear changegroup...</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/>
- <source>Create a .hgignore file with default values</source>
- <translation>Crear un archivo .hgignore con valores por defecto</translation>
+ <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="1793"/>
+ <source>Apply changegroups</source>
+ <translation>Aplicar changegroups</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/>
+ <source>Apply changegroups...</source>
+ <translation>Aplicar changegroups...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/>
+ <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="1309"/>
+ <source>Changegroup Management</source>
+ <translation>Gestión de Chagegroup</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/>
- <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="785"/>
- <source>Create changegroup</source>
- <translation>Crear changegroup</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/>
- <source>Create changegroup...</source>
- <translation>Crear changegroup...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/>
- <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="1810"/>
- <source>Apply changegroups</source>
- <translation>Aplicar changegroups</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/>
- <source>Apply changegroups...</source>
- <translation>Aplicar changegroups...</translation>
+ <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="810"/>
+ <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="581"/>
+ <source>Show current branch</source>
+ <translation>Mostrar la branch actual</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/>
+ <source>Show the current branch of the project</source>
+ <translation>Mostrar la branch actual del proyecto</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/>
+ <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source>
+ <translation><b>Mostrar branch actual</b><p>Muestra la branch actual del proyecto.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/>
+ <source>Mark as "good"</source>
+ <translation>Marcar como "bueno"</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/>
- <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="1324"/>
- <source>Changegroup Management</source>
- <translation>Gestión de Chagegroup</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/>
- <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>
+ <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="825"/>
- <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="596"/>
- <source>Show current branch</source>
- <translation>Mostrar la branch actual</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/>
- <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="603"/>
- <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="833"/>
- <source>Mark as "good"</source>
- <translation>Marcar como "bueno"</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/>
- <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="840"/>
<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="847"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/>
<source>Mark as "bad"</source>
<translation>Marcar como "malo"</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/>
<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="854"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/>
<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="861"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/>
<source>Skip</source>
<translation>Saltar</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/>
<source>Reset</source>
<translation>Reiniciar</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/>
<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="882"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/>
<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="1337"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/>
<source>Bisect</source>
<translation>Bisect</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/>
<source>Mark as "good"...</source>
<translation>Marcar como "bueno"...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/>
<source>Mark as "bad"...</source>
<translation>Marcar como "malo"...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/>
<source>Preview changegroup</source>
<translation>Previsualizar changegroup</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/>
<source>Preview changegroup...</source>
<translation>Previsualizar changegroup...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/>
<source>Identify</source>
<translation>Identificar</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/>
<source>Identify...</source>
<translation>Identificar...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/>
<source>Identify the project directory</source>
<translation>Identificar el directorio de proyecto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/>
<source><b>Identify</b><p>This identifies the project directory.</p></source>
<translation><b>Identificar</b><p>Identifica el directorio de proyecto.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/>
<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="809"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/>
<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="889"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/>
<source>Back out changeset</source>
<translation>Hacer respaldo de changeset</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/>
<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="896"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/>
<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>
@@ -26283,687 +26268,687 @@
<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="1315"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1300"/>
<source>Specials</source>
<translation>Especial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/>
<source>Serve project repository</source>
<translation>Servir repositorio de proyecto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/>
<source>Serve project repository...</source>
<translation>Servir repositorio de proyecto...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/>
<source>Serve the project repository</source>
<translation>Servir el repositorio de proyecto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="922"/>
<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="1627"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1610"/>
<source>Pull</source>
<translation>Hacer Pull</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1921"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/>
<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="566"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/>
<source>Push new branch</source>
<translation>Hacer push de nueva rama</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/>
<source>Push the current branch of the local project as a new named branch</source>
<translation>Ejecutar push de la rama actual del proyecto local como una nueva rama con nombre</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/>
<source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source>
<translation><b>Hacer push de nueva rama</b><p>Hace un push de la rama actual del proyecto local como una nueva rama con nombre.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/>
<source>Rollback last transaction</source>
<translation>Rollback de última transacción</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/>
<source>Rollback the last transaction</source>
<translation>Rollback de la última transacción</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/>
<source>Extensions</source>
<translation>Extensiones</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/>
<source>Edit user configuration</source>
<translation>Editar configuración de usuario</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/>
<source>Edit user configuration...</source>
<translation>Editar configuración de usuario...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/>
<source>Show an editor to edit the user configuration file</source>
<translation>Mostrar un editor para editar el archivo de configuración de usuario</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/>
<source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source>
<translation><b>Editar configuración de usuario</b><p>Mostrar un editor para editar el archivo de configuración de usuario.</p></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/>
+ <source>Edit repository configuration</source>
+ <translation>Editar configuración del repositorio</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/>
+ <source>Edit repository configuration...</source>
+ <translation>Editar configuración del repositorio...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/>
+ <source>Show an editor to edit the repository configuration file</source>
+ <translation>Mostrar un editor para editar el archivo de configuración del repositorio</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/>
+ <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source>
+ <translation><b>Editar configuración del repositorio</b><p>Mostrar un editor para editar el archivo de configuración del repositorio.</p></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/>
- <source>Edit repository configuration</source>
- <translation>Editar configuración del repositorio</translation>
+ <source>Show combined configuration settings</source>
+ <translation>Mostrar ajustes de configuración combinados</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/>
- <source>Edit repository configuration...</source>
- <translation>Editar configuración del repositorio...</translation>
+ <source>Show combined configuration settings...</source>
+ <translation>Mostrar ajustes de configuración combinados...</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/>
- <source>Show 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="691"/>
- <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="699"/>
- <source>Show combined configuration settings</source>
- <translation>Mostrar ajustes de configuración combinados</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/>
- <source>Show combined configuration settings...</source>
- <translation>Mostrar ajustes de configuración combinados...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/>
<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="707"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/>
<source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source>
<translation><b>Mostrar ajustes de configuración combinados</b><p>Muestra los ajustes de configuración combinados de todos los archivos de configuración.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/>
<source>Skip...</source>
<translation>Ignorar...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="850"/>
<source>Skip a selectable changeset</source>
<translation>Ignorar un changeset seleccionable</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/>
<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="1866"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1849"/>
<source>Import Patch</source>
<translation>Importar Patch</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/>
<source>Import Patch...</source>
<translation>Importar Patch...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/>
<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="952"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/>
<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="1331"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1316"/>
<source>Patch Management</source>
<translation>Gestión de Patch</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1886"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1869"/>
<source>Revert Changes</source>
<translation>Revertir cambios</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/>
+ <source>Export Patches</source>
+ <translation>Exportar Patches</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/>
+ <source>Export Patches...</source>
+ <translation>Exportar Patches...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/>
+ <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="953"/>
+ <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="960"/>
- <source>Export Patches</source>
- <translation>Exportar Patches</translation>
+ <source>Change Phase</source>
+ <translation>Cambiar Fase</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/>
- <source>Export Patches...</source>
- <translation>Exportar Patches...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/>
- <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="968"/>
- <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="975"/>
- <source>Change Phase</source>
- <translation>Cambiar Fase</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/>
<source>Change Phase...</source>
<translation>Cambiar Fase...</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/>
+ <source>Change the phase of revisions</source>
+ <translation>Cambiar la fase de revisiones</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/>
+ <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="1889"/>
+ <source>Copy Changesets</source>
+ <translation>Copiar Changesets</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/>
- <source>Change the phase of revisions</source>
- <translation>Cambiar la fase de revisiones</translation>
+ <source>Copies changesets from another branch</source>
+ <translation>Copiar changesets de otra branch</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/>
- <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="1906"/>
- <source>Copy Changesets</source>
- <translation>Copiar Changesets</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/>
- <source>Copies changesets from another branch</source>
- <translation>Copiar changesets de otra branch</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="997"/>
<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="991"/>
+ <source>Continue Copying Session</source>
+ <translation>Continuar Sesión de Copia</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="995"/>
+ <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="998"/>
+ <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="1378"/>
+ <source>Graft</source>
+ <translation>Graft</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/>
+ <source>Copy Changesets (Continue)</source>
+ <translation>Copiar Changesets (Continuar)</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/>
+ <source>Conflicts resolved</source>
+ <translation>Conflictos resueltos</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/>
+ <source>Con&flicts resolved</source>
+ <translation>Con&flictos resueltos</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/>
+ <source>Mark all conflicts of the local project as resolved</source>
+ <translation>Marcar todos los conflictos del proyecto local como resueltos</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/>
+ <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source>
+ <translation><b>Conflictos resueltos</b><p>Marca todos los conflictos del proyecto local como resueltos.</p></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/>
- <source>Continue Copying Session</source>
- <translation>Continuar Sesión de Copia</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/>
- <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="1013"/>
- <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="1393"/>
- <source>Graft</source>
- <translation>Graft</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1921"/>
- <source>Copy Changesets (Continue)</source>
- <translation>Copiar Changesets (Continuar)</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/>
- <source>Conflicts resolved</source>
- <translation>Conflictos resueltos</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/>
- <source>Con&flicts resolved</source>
- <translation>Con&flictos resueltos</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/>
- <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="484"/>
- <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>
+ <source>Add</source>
+ <translation>Añadir</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/>
+ <source>Add...</source>
+ <translation>Añadir...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/>
+ <source>Add a sub-repository</source>
+ <translation>Añadir un sub-repositorio</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/>
+ <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="1021"/>
+ <source>Remove</source>
+ <translation>Eliminar</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/>
- <source>Add</source>
- <translation>Añadir</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/>
- <source>Add...</source>
- <translation>Añadir...</translation>
+ <source>Remove...</source>
+ <translation>Eliminar...</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/>
- <source>Add a sub-repository</source>
- <translation>Añadir un sub-repositorio</translation>
+ <source>Remove sub-repositories</source>
+ <translation>Eliminar sub-repositorios</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/>
- <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="1036"/>
- <source>Remove</source>
- <translation>Eliminar</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/>
- <source>Remove...</source>
- <translation>Eliminar...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/>
- <source>Remove sub-repositories</source>
- <translation>Eliminar sub-repositorios</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/>
<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="1399"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1384"/>
<source>Sub-Repository</source>
<translation>Sub-repositorio</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/>
+ <source>Show &status...</source>
+ <translation>Mostrar e&stado...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/>
+ <source>Show Summary</source>
+ <translation>Mostrar Sumario</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/>
- <source>Show &status...</source>
- <translation>Mostrar e&stado...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/>
- <source>Show Summary</source>
- <translation>Mostrar Sumario</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/>
<source>Show summary...</source>
<translation>Mostrar Sumario...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/>
<source>Show summary information of the working directory status</source>
<translation>Mostrar información sumarial del estado del directorio de trabajo</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/>
<source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source>
<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="1052"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/>
<source>Create unversioned archive</source>
<translation>Crear archivo sin versionar</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/>
<source>Create unversioned archive...</source>
<translation>Crear archivo sin versionar...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/>
<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="1060"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/>
<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="910"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/>
<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="1290"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1275"/>
<source>Administration</source>
<translation>Administración</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/>
<source>Show differences</source>
<translation>Mostrar diferencias</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/>
<source>Show differences (extended)</source>
<translation>Mostrar diferencias (extendido)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/>
<source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source>
<translation><b>Mostrar diferencias</b><p>Muestra diferencias entre el proyecto local y el repositorio.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="319"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/>
<source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source>
<translation><b>Mostrar diferencias (extendido)</b><p>Muestra diferencias entre revisiones seleccionables del proyecto.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/>
<source>Cancel uncommitted merge</source>
<translation>Cancelar merge sin commit</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/>
<source>Cancel an uncommitted merge and lose all changes</source>
<translation>Cancelar un merge sin commit y perder todos los cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="438"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/>
<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="1053"/>
+ <source>List bookmarks</source>
+ <translation>Listar marcadores</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/>
+ <source>List bookmarks...</source>
+ <translation>Listar marcadores...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/>
+ <source>List bookmarks of the project</source>
+ <translation>Lista marcadores del proyecto</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/>
+ <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="1068"/>
- <source>List bookmarks</source>
- <translation>Listar marcadores</translation>
+ <source>Define bookmark</source>
+ <translation>Definir marcador</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/>
- <source>List bookmarks...</source>
- <translation>Listar marcadores...</translation>
+ <source>Define bookmark...</source>
+ <translation>Definir marcador...</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/>
- <source>List bookmarks of the project</source>
- <translation>Lista marcadores del proyecto</translation>
+ <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="1076"/>
- <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>
+ <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="1083"/>
- <source>Define bookmark</source>
- <translation>Definir marcador</translation>
+ <source>Delete bookmark</source>
+ <translation>Borrar marcador</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/>
- <source>Define bookmark...</source>
- <translation>Definir marcador...</translation>
+ <source>Delete bookmark...</source>
+ <translation>Borrar marcador...</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/>
- <source>Define a bookmark for the project</source>
- <translation>Define un marcador para el proyecto</translation>
+ <source>Delete a bookmark of the project</source>
+ <translation>Borrar un marcador del proyecto</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/>
- <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>
+ <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="1098"/>
- <source>Delete bookmark</source>
- <translation>Borrar marcador</translation>
+ <source>Rename bookmark</source>
+ <translation>Renombrar marcador</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/>
- <source>Delete bookmark...</source>
- <translation>Borrar marcador...</translation>
+ <source>Rename bookmark...</source>
+ <translation>Renombrar marcador...</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/>
- <source>Delete a bookmark of the project</source>
- <translation>Borrar un marcador del proyecto</translation>
+ <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="1106"/>
- <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>
+ <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="1113"/>
- <source>Rename bookmark</source>
- <translation>Renombrar marcador</translation>
+ <source>Move bookmark</source>
+ <translation>Mover marcador</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/>
- <source>Rename bookmark...</source>
- <translation>Renombrar marcador...</translation>
+ <source>Move bookmark...</source>
+ <translation>Mover marcador...</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/>
- <source>Rename a bookmark of the project</source>
- <translation>Renombrar un marcador del proyecto</translation>
+ <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="1121"/>
- <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="1128"/>
- <source>Move bookmark</source>
- <translation>Mover marcador</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/>
- <source>Move bookmark...</source>
- <translation>Mover marcador...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/>
- <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="1136"/>
<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="1144"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/>
<source>Show incoming bookmarks</source>
<translation>Mostrar marcadores entrantes</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/>
<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="1152"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1137"/>
<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="1161"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/>
<source>Pull bookmark</source>
<translation>Pull de marcador</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/>
<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="1169"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/>
<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="1193"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/>
<source>Show outgoing bookmarks</source>
<translation>Mostrar marcadores salientes</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1198"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/>
<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="1201"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186"/>
<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="1210"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1195"/>
<source>Push bookmark</source>
<translation>Push de marcador</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/>
<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="1218"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203"/>
<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="1361"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/>
<source>Bookmarks</source>
<translation>Marcadores</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1345"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/>
<source>Tags</source>
<translation>Tags</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/>
<source>Branches</source>
<translation>Branches</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/>
<source>Re-Merge</source>
<translation>Re-Merge</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/>
+ <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="447"/>
+ <source>Show conflicts</source>
+ <translation>Mostrar conflictos</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/>
+ <source>Show conflicts...</source>
+ <translation>Mostrar conflictos...</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/>
- <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="462"/>
- <source>Show conflicts</source>
- <translation>Mostrar conflictos</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/>
- <source>Show conflicts...</source>
- <translation>Mostrar conflictos...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/>
<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="469"/>
- <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="492"/>
- <source>Conflicts unresolved</source>
- <translation>Conflictos sin resolver</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/>
- <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="499"/>
- <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="1404"/>
- <source>Manage Changes</source>
- <translation>Gestionar Cambios</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/>
+ <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source>
+ <translation><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="477"/>
+ <source>Conflicts unresolved</source>
+ <translation>Conflictos sin resolver</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/>
+ <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="484"/>
+ <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="1389"/>
+ <source>Manage Changes</source>
+ <translation>Gestionar Cambios</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/>
<source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source>
<translation><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="1490"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/>
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/>
<source>Pull current bookmark</source>
<translation>Pull del marcador actual</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/>
<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="1185"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1170"/>
<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="1226"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/>
<source>Push current bookmark</source>
<translation>Push de marcador actual</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/>
<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="1234"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1219"/>
<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="1243"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/>
<source>Delete all backups</source>
<translation>Borrar todas las Copias de Seguridad</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/>
<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="1251"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/>
<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>
@@ -35679,109 +35664,104 @@
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="236"/>
<source>Incoming / Outgoing</source>
- <translation>Entrante/ Saliente</translation>
+ <translation type="obsolete">Entrante/ Saliente</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="242"/>
- <source>Select to show the incoming and outgoing log in a log browser dialog</source>
- <translation>Seleccionar para mostrar los registros entrantes y salientes en un diálogo de navegación de registros</translation>
+ <source>Select to update the working directory to new tip</source>
+ <translation>Seleccionar para actualizar el directorio de trabajo a la nueva tip</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="245"/>
<source>Use Log Browser for incoming / outgoing log</source>
- <translation>Utilizar el Navegador de Registros para mensajes de registro entrantes / salientes</translation>
+ <translation type="obsolete">Utilizar el Navegador de Registros para mensajes de registro entrantes / salientes</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="236"/>
+ <source>Pull</source>
+ <translation>Hacer Pull</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="245"/>
+ <source>Update after pulling</source>
+ <translation>Hacer update despues de hacer pull</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="334"/>
+ <source>Edit the Mercurial configuration file</source>
+ <translation>Editar el archivo de configuración de mercurial</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="337"/>
+ <source>Edit configuration file</source>
+ <translation>Editar archivo de configuración</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="311"/>
+ <source>Cleanup</source>
+ <translation>Limpiar</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="317"/>
+ <source>Pattern:</source>
+ <translation>Patrón:</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="324"/>
+ <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source>
+ <translation>Intruducir el patrón de nombres de archivo a utilizar para la limpieza (entradas separadas por un caracter de espacio)</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="252"/>
+ <source>Select to prefer unbundle over pull</source>
+ <translation>Seleccionar para preferir unbundle en lugar de pull</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="255"/>
- <source>Pull</source>
- <translation>Hacer Pull</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="261"/>
- <source>Select to update the working directory to new tip</source>
- <translation>Seleccionar para actualizar el directorio de trabajo a la nueva tip</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="264"/>
- <source>Update after pulling</source>
- <translation>Hacer update despues de hacer pull</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="353"/>
- <source>Edit the Mercurial configuration file</source>
- <translation>Editar el archivo de configuración de mercurial</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="356"/>
- <source>Edit configuration file</source>
- <translation>Editar archivo de configuración</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="330"/>
- <source>Cleanup</source>
- <translation>Limpiar</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="336"/>
- <source>Pattern:</source>
- <translation>Patrón:</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="343"/>
- <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source>
- <translation>Intruducir el patrón de nombres de archivo a utilizar para la limpieza (entradas separadas por un caracter de espacio)</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="271"/>
- <source>Select to prefer unbundle over pull</source>
- <translation>Seleccionar para preferir unbundle en lugar de pull</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="274"/>
<source><b>Prefer Unbundle</b>
<p>If this option is selected, it will be checked, if a Mercurial changegroups file from a previous "Show Incoming" request exists. In this case it will be applied and deleted. Otherwise a pull request will be sent.</p></source>
<translation><b>Preferir Unbundle</b>
<p>Si se selecciona esta opción, se comprobará si existe un archivo de changegroups de Mercurial de alguna solicitud "Show Incoming" anterior. De ser así, éste será aplicado y borrado. En cualquier otro caso, se enviará una solicitud de pull.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="278"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="259"/>
<source>Prefer Unbundle</source>
<translation>Preferir Unbundle</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="311"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="292"/>
<source>Revert</source>
<translation>Revertir</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="317"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="298"/>
<source>Select to create a backup file (.orig) before reverting changes</source>
<translation>Seleccionar para crear un archivo de backup (.orig) antes de revertir cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="320"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="301"/>
<source>Create Backup Files</source>
<translation>Crear Archivos de Backup</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="288"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="269"/>
<source>Merge</source>
<translation>Hacer merge</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="294"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="275"/>
<source>Select to enforce usage of the Mercural internal merge tool</source>
<translation>Seleccionar para forzar el uso de la herramienta interna de Mercurial de merge</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="297"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="278"/>
<source><b>Internal Merge Tool</b>
<p>Select to enforce usage of the Mercural internal merge tool,which leaves conflict markers in the file in case of conflicting changes.</p></source>
<translation><b>Herramienta Interna Merge</b>
<p>Seleccionar para forzar el uso de la herramienta interna de Mercurial de merge. Ésta deja los marcadores de conflicto en el archivo en caso de cambios conflictivos.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="301"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="282"/>
<source>Use internal merge with conflict markers</source>
<translation>Utilizar merge interno con marcadores de conflicto</translation>
</message>
@@ -44370,521 +44350,506 @@
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="99"/>
- <source>Show log</source>
- <translation>Mostrar log</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="99"/>
- <source>Show &log</source>
- <translation>Mostrar &log</translation>
+ <source>Show log browser</source>
+ <translation>Mostrar navegador de log</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/>
- <source>Show the log of the local project</source>
- <translation>Mostrar el log del proyecto local</translation>
+ <source>Show a dialog to browse the log of the local project</source>
+ <translation>Mostrar un diálogo para navegar el log del proyecto local</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="107"/>
<source><b>Show log</b><p>This shows the log of the local project.</p></source>
- <translation><b>Mostrar log</b><p>Muestra el log del proyecto local.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="114"/>
- <source>Show log browser</source>
- <translation>Mostrar navegador de log</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="119"/>
- <source>Show a dialog to browse the log of the local project</source>
- <translation>Mostrar un diálogo para navegar el log del proyecto local</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="122"/>
+ <translation type="obsolete"><b>Mostrar log</b><p>Muestra el log del proyecto local.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="107"/>
<source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source>
<translation><b>Mostrar navegador de log</b><p>Muestra un diálogo para navegar el log del proyecto local. Al principio se muestra un número limitado de entradas. Se pueden recuperar más entradas despues.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="116"/>
<source>Show differences</source>
<translation>Mostrar diferencias</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="116"/>
<source>Show &difference</source>
<translation>Mostrar &diferencia</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="121"/>
<source>Show the difference of the local project to the repository</source>
<translation>Mostrar las diferencias entre el proyecto local y el repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="139"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="124"/>
<source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source>
<translation><b>Mostrar diferencias</b><p>Muestra diferencias entre el proyecto local y el repositorio.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="132"/>
<source>Show differences (extended)</source>
<translation>Mostrar diferencias (extendido)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="137"/>
<source>Show the difference of revisions of the project to the repository</source>
<translation>Muestra la diferencia de revisiones entre el proyecto y el repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="155"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="140"/>
<source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source>
<translation><b>Mostrar diferencias (extendido)</b><p>Muestra diferencias entre revisiones seleccionables del proyecto.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="163"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="148"/>
<source>Show differences (URLs)</source>
<translation>Mostrar diferencias (URLs)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="153"/>
<source>Show the difference of the project between two repository URLs</source>
<translation>Muestra la diferencia en el proyecto entre dos URLs de repositorios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="171"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="156"/>
<source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source>
<translation><b>Mostrar diferencias (URLs)</b><p>Muestra diferencias para el proyecto entre dos URLs de repositorios.</p></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="164"/>
+ <source>Show status</source>
+ <translation>Mostrar estado</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="164"/>
+ <source>Show &status</source>
+ <translation>Mostrar e&stado</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="169"/>
+ <source>Show the status of the local project</source>
+ <translation>Mostrar el estado del proyecto local</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="172"/>
+ <source><b>Show status</b><p>This shows the status of the local project.</p></source>
+ <translation><b>Mostrar estado</b><p>Muestra el estado del proyecto local.</p></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/>
- <source>Show status</source>
- <translation>Mostrar estado</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/>
- <source>Show &status</source>
- <translation>Mostrar e&stado</translation>
+ <source>Show change lists</source>
+ <translation>Mostrar listas de cambios</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="184"/>
- <source>Show the status of the local project</source>
- <translation>Mostrar el estado del proyecto local</translation>
+ <source>Show the change lists and associated files of the local project</source>
+ <translation>Mostrar las listas de cambios y los archivos asociados del proyecto local</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="187"/>
- <source><b>Show status</b><p>This shows the status of the local project.</p></source>
- <translation><b>Mostrar estado</b><p>Muestra el estado del proyecto local.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/>
- <source>Show change lists</source>
- <translation>Mostrar listas de cambios</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="199"/>
- <source>Show the change lists and associated files of the local project</source>
- <translation>Mostrar las listas de cambios y los archivos asociados del proyecto local</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="202"/>
<source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source>
<translation><b>Mostrar listas de cambios</b><p>Muestra las listas de cambios y los archivos asociados del proyecto local.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/>
<source>Show repository info</source>
<translation>Mostrar informacion del repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="215"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="200"/>
<source>Show some repository related information for the local project</source>
<translation>Mostrar información relacionada con el repositorio para el proyecto local</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="218"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="203"/>
<source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source>
<translation><b>Mostrar información del repositorio</b><p>Muestra información relacionada con el repositorio para el proyecto local.</p></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/>
+ <source>Tag in repository</source>
+ <translation>Crear un Tag en el repositorio</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/>
+ <source>&Tag in repository...</source>
+ <translation>Crear un &Tag en el repositorio...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="216"/>
+ <source>Tag the local project in the repository</source>
+ <translation>Crear un tag del proyecto local en el repositorio</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/>
+ <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/vcsPySvn/ProjectHelper.py" line="226"/>
- <source>Tag in repository</source>
- <translation>Crear un Tag en el repositorio</translation>
+ <source>Export from repository</source>
+ <translation>Exportar desde repositorio</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/>
- <source>&Tag in repository...</source>
- <translation>Crear un &Tag en el repositorio...</translation>
+ <source>&Export from repository...</source>
+ <translation>&Exportar desde repositorio...</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="231"/>
- <source>Tag the local project in the repository</source>
- <translation>Crear un tag del proyecto local en el repositorio</translation>
+ <source>Export a project from the repository</source>
+ <translation>Exportar un proyecto desde el repositorio</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/>
- <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>
+ <source><b>Export from repository</b><p>This exports a project from the repository.</p></source>
+ <translation><b>Exportar desde repositorio</b><p>Exporta un proyecto desde el repositorio.</p></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="241"/>
- <source>Export from repository</source>
- <translation>Exportar desde repositorio</translation>
+ <source>Command options</source>
+ <translation>Opciones de comando</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="241"/>
- <source>&Export from repository...</source>
- <translation>&Exportar desde repositorio...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="246"/>
- <source>Export a project from the repository</source>
- <translation>Exportar un proyecto desde el repositorio</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/>
- <source><b>Export from repository</b><p>This exports a project from the repository.</p></source>
- <translation><b>Exportar desde repositorio</b><p>Exporta un proyecto desde el repositorio.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="256"/>
- <source>Command options</source>
- <translation>Opciones de comando</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="256"/>
<source>Command &options...</source>
<translation>&Opciones de comando...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/>
<source>Show the VCS command options</source>
<translation>Mostrar opciones de comando VCS</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/>
+ <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source>
+ <translation><b>Opciones de comando...</b><p>Muestra un diálogo para editar las opciones de comando VCS.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="254"/>
+ <source>Revert changes</source>
+ <translation>Revertir cambios</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="254"/>
+ <source>Re&vert changes</source>
+ <translation>Re&vertir cambios</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/>
+ <source>Revert all changes made to the local project</source>
+ <translation>Revertir todos los cambios hechos al proyecto local</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/>
- <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source>
- <translation><b>Opciones de comando...</b><p>Muestra un diálogo para editar las opciones de comando VCS.</p></translation>
+ <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source>
+ <translation><b>Revertir cambios</b><p>Revierte todos los cambios hechos al proyecto local.</p></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="269"/>
- <source>Revert changes</source>
- <translation>Revertir cambios</translation>
+ <source>Merge</source>
+ <translation>Hacer merge</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="269"/>
- <source>Re&vert changes</source>
- <translation>Re&vertir cambios</translation>
+ <source>Mer&ge changes...</source>
+ <translation>Hacer mer&ge de los cambios...</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/>
- <source>Revert all changes made to the local project</source>
- <translation>Revertir todos los cambios hechos al proyecto local</translation>
+ <source>Merge changes of a tag/revision into the local project</source>
+ <translation>Hacer merge de los cambios de una tag/revision al proyecto local</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/>
- <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source>
- <translation><b>Revertir cambios</b><p>Revierte todos los cambios hechos al proyecto local.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="284"/>
- <source>Merge</source>
- <translation>Hacer merge</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="284"/>
- <source>Mer&ge changes...</source>
- <translation>Hacer mer&ge de los cambios...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="289"/>
- <source>Merge changes of a tag/revision into the local project</source>
- <translation>Hacer merge de los cambios de una tag/revision al proyecto local</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="292"/>
<source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source>
<translation><b>Merge</b><p>Hace un merge de los cambios de una tag/revision al proyecto local.</p></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="285"/>
+ <source>Switch</source>
+ <translation>Hacer switch</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="285"/>
+ <source>S&witch...</source>
+ <translation>Hacer s&witch...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/>
+ <source>Switch the local copy to another tag/branch</source>
+ <translation>Hace un switch de la copia local a otra tag/branch</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/>
+ <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source>
+ <translation><b>Hacer switch</b><p>Hace un switch de la copia local a otra tag/branch.</p></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/>
- <source>Switch</source>
- <translation>Hacer switch</translation>
+ <source>Conflicts resolved</source>
+ <translation>Conflictos resueltos</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/>
- <source>S&witch...</source>
- <translation>Hacer s&witch...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="305"/>
- <source>Switch the local copy to another tag/branch</source>
- <translation>Hace un switch de la copia local a otra tag/branch</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="308"/>
- <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source>
- <translation><b>Hacer switch</b><p>Hace un switch de la copia local a otra tag/branch.</p></translation>
+ <source>Con&flicts resolved</source>
+ <translation>Con&flictos resueltos</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="304"/>
+ <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/vcsPySvn/ProjectHelper.py" line="307"/>
+ <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/vcsPySvn/ProjectHelper.py" line="315"/>
- <source>Conflicts resolved</source>
- <translation>Conflictos resueltos</translation>
+ <source>Cleanup</source>
+ <translation>Limpiar (cleanup)</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/>
- <source>Con&flicts resolved</source>
- <translation>Con&flictos resueltos</translation>
+ <source>Cleanu&p</source>
+ <translation>Lim&piar (cleanup)</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/>
- <source>Mark all conflicts of the local project as resolved</source>
- <translation>Marcar todos los conflictos del proyecto local como resueltos</translation>
+ <source>Cleanup the local project</source>
+ <translation>Limpiar (cleanup) el proyecto local</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="322"/>
- <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/vcsPySvn/ProjectHelper.py" line="330"/>
- <source>Cleanup</source>
- <translation>Limpiar (cleanup)</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="330"/>
- <source>Cleanu&p</source>
- <translation>Lim&piar (cleanup)</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="334"/>
- <source>Cleanup the local project</source>
- <translation>Limpiar (cleanup) el proyecto local</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="337"/>
<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/vcsPySvn/ProjectHelper.py" line="344"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/>
<source>Execute command</source>
<translation>Ejecutar comando</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/>
<source>E&xecute command...</source>
<translation>E&jecutar comando...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="348"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="333"/>
<source>Execute an arbitrary VCS command</source>
<translation>Ejecuta un comando VCS arbitrario</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="351"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="336"/>
<source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source>
<translation><b>Ejecutar comando</b><p>Abre un diálogo para introducir un comando VCS arbitrario.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="343"/>
<source>List tags</source>
<translation>Listar tags</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="343"/>
<source>List tags...</source>
<translation>Listar tags...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="362"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="347"/>
<source>List tags of the project</source>
<translation>Lista los tags del proyecto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="350"/>
<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/vcsPySvn/ProjectHelper.py" line="372"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/>
<source>List branches</source>
<translation>Listar branches</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="372"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/>
<source>List branches...</source>
<translation>Listar branches...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="376"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="361"/>
<source>List branches of the project</source>
<translation>Lista las branches del proyecto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="379"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="364"/>
<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/vcsPySvn/ProjectHelper.py" line="386"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/>
<source>List repository contents</source>
<translation>Listar contenido del repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/>
<source>List repository contents...</source>
<translation>Listar contenido del repositorio...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="390"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="375"/>
<source>Lists the contents of the repository</source>
<translation>Lista el contenido del repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/>
<source><b>List repository contents</b><p>This lists the contents of the repository.</p></source>
<translation><b>Listar contenido del repositorio</b><p>Lista el contenido del repositorio.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="400"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="385"/>
<source>Set Property</source>
<translation>Establecer propiedad</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="400"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="385"/>
<source>Set Property...</source>
<translation>Establecer propiedad...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="389"/>
<source>Set a property for the project files</source>
<translation>Establece una propiedad para los archivos del proyecto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="407"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="392"/>
<source><b>Set Property</b><p>This sets a property for the project files.</p></source>
<translation><b>Establecer Propiedad</b><p>Establece una propiedad para los archivos del proyecto.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="414"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/>
<source>List Properties</source>
<translation>Listar propiedades</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="414"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/>
<source>List Properties...</source>
<translation>Listar propiedades...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="403"/>
<source>List properties of the project files</source>
<translation>Listar propiedades de los archivos del proyecto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="421"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/>
<source><b>List Properties</b><p>This lists the properties of the project files.</p></source>
<translation><b>Listar Propiedades</b><p>Lista las propiedades de los archivos del proyecto.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="428"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="413"/>
<source>Delete Property</source>
<translation>Borrar propiedad</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="428"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="413"/>
<source>Delete Property...</source>
<translation>Borrar propiedad...</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/>
+ <source>Delete a property for the project files</source>
+ <translation>Borrar una propiedad de los archivos del proyecto</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="420"/>
+ <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source>
+ <translation><b>Borrar Propiedad</b><p>Borra una propiedad de los archivos del proyecto.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="427"/>
+ <source>Relocate</source>
+ <translation>Trasladar (relocate)</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="427"/>
+ <source>Relocate...</source>
+ <translation>Trasladar (relocate)...</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/>
- <source>Delete a property for the project files</source>
- <translation>Borrar una propiedad de los archivos del proyecto</translation>
+ <source>Relocate the working copy to a new repository URL</source>
+ <translation>Trasladar la copia de trabajo a una nueva URL de repositorio</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/>
- <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source>
- <translation><b>Borrar Propiedad</b><p>Borra una propiedad de los archivos del proyecto.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="442"/>
- <source>Relocate</source>
- <translation>Trasladar (relocate)</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="442"/>
- <source>Relocate...</source>
- <translation>Trasladar (relocate)...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/>
- <source>Relocate the working copy to a new repository URL</source>
- <translation>Trasladar la copia de trabajo a una nueva URL de repositorio</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="450"/>
<source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source>
<translation><b>Trasladar (relocate)</b><p>Traslada la copia de trabajo a una nueva URL de repositorio.</p></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="443"/>
+ <source>Repository Browser</source>
+ <translation>Navegador de Repositorios</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="443"/>
+ <source>Repository Browser...</source>
+ <translation>Navegador de Repositorios...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="448"/>
+ <source>Show the Repository Browser dialog</source>
+ <translation>Mostrar diálogo de Navegador de Repositorios</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="451"/>
+ <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source>
+ <translation><b>Navegador de Repositorios</b><p>Muestra el diálogo de Navegador de Repositorios.</p></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="458"/>
- <source>Repository Browser</source>
- <translation>Navegador de Repositorios</translation>
+ <source>Configure</source>
+ <translation>Configurar</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="458"/>
- <source>Repository Browser...</source>
- <translation>Navegador de Repositorios...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="463"/>
- <source>Show the Repository Browser dialog</source>
- <translation>Mostrar diálogo de Navegador de Repositorios</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="466"/>
- <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source>
- <translation><b>Navegador de Repositorios</b><p>Muestra el diálogo de Navegador de Repositorios.</p></translation>
+ <source>Configure...</source>
+ <translation>Configurar...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="462"/>
+ <source>Show the configuration dialog with the Subversion page selected</source>
+ <translation>Mostrar el diálogo de configuración con la página de Subversion seleccionada</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="465"/>
+ <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source>
+ <translation><b>Configurar</b><p>Mostrar el diálogo de configuración con la página de Subversion seleccionada.</p></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="473"/>
- <source>Configure</source>
- <translation>Configurar</translation>
+ <source>Upgrade</source>
+ <translation>Actualizar versión</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="473"/>
- <source>Configure...</source>
- <translation>Configurar...</translation>
+ <source>Upgrade...</source>
+ <translation>Actualizar versión...</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="477"/>
- <source>Show the configuration dialog with the Subversion page selected</source>
- <translation>Mostrar el diálogo de configuración con la página de Subversion seleccionada</translation>
+ <source>Upgrade the working copy to the current format</source>
+ <translation>Actualizar la copia de trabajo al formato actual</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="480"/>
- <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source>
- <translation><b>Configurar</b><p>Mostrar el diálogo de configuración con la página de Subversion seleccionada.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="488"/>
- <source>Upgrade</source>
- <translation>Actualizar versión</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="488"/>
- <source>Upgrade...</source>
- <translation>Actualizar versión...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="492"/>
- <source>Upgrade the working copy to the current format</source>
- <translation>Actualizar la copia de trabajo al formato actual</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="495"/>
<source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source>
<translation><b>Actualizar versión</b><p>Actualiza la versión de la copia de trabajo al formato actual.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="575"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="559"/>
<source>Subversion (pysvn)</source>
<translation>Subversion (pysvn)</translation>
</message>
@@ -52466,7 +52431,7 @@
<context>
<name>Subversion</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1984"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1964"/>
<source>The svn process did not finish within 30s.</source>
<translation>El proceso svn no terminó en un plazo de 30s.</translation>
</message>
@@ -52551,117 +52516,117 @@
<translation>Eliminando archivos/directorios del repositorio Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1120"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1100"/>
<source>Subversion Error</source>
<translation>Error de Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="971"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="951"/>
<source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source>
<translation>La URL del repositorio del proyecto no ha podido recuperarse de la copia de trabajo. La operación tag se abortará</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="998"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="978"/>
<source>The URL of the project repository has an invalid format. The tag operation will be aborted</source>
<translation>La URL del repositorio del proyecto tiene un formato no válido. La operación tag se abortará</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1076"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1056"/>
<source>Reverting changes</source>
<translation>Revirtiendo cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1093"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1073"/>
<source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source>
<translation>La URL del repositorio del proyecto no ha podido recuperarse de la copia de trabajo. La operación switch se abortará</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1120"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1100"/>
<source>The URL of the project repository has an invalid format. The switch operation will be aborted</source>
<translation>La URL del repositorio del proyecto tiene un formato no válido. La operación switch se abortará</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1512"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1492"/>
<source>Subversion command</source>
<translation>Comando de Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1684"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1664"/>
<source>Resolving conficts</source>
<translation>Resolviendo conflictos</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1779"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1759"/>
<source>Subversion Set Property</source>
<translation>Asignar Propiedad de Subversion</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1781"/>
+ <source>You have to supply a property name. Aborting.</source>
+ <translation>Tiene que proporcionar un nombre de propiedad. Abortando.</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1801"/>
- <source>You have to supply a property name. Aborting.</source>
- <translation>Tiene que proporcionar un nombre de propiedad. Abortando.</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1821"/>
<source>Subversion Delete Property</source>
<translation>Borrar Propiedad de Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1791"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1771"/>
<source>Enter property name</source>
<translation>Introducir nombre de la propiedad</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="900"/>
<source>Subversion Log</source>
- <translation>Log de Subversion</translation>
+ <translation type="obsolete">Log de Subversion</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="900"/>
<source>Select number of entries to show.</source>
- <translation>Seleccionar número de entradas a mostrar.</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2100"/>
+ <translation type="obsolete">Seleccionar número de entradas a mostrar.</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2080"/>
<source>Locking in the Subversion repository</source>
<translation>Bloqueando en el repositorio Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2128"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2108"/>
<source>Unlocking in the Subversion repository</source>
<translation>Desbloqueando en el repositorio Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1944"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1923"/>
<source>Property set.</source>
<translation>Propiedad establecida.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1997"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1976"/>
<source>Property deleted.</source>
<translation>Propiedad borrada.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2268"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2247"/>
<source>Subversion Lock</source>
<translation>Bloqueo de Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2268"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2247"/>
<source>Enter lock comment</source>
<translation>Introducir comentario para el bloqueo</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2153"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2133"/>
<source>Relocating</source>
<translation>Realojando</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2170"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2150"/>
<source>Repository Browser</source>
<translation>Navegador de Repositorios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2170"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2150"/>
<source>Enter the repository URL.</source>
<translation>Introducir la URL del repositorio.</translation>
</message>
@@ -52816,17 +52781,17 @@
<translation>Sin versionar</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2241"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2221"/>
<source>Remove from changelist</source>
<translation>Quitar de la lista de cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2220"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2200"/>
<source>Add to changelist</source>
<translation>Añadir a la lista de cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2220"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2200"/>
<source>Enter name of the changelist:</source>
<translation>Introduzca el nombre de la lista de cambios:</translation>
</message>
@@ -52856,27 +52821,27 @@
<translation>Moviendo {0}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1033"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1013"/>
<source>Tagging {0} in the Subversion repository</source>
<translation>Haciendo un tag {0} en el repositorio Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1151"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1131"/>
<source>Switching to {0}</source>
<translation>Haciendo un switch a {0}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1216"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1196"/>
<source>Merging {0}</source>
<translation>Haciendo un merge de {0}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1482"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1462"/>
<source>Cleaning up {0}</source>
<translation>Limpiando {0}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1715"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1695"/>
<source>Copying {0}</source>
<translation>Copiando {0}</translation>
</message>
@@ -52892,7 +52857,7 @@
<translation>Commit realizado para revisión {0}.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1255"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1234"/>
<source>Revision {0}.
</source>
<translation>Revisión {0}.</translation>
@@ -52908,37 +52873,37 @@
<translation>La operación de commit afecta a archivos que tienen cambios sin guardar. ¿Continuar con la operación de commit?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1070"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1050"/>
<source>Revert changes</source>
<translation>Revertir cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1062"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1042"/>
<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/vcsSubversion/subversion.py" line="1070"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1050"/>
<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/vcsSubversion/subversion.py" line="1987"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1967"/>
<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/vcsSubversion/subversion.py" line="2048"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2028"/>
<source>Subversion Side-by-Side Difference</source>
<translation>Diferencia Lado a Lado Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2048"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2028"/>
<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/vcsSubversion/subversion.py" line="2305"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2285"/>
<source>Upgrade</source>
<translation>Actualizar versión</translation>
</message>
@@ -54071,61 +54036,61 @@
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="55"/>
<source><b>Processing your request, please wait...</b></source>
- <translation><b>Procesando la solicitud, por favor aguarde...</b></translation>
+ <translation type="obsolete"><b>Procesando la solicitud, por favor aguarde...</b></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="81"/>
<source>Added</source>
- <translation>Añadido</translation>
+ <translation type="obsolete">Añadido</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="82"/>
<source>Deleted</source>
- <translation>Borrado</translation>
+ <translation type="obsolete">Borrado</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="83"/>
<source>Modified</source>
- <translation>Modificado</translation>
+ <translation type="obsolete">Modificado</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="87"/>
<source>revision</source>
- <translation>Revisión</translation>
+ <translation type="obsolete">Revisión</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="142"/>
<source>Process Generation Error</source>
- <translation>Error de Generación de Proceso</translation>
+ <translation type="obsolete">Error de Generación de Proceso</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="142"/>
<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>
+ <translation type="obsolete">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/vcsSubversion/SvnLogDialog.py" line="193"/>
<source>diff to {0}</source>
- <translation>diff con {0}</translation>
+ <translation type="obsolete">diff con {0}</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="202"/>
<source><i>author: {0}</i><br />
</source>
- <translation><i>autor: {0}</i><br />
+ <translation type="obsolete"><i>autor: {0}</i><br />
</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="205"/>
<source><i>date: {0}</i><br />
</source>
- <translation><i>Fecha: {0}</i><br />
+ <translation type="obsolete"><i>Fecha: {0}</i><br />
</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="191"/>
<source> (copied from {0}, revision {1})</source>
- <translation> (copiado de {0}, revisión {1})</translation>
+ <translation type="obsolete"> (copiado de {0}, revisión {1})</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="42"/>
@@ -54426,177 +54391,177 @@
<context>
<name>SvnProjectBrowserHelper</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="642"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="634"/>
<source>Version Control</source>
<translation>Control de Versiones</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="654"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="646"/>
<source>Update from repository</source>
<translation>Hacer update desde repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="658"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="650"/>
<source>Commit changes to repository...</source>
<translation>Hacer commit de los cambios al repositorio...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="664"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="656"/>
<source>Add to repository</source>
<translation>Añadir al repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="385"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="381"/>
<source>Add tree to repository</source>
<translation>Añadir árbol al repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="668"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="660"/>
<source>Remove from repository (and disk)</source>
<translation>Eliminar del repositorio (y del disco)</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="566"/>
<source>Show log</source>
- <translation>Mostrar log</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="684"/>
+ <translation type="obsolete">Mostrar log</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="676"/>
<source>Show status</source>
<translation>Mostrar estado</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="290"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="286"/>
<source>Show annotated file</source>
<translation>Mostrar archivo anotado</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="704"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="696"/>
<source>Revert changes</source>
<translation>Revertir cambios</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="700"/>
+ <source>Merge changes</source>
+ <translation>Hacer merge de los cambios</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="430"/>
+ <source>Lock</source>
+ <translation>Bloquear</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="434"/>
+ <source>Unlock</source>
+ <translation>Desbloquear</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="438"/>
+ <source>Break Lock</source>
+ <translation>Romper bloqueo</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="442"/>
+ <source>Steal Lock</source>
+ <translation>Robar bloqueo</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="708"/>
- <source>Merge changes</source>
- <translation>Hacer merge de los cambios</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="434"/>
- <source>Lock</source>
- <translation>Bloquear</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="438"/>
- <source>Unlock</source>
- <translation>Desbloquear</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="442"/>
- <source>Break Lock</source>
- <translation>Romper bloqueo</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="446"/>
- <source>Steal Lock</source>
- <translation>Robar bloqueo</translation>
+ <source>Set Property</source>
+ <translation>Establecer propiedad</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="710"/>
+ <source>List Properties</source>
+ <translation>Listar propiedades</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="713"/>
+ <source>Delete Property</source>
+ <translation>Borrar propiedad</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="716"/>
- <source>Set Property</source>
- <translation>Establecer propiedad</translation>
+ <source>Select all local file entries</source>
+ <translation>Seleccionar todas las entradas de archivo locales</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="718"/>
- <source>List Properties</source>
- <translation>Listar propiedades</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="721"/>
- <source>Delete Property</source>
- <translation>Borrar propiedad</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="724"/>
- <source>Select all local file entries</source>
- <translation>Seleccionar todas las entradas de archivo locales</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="726"/>
<source>Select all versioned file entries</source>
<translation>Seleccionar todas las entradas de archivo versionadas</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="728"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="720"/>
<source>Select all local directory entries</source>
<translation>Seleccionar todas las entradas de directorio locales</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="730"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="722"/>
<source>Select all versioned directory entries</source>
<translation>Seleccionar todas las entradas de directorio versionadas</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="580"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="572"/>
<source>Show repository info</source>
<translation>Mostrar informacion del repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="570"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="562"/>
<source>Show log browser</source>
<translation>Mostrar navegador de log</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="733"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="725"/>
<source>Configure...</source>
<translation>Configurar...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="675"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="667"/>
<source>Add to Changelist</source>
<translation>Añadir a la lista de cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="679"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="671"/>
<source>Remove from Changelist</source>
<translation>Quitar de la lista de cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="551"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="547"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="553"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="549"/>
<source>Move</source>
<translation>Mover</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="689"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="681"/>
<source>Show differences</source>
<translation>Mostrar diferencias</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="271"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="267"/>
<source>Show differences side-by-side</source>
<translation>Mostrar diferencias lado a lado</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="693"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="685"/>
<source>Show differences (extended)</source>
<translation>Mostrar diferencias (extendido)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="280"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="276"/>
<source>Show differences side-by-side (extended)</source>
<translation>Mostrar diferencias lado a lado (extendido)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="698"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="690"/>
<source>Show differences (URLs)</source>
<translation>Mostrar diferencias (URLs)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="712"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="704"/>
<source>Conflicts resolved</source>
<translation>Conflictos resueltos</translation>
</message>
@@ -54665,506 +54630,491 @@
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="99"/>
- <source>Show log</source>
- <translation>Mostrar log</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="99"/>
- <source>Show &log</source>
- <translation>Mostrar &log</translation>
+ <source>Show log browser</source>
+ <translation>Mostrar navegador de log</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="104"/>
- <source>Show the log of the local project</source>
- <translation>Mostrar el log del proyecto local</translation>
+ <source>Show a dialog to browse the log of the local project</source>
+ <translation>Mostrar un diálogo para navegar el log del proyecto local</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="107"/>
<source><b>Show log</b><p>This shows the log of the local project.</p></source>
- <translation><b>Mostrar log</b><p>Muestra el log del proyecto local.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="131"/>
+ <translation type="obsolete"><b>Mostrar log</b><p>Muestra el log del proyecto local.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="116"/>
<source>Show &difference</source>
<translation>Mostrar &diferencia</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="136"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="121"/>
<source>Show the difference of the local project to the repository</source>
<translation>Muestra las diferencias entre el proyecto local y el repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="152"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="137"/>
<source>Show the difference of revisions of the project to the repository</source>
<translation>Muestra la diferencia de revisiones entre el proyecto local y el repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="168"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="153"/>
<source>Show the difference of the project between two repository URLs</source>
<translation>Muestra la diferencia de revisiones entre dos URLs de repositorios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="164"/>
<source>Show status</source>
<translation>Mostrar estado</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="164"/>
<source>Show &status</source>
<translation>Mostrar e&stado</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="184"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="169"/>
<source>Show the status of the local project</source>
<translation>Mostrar el estado del proyecto local</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="187"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="172"/>
<source><b>Show status</b><p>This shows the status of the local project.</p></source>
<translation><b>Mostrar estado</b><p>Muestra el estado del proyecto local.</p></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="195"/>
+ <source>Tag in repository</source>
+ <translation>Crear un Tag en el repositorio</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="195"/>
+ <source>&Tag in repository...</source>
+ <translation>Crear un &Tag en el repositorio...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="200"/>
+ <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/vcsSubversion/ProjectHelper.py" line="203"/>
+ <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/vcsSubversion/ProjectHelper.py" line="210"/>
- <source>Tag in repository</source>
- <translation>Crear un Tag en el repositorio</translation>
+ <source>Export from repository</source>
+ <translation>Exportar desde repositorio</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="210"/>
- <source>&Tag in repository...</source>
- <translation>Crear un &Tag en el repositorio...</translation>
+ <source>&Export from repository...</source>
+ <translation>&Exportar desde repositorio...</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="215"/>
- <source>Tag the local project in the repository</source>
- <translation>Crea un tag del proyecto local en el repositorio</translation>
+ <source>Export a project from the repository</source>
+ <translation>Exportar un proyecto desde el repositorio</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="218"/>
- <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>
+ <source><b>Export from repository</b><p>This exports a project from the repository.</p></source>
+ <translation><b>Exportar desde repositorio</b><p>Exporta un proyecto desde el repositorio.</p></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="225"/>
- <source>Export from repository</source>
- <translation>Exportar desde repositorio</translation>
+ <source>Command options</source>
+ <translation>Opciones de comando</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="225"/>
- <source>&Export from repository...</source>
- <translation>&Exportar desde repositorio...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="230"/>
- <source>Export a project from the repository</source>
- <translation>Exportar un proyecto desde el repositorio</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="233"/>
- <source><b>Export from repository</b><p>This exports a project from the repository.</p></source>
- <translation><b>Exportar desde repositorio</b><p>Exporta un proyecto desde el repositorio.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="240"/>
- <source>Command options</source>
- <translation>Opciones de comando</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="240"/>
<source>Command &options...</source>
<translation>&Opciones de comando...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="244"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="229"/>
<source>Show the VCS command options</source>
<translation>Mostrar opciones de comando VCS</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="231"/>
+ <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source>
+ <translation><b>Opciones de comando...</b><p>Muestra un diálogo para editar las opciones de comando VCS.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="238"/>
+ <source>Revert changes</source>
+ <translation>Revertir cambios</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="238"/>
+ <source>Re&vert changes</source>
+ <translation>Re&vertir cambios</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="243"/>
+ <source>Revert all changes made to the local project</source>
+ <translation>Revertir todos los cambios hechos al proyecto local</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="246"/>
- <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source>
- <translation><b>Opciones de comando...</b><p>Muestra un diálogo para editar las opciones de comando VCS.</p></translation>
+ <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source>
+ <translation><b>Revertir cambios</b><p>Revierte todos los cambios hechos al proyecto local.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="253"/>
+ <source>Merge</source>
+ <translation>Hacer merge</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="253"/>
- <source>Revert changes</source>
- <translation>Revertir cambios</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="253"/>
- <source>Re&vert changes</source>
- <translation>Re&vertir cambios</translation>
+ <source>Mer&ge changes...</source>
+ <translation>Hacer mer&ge de los cambios...</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="258"/>
- <source>Revert all changes made to the local project</source>
- <translation>Revertir todos los cambios hechos al proyecto local</translation>
+ <source>Merge changes of a tag/revision into the local project</source>
+ <translation>Hacer merge de los cambios de una tag/revision en el proyecto local</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="261"/>
- <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source>
- <translation><b>Revertir cambios</b><p>Revierte todos los cambios hechos al proyecto local.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="268"/>
- <source>Merge</source>
- <translation>Hacer merge</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="268"/>
- <source>Mer&ge changes...</source>
- <translation>Hacer mer&ge de los cambios...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="273"/>
- <source>Merge changes of a tag/revision into the local project</source>
- <translation>Hacer merge de los cambios de una tag/revision en el proyecto local</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="276"/>
<source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source>
<translation><b>Merge</b><p>Hace un merge de los cambios de una tag/revision al proyecto local.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="269"/>
<source>Switch</source>
<translation>Hacer switch</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="269"/>
+ <source>S&witch...</source>
+ <translation>Hacer s&witch...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="274"/>
+ <source>Switch the local copy to another tag/branch</source>
+ <translation>Hace un switch de la copia local a otra tag/branch</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="277"/>
+ <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source>
+ <translation><b>Hacer switch</b><p>Hace un switch de la copia local a otra tag/branch.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/>
+ <source>Cleanup</source>
+ <translation>Limpiar (cleanup)</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/>
+ <source>Cleanu&p</source>
+ <translation>Lim&piar (cleanup)</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="303"/>
+ <source>Cleanup the local project</source>
+ <translation>Hacer limpieza (cleanup) del proyecto local</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="306"/>
+ <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source>
+ <translation><b>Limpieza (cleanup)</b><p>Ejecuta un cleanup del proyecto local.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="313"/>
+ <source>Execute command</source>
+ <translation>Ejecutar comando</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="313"/>
+ <source>E&xecute command...</source>
+ <translation>E&jecutar comando...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="317"/>
+ <source>Execute an arbitrary VCS command</source>
+ <translation>Ejecuta un comando VCS arbitrario</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="320"/>
+ <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source>
+ <translation><b>Ejecutar comando</b><p>Abre un diálogo para introducir un comando VCS arbitrario.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="327"/>
+ <source>List tags</source>
+ <translation>Listar tags</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="327"/>
+ <source>List tags...</source>
+ <translation>Listar tags...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="331"/>
+ <source>List tags of the project</source>
+ <translation>Lista los tags del proyecto</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="334"/>
+ <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/vcsSubversion/ProjectHelper.py" line="341"/>
+ <source>List branches</source>
+ <translation>Listar branches</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="341"/>
+ <source>List branches...</source>
+ <translation>Listar branches...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="345"/>
+ <source>List branches of the project</source>
+ <translation>Lista las branches del proyecto</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="348"/>
+ <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/vcsSubversion/ProjectHelper.py" line="355"/>
+ <source>List repository contents</source>
+ <translation>Listar contenido del repositorio</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="355"/>
+ <source>List repository contents...</source>
+ <translation>Listar contenido del repositorio...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="359"/>
+ <source>Lists the contents of the repository</source>
+ <translation>Lista el contenido del repositorio</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="362"/>
+ <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source>
+ <translation><b>Listar contenido del repositorio</b><p>Lista el contenido del repositorio.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="369"/>
+ <source>Set Property</source>
+ <translation>Establecer propiedad</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="369"/>
+ <source>Set Property...</source>
+ <translation>Establecer propiedad...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="373"/>
+ <source>Set a property for the project files</source>
+ <translation>Establece una propiedad para los archivos del proyecto</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="376"/>
+ <source><b>Set Property</b><p>This sets a property for the project files.</p></source>
+ <translation><b>Establecer Propiedad</b><p>Establece una propiedad para los archivos del proyecto.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="383"/>
+ <source>List Properties</source>
+ <translation>Listar propiedades</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="383"/>
+ <source>List Properties...</source>
+ <translation>Listar propiedades...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="387"/>
+ <source>List properties of the project files</source>
+ <translation>Listar propiedades de los archivos del proyecto</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="390"/>
+ <source><b>List Properties</b><p>This lists the properties of the project files.</p></source>
+ <translation><b>Listar Propiedades</b><p>Lista las propiedades de los archivos del proyecto.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="397"/>
+ <source>Delete Property</source>
+ <translation>Borrar propiedad</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="397"/>
+ <source>Delete Property...</source>
+ <translation>Borrar propiedad...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="401"/>
+ <source>Delete a property for the project files</source>
+ <translation>Borrar una propiedad de los archivos del proyecto</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="404"/>
+ <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source>
+ <translation><b>Borrar Propiedad</b><p>Borra una propiedad de los archivos del proyecto.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="411"/>
+ <source>Relocate</source>
+ <translation>Trasladar (relocate)</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="411"/>
+ <source>Relocate...</source>
+ <translation>Trasladar (relocate)...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="416"/>
+ <source>Relocate the working copy to a new repository URL</source>
+ <translation>Trasladar la copia de trabajo a una nueva URL de repositorio</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="419"/>
+ <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source>
+ <translation><b>Trasladar (relocate)</b><p>Traslada la copia de trabajo a una nueva URL de repositorio.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="427"/>
+ <source>Repository Browser</source>
+ <translation>Navegador de Repositorios</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="427"/>
+ <source>Repository Browser...</source>
+ <translation>Navegador de Repositorios...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="432"/>
+ <source>Show the Repository Browser dialog</source>
+ <translation>Mostrar diálogo de Navegador de Repositorios</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="435"/>
+ <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source>
+ <translation><b>Navegador de Repositorios</b><p>Muestra el diálogo de Navegador de Repositorios.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="107"/>
+ <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source>
+ <translation><b>Mostrar navegador de log</b><p>Muestra un diálogo para navegar el log del proyecto local. Al principio se muestra un número limitado de entradas. Se pueden recuperar más entradas despues.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/>
+ <source>Configure</source>
+ <translation>Configurar</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/>
+ <source>Configure...</source>
+ <translation>Configurar...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="446"/>
+ <source>Show the configuration dialog with the Subversion page selected</source>
+ <translation>Mostrar el diálogo de configuración con la página de Subversion seleccionada</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="449"/>
+ <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source>
+ <translation><b>Configurar</b><p>Mostrar el diálogo de configuración con la página de Subversion seleccionada.</p></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/>
- <source>S&witch...</source>
- <translation>Hacer s&witch...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="289"/>
- <source>Switch the local copy to another tag/branch</source>
- <translation>Hace un switch de la copia local a otra tag/branch</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="292"/>
- <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source>
- <translation><b>Hacer switch</b><p>Hace un switch de la copia local a otra tag/branch.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="314"/>
- <source>Cleanup</source>
- <translation>Limpiar (cleanup)</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="314"/>
- <source>Cleanu&p</source>
- <translation>Lim&piar (cleanup)</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="318"/>
- <source>Cleanup the local project</source>
- <translation>Hacer limpieza (cleanup) del proyecto local</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="321"/>
- <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source>
- <translation><b>Limpieza (cleanup)</b><p>Ejecuta un cleanup del proyecto local.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="328"/>
- <source>Execute command</source>
- <translation>Ejecutar comando</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="328"/>
- <source>E&xecute command...</source>
- <translation>E&jecutar comando...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="332"/>
- <source>Execute an arbitrary VCS command</source>
- <translation>Ejecuta un comando VCS arbitrario</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="335"/>
- <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source>
- <translation><b>Ejecutar comando</b><p>Abre un diálogo para introducir un comando VCS arbitrario.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="342"/>
- <source>List tags</source>
- <translation>Listar tags</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="342"/>
- <source>List tags...</source>
- <translation>Listar tags...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="346"/>
- <source>List tags of the project</source>
- <translation>Lista los tags del proyecto</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="349"/>
- <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/vcsSubversion/ProjectHelper.py" line="356"/>
- <source>List branches</source>
- <translation>Listar branches</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="356"/>
- <source>List branches...</source>
- <translation>Listar branches...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="360"/>
- <source>List branches of the project</source>
- <translation>Lista las branches del proyecto</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="363"/>
- <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/vcsSubversion/ProjectHelper.py" line="370"/>
- <source>List repository contents</source>
- <translation>Listar contenido del repositorio</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="370"/>
- <source>List repository contents...</source>
- <translation>Listar contenido del repositorio...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="374"/>
- <source>Lists the contents of the repository</source>
- <translation>Lista el contenido del repositorio</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="377"/>
- <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source>
- <translation><b>Listar contenido del repositorio</b><p>Lista el contenido del repositorio.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="384"/>
- <source>Set Property</source>
- <translation>Establecer propiedad</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="384"/>
- <source>Set Property...</source>
- <translation>Establecer propiedad...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="388"/>
- <source>Set a property for the project files</source>
- <translation>Establece una propiedad para los archivos del proyecto</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="391"/>
- <source><b>Set Property</b><p>This sets a property for the project files.</p></source>
- <translation><b>Establecer Propiedad</b><p>Establece una propiedad para los archivos del proyecto.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="398"/>
- <source>List Properties</source>
- <translation>Listar propiedades</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="398"/>
- <source>List Properties...</source>
- <translation>Listar propiedades...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="402"/>
- <source>List properties of the project files</source>
- <translation>Listar propiedades de los archivos del proyecto</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="405"/>
- <source><b>List Properties</b><p>This lists the properties of the project files.</p></source>
- <translation><b>Listar Propiedades</b><p>Lista las propiedades de los archivos del proyecto.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="412"/>
- <source>Delete Property</source>
- <translation>Borrar propiedad</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="412"/>
- <source>Delete Property...</source>
- <translation>Borrar propiedad...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="416"/>
- <source>Delete a property for the project files</source>
- <translation>Borrar una propiedad de los archivos del proyecto</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="419"/>
- <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source>
- <translation><b>Borrar Propiedad</b><p>Borra una propiedad de los archivos del proyecto.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="426"/>
- <source>Relocate</source>
- <translation>Trasladar (relocate)</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="426"/>
- <source>Relocate...</source>
- <translation>Trasladar (relocate)...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="431"/>
- <source>Relocate the working copy to a new repository URL</source>
- <translation>Trasladar la copia de trabajo a una nueva URL de repositorio</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="434"/>
- <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source>
- <translation><b>Trasladar (relocate)</b><p>Traslada la copia de trabajo a una nueva URL de repositorio.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/>
- <source>Repository Browser</source>
- <translation>Navegador de Repositorios</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/>
- <source>Repository Browser...</source>
- <translation>Navegador de Repositorios...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="447"/>
- <source>Show the Repository Browser dialog</source>
- <translation>Mostrar diálogo de Navegador de Repositorios</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="450"/>
- <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source>
- <translation><b>Navegador de Repositorios</b><p>Muestra el diálogo de Navegador de Repositorios.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="114"/>
- <source>Show log browser</source>
- <translation>Mostrar navegador de log</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="119"/>
- <source>Show a dialog to browse the log of the local project</source>
- <translation>Mostrar un diálogo para navegar el log del proyecto local</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="122"/>
- <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source>
- <translation><b>Mostrar navegador de log</b><p>Muestra un diálogo para navegar el log del proyecto local. Al principio se muestra un número limitado de entradas. Se pueden recuperar más entradas despues.</p></translation>
+ <source>Conflicts resolved</source>
+ <translation>Conflictos resueltos</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/>
+ <source>Con&flicts resolved</source>
+ <translation>Con&flictos resueltos</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="288"/>
+ <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/vcsSubversion/ProjectHelper.py" line="291"/>
+ <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/vcsSubversion/ProjectHelper.py" line="179"/>
+ <source>Show change lists</source>
+ <translation>Mostrar listas de cambios</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="184"/>
+ <source>Show the change lists and associated files of the local project</source>
+ <translation>Mostrar las listas de cambios y los archivos asociados del proyecto local</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="187"/>
+ <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source>
+ <translation><b>Mostrar listas de cambios</b><p>Muestra las listas de cambios y los archivos asociados del proyecto local.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/>
+ <source>Upgrade</source>
+ <translation>Actualizar versión</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/>
- <source>Configure</source>
- <translation>Configurar</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/>
- <source>Configure...</source>
- <translation>Configurar...</translation>
+ <source>Upgrade...</source>
+ <translation>Actualizar versión...</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="461"/>
- <source>Show the configuration dialog with the Subversion page selected</source>
- <translation>Mostrar el diálogo de configuración con la página de Subversion seleccionada</translation>
+ <source>Upgrade the working copy to the current format</source>
+ <translation>Actualizar la copia de trabajo al formato actual</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="464"/>
- <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source>
- <translation><b>Configurar</b><p>Mostrar el diálogo de configuración con la página de Subversion seleccionada.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/>
- <source>Conflicts resolved</source>
- <translation>Conflictos resueltos</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/>
- <source>Con&flicts resolved</source>
- <translation>Con&flictos resueltos</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="303"/>
- <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/vcsSubversion/ProjectHelper.py" line="306"/>
- <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/vcsSubversion/ProjectHelper.py" line="194"/>
- <source>Show change lists</source>
- <translation>Mostrar listas de cambios</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="199"/>
- <source>Show the change lists and associated files of the local project</source>
- <translation>Mostrar las listas de cambios y los archivos asociados del proyecto local</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="202"/>
- <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source>
- <translation><b>Mostrar listas de cambios</b><p>Muestra las listas de cambios y los archivos asociados del proyecto local.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="472"/>
- <source>Upgrade</source>
- <translation>Actualizar versión</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="472"/>
- <source>Upgrade...</source>
- <translation>Actualizar versión...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="476"/>
- <source>Upgrade the working copy to the current format</source>
- <translation>Actualizar la copia de trabajo al formato actual</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="479"/>
<source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source>
<translation><b>Actualizar versión</b><p>Actualiza la versión de la copia de trabajo al formato actual.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="131"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="116"/>
<source>Show differences</source>
<translation>Mostrar diferencias</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="147"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="132"/>
<source>Show differences (extended)</source>
<translation>Mostrar diferencias (extendido)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="163"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="148"/>
<source>Show differences (URLs)</source>
<translation>Mostrar diferencias (URLs)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="139"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="124"/>
<source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source>
<translation><b>Mostrar diferencias</b><p>Muestra diferencias entre el proyecto local y el repositorio.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="155"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="140"/>
<source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source>
<translation><b>Mostrar difefencias (extendido)</b><p>Muestra diferencias entre revisiones seleccionables del proyecto.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="171"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="156"/>
<source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source>
<translation><b>Mostrar diferencias (URLs)</b><p>Muestra diferencias para el proyecto entre dos URLs de repositorios.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="559"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="543"/>
<source>Subversion (svn)</source>
<translation>Subversion (svn)</translation>
</message>
@@ -64580,7 +64530,7 @@
<translation>Actualizar</translation>
</message>
<message>
- <location filename="../VCS/ProjectHelper.py" line="532"/>
+ <location filename="../VCS/ProjectHelper.py" line="533"/>
<source>The project should be reread. Do this now?</source>
<translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation>
</message>
@@ -64595,7 +64545,7 @@
<translation>El proyecto recuperado del repositorio no contiene un archivo de proyecto de eric (*.e4p). ¿Desea crearlo?</translation>
</message>
<message>
- <location filename="../VCS/ProjectHelper.py" line="532"/>
+ <location filename="../VCS/ProjectHelper.py" line="533"/>
<source>Switch</source>
<translation>Hacer switch</translation>
</message>
@@ -64675,17 +64625,17 @@
<context>
<name>VersionControl</name>
<message>
- <location filename="../VCS/VersionControl.py" line="573"/>
+ <location filename="../VCS/VersionControl.py" line="563"/>
<source>Process Generation Error</source>
<translation>Error de Generación de Proceso</translation>
</message>
<message>
- <location filename="../VCS/VersionControl.py" line="704"/>
+ <location filename="../VCS/VersionControl.py" line="694"/>
<source>Repository status checking is switched off</source>
<translation>El chequeo de estado del repositorio está deshabilitado</translation>
</message>
<message>
- <location filename="../VCS/VersionControl.py" line="573"/>
+ <location filename="../VCS/VersionControl.py" line="563"/>
<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>
@@ -71915,17 +71865,17 @@
<context>
<name>mercurial</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/>
<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="2151"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2106"/>
<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="2160"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115"/>
<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>
@@ -71936,31 +71886,31 @@
</table></p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2133"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/>
<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="2136"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/>
<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="2156"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2111"/>
<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="1459"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1426"/>
<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="1479"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1446"/>
<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>
@@ -71969,12 +71919,12 @@
<tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2146"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2101"/>
<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="1517"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1484"/>
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
@@ -71991,14 +71941,14 @@
</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2078"/>
<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="2128"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2083"/>
<source><tr><td><b>Parent #{0}</b></td><td></td></tr>
</source>
<translation><tr><td><b>Parent #{0}</b></td><td></td></tr>
@@ -72544,17 +72494,17 @@
<context>
<name>subversion</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1741"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1720"/>
<source>unknown</source>
<translation>desconocido</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1606"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1586"/>
<source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source>
<translation><h3>Información del repositorio</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Revisión actual</b></td><td>{2}</td></tr><tr><td><b>Revisión enviada</b></td><td>{3}</td></tr><tr><td><b>Fecha de envío</b></td><td>{4}</td></tr><tr><td><b>Hora de envío</b></td><td>{5}</td></tr><tr><td><b>Último autor</b></td><td>{6}</td></tr></table></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1746"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1725"/>
<source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source>
<translation><h3>Information del repositorio</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Revisión enviada</b></td><td>{5}</td></tr><tr><td><b>Fecha de envío</b></td><td>{6}</td></tr><tr><td><b>Hora de envio</b></td><td>{7}</td></tr><tr><td><b>Último autor</b></td><td>{8}</td></tr></table></translation>
</message>
