--- a/i18n/eric5_es.ts Tue Mar 25 19:34:15 2014 +0100
+++ b/i18n/eric5_es.ts Tue Mar 25 19:36:31 2014 +0100
@@ -19149,7 +19149,7 @@
<translation>Recuperando de transacción interrumpida</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2634"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/>
<source>Shall the working directory be updated?</source>
<translation>¿Debe ser actualizado el directorio de trabajo?</translation>
</message>
@@ -19164,22 +19164,22 @@
<translation>Crear changegroup</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2646"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2615"/>
<source>Apply changegroups</source>
<translation>Aplicar changegroups</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2664"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2633"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation>Subcomando bisect ({0}) inválido.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2700"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2669"/>
<source>Mercurial Bisect ({0})</source>
<translation>Mercurial Bisect ({0})</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2592"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2556"/>
<source>Preview changegroup</source>
<translation>Previsualizar changegroup</translation>
</message>
@@ -19199,7 +19199,7 @@
<translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2732"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2701"/>
<source>Removing files from the Mercurial repository only</source>
<translation>Eliminando archivos unicamente del repositorio Mercurial</translation>
</message>
@@ -19209,22 +19209,22 @@
<translation>Archivos Changegroup de Mercurial (*.hg)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2626"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/>
<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="2603"/>
<source>Identifying changegroup file</source>
- <translation>Identificando archivo de changegroup</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2792"/>
+ <translation type="obsolete">Identificando archivo de changegroup</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2761"/>
<source>Backing out changeset</source>
<translation>Haciendo respaldo de changeset</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2772"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2741"/>
<source>No revision given. Aborting...</source>
<translation>No se ha proporcionado revisión. Abortando...</translation>
</message>
@@ -19234,12 +19234,12 @@
<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="2819"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2788"/>
<source>Rollback last transaction</source>
<translation>Hacer Rollback de la última transacción</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2812"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2781"/>
<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>
@@ -19249,72 +19249,72 @@
<translation>Haciendo commit de cambios al repositorio Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3474"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3443"/>
<source>Mercurial Command Server</source>
<translation>Servidor de Comandos de Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3308"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3277"/>
<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="3474"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3443"/>
<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="2887"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2856"/>
<source>Import Patch</source>
<translation>Importar Patch</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2934"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2903"/>
<source>Export Patches</source>
<translation>Exportar Patches</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2981"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2950"/>
<source>Change Phase</source>
<translation>Cambiar Fase</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3034"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/>
<source>Copy Changesets</source>
<translation>Copiar Changesets</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3060"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3029"/>
<source>Copy Changesets (Continue)</source>
<translation>Copiar Changesets (Continuar)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3177"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3146"/>
<source>Add Sub-repository</source>
<translation>Añadir Sub-repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3210"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3179"/>
<source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source>
<translation><p>No se ha podido leer el archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3158"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3127"/>
<source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source>
<translation><p>El archivo .hgsub de sub-repositorios ya contiene una entrada.</p><p>Abortando...</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3229"/>
- <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source>
- <translation><p>No se ha podido escribir al archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3229"/>
- <source>Remove Sub-repositories</source>
- <translation>Eliminar Sub-repositorios</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3198"/>
+ <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source>
+ <translation><p>No se ha podido escribir al archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3198"/>
+ <source>Remove Sub-repositories</source>
+ <translation>Eliminar Sub-repositorios</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3167"/>
<source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source>
<translation><p>El archivo de subrepositorios .hgsub no existe. Abortando...</p></translation>
</message>
@@ -19344,7 +19344,7 @@
<translation>¿Realmente desea revertir todos los cambios del proyecto?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3095"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3064"/>
<source>Create Unversioned Archive</source>
<translation>Crear Archivo Sin Versionar</translation>
</message>
@@ -22896,22 +22896,22 @@
<translation>Crea un archivo de changegroup recogiendo changesets</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1407"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1385"/>
<source>Apply changegroups</source>
<translation>Aplicar changegroups</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/>
<source>Apply changegroups...</source>
<translation>Aplicar changegroups...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/>
<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="1056"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/>
<source>Changegroup Management</source>
<translation>Gestión de Chagegroup</translation>
</message>
@@ -22921,7 +22921,7 @@
<translation><b>Crear changegroup</b><p>Crea un archivo de changegroup recogiendo los changeset seleccionados (hg bundle).</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/>
<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>
@@ -22941,67 +22941,67 @@
<translation><b>Mostrar branch actual</b><p>Muestra la branch actual del proyecto.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/>
<source>Mark as "good"</source>
<translation>Marcar como "bueno"</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758"/>
<source>Mark a selectable changeset as good</source>
<translation>Marcar un changeset seleccionable como bueno</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/>
<source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source>
<translation><b>Marcar como bueno</b><p>Marca un changeset seleccionable como bueno.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/>
<source>Mark as "bad"</source>
<translation>Marcar como "malo"</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="787"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="772"/>
<source>Mark a selectable changeset as bad</source>
<translation>Marcar un changeset seleccionable como malo</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/>
<source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source>
<translation><b>Marcar como malo</b><p>Marca un changeset seleccionable como malo.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782"/>
<source>Skip</source>
<translation>Saltar</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/>
<source>Reset</source>
<translation>Reiniciar</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/>
<source>Reset the bisect search data</source>
<translation>Reiniciar los datos de búsqueda de bisect</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803"/>
<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="1070"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054"/>
<source>Bisect</source>
<translation>Bisect</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/>
<source>Mark as "good"...</source>
<translation>Marcar como "bueno"...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/>
<source>Mark as "bad"...</source>
<translation>Marcar como "malo"...</translation>
</message>
@@ -23048,35 +23048,35 @@
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/>
<source>Identify changegroup</source>
- <translation>Identificar changegroup</translation>
+ <translation type="obsolete">Identificar changegroup</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/>
<source>Identify changegroup...</source>
- <translation>Identificar changegroup...</translation>
+ <translation type="obsolete">Identificar changegroup...</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/>
<source>Identify a changegroup file containing a collection of changesets</source>
- <translation>Identificar un archivo de changegroup conteniendo una colección de changesets</translation>
+ <translation type="obsolete">Identificar un archivo de changegroup conteniendo una colección de changesets</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/>
<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="825"/>
+ <translation type="obsolete"><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="810"/>
<source>Back out changeset</source>
<translation>Hacer respaldo de changeset</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="814"/>
<source>Back out changes of an earlier changeset</source>
<translation>Hacer respaldo de cambios de un changeset anterior</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/>
<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>
@@ -23096,37 +23096,37 @@
<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="1047"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/>
<source>Specials</source>
<translation>Especial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/>
<source>Serve project repository</source>
<translation>Servir repositorio de proyecto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/>
<source>Serve project repository...</source>
<translation>Servir repositorio de proyecto...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="870"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/>
<source>Serve the project repository</source>
<translation>Servir el repositorio de proyecto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/>
<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="1244"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/>
<source>Pull</source>
<translation>Hacer Pull</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1518"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1496"/>
<source>The project should be reread. Do this now?</source>
<translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation>
</message>
@@ -23146,17 +23146,17 @@
<translation><b>Hacer push de nueva rama</b><p>Hace un push de la rama actual del proyecto local como una nueva rama con nombre.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="824"/>
<source>Rollback last transaction</source>
<translation>Rollback de última transacción</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="843"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/>
<source>Rollback the last transaction</source>
<translation>Rollback de la última transacción</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1078"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/>
<source>Extensions</source>
<translation>Extensiones</translation>
</message>
@@ -23221,127 +23221,127 @@
<translation><b>Mostrar ajustes de configuración combinados</b><p>Muestra los ajustes de configuración combinados de todos los archivos de configuración.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782"/>
<source>Skip...</source>
<translation>Ignorar...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/>
<source>Skip a selectable changeset</source>
<translation>Ignorar un changeset seleccionable</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/>
<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="1463"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1441"/>
<source>Import Patch</source>
<translation>Importar Patch</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/>
+ <source>Import Patch...</source>
+ <translation>Importar Patch...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/>
+ <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="872"/>
+ <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="1048"/>
+ <source>Patch Management</source>
+ <translation>Gestión de Patch</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1461"/>
+ <source>Revert Changes</source>
+ <translation>Revertir cambios</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/>
- <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="880"/>
+ <source>Export Patches...</source>
+ <translation>Exportar Patches...</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="884"/>
- <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="887"/>
- <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="1064"/>
- <source>Patch Management</source>
- <translation>Gestión de Patch</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1483"/>
- <source>Revert Changes</source>
- <translation>Revertir cambios</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/>
- <source>Export Patches</source>
- <translation>Exportar Patches</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/>
- <source>Export Patches...</source>
- <translation>Exportar Patches...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/>
- <source>Export revisions to patch files</source>
- <translation>Exportar revisiones a archivos de patch</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="902"/>
<source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source>
<translation><b>Exportar Patches</b><p>Exporta revisiones del proyecto a archivos de patch.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="894"/>
<source>Change Phase</source>
<translation>Cambiar Fase</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="894"/>
<source>Change Phase...</source>
<translation>Cambiar Fase...</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="898"/>
+ <source>Change the phase of revisions</source>
+ <translation>Cambiar la fase de revisiones</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="901"/>
+ <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="1481"/>
+ <source>Copy Changesets</source>
+ <translation>Copiar Changesets</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/>
- <source>Change the phase of revisions</source>
- <translation>Cambiar la fase de revisiones</translation>
+ <source>Copies changesets from another branch</source>
+ <translation>Copiar changesets de otra branch</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/>
- <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source>
- <translation><b>Cambiar Fase</b><p>Cambia la fase de revisiones.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1503"/>
- <source>Copy Changesets</source>
- <translation>Copiar Changesets</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/>
- <source>Copies changesets from another branch</source>
- <translation>Copiar changesets de otra branch</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931"/>
<source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source>
<translation><b>Copiar Changesets</b><p>Copia changesets de otra branch encima del directorio de trabajo actual con el usuario, fecha y descripción del changeset original.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="925"/>
<source>Continue Copying Session</source>
<translation>Continuar Sesión de Copia</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/>
<source>Continue the last copying session after conflicts were resolved</source>
<translation>Continuar la última sesión de copia despues de resolver los conflictos</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="947"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="932"/>
<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="1090"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/>
<source>Graft</source>
<translation>Graft</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1518"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1496"/>
<source>Copy Changesets (Continue)</source>
<translation>Copiar Changesets (Continuar)</translation>
</message>
@@ -23366,47 +23366,47 @@
<translation><b>Conflictos resueltos</b><p>Marca todos los conflictos del proyecto local como resueltos.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940"/>
<source>Add</source>
<translation>Añadir</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940"/>
+ <source>Add...</source>
+ <translation>Añadir...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/>
+ <source>Add a sub-repository</source>
+ <translation>Añadir un sub-repositorio</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948"/>
+ <source><b>Add...</b><p>Add a sub-repository to the project.</p></source>
+ <translation><b>Añadir...</b><p>Añadir un sub-repositorio al proyecto.</p></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/>
- <source>Add...</source>
- <translation>Añadir...</translation>
+ <source>Remove</source>
+ <translation>Eliminar</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/>
+ <source>Remove...</source>
+ <translation>Eliminar...</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/>
- <source>Add a sub-repository</source>
- <translation>Añadir un sub-repositorio</translation>
+ <source>Remove sub-repositories</source>
+ <translation>Eliminar sub-repositorios</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/>
- <source><b>Add...</b><p>Add a sub-repository to the project.</p></source>
- <translation><b>Añadir...</b><p>Añadir un sub-repositorio al proyecto.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/>
- <source>Remove</source>
- <translation>Eliminar</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/>
- <source>Remove...</source>
- <translation>Eliminar...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/>
- <source>Remove sub-repositories</source>
- <translation>Eliminar sub-repositorios</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="978"/>
<source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source>
<translation><b>Eliminar...</b><p>Eliminar sub-repositorios del proyecto.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1099"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/>
<source>Sub-Repository</source>
<translation>Sub-repositorio</translation>
</message>
@@ -23436,32 +23436,32 @@
<translation><b>Mostrar sumario</b><p>Muestra información sumarial del estado del directorio de trabajo.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/>
<source>Create unversioned archive</source>
<translation>Crear archivo sin versionar</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/>
<source>Create unversioned archive...</source>
<translation>Crear archivo sin versionar...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="976"/>
<source>Create an unversioned archive from the repository</source>
<translation>Crear un archivo sin versionar a partir del repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/>
<source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source>
<translation><b>Crear archivo sin versionar...</b><p>Crea un archivo sin versionar a partir del repositorio.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/>
<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="1024"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1009"/>
<source>Administration</source>
<translation>Administración</translation>
</message>
