--- a/i18n/eric5_fr.ts Wed Feb 19 19:45:06 2014 +0100
+++ b/i18n/eric5_fr.ts Wed Feb 19 19:52:16 2014 +0100
@@ -20777,82 +20777,82 @@
<context>
<name>Hg</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="237"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="243"/>
<source>The hg process finished with the exit code {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1799"/>
<source>The hg process did not finish within 30s.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="244"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="250"/>
<source>Could not start the hg executable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/>
<source>Create project repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/>
<source>The project repository could not be created.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="302"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="308"/>
<source>Creating Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="325"/>
<source>Initial commit to Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="368"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="374"/>
<source>Cloning project from a Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="587"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="593"/>
<source>Synchronizing with the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="640"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="646"/>
<source>Adding files/directories to the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="719"/>
<source>Removing files/directories from the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="781"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="787"/>
<source>Renaming {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/>
<source>Reverting changes</source>
<translation type="unfinished">Revenir avant les modifications</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1068"/>
<source>Merging</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1322"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1328"/>
<source>Mercurial command</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1539"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1545"/>
<source>Copying {0}</source>
<translation type="unfinished"></translation>
</message>
@@ -20862,272 +20862,272 @@
<translation type="obsolete">Sélectionner plusieurs entrées à afficher.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1949"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1958"/>
<source>Pulling from a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2003"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/>
<source>Pushing to a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2135"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/>
<source>Resolving files/directories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2165"/>
<source>Create Branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2165"/>
<source>Enter branch name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/>
<source>Creating branch in the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2288"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297"/>
<source>Verifying the integrity of the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2314"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2323"/>
<source>Showing the combined configuration settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2339"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2348"/>
<source>Showing aliases for remote repositories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2364"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2373"/>
<source>Recovering from interrupted transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2622"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2632"/>
<source>Shall the working directory be updated?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2192"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2201"/>
<source>Showing current branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2532"/>
<source>Create changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2635"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/>
<source>Apply changegroups</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2653"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2691"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2701"/>
<source>Mercurial Bisect ({0})</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2579"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2589"/>
<source>Preview changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2389"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2398"/>
<source>Identifying project directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/>
<source>Create .hgignore file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/>
<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="2725"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/>
<source>Removing files from the Mercurial repository only</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2614"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/>
<source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2591"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2601"/>
<source>Identifying changegroup file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2786"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2796"/>
<source>Backing out changeset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2765"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2775"/>
<source>No revision given. Aborting...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2505"/>
<source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2823"/>
<source>Rollback last transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2806"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2816"/>
<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="532"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="538"/>
<source>Committing changes to Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3466"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3476"/>
<source>Mercurial Command Server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3312"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/>
<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="3466"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3476"/>
<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="2882"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2892"/>
<source>Import Patch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2930"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/>
<source>Export Patches</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2978"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2988"/>
<source>Change Phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3032"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3042"/>
<source>Copy Changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3069"/>
<source>Copy Changesets (Continue)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3177"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3187"/>
<source>Add Sub-repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3210"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3220"/>
<source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3158"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3168"/>
<source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3229"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3239"/>
<source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3229"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3239"/>
<source>Remove Sub-repositories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3198"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3208"/>
<source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="464"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/>
<source>Commit Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="464"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/>
<source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="998"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/>
<source>Revert changes</source>
<translation type="unfinished">Revenir avant les modifications</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="989"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="995"/>
<source>Do you really want to revert all changes to these files or directories?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="998"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/>
<source>Do you really want to revert all changes of the project?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3095"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3105"/>
<source>Create Unversioned Archive</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1870"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/>
<source>Mercurial Side-by-Side Difference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1870"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/>
<source><p>The file <b>{0}</b> could not be read.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1796"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1802"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="946"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="952"/>
<source>Tagging in the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
@@ -23000,7 +23000,7 @@
<context>
<name>HgLogBrowserDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="60"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="59"/>
<source>Mercurial Log</source>
<translation type="unfinished"></translation>
</message>
@@ -23030,17 +23030,17 @@
<translation type="unfinished">Sélectionner le champ à filtrer</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1304"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1344"/>
<source>Revision</source>
<translation type="unfinished">Révision</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1301"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1341"/>
<source>Author</source>
<translation type="unfinished">Auteur</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="226"/>
<source>Message</source>
<translation type="unfinished">Message</translation>
</message>
@@ -23180,42 +23180,42 @@
<translation type="unfinished">Alt+P</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="114"/>
<source>Added</source>
<translation type="unfinished">Ajouté</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/>
<source>Deleted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="116"/>
<source>Modified</source>
<translation type="unfinished">Modifié</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="778"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="806"/>
<source>Process Generation Error</source>
<translation type="unfinished">Erreur du processus</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="778"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="806"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="545"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="573"/>
<source>The hg process did not finish within 30s.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="548"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="576"/>
<source>Could not start the hg executable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="551"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="579"/>
<source>Mercurial Error</source>
<translation type="unfinished"></translation>
</message>
@@ -23255,22 +23255,22 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/>
<source>All</source>
<translation type="unfinished">Tous</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="62"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="61"/>
<source>Mercurial Log (Incoming)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="64"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="63"/>
<source>Mercurial Log (Outgoing)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="134"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/>
<source>Bookmarks</source>
<translation type="unfinished">Signets</translation>
</message>
@@ -23280,12 +23280,12 @@
<translation type="obsolete">Rafraichir</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/>
<source>Press to refresh the list of changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="71"/>
<source>&Refresh</source>
<translation type="unfinished"></translation>
</message>
@@ -23295,28 +23295,28 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="151"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="142"/>
<source>Change the phase of the selected revisions</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="153"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="144"/>
<source><b>Change Phase</b>
<p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="149"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140"/>
<source>Change Phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1458"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1503"/>
<source>Copy Changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1495"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1540"/>
<source>The project should be reread. Do this now?</source>
<translation type="unfinished"></translation>
</message>
@@ -23336,27 +23336,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="143"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="134"/>
<source>Copy the selected changesets to the current branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="151"/>
<source>Tag</source>
<translation type="unfinished">Tag</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="162"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="153"/>
<source>Tag the selected revision</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1495"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1540"/>
<source>Switch</source>
<translation type="unfinished">Basculer de version</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="157"/>
<source>Switch the working directory to the selected revision</source>
<translation type="unfinished"></translation>
</message>
@@ -27309,12 +27309,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="140"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="150"/>
<source>Select to activate the transplant extension</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="143"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="153"/>
<source>Transplant</source>
<translation type="unfinished"></translation>
</message>
@@ -27323,6 +27323,16 @@
<source>Select to activate the rebase extension</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="140"/>
+ <source>Select to activate the shelve extension</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="143"/>
+ <source>Shelve</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HistoryDialog</name>
@@ -50349,7 +50359,7 @@
<translation>Suppression d'une propriété Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1774"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1777"/>
<source>Enter property name</source>
<translation>Entrer le nom de la propriété</translation>
</message>
@@ -50419,12 +50429,12 @@
<translation>Sélectionner plusieurs entrées à afficher.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2260"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2261"/>
<source>Locking in the Subversion repository</source>
<translation>Verrouillage dans le référentiel Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2300"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2301"/>
<source>Unlocking in the Subversion repository</source>
<translation>Déverrouillage dans le référentiel Subversion</translation>
</message>
@@ -50451,17 +50461,17 @@
<translation>Propriété supprimée.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2240"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2241"/>
<source>Subversion Lock</source>
<translation>Verrou Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2240"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2241"/>
<source>Enter lock comment</source>
<translation>Entrer un commentaire pour le verrou</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2348"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2349"/>
<source>Relocating</source>
<translation>Déplacement</translation>
</message>
@@ -50627,37 +50637,37 @@
<translation type="obsolete">Le processus SVN s'est terminé avec le code de sortie %1</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1963"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1966"/>
<source>The svn process did not finish within 30s.</source>
<translation>Le processus SVN ne s'est pas terminé dans les 30 dernières secondes.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="182"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="185"/>
<source>Could not start the svn executable.</source>
<translation>Impossible de lancer l'executable SVN.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2374"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2375"/>
<source>Repository Browser</source>
<translation>Navigateur de référentiel</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2374"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2375"/>
<source>Enter the repository URL.</source>
<translation>Entrer l'URL du référentiel.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2399"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2400"/>
<source>Remove from changelist</source>
<translation>Supprimer de la liste des modifications</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2436"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2437"/>
<source>Add to changelist</source>
<translation>Ajouter à la liste des modifications:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2425"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2426"/>
<source>Enter name of the changelist:</source>
<translation>Entrer le nom de la liste des modifications:</translation>
</message>
@@ -50677,7 +50687,7 @@
<translation></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="175"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="178"/>
<source>The svn process finished with the exit code {0}</source>
<translation type="unfinished"></translation>
</message>
@@ -50754,7 +50764,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1966"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1969"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation>
</message>
@@ -50769,7 +50779,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2495"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2496"/>
<source>Upgrade</source>
<translation type="unfinished"></translation>
</message>
@@ -51834,12 +51844,12 @@
<translation>Log Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="576"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="612"/>
<source>Revision</source>
<translation>Révision</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="573"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="609"/>
<source>Author</source>
<translation>Auteur</translation>
</message>
@@ -51849,7 +51859,7 @@
<translation>Date</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="57"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="133"/>
<source>Message</source>
<translation>Message</translation>
</message>
@@ -51959,27 +51969,27 @@
<translation>Alt+P</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="92"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="82"/>
<source>Added</source>
<translation>Ajouté</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="93"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="83"/>
<source>Deleted</source>
<translation>Effacer</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="94"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="84"/>
<source>Modified</source>
<translation>Modifié</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="452"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="494"/>
<source>Subversion Error</source>
<translation>Erreur Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="253"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="281"/>
<source>Process Generation Error</source>
<translation>Erreur du processus</translation>
</message>
@@ -52029,12 +52039,12 @@
<translation>Arrêt lors de copie/déplacement</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="253"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="281"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="95"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="85"/>
<source>Replaced</source>
<translation type="unfinished"></translation>
</message>
@@ -68431,24 +68441,24 @@
<context>
<name>mercurial</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1391"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397"/>
<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>Parent #{0}</b></td><td></td></tr>
<tr><td><b>Modifications</b></td><td>{1}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2080"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2089"/>
<source><tr><td><b>Tags</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Étiquettes</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2090"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2099"/>
<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="1411"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1417"/>
<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>
@@ -68474,23 +68484,23 @@
{2}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2081"/>
<source><tr><td><b>Tip</b></td><td></td></tr>
</source>
<translation><tr><td><b>Suggestion</b></td><td></td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2084"/>
<source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Modifications</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2095"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104"/>
<source><tr><td><b>Parents</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Parents</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2099"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2108"/>
<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>
@@ -68501,12 +68511,12 @@
</table></p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2085"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/>
<source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Signets</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1451"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/>
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
@@ -68892,7 +68902,7 @@
<translation type="obsolete"><h3>Informations sur le référentiel</h3><table><tr><td><b>PySvn V.</b></td><td>%1</td></tr><tr><td><b>Subversion V.</b></td><td>%2</td></tr><tr><td><b>API Subversion V.</b></td><td>%3</td></tr><tr><td><b>URL</b></td><td>%4</td></tr><tr><td><b>Révision actuelle</b></td><td>%5</td></tr><tr><td><b>Révision validée</b></td><td>%6</td></tr><tr><td><b>Date de validation</b></td><td>%7</td></tr><tr><td><b>Heure de validation</b></td><td>%8</td></tr><tr><td><b>Dernier auteur</b></td><td>%9</td></tr></table></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1591"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1594"/>
<source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source>
<translation><h3>Information référentiel</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Version en cours</b></td><td>{2}</td></tr><tr><td><b>Version soumise</b></td><td>{3}</td></tr><tr><td><b>Date de la soumission</b></td><td>{4}</td></tr><tr><td><b>Heure de la soumission</b></td><td>{5}</td></tr><tr><td><b>Dernier auteur</b></td><td>{6}</td></tr></table></translation>
</message>
