--- a/i18n/eric5_es.ts Mon May 28 15:59:36 2012 +0200
+++ b/i18n/eric5_es.ts Tue May 29 20:59:40 2012 +0200
@@ -16521,277 +16521,277 @@
<context>
<name>Hg</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="251"/>
<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="252"/>
- <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="254"/>
+ <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="256"/>
<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="280"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/>
<source>Create project repository</source>
<translation>Crear repositorio del proyecto</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/>
<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="308"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="310"/>
<source>Creating Mercurial repository</source>
<translation>Creando repositorio Mercurial</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="323"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="325"/>
<source>Initial commit to Mercurial repository</source>
<translation>Commit inicial al repositorio Mercurial</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="369"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="371"/>
<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="531"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="533"/>
<source>Synchronizing with the Mercurial repository</source>
<translation>Sincronizando con el repositorio Mercurial</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="585"/>
<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="647"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="649"/>
<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="711"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/>
<source>Renaming {0}</source>
<translation>Renombrando {0}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="925"/>
<source>Merging</source>
<translation>Haciendo un merge</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1352"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/>
<source>Copying {0}</source>
<translation>Copiando {0}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1597"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1611"/>
<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="1650"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/>
<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="1769"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/>
<source>Resolving files/directories</source>
<translation>Resolviendo archivos/directorios</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="840"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="842"/>
<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="873"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="875"/>
<source>Reverting changes</source>
<translation>Revirtiendo cambios</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1176"/>
<source>Mercurial command</source>
<translation>Comando de Mercurial</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/>
<source>Create Branch</source>
<translation>Crear Branch</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/>
<source>Enter branch name</source>
<translation>Introducir nombre de branch</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/>
<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="1882"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/>
<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="1907"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/>
<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="1930"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/>
<source>Showing aliases for remote repositories</source>
<translation>Mostrando alias para repositorios remotos</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/>
<source>Recovering from interrupted transaction</source>
<translation>Recuperando de transacción interrumpida</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210"/>
<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="1825"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1839"/>
<source>Showing current branch</source>
<translation>Mostrando la branch actual</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2100"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/>
<source>Create changegroup</source>
<translation>Crear changegroup</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/>
<source>Apply changegroups</source>
<translation>Aplicar changegroups</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation>Subcomando bisect ({0}) inválido.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/>
<source>Mercurial Bisect ({0})</source>
<translation>Mercurial Bisect ({0})</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2171"/>
<source>Preview changegroup</source>
<translation>Previsualizar changegroup</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1976"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/>
<source>Identifying project directory</source>
<translation>Identificando directorio de proyecto</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/>
<source>Create .hgignore file</source>
<translation>Crear archivo .hgignore</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/>
<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="2286"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2305"/>
<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="2058"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation>Archivos Changegroup de Mercurial (*.hg)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2185"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/>
<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="2162"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/>
<source>Identifying changegroup file</source>
<translation>Identificando archivo de changegroup</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2342"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/>
<source>Backing out changeset</source>
<translation>Haciendo respaldo de changeset</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2322"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/>
<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="2075"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/>
<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="2367"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/>
<source>Rollback last transaction</source>
<translation>Hacer Rollback de la última transacción</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2381"/>
<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="479"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="481"/>
<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="2745"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/>
<source>Mercurial Command Server</source>
<translation>Servidor de Comandos de Mercurial</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2643"/>
<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="2745"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/>
<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="2434"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2453"/>
<source>Import Patch</source>
<translation>Importar Patch</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2500"/>
<source>Export Patches</source>
<translation>Exportar Patches</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/>
<source>Change Phase</source>
<translation>Cambiar Fase</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/>
<source>Copy Changesets</source>
<translation>Copiar Changesets</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2601"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/>
<source>Copy Changesets (Continue)</source>
<translation>Copiar Changesets (Continuar)</translation>
</message>
@@ -19353,7 +19353,7 @@
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/>
<source>Resolve conflict</source>
- <translation>Resolver conflicto</translation>
+ <translation type="obsolete">Resolver conflicto</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="496"/>
@@ -19405,6 +19405,11 @@
<source>Do you really want to remove these files from the repository?</source>
<translation>¿Realmente quiere eliminar estos archivos del repositorio?</translation>
</message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/>
+ <source>Conflict resolved</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgProjectHelper</name>
@@ -19551,710 +19556,710 @@
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/>
<source>Add to repository</source>
- <translation>Añadir al repositorio</translation>
+ <translation type="obsolete">Añadir al repositorio</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/>
<source>&Add to repository...</source>
- <translation>&Añadir al repositorio...</translation>
+ <translation type="obsolete">&Añadir al repositorio...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="225"/>
<source>Add the local project to the repository</source>
- <translation>Añadir el proyecto local al repositorio</translation>
+ <translation type="obsolete">Añadir el proyecto local al repositorio</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228"/>
<source><b>Add to repository</b><p>This adds (imports) the local project to the repository.</p></source>
- <translation><b>Añadir al repositorio</b><p>Añade (import) el proyecto local al repositorio.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/>
+ <translation type="obsolete"><b>Añadir al repositorio</b><p>Añade (import) el proyecto local al repositorio.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/>
<source>Remove from repository (and disk)</source>
<translation>Eliminar del repositorio (y del disco)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/>
<source>&Remove from repository (and disk)</source>
<translation>Eliminar del &repositorio (y del disco)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="239"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="226"/>
<source>Remove the local project from the repository (and disk)</source>
<translation>Eliminar el proyecto local del repositorio (y del disco)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="229"/>
<source><b>Remove from repository</b><p>This removes the local project from the repository (and disk).</p></source>
<translation><b>Eliminar del repositorio</b><p>Elimina el proyecto local del repositorio (y del disco).</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/>
<source>Show log</source>
<translation>Mostrar log</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/>
<source>Show &log</source>
<translation>Mostrar &log</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="241"/>
<source>Show the log of the local project</source>
<translation>Mostrar el log del proyecto local</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="257"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="244"/>
<source><b>Show log</b><p>This shows the log of the local project.</p></source>
<translation><b>Mostrar log</b><p>Muestra el log del proyecto local.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="264"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/>
<source>Show log browser</source>
<translation>Mostrar navegador de log</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="255"/>
<source>Show a dialog to browse the log of the local project</source>
<translation>Mostrar un diálogo para navegar el log del proyecto local</translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="258"/>
+ <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source>
+ <translation><b>Mostrar navegador de log</b><p>Muestra un diálogo para navegar el log del proyecto local. Al principio se muestra un número limitado de entradas. Se pueden recuperar más entradas despues.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="267"/>
+ <source>Show difference</source>
+ <translation>Mostrar diferencia</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="267"/>
+ <source>Show &difference</source>
+ <translation>Mostrar &diferencia</translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/>
- <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source>
- <translation><b>Mostrar navegador de log</b><p>Muestra un diálogo para navegar el log del proyecto local. Al principio se muestra un número limitado de entradas. Se pueden recuperar más entradas despues.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/>
- <source>Show difference</source>
- <translation>Mostrar diferencia</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/>
- <source>Show &difference</source>
- <translation>Mostrar &diferencia</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/>
<source>Show the difference of the local project to the repository</source>
<translation>Muestra las diferencias entre el proyecto local y el repositorio</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="287"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/>
<source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source>
<translation><b>Mostrar direfencia</b><p>Muestra la diferencia que hay entre el proyecto local y el repositorio.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281"/>
<source>Show difference (extended)</source>
<translation>Mostrar diferencia (extendida)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/>
<source>Show the difference of revisions of the project to the repository</source>
<translation>Muestra la diferencia de revisiones entre el proyecto local y el repositorio</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/>
<source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source>
<translation><b>Mostrar direfencia (extendida)</b><p>Muestra la diferencia entre revisiones seleccionables del proyecto.</p></translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/>
+ <source>Show heads</source>
+ <translation>Mostrar heads</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/>
+ <source>Show the heads of the repository</source>
+ <translation>Mostrar los heads del repositorio</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/>
+ <source><b>Show heads</b><p>This shows the heads of the repository.</p></source>
+ <translation><b>Mostrar heads</b><p>Muestra los heads del repositorio.</p></translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322"/>
- <source>Show heads</source>
- <translation>Mostrar heads</translation>
+ <source>Show parents</source>
+ <translation>Mostrar parents</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/>
- <source>Show the heads of the repository</source>
- <translation>Mostrar los heads del repositorio</translation>
+ <source>Show the parents of the repository</source>
+ <translation>Mostrar los parents del repositorio</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="328"/>
- <source><b>Show heads</b><p>This shows the heads of the repository.</p></source>
- <translation><b>Mostrar heads</b><p>Muestra los heads del repositorio.</p></translation>
+ <source><b>Show parents</b><p>This shows the parents of the repository.</p></source>
+ <translation><b>Mostrar parents</b><p>Muestra los parents del repositorio.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/>
- <source>Show parents</source>
- <translation>Mostrar parents</translation>
+ <source>Show tip</source>
+ <translation>Mostrar tip</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/>
- <source>Show the parents of the repository</source>
- <translation>Mostrar los parents del repositorio</translation>
+ <source>Show the tip of the repository</source>
+ <translation>Mostrar el tip del repositorio</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="341"/>
- <source><b>Show parents</b><p>This shows the parents of the repository.</p></source>
- <translation><b>Mostrar parents</b><p>Muestra los parents del repositorio.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/>
- <source>Show tip</source>
- <translation>Mostrar tip</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="351"/>
- <source>Show the tip of the repository</source>
- <translation>Mostrar el tip del repositorio</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354"/>
<source><b>Show tip</b><p>This shows the tip of the repository.</p></source>
<translation><b>Mostrar tip</b><p>Muestra el tip del repositorio.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/>
<source>Merge</source>
<translation>Hacer merge</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/>
<source>Mer&ge changes...</source>
<translation>Hacer mer&ge de los cambios...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/>
<source>Merge changes of a revision into the local project</source>
<translation>Hacer merge de los cambios de una revision en el proyecto local</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/>
<source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source>
<translation><b>Merge</b><p>Hace un merge de los cambios de una revision en el proyecto local.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/>
<source>Resolve conflicts</source>
- <translation>Resolver conflictos</translation>
+ <translation type="obsolete">Resolver conflictos</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/>
<source>Resolve con&flicts</source>
- <translation>Resolver con&flictos</translation>
+ <translation type="obsolete">Resolver con&flictos</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="392"/>
<source>Resolve all conflicts of the local project</source>
- <translation>Resolver todos los conflictos del proyecto local</translation>
+ <translation type="obsolete">Resolver todos los conflictos del proyecto local</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395"/>
<source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source>
- <translation><b>Resolver conflictos</b><p>Resuelve todos los conflictos del proyecto local.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/>
+ <translation type="obsolete"><b>Resolver conflictos</b><p>Resuelve todos los conflictos del proyecto local.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/>
<source>Show status</source>
<translation>Mostrar estado</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/>
<source>Show &status</source>
<translation>Mostrar e&stado</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/>
<source>Show the status of the local project</source>
<translation>Mostrar el estado del proyecto local</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302"/>
<source><b>Show status</b><p>This shows the status of the local project.</p></source>
<translation><b>Mostrar estado</b><p>Muestra el estado del proyecto local.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/>
<source>Revert changes</source>
<translation>Revertir cambios</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/>
<source>Re&vert changes</source>
<translation>Re&vertir cambios</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="352"/>
<source>Revert all changes made to the local project</source>
<translation>Revertir todos los cambios hechos al proyecto local</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="368"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="355"/>
<source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source>
<translation><b>Revertir cambios</b><p>Revierte todos los cambios hechos al proyecto local.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/>
<source>Tag in repository</source>
<translation>Crear un Tag en el repositorio</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/>
<source>&Tag in repository...</source>
<translation>Crear un &Tag en el repositorio...</translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/>
+ <source>Tag the local project in the repository</source>
+ <translation>Crea un tag del proyecto local en el repositorio</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/>
+ <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source>
+ <translation><b>Crear un Tag en el repositorio</b><p>Crea un tag del proyecto local en el repositorio.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/>
+ <source>List tags</source>
+ <translation>Listar tags</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/>
+ <source>List tags...</source>
+ <translation>Listar tags...</translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/>
- <source>Tag the local project in the repository</source>
- <translation>Crea un tag del proyecto local en el repositorio</translation>
+ <source>List tags of the project</source>
+ <translation>Lista los tags del proyecto</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="409"/>
- <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source>
- <translation><b>Crear un Tag en el repositorio</b><p>Crea un tag del proyecto local en el repositorio.</p></translation>
+ <source><b>List tags</b><p>This lists the tags of the project.</p></source>
+ <translation><b>Listar tags</b><p>Lista los tags del proyecto.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/>
- <source>List tags</source>
- <translation>Listar tags</translation>
+ <source>List branches</source>
+ <translation>Listar branches</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/>
- <source>List tags...</source>
- <translation>Listar tags...</translation>
+ <source>List branches...</source>
+ <translation>Listar branches...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/>
- <source>List tags of the project</source>
- <translation>Lista los tags del proyecto</translation>
+ <source>List branches of the project</source>
+ <translation>Lista las branches del proyecto</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/>
- <source><b>List tags</b><p>This lists the tags of the project.</p></source>
- <translation><b>Listar tags</b><p>Lista los tags del proyecto.</p></translation>
+ <source><b>List branches</b><p>This lists the branches of the project.</p></source>
+ <translation><b>Listar branches</b><p>Lista las branches del proyecto.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/>
- <source>List branches</source>
- <translation>Listar branches</translation>
+ <source>Create branch</source>
+ <translation>Crear branch</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/>
- <source>List branches...</source>
- <translation>Listar branches...</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432"/>
- <source>List branches of the project</source>
- <translation>Lista las branches del proyecto</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/>
- <source><b>List branches</b><p>This lists the branches of the project.</p></source>
- <translation><b>Listar branches</b><p>Lista las branches del proyecto.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/>
- <source>Create branch</source>
- <translation>Crear branch</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/>
<source>Create &branch...</source>
<translation>Crear &branch...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/>
<source>Create a new branch for the local project in the repository</source>
<translation>Crear una nueva branch para el proyecto local en el repositorio</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/>
<source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source>
<translation><b>Crear branch</b><p>Crea una nueva branch para el proyecto local en el repositorio.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/>
<source>Close branch</source>
<translation>Cerrar branch</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/>
<source>Close the current branch of the local project</source>
<translation>Cerrar la branch actual para el proyecto local</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/>
<source><b>Close branch</b><p>This closes the current branch of the local project.</p></source>
<translation><b>Cerrar branch</b><p>Cierra la branch actual del proyecto local.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/>
<source>Switch</source>
<translation>Hacer switch</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/>
<source>S&witch...</source>
<translation>Hacer s&witch...</translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/>
+ <source>Switch the working directory to another revision</source>
+ <translation>Hacer switch del directorio de trabajo a otra revisión</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="491"/>
+ <source><b>Switch</b><p>This switches the working directory to another revision.</p></source>
+ <translation><b>Hacer switch</b><p>Hace un switch del directorio de trabajo a otra revisión.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/>
+ <source>Cleanup</source>
+ <translation>Limpiar (cleanup)</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/>
+ <source>Cleanu&p</source>
+ <translation>Lim&piar (cleanup)</translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/>
- <source>Switch the working directory to another revision</source>
- <translation>Hacer switch del directorio de trabajo a otra revisión</translation>
+ <source>Cleanup the local project</source>
+ <translation>Limpiar (cleanup) el proyecto local</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/>
- <source><b>Switch</b><p>This switches the working directory to another revision.</p></source>
- <translation><b>Hacer switch</b><p>Hace un switch del directorio de trabajo a otra revisión.</p></translation>
+ <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source>
+ <translation><b>Limpieza (cleanup)</b><p>Lleva a cabo un cleanup del proyecto local.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/>
- <source>Cleanup</source>
- <translation>Limpiar (cleanup)</translation>
+ <source>Execute command</source>
+ <translation>Ejecutar comando</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/>
- <source>Cleanu&p</source>
- <translation>Lim&piar (cleanup)</translation>
+ <source>E&xecute command...</source>
+ <translation>E&jecutar comando...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/>
- <source>Cleanup the local project</source>
- <translation>Limpiar (cleanup) el proyecto local</translation>
+ <source>Execute an arbitrary Mercurial command</source>
+ <translation>Ejecuta un comando Mercurial arbitrario</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/>
- <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source>
- <translation><b>Limpieza (cleanup)</b><p>Lleva a cabo un cleanup del proyecto local.</p></translation>
+ <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source>
+ <translation><b>Ejecutar comando</b><p>Abre un diálogo para introducir un comando Mercurial arbitrario.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/>
- <source>Execute command</source>
- <translation>Ejecutar comando</translation>
+ <source>Command options</source>
+ <translation>Opciones de comando</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/>
- <source>E&xecute command...</source>
- <translation>E&jecutar comando...</translation>
+ <source>Command &options...</source>
+ <translation>&Opciones de comando...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/>
- <source>Execute an arbitrary Mercurial command</source>
- <translation>Ejecuta un comando Mercurial arbitrario</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/>
- <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source>
- <translation><b>Ejecutar comando</b><p>Abre un diálogo para introducir un comando Mercurial arbitrario.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/>
- <source>Command options</source>
- <translation>Opciones de comando</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/>
- <source>Command &options...</source>
- <translation>&Opciones de comando...</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/>
<source>Show the Mercurial command options</source>
<translation>Mostrar opciones de comando Mercurial</translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/>
+ <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source>
+ <translation><b>Opciones de comando...</b><p>Muestra un diálogo para editar las opciones de comando Mercurial.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/>
+ <source>Configure</source>
+ <translation>Configurar</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/>
+ <source>Configure...</source>
+ <translation>Configurar...</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/>
+ <source>Show the configuration dialog with the Mercurial page selected</source>
+ <translation>Mostrar el diálogo de configuración con la página de Mercurial seleccionada</translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/>
- <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source>
- <translation><b>Opciones de comando...</b><p>Muestra un diálogo para editar las opciones de comando Mercurial.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/>
- <source>Configure</source>
- <translation>Configurar</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/>
- <source>Configure...</source>
- <translation>Configurar...</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/>
- <source>Show the configuration dialog with the Mercurial page selected</source>
- <translation>Mostrar el diálogo de configuración con la página de Mercurial seleccionada</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/>
<source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source>
<translation><b>Configurar</b><p>Mostrar el diálogo de configuración con la página de Mercurial seleccionada.</p></translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/>
+ <source>Show paths</source>
+ <translation>Mostrar rutas</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/>
+ <source>Show paths...</source>
+ <translation>Mostrar rutas...</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/>
+ <source>Show the aliases for remote repositories</source>
+ <translation>Mostrar los alias para los repositorios remotos</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/>
+ <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source>
+ <translation><b>Mostrar rutas</b><p>Muestra los alias para los repositorios remotos.</p></translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/>
- <source>Show paths</source>
- <translation>Mostrar rutas</translation>
+ <source>Verify repository</source>
+ <translation>Verificar repositorio</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/>
- <source>Show paths...</source>
- <translation>Mostrar rutas...</translation>
+ <source>Verify repository...</source>
+ <translation>Verificar repositorio...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="605"/>
- <source>Show the aliases for remote repositories</source>
- <translation>Mostrar los alias para los repositorios remotos</translation>
+ <source>Verify the integrity of the repository</source>
+ <translation>Verificar la integridad del repositorio</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/>
- <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source>
- <translation><b>Mostrar rutas</b><p>Muestra los alias para los repositorios remotos.</p></translation>
+ <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source>
+ <translation><b>Verificar repositorio</b><p>Verifica la integridad del repositorio.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/>
- <source>Verify repository</source>
- <translation>Verificar repositorio</translation>
+ <source>Recover</source>
+ <translation>Recuperar</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/>
- <source>Verify repository...</source>
- <translation>Verificar repositorio...</translation>
+ <source>Recover...</source>
+ <translation>Recuperar...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/>
- <source>Verify the integrity of the repository</source>
- <translation>Verificar la integridad del repositorio</translation>
+ <source>Recover from an interrupted transaction</source>
+ <translation>Recuperar de una transacción interrumpida</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/>
- <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source>
- <translation><b>Verificar repositorio</b><p>Verifica la integridad del repositorio.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/>
- <source>Recover</source>
- <translation>Recuperar</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/>
- <source>Recover...</source>
- <translation>Recuperar...</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/>
- <source>Recover from an interrupted transaction</source>
- <translation>Recuperar de una transacción interrumpida</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/>
<source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source>
<translation><b>Recuperar</b><p>Recupera de una transacción interrumpida.</p></translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/>
+ <source>Create .hgignore</source>
+ <translation>Crear .hgignore</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/>
+ <source>Create a .hgignore file with default values</source>
+ <translation>Creare un archivo .hgignore con valores por defecto</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/>
+ <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source>
+ <translation><b>Crear .hgignore</b><p>Crea un archivo .hgignore con valores por defecto.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/>
+ <source>Repository Administration</source>
+ <translation>Administración del Repositorio</translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/>
- <source>Create .hgignore</source>
- <translation>Crear .hgignore</translation>
+ <source>Create changegroup</source>
+ <translation>Crear changegroup</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/>
+ <source>Create changegroup...</source>
+ <translation>Crear changegroup...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/>
- <source>Create a .hgignore file with default values</source>
- <translation>Creare un archivo .hgignore con valores por defecto</translation>
+ <source>Create changegroup file collecting changesets</source>
+ <translation>Crea un archivo de changegroup recogiendo changesets</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/>
+ <source>Apply changegroups</source>
+ <translation>Aplicar changegroups</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/>
+ <source>Apply changegroups...</source>
+ <translation>Aplicar changegroups...</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/>
+ <source>Apply one or several changegroup files</source>
+ <translation>Aplicar uno o varios archivos de changegroup</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/>
+ <source>Changegroup Management</source>
+ <translation>Gestión de Chagegroup</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/>
- <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source>
- <translation><b>Crear .hgignore</b><p>Crea un archivo .hgignore con valores por defecto.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/>
- <source>Repository Administration</source>
- <translation>Administración del Repositorio</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/>
- <source>Create changegroup</source>
- <translation>Crear changegroup</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/>
- <source>Create changegroup...</source>
- <translation>Crear changegroup...</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/>
- <source>Create changegroup file collecting changesets</source>
- <translation>Crea un archivo de changegroup recogiendo changesets</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/>
- <source>Apply changegroups</source>
- <translation>Aplicar changegroups</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/>
- <source>Apply changegroups...</source>
- <translation>Aplicar changegroups...</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/>
- <source>Apply one or several changegroup files</source>
- <translation>Aplicar uno o varios archivos de changegroup</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/>
- <source>Changegroup Management</source>
- <translation>Gestión de Chagegroup</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/>
<source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source>
<translation><b>Crear changegroup</b><p>Crea un archivo de changegroup recogiendo los changeset seleccionados (hg bundle).</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702"/>
<source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source>
<translation><b>Aplicar changegroups</b><p>Aplica uno o varios archivos de changegroup generados por la acción 'Crear changegroup' (hg unbundle).</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/>
<source>Show current branch</source>
<translation>Mostrar la branch actual</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/>
<source>Show the current branch of the project</source>
<translation>Mostrar la branch actual del proyecto</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/>
<source><b>Show current branch</b><p>This shows the current branch of the project.</p></source>
<translation><b>Mostrar branch actual</b><p>Muestra la branch actual del proyecto.</p></translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/>
+ <source>Mark as "good"</source>
+ <translation>Marcar como "bueno"</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/>
+ <source>Mark a selectable changeset as good</source>
+ <translation>Marcar un changeset seleccionable como bueno</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="716"/>
+ <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source>
+ <translation><b>Marcar como bueno</b><p>Marca un changeset seleccionable como bueno.</p></translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/>
- <source>Mark as "good"</source>
- <translation>Marcar como "bueno"</translation>
+ <source>Mark as "bad"</source>
+ <translation>Marcar como "malo"</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/>
- <source>Mark a selectable changeset as good</source>
- <translation>Marcar un changeset seleccionable como bueno</translation>
+ <source>Mark a selectable changeset as bad</source>
+ <translation>Marcar un changeset seleccionable como malo</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/>
- <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source>
- <translation><b>Marcar como bueno</b><p>Marca un changeset seleccionable como bueno.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/>
- <source>Mark as "bad"</source>
- <translation>Marcar como "malo"</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/>
- <source>Mark a selectable changeset as bad</source>
- <translation>Marcar un changeset seleccionable como malo</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/>
<source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source>
<translation><b>Marcar como malo</b><p>Marca un changeset seleccionable como malo.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/>
- <source>Skip</source>
- <translation>Saltar</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/>
- <source>Reset</source>
- <translation>Reiniciar</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/>
- <source>Reset the bisect search data</source>
- <translation>Reiniciar los datos de búsqueda de bisect</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/>
- <source><b>Reset</b><p>This resets the bisect search data.</p></source>
- <translation><b>Reiniciar</b><p>Reinicia los datos de búsqueda de bisect.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/>
- <source>Bisect</source>
- <translation>Bisect</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/>
- <source>Mark as "good"...</source>
- <translation>Marcar como "bueno"...</translation>
- </message>
- <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/>
+ <source>Skip</source>
+ <translation>Saltar</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/>
+ <source>Reset</source>
+ <translation>Reiniciar</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/>
+ <source>Reset the bisect search data</source>
+ <translation>Reiniciar los datos de búsqueda de bisect</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/>
+ <source><b>Reset</b><p>This resets the bisect search data.</p></source>
+ <translation><b>Reiniciar</b><p>Reinicia los datos de búsqueda de bisect.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/>
+ <source>Bisect</source>
+ <translation>Bisect</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/>
+ <source>Mark as "good"...</source>
+ <translation>Marcar como "bueno"...</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/>
<source>Mark as "bad"...</source>
<translation>Marcar como "malo"...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/>
<source>Preview changegroup</source>
<translation>Previsualizar changegroup</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/>
<source>Preview changegroup...</source>
<translation>Previsualizar changegroup...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/>
<source>Identify</source>
<translation>Identificar</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/>
<source>Identify...</source>
<translation>Identificar...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/>
<source>Identify the project directory</source>
<translation>Identificar el directorio de proyecto</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/>
<source><b>Identify</b><p>This identifies the project directory.</p></source>
<translation><b>Identificar</b><p>Identifica el directorio de proyecto.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="671"/>
<source>Preview a changegroup file containing a collection of changesets</source>
<translation>Previsualizar un archivo de changegroup conteniendo una colección de changesets</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/>
<source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source>
<translation><b>Previsualizar changegroup</b><p>Previsualiza un archivo de changegroup conteniendo una colección de changesets.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/>
<source>Identify changegroup</source>
<translation>Identificar changegroup</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/>
<source>Identify changegroup...</source>
<translation>Identificar changegroup...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/>
<source>Identify a changegroup file containing a collection of changesets</source>
<translation>Identificar un archivo de changegroup conteniendo una colección de changesets</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/>
<source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source>
<translation><b>Identificar changegroup</b><p>Identifica un archivo de changegroup conteniendo una colección de changesets.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/>
<source>Back out changeset</source>
<translation>Hacer respaldo de changeset</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/>
<source>Back out changes of an earlier changeset</source>
<translation>Hacer respaldo de cambios de un changeset anterior</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/>
<source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source>
<translation><b>Hacer respaldo de changeset</b><p>Hace un respaldo de cambios de un changeset anterior.</p></translation>
</message>
@@ -20274,260 +20279,280 @@
<translation><b>Hacer push de cambios (force)</b><p>Se hace un push de los cambios desde el repositorio local a un repositorio remoto utilizando la opción 'force'.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/>
<source>Specials</source>
<translation>Especial</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/>
<source>Serve project repository</source>
<translation>Servir repositorio de proyecto</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/>
<source>Serve project repository...</source>
<translation>Servir repositorio de proyecto...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803"/>
<source>Serve the project repository</source>
<translation>Servir el repositorio de proyecto</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/>
<source><b>Serve project repository</b><p>This serves the project repository.</p></source>
<translation><b>Servir repositorio de proyecto</b><p>Esto sirve el repositorio de proyecto.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1094"/>
<source>Pull</source>
<translation>Hacer Pull</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/>
<source>The project should be reread. Do this now?</source>
<translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/>
<source>Push new branch</source>
<translation>Hacer push de nueva rama</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/>
<source>Push the current branch of the local project as a new named branch</source>
<translation>Ejecutar push de la rama actual del proyecto local como una nueva rama con nombre</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/>
<source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source>
<translation><b>Hacer push de nueva rama</b><p>Hace un push de la rama actual del proyecto local como una nueva rama con nombre.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/>
<source>Rollback last transaction</source>
<translation>Rollback de última transacción</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/>
<source>Rollback the last transaction</source>
<translation>Rollback de la última transacción</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/>
<source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care.</strong></p></source>
<translation><b>Rollback de última transacción</b><p>Lleva a cabo un rollback de la última transacción. Las transactiones se utilizan para encapsular los efectos de todos los comandos que crean nuevos changesets or propagan changesets existentes hacia un repository. Por ejemplo, los siguientes comandos son transaccionales, y sus efectos pueden ser revertidos (rollback):<ul><li>commit</li><li>import</li><li>pull</li><li>push (con este repositorio como destino)</li><li>unbundle</li></ul></p><p><strong>Este comando es peligroso. Utiliícelo por favor con cuidado.</strong></p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/>
<source>Extensions</source>
<translation>Extensiones</translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/>
+ <source>Edit user configuration</source>
+ <translation>Editar configuración de usuario</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/>
+ <source>Edit user configuration...</source>
+ <translation>Editar configuración de usuario...</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/>
+ <source>Show an editor to edit the user configuration file</source>
+ <translation>Mostrar un editor para editar el archivo de configuración de usuario</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/>
+ <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source>
+ <translation><b>Editar configuración de usuario</b><p>Mostrar un editor para editar el archivo de configuración de usuario.</p></translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/>
- <source>Edit user configuration</source>
- <translation>Editar configuración de usuario</translation>
+ <source>Edit repository configuration</source>
+ <translation>Editar configuración del repositorio</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/>
- <source>Edit user configuration...</source>
- <translation>Editar configuración de usuario...</translation>
+ <source>Edit repository configuration...</source>
+ <translation>Editar configuración del repositorio...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/>
- <source>Show an editor to edit the user configuration file</source>
- <translation>Mostrar un editor para editar el archivo de configuración de usuario</translation>
+ <source>Show an editor to edit the repository configuration file</source>
+ <translation>Mostrar un editor para editar el archivo de configuración del repositorio</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/>
- <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source>
- <translation><b>Editar configuración de usuario</b><p>Mostrar un editor para editar el archivo de configuración de usuario.</p></translation>
+ <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source>
+ <translation><b>Editar configuración del repositorio</b><p>Mostrar un editor para editar el archivo de configuración del repositorio.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/>
- <source>Edit repository configuration</source>
- <translation>Editar configuración del repositorio</translation>
+ <source>Show combined configuration settings</source>
+ <translation>Mostrar ajustes de configuración combinados</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/>
- <source>Edit repository configuration...</source>
- <translation>Editar configuración del repositorio...</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/>
- <source>Show an editor to edit the repository configuration file</source>
- <translation>Mostrar un editor para editar el archivo de configuración del repositorio</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/>
- <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source>
- <translation><b>Editar configuración del repositorio</b><p>Mostrar un editor para editar el archivo de configuración del repositorio.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/>
- <source>Show combined configuration settings</source>
- <translation>Mostrar ajustes de configuración combinados</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/>
<source>Show combined configuration settings...</source>
<translation>Mostrar ajustes de configuración combinados...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="578"/>
<source>Show the combined configuration settings from all configuration files</source>
<translation>Mostrar los ajustes de configuración combinados de todos los archivos de configuración</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/>
<source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source>
<translation><b>Mostrar ajustes de configuración combinados</b><p>Muestra los ajustes de configuración combinados de todos los archivos de configuración.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/>
<source>Skip...</source>
<translation>Ignorar...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/>
<source>Skip a selectable changeset</source>
<translation>Ignorar un changeset seleccionable</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/>
<source><b>Skip</b><p>This skips a selectable changeset.</p></source>
<translation><b>Ignorar</b><p>Ignora un changeset seleccionable.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1311"/>
<source>Import Patch</source>
<translation>Importar Patch</translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/>
+ <source>Import Patch...</source>
+ <translation>Importar Patch...</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/>
+ <source>Import a patch from a patch file</source>
+ <translation>Importar un patch desde un archivo de patch</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/>
+ <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source>
+ <translation><b>Importar Patch</b><p>Importa un patch desde un archivo de patch al proyecto.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931"/>
+ <source>Patch Management</source>
+ <translation>Gestión de Patch</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/>
+ <source>Revert Changes</source>
+ <translation>Revertir cambios</translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/>
- <source>Import Patch...</source>
- <translation>Importar Patch...</translation>
+ <source>Export Patches</source>
+ <translation>Exportar Patches</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/>
+ <source>Export Patches...</source>
+ <translation>Exportar Patches...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/>
- <source>Import a patch from a patch file</source>
- <translation>Importar un patch desde un archivo de patch</translation>
+ <source>Export revisions to patch files</source>
+ <translation>Exportar revisiones a archivos de patch</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/>
- <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source>
- <translation><b>Importar Patch</b><p>Importa un patch desde un archivo de patch al proyecto.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/>
- <source>Patch Management</source>
- <translation>Gestión de Patch</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344"/>
- <source>Revert Changes</source>
- <translation>Revertir cambios</translation>
+ <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source>
+ <translation><b>Exportar Patches</b><p>Exporta revisiones del proyecto a archivos de patch.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/>
- <source>Export Patches</source>
- <translation>Exportar Patches</translation>
+ <source>Change Phase</source>
+ <translation>Cambiar Fase</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/>
- <source>Export Patches...</source>
- <translation>Exportar Patches...</translation>
+ <source>Change Phase...</source>
+ <translation>Cambiar Fase...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="842"/>
- <source>Export revisions to patch files</source>
- <translation>Exportar revisiones a archivos de patch</translation>
+ <source>Change the phase of revisions</source>
+ <translation>Cambiar la fase de revisiones</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/>
- <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source>
- <translation><b>Exportar Patches</b><p>Exporta revisiones del proyecto a archivos de patch.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/>
- <source>Change Phase</source>
- <translation>Cambiar Fase</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/>
- <source>Change Phase...</source>
- <translation>Cambiar Fase...</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/>
- <source>Change the phase of revisions</source>
- <translation>Cambiar la fase de revisiones</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/>
<source><b>Change Phase</b><p>This changes the phase of revisions.</p></source>
<translation><b>Cambiar Fase</b><p>Cambia la fase de revisiones.</p></translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1349"/>
+ <source>Copy Changesets</source>
+ <translation>Copiar Changesets</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="856"/>
+ <source>Copies changesets from another branch</source>
+ <translation>Copiar changesets de otra branch</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/>
+ <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source>
+ <translation><b>Copiar Changesets</b><p>Copia changesets de otra branch encima del directorio de trabajo actual con el usuario, fecha y descripción del changeset original.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/>
+ <source>Continue Copying Session</source>
+ <translation>Continuar Sesión de Copia</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/>
+ <source>Continue the last copying session after conflicts were resolved</source>
+ <translation>Continuar la última sesión de copia despues de resolver los conflictos</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/>
+ <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source>
+ <translation><b>Continuar Sesión de C opia</b><p>Continua la última sesión de copia despues de resolver los conflictos.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/>
+ <source>Graft</source>
+ <translation>Graft</translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/>
- <source>Copy Changesets</source>
- <translation>Copiar Changesets</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/>
- <source>Copies changesets from another branch</source>
- <translation>Copiar changesets de otra branch</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/>
- <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source>
- <translation><b>Copiar Changesets</b><p>Copia changesets de otra branch encima del directorio de trabajo actual con el usuario, fecha y descripción del changeset original.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/>
- <source>Continue Copying Session</source>
- <translation>Continuar Sesión de Copia</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/>
- <source>Continue the last copying session after conflicts were resolved</source>
- <translation>Continuar la última sesión de copia despues de resolver los conflictos</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/>
- <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source>
- <translation><b>Continuar Sesión de C opia</b><p>Continua la última sesión de copia despues de resolver los conflictos.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/>
- <source>Graft</source>
- <translation>Graft</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/>
<source>Copy Changesets (Continue)</source>
<translation>Copiar Changesets (Continuar)</translation>
</message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/>
+ <source>Conflicts resolved</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/>
+ <source>Con&flicts resolved</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/>
+ <source>Mark all conflicts of the local project as resolved</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/>
+ <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgPurgeListDialog</name>
@@ -29512,7 +29537,7 @@
<translation><b>Cobertura de Código...</b><p>Muestra la información de cobertura de código para todos los archivos Python en el proyecto.</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="3901"/>
+ <location filename="Project/Project.py" line="3903"/>
<source>Profile Data</source>
<translation>Datos de perfil</translation>
</message>
@@ -29532,7 +29557,7 @@
<translation><b>Datos de Profiling...</b><p>Muestra datos de profiling para el proyecto.</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="3954"/>
+ <location filename="Project/Project.py" line="3956"/>
<source>Application Diagram</source>
<translation>Diagrama de Aplicación</translation>
</message>
@@ -29552,7 +29577,7 @@
<translation><b>Diagrama de Aplicación...</b><p>Muestra un diagrama del proyecto.</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="4085"/>
+ <location filename="Project/Project.py" line="4087"/>
<source>Create Package List</source>
<translation>Crear Lista del Paquete</translation>
</message>
@@ -29562,7 +29587,7 @@
<translation>Crear Lista del &Paquete</translation>
</message>
<message>
- <location filename="Project/Project.py" line="4245"/>
+ <location filename="Project/Project.py" line="4247"/>
<source>Create Plugin Archive</source>
<translation>Crear Archivo de Plugin</translation>
</message>
@@ -29647,47 +29672,47 @@
<translation>Sistema de control de versiones</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3834"/>
+ <location filename="Project/Project.py" line="3836"/>
<source>Coverage Data</source>
<translation>Datos de Cobertura</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3880"/>
+ <location filename="Project/Project.py" line="3882"/>
<source>There is no main script defined for the current project. Aborting</source>
<translation>No hay script principal definido para el proyecto actual. Abortando</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3855"/>
+ <location filename="Project/Project.py" line="3857"/>
<source>Code Coverage</source>
<translation>Cobertura de codigo</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3855"/>
+ <location filename="Project/Project.py" line="3857"/>
<source>Please select a coverage file</source>
<translation>Por favor seleccione un archivo de cobertura</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3901"/>
+ <location filename="Project/Project.py" line="3903"/>
<source>Please select a profile file</source>
<translation>Por favor seleccione un archivo de profiling</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3954"/>
+ <location filename="Project/Project.py" line="3956"/>
<source>Include module names?</source>
<translation>¿Incluir nombres de módulos?</translation>
</message>
<message>
- <location filename="Project/Project.py" line="4058"/>
+ <location filename="Project/Project.py" line="4060"/>
<source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source>
<translation><p>El archivo <b>PKGLIST</b> ya existe.</p><p>¿Desea sobreescribirlo?</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="4102"/>
+ <location filename="Project/Project.py" line="4104"/>
<source><p>The file <b>PKGLIST</b> does not exist. Aborting...</p></source>
<translation><p>El archivo <b>PKGLIST</b> no existe. Abortando...</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="4110"/>
+ <location filename="Project/Project.py" line="4112"/>
<source>The project does not have a main script defined. Aborting...</source>
<translation>No hay script principal definido para el proyecto actual. Abortando...</translation>
</message>
@@ -29902,32 +29927,32 @@
<translation><p>El VCS seleccionado <b>{0}</b> no ha sido encontrado.<br>Deshabilitando control de versiones.</p><p>{1}</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="4085"/>
+ <location filename="Project/Project.py" line="4087"/>
<source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source>
<translation><p>El archivo <b>PKGLIST</b> no puede ser creado.</p><p>Causa: {0}</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="4122"/>
+ <location filename="Project/Project.py" line="4124"/>
<source><p>The file <b>PKGLIST</b> could not be read.</p><p>Reason: {0}</p></source>
<translation><p>El archivo <b>PKGLIST</b> no puede ser leido.</p><p>Causa: {0}</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="4133"/>
+ <location filename="Project/Project.py" line="4135"/>
<source><p>The eric5 plugin archive file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source>
<translation><p>El archivo de plugin de eric5 <b>{0}</b> no ha podido ser creado. Abortando...</p><p>Razón: {1}</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="4153"/>
+ <location filename="Project/Project.py" line="4155"/>
<source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source>
<translation><p>El fichero<b>{0}</b> no ha podido ser almacenado en el archivo. Va a ser ignorado.</p><p>Causa: {1}</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="4165"/>
+ <location filename="Project/Project.py" line="4167"/>
<source><p>The eric5 plugin archive file <b>{0}</b> was created successfully.</p></source>
<translation><p>El archivo de plugin de eric5 <b>{0}</b> se ha creado satisfactoriamente.</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="4245"/>
+ <location filename="Project/Project.py" line="4247"/>
<source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source>
<translation><p>El archivo de plugin<b>{0}</b> no puede ser leido.</p><p>Causa: {1}</p></translation>
</message>
@@ -38119,202 +38144,202 @@
<context>
<name>Subversion</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="194"/>
+ <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="195"/>
<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="196"/>
+ <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="197"/>
<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="221"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/>
<source>Create project in repository</source>
<translation>Crear proyecto en el repositorio</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="221"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/>
<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="243"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/>
<source>New project</source>
<translation>Proyecto nuevo</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="243"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/>
<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="313"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="314"/>
<source>Importing project into Subversion repository</source>
<translation>Importando proyecto al repositorio Subversion</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="363"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="364"/>
<source>Subversion Checkout</source>
<translation>Checkout de Subversion</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="425"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/>
<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="384"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="385"/>
<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="425"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/>
<source>Subversion Export</source>
<translation>Export de Subversion</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="445"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="446"/>
<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="529"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="530"/>
<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="585"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="586"/>
<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="686"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="687"/>
<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="785"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="786"/>
<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="820"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/>
<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="1125"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/>
<source>Subversion Error</source>
<translation>Error de Subversion</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="986"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="987"/>
<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="1010"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1011"/>
<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="1074"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1075"/>
<source>Reverting changes</source>
<translation>Revirtiendo cambios</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1101"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1102"/>
<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="1125"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/>
<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="1548"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/>
<source>Subversion command</source>
<translation>Comando de Subversion</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1655"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1670"/>
<source>Resolving conficts</source>
<translation>Resolviendo conflictos</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1761"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1776"/>
<source>Subversion Set Property</source>
<translation>Asignar Propiedad de Subversion</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1794"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1809"/>
<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="1812"/>
- <source>Subversion Delete Property</source>
- <translation>Borrar Propiedad de Subversion</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1632"/>
- <source>Enter property name</source>
- <translation>Introducir nombre de la propiedad</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="922"/>
- <source>Subversion Log</source>
- <translation>Log de Subversion</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="922"/>
- <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="1978"/>
- <source>Locking in the Subversion repository</source>
- <translation>Bloqueando en el repositorio Subversion</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2016"/>
- <source>Unlocking in the Subversion repository</source>
- <translation>Desbloqueando en el repositorio Subversion</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1777"/>
- <source>Property set.</source>
- <translation>Propiedad establecida.</translation>
- </message>
- <message>
<location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1827"/>
+ <source>Subversion Delete Property</source>
+ <translation>Borrar Propiedad de Subversion</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1647"/>
+ <source>Enter property name</source>
+ <translation>Introducir nombre de la propiedad</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/>
+ <source>Subversion Log</source>
+ <translation>Log de Subversion</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/>
+ <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="1993"/>
+ <source>Locking in the Subversion repository</source>
+ <translation>Bloqueando en el repositorio Subversion</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2031"/>
+ <source>Unlocking in the Subversion repository</source>
+ <translation>Desbloqueando en el repositorio Subversion</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1792"/>
+ <source>Property set.</source>
+ <translation>Propiedad establecida.</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1842"/>
<source>Property deleted.</source>
<translation>Propiedad borrada.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1958"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/>
<source>Subversion Lock</source>
<translation>Bloqueo de Subversion</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1958"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/>
<source>Enter lock comment</source>
<translation>Introducir comentario para el bloqueo</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2061"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2076"/>
<source>Relocating</source>
<translation>Realojando</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2087"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/>
<source>Repository Browser</source>
<translation>Navegador de Repositorios</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2087"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/>
<source>Enter the repository URL.</source>
<translation>Introducir la URL del repositorio.</translation>
</message>
@@ -38469,17 +38494,17 @@
<translation>Sin versionar</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2111"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2126"/>
<source>Remove from changelist</source>
<translation>Quitar de la lista de cambios</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2147"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2162"/>
<source>Add to changelist</source>
<translation>Añadir a la lista de cambios</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2137"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2152"/>
<source>Enter name of the changelist:</source>
<translation>Introduzca el nombre de la lista de cambios:</translation>
</message>
@@ -38499,53 +38524,53 @@
<translation>Lista de cambios movida</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="191"/>
+ <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/>
<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="882"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="883"/>
<source>Moving {0}</source>
<translation>Moviendo {0}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1045"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/>
<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="1147"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1148"/>
<source>Switching to {0}</source>
<translation>Haciendo un switch a {0}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1249"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1250"/>
<source>Merging {0}</source>
<translation>Haciendo un merge de {0}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1512"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1527"/>
<source>Cleaning up {0}</source>
<translation>Limpiando {0}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1694"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1709"/>
<source>Copying {0}</source>
<translation>Copiando {0}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="329"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="330"/>
<source>Imported revision {0}.
</source>
<translation>Importada revisión {0}.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="554"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="555"/>
<source>Committed revision {0}.</source>
<translation>Commit realizado para revisión {0}.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1154"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1155"/>
<source>Revision {0}.
</source>
<translation>Revisión {0}.</translation>
@@ -40093,7 +40118,7 @@
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/>
<source>Resolve conflict</source>
- <translation>Resolver conflicto</translation>
+ <translation type="obsolete">Resolver conflicto</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="388"/>
@@ -40175,6 +40200,11 @@
<source>Remove from Changelist</source>
<translation>Quitar de la lista de cambios</translation>
</message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/>
+ <source>Conflict resolved</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>SvnProjectHelper</name>
@@ -40241,523 +40271,543 @@
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/>
<source>Add to repository</source>
- <translation>Añadir al repositorio</translation>
+ <translation type="obsolete">Añadir al repositorio</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/>
<source>&Add to repository...</source>
- <translation>&Añadir al repositorio...</translation>
+ <translation type="obsolete">&Añadir al repositorio...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="92"/>
<source>Add the local project to the VCS repository</source>
- <translation>Añadir el proyecto local al repositorio VCS</translation>
+ <translation type="obsolete">Añadir el proyecto local al repositorio VCS</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="95"/>
<source><b>Add to repository</b><p>This adds (imports) the local project to the VCS repository.</p></source>
- <translation><b>Añadir al repositorio</b><p>Añade (import) el proyecto local al repositorio VCS.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="102"/>
+ <translation type="obsolete"><b>Añadir al repositorio</b><p>Añade (import) el proyecto local al repositorio VCS.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/>
<source>Remove from repository (and disk)</source>
<translation>Eliminar del repositorio (y del disco)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="102"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/>
<source>&Remove from repository (and disk)</source>
<translation>Eliminar del &repositorio (y del disco)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="106"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="93"/>
<source>Remove the local project from the VCS repository (and disk)</source>
<translation>Eliminar el proyecto local del repositorio VCS (y del disco)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="109"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="96"/>
<source><b>Remove from repository</b><p>This removes the local project from the VCS repository (and disk).</p></source>
<translation><b>Eliminar del repositorio</b><p>Elimina el proyecto local del repositorio VCS (y del disco).</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="117"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/>
<source>Show log</source>
<translation>Mostrar log</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="117"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/>
<source>Show &log</source>
<translation>Mostrar &log</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="121"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="108"/>
<source>Show the log of the local project</source>
<translation>Mostrar el log del proyecto local</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="124"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="111"/>
<source><b>Show log</b><p>This shows the log of the local project.</p></source>
<translation><b>Mostrar log</b><p>Muestra el log del proyecto local.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="134"/>
<source>Show difference</source>
<translation>Mostrar diferencia</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="134"/>
<source>Show &difference</source>
<translation>Mostrar &diferencia</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="151"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="138"/>
<source>Show the difference of the local project to the repository</source>
<translation>Muestra las diferencias entre el proyecto local y el repositorio</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="154"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="141"/>
<source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source>
<translation><b>Mostrar direfencia</b><p>Muestra la diferencia que hay entre el proyecto local y el repositorio.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="161"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="148"/>
<source>Show difference (extended)</source>
<translation>Mostrar diferencia (extendida)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="165"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/>
<source>Show the difference of revisions of the project to the repository</source>
<translation>Muestra la diferencia de revisiones entre el proyecto local y el repositorio</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="155"/>
<source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source>
<translation><b>Mostrar direfencia (extendida)</b><p>Muestra la diferencia entre revisiones seleccionables del proyecto.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="175"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="162"/>
<source>Show difference (URLs)</source>
<translation>Mostrar diferencia (URLs)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="166"/>
<source>Show the difference of the project between two repository URLs</source>
<translation>Muestra la diferencia de revisiones entre dos URLs de repositorios</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="182"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="169"/>
<source><b>Show difference (URLs)</b><p>This shows the difference of the project between two repository URLs.</p></source>
<translation><b>Mostrar direfencia (URLs)</b><p>Muestra la diferencia del proyecto entre dos URLs de repositorios.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="177"/>
<source>Show status</source>
<translation>Mostrar estado</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="177"/>
<source>Show &status</source>
<translation>Mostrar e&stado</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="181"/>
<source>Show the status of the local project</source>
<translation>Mostrar el estado del proyecto local</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="197"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="184"/>
<source><b>Show status</b><p>This shows the status of the local project.</p></source>
<translation><b>Mostrar estado</b><p>Muestra el estado del proyecto local.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/>
<source>Tag in repository</source>
<translation>Crear un Tag en el repositorio</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/>
<source>&Tag in repository...</source>
<translation>Crear un &Tag en el repositorio...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="223"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/>
<source>Tag the local project in the repository</source>
<translation>Crea un tag del proyecto local en el repositorio</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/>
<source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source>
<translation><b>Crear un Tag en el repositorio</b><p>Crea un tag del proyecto local en el repositorio.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/>
<source>Export from repository</source>
<translation>Exportar desde repositorio</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/>
<source>&Export from repository...</source>
<translation>&Exportar desde repositorio...</translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="224"/>
+ <source>Export a project from the repository</source>
+ <translation>Exportar un proyecto desde el repositorio</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="227"/>
+ <source><b>Export from repository</b><p>This exports a project from the repository.</p></source>
+ <translation><b>Exportar desde repositorio</b><p>Exporta un proyecto desde el repositorio.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/>
+ <source>Command options</source>
+ <translation>Opciones de comando</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/>
+ <source>Command &options...</source>
+ <translation>&Opciones de comando...</translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="237"/>
- <source>Export a project from the repository</source>
- <translation>Exportar un proyecto desde el repositorio</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="240"/>
- <source><b>Export from repository</b><p>This exports a project from the repository.</p></source>
- <translation><b>Exportar desde repositorio</b><p>Exporta un proyecto desde el repositorio.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/>
- <source>Command options</source>
- <translation>Opciones de comando</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/>
- <source>Command &options...</source>
- <translation>&Opciones de comando...</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="250"/>
<source>Show the VCS command options</source>
<translation>Mostrar opciones de comando VCS</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="251"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="238"/>
<source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source>
<translation><b>Opciones de comando...</b><p>Muestra un diálogo para editar las opciones de comando VCS.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/>
<source>Revert changes</source>
<translation>Revertir cambios</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/>
<source>Re&vert changes</source>
<translation>Re&vertir cambios</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/>
<source>Revert all changes made to the local project</source>
<translation>Revertir todos los cambios hechos al proyecto local</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="265"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="252"/>
<source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source>
<translation><b>Revertir cambios</b><p>Revierte todos los cambios hechos al proyecto local.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/>
<source>Merge</source>
<translation>Hacer merge</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/>
<source>Mer&ge changes...</source>
<translation>Hacer mer&ge de los cambios...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="276"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="263"/>
<source>Merge changes of a tag/revision into the local project</source>
<translation>Hacer merge de los cambios de una tag/revision en el proyecto local</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="279"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="266"/>
<source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source>
<translation><b>Merge</b><p>Hace un merge de los cambios de una tag/revision al proyecto local.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/>
<source>Switch</source>
<translation>Hacer switch</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/>
<source>S&witch...</source>
<translation>Hacer s&witch...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/>
<source>Switch the local copy to another tag/branch</source>
<translation>Hace un switch de la copia local a otra tag/branch</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="280"/>
<source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source>
<translation><b>Hacer switch</b><p>Hace un switch de la copia local a otra tag/branch.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/>
<source>Resolve conflicts</source>
- <translation>Resolver conflictos</translation>
+ <translation type="obsolete">Resolver conflictos</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/>
<source>Resolve con&flicts</source>
- <translation>Resolver con&flictos</translation>
+ <translation type="obsolete">Resolver con&flictos</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/>
<source>Resolve all conflicts of the local project</source>
- <translation>Resolver todos los conflictos del proyecto local</translation>
+ <translation type="obsolete">Resolver todos los conflictos del proyecto local</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/>
<source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source>
- <translation><b>Resolver conflictos</b><p>Resuelve todos los conflictos del proyecto local.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/>
+ <translation type="obsolete"><b>Resolver conflictos</b><p>Resuelve todos los conflictos del proyecto local.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/>
<source>Cleanup</source>
<translation>Limpiar (cleanup)</translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/>
+ <source>Cleanu&p</source>
+ <translation>Lim&piar (cleanup)</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/>
+ <source>Cleanup the local project</source>
+ <translation>Hacer limpieza (cleanup) del proyecto local</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/>
+ <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source>
+ <translation><b>Limpieza (cleanup)</b><p>Ejecuta un cleanup del proyecto local.</p></translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/>
- <source>Cleanu&p</source>
- <translation>Lim&piar (cleanup)</translation>
+ <source>Execute command</source>
+ <translation>Ejecutar comando</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/>
+ <source>E&xecute command...</source>
+ <translation>E&jecutar comando...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="316"/>
- <source>Cleanup the local project</source>
- <translation>Hacer limpieza (cleanup) del proyecto local</translation>
+ <source>Execute an arbitrary VCS command</source>
+ <translation>Ejecuta un comando VCS arbitrario</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/>
- <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source>
- <translation><b>Limpieza (cleanup)</b><p>Ejecuta un cleanup del proyecto local.</p></translation>
+ <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source>
+ <translation><b>Ejecutar comando</b><p>Abre un diálogo para introducir un comando VCS arbitrario.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/>
- <source>Execute command</source>
- <translation>Ejecutar comando</translation>
+ <source>List tags</source>
+ <translation>Listar tags</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/>
- <source>E&xecute command...</source>
- <translation>E&jecutar comando...</translation>
+ <source>List tags...</source>
+ <translation>Listar tags...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/>
- <source>Execute an arbitrary VCS command</source>
- <translation>Ejecuta un comando VCS arbitrario</translation>
+ <source>List tags of the project</source>
+ <translation>Lista los tags del proyecto</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="332"/>
- <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source>
- <translation><b>Ejecutar comando</b><p>Abre un diálogo para introducir un comando VCS arbitrario.</p></translation>
+ <source><b>List tags</b><p>This lists the tags of the project.</p></source>
+ <translation><b>Listar tags</b><p>Lista los tags del proyecto.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/>
- <source>List tags</source>
- <translation>Listar tags</translation>
+ <source>List branches</source>
+ <translation>Listar branches</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/>
- <source>List tags...</source>
- <translation>Listar tags...</translation>
+ <source>List branches...</source>
+ <translation>Listar branches...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="342"/>
- <source>List tags of the project</source>
- <translation>Lista los tags del proyecto</translation>
+ <source>List branches of the project</source>
+ <translation>Lista las branches del proyecto</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="345"/>
- <source><b>List tags</b><p>This lists the tags of the project.</p></source>
- <translation><b>Listar tags</b><p>Lista los tags del proyecto.</p></translation>
+ <source><b>List branches</b><p>This lists the branches of the project.</p></source>
+ <translation><b>Listar branches</b><p>Lista las branches del proyecto.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/>
- <source>List branches</source>
- <translation>Listar branches</translation>
+ <source>List repository contents</source>
+ <translation>Listar contenido del repositorio</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/>
- <source>List branches...</source>
- <translation>Listar branches...</translation>
+ <source>List repository contents...</source>
+ <translation>Listar contenido del repositorio...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="355"/>
- <source>List branches of the project</source>
- <translation>Lista las branches del proyecto</translation>
+ <source>Lists the contents of the repository</source>
+ <translation>Lista el contenido del repositorio</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/>
- <source><b>List branches</b><p>This lists the branches of the project.</p></source>
- <translation><b>Listar branches</b><p>Lista las branches del proyecto.</p></translation>
+ <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source>
+ <translation><b>Listar contenido del repositorio</b><p>Lista el contenido del repositorio.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/>
- <source>List repository contents</source>
- <translation>Listar contenido del repositorio</translation>
+ <source>Set Property</source>
+ <translation>Establecer propiedad</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/>
- <source>List repository contents...</source>
- <translation>Listar contenido del repositorio...</translation>
+ <source>Set Property...</source>
+ <translation>Establecer propiedad...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="368"/>
- <source>Lists the contents of the repository</source>
- <translation>Lista el contenido del repositorio</translation>
+ <source>Set a property for the project files</source>
+ <translation>Establece una propiedad para los archivos del proyecto</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/>
- <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source>
- <translation><b>Listar contenido del repositorio</b><p>Lista el contenido del repositorio.</p></translation>
+ <source><b>Set Property</b><p>This sets a property for the project files.</p></source>
+ <translation><b>Establecer Propiedad</b><p>Establece una propiedad para los archivos del proyecto.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/>
- <source>Set Property</source>
- <translation>Establecer propiedad</translation>
+ <source>List Properties</source>
+ <translation>Listar propiedades</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/>
- <source>Set Property...</source>
- <translation>Establecer propiedad...</translation>
+ <source>List Properties...</source>
+ <translation>Listar propiedades...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="381"/>
- <source>Set a property for the project files</source>
- <translation>Establece una propiedad para los archivos del proyecto</translation>
+ <source>List properties of the project files</source>
+ <translation>Listar propiedades de los archivos del proyecto</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="384"/>
- <source><b>Set Property</b><p>This sets a property for the project files.</p></source>
- <translation><b>Establecer Propiedad</b><p>Establece una propiedad para los archivos del proyecto.</p></translation>
+ <source><b>List Properties</b><p>This lists the properties of the project files.</p></source>
+ <translation><b>Listar Propiedades</b><p>Lista las propiedades de los archivos del proyecto.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/>
- <source>List Properties</source>
- <translation>Listar propiedades</translation>
+ <source>Delete Property</source>
+ <translation>Borrar propiedad</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/>
- <source>List Properties...</source>
- <translation>Listar propiedades...</translation>
+ <source>Delete Property...</source>
+ <translation>Borrar propiedad...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="394"/>
- <source>List properties of the project files</source>
- <translation>Listar propiedades de los archivos del proyecto</translation>
+ <source>Delete a property for the project files</source>
+ <translation>Borrar una propiedad de los archivos del proyecto</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="397"/>
- <source><b>List Properties</b><p>This lists the properties of the project files.</p></source>
- <translation><b>Listar Propiedades</b><p>Lista las propiedades de los archivos del proyecto.</p></translation>
+ <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source>
+ <translation><b>Borrar Propiedad</b><p>Borra una propiedad de los archivos del proyecto.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/>
+ <source>Show repository info</source>
+ <translation>Mostrar informacion del repositorio</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/>
+ <source>Show some repository related information for the local project</source>
+ <translation>Mostrar información relacionada con el repositorio para el proyecto local</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="198"/>
+ <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source>
+ <translation><b>Mostrar información del repositorio</b><p>Muestra información relacionada con el repositorio para el proyecto local.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/>
- <source>Delete Property</source>
- <translation>Borrar propiedad</translation>
+ <source>Relocate</source>
+ <translation>Trasladar (relocate)</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/>
- <source>Delete Property...</source>
- <translation>Borrar propiedad...</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="407"/>
- <source>Delete a property for the project files</source>
- <translation>Borrar una propiedad de los archivos del proyecto</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="410"/>
- <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source>
- <translation><b>Borrar Propiedad</b><p>Borra una propiedad de los archivos del proyecto.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="204"/>
- <source>Show repository info</source>
- <translation>Mostrar informacion del repositorio</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="208"/>
- <source>Show some repository related information for the local project</source>
- <translation>Mostrar información relacionada con el repositorio para el proyecto local</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/>
- <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source>
- <translation><b>Mostrar información del repositorio</b><p>Muestra información relacionada con el repositorio para el proyecto local.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/>
- <source>Relocate</source>
- <translation>Trasladar (relocate)</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/>
<source>Relocate...</source>
<translation>Trasladar (relocate)...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="421"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="408"/>
<source>Relocate the working copy to a new repository URL</source>
<translation>Trasladar la copia de trabajo a una nueva URL de repositorio</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="424"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="411"/>
<source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source>
<translation><b>Trasladar (relocate)</b><p>Traslada la copia de trabajo a una nueva URL de repositorio.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/>
<source>Repository Browser</source>
<translation>Navegador de Repositorios</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/>
<source>Repository Browser...</source>
<translation>Navegador de Repositorios...</translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="422"/>
+ <source>Show the Repository Browser dialog</source>
+ <translation>Mostrar diálogo de Navegador de Repositorios</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="425"/>
+ <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source>
+ <translation><b>Navegador de Repositorios</b><p>Muestra el diálogo de Navegador de Repositorios.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="118"/>
+ <source>Show log browser</source>
+ <translation>Mostrar navegador de log</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="122"/>
+ <source>Show a dialog to browse the log of the local project</source>
+ <translation>Mostrar un diálogo para navegar el log del proyecto local</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="125"/>
+ <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source>
+ <translation><b>Mostrar navegador de log</b><p>Muestra un diálogo para navegar el log del proyecto local. Al principio se muestra un número limitado de entradas. Se pueden recuperar más entradas despues.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/>
+ <source>Configure</source>
+ <translation>Configurar</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/>
+ <source>Configure...</source>
+ <translation>Configurar...</translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/>
- <source>Show the Repository Browser dialog</source>
- <translation>Mostrar diálogo de Navegador de Repositorios</translation>
+ <source>Show the configuration dialog with the Subversion page selected</source>
+ <translation>Mostrar el diálogo de configuración con la página de Subversion seleccionada</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="438"/>
- <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source>
- <translation><b>Navegador de Repositorios</b><p>Muestra el diálogo de Navegador de Repositorios.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/>
- <source>Show log browser</source>
- <translation>Mostrar navegador de log</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="135"/>
- <source>Show a dialog to browse the log of the local project</source>
- <translation>Mostrar un diálogo para navegar el log del proyecto local</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="138"/>
- <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source>
- <translation><b>Mostrar navegador de log</b><p>Muestra un diálogo para navegar el log del proyecto local. Al principio se muestra un número limitado de entradas. Se pueden recuperar más entradas despues.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/>
- <source>Configure</source>
- <translation>Configurar</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/>
- <source>Configure...</source>
- <translation>Configurar...</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="448"/>
- <source>Show the configuration dialog with the Subversion page selected</source>
- <translation>Mostrar el diálogo de configuración con la página de Subversion seleccionada</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="451"/>
<source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source>
<translation><b>Configurar</b><p>Mostrar el diálogo de configuración con la página de Subversion seleccionada.</p></translation>
</message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/>
+ <source>Conflicts resolved</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/>
+ <source>Con&flicts resolved</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/>
+ <source>Mark all conflicts of the local project as resolved</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/>
+ <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>SvnPropDelDialog</name>
@@ -49489,17 +49539,17 @@
<context>
<name>VersionControl</name>
<message>
- <location filename="VCS/VersionControl.py" line="536"/>
+ <location filename="VCS/VersionControl.py" line="547"/>
<source>Process Generation Error</source>
<translation>Error de Generación de Proceso</translation>
</message>
<message>
- <location filename="VCS/VersionControl.py" line="662"/>
+ <location filename="VCS/VersionControl.py" line="673"/>
<source>Repository status checking is switched off</source>
<translation>El chequeo de estado del repositorio está deshabilitado</translation>
</message>
<message>
- <location filename="VCS/VersionControl.py" line="536"/>
+ <location filename="VCS/VersionControl.py" line="547"/>
<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>
@@ -53057,17 +53107,17 @@
<context>
<name>mercurial</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1733"/>
<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="1727"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1741"/>
<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="1734"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1748"/>
<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>
@@ -53078,31 +53128,31 @@
</table></p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/>
<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="1715"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/>
<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="1731"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1745"/>
<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="1222"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1236"/>
<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="1238"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1252"/>
<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>
@@ -53111,7 +53161,7 @@
<tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1268"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282"/>
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
@@ -53128,7 +53178,7 @@
{2}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/>
<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>
@@ -53372,17 +53422,17 @@
<context>
<name>subversion</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1589"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1604"/>
<source>unknown</source>
<translation>desconocido</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1458"/>
+ <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1473"/>
<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="1590"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/>
<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>
