--- a/i18n/eric6_es.ts Sat Aug 04 15:38:09 2018 +0200
+++ b/i18n/eric6_es.ts Sat Aug 04 15:38:32 2018 +0200
@@ -29921,17 +29921,17 @@
<translation>Haciendo commit de cambios al repositorio Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/>
<source>Mercurial Command Server</source>
<translation>Servidor de Comandos de Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3350"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3401"/>
<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="3495"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/>
<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>
@@ -29941,52 +29941,52 @@
<translation>Importar Patch</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2955"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2960"/>
<source>Export Patches</source>
<translation>Exportar Patches</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3002"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3007"/>
<source>Change Phase</source>
<translation>Cambiar Fase</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3055"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3063"/>
<source>Copy Changesets</source>
<translation>Copiar Changesets</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3112"/>
<source>Copy Changesets (Continue)</source>
<translation>Copiar Changesets (Continuar)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/>
<source>Add Sub-repository</source>
<translation>Añadir Sub-repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3303"/>
<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="3200"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/>
<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="3271"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/>
<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="3271"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/>
<source>Remove Sub-repositories</source>
<translation>Eliminar Sub-repositorios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291"/>
<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>
@@ -30016,7 +30016,7 @@
<translation>¿Realmente desea revertir todos los cambios del proyecto?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3167"/>
<source>Create Unversioned Archive</source>
<translation>Crear Archivo Sin Versionar</translation>
</message>
@@ -30051,62 +30051,62 @@
<translation>Tip branch actual</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3614"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665"/>
<source>Mercurial Bookmark</source>
<translation>Marcador de Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/>
<source>Delete Bookmark</source>
<translation>Borrar Marcador</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/>
<source>Select the bookmark to be deleted:</source>
<translation>Seleccionar el marcador a borrar:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3647"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3698"/>
<source>Delete Mercurial Bookmark</source>
<translation>Borrar Marcador de Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3680"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3731"/>
<source>Rename Mercurial Bookmark</source>
<translation>Renombrar Marcador de Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3773"/>
<source>Move Mercurial Bookmark</source>
<translation>Mover Marcador de Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/>
<source>Pull Bookmark</source>
<translation>Pull de Marcador</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/>
<source>Select the bookmark to be pulled:</source>
<translation>Seleccinar el marcador sobre el que hacer pull:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3829"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3880"/>
<source>Pulling bookmark from a remote Mercurial repository</source>
<translation>Haciendo pull de marcador desde un repositorio Mercurial remoto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/>
<source>Push Bookmark</source>
<translation>Push de Marcador</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/>
<source>Select the bookmark to be push:</source>
<translation>Seleccinar el marcador sobre el que hacer push:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3873"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3924"/>
<source>Pushing bookmark to a remote Mercurial repository</source>
<translation>Haciendo push de marcador desde un repositorio Mercurial remoto</translation>
</message>
@@ -30141,12 +30141,12 @@
<translation>Marcando como 'resolved'</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/>
<source>Delete All Backups</source>
<translation>Borrar todas las Copias de Seguridad</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/>
<source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source>
<translation><p>¿Desea realmente borrar todos los bundles de copia de seguridad almacenados en el área de copias de seguridad <b>{0}</b>?</p></translation>
</message>
@@ -30155,6 +30155,16 @@
<source>Canceling uncommitted merge</source>
<translation>Cancelando merge sin commit</translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3124"/>
+ <source>Copy Changesets (Stop)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3137"/>
+ <source>Copy Changesets (Abort)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgAddSubrepositoryDialog</name>
@@ -31719,22 +31729,22 @@
<translation>Introducir changesets por número, id, rango o expresión de revset, uno por línea</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="110"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="130"/>
<source>Compare Against Second Parent</source>
<translation>Comparar Contra el Segundo Parent</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="120"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="140"/>
<source>Treat all Files as Text</source>
<translation>Tratar todos los Archivos como Texto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="127"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="147"/>
<source>Omit Dates</source>
<translation>Omitir Fechas</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="134"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="154"/>
<source>Use Git extended Diff-Format</source>
<translation>Utilizar Formato de Diff extendido de Git</translation>
</message>
@@ -31750,6 +31760,16 @@
<translation><b>Nombre de destino</b>
<p>Introducir el nuevo nombre en este campo. El destino será el nuevo nombre o una ruta absoluta.</p></translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="105"/>
+ <source>Bookmark:</source>
+ <translation type="unfinished">Marcador:</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="118"/>
+ <source>Enter a bookmark name</source>
+ <translation type="unfinished">Introduzca un nombre de marcador</translation>
+ </message>
</context>
<context>
<name>HgFetchDialog</name>
@@ -32132,6 +32152,16 @@
<source>Perform Dry-Run</source>
<translation>Llevar a cabo Simulacro (Dry-Run)</translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="171"/>
+ <source>Select to not commit the copied changesets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="174"/>
+ <source>Don't Commit</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgHisteditCommitEditor</name>
@@ -34120,7 +34150,7 @@
<translation>Crea un archivo de changegroup recogiendo changesets</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1793"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1823"/>
<source>Apply changegroups</source>
<translation>Aplicar changegroups</translation>
</message>
@@ -34135,7 +34165,7 @@
<translation>Aplicar uno o varios archivos de changegroup</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1339"/>
<source>Changegroup Management</source>
<translation>Gestión de Chagegroup</translation>
</message>
@@ -34215,7 +34245,7 @@
<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="1322"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352"/>
<source>Bisect</source>
<translation>Bisect</translation>
</message>
@@ -34300,7 +34330,7 @@
<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="1300"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/>
<source>Specials</source>
<translation>Especial</translation>
</message>
@@ -34325,12 +34355,12 @@
<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="1610"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1640"/>
<source>Pull</source>
<translation>Hacer Pull</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1963"/>
<source>The project should be reread. Do this now?</source>
<translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation>
</message>
@@ -34360,7 +34390,7 @@
<translation>Rollback de la última transacción</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1397"/>
<source>Extensions</source>
<translation>Extensiones</translation>
</message>
@@ -34440,7 +34470,7 @@
<translation><b>Ignorar</b><p>Ignora un changeset seleccionable.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1849"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1879"/>
<source>Import Patch</source>
<translation>Importar Patch</translation>
</message>
@@ -34460,12 +34490,12 @@
<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="1316"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/>
<source>Patch Management</source>
<translation>Gestión de Patch</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1869"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/>
<source>Revert Changes</source>
<translation>Revertir cambios</translation>
</message>
@@ -34510,7 +34540,7 @@
<translation><b>Cambiar Fase</b><p>Cambia la fase de revisiones.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1889"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1919"/>
<source>Copy Changesets</source>
<translation>Copiar Changesets</translation>
</message>
@@ -34542,10 +34572,10 @@
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378"/>
<source>Graft</source>
- <translation>Graft</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/>
+ <translation type="obsolete">Graft</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1934"/>
<source>Copy Changesets (Continue)</source>
<translation>Copiar Changesets (Continuar)</translation>
</message>
@@ -34570,47 +34600,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="1006"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/>
<source>Add</source>
<translation>Añadir</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/>
<source>Add...</source>
<translation>Añadir...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/>
<source>Add a sub-repository</source>
<translation>Añadir un sub-repositorio</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/>
<source><b>Add...</b><p>Add a sub-repository to the project.</p></source>
<translation><b>Añadir...</b><p>Añadir un sub-repositorio al proyecto.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/>
<source>Remove</source>
<translation>Eliminar</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/>
<source>Remove...</source>
<translation>Eliminar...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/>
<source>Remove sub-repositories</source>
<translation>Eliminar sub-repositorios</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1059"/>
<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="1384"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1417"/>
<source>Sub-Repository</source>
<translation>Sub-repositorio</translation>
</message>
@@ -34640,22 +34670,22 @@
<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="1037"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/>
<source>Create unversioned archive</source>
<translation>Crear archivo sin versionar</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/>
<source>Create unversioned archive...</source>
<translation>Crear archivo sin versionar...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/>
<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="1045"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1075"/>
<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>
@@ -34665,7 +34695,7 @@
<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="1275"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1305"/>
<source>Administration</source>
<translation>Administración</translation>
</message>
@@ -34705,177 +34735,177 @@
<translation><b>Cancelar merge sin commit</b><p>Esto cancela un merge sin commit causando que todos los cambios se pierdan.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/>
<source>List bookmarks</source>
<translation>Listar marcadores</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/>
- <source>List bookmarks...</source>
- <translation>Listar marcadores...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/>
- <source>List bookmarks of the project</source>
- <translation>Lista marcadores del proyecto</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/>
- <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source>
- <translation><b>Listar marcadores</b><p>Lista los marcadores del proyecto.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/>
- <source>Define bookmark</source>
- <translation>Definir marcador</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/>
- <source>Define bookmark...</source>
- <translation>Definir marcador...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/>
- <source>Define a bookmark for the project</source>
- <translation>Define un marcador para el proyecto</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/>
- <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source>
- <translation><b>Definir marcador</b><p>Define un marcador para el proyecto.</p></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/>
- <source>Delete bookmark</source>
- <translation>Borrar marcador</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/>
- <source>Delete bookmark...</source>
- <translation>Borrar marcador...</translation>
+ <source>List bookmarks...</source>
+ <translation>Listar marcadores...</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/>
- <source>Delete a bookmark of the project</source>
- <translation>Borrar un marcador del proyecto</translation>
+ <source>List bookmarks of the project</source>
+ <translation>Lista marcadores del proyecto</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/>
- <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source>
- <translation><b>Borrar marcador</b><p>Borra un marcador del proyecto.</p></translation>
+ <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source>
+ <translation><b>Listar marcadores</b><p>Lista los marcadores del proyecto.</p></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/>
- <source>Rename bookmark</source>
- <translation>Renombrar marcador</translation>
+ <source>Define bookmark</source>
+ <translation>Definir marcador</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/>
- <source>Rename bookmark...</source>
- <translation>Renombrar marcador...</translation>
+ <source>Define bookmark...</source>
+ <translation>Definir marcador...</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/>
- <source>Rename a bookmark of the project</source>
- <translation>Renombrar un marcador del proyecto</translation>
+ <source>Define a bookmark for the project</source>
+ <translation>Define un marcador para el proyecto</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/>
- <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source>
- <translation><b>Renombrar marcador</b><p>Renombra un marcador del proyecto.</p></translation>
+ <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source>
+ <translation><b>Definir marcador</b><p>Define un marcador para el proyecto.</p></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/>
- <source>Move bookmark</source>
- <translation>Mover marcador</translation>
+ <source>Delete bookmark</source>
+ <translation>Borrar marcador</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/>
- <source>Move bookmark...</source>
- <translation>Mover marcador...</translation>
+ <source>Delete bookmark...</source>
+ <translation>Borrar marcador...</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/>
- <source>Move a bookmark of the project</source>
- <translation>Mover un marcador del proyecto</translation>
+ <source>Delete a bookmark of the project</source>
+ <translation>Borrar un marcador del proyecto</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/>
- <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source>
- <translation><b>Mover marcador</b><p>Mueve un marcador del proyecto.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/>
- <source>Show incoming bookmarks</source>
- <translation>Mostrar marcadores entrantes</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/>
- <source>Show a list of incoming bookmarks</source>
- <translation>Muestra una lista de marcadores entrantes</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1137"/>
- <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source>
- <translation><b>Mostrar marcadores entrantes</b><p>Muestra una lista de nuevos marcadores disponibles en el repositorio remoto.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/>
- <source>Pull bookmark</source>
- <translation>Pull de marcador</translation>
+ <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source>
+ <translation><b>Borrar marcador</b><p>Borra un marcador del proyecto.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/>
+ <source>Rename bookmark</source>
+ <translation>Renombrar marcador</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/>
+ <source>Rename bookmark...</source>
+ <translation>Renombrar marcador...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/>
+ <source>Rename a bookmark of the project</source>
+ <translation>Renombrar un marcador del proyecto</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/>
+ <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source>
+ <translation><b>Renombrar marcador</b><p>Renombra un marcador del proyecto.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/>
+ <source>Move bookmark</source>
+ <translation>Mover marcador</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/>
+ <source>Move bookmark...</source>
+ <translation>Mover marcador...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/>
+ <source>Move a bookmark of the project</source>
+ <translation>Mover un marcador del proyecto</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/>
+ <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source>
+ <translation><b>Mover marcador</b><p>Mueve un marcador del proyecto.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1159"/>
+ <source>Show incoming bookmarks</source>
+ <translation>Mostrar marcadores entrantes</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/>
+ <source>Show a list of incoming bookmarks</source>
+ <translation>Muestra una lista de marcadores entrantes</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/>
+ <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source>
+ <translation><b>Mostrar marcadores entrantes</b><p>Muestra una lista de nuevos marcadores disponibles en el repositorio remoto.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1176"/>
+ <source>Pull bookmark</source>
+ <translation>Pull de marcador</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1181"/>
<source>Pull a bookmark from a remote repository</source>
<translation>Hacer pull de marcador desde un repositorio remoto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1184"/>
<source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source>
<translation><b>Hacer pull de marcador</b><p>Hace pull de un marcador desde un repositorio remoto al repositorio local.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1208"/>
<source>Show outgoing bookmarks</source>
<translation>Mostrar marcadores salientes</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/>
<source>Show a list of outgoing bookmarks</source>
<translation>Muestra una lista de marcadores salientes</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/>
<source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source>
<translation><b>Mostrar marcadores salientes</b><p>Muestra una lista de nuevos marcadores disponibles en el repositorio local.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1195"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1225"/>
<source>Push bookmark</source>
<translation>Push de marcador</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1230"/>
<source>Push a bookmark to a remote repository</source>
<translation>Hacer push de marcador a un repositorio remoto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/>
<source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source>
<translation><b>Hacer push de marcador</b><p>Hace push de un marcador desde un repositorio local al repositorio remoto.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1376"/>
<source>Bookmarks</source>
<translation>Marcadores</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360"/>
<source>Tags</source>
<translation>Tags</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/>
<source>Branches</source>
<translation>Branches</translation>
</message>
@@ -34927,7 +34957,7 @@
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/>
<source>Manage Changes</source>
- <translation>Gestionar Cambios</translation>
+ <translation type="obsolete">Gestionar Cambios</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/>
@@ -34935,55 +34965,95 @@
<translation><b>Re-Merge</b><p>Aplica un re-merge a todos los archivos con conflictos sin resolver del proyecto, descartando cualquier intento anterior de merge.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1504"/>
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1192"/>
<source>Pull current bookmark</source>
<translation>Pull del marcador actual</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/>
<source>Pull the current bookmark from a remote repository</source>
<translation>Hacer pull del marcador actual desde repositorio remoto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1170"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/>
<source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source>
<translation><b>Pull de marcador actual<p>Ejecuta un pull del marcador actual desde un repositorio remoto al repositorio local.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1241"/>
<source>Push current bookmark</source>
<translation>Push de marcador actual</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1246"/>
<source>Push the current bookmark to a remote repository</source>
<translation>Hacer push del marcador actual hacia repositorio remoto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1219"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1249"/>
<source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source>
<translation><b>Push de marcador actual<p>Ejecuta un pshl del marcador actual desde 3l repositorio local hacia un repositorio remoto.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1258"/>
<source>Delete all backups</source>
<translation>Borrar todas las Copias de Seguridad</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1263"/>
<source>Delete all backup bundles stored in the backup area</source>
<translation>Borrar todos los bundles de copia de seguridad almacenados en el área de copias de seguridad</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/>
<source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source>
<translation><b>Borrar todas las copias de seguridad</b><p>Borra todos los bundles de copia de seguridad almacenados en el área de copias de seguridad del repositorio.</p></translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1007"/>
+ <source>Stop Copying Session</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/>
+ <source>Stop the interrupted copying session</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/>
+ <source>Abort Copying Session</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025"/>
+ <source>Abort the interrupted copying session and rollback</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1028"/>
+ <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1422"/>
+ <source>Merge Changesets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1948"/>
+ <source>Copy Changesets (Stop)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1963"/>
+ <source>Copy Changesets (Abort)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgPurgeListDialog</name>
@@ -35709,6 +35779,41 @@
<source>Current branch tip</source>
<translation>Tip branch actual</translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="428"/>
+ <source>Dry-Run</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="434"/>
+ <source>Select to not do a dry-run</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="437"/>
+ <source>No</source>
+ <translation type="unfinished">No</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="447"/>
+ <source>Select to just do a dry-run</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="450"/>
+ <source>Dry-Run Only</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="457"/>
+ <source>Select to do a dry-run first, than ask the user for confirmation to perform the rebase</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="460"/>
+ <source>Dry-Run First, than Confirm</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgRemoveSubrepositoriesDialog</name>
@@ -60043,17 +60148,17 @@
<context>
<name>Rebase</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="75"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="80"/>
<source>Rebase Changesets</source>
<translation>Hacer Rebase de Changesets</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="101"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="106"/>
<source>Rebase Changesets (Continue)</source>
<translation>Hacer Rebase de Changesets (Continuar)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="127"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="132"/>
<source>Rebase Changesets (Abort)</source>
<translation>Hacer Rebase de Changesets (Abortar)</translation>
</message>
