--- a/i18n/eric5_it.ts Wed Feb 22 19:14:07 2012 +0100
+++ b/i18n/eric5_it.ts Wed Feb 22 19:22:42 2012 +0100
@@ -16263,42 +16263,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>Il processo hg è terminato con codice di uscita {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>Il processo hg non è finito entro i 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>Non posso avviare l'eseguibile 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>Crea il repository del progetto</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>Il repository del progetto non può essere creato.</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>Creazione repository 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 iniziale nel repository 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>Clonazione del progetto dal repository Mercurial</translation>
</message>
@@ -16308,47 +16308,47 @@
<translation type="obsolete">Commit delle modifiche nel repository 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>Sincronizzazione con il repository 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>Aggiunta di file/directory al repository 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>Rimozione di file/directory dal repository 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>Rinomino {0}</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>Creazione tag nel repository 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>Annullamento modifiche</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>Merge</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 Mercurial</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>Copia di {0}</translation>
</message>
@@ -16363,185 +16363,195 @@
<translation type="obsolete">Mostra il numero di elementi da mostrare.</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>Pulling da un repository Mercurial remoto</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>Pushing in un repository Mercurial remoto</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>Risoluzione di file/directory</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>Creazione 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>Inserisci il nome del 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>Creazione Branch nel repository 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>Verifica dell'integrità del repository 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>Visualizzazione combinata della impostazioni di configurazione</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>Visualizzazione degli alias per i repository remoti</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>Recupero da una transazione interrotta</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>Le directory di lavoro devono essere aggiornate ?</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>Visualizzazione branch corrente</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>Crea 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>Applica changegroup</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>Sottocomando Bisect ({0}) non valido.</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>Anteprima 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>Identificazione directory del progetto</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>Crea il file .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>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</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>Rimozione di file dal solo repository 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>Mercurial Changegroup Files (*.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>Mercurial Changegroup Files (*.hg);;All Files (*)</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>Identifica i file 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>Ritiro 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>Nessuna revisione fornita. Termino...</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>Il file changegroup di Mercurial<b>{0}</b> esiste già. Sovrascriverlo ?</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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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>
@@ -18019,6 +18029,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"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="45"/>
+ <source>Select to give user information</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="48"/>
+ <source>User</source>
+ <translation type="unfinished"></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"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="63"/>
+ <source>Use current user</source>
+ <translation type="unfinished"></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"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="90"/>
+ <source>Date and Time</source>
+ <translation type="unfinished"></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"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="105"/>
+ <source>Use current date and time</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="112"/>
+ <source>Date/Time:</source>
+ <translation type="unfinished"></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"/>
@@ -19768,7 +19856,7 @@
<translation><b>Recover</b><p>Recupera da una transazione interrotta.</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>Amministrazione repository</translation>
</message>
@@ -19803,7 +19891,7 @@
<translation>Crea un file changegroup che colleziona i changeset</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>Applica changegroups</translation>
</message>
@@ -19818,7 +19906,7 @@
<translation>Applica una o più file changegroups</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>Changegroup Management</translation>
</message>
@@ -19908,7 +19996,7 @@
<translation><b>Reset</b><p>Reset dei dati di ricerca 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>
@@ -20033,17 +20121,17 @@
<translation><b>Servi repository del progetto</b><p>Rende disponibile il repository del progetto.</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>Speciali</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>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>Il progetto deve essere riletto. Farlo ora ?</translation>
</message>
@@ -20078,7 +20166,7 @@
<translation type="unfinished"></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 type="unfinished"></translation>
</message>
@@ -20158,7 +20246,7 @@
<translation type="unfinished"></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 type="unfinished"></translation>
</message>
@@ -20178,12 +20266,12 @@
<translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation>
</message>
@@ -20227,6 +20315,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>
@@ -51410,24 +51538,24 @@
<context>
<name>mercurial</name>
<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>Origine #{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="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>Tags</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="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>
@@ -51436,7 +51564,7 @@
<tr><td><b>Committed time</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>
@@ -51453,24 +51581,24 @@
{2}</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>Tip</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>Origini</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>
@@ -51480,7 +51608,7 @@
<tr><td><b>Committed time</b></td><td>{2}</td></tr></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 type="unfinished"></translation>
</message>
