--- a/i18n/eric5_fr.ts Sun Feb 23 15:24:28 2014 +0100
+++ b/i18n/eric5_fr.ts Sun Feb 23 19:20:43 2014 +0100
@@ -1871,62 +1871,62 @@
<context>
<name>Bookmarks</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="128"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="122"/>
<source>Mercurial Bookmark</source>
<translation>Signet Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="146"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="140"/>
<source>Delete Bookmark</source>
<translation>Supprimer le signet</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="146"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="140"/>
<source>Select the bookmark to be deleted:</source>
<translation>Selectionner le signet à supprimer:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="158"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="151"/>
<source>Delete Mercurial Bookmark</source>
<translation>Supprimer le signet Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="187"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="179"/>
<source>Rename Mercurial Bookmark</source>
<translation>Renommer le signet Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="221"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="212"/>
<source>Move Mercurial Bookmark</source>
<translation>Déplacer le signet Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="309"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="297"/>
<source>Pull Bookmark</source>
<translation>Récuperer le signet</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="309"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="297"/>
<source>Select the bookmark to be pulled:</source>
<translation>Sélectionner le signet à récuperer:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="321"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="308"/>
<source>Pulling bookmark from a remote Mercurial repository</source>
<translation>Récupérant le signet d'un dépôt Mercurial distant</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="343"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="330"/>
<source>Push Bookmark</source>
<translation>Envoyer signet</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="343"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="330"/>
<source>Select the bookmark to be push:</source>
<translation>Sélectionner le signet à envoyer:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="355"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="341"/>
<source>Pushing bookmark to a remote Mercurial repository</source>
<translation>À envoyer le signet à un dépôt Mercurial distant</translation>
</message>
@@ -15509,7 +15509,7 @@
<context>
<name>Fetch</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/fetch.py" line="59"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/fetch.py" line="58"/>
<source>Fetching from a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
@@ -16604,12 +16604,12 @@
<context>
<name>Gpg</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py" line="87"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py" line="86"/>
<source>Verify Signatures</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py" line="135"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py" line="133"/>
<source>Sign Revision</source>
<translation type="unfinished"></translation>
</message>
@@ -20777,82 +20777,82 @@
<context>
<name>Hg</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="245"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="263"/>
<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="1801"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779"/>
<source>The hg process did not finish within 30s.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="252"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="270"/>
<source>Could not start the hg executable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="298"/>
<source>Create project repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="298"/>
<source>The project repository could not be created.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="310"/>
- <source>Creating Mercurial repository</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="327"/>
+ <source>Creating Mercurial repository</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="343"/>
<source>Initial commit to Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="376"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="389"/>
<source>Cloning project from a Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="595"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="602"/>
<source>Synchronizing with the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="648"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="652"/>
<source>Adding files/directories to the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="721"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/>
<source>Removing files/directories from the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="789"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="786"/>
<source>Renaming {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1012"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/>
<source>Reverting changes</source>
<translation type="unfinished">Revenir avant les modifications</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1070"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/>
<source>Merging</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1330"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314"/>
<source>Mercurial command</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1547"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1534"/>
<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="1962"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1940"/>
<source>Pulling from a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2016"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/>
<source>Pushing to a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2148"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2118"/>
<source>Resolving files/directories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2169"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/>
<source>Create Branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2169"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/>
<source>Enter branch name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/>
<source>Creating branch in the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2268"/>
<source>Verifying the integrity of the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2327"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2293"/>
<source>Showing the combined configuration settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2317"/>
<source>Showing aliases for remote repositories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2377"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/>
<source>Recovering from interrupted transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2636"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597"/>
<source>Shall the working directory be updated?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2205"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/>
<source>Showing current branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2536"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2498"/>
<source>Create changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2649"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2609"/>
<source>Apply changegroups</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2627"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2664"/>
<source>Mercurial Bisect ({0})</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2555"/>
<source>Preview changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2402"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2365"/>
<source>Identifying project directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2401"/>
<source>Create .hgignore file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2401"/>
<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="2739"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2696"/>
<source>Removing files from the Mercurial repository only</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2628"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2589"/>
<source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2605"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566"/>
<source>Identifying changegroup file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2800"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2756"/>
<source>Backing out changeset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2736"/>
<source>No revision given. Aborting...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2509"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/>
<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="2827"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2783"/>
<source>Rollback last transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2820"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2776"/>
<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="540"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="550"/>
<source>Committing changes to Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3485"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3431"/>
<source>Mercurial Command Server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3326"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3274"/>
<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="3485"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3431"/>
<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="2896"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2851"/>
<source>Import Patch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2944"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2898"/>
<source>Export Patches</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2992"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2945"/>
<source>Change Phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3046"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2998"/>
<source>Copy Changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3073"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3024"/>
<source>Copy Changesets (Continue)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3191"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3141"/>
<source>Add Sub-repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3224"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3174"/>
<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="3172"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3122"/>
<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="3243"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3193"/>
<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="3243"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3193"/>
<source>Remove Sub-repositories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3212"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/>
<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="472"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="485"/>
<source>Commit Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="485"/>
<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="1006"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1000"/>
<source>Revert changes</source>
<translation type="unfinished">Revenir avant les modifications</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="997"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="991"/>
<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="1006"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1000"/>
<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="3109"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059"/>
<source>Create Unversioned Archive</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1878"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1856"/>
<source>Mercurial Side-by-Side Difference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1878"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1856"/>
<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="1804"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/>
<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="954"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="950"/>
<source>Tagging in the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
@@ -21258,12 +21258,12 @@
<translation type="unfinished">Alt+P</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="131"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="128"/>
<source>Process Generation Error</source>
<translation type="unfinished">Erreur du processus</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="131"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="128"/>
<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>
@@ -21759,27 +21759,27 @@
<translation type="unfinished">Alt+P</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="50"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="48"/>
<source>Mercurial Incoming Bookmarks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="52"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="50"/>
<source>Mercurial Outgoing Bookmarks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="140"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="137"/>
<source>Process Generation Error</source>
<translation type="unfinished">Erreur du processus</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="140"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="137"/>
<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/BookmarksExtension/HgBookmarksInOutDialog.py" line="175"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="172"/>
<source>no bookmarks found</source>
<translation type="unfinished"></translation>
</message>
@@ -21869,17 +21869,17 @@
<translation type="unfinished">Alt+P</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="122"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="119"/>
<source>Process Generation Error</source>
<translation type="unfinished">Erreur du processus</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="122"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="119"/>
<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/BookmarksExtension/HgBookmarksListDialog.py" line="157"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="154"/>
<source>no bookmarks defined</source>
<translation type="unfinished"></translation>
</message>
@@ -22010,42 +22010,42 @@
<context>
<name>HgClient</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="83"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="84"/>
<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/HgClient.py" line="130"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="131"/>
<source>Did not receive the 'hello' message.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="132"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="133"/>
<source>Received data on unexpected channel.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="137"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="138"/>
<source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="142"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="143"/>
<source>'capabilities' message did not contain any capability.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="150"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151"/>
<source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="155"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="156"/>
<source>'encoding' message did not contain any encoding.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="341"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="342"/>
<source>For message see output dialog.</source>
<translation type="unfinished"></translation>
</message>
@@ -22318,12 +22318,12 @@
<translation type="unfinished">Alt+P</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="148"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="149"/>
<source>Process Generation Error</source>
<translation type="unfinished">Erreur du processus</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="148"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="149"/>
<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>
@@ -22391,52 +22391,52 @@
<translation type="unfinished">Alt+P</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="196"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="193"/>
<source>Process Generation Error</source>
<translation type="unfinished">Erreur du processus</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="196"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="193"/>
<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/HgDiffDialog.py" line="223"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="220"/>
<source>There is no difference.</source>
<translation type="unfinished">Aucune différence.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="440"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="435"/>
<source>Save Diff</source>
<translation type="unfinished">Enregistrer Diff</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="407"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="402"/>
<source>Patch Files (*.diff)</source>
<translation type="unfinished">Fichiers Patch (*.diff)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="440"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="435"/>
<source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="424"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="419"/>
<source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="116"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="115"/>
<source>Patch Contents</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="237"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="234"/>
<source><Start></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="238"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="235"/>
<source><End></source>
<translation type="unfinished"></translation>
</message>
@@ -22711,7 +22711,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="317"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="312"/>
<source>Revision</source>
<translation type="unfinished">Révision</translation>
</message>
@@ -22786,17 +22786,17 @@
<translation type="unfinished">Alt+P</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="116"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="113"/>
<source>Process Generation Error</source>
<translation type="unfinished">Erreur du processus</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="116"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="113"/>
<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/GpgExtension/HgGpgSignaturesDialog.py" line="151"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="148"/>
<source>no signatures found</source>
<translation type="unfinished"></translation>
</message>
@@ -23000,7 +23000,7 @@
<context>
<name>HgLogBrowserDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="59"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="58"/>
<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="1344"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1329"/>
<source>Revision</source>
<translation type="unfinished">Révision</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1341"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1326"/>
<source>Author</source>
<translation type="unfinished">Auteur</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="226"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="225"/>
<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="114"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="113"/>
<source>Added</source>
<translation type="unfinished">Ajouté</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="114"/>
+ <source>Deleted</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<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="116"/>
<source>Modified</source>
<translation type="unfinished">Modifié</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="806"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="793"/>
<source>Process Generation Error</source>
<translation type="unfinished">Erreur du processus</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="806"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="793"/>
<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="573"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="563"/>
<source>The hg process did not finish within 30s.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="576"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="566"/>
<source>Could not start the hg executable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="579"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="569"/>
<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="94"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/>
<source>All</source>
<translation type="unfinished">Tous</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="61"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="60"/>
<source>Mercurial Log (Incoming)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="63"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="62"/>
<source>Mercurial Log (Outgoing)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/>
<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="73"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/>
<source>Press to refresh the list of changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="71"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="70"/>
<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="142"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="141"/>
<source>Change the phase of the selected revisions</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="144"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="143"/>
<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="140"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/>
<source>Change Phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1503"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1488"/>
<source>Copy Changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1540"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1525"/>
<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="134"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="133"/>
<source>Copy the selected changesets to the current branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="151"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="150"/>
<source>Tag</source>
<translation type="unfinished">Tag</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="153"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="152"/>
<source>Tag the selected revision</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1540"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1525"/>
<source>Switch</source>
<translation type="unfinished">Basculer de version</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="157"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="156"/>
<source>Switch the working directory to the selected revision</source>
<translation type="unfinished"></translation>
</message>
@@ -23429,112 +23429,112 @@
<translation type="unfinished">Alt+P</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="58"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="57"/>
<source><b>Processing your request, please wait...</b></source>
<translation type="unfinished"><b>Votre requête est en cours d'execution, merci de patienter...</b></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="68"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="67"/>
<source>Revision</source>
<translation type="unfinished">Révision</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="216"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="212"/>
<source>Process Generation Error</source>
<translation type="unfinished">Erreur du processus</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="216"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="212"/>
<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/HgLogDialog.py" line="310"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="303"/>
<source>No log available for '{0}'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="344"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="337"/>
<source>diff to {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="356"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="349"/>
<source>Branches: {0}<br />
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="359"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="352"/>
<source>Tags: {0}<br />
</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="358"/>
+ <source>Parents: {0}<br />
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="361"/>
+ <source><i>Author: {0}</i><br />
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="365"/>
- <source>Parents: {0}<br />
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="368"/>
- <source><i>Author: {0}</i><br />
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="372"/>
<source><i>Date: {0}, {1}</i><br />
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="388"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="381"/>
<source>Added {0}<br />
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="394"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="387"/>
<source>Modified {0}<br />
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="400"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="393"/>
<source>Deleted {0}<br />
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="274"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="267"/>
<source>The hg process did not finish within 30s.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="277"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="270"/>
<source>Could not start the hg executable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="280"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="273"/>
<source>Mercurial Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="383"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="376"/>
<source>Added {0} (copied from {1})<br />
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="362"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="355"/>
<source>Bookmarks: {0}<br />
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="353"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="346"/>
<source>Phase: {0}<br />
</source>
<translation type="unfinished"></translation>
@@ -24581,165 +24581,155 @@
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575"/>
<source>Command options</source>
- <translation type="unfinished">Options de commande</translation>
+ <translation type="obsolete">Options de commande</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575"/>
<source>Command &options...</source>
- <translation type="unfinished">&Options de commande...</translation>
+ <translation type="obsolete">&Options de commande...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575"/>
+ <source>Configure</source>
+ <translation type="unfinished">Configuration</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575"/>
+ <source>Configure...</source>
+ <translation type="unfinished">Configuration...</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/>
- <source>Show the Mercurial command options</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/>
- <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/>
- <source>Configure</source>
- <translation type="unfinished">Configuration</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/>
- <source>Configure...</source>
- <translation type="unfinished">Configuration...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/>
<source>Show the configuration dialog with the Mercurial page selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/>
<source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="635"/>
+ <source>Show paths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="635"/>
+ <source>Show paths...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639"/>
+ <source>Show the aliases for remote repositories</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/>
+ <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="649"/>
- <source>Show paths</source>
+ <source>Verify repository</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="649"/>
- <source>Show paths...</source>
+ <source>Verify repository...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/>
- <source>Show the aliases for remote repositories</source>
+ <source>Verify the integrity of the repository</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/>
- <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source>
+ <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/>
- <source>Verify repository</source>
+ <source>Recover</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/>
- <source>Verify repository...</source>
+ <source>Recover...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/>
- <source>Verify the integrity of the repository</source>
+ <source>Recover from an interrupted transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/>
- <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/>
- <source>Recover</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/>
- <source>Recover...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/>
- <source>Recover from an interrupted transaction</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/>
<source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1022"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1008"/>
<source>Repository Administration</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/>
+ <source>Create .hgignore</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/>
+ <source>Create a .hgignore file with default values</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/>
+ <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/>
- <source>Create .hgignore</source>
+ <source>Create changegroup</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/>
+ <source>Create changegroup...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/>
- <source>Create a .hgignore file with default values</source>
+ <source>Create changegroup file collecting changesets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1401"/>
+ <source>Apply changegroups</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/>
+ <source>Apply changegroups...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/>
+ <source>Apply one or several changegroup files</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1040"/>
+ <source>Changegroup Management</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/>
- <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/>
- <source>Create changegroup</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/>
- <source>Create changegroup...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/>
- <source>Create changegroup file collecting changesets</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1417"/>
- <source>Apply changegroups</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/>
- <source>Apply changegroups...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/>
- <source>Apply one or several changegroup files</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054"/>
- <source>Changegroup Management</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/>
<source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/>
<source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source>
<translation type="unfinished"></translation>
</message>
@@ -24759,142 +24749,142 @@
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/>
+ <source>Mark as "good"</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/>
+ <source>Mark a selectable changeset as good</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="772"/>
+ <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779"/>
- <source>Mark as "good"</source>
+ <source>Mark as "bad"</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/>
- <source>Mark a selectable changeset as good</source>
+ <source>Mark a selectable changeset as bad</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/>
- <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/>
- <source>Mark as "bad"</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/>
- <source>Mark a selectable changeset as bad</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/>
<source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/>
- <source>Skip</source>
- <translation type="unfinished">Passer</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="821"/>
- <source>Reset</source>
- <translation type="unfinished">Réinitialiser</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/>
- <source>Reset the bisect search data</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/>
- <source><b>Reset</b><p>This resets the bisect search data.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/>
- <source>Bisect</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779"/>
- <source>Mark as "good"...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/>
+ <source>Skip</source>
+ <translation type="unfinished">Passer</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/>
+ <source>Reset</source>
+ <translation type="unfinished">Réinitialiser</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/>
+ <source>Reset the bisect search data</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="814"/>
+ <source><b>Reset</b><p>This resets the bisect search data.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054"/>
+ <source>Bisect</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/>
+ <source>Mark as "good"...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779"/>
<source>Mark as "bad"...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="734"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="720"/>
<source>Preview changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="734"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="720"/>
<source>Preview changegroup...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/>
<source>Identify</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/>
<source>Identify...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/>
<source>Identify the project directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/>
<source><b>Identify</b><p>This identifies the project directory.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="738"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/>
<source>Preview a changegroup file containing a collection of changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/>
<source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/>
<source>Identify changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/>
<source>Identify changegroup...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/>
<source>Identify a changegroup file containing a collection of changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/>
<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="835"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="821"/>
<source>Back out changeset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/>
<source>Back out changes of an earlier changeset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="842"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/>
<source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source>
<translation type="unfinished"></translation>
</message>
@@ -24914,37 +24904,37 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1031"/>
<source>Specials</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="876"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862"/>
<source>Serve project repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="876"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862"/>
<source>Serve project repository...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/>
<source>Serve the project repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="883"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/>
<source><b>Serve project repository</b><p>This serves the project repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1254"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1238"/>
<source>Pull</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1528"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1512"/>
<source>The project should be reread. Do this now?</source>
<translation type="unfinished"></translation>
</message>
@@ -24964,202 +24954,202 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="835"/>
<source>Rollback last transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/>
<source>Rollback the last transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/>
<source>Extensions</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/>
+ <source>Edit user configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/>
+ <source>Edit user configuration...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/>
+ <source>Show an editor to edit the user configuration file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="597"/>
+ <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/>
- <source>Edit user configuration</source>
+ <source>Edit repository configuration</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/>
- <source>Edit user configuration...</source>
+ <source>Edit repository configuration...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/>
- <source>Show an editor to edit the user configuration file</source>
+ <source>Show an editor to edit the repository configuration file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/>
- <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/>
- <source>Edit repository configuration</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/>
- <source>Edit repository configuration...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/>
- <source>Show an editor to edit the repository configuration file</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/>
<source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/>
<source>Show combined configuration settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/>
<source>Show combined configuration settings...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/>
<source>Show the combined configuration settings from all configuration files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/>
<source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/>
<source>Skip...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/>
<source>Skip a selectable changeset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="814"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/>
<source><b>Skip</b><p>This skips a selectable changeset.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1473"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1457"/>
<source>Import Patch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="890"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="876"/>
<source>Import Patch...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="894"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/>
<source>Import a patch from a patch file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="897"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="883"/>
<source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/>
<source>Patch Management</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1493"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1477"/>
<source>Revert Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="891"/>
+ <source>Export Patches</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="891"/>
+ <source>Export Patches...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/>
+ <source>Export revisions to patch files</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="898"/>
+ <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/>
- <source>Export Patches</source>
+ <source>Change Phase</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/>
- <source>Export Patches...</source>
+ <source>Change Phase...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/>
- <source>Export revisions to patch files</source>
+ <source>Change the phase of revisions</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="912"/>
- <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/>
- <source>Change Phase</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/>
- <source>Change Phase...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/>
- <source>Change the phase of revisions</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="926"/>
<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="1513"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1497"/>
<source>Copy Changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="938"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="924"/>
<source>Copies changesets from another branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/>
<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="950"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/>
<source>Continue Copying Session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="954"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940"/>
<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="957"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="943"/>
<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="1088"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/>
<source>Graft</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1528"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1512"/>
<source>Copy Changesets (Continue)</source>
<translation type="unfinished"></translation>
</message>
@@ -25184,47 +25174,47 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="951"/>
<source>Add</source>
<translation type="unfinished">Ajouter</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="951"/>
<source>Add...</source>
<translation type="unfinished">Ajouter...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/>
<source>Add a sub-repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="959"/>
<source><b>Add...</b><p>Add a sub-repository to the project.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/>
<source>Remove</source>
<translation type="unfinished">Supprimer</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/>
<source>Remove...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="985"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/>
<source>Remove sub-repositories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="988"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="974"/>
<source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1097"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/>
<source>Sub-Repository</source>
<translation type="unfinished"></translation>
</message>
@@ -25254,27 +25244,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="996"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/>
<source>Create unversioned archive</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="996"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/>
<source>Create unversioned archive...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/>
<source>Create an unversioned archive from the repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1004"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990"/>
<source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="856"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="842"/>
<source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source>
<translation type="unfinished"></translation>
</message>
@@ -25355,37 +25345,37 @@
<translation type="unfinished">Supprimer</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="118"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="117"/>
<source>Unsaved Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="118"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="117"/>
<source>The guards list has been changed. Shall the changes be applied?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="242"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="239"/>
<source>Remove Guards</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="242"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="239"/>
<source>Do you really want to remove the selected guards?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="314"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="308"/>
<source>Apply Guard Definitions</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="314"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="308"/>
<source><p>The defined guards could not be applied.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="306"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="300"/>
<source>The Mercurial process did not finish in time.</source>
<translation type="unfinished"></translation>
</message>
@@ -25459,17 +25449,17 @@
<translation type="unfinished">Message de commit</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="107"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="104"/>
<source>Process Generation Error</source>
<translation type="unfinished">Erreur du processus</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="107"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="104"/>
<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/QueuesExtension/HgQueuesHeaderDialog.py" line="197"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="192"/>
<source>Error: </source>
<translation type="unfinished"></translation>
</message>
@@ -25487,12 +25477,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="94"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="91"/>
<source>Unguarded</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="99"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="96"/>
<source>no patches found</source>
<translation type="unfinished"></translation>
</message>
@@ -25577,17 +25567,17 @@
<translation type="unfinished">Alt+P</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="193"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="191"/>
<source>Process Generation Error</source>
<translation type="unfinished">Erreur du processus</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="193"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="191"/>
<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/QueuesExtension/HgQueuesListDialog.py" line="228"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="226"/>
<source>no patches found</source>
<translation type="unfinished"></translation>
</message>
@@ -25607,7 +25597,7 @@
<translation type="unfinished">manquant</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="302"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="300"/>
<source>unknown</source>
<translation type="unfinished">inconnu</translation>
</message>
@@ -25650,7 +25640,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="126"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="122"/>
<source>Unguarded</source>
<translation type="unfinished"></translation>
</message>
@@ -25771,12 +25761,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="67"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="66"/>
<source>Refresh</source>
<translation type="unfinished">Rafraichir</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="69"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="68"/>
<source>Press to refresh the queues list</source>
<translation type="unfinished"></translation>
</message>
@@ -26362,12 +26352,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="138"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="137"/>
<source>Process Generation Error</source>
<translation type="unfinished">Erreur du processus</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="138"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="137"/>
<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>
@@ -26470,42 +26460,42 @@
<translation type="unfinished">Alt+P</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="49"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="47"/>
<source>&Refresh</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="51"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="49"/>
<source>Press to refresh the list of shelves</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="66"/>
+ <source>Restore selected shelve</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="68"/>
- <source>Restore selected shelve</source>
+ <source>Delete selected shelves</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="70"/>
- <source>Delete selected shelves</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="72"/>
<source>Delete all shelves</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="181"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="178"/>
<source>Process Generation Error</source>
<translation type="unfinished">Erreur du processus</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="181"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="178"/>
<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 numerus="yes">
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="361"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="356"/>
<source>%n file(s) changed</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -26513,7 +26503,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="363"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="358"/>
<source>%n line(s) inserted</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -26521,7 +26511,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="365"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="360"/>
<source>%n line(s) deleted</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -26724,37 +26714,37 @@
<translation type="unfinished">manquant</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="279"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="275"/>
<source>Process Generation Error</source>
<translation type="unfinished">Erreur du processus</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="279"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="275"/>
<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/HgStatusDialog.py" line="595"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="588"/>
<source>Commit</source>
<translation type="unfinished">Commit</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="736"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="729"/>
<source>There are no uncommitted changes available/selected.</source>
<translation type="unfinished">Il n'y a pas de modification non commitée disponible/sélectionnée.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="635"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="628"/>
<source>Add</source>
<translation type="unfinished">Ajouter</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="635"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="628"/>
<source>There are no unversioned entries available/selected.</source>
<translation type="unfinished">Aucune entrée "non-versionnée" disponible/sélectionnée.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="698"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="691"/>
<source>Revert</source>
<translation type="unfinished">Recouvrir</translation>
</message>
@@ -26764,12 +26754,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="657"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="650"/>
<source>Remove</source>
<translation type="unfinished">Supprimer</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="698"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="691"/>
<source>There are no missing entries available/selected.</source>
<translation type="unfinished"></translation>
</message>
@@ -26854,7 +26844,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="497"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="490"/>
<source>all</source>
<translation type="unfinished"></translation>
</message>
@@ -26864,12 +26854,12 @@
<translation type="obsolete">Différence</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="716"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="709"/>
<source>Differences</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="595"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="588"/>
<source>There are no entries selected to be committed.</source>
<translation type="unfinished"></translation>
</message>
@@ -26899,12 +26889,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="743"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="736"/>
<source>Side-by-Side Diff</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="743"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="736"/>
<source>Only one file with uncommitted changes must be selected.</source>
<translation type="unfinished"></translation>
</message>
@@ -26917,12 +26907,12 @@
<context>
<name>HgStatusMonitorThread</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="161"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="154"/>
<source>Mercurial status checked successfully</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="104"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="99"/>
<source>Could not start the Mercurial process.</source>
<translation type="unfinished"></translation>
</message>
@@ -26940,212 +26930,212 @@
<translation type="unfinished">Erreurs</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="40"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="38"/>
<source>Refresh</source>
<translation type="unfinished">Rafraichir</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="42"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="40"/>
<source>Press to refresh the summary display</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="106"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="101"/>
<source>Process Generation Error</source>
<translation type="unfinished">Erreur du processus</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="106"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="101"/>
<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/HgSummaryDialog.py" line="320"/>
+ <source><tr><td><b>Parent</b></td><td>{0}</td></tr></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="324"/>
+ <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source>
+ <translation type="unfinished"><tr><td><b>Étiquettes</b></td><td>{0}</td></tr></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="328"/>
- <source><tr><td><b>Parent</b></td><td>{0}</td></tr></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="332"/>
- <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source>
- <translation type="unfinished"><tr><td><b>Étiquettes</b></td><td>{0}</td></tr></translation>
+ <source><tr><td><b>Commit Message</b></td><td>{0}</td></tr></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="334"/>
+ <source>empty repository</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="336"/>
- <source><tr><td><b>Commit Message</b></td><td>{0}</td></tr></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="342"/>
- <source>empty repository</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="344"/>
<source>no revision checked out</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="345"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="337"/>
<source><tr><td><b>Remarks</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="341"/>
+ <source><tr><td><b>Branch</b></td><td>{0}</td></tr></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="349"/>
- <source><tr><td><b>Branch</b></td><td>{0}</td></tr></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="357"/>
<source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source>
<translation type="unfinished"><tr><td><b>Signets</b></td><td>{0}</td></tr></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="356"/>
+ <source>{0} modified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="358"/>
+ <source>{0} added</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="360"/>
+ <source>{0} removed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="362"/>
+ <source>{0} renamed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="364"/>
- <source>{0} modified</source>
+ <source>{0} copied</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="366"/>
- <source>{0} added</source>
+ <source>{0} deleted</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="368"/>
- <source>{0} removed</source>
+ <source>{0} unknown</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="370"/>
- <source>{0} renamed</source>
+ <source>{0} ignored</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="372"/>
- <source>{0} copied</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="374"/>
- <source>{0} deleted</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="376"/>
- <source>{0} unknown</source>
+ <source>{0} unresolved</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="375"/>
+ <source>{0} subrepos</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="378"/>
- <source>{0} ignored</source>
+ <source>Merge needed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="380"/>
- <source>{0} unresolved</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="383"/>
- <source>{0} subrepos</source>
+ <source>New Branch</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="382"/>
+ <source>Head is closed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="384"/>
+ <source>No commit required</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="386"/>
- <source>Merge needed</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="388"/>
- <source>New Branch</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="390"/>
- <source>Head is closed</source>
+ <source>New Branch Head</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="387"/>
+ <source><tr><td><b>Commit Status</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="392"/>
- <source>No commit required</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="394"/>
- <source>New Branch Head</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="395"/>
- <source><tr><td><b>Commit Status</b></td><td>{0}</td></tr></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="400"/>
<source>current</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="415"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="407"/>
<source>unknown status</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="416"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="408"/>
<source><tr><td><b>Update Status</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="421"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="413"/>
<source>synched</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="425"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="417"/>
<source>1 or more incoming</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="427"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="419"/>
<source>{0} outgoing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="436"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="428"/>
<source><tr><td><b>Remote Status</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="441"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="433"/>
<source>empty queue</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="445"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="437"/>
<source>{0} applied</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="440"/>
+ <source>{0} unapplied</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="443"/>
+ <source><tr><td><b>Queues Status</b></td><td>{0}</td></tr></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="448"/>
- <source>{0} unapplied</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="451"/>
- <source><tr><td><b>Queues Status</b></td><td>{0}</td></tr></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="456"/>
<source><p>No status information available.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="324"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="316"/>
<source><tr><td><b>Parent #{0}</b></td><td>{1}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="402"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="394"/>
<source>%n new changeset(s)<br/>Update required</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -27153,7 +27143,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="406"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="398"/>
<source>%n new changeset(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -27161,7 +27151,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="408"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="400"/>
<source>%n branch head(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -27169,13 +27159,13 @@
</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="410"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="402"/>
<source>{0}<br/>{1}<br/>Merge required</source>
<comment>0 is changesets, 1 is branch heads</comment>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="430"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="422"/>
<source>%n incoming bookmark(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -27183,7 +27173,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="433"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="425"/>
<source>%n outgoing bookmark(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -27277,32 +27267,32 @@
<translation type="unfinished">Alt+P</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="90"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="88"/>
<source>Mercurial Branches List</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="91"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="89"/>
<source>Status</source>
<translation type="unfinished">Etat (status)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="135"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="132"/>
<source>Process Generation Error</source>
<translation type="unfinished">Erreur du processus</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="135"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="132"/>
<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/HgTagBranchListDialog.py" line="255"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="251"/>
<source>active</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="260"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="256"/>
<source>yes</source>
<translation type="unfinished">oui</translation>
</message>
@@ -33091,47 +33081,47 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="37"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="93"/>
<source>Log</source>
<translation type="unfinished">Log</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="43"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="99"/>
<source>No. of log messages shown:</source>
<translation type="unfinished">Nb. de messages log affichés:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="50"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="106"/>
<source>Enter the number of log messages to be shown</source>
<translation type="unfinished">Entrer le nombre de messages log à afficher</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="79"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="135"/>
<source>Commit</source>
<translation type="unfinished">Commit</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="85"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="141"/>
<source>No. of commit messages to remember:</source>
<translation type="unfinished">Nb. de messages de commit à conserver:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="92"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="148"/>
<source>Enter the number of commit messages to remember</source>
<translation type="unfinished">Entrer le nombre de messages de commit à conserver</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="124"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="180"/>
<source>Incoming / Outgoing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="130"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="186"/>
<source>Select to show the incoming and outgoing log in a log browser dialog</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="133"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="189"/>
<source>Use Log Browser for incoming / outgoing log</source>
<translation type="unfinished"></translation>
</message>
@@ -33141,97 +33131,127 @@
<translation type="obsolete">Edition du fichier de config</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="143"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="199"/>
<source>Pull</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="149"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="205"/>
<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"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="208"/>
<source>Update after pulling</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="241"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="297"/>
<source>Edit the Mercurial configuration file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="244"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="300"/>
<source>Edit configuration file</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="274"/>
+ <source>Cleanup</source>
+ <translation type="unfinished">Nettoyer</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="280"/>
+ <source>Pattern:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="287"/>
+ <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="215"/>
+ <source>Select to prefer unbundle over pull</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="218"/>
- <source>Cleanup</source>
- <translation type="unfinished">Nettoyer</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="224"/>
- <source>Pattern:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="231"/>
- <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="159"/>
- <source>Select to prefer unbundle over pull</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/>
<source><b>Prefer Unbundle</b>
<p>If this option is selected, it will be checked, if a Mercurial changegroups file from a previous "Show Incoming" request exists. In this case it will be applied and deleted. Otherwise a pull request will be sent.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="166"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="222"/>
<source>Prefer Unbundle</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="199"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="255"/>
<source>Revert</source>
<translation type="unfinished">Recouvrir</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="205"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="261"/>
<source>Select to create a backup file (.orig) before reverting changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="208"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="264"/>
<source>Create Backup Files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="176"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="232"/>
<source>Merge</source>
<translation type="unfinished">Fusionner</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="182"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="238"/>
<source>Select to enforce usage of the Mercural internal merge tool</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="185"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="241"/>
<source><b>Internal Merge Tool</b>
<p>Select to enforce usage of the Mercural internal merge tool,which leaves conflict markers in the file in case of conflicting changes.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="189"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="245"/>
<source>Use internal merge with conflict markers</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="37"/>
+ <source>Global Options</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="43"/>
+ <source>Encoding:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="56"/>
+ <source>Select the encoding to be used by Mercurial</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="63"/>
+ <source>Encoding Mode:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="76"/>
+ <source>Select the encoding mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="83"/>
+ <source>Consider hidden changesets</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MercurialUserDataDialog</name>
@@ -37941,262 +37961,262 @@
<translation>Création d'un répertoire projet</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3275"/>
+ <location filename="../Project/Project.py" line="3281"/>
<source>New project</source>
<translation>Nouveau projet</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3289"/>
+ <location filename="../Project/Project.py" line="3295"/>
<source>Open project</source>
<translation>Ouvir un projet</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3326"/>
+ <location filename="../Project/Project.py" line="3332"/>
<source>Save project as</source>
<translation>Enregistrer le projet sous</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="2695"/>
+ <location filename="../Project/Project.py" line="2701"/>
<source>Save File</source>
<translation>Enregistrer Fichier</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="2731"/>
+ <location filename="../Project/Project.py" line="2737"/>
<source>Close Project</source>
<translation>Fermer le projet</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="2731"/>
+ <location filename="../Project/Project.py" line="2737"/>
<source>The current project has unsaved changes.</source>
<translation>Le projet courant a des modifications non enregistrées.</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3490"/>
+ <location filename="../Project/Project.py" line="3496"/>
<source>&Save</source>
<translation>&Enregistrer</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3275"/>
- <source>&New...</source>
- <translation>&Nouveau...</translation>
- </message>
- <message>
- <location filename="../Project/Project.py" line="3280"/>
- <source>Generate a new project</source>
- <translation>Génerer un nouveau projet</translation>
- </message>
- <message>
<location filename="../Project/Project.py" line="3281"/>
+ <source>&New...</source>
+ <translation>&Nouveau...</translation>
+ </message>
+ <message>
+ <location filename="../Project/Project.py" line="3286"/>
+ <source>Generate a new project</source>
+ <translation>Génerer un nouveau projet</translation>
+ </message>
+ <message>
+ <location filename="../Project/Project.py" line="3287"/>
<source><b>New...</b><p>This opens a dialog for entering the info for a new project.</p></source>
<translation><b>Nouveau...</b><p>Ouvre une boite de dialogue pour entrer les paramètres d'un nouveau projet.</p></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3289"/>
- <source>&Open...</source>
- <translation>&Ouvrir...</translation>
- </message>
- <message>
- <location filename="../Project/Project.py" line="3294"/>
- <source>Open an existing project</source>
- <translation>Ouvrir un projet existant</translation>
- </message>
- <message>
<location filename="../Project/Project.py" line="3295"/>
+ <source>&Open...</source>
+ <translation>&Ouvrir...</translation>
+ </message>
+ <message>
+ <location filename="../Project/Project.py" line="3300"/>
+ <source>Open an existing project</source>
+ <translation>Ouvrir un projet existant</translation>
+ </message>
+ <message>
+ <location filename="../Project/Project.py" line="3301"/>
<source><b>Open...</b><p>This opens an existing project.</p></source>
<translation><b>Ouvrir...</b><p>Ouvre un projet existant.</p></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3302"/>
+ <location filename="../Project/Project.py" line="3308"/>
<source>Close project</source>
<translation>Fermer le projet</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3302"/>
+ <location filename="../Project/Project.py" line="3308"/>
<source>&Close</source>
<translation>&Fermer</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3306"/>
+ <location filename="../Project/Project.py" line="3312"/>
<source>Close the current project</source>
<translation>Fermer le projet en cours</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3307"/>
+ <location filename="../Project/Project.py" line="3313"/>
<source><b>Close</b><p>This closes the current project.</p></source>
<translation><b>Fermer</b><p>Ferme le projet en cours.</p></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3314"/>
+ <location filename="../Project/Project.py" line="3320"/>
<source>Save project</source>
<translation>Enregistrer le projet</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3318"/>
+ <location filename="../Project/Project.py" line="3324"/>
<source>Save the current project</source>
<translation>Enregistre le projet courant</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3319"/>
+ <location filename="../Project/Project.py" line="3325"/>
<source><b>Save</b><p>This saves the current project.</p></source>
<translation><b>Enregistrer</b><p>Enregistre le projet en cours.</p></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3326"/>
- <source>Save &as...</source>
- <translation>&Enregistrer sous...</translation>
- </message>
- <message>
- <location filename="../Project/Project.py" line="3330"/>
- <source>Save the current project to a new file</source>
- <translation>Enregistre le projet en cours dans un nouveau fichier</translation>
- </message>
- <message>
<location filename="../Project/Project.py" line="3332"/>
+ <source>Save &as...</source>
+ <translation>&Enregistrer sous...</translation>
+ </message>
+ <message>
+ <location filename="../Project/Project.py" line="3336"/>
+ <source>Save the current project to a new file</source>
+ <translation>Enregistre le projet en cours dans un nouveau fichier</translation>
+ </message>
+ <message>
+ <location filename="../Project/Project.py" line="3338"/>
<source><b>Save as</b><p>This saves the current project to a new file.</p></source>
<translation><b>Enregistrer sous</b><p>Enregistre le projet en cours dans un nouveau fichier.</p></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3372"/>
+ <location filename="../Project/Project.py" line="3378"/>
<source>Add translation to project</source>
<translation>Ajouter une traduction au projet</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3372"/>
+ <location filename="../Project/Project.py" line="3378"/>
<source>Add &translation...</source>
<translation>Ajouter une &traduction...</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3377"/>
+ <location filename="../Project/Project.py" line="3383"/>
<source>Add a translation to the current project</source>
<translation>Ajoute une traduction au projet en cours</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3379"/>
+ <location filename="../Project/Project.py" line="3385"/>
<source><b>Add translation...</b><p>This opens a dialog for add a translation to the current project.</p></source>
<translation><b>Ajouter une traduction...</b><p>Ouvre une boite de dialogue pour ajouter une traduction au projet courant.</p></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3387"/>
+ <location filename="../Project/Project.py" line="3393"/>
<source>Search new files</source>
<translation>Rechercher des nouveaux fichiers</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3387"/>
+ <location filename="../Project/Project.py" line="3393"/>
<source>Searc&h new files...</source>
<translation>Re&chercher des nouveaux fichiers...</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3391"/>
+ <location filename="../Project/Project.py" line="3397"/>
<source>Search new files in the project directory.</source>
<translation>Recherche des nouveaux fichiers dans le répertoire du projet.</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3401"/>
+ <location filename="../Project/Project.py" line="3407"/>
<source>Project properties</source>
<translation>Propriétés du projet</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3401"/>
- <source>&Properties...</source>
- <translation>&Propriétés...</translation>
- </message>
- <message>
- <location filename="../Project/Project.py" line="3406"/>
- <source>Show the project properties</source>
- <translation>Affiche les propriétés du projet</translation>
- </message>
- <message>
<location filename="../Project/Project.py" line="3407"/>
+ <source>&Properties...</source>
+ <translation>&Propriétés...</translation>
+ </message>
+ <message>
+ <location filename="../Project/Project.py" line="3412"/>
+ <source>Show the project properties</source>
+ <translation>Affiche les propriétés du projet</translation>
+ </message>
+ <message>
+ <location filename="../Project/Project.py" line="3413"/>
<source><b>Properties...</b><p>This shows a dialog to edit the project properties.</p></source>
<translation><b>Propriétés...</b><p>Affiche une boite de dialogue pour éditer les propriétés du projet.</p></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3529"/>
+ <location filename="../Project/Project.py" line="3535"/>
<source>Load session</source>
<translation>Charger la session</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3533"/>
+ <location filename="../Project/Project.py" line="3539"/>
<source>Load the projects session file.</source>
<translation>Charge le fichier de session du projet.</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3534"/>
+ <location filename="../Project/Project.py" line="3540"/>
<source><b>Load session</b><p>This loads the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source>
<translation><b>Charger la session</b><p>Charge le fichier session du projet. Une session est constituée par les données suivantes.<br>- tous les fichiers open source<br>- tous les points d'arrêts<br>- les arguments de ligne de commande<br>- le répertoire de travail<br>- le flag de rapport d'exception</p></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3547"/>
+ <location filename="../Project/Project.py" line="3553"/>
<source>Save session</source>
<translation>Enregistrer la session</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3551"/>
+ <location filename="../Project/Project.py" line="3557"/>
<source>Save the projects session file.</source>
<translation>Enregistre le fichier de session du projet.</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3552"/>
+ <location filename="../Project/Project.py" line="3558"/>
<source><b>Save session</b><p>This saves the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source>
<translation><b>Enregistrer la session</b><p>Enregistrer le fichier session du projet. Une session est constituée par les données suivantes.<br>- tous les fichiers open source<br>- tous les points d'arrêts<br>- les arguments de ligne de commande<br>- le répertoire de travail<br>- le flag de rapport d'exception</p></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3579"/>
+ <location filename="../Project/Project.py" line="3585"/>
<source>Code Metrics</source>
<translation>Statistiques du code</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3579"/>
- <source>&Code Metrics...</source>
- <translation>Statistiques du &Code...</translation>
- </message>
- <message>
- <location filename="../Project/Project.py" line="3583"/>
- <source>Show some code metrics for the project.</source>
- <translation>Affiche des statistiques sur le code du projet.</translation>
- </message>
- <message>
<location filename="../Project/Project.py" line="3585"/>
+ <source>&Code Metrics...</source>
+ <translation>Statistiques du &Code...</translation>
+ </message>
+ <message>
+ <location filename="../Project/Project.py" line="3589"/>
+ <source>Show some code metrics for the project.</source>
+ <translation>Affiche des statistiques sur le code du projet.</translation>
+ </message>
+ <message>
+ <location filename="../Project/Project.py" line="3591"/>
<source><b>Code Metrics...</b><p>This shows some code metrics for all Python files in the project.</p></source>
<translation><b>Statistiques du Code...</b><p>Affiche des statistiques sur le code de tous les fichiers Python du projet.</p></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3593"/>
+ <location filename="../Project/Project.py" line="3599"/>
<source>Python Code Coverage</source>
<translation> Code Coverage Python</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3593"/>
- <source>Code Co&verage...</source>
- <translation>Code Co&verage...</translation>
- </message>
- <message>
- <location filename="../Project/Project.py" line="3597"/>
- <source>Show code coverage information for the project.</source>
- <translation>Affiche les informations de code coverage pour le projet.</translation>
- </message>
- <message>
<location filename="../Project/Project.py" line="3599"/>
+ <source>Code Co&verage...</source>
+ <translation>Code Co&verage...</translation>
+ </message>
+ <message>
+ <location filename="../Project/Project.py" line="3603"/>
+ <source>Show code coverage information for the project.</source>
+ <translation>Affiche les informations de code coverage pour le projet.</translation>
+ </message>
+ <message>
+ <location filename="../Project/Project.py" line="3605"/>
<source><b>Code Coverage...</b><p>This shows the code coverage information for all Python files in the project.</p></source>
<translation><b>Code Coverage...</b><p>Affiche les informations de code coverage pour le projet.</p></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="4358"/>
+ <location filename="../Project/Project.py" line="4365"/>
<source>Profile Data</source>
<translation>Profiling des données</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3607"/>
- <source>&Profile Data...</source>
- <translation>&Profiling des données...</translation>
- </message>
- <message>
- <location filename="../Project/Project.py" line="3611"/>
- <source>Show profiling data for the project.</source>
- <translation>Affiche le profiling des données du projet.</translation>
- </message>
- <message>
<location filename="../Project/Project.py" line="3613"/>
+ <source>&Profile Data...</source>
+ <translation>&Profiling des données...</translation>
+ </message>
+ <message>
+ <location filename="../Project/Project.py" line="3617"/>
+ <source>Show profiling data for the project.</source>
+ <translation>Affiche le profiling des données du projet.</translation>
+ </message>
+ <message>
+ <location filename="../Project/Project.py" line="3619"/>
<source><b>Profile Data...</b><p>This shows the profiling data for the project.</p></source>
<translation><b>Profilling des données...</b><p>Affiche le profiling des données du projet.</p></translation>
</message>
@@ -38241,77 +38261,77 @@
<translation type="obsolete"><b>Supprimer Cyclops le rapport Cyclops</b><p>Supprime le rapport Cyclops du projet.</p></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="4412"/>
+ <location filename="../Project/Project.py" line="4419"/>
<source>Application Diagram</source>
<translation>Diagramme de l'application</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3622"/>
- <source>&Application Diagram...</source>
- <translation>&Diagramme de l'application...</translation>
- </message>
- <message>
- <location filename="../Project/Project.py" line="3626"/>
- <source>Show a diagram of the project.</source>
- <translation>Affiche le diagramme de l'application.</translation>
- </message>
- <message>
<location filename="../Project/Project.py" line="3628"/>
+ <source>&Application Diagram...</source>
+ <translation>&Diagramme de l'application...</translation>
+ </message>
+ <message>
+ <location filename="../Project/Project.py" line="3632"/>
+ <source>Show a diagram of the project.</source>
+ <translation>Affiche le diagramme de l'application.</translation>
+ </message>
+ <message>
+ <location filename="../Project/Project.py" line="3634"/>
<source><b>Application Diagram...</b><p>This shows a diagram of the project.</p></source>
<translation><b>Diagramme de l'application...</b><p>Affiche le diagramme du projet.</p></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3720"/>
+ <location filename="../Project/Project.py" line="3726"/>
<source>Open &Recent Projects</source>
<translation>Ouvrir un projet &récent</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3728"/>
+ <location filename="../Project/Project.py" line="3734"/>
<source>&Diagrams</source>
<translation>&Diagrammes</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3725"/>
+ <location filename="../Project/Project.py" line="3731"/>
<source>Chec&k</source>
<translation>&Vérification</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3721"/>
- <source>&Version Control</source>
- <translation>&Contrôle de version</translation>
- </message>
- <message>
<location filename="../Project/Project.py" line="3727"/>
+ <source>&Version Control</source>
+ <translation>&Contrôle de version</translation>
+ </message>
+ <message>
+ <location filename="../Project/Project.py" line="3733"/>
<source>Sho&w</source>
<translation>&Affichage</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3730"/>
+ <location filename="../Project/Project.py" line="3736"/>
<source>Source &Documentation</source>
<translation>&Documentation automatique</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="4023"/>
+ <location filename="../Project/Project.py" line="4029"/>
<source>Search New Files</source>
<translation>Rechercher des nouveaux fichiers</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="4023"/>
+ <location filename="../Project/Project.py" line="4029"/>
<source>There were no new files found to be added.</source>
<translation>Aucun fichier à ajouter n'a été trouvé.</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="4169"/>
+ <location filename="../Project/Project.py" line="4175"/>
<source>Version Control System</source>
<translation>Système de conrôle des versions (VCS)</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="4286"/>
+ <location filename="../Project/Project.py" line="4293"/>
<source>Coverage Data</source>
<translation>Coverage de données</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="4335"/>
+ <location filename="../Project/Project.py" line="4342"/>
<source>There is no main script defined for the current project. Aborting</source>
<translation>Il n'y a pas de script principal défini dans le projet en cours. Abandon</translation>
</message>
@@ -38326,7 +38346,7 @@
<translation>Renommer le fichier</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="2547"/>
+ <location filename="../Project/Project.py" line="2553"/>
<source>New Project</source>
<translation>Nouveau projet</translation>
</message>
@@ -38336,52 +38356,52 @@
<translation>Ajouter des fichiers existant au projet ?</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="2235"/>
+ <location filename="../Project/Project.py" line="2239"/>
<source>Would you like to edit the VCS command options?</source>
<translation>Voulez-vous éditer les options de commande VCS ?</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="2184"/>
+ <location filename="../Project/Project.py" line="2187"/>
<source>Shall the project file be added to the repository?</source>
<translation>Le fichier projet doit-il être ajouté au référentiel?</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="2208"/>
+ <location filename="../Project/Project.py" line="2211"/>
<source>Select version control system for the project</source>
<translation>Sélectionner un système de contrôle de version (VCS) pour le projet</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3357"/>
+ <location filename="../Project/Project.py" line="3363"/>
<source>Add directory to project</source>
<translation>Ajouter un répertoire au projet</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3357"/>
+ <location filename="../Project/Project.py" line="3363"/>
<source>Add directory...</source>
<translation>Ajouter un répertoire...</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3362"/>
+ <location filename="../Project/Project.py" line="3368"/>
<source>Add a directory to the current project</source>
<translation>Ajouter un répertoire au projet courant</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3364"/>
+ <location filename="../Project/Project.py" line="3370"/>
<source><b>Add directory...</b><p>This opens a dialog for adding a directory to the current project.</p></source>
<translation><b>Ajouter un répertoire...</b><p>Ouvre une fenêtre pour ajouter un répertoire au projet courant.</p></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="4309"/>
+ <location filename="../Project/Project.py" line="4316"/>
<source>Code Coverage</source>
<translation>Code Coverage</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="4309"/>
+ <location filename="../Project/Project.py" line="4316"/>
<source>Please select a coverage file</source>
<translation>Sélectionner un fichier coverage</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="4358"/>
+ <location filename="../Project/Project.py" line="4365"/>
<source>Please select a profile file</source>
<translation>Sélectionner un fichier profile</translation>
</message>
@@ -38481,17 +38501,17 @@
<translation type="obsolete"><p>Impossible de supprimer le fichier session de projet <b>%1</b>.</p></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3565"/>
+ <location filename="../Project/Project.py" line="3571"/>
<source>Delete session</source>
<translation>Supprimer la session</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3569"/>
+ <location filename="../Project/Project.py" line="3575"/>
<source>Delete the projects session file.</source>
<translation>Suppression du fichier session de projet.</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3570"/>
+ <location filename="../Project/Project.py" line="3576"/>
<source><b>Delete session</b><p>This deletes the projects session file</p></source>
<translation><b>Suppression de session</b><p>Ceci supprime le fichier session de projet.</p></translation>
</message>
@@ -38501,7 +38521,7 @@
<translation>Fichiers Ruby (*.rb);;</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3393"/>
+ <location filename="../Project/Project.py" line="3399"/>
<source><b>Search new files...</b><p>This searches for new files (sources, *.ui, *.idl) in the project directory and registered subdirectories.</p></source>
<translation><b>Chercher des nouveaux fichiers...</b><p>Cette commande recherche des nouveaux fichiers (sources, *.ui, *.idl) dans le répertoire projet et dans les sous-répertoires enregistrés.</p></translation>
</message>
@@ -38516,7 +38536,7 @@
<translation>Autre</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="4412"/>
+ <location filename="../Project/Project.py" line="4419"/>
<source>Include module names?</source>
<translation>Inclure les noms de modules ?</translation>
</message>
@@ -38601,132 +38621,132 @@
<translation type="obsolete"><p>Impossible de supprimer le fichier de propriétés du débogueur : <b>%1</b></p></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3465"/>
+ <location filename="../Project/Project.py" line="3471"/>
<source>Debugger Properties</source>
<translation>Propriétés du Débogueur</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3465"/>
+ <location filename="../Project/Project.py" line="3471"/>
<source>Debugger &Properties...</source>
<translation>Débogueur & Propriétés...</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3469"/>
+ <location filename="../Project/Project.py" line="3475"/>
<source>Show the debugger properties</source>
<translation>Affichage des propriétés du débogueur</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3470"/>
+ <location filename="../Project/Project.py" line="3476"/>
<source><b>Debugger Properties...</b><p>This shows a dialog to edit project specific debugger settings.</p></source>
<translation><b>Propriétés du Débogueur...</b><p>Affiche une boite de dialogue permettant d'éditer les proprités du débogueur, spécifiques au projet.</p></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3478"/>
+ <location filename="../Project/Project.py" line="3484"/>
<source>Load</source>
<translation>Charger</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3478"/>
+ <location filename="../Project/Project.py" line="3484"/>
<source>&Load</source>
<translation>&Charger</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3482"/>
+ <location filename="../Project/Project.py" line="3488"/>
<source>Load the debugger properties</source>
<translation>Charger les propriétés du débogueur</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3490"/>
+ <location filename="../Project/Project.py" line="3496"/>
<source>Save</source>
<translation>Enregistrer</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3494"/>
+ <location filename="../Project/Project.py" line="3500"/>
<source>Save the debugger properties</source>
<translation>Enregistrer les propriétés du débogueur</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3502"/>
+ <location filename="../Project/Project.py" line="3508"/>
<source>Delete</source>
<translation>Supprimer</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3502"/>
+ <location filename="../Project/Project.py" line="3508"/>
<source>&Delete</source>
<translation>&Supprimer</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3506"/>
+ <location filename="../Project/Project.py" line="3512"/>
<source>Delete the debugger properties</source>
<translation>Supprimer les propriétés du débogueur</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3515"/>
+ <location filename="../Project/Project.py" line="3521"/>
<source>Reset</source>
<translation>Réinitialiser</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3515"/>
+ <location filename="../Project/Project.py" line="3521"/>
<source>&Reset</source>
<translation>&Réinitialiser</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3519"/>
+ <location filename="../Project/Project.py" line="3525"/>
<source>Reset the debugger properties</source>
<translation>Réinitialise des propriétés du débogueur</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3732"/>
+ <location filename="../Project/Project.py" line="3738"/>
<source>Debugger</source>
<translation>Débogueur</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3729"/>
+ <location filename="../Project/Project.py" line="3735"/>
<source>Session</source>
<translation>Session</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3483"/>
+ <location filename="../Project/Project.py" line="3489"/>
<source><b>Load Debugger Properties</b><p>This loads the project specific debugger settings.</p></source>
<translation><b>Chargement des Propriétés du Débogueur</b><p>Charge la configuration du débogueur spécifique au projet.</p></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3495"/>
+ <location filename="../Project/Project.py" line="3501"/>
<source><b>Save Debugger Properties</b><p>This saves the project specific debugger settings.</p></source>
<translation><b>Enregistrement des Propriétés du Débogueur</b><p>Enregistre la configuration du débogueur spécifique au projet.</p></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3507"/>
+ <location filename="../Project/Project.py" line="3513"/>
<source><b>Delete Debugger Properties</b><p>This deletes the file containing the project specific debugger settings.</p></source>
<translation><b>Suppression des Propriétés du Débogueur...</b><p>Supprime la configuration du débogueur spécifique au projet.</p></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3520"/>
+ <location filename="../Project/Project.py" line="3526"/>
<source><b>Reset Debugger Properties</b><p>This resets the project specific debugger settings.</p></source>
<translation><b>Réinitialiser les propriétés du débogueur</b><p>Réinitialise la configuration du débogueur spécifique au projet.</p></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3429"/>
- <source>Filetype Associations</source>
- <translation>Association des types de fichiers</translation>
- </message>
- <message>
- <location filename="../Project/Project.py" line="3429"/>
- <source>Filetype Associations...</source>
- <translation>Association des types de fichiers...</translation>
- </message>
- <message>
- <location filename="../Project/Project.py" line="3433"/>
- <source>Show the project filetype associations</source>
- <translation>Affiche les asociation Fichier/Type de fichier pour le projet</translation>
- </message>
- <message>
<location filename="../Project/Project.py" line="3435"/>
+ <source>Filetype Associations</source>
+ <translation>Association des types de fichiers</translation>
+ </message>
+ <message>
+ <location filename="../Project/Project.py" line="3435"/>
+ <source>Filetype Associations...</source>
+ <translation>Association des types de fichiers...</translation>
+ </message>
+ <message>
+ <location filename="../Project/Project.py" line="3439"/>
+ <source>Show the project filetype associations</source>
+ <translation>Affiche les asociation Fichier/Type de fichier pour le projet</translation>
+ </message>
+ <message>
+ <location filename="../Project/Project.py" line="3441"/>
<source><b>Filetype Associations...</b><p>This shows a dialog to edit the filetype associations of the project. These associations determine the type (source, form, interface or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.</p></source>
<translation><b>Filetype Associations...</b><p>This shows a dialog to edit the filetype associations of the project. These associations determine the type (source, form, interface or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.</p></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3733"/>
+ <location filename="../Project/Project.py" line="3739"/>
<source>Pac&kagers</source>
<translation>Création de pac&kage</translation>
</message>
@@ -38736,22 +38756,22 @@
<translation type="obsolete">Problème de sécurité</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3341"/>
+ <location filename="../Project/Project.py" line="3347"/>
<source>Add files to project</source>
<translation>Ajouter des fichiers au projet</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3341"/>
+ <location filename="../Project/Project.py" line="3347"/>
<source>Add &files...</source>
<translation>Ajouter des &fichiers...</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3346"/>
+ <location filename="../Project/Project.py" line="3352"/>
<source>Add files to the current project</source>
<translation>Ajouter des fichiers au projet courant</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3348"/>
+ <location filename="../Project/Project.py" line="3354"/>
<source><b>Add files...</b><p>This opens a dialog for adding files to the current project. The place to add is determined by the file extension.</p></source>
<translation><b>Ajouter des fichiers...</b><p>Ouvre une boite de dialogue pour ajouter des fichiers au projet courant. La position pour l'insertion est déterminée par l'extension du fichier.</p></translation>
</message>
@@ -38796,7 +38816,7 @@
<translation type="obsolete">Fichiers projets compressés (*.e4pz)</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="2680"/>
+ <location filename="../Project/Project.py" line="2686"/>
<source>Project Files (*.e4p)</source>
<translation>Fichiers projets (*.e4p)</translation>
</message>
@@ -38806,17 +38826,17 @@
<translation type="obsolete">Fichiers projets (*.e4p);;Fichiers projets compressés (*.e4pz)</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3719"/>
+ <location filename="../Project/Project.py" line="3725"/>
<source>&Project</source>
<translation>&Projet</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3840"/>
+ <location filename="../Project/Project.py" line="3846"/>
<source>Project</source>
<translation>Projet</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3902"/>
+ <location filename="../Project/Project.py" line="3908"/>
<source>&Clear</source>
<translation>&Effacer</translation>
</message>
@@ -38846,27 +38866,27 @@
<translation type="obsolete"><p>Impossible d'écrire le fichier de propriétés du projet <b>%1</b>.</p></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3414"/>
+ <location filename="../Project/Project.py" line="3420"/>
<source>User project properties</source>
<translation>Propriétés utilisateur du projet</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3414"/>
+ <location filename="../Project/Project.py" line="3420"/>
<source>&User Properties...</source>
<translation>Propriétés &Utilisateur...</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3419"/>
+ <location filename="../Project/Project.py" line="3425"/>
<source>Show the user specific project properties</source>
<translation>Afficher le propriétés utilisateurs spécifiques au projet</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3421"/>
+ <location filename="../Project/Project.py" line="3427"/>
<source><b>User Properties...</b><p>This shows a dialog to edit the user specific project properties.</p></source>
<translation><b>Propriétés utilisateur...</b><p>Affiche une fenêtre permettant d'éditer les propriétés du projet spécifiques à l'utilisateur.</p></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="2893"/>
+ <location filename="../Project/Project.py" line="2899"/>
<source>Syntax errors detected</source>
<translation>Erreurs de syntaxe détectées</translation>
</message>
@@ -38876,7 +38896,7 @@
<translation type="obsolete">KDE 3</translation>
</message>
<message numerus="yes">
- <location filename="../Project/Project.py" line="2893"/>
+ <location filename="../Project/Project.py" line="2899"/>
<source>The project contains %n file(s) with syntax errors.</source>
<translation>
<numerusform>Le projet contient %n fichier avec des erreurs de syntaxe.</numerusform>
@@ -38889,12 +38909,12 @@
<translation type="obsolete">Plugin Eric4</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="4570"/>
+ <location filename="../Project/Project.py" line="4577"/>
<source>Create Package List</source>
<translation>Création de la liste de package</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3651"/>
+ <location filename="../Project/Project.py" line="3657"/>
<source>Create &Package List</source>
<translation>Création de la liste de &package</translation>
</message>
@@ -38909,12 +38929,12 @@
<translation type="obsolete"><b>Création de la liste de package</b><p>Cette commande créé la liste des fichiers à inclure dans l'archive d'un plugin eric4. Cette liste est créée à partir du fichier projet.</p></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="4762"/>
+ <location filename="../Project/Project.py" line="4769"/>
<source>Create Plugin Archive</source>
<translation>Création de l'archive du plugin</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3667"/>
+ <location filename="../Project/Project.py" line="3673"/>
<source>Create Plugin &Archive</source>
<translation>Création de l'&archive du plugin</translation>
</message>
@@ -38924,7 +38944,7 @@
<translation type="obsolete">Créé le fichier d'archive pour un plugin eric4.</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="4530"/>
+ <location filename="../Project/Project.py" line="4537"/>
<source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source>
<translation><p>Le fichier <b>PKGLIST</b> existe déjà.</p><p>Ecraser ?</p></translation>
</message>
@@ -38934,12 +38954,12 @@
<translation type="obsolete"><p>Impossible de créer le fichier <b>PKGLIST</b>.</p><p>Raison: %1</p></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="4589"/>
+ <location filename="../Project/Project.py" line="4596"/>
<source><p>The file <b>PKGLIST</b> does not exist. Aborting...</p></source>
<translation><p>Le fichier <b>PKGLIST</b> n'existe pas. Abandon...</p></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="4598"/>
+ <location filename="../Project/Project.py" line="4605"/>
<source>The project does not have a main script defined. Aborting...</source>
<translation>Le projet n'a pas de script principal défini. Abandon...</translation>
</message>
@@ -38969,12 +38989,12 @@
<translation><p>Le répertoire source ne contient aucun fichier correspondant à la catégorie sélectionnée.</p></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="2547"/>
+ <location filename="../Project/Project.py" line="2553"/>
<source>Select Version Control System</source>
<translation>Sélectionner un système de contrôle de version</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="2215"/>
+ <location filename="../Project/Project.py" line="2218"/>
<source>None</source>
<translation>Auncun</translation>
</message>
@@ -38994,12 +39014,12 @@
<translation type="obsolete"><p>Impossible d'enregistrer le fichier <b>%1</b> dans l'archive. Plugin ignoré.</p><p>Raison: %2</p></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3683"/>
+ <location filename="../Project/Project.py" line="3689"/>
<source>Create Plugin Archive (Snapshot)</source>
<translation>Création d'une archive plugin (Snapshot)</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3683"/>
+ <location filename="../Project/Project.py" line="3689"/>
<source>Create Plugin Archive (&Snapshot)</source>
<translation>Création d'une archive plugin (&Snapshot)</translation>
</message>
@@ -39029,12 +39049,12 @@
<translation>Vous devez d'abord spécifier un pattern de traduction.</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="2308"/>
+ <location filename="../Project/Project.py" line="2314"/>
<source>Translation Pattern</source>
<translation>Pattern de traduction</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="2308"/>
+ <location filename="../Project/Project.py" line="2314"/>
<source>Enter the path pattern for translation files (use '%language%' in place of the language code):</source>
<translation>Entrer le pattern pour les fichiers de traduction (utiliser la balise '%language%' à la place de la langue à utiliser):</translation>
</message>
@@ -39049,22 +39069,22 @@
<translation type="obsolete"><p>Le VCS sélectionné (<b>%1</b>) est introuvable.<br>Désactivation du système de contrôle de versions (VCS).</p><p>%2</p></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3447"/>
+ <location filename="../Project/Project.py" line="3453"/>
<source>Lexer Associations</source>
<translation>Association des types de fichiers</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3447"/>
- <source>Lexer Associations...</source>
- <translation>Association des types de fichiers...</translation>
- </message>
- <message>
- <location filename="../Project/Project.py" line="3451"/>
- <source>Show the project lexer associations (overriding defaults)</source>
- <translation>Affiche les asociations Fichier/Type de fichier pour le projet (sans tenir compte des valeurs par défaut)</translation>
- </message>
- <message>
<location filename="../Project/Project.py" line="3453"/>
+ <source>Lexer Associations...</source>
+ <translation>Association des types de fichiers...</translation>
+ </message>
+ <message>
+ <location filename="../Project/Project.py" line="3457"/>
+ <source>Show the project lexer associations (overriding defaults)</source>
+ <translation>Affiche les asociations Fichier/Type de fichier pour le projet (sans tenir compte des valeurs par défaut)</translation>
+ </message>
+ <message>
+ <location filename="../Project/Project.py" line="3459"/>
<source><b>Lexer Associations...</b><p>This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.</p></source>
<translation><b>Associations des types de fichiers...</b><p>Permet d'associer les types de fichiers aux analyseurs syntaxiques pour le projet en cours. Ces associations sont prioritaires sur les associations de fichiers configurées par défaut.</p></translation>
</message>
@@ -39159,7 +39179,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="2695"/>
+ <location filename="../Project/Project.py" line="2701"/>
<source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation type="unfinished"><p>Le fichier <b>{0}</b>existe déjà. Écraser ?</p></translation>
</message>
@@ -39189,67 +39209,67 @@
<translation type="obsolete">Fichiers projets (*.e4p *.e4pz)</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3656"/>
+ <location filename="../Project/Project.py" line="3662"/>
<source>Create an initial PKGLIST file for an eric5 plugin.</source>
<translation type="unfinished">Créé un fichier PKGLIST initial pour un plugin eric4. {5 ?}</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3658"/>
+ <location filename="../Project/Project.py" line="3664"/>
<source><b>Create Package List</b><p>This creates an initial list of files to include in an eric5 plugin archive. The list is created from the project file.</p></source>
<translation type="unfinished"><b>Création de la liste de package</b><p>Cette commande créé la liste des fichiers à inclure dans l'archive d'un plugin eric4. Cette liste est créée à partir du fichier projet.</p> {5 ?}</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3672"/>
+ <location filename="../Project/Project.py" line="3678"/>
<source>Create an eric5 plugin archive file.</source>
<translation type="unfinished">Créé le fichier d'archive pour un plugin eric4. {5 ?}</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3674"/>
+ <location filename="../Project/Project.py" line="3680"/>
<source><b>Create Plugin Archive</b><p>This creates an eric5 plugin archive file using the list of files given in the PKGLIST file. The archive name is built from the main script name.</p></source>
<translation type="unfinished"><b>Création de l'archive du plugin</b><p>Ceci créé une archive contenant l'ensemble des fichiers indiqués dans le fichier PKGLIST. Le nom de l'archive est construit à partir du nom du script principal.</p> {5 ?}</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3688"/>
+ <location filename="../Project/Project.py" line="3694"/>
<source>Create an eric5 plugin archive file (snapshot release).</source>
<translation type="unfinished">Créé une archive de plugin eric4 (snapshot release). {5 ?}</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3690"/>
+ <location filename="../Project/Project.py" line="3696"/>
<source><b>Create Plugin Archive (Snapshot)</b><p>This creates an eric5 plugin archive file using the list of files given in the PKGLIST file. The archive name is built from the main script name. The version entry of the main script is modified to reflect a snapshot release.</p></source>
<translation type="unfinished"><b>Création d'une archive de plugin (Snapshot)</b><p>Ceci permet de créer un plugin en utilisant la liste des fichiers indiqués dans le fichier PKGLIST. Le nom de l'archive est créé à partir du nom du script principal. Le champ 'version' du script principal est modifié pour indiquer une version snapshot.</p> {5 ?}</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="4169"/>
+ <location filename="../Project/Project.py" line="4175"/>
<source><p>The selected VCS <b>{0}</b> could not be found.<br/>Disabling version control.</p><p>{1}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="4570"/>
+ <location filename="../Project/Project.py" line="4577"/>
<source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="4612"/>
+ <location filename="../Project/Project.py" line="4619"/>
<source><p>The file <b>PKGLIST</b> could not be read.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="4625"/>
+ <location filename="../Project/Project.py" line="4632"/>
<source><p>The eric5 plugin archive file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="4651"/>
+ <location filename="../Project/Project.py" line="4658"/>
<source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="4674"/>
+ <location filename="../Project/Project.py" line="4681"/>
<source><p>The eric5 plugin archive file <b>{0}</b> was created successfully.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="4720"/>
+ <location filename="../Project/Project.py" line="4727"/>
<source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source>
<translation type="unfinished"></translation>
</message>
@@ -39279,22 +39299,22 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3636"/>
+ <location filename="../Project/Project.py" line="3642"/>
<source>Load Diagram</source>
<translation type="unfinished">Charger le diagramme</translation>
</message>
<message>
- <location filename="../Project/Project.py" line="3636"/>
- <source>&Load Diagram...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Project/Project.py" line="3640"/>
- <source>Load a diagram from file.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Project/Project.py" line="3642"/>
+ <source>&Load Diagram...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Project/Project.py" line="3646"/>
+ <source>Load a diagram from file.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Project/Project.py" line="3648"/>
<source><b>Load Diagram...</b><p>This loads a diagram from file.</p></source>
<translation type="unfinished"></translation>
</message>
@@ -39334,12 +39354,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="4158"/>
+ <location filename="../Project/Project.py" line="4164"/>
<source><p>The selected VCS <b>{0}</b> could not be found. <br/>Reverting override.</p><p>{1}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Project/Project.py" line="4762"/>
+ <location filename="../Project/Project.py" line="4769"/>
<source><p>The plugin file <b>{0}</b> could not be read.</p> <p>Reason: {1}</p></source>
<translation type="unfinished"></translation>
</message>
@@ -41310,22 +41330,22 @@
<context>
<name>Purge</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="95"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="91"/>
<source>Purge All Files</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="92"/>
+ <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="96"/>
- <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="100"/>
<source>Purge Files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="101"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="97"/>
<source>Do really want to delete files not tracked by Mercurial?</source>
<translation type="unfinished"></translation>
</message>
@@ -46268,182 +46288,182 @@
<context>
<name>Queues</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="274"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="262"/>
<source>New Patch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="324"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="311"/>
<source>Update Current Patch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="380"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="366"/>
<source>Pop Patches</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="384"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="370"/>
<source>Push Patches</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="388"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="374"/>
<source>Go to Patch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="524"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="507"/>
<source>Select Patch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="400"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="386"/>
<source>Select the target patch name:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="524"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="507"/>
<source>No patches to select from.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="453"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="438"/>
<source>Finish Applied Patches</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="487"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="471"/>
<source>Rename Patch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="510"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="493"/>
<source>Select the patch to be deleted:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="519"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="502"/>
<source>Delete Patch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="568"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="550"/>
<source>Fold Patches</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="563"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="545"/>
<source>No patches selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="568"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="550"/>
<source>No patches available to be folded.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="595"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="577"/>
<source>List Guards</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="595"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="577"/>
<source>No patches available to list guards for.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="633"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="615"/>
<source>Define Guards</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="679"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="660"/>
<source>No patches available to define guards for.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="679"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="660"/>
<source>Drop All Guards</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="654"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="636"/>
<source>Select the patch to drop guards for (leave empty for the current patch):</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="716"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="696"/>
<source>Set Active Guards</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="716"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="696"/>
<source>No guards available to select from.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="739"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="718"/>
<source>Deactivate Guards</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="779"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="758"/>
<source>Create New Queue</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="781"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="760"/>
<source>Rename Active Queue</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="819"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="795"/>
<source>Error while creating a new queue.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="822"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="798"/>
<source>Error while renaming the active queue.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="851"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="827"/>
<source>Purge Queue</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="853"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="829"/>
<source>Delete Queue</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="855"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="831"/>
<source>Activate Queue</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="896"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="869"/>
<source>Error while purging the queue.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="898"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="871"/>
<source>Error while deleting the queue.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="900"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="873"/>
<source>Error while setting the active queue.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="926"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="899"/>
<source>Available Queues</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="950"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="922"/>
<source>Initializing new queue repository</source>
<translation type="unfinished"></translation>
</message>
@@ -47124,17 +47144,17 @@
<context>
<name>Rebase</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="80"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="79"/>
<source>Rebase Changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="107"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="105"/>
<source>Rebase Changesets (Continue)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="134"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="131"/>
<source>Rebase Changesets (Abort)</source>
<translation type="unfinished"></translation>
</message>
@@ -48245,47 +48265,47 @@
<context>
<name>Shelve</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="128"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="122"/>
<source>Shelve current changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="179"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="172"/>
<source>Restore shelved changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="205"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="197"/>
<source>Abort restore operation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="233"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="224"/>
<source>Continue restore operation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="257"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="248"/>
<source>Select the shelves to be deleted:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="278"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="268"/>
<source>Delete shelves</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="267"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="258"/>
<source>Do you really want to delete these shelves?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="305"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="294"/>
<source>Delete all shelves</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="296"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="286"/>
<source>Do you really want to delete all shelved changes?</source>
<translation type="unfinished"></translation>
</message>
@@ -59453,12 +59473,12 @@
<context>
<name>Transplant</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py" line="72"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py" line="71"/>
<source>Transplant Changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py" line="99"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py" line="97"/>
<source>Transplant Changesets (Continue)</source>
<translation type="unfinished"></translation>
</message>
@@ -64469,22 +64489,22 @@
<translation><b>Ajouter au référentiel</b><p>Ajoute (importe) le projet local au référentiel VCS.</p></translation>
</message>
<message>
- <location filename="../VCS/ProjectHelper.py" line="173"/>
+ <location filename="../VCS/ProjectHelper.py" line="174"/>
<source>New Project</source>
<translation>Nouveau projet</translation>
</message>
<message>
- <location filename="../VCS/ProjectHelper.py" line="334"/>
+ <location filename="../VCS/ProjectHelper.py" line="338"/>
<source>Select version control system for the project</source>
<translation>Sélectionner un système de contrôle de version (VCS) pour le projet</translation>
</message>
<message>
- <location filename="../VCS/ProjectHelper.py" line="354"/>
+ <location filename="../VCS/ProjectHelper.py" line="359"/>
<source>Would you like to edit the VCS command options?</source>
<translation>Voulez-vous éditer les options de commande VCS ?</translation>
</message>
<message>
- <location filename="../VCS/ProjectHelper.py" line="189"/>
+ <location filename="../VCS/ProjectHelper.py" line="193"/>
<source>Create project directory</source>
<translation>Création d'un répertoire projet</translation>
</message>
@@ -64494,37 +64514,37 @@
<translation type="obsolete"><p>Impossible de créer le répertoire projet <b>%1</b>.</p></translation>
</message>
<message>
- <location filename="../VCS/ProjectHelper.py" line="278"/>
+ <location filename="../VCS/ProjectHelper.py" line="282"/>
<source>New project from repository</source>
<translation>Nouveau projet à partir du référentiel</translation>
</message>
<message>
- <location filename="../VCS/ProjectHelper.py" line="218"/>
+ <location filename="../VCS/ProjectHelper.py" line="222"/>
<source>Select a project file to open.</source>
<translation>Sélectionner un fichier projet à ouvrir.</translation>
</message>
<message>
- <location filename="../VCS/ProjectHelper.py" line="266"/>
+ <location filename="../VCS/ProjectHelper.py" line="270"/>
<source>Shall the project file be added to the repository?</source>
<translation>Le fichier projet doit-il être ajouté au référentiel?</translation>
</message>
<message>
- <location filename="../VCS/ProjectHelper.py" line="278"/>
+ <location filename="../VCS/ProjectHelper.py" line="282"/>
<source>The project could not be retrieved from the repository.</source>
<translation>Impossible de rappatrier le projet depuis le référentiel.</translation>
</message>
<message>
- <location filename="../VCS/ProjectHelper.py" line="354"/>
+ <location filename="../VCS/ProjectHelper.py" line="359"/>
<source>Import Project</source>
<translation>Importation de projet</translation>
</message>
<message>
- <location filename="../VCS/ProjectHelper.py" line="412"/>
+ <location filename="../VCS/ProjectHelper.py" line="420"/>
<source>Remove project from repository</source>
<translation>Supprimer le projet du référentiel</translation>
</message>
<message>
- <location filename="../VCS/ProjectHelper.py" line="412"/>
+ <location filename="../VCS/ProjectHelper.py" line="420"/>
<source>Dou you really want to remove this project from the repository (and disk)?</source>
<translation>Voulez-vous vraiment supprimer ce projet du référentiel (et du disque)?</translation>
</message>
@@ -64534,27 +64554,27 @@
<translation type="obsolete">Le projet rapatrié du référentiel ne contient pas de fichier de projet Eric (*.e4p *.e4pz *.e3p *.e3pz). Voulez-vous en créer un ?</translation>
</message>
<message>
- <location filename="../VCS/ProjectHelper.py" line="386"/>
+ <location filename="../VCS/ProjectHelper.py" line="394"/>
<source>Update</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../VCS/ProjectHelper.py" line="474"/>
+ <location filename="../VCS/ProjectHelper.py" line="483"/>
<source>The project should be reread. Do this now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../VCS/ProjectHelper.py" line="189"/>
+ <location filename="../VCS/ProjectHelper.py" line="193"/>
<source><p>The project directory <b>{0}</b> could not be created.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../VCS/ProjectHelper.py" line="233"/>
+ <location filename="../VCS/ProjectHelper.py" line="237"/>
<source>The project retrieved from the repository does not contain an eric project file (*.e4p). Create it?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../VCS/ProjectHelper.py" line="474"/>
+ <location filename="../VCS/ProjectHelper.py" line="483"/>
<source>Switch</source>
<translation type="unfinished">Basculer de version</translation>
</message>
@@ -64629,7 +64649,7 @@
<context>
<name>VersionControl</name>
<message>
- <location filename="../VCS/VersionControl.py" line="568"/>
+ <location filename="../VCS/VersionControl.py" line="581"/>
<source>Process Generation Error</source>
<translation>Erreur du processus</translation>
</message>
@@ -64639,12 +64659,12 @@
<translation type="obsolete">Impossible de lancer le processus %1. Assurez-vous qu'il est bien dans le chemin de recherche.</translation>
</message>
<message>
- <location filename="../VCS/VersionControl.py" line="699"/>
+ <location filename="../VCS/VersionControl.py" line="712"/>
<source>Repository status checking is switched off</source>
<translation>La vérification de statut du référentiel est désactivée</translation>
</message>
<message>
- <location filename="../VCS/VersionControl.py" line="568"/>
+ <location filename="../VCS/VersionControl.py" line="581"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation>Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation>
</message>
@@ -68888,24 +68908,24 @@
<context>
<name>mercurial</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1399"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1381"/>
<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="2093"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/>
<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="2103"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/>
<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="1419"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1401"/>
<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>
@@ -68931,23 +68951,23 @@
{2}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2085"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057"/>
<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="2088"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/>
<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="2108"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2080"/>
<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="2112"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2084"/>
<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>
@@ -68958,12 +68978,12 @@
</table></p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2098"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2070"/>
<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="1459"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1439"/>
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
