--- a/i18n/eric5_es.ts Sun May 02 09:55:49 2010 +0000
+++ b/i18n/eric5_es.ts Sun May 02 15:11:44 2010 +0000
@@ -13206,230 +13206,240 @@
<context>
<name>Hg</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="164"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="165"/>
<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="167"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="168"/>
<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="169"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="170"/>
<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="195"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="196"/>
<source>Create project repository</source>
<translation>Crear repositorio del proyecto</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="196"/>
<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="222"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="223"/>
<source>Creating Mercurial repository</source>
<translation>Creando repositorio Mercurial</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="238"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="239"/>
<source>Initial commit to Mercurial repository</source>
<translation>Commit inicial al repositorio Mercurial</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/>
<source>Cloning project from a Mercurial repository</source>
<translation>Clonando proyecto desde un repositorio Mercurial</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="377"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="378"/>
<source>Commiting changes to Mercurial repository</source>
<translation>Haciendo commit de cambios al repositorio Mercurial</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="423"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="424"/>
<source>Synchronizing with the Mercurial repository</source>
<translation>Sincronizando con el repositorio Mercurial</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="471"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/>
<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="531"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="532"/>
<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="589"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="590"/>
<source>Renaming {0}</source>
<translation>Renombrando {0}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="768"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="769"/>
<source>Merging</source>
<translation>Haciendo un merge</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1138"/>
<source>Copying {0}</source>
<translation>Copiando {0}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1231"/>
<source>Mercurial Log</source>
<translation>Registro de Mercurial</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1231"/>
<source>Select number of entries to show.</source>
<translation>Seleccionar número de entradas a mostrar.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1304"/>
<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="1326"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1329"/>
<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="1435"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1438"/>
<source>Resolving files/directories</source>
<translation>Resolviendo archivos/directorios</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="697"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="698"/>
<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="727"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="728"/>
<source>Reverting changes</source>
<translation>Revirtiendo cambios</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="968"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="969"/>
<source>Mercurial command</source>
<translation>Comando de Mercurial</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/>
<source>Create Branch</source>
<translation>Crear Branch</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/>
<source>Enter branch name</source>
<translation>Introducir nombre de branch</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1471"/>
<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="1533"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1536"/>
<source>Verifying the integrity of the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1557"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/>
<source>Showing the combined configuration settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1583"/>
<source>Showing aliases for remote repositories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1603"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1606"/>
<source>Recovering from interrupted transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/>
<source>Shall the working directory be updated?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1494"/>
<source>Showing current branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1740"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/>
<source>Create changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1833"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/>
<source>Apply changegroups</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1859"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1886"/>
<source>Mercurial Bisect ({0})</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1795"/>
<source>Preview changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1626"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/>
<source>Identifying project directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1654"/>
<source>Create .hgignore file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1654"/>
<source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1906"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/>
<source>Removing files from the Mercurial repository only</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1698"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1701"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/>
<source><p>The Mercurial changegroup file <b>{0}</b> already exists.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1813"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/>
<source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805"/>
<source>Identifying changegroup file</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/>
+ <source>Backing out changeset</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1947"/>
+ <source>No revision given. Aborting...</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgAnnotateDialog</name>
@@ -13520,6 +13530,139 @@
</message>
</context>
<context>
+ <name>HgBackoutDialog</name>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="14"/>
+ <source>Mercurial Revision</source>
+ <translation type="unfinished">Revisión de Mercurial</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="23"/>
+ <source>Revision</source>
+ <translation type="unfinished">Revisión</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="29"/>
+ <source>Select to specify a revision by number</source>
+ <translation type="unfinished">Seleccionar para especificar una revisión por número</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="32"/>
+ <source>Number</source>
+ <translation type="unfinished">Número</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="42"/>
+ <source>Enter a revision number</source>
+ <translation type="unfinished">Introduzca un número de revisión</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="71"/>
+ <source>Select to specify a revision by changeset id</source>
+ <translation type="unfinished">Seleccionar para especificar una revisión por changeset id</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="74"/>
+ <source>Id:</source>
+ <translation type="unfinished">Id:</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="84"/>
+ <source>Enter a changeset id</source>
+ <translation type="unfinished">Introduzca un changeset id</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="91"/>
+ <source>Select to specify a revision by a tag</source>
+ <translation type="unfinished">Seleccionar para especificar una revisión por tag</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="94"/>
+ <source>Tag:</source>
+ <translation type="unfinished">Tag:</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="110"/>
+ <source>Enter a tag name</source>
+ <translation type="unfinished">Introduzca un nombre de tag</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="120"/>
+ <source>Select to specify a revision by a branch</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="123"/>
+ <source>Branch:</source>
+ <translation type="unfinished">Branch:</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="139"/>
+ <source>Enter a branch name</source>
+ <translation type="unfinished">Introducir un nombre de branch</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/>
+ <source>Select to not specify a specific revision</source>
+ <translation type="unfinished">Seleccionar para no especificar una revisión específica</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="152"/>
+ <source>No revision selected</source>
+ <translation type="unfinished">No hay seleccionada una revisión</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="165"/>
+ <source>Commit data</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="171"/>
+ <source>Commit message:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/>
+ <source>Enter the commit message or leave empty to use the default one</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="190"/>
+ <source>Commit Date:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="197"/>
+ <source>Enter optional date for the commit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="210"/>
+ <source>Commit User:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="217"/>
+ <source>Enter optional user for the commit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="229"/>
+ <source>Select to merge with parent of the project directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="232"/>
+ <source>Merge with current parent</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py" line="75"/>
+ <source>Backed out changeset <{0}>.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>HgBundleDialog</name>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="14"/>
@@ -15400,7 +15543,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/>
<source>Repository Administration</source>
<translation type="unfinished"></translation>
</message>
@@ -15435,7 +15578,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/>
<source>Changegroup Management</source>
<translation type="unfinished"></translation>
</message>
@@ -15525,7 +15668,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/>
<source>Bisect</source>
<translation type="unfinished"></translation>
</message>
@@ -15599,6 +15742,21 @@
<source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/>
+ <source>Back out changeset</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/>
+ <source>Back out changes of an earlier changeset</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/>
+ <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgRevisionSelectionDialog</name>
@@ -19222,12 +19380,12 @@
<translation>Introduzca el número de mensajes de commit a recordar</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="143"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/>
<source>Edit the mercurial config file</source>
<translation>Editar el archivo de configuración de mercurial</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="146"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/>
<source>Edit config file</source>
<translation>Editar archivo de configuración</translation>
</message>
@@ -19246,6 +19404,21 @@
<source>Use Log Browser for incoming / outgoing log</source>
<translation>Utilizar el Navegador de Registros para mensajes de registro entrantes / salientes</translation>
</message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="143"/>
+ <source>Pull</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="149"/>
+ <source>Select to update the working directory to new tip</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="152"/>
+ <source>Update after pulling</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MessageBoxWizard</name>
@@ -41171,17 +41344,17 @@
<context>
<name>mercurial</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1388"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1391"/>
<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="1392"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1395"/>
<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="1399"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/>
<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>
@@ -41192,31 +41365,31 @@
</table></p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1382"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1385"/>
<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="1384"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1387"/>
<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="1396"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1399"/>
<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="1021"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1022"/>
<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="1033"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1034"/>
<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>
@@ -41225,7 +41398,7 @@
<tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1054"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1055"/>
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
