--- a/i18n/eric5_es.ts Wed Feb 22 19:14:07 2012 +0100
+++ b/i18n/eric5_es.ts Wed Feb 22 19:22:42 2012 +0100
@@ -16333,42 +16333,42 @@
<context>
<name>Hg</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/>
<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="249"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="250"/>
<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="251"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="252"/>
<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="277"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/>
<source>Create project repository</source>
<translation>Crear repositorio del proyecto</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/>
<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="305"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="306"/>
<source>Creating Mercurial repository</source>
<translation>Creando repositorio Mercurial</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="321"/>
<source>Initial commit to Mercurial repository</source>
<translation>Commit inicial al repositorio Mercurial</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="366"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="367"/>
<source>Cloning project from a Mercurial repository</source>
<translation>Clonando proyecto desde un repositorio Mercurial</translation>
</message>
@@ -16378,32 +16378,32 @@
<translation type="obsolete">Haciendo commit de cambios al repositorio Mercurial</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="522"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="523"/>
<source>Synchronizing with the Mercurial repository</source>
<translation>Sincronizando con el repositorio Mercurial</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="574"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="575"/>
<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="638"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="639"/>
<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="702"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="703"/>
<source>Renaming {0}</source>
<translation>Renombrando {0}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="914"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="915"/>
<source>Merging</source>
<translation>Haciendo un merge</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1343"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1344"/>
<source>Copying {0}</source>
<translation>Copiando {0}</translation>
</message>
@@ -16418,200 +16418,210 @@
<translation type="obsolete">Seleccionar número de entradas a mostrar.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1588"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1589"/>
<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="1641"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1642"/>
<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="1760"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1761"/>
<source>Resolving files/directories</source>
<translation>Resolviendo archivos/directorios</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="831"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="832"/>
<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="864"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="865"/>
<source>Reverting changes</source>
<translation>Revirtiendo cambios</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1153"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1154"/>
<source>Mercurial command</source>
<translation>Comando de Mercurial</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/>
<source>Create Branch</source>
<translation>Crear Branch</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/>
<source>Enter branch name</source>
<translation>Introducir nombre de branch</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1792"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/>
<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="1873"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/>
<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="1898"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899"/>
<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="1921"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/>
<source>Showing aliases for remote repositories</source>
<translation>Mostrando alias para repositorios remotos</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945"/>
<source>Recovering from interrupted transaction</source>
<translation>Recuperando de transacción interrumpida</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2183"/>
<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="1816"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/>
<source>Showing current branch</source>
<translation>Mostrando la branch actual</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2092"/>
<source>Create changegroup</source>
<translation>Crear changegroup</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2195"/>
<source>Apply changegroups</source>
<translation>Aplicar changegroups</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2211"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation>Subcomando bisect ({0}) inválido.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2246"/>
<source>Mercurial Bisect ({0})</source>
<translation>Mercurial Bisect ({0})</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2143"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/>
<source>Preview changegroup</source>
<translation>Previsualizar changegroup</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968"/>
<source>Identifying project directory</source>
<translation>Identificando directorio de proyecto</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1999"/>
<source>Create .hgignore file</source>
<translation>Crear archivo .hgignore</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1999"/>
<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="2277"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2278"/>
<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="2049"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation>Archivos Changegroup de Mercurial (*.hg)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/>
<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="2153"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/>
<source>Identifying changegroup file</source>
<translation>Identificando archivo de changegroup</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2333"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2334"/>
<source>Backing out changeset</source>
<translation>Haciendo respaldo de changeset</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2313"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2314"/>
<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="2066"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/>
<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="2358"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2359"/>
<source>Rollback last transaction</source>
<translation>Hacer Rollback de la última transacción</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/>
<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="470"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="471"/>
<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="2664"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/>
<source>Mercurial Command Server</source>
<translation>Servidor de Comandos de Mercurial</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2616"/>
<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="2664"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/>
<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="2425"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2426"/>
<source>Import Patch</source>
<translation>Importar Patch</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2473"/>
<source>Export Patches</source>
<translation>Exportar Patches</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2518"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/>
<source>Change Phase</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566"/>
+ <source>Copy Changesets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/>
+ <source>Copy Changesets (Continue)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgAnnotateDialog</name>
@@ -18106,6 +18116,84 @@
</message>
</context>
<context>
+ <name>HgGraftDialog</name>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="14"/>
+ <source>Copy Changesets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="23"/>
+ <source>Revisions</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="29"/>
+ <source>Enter changesets by number, id, range or revset expression one per line</source>
+ <translation type="unfinished">Introducir changesets por número, id, rango o expresión de revset, uno por línea</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="45"/>
+ <source>Select to give user information</source>
+ <translation type="unfinished">Seleccionar para dar información del usuario</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="48"/>
+ <source>User</source>
+ <translation type="unfinished">Usuario</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="60"/>
+ <source>Select to use the name of the current user</source>
+ <translation type="unfinished">Seleccionar para utilizar el nombre del usuario actual</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="63"/>
+ <source>Use current user</source>
+ <translation type="unfinished">Utilizar usuario actual</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="70"/>
+ <source>Username:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="77"/>
+ <source>Enter the user name to be used</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="87"/>
+ <source>Select to give date and time information</source>
+ <translation type="unfinished">Seleccionar para dar información de fecha y hora</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="90"/>
+ <source>Date and Time</source>
+ <translation type="unfinished">Fecha y Hora</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="102"/>
+ <source>Select to use the current date and time</source>
+ <translation type="unfinished">Seleccionar para utilizar la fecha y hora actuales</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="105"/>
+ <source>Use current date and time</source>
+ <translation type="unfinished">Utilizar fecha y hora actuales</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="112"/>
+ <source>Date/Time:</source>
+ <translation type="unfinished">Fecha/Hora:</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="119"/>
+ <source>Enter the date and time to be used</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>HgImportDialog</name>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/>
@@ -19871,7 +19959,7 @@
<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="875"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/>
<source>Repository Administration</source>
<translation>Administración del Repositorio</translation>
</message>
@@ -19891,7 +19979,7 @@
<translation>Crea un archivo de changegroup recogiendo changesets</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1227"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/>
<source>Apply changegroups</source>
<translation>Aplicar changegroups</translation>
</message>
@@ -19906,7 +19994,7 @@
<translation>Aplicar uno o varios archivos de changegroup</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/>
<source>Changegroup Management</source>
<translation>Gestión de Chagegroup</translation>
</message>
@@ -19996,7 +20084,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="919"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/>
<source>Bisect</source>
<translation>Bisect</translation>
</message>
@@ -20101,7 +20189,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="898"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/>
<source>Specials</source>
<translation>Especial</translation>
</message>
@@ -20126,12 +20214,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="1065"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/>
<source>Pull</source>
<translation>Hacer Pull</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/>
<source>The project should be reread. Do this now?</source>
<translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation>
</message>
@@ -20166,7 +20254,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="927"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/>
<source>Extensions</source>
<translation>Extensiones</translation>
</message>
@@ -20246,7 +20334,7 @@
<translation><b>Ignorar</b><p>Ignora un changeset seleccionable.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/>
<source>Import Patch</source>
<translation>Importar Patch</translation>
</message>
@@ -20266,12 +20354,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="913"/>
+ <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="1301"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344"/>
<source>Revert Changes</source>
<translation>Revertir cambios</translation>
</message>
@@ -20315,6 +20403,46 @@
<source><b>Change Phase</b><p>This changes the phase of revisions.</p></source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/>
+ <source>Copy Changesets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/>
+ <source>Copies changesets from another branch</source>
+ <translation type="unfinished"></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 type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/>
+ <source>Continue Copying Session</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/>
+ <source>Continue the last copying session after conflicts were resolved</source>
+ <translation type="unfinished"></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 type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/>
+ <source>Graft</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/>
+ <source>Copy Changesets (Continue)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgPurgeListDialog</name>
@@ -51574,17 +51702,17 @@
<context>
<name>mercurial</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711"/>
<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="1718"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/>
<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="1725"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1726"/>
<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>
@@ -51595,31 +51723,31 @@
</table></p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1704"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1705"/>
<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="1706"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/>
<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="1722"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/>
<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="1213"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1214"/>
<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="1229"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/>
<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>
@@ -51628,7 +51756,7 @@
<tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1259"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1260"/>
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
@@ -51645,7 +51773,7 @@
{2}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/>
<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>
