--- a/i18n/eric5_es.ts Mon Aug 05 13:17:51 2013 +0200
+++ b/i18n/eric5_es.ts Mon Aug 05 15:58:30 2013 +0200
@@ -17957,352 +17957,352 @@
<context>
<name>Hg</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="228"/>
<source>The hg process finished with the exit code {0}</source>
<translation>El proceso hg ha terminado con código de salida {0}</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1673"/>
+ <source>The hg process did not finish within 30s.</source>
+ <translation>El proceso hg no terminó en un plazo de 30s.</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="233"/>
+ <source>Could not start the hg executable.</source>
+ <translation>No se ha podido iniciar el ejecutable de hg.</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="259"/>
+ <source>Create project repository</source>
+ <translation>Crear repositorio del proyecto</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="259"/>
+ <source>The project repository could not be created.</source>
+ <translation>No se ha podido crear el repositorio del proyecto.</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="287"/>
+ <source>Creating Mercurial repository</source>
+ <translation>Creando repositorio Mercurial</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="304"/>
+ <source>Initial commit to Mercurial repository</source>
+ <translation>Commit inicial al repositorio Mercurial</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="350"/>
+ <source>Cloning project from a Mercurial repository</source>
+ <translation>Clonando proyecto desde un repositorio Mercurial</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="558"/>
+ <source>Synchronizing with the Mercurial repository</source>
+ <translation>Sincronizando con el repositorio Mercurial</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="610"/>
+ <source>Adding files/directories to the Mercurial repository</source>
+ <translation>Añadiendo archivos/directorios al repositorio Mercurial</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="674"/>
+ <source>Removing files/directories from the Mercurial repository</source>
+ <translation>Eliminando archivos/directorios del repositorio Mercurial</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="739"/>
+ <source>Renaming {0}</source>
+ <translation>Renombrando {0}</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="991"/>
+ <source>Merging</source>
+ <translation>Haciendo un merge</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1442"/>
+ <source>Copying {0}</source>
+ <translation>Copiando {0}</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1818"/>
+ <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="1871"/>
+ <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="1990"/>
+ <source>Resolving files/directories</source>
+ <translation>Resolviendo archivos/directorios</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="886"/>
+ <source>Taging in the Mercurial repository</source>
+ <translation>Haciendo tag en el repositorio Mercurial</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="937"/>
+ <source>Reverting changes</source>
+ <translation>Revirtiendo cambios</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1246"/>
+ <source>Mercurial command</source>
+ <translation>Comando de Mercurial</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2011"/>
+ <source>Create Branch</source>
+ <translation>Crear Branch</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2011"/>
+ <source>Enter branch name</source>
+ <translation>Introducir nombre de branch</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2022"/>
+ <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="2112"/>
+ <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="2137"/>
+ <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="2160"/>
+ <source>Showing aliases for remote repositories</source>
+ <translation>Mostrando alias para repositorios remotos</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2183"/>
+ <source>Recovering from interrupted transaction</source>
+ <translation>Recuperando de transacción interrumpida</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436"/>
+ <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="2046"/>
+ <source>Showing current branch</source>
+ <translation>Mostrando la branch actual</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2337"/>
+ <source>Create changegroup</source>
+ <translation>Crear changegroup</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/>
+ <source>Apply changegroups</source>
+ <translation>Aplicar changegroups</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465"/>
+ <source>Bisect subcommand ({0}) invalid.</source>
+ <translation>Subcomando bisect ({0}) inválido.</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2500"/>
+ <source>Mercurial Bisect ({0})</source>
+ <translation>Mercurial Bisect ({0})</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2393"/>
+ <source>Preview changegroup</source>
+ <translation>Previsualizar changegroup</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2206"/>
+ <source>Identifying project directory</source>
+ <translation>Identificando directorio de proyecto</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/>
+ <source>Create .hgignore file</source>
+ <translation>Crear archivo .hgignore</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/>
+ <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="2532"/>
+ <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="2294"/>
+ <source>Mercurial Changegroup Files (*.hg)</source>
+ <translation>Archivos Changegroup de Mercurial (*.hg)</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2428"/>
+ <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="2405"/>
+ <source>Identifying changegroup file</source>
+ <translation>Identificando archivo de changegroup</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2589"/>
+ <source>Backing out changeset</source>
+ <translation>Haciendo respaldo de changeset</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2569"/>
+ <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="2311"/>
+ <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="2614"/>
+ <source>Rollback last transaction</source>
+ <translation>Hacer Rollback de la última transacción</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2609"/>
+ <source>Are you sure you want to rollback the last transaction?</source>
+ <translation>¿Está seguro de que quiere aplicar un rollback a la última transacción?</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="506"/>
+ <source>Committing changes to Mercurial repository</source>
+ <translation>Haciendo commit de cambios al repositorio Mercurial</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3177"/>
+ <source>Mercurial Command Server</source>
+ <translation>Servidor de Comandos de Mercurial</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3048"/>
+ <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="3177"/>
+ <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="2683"/>
+ <source>Import Patch</source>
+ <translation>Importar Patch</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2731"/>
+ <source>Export Patches</source>
+ <translation>Exportar Patches</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2778"/>
+ <source>Change Phase</source>
+ <translation>Cambiar Fase</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2831"/>
+ <source>Copy Changesets</source>
+ <translation>Copiar Changesets</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2858"/>
+ <source>Copy Changesets (Continue)</source>
+ <translation>Copiar Changesets (Continuar)</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972"/>
+ <source>Add Sub-repository</source>
+ <translation>Añadir Sub-repositorio</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3002"/>
+ <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="2955"/>
+ <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="3019"/>
+ <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="3019"/>
+ <source>Remove Sub-repositories</source>
+ <translation>Eliminar Sub-repositorios</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2991"/>
+ <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source>
+ <translation><p>El archivo de subrepositorios .hgsub no existe. Abortando...</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="440"/>
+ <source>Commit Changes</source>
+ <translation>Hacer Commit de Cambios</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="440"/>
+ <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source>
+ <translation>La operación de commit afecta a archivos que tienen cambios sin guardar. ¿Continuar con la operación de commit?</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="932"/>
+ <source>Revert changes</source>
+ <translation>Revertir cambios</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="925"/>
+ <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="932"/>
+ <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="2894"/>
+ <source>Create Unversioned Archive</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1742"/>
+ <source>Mercurial Side-by-Side Difference</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1742"/>
+ <source><p>The file <b>{0}</b> could not be read.</p></source>
+ <translation type="unfinished"><p>El archivo <b>{0}</b> no se ha podido leer.</p></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1675"/>
- <source>The hg process did not finish within 30s.</source>
- <translation>El proceso hg no terminó en un plazo de 30s.</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="235"/>
- <source>Could not start the hg executable.</source>
- <translation>No se ha podido iniciar el ejecutable de hg.</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="261"/>
- <source>Create project repository</source>
- <translation>Crear repositorio del proyecto</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="261"/>
- <source>The project repository could not be created.</source>
- <translation>No se ha podido crear el repositorio del proyecto.</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="289"/>
- <source>Creating Mercurial repository</source>
- <translation>Creando repositorio Mercurial</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="306"/>
- <source>Initial commit to Mercurial repository</source>
- <translation>Commit inicial al repositorio Mercurial</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="352"/>
- <source>Cloning project from a Mercurial repository</source>
- <translation>Clonando proyecto desde un repositorio Mercurial</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="560"/>
- <source>Synchronizing with the Mercurial repository</source>
- <translation>Sincronizando con el repositorio Mercurial</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="612"/>
- <source>Adding files/directories to the Mercurial repository</source>
- <translation>Añadiendo archivos/directorios al repositorio Mercurial</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="676"/>
- <source>Removing files/directories from the Mercurial repository</source>
- <translation>Eliminando archivos/directorios del repositorio Mercurial</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="741"/>
- <source>Renaming {0}</source>
- <translation>Renombrando {0}</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/>
- <source>Merging</source>
- <translation>Haciendo un merge</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1444"/>
- <source>Copying {0}</source>
- <translation>Copiando {0}</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1821"/>
- <source>Pulling from a remote Mercurial repository</source>
- <translation>Haciendo pull de un repositorio remoto Mercurial</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/>
- <source>Pushing to a remote Mercurial repository</source>
- <translation>Haciendo push a un repositorio remoto Mercurial</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1993"/>
- <source>Resolving files/directories</source>
- <translation>Resolviendo archivos/directorios</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="888"/>
- <source>Taging in the Mercurial repository</source>
- <translation>Haciendo tag en el repositorio Mercurial</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="939"/>
- <source>Reverting changes</source>
- <translation>Revirtiendo cambios</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1248"/>
- <source>Mercurial command</source>
- <translation>Comando de Mercurial</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2014"/>
- <source>Create Branch</source>
- <translation>Crear Branch</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2014"/>
- <source>Enter branch name</source>
- <translation>Introducir nombre de branch</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2025"/>
- <source>Creating branch in the Mercurial repository</source>
- <translation>Creando branch en el repositorio Mercurial</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115"/>
- <source>Verifying the integrity of the Mercurial repository</source>
- <translation>Verificando la integridad del repositorio Mercurial</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/>
- <source>Showing the combined configuration settings</source>
- <translation>Mostrando los ajustes de configuración combinados</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2163"/>
- <source>Showing aliases for remote repositories</source>
- <translation>Mostrando alias para repositorios remotos</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2186"/>
- <source>Recovering from interrupted transaction</source>
- <translation>Recuperando de transacción interrumpida</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2439"/>
- <source>Shall the working directory be updated?</source>
- <translation>¿Debe ser actualizado el directorio de trabajo?</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/>
- <source>Showing current branch</source>
- <translation>Mostrando la branch actual</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2340"/>
- <source>Create changegroup</source>
- <translation>Crear changegroup</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2451"/>
- <source>Apply changegroups</source>
- <translation>Aplicar changegroups</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2468"/>
- <source>Bisect subcommand ({0}) invalid.</source>
- <translation>Subcomando bisect ({0}) inválido.</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2503"/>
- <source>Mercurial Bisect ({0})</source>
- <translation>Mercurial Bisect ({0})</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2396"/>
- <source>Preview changegroup</source>
- <translation>Previsualizar changegroup</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/>
- <source>Identifying project directory</source>
- <translation>Identificando directorio de proyecto</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/>
- <source>Create .hgignore file</source>
- <translation>Crear archivo .hgignore</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/>
- <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source>
- <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2535"/>
- <source>Removing files from the Mercurial repository only</source>
- <translation>Eliminando archivos unicamente del repositorio Mercurial</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297"/>
- <source>Mercurial Changegroup Files (*.hg)</source>
- <translation>Archivos Changegroup de Mercurial (*.hg)</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2431"/>
- <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
- <translation>Archivos Changegroup de Mercurial (*.hg);;Todos los Archivos (*)</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2408"/>
- <source>Identifying changegroup file</source>
- <translation>Identificando archivo de changegroup</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2592"/>
- <source>Backing out changeset</source>
- <translation>Haciendo respaldo de changeset</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572"/>
- <source>No revision given. Aborting...</source>
- <translation>No se ha proporcionado revisión. Abortando...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2314"/>
- <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source>
- <translation><p>El archivo changegroup de Mercurial <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2617"/>
- <source>Rollback last transaction</source>
- <translation>Hacer Rollback de la última transacción</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/>
- <source>Are you sure you want to rollback the last transaction?</source>
- <translation>¿Está seguro de que quiere aplicar un rollback a la última transacción?</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="508"/>
- <source>Committing changes to Mercurial repository</source>
- <translation>Haciendo commit de cambios al repositorio Mercurial</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3180"/>
- <source>Mercurial Command Server</source>
- <translation>Servidor de Comandos de Mercurial</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3051"/>
- <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source>
- <translation><p>El Servidor de Comandos de Mercurial no ha podido reiniciarse.</p><p>Razón: {0}</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3180"/>
- <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source>
- <translation><p>El Servidor de Comandos de Mercurial no ha podido iniciarse.</p><p>Razón: {0}</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2686"/>
- <source>Import Patch</source>
- <translation>Importar Patch</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2734"/>
- <source>Export Patches</source>
- <translation>Exportar Patches</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2781"/>
- <source>Change Phase</source>
- <translation>Cambiar Fase</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/>
- <source>Copy Changesets</source>
- <translation>Copiar Changesets</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2861"/>
- <source>Copy Changesets (Continue)</source>
- <translation>Copiar Changesets (Continuar)</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2975"/>
- <source>Add Sub-repository</source>
- <translation>Añadir Sub-repositorio</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3005"/>
- <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source>
- <translation><p>No se ha podido leer el archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2958"/>
- <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source>
- <translation><p>El archivo .hgsub de sub-repositorios ya contiene una entrada.</p><p>Abortando...</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3022"/>
- <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source>
- <translation><p>No se ha podido escribir al archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3022"/>
- <source>Remove Sub-repositories</source>
- <translation>Eliminar Sub-repositorios</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994"/>
- <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source>
- <translation><p>El archivo de subrepositorios .hgsub no existe. Abortando...</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="442"/>
- <source>Commit Changes</source>
- <translation>Hacer Commit de Cambios</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="442"/>
- <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source>
- <translation>La operación de commit afecta a archivos que tienen cambios sin guardar. ¿Continuar con la operación de commit?</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="934"/>
- <source>Revert changes</source>
- <translation>Revertir cambios</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="927"/>
- <source>Do you really want to revert all changes to these files or directories?</source>
- <translation>¿Realmente desea revertir todos los cambios a estos archivos o directorios?</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="934"/>
- <source>Do you really want to revert all changes of the project?</source>
- <translation>¿Realmente desea revertir todos los cambios del proyecto?</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2897"/>
- <source>Create Unversioned Archive</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1744"/>
- <source>Mercurial Side-by-Side Difference</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1744"/>
- <source><p>The file <b>{0}</b> could not be read.</p></source>
- <translation type="unfinished"><p>El archivo <b>{0}</b> no se ha podido leer.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1677"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation type="unfinished">El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation>
</message>
@@ -44345,202 +44345,202 @@
<context>
<name>Subversion</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="172"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1869"/>
<source>The svn process did not finish within 30s.</source>
<translation>El proceso svn no terminó en un plazo de 30s.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="174"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="175"/>
<source>Could not start the svn executable.</source>
<translation>No se ha podido ejecutar svn.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="195"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="196"/>
<source>Create project in repository</source>
<translation>Crear proyecto en el repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="195"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="196"/>
<source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source>
<translation>El proyecto no se ha podido crear en el repositorio. Quizá el repositorio proporcionado no existe o el servidor está caído.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="217"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="218"/>
<source>New project</source>
<translation>Proyecto nuevo</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="217"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="218"/>
<source>The project could not be checked out of the repository.<br />Restoring the original contents.</source>
<translation>No se ha podido hacer un checkout del proyecto en el repositorio.<br/>Restaurando los contenidos originales.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="287"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="288"/>
<source>Importing project into Subversion repository</source>
<translation>Importando proyecto al repositorio Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="337"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="338"/>
<source>Subversion Checkout</source>
<translation>Checkout de Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="399"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="400"/>
<source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source>
<translation>El tag debe ser una tag (tags) normal o branch (branches). Por favor, seleccione de la lista.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="358"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="359"/>
<source>Checking project out of Subversion repository</source>
<translation>Haciendo checkout del proyecto desde el repositorio Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="399"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="400"/>
<source>Subversion Export</source>
<translation>Export de Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="419"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="420"/>
<source>Exporting project from Subversion repository</source>
<translation>Exportando proyecto desde el repositorio Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="536"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="537"/>
<source>Commiting changes to Subversion repository</source>
<translation>Haciendo commit de los cambios al repositorio Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="592"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="593"/>
<source>Synchronizing with the Subversion repository</source>
<translation>Sincronizando con el repositorio de Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="693"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="694"/>
<source>Adding files/directories to the Subversion repository</source>
<translation>Añadiendo archivos/directorios al repositorio Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="792"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="793"/>
<source>Adding directory trees to the Subversion repository</source>
<translation>Añadiendo árboles de directorios al repositorio Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="827"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="828"/>
<source>Removing files/directories from the Subversion repository</source>
<translation>Eliminando archivos/directorios del repositorio Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1155"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1157"/>
<source>Subversion Error</source>
<translation>Error de Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="997"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="999"/>
<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/vcsPySvn/subversion.py" line="1022"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1024"/>
<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/vcsPySvn/subversion.py" line="1103"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1105"/>
<source>Reverting changes</source>
<translation>Revirtiendo cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1130"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1132"/>
<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/vcsPySvn/subversion.py" line="1155"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1157"/>
<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/vcsPySvn/subversion.py" line="1596"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1598"/>
<source>Subversion command</source>
<translation>Comando de Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1705"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1707"/>
<source>Resolving conficts</source>
<translation>Resolviendo conflictos</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1814"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1816"/>
<source>Subversion Set Property</source>
<translation>Asignar Propiedad de Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1848"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1850"/>
<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/vcsPySvn/subversion.py" line="1866"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1868"/>
<source>Subversion Delete Property</source>
<translation>Borrar Propiedad de Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1688"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1690"/>
<source>Enter property name</source>
<translation>Introducir nombre de la propiedad</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="930"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="932"/>
<source>Subversion Log</source>
<translation>Log de Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="930"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="932"/>
<source>Select number of entries to show.</source>
<translation>Seleccionar número de entradas a mostrar.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2039"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2144"/>
<source>Locking in the Subversion repository</source>
<translation>Bloqueando en el repositorio Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2077"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2182"/>
<source>Unlocking in the Subversion repository</source>
<translation>Desbloqueando en el repositorio Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1830"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1832"/>
<source>Property set.</source>
<translation>Propiedad establecida.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1881"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1883"/>
<source>Property deleted.</source>
<translation>Propiedad borrada.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2019"/>
- <source>Subversion Lock</source>
- <translation>Bloqueo de Subversion</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2019"/>
- <source>Enter lock comment</source>
- <translation>Introducir comentario para el bloqueo</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2124"/>
+ <source>Subversion Lock</source>
+ <translation>Bloqueo de Subversion</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2124"/>
+ <source>Enter lock comment</source>
+ <translation>Introducir comentario para el bloqueo</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2229"/>
<source>Relocating</source>
<translation>Realojando</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2150"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2255"/>
<source>Repository Browser</source>
<translation>Navegador de Repositorios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2150"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2255"/>
<source>Enter the repository URL.</source>
<translation>Introducir la URL del repositorio.</translation>
</message>
@@ -44695,17 +44695,17 @@
<translation>Sin versionar</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2175"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2280"/>
<source>Remove from changelist</source>
<translation>Quitar de la lista de cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2212"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2317"/>
<source>Add to changelist</source>
<translation>Añadir a la lista de cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2201"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2306"/>
<source>Enter name of the changelist:</source>
<translation>Introduzca el nombre de la lista de cambios:</translation>
</message>
@@ -44725,82 +44725,102 @@
<translation>Lista de cambios movida</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="169"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="170"/>
<source>The svn process finished with the exit code {0}</source>
<translation>El proceso svn ha terminado con código de salida {0}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="890"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="891"/>
<source>Moving {0}</source>
<translation>Moviendo {0}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1057"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1059"/>
<source>Tagging {0} in the Subversion repository</source>
<translation>Haciendo un tag {0} en el repositorio Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1177"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1179"/>
<source>Switching to {0}</source>
<translation>Haciendo un switch a {0}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1280"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1282"/>
<source>Merging {0}</source>
<translation>Haciendo un merge de {0}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1557"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1559"/>
<source>Cleaning up {0}</source>
<translation>Limpiando {0}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1745"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1747"/>
<source>Copying {0}</source>
<translation>Copiando {0}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="303"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="304"/>
<source>Imported revision {0}.
</source>
<translation>Importada revisión {0}.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="561"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="562"/>
<source>Committed revision {0}.</source>
<translation>Commit realizado para revisión {0}.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1184"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1186"/>
<source>Revision {0}.
</source>
<translation>Revisión {0}.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="494"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="495"/>
<source>Commit Changes</source>
<translation>Hacer Commit de Cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="494"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="495"/>
<source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source>
<translation>La operación de commit afecta a archivos que tienen cambios sin guardar. ¿Continuar con la operación de commit?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1096"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1098"/>
<source>Revert changes</source>
<translation>Revertir cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1089"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1091"/>
<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/vcsPySvn/subversion.py" line="1096"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1098"/>
<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="1869"/>
+ <source>The hg process did not finish within 30s.</source>
+ <translation type="obsolete">El proceso hg no terminó en un plazo de 30s.</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1871"/>
+ <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
+ <translation type="unfinished">El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2090"/>
+ <source>Subversion Side-by-Side Difference</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2090"/>
+ <source><p>The file <b>{0}</b> could not be read.</p></source>
+ <translation type="unfinished"><p>El archivo <b>{0}</b> no se ha podido leer.</p></translation>
+ </message>
</context>
<context>
<name>SubversionPage</name>
@@ -45705,17 +45725,17 @@
<translation>Seleccione el campo de filtrado</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="553"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="559"/>
<source>Revision</source>
<translation>Revisión</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="550"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="556"/>
<source>Author</source>
<translation>Autor</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="53"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="56"/>
<source>Message</source>
<translation>Mensaje</translation>
</message>
@@ -45795,90 +45815,100 @@
<translation>&Comparar Revisiones</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="285"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="295"/>
<source>Errors</source>
<translation>Errores</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="291"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="301"/>
<source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source>
<translation><b>Errores de Subversion log</b><p>Muestra los posibles mensajes de error del comando svn log.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="307"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="317"/>
<source>Input</source>
<translation>Input</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="329"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="339"/>
<source>Press to send the input to the subversion process</source>
<translation>Pulsar para enviar el input al proceso de subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="332"/>
- <source>&Send</source>
- <translation>&Enviar</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="335"/>
- <source>Alt+S</source>
- <translation>Alt+E</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="342"/>
- <source>Enter data to be sent to the subversion process</source>
- <translation>Introducir datos a enviar al proceso de subversion</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="349"/>
- <source>Select to switch the input field to password mode</source>
- <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation>
+ <source>&Send</source>
+ <translation>&Enviar</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="345"/>
+ <source>Alt+S</source>
+ <translation>Alt+E</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="352"/>
+ <source>Enter data to be sent to the subversion process</source>
+ <translation>Introducir datos a enviar al proceso de subversion</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="359"/>
+ <source>Select to switch the input field to password mode</source>
+ <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="362"/>
<source>&Password Mode</source>
<translation>&Modo de contraseña</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="355"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="365"/>
<source>Alt+P</source>
<translation>Alt+M</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="82"/>
- <source>Added</source>
- <translation>Añadido</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="83"/>
- <source>Deleted</source>
- <translation>Borrado</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="84"/>
- <source>Modified</source>
- <translation>Modificado</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="428"/>
- <source>Subversion Error</source>
- <translation>Error de Subversion</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="242"/>
- <source>Process Generation Error</source>
- <translation>Error de Generación de Proceso</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="242"/>
- <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/SvnLogBrowserDialog.py" line="85"/>
+ <source>Added</source>
+ <translation>Añadido</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="86"/>
+ <source>Deleted</source>
+ <translation>Borrado</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="87"/>
+ <source>Modified</source>
+ <translation>Modificado</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="434"/>
+ <source>Subversion Error</source>
+ <translation>Error de Subversion</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="245"/>
+ <source>Process Generation Error</source>
+ <translation>Error de Generación de Proceso</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="245"/>
+ <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/SvnLogBrowserDialog.py" line="88"/>
<source>Replaced</source>
<translation>Reemplazado</translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="277"/>
+ <source>Select to show differences side-by-side</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="280"/>
+ <source>Show differences side-by-side</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>SvnLogDialog</name>
@@ -45898,114 +45928,124 @@
<translation><b>Log de Subversion</b><p>Muestra la salida del comando svn log. Haciendo click en los enlaces se muestran las diferencias entre versiones.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.ui" line="48"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.ui" line="58"/>
<source>Errors</source>
<translation>Errores</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.ui" line="54"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.ui" line="64"/>
<source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source>
<translation><b>Errores de Subversion log</b><p>Muestra los posibles mensajes de error del comando svn log.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="70"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="80"/>
<source>Input</source>
<translation>Input</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="92"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="102"/>
<source>Press to send the input to the subversion process</source>
<translation>Pulsar para enviar el input al proceso de subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="95"/>
- <source>&Send</source>
- <translation>&Enviar</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="98"/>
- <source>Alt+S</source>
- <translation>Alt+E</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="105"/>
- <source>Enter data to be sent to the subversion process</source>
- <translation>Introducir datos a enviar al proceso de subversion</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="112"/>
- <source>Select to switch the input field to password mode</source>
- <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation>
+ <source>&Send</source>
+ <translation>&Enviar</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="108"/>
+ <source>Alt+S</source>
+ <translation>Alt+E</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="115"/>
+ <source>Enter data to be sent to the subversion process</source>
+ <translation>Introducir datos a enviar al proceso de subversion</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="122"/>
+ <source>Select to switch the input field to password mode</source>
+ <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="125"/>
<source>&Password Mode</source>
<translation>&Modo de contraseña</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="118"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="128"/>
<source>Alt+P</source>
<translation>Alt+M</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="48"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="49"/>
<source><b>Processing your request, please wait...</b></source>
<translation><b>Procesando la solicitud, por favor aguarde...</b></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="54"/>
- <source>Added</source>
- <translation>Añadido</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="55"/>
- <source>Deleted</source>
- <translation>Borrado</translation>
+ <source>Added</source>
+ <translation>Añadido</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="56"/>
+ <source>Deleted</source>
+ <translation>Borrado</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="57"/>
<source>Modified</source>
<translation>Modificado</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="59"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="60"/>
<source>revision</source>
<translation>Revisión</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="127"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="130"/>
<source>Process Generation Error</source>
<translation>Error de Generación de Proceso</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="127"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="130"/>
<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/vcsPySvn/SvnLogDialog.py" line="137"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="140"/>
<source>diff to {0}</source>
<translation>diff con {0}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="145"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="148"/>
<source><i>author: {0}</i><br />
</source>
<translation><i>autor: {0}</i><br />
</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="148"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="151"/>
<source><i>date: {0}</i><br />
</source>
<translation><i>Fecha: {0}</i><br />
</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="165"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="168"/>
<source> (copied from {0}, revision {1})</source>
<translation> (copiado de {0}, revisión {1})</translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.ui" line="42"/>
+ <source>Select to show differences side-by-side</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.ui" line="45"/>
+ <source>Show differences side-by-side</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>SvnLoginDialog</name>
@@ -46335,170 +46375,180 @@
<context>
<name>SvnProjectBrowserHelper</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="576"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="583"/>
<source>Version Control</source>
<translation>Control de Versiones</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="587"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="594"/>
<source>Update from repository</source>
<translation>Hacer update desde repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="590"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="597"/>
<source>Commit changes to repository...</source>
<translation>Hacer commit de los cambios al repositorio...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="595"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="602"/>
<source>Add to repository</source>
<translation>Añadir al repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="350"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="357"/>
<source>Add tree to repository</source>
<translation>Añadir árbol al repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="598"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="605"/>
<source>Remove from repository (and disk)</source>
<translation>Eliminar del repositorio (y del disco)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="507"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="514"/>
<source>Show log</source>
<translation>Mostrar log</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="611"/>
- <source>Show status</source>
- <translation>Mostrar estado</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="615"/>
- <source>Show difference</source>
- <translation>Mostrar diferencia</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="618"/>
- <source>Show difference (extended)</source>
- <translation>Mostrar diferencia (extendida)</translation>
+ <source>Show status</source>
+ <translation>Mostrar estado</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="622"/>
+ <source>Show difference</source>
+ <translation>Mostrar diferencia</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="625"/>
+ <source>Show difference (extended)</source>
+ <translation>Mostrar diferencia (extendida)</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="629"/>
<source>Show difference (URLs)</source>
<translation>Mostrar diferencia (URLs)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="268"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="275"/>
<source>Show annotated file</source>
<translation>Mostrar archivo anotado</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="627"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="634"/>
<source>Revert changes</source>
<translation>Revertir cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="630"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="637"/>
<source>Merge changes</source>
<translation>Hacer merge de los cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="388"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="395"/>
<source>Lock</source>
<translation>Bloquear</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="391"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="398"/>
<source>Unlock</source>
<translation>Desbloquear</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="394"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="401"/>
<source>Break Lock</source>
<translation>Romper bloqueo</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="397"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="404"/>
<source>Steal Lock</source>
<translation>Robar bloqueo</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="636"/>
- <source>Set Property</source>
- <translation>Establecer propiedad</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="638"/>
- <source>List Properties</source>
- <translation>Listar propiedades</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="640"/>
- <source>Delete Property</source>
- <translation>Borrar propiedad</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="643"/>
- <source>Select all local file entries</source>
- <translation>Seleccionar todas las entradas de archivo locales</translation>
+ <source>Set Property</source>
+ <translation>Establecer propiedad</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="645"/>
- <source>Select all versioned file entries</source>
- <translation>Seleccionar todas las entradas de archivo versionadas</translation>
+ <source>List Properties</source>
+ <translation>Listar propiedades</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="647"/>
+ <source>Delete Property</source>
+ <translation>Borrar propiedad</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="650"/>
+ <source>Select all local file entries</source>
+ <translation>Seleccionar todas las entradas de archivo locales</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="652"/>
+ <source>Select all versioned file entries</source>
+ <translation>Seleccionar todas las entradas de archivo versionadas</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="654"/>
<source>Select all local directory entries</source>
<translation>Seleccionar todas las entradas de directorio locales</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="649"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="656"/>
<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="524"/>
+ <source>Show repository info</source>
+ <translation>Mostrar informacion del repositorio</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="517"/>
- <source>Show repository info</source>
- <translation>Mostrar informacion del repositorio</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="510"/>
<source>Show log browser</source>
<translation>Mostrar navegador de log</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="652"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="659"/>
<source>Configure...</source>
<translation>Configurar...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="604"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="611"/>
<source>Add to Changelist</source>
<translation>Añadir a la lista de cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="607"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="614"/>
<source>Remove from Changelist</source>
<translation>Quitar de la lista de cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="640"/>
<source>Conflict resolved</source>
<translation>Conflicto resuelto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="494"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="501"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="496"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="503"/>
<source>Move</source>
<translation>Mover</translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="260"/>
+ <source>Show difference side-by-side</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="267"/>
+ <source>Show difference side-by-side (extended)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>SvnProjectHelper</name>
@@ -47377,107 +47427,107 @@
<context>
<name>SvnRevisionSelectionDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="13"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="14"/>
<source>Subversion Diff</source>
<translation>Diff de Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="22"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="23"/>
<source>Revision &1</source>
<translation>Revisión &1</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="174"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="178"/>
<source>Select revision before last commit</source>
<translation>Seleccionar revisión antes del último commit</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="177"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="181"/>
<source>PREV</source>
<translation>PREV</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="184"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="188"/>
<source>Select last committed revision</source>
<translation>Seleccionar la última revisión de la que se ha hecho commit</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="187"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="191"/>
<source>COMMITTED</source>
<translation>COMMITED</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="194"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="198"/>
<source>Select base revision</source>
<translation>Seleccionar revisión base</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="197"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="201"/>
<source>BASE</source>
<translation>BASE</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="204"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="208"/>
<source>Select head revision of repository</source>
<translation>Seleccionar revisión head del repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="207"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="211"/>
<source>HEAD</source>
<translation>HEAD</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="217"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="221"/>
<source>Select working revision</source>
<translation>Seleccionar revisión working</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="220"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="224"/>
<source>WORKING</source>
<translation>WORKING</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="236"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="243"/>
<source>Enter a revision number</source>
<translation>Introduzca un número de revisión</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="255"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="262"/>
<source>Enter time of revision</source>
<translation>Introduzca hora de revisión</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="265"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="272"/>
<source>Enter date of revision</source>
<translation>Introduzca fecha de revisión</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="268"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="275"/>
<source>yyyy-MM-dd</source>
<translation>yyyy-MM-dd</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="291"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="298"/>
<source>Select to specify a revision by number</source>
<translation>Seleccionar para especificar una revisión por número</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="294"/>
- <source>Number</source>
- <translation>Número</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="301"/>
+ <source>Number</source>
+ <translation>Número</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="308"/>
<source>Select to specify a revision by date and time</source>
<translation>Seleccionar para especificar una revisión por fecha y hora</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="304"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="311"/>
<source>Date</source>
<translation>Fecha</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="168"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="172"/>
<source>Revision &2</source>
<translation>Revisión &2</translation>
</message>
@@ -47485,7 +47535,7 @@
<context>
<name>SvnStatusDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="278"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="281"/>
<source>Subversion Status</source>
<translation>Estado de Subversion</translation>
</message>
@@ -47552,47 +47602,47 @@
<translation>Ruta</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="231"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="241"/>
<source>Errors</source>
<translation>Errores</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="247"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="257"/>
<source>Input</source>
<translation>Input</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="269"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="279"/>
<source>Press to send the input to the subversion process</source>
<translation>Pulsar para enviar el input al proceso de subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="272"/>
- <source>&Send</source>
- <translation>&Enviar</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="275"/>
- <source>Alt+S</source>
- <translation>Alt+E</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="282"/>
- <source>Enter data to be sent to the subversion process</source>
- <translation>Introducir datos a enviar al proceso de subversion</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="289"/>
- <source>Select to switch the input field to password mode</source>
- <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation>
+ <source>&Send</source>
+ <translation>&Enviar</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="285"/>
+ <source>Alt+S</source>
+ <translation>Alt+E</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="292"/>
+ <source>Enter data to be sent to the subversion process</source>
+ <translation>Introducir datos a enviar al proceso de subversion</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="299"/>
+ <source>Select to switch the input field to password mode</source>
+ <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="302"/>
<source>&Password Mode</source>
<translation>&Modo de contraseña</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="295"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="305"/>
<source>Alt+P</source>
<translation>Alt+M</translation>
</message>
@@ -47617,172 +47667,172 @@
<translation>Añadir al repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="91"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="93"/>
<source>Revert changes</source>
<translation>Revertir cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="705"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="737"/>
<source>Lock</source>
<translation>Bloquear</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="721"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="753"/>
<source>Unlock</source>
<translation>Desbloquear</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="108"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="110"/>
<source>Break lock</source>
<translation>Romper bloqueo</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="111"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="113"/>
<source>Steal lock</source>
<translation>Robar bloqueo</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="115"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="117"/>
<source>Adjust column sizes</source>
<translation>Adjustar tamaño de columnas</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="149"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="151"/>
<source>added</source>
<translation>añadido</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="150"/>
- <source>deleted</source>
- <translation>borrado</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="162"/>
- <source>modified</source>
- <translation>modificado</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="156"/>
- <source>unversioned</source>
- <translation>sin versionar</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="155"/>
- <source>locked</source>
- <translation>bloqueado</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="156"/>
- <source>other lock</source>
- <translation>otro bloqueo</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="157"/>
- <source>stolen lock</source>
- <translation>bloqueo robado</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="158"/>
- <source>broken lock</source>
- <translation>bloqueo roto</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="154"/>
- <source>not locked</source>
- <translation>no bloqueado</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="161"/>
- <source>normal</source>
- <translation>normal</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="152"/>
- <source>replaced</source>
- <translation>reemplazado</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="163"/>
- <source>conflict</source>
- <translation>conflicto</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="154"/>
- <source>external</source>
- <translation>externo</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="155"/>
- <source>ignored</source>
- <translation>ignorado</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="157"/>
- <source>missing</source>
- <translation>perdido</translation>
+ <source>deleted</source>
+ <translation>borrado</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="164"/>
+ <source>modified</source>
+ <translation>modificado</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="158"/>
+ <source>unversioned</source>
+ <translation>sin versionar</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="157"/>
+ <source>locked</source>
+ <translation>bloqueado</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="158"/>
+ <source>other lock</source>
+ <translation>otro bloqueo</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="159"/>
+ <source>stolen lock</source>
+ <translation>bloqueo robado</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="160"/>
+ <source>broken lock</source>
+ <translation>bloqueo roto</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="156"/>
+ <source>not locked</source>
+ <translation>no bloqueado</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="163"/>
+ <source>normal</source>
+ <translation>normal</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="154"/>
+ <source>replaced</source>
+ <translation>reemplazado</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="165"/>
+ <source>conflict</source>
+ <translation>conflicto</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="156"/>
+ <source>external</source>
+ <translation>externo</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="157"/>
+ <source>ignored</source>
+ <translation>ignorado</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="159"/>
+ <source>missing</source>
+ <translation>perdido</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="160"/>
<source>type error</source>
<translation>error de tipo</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="161"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="163"/>
<source>no</source>
<translation>no</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="162"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="164"/>
<source>yes</source>
<translation>si</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="389"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="392"/>
<source>Process Generation Error</source>
<translation>Error de Generación de Proceso</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="585"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="596"/>
<source>Commit</source>
<translation>Commit</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="685"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="716"/>
<source>There are no uncommitted changes available/selected.</source>
<translation>No hay cambios pendientes de commit disponibles/seleccionados.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="624"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="635"/>
<source>Add</source>
<translation>Añadir</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="624"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="635"/>
<source>There are no unversioned entries available/selected.</source>
<translation>No hay entradas sin versionar disponibles/seleccionadas.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="668"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="679"/>
<source>Revert</source>
<translation>Revertir</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="705"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="737"/>
<source>There are no unlocked files available/selected.</source>
<translation>No hay archivos desbloqueados disponibles/seleccionados.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="755"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="787"/>
<source>There are no locked files available/selected.</source>
<translation>No hay archivos bloqueados disponibles/seleccionados.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="738"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="770"/>
<source>Break Lock</source>
<translation>Romper Bloqueo</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="755"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="787"/>
<source>Steal Lock</source>
<translation>Robar Bloqueo</translation>
</message>
@@ -47792,27 +47842,27 @@
<translation>Lista de cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="97"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="99"/>
<source>Add to Changelist</source>
<translation>Añadir a la lista de cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="789"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="821"/>
<source>Remove from Changelist</source>
<translation>Quitar de la lista de cambios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="771"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="803"/>
<source>There are no files available/selected not belonging to a changelist.</source>
<translation>No hay archivos disponibles/seleccionados que no pertenezcan a una lista de cambios.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="789"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="821"/>
<source>There are no files available/selected belonging to a changelist.</source>
<translation>No hay archivos disponibles/seleccionados que pertenezcan a una lista de cambios.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="389"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="392"/>
<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>
@@ -47857,22 +47907,22 @@
<translation>&Diferencias</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="190"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="200"/>
<source>Revert the selected entries to the last revision in the repository</source>
<translation>Revertir las entradas seleccionadas a la última revisión en el repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="193"/>
- <source>Re&vert</source>
- <translation>Re&vert</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="200"/>
- <source>Restore the selected missing entries from the repository</source>
- <translation>Restaurar las entradas perdidas seleccionadas desde el repositorio</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="203"/>
+ <source>Re&vert</source>
+ <translation>Re&vert</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="210"/>
+ <source>Restore the selected missing entries from the repository</source>
+ <translation>Restaurar las entradas perdidas seleccionadas desde el repositorio</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="213"/>
<source>&Restore</source>
<translation>&Restore</translation>
</message>
@@ -47882,27 +47932,27 @@
<translation>Mostrar diferencias</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="93"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="95"/>
<source>Restore missing</source>
<translation>Restaurar perdidas</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="504"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="508"/>
<source>all</source>
<translation>todo</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="685"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="696"/>
<source>Differences</source>
<translation>Diferencias</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="585"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="596"/>
<source>There are no entries selected to be committed.</source>
<translation>No hay entradas seleccionads sobre las que hacer commit.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="668"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="679"/>
<source>There are no missing entries available/selected.</source>
<translation>No hay entradas perdidas disponibles/seleccionadas.</translation>
</message>
@@ -47916,6 +47966,31 @@
<source>Deselect all from commit</source>
<translation>Deshacer selección de todo en el commit</translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="190"/>
+ <source>Show differences of the selected entry to the repository in a side-by-side manner</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="193"/>
+ <source>Side-b&y-Side Diff</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="91"/>
+ <source>Show differences side-by-side</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="722"/>
+ <source>Side-by-Side Diff</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="722"/>
+ <source>Only one file with uncommitted changes must be selected.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>SvnStatusMonitorThread</name>
@@ -59872,17 +59947,17 @@
<context>
<name>mercurial</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1940"/>
<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="1951"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1948"/>
<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="1958"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1955"/>
<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>
@@ -59893,31 +59968,31 @@
</table></p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1937"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1934"/>
<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="1939"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1936"/>
<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="1955"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1952"/>
<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="1309"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1307"/>
<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="1325"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1323"/>
<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>
@@ -59943,12 +60018,12 @@
{2}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1947"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/>
<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="1359"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1357"/>
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
@@ -60203,17 +60278,17 @@
<context>
<name>subversion</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1639"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1641"/>
<source>unknown</source>
<translation>desconocido</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1511"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1513"/>
<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="1640"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1642"/>
<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>
