--- a/i18n/eric5_fr.ts Sun May 08 13:56:12 2011 +0200
+++ b/i18n/eric5_fr.ts Sun May 08 15:19:58 2011 +0200
@@ -1562,6 +1562,69 @@
</message>
</context>
<context>
+ <name>Bookmarks</name>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="121"/>
+ <source>Mercurial Bookmark</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="139"/>
+ <source>Delete Bookmark</source>
+ <translation type="unfinished">Supprimer le signet</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="139"/>
+ <source>Select the bookmark to be deleted:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="151"/>
+ <source>Delete Mercurial Bookmark</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="179"/>
+ <source>Rename Mercurial Bookmark</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="212"/>
+ <source>Move Mercurial Bookmark</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="289"/>
+ <source>Pull Bookmark</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="289"/>
+ <source>Select the bookmark to be pulled:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="301"/>
+ <source>Pulling bookmark from a remote Mercurial repository</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="321"/>
+ <source>Push Bookmark</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="321"/>
+ <source>Select the bookmark to be push:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="333"/>
+ <source>Pushing bookmark to a remote Mercurial repository</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>BookmarksDialog</name>
<message>
<location filename="Helpviewer/Bookmarks/BookmarksDialog.ui" line="14"/>
@@ -1786,6 +1849,174 @@
</message>
</context>
<context>
+ <name>BookmarksProjectHelper</name>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="54"/>
+ <source>List bookmarks</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="54"/>
+ <source>List bookmarks...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="58"/>
+ <source>List bookmarks of the project</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="61"/>
+ <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="68"/>
+ <source>Define bookmark</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="68"/>
+ <source>Define bookmark...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="72"/>
+ <source>Define a bookmark for the project</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="75"/>
+ <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="82"/>
+ <source>Delete bookmark</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="82"/>
+ <source>Delete bookmark...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="86"/>
+ <source>Delete a bookmark of the project</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="89"/>
+ <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="96"/>
+ <source>Rename bookmark</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="96"/>
+ <source>Rename bookmark...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="100"/>
+ <source>Rename a bookmark of the project</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="103"/>
+ <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="110"/>
+ <source>Move bookmark</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="110"/>
+ <source>Move bookmark...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="114"/>
+ <source>Move a bookmark of the project</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="117"/>
+ <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="124"/>
+ <source>Show incoming bookmarks</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="128"/>
+ <source>Show a list of incoming bookmarks</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="131"/>
+ <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="139"/>
+ <source>Pull bookmark</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="143"/>
+ <source>Pull a bookmark from a remote repository</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="146"/>
+ <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="154"/>
+ <source>Show outgoing bookmarks</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="158"/>
+ <source>Show a list of outgoing bookmarks</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="161"/>
+ <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="169"/>
+ <source>Push bookmark</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="173"/>
+ <source>Push a bookmark to a remote repository</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="176"/>
+ <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="191"/>
+ <source>Bookmarks</source>
+ <translation type="unfinished">Signets</translation>
+ </message>
+</context>
+<context>
<name>BookmarksToolBar</name>
<message>
<location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="39"/>
@@ -3695,7 +3926,7 @@
<translation>Filtrer &avec:</translation>
</message>
<message>
- <location filename="Project/CreateDialogCodeDialog.py" line="396"/>
+ <location filename="Project/CreateDialogCodeDialog.py" line="401"/>
<source>Code Generation</source>
<translation>Génération de code</translation>
</message>
@@ -3715,7 +3946,7 @@
<translation type="obsolete"><p>Impossible d'écrire le fichier source "%1".</p><p>Raison: %2</p></translation>
</message>
<message>
- <location filename="Project/CreateDialogCodeDialog.py" line="262"/>
+ <location filename="Project/CreateDialogCodeDialog.py" line="267"/>
<source>uic error</source>
<translation>erreur uic</translation>
</message>
@@ -3725,7 +3956,7 @@
<translation type="obsolete"><p>Erreur lors du chargement de la feuille <b>%1</b>.</p><p>%2</p></translation>
</message>
<message>
- <location filename="Project/CreateDialogCodeDialog.py" line="90"/>
+ <location filename="Project/CreateDialogCodeDialog.py" line="95"/>
<source>Create Dialog Code</source>
<translation>Création du code de boite de dialogue</translation>
</message>
@@ -3740,27 +3971,27 @@
<translation type="obsolete">...</translation>
</message>
<message>
- <location filename="Project/CreateDialogCodeDialog.py" line="90"/>
+ <location filename="Project/CreateDialogCodeDialog.py" line="95"/>
<source>The file <b>{0}</b> exists but does not contain any classes.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Project/CreateDialogCodeDialog.py" line="262"/>
+ <location filename="Project/CreateDialogCodeDialog.py" line="267"/>
<source><p>There was an error loading the form <b>{0}</b>.</p><p>{1}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Project/CreateDialogCodeDialog.py" line="304"/>
+ <location filename="Project/CreateDialogCodeDialog.py" line="309"/>
<source><p>Could not open the code template file "{0}".</p><p>Reason: {1}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Project/CreateDialogCodeDialog.py" line="337"/>
+ <location filename="Project/CreateDialogCodeDialog.py" line="342"/>
<source><p>Could not open the source file "{0}".</p><p>Reason: {1}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Project/CreateDialogCodeDialog.py" line="396"/>
+ <location filename="Project/CreateDialogCodeDialog.py" line="401"/>
<source><p>Could not write the source file "{0}".</p><p>Reason: {1}</p></source>
<translation type="unfinished"></translation>
</message>
@@ -16302,247 +16533,247 @@
<context>
<name>Hg</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="175"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="197"/>
<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="178"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="200"/>
<source>The hg process did not finish within 30s.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="180"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="202"/>
<source>Could not start the hg executable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="206"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="228"/>
<source>Create project repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="206"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="228"/>
<source>The project repository could not be created.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="233"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="255"/>
<source>Creating Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="270"/>
<source>Initial commit to Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="289"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="311"/>
<source>Cloning project from a Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="385"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="407"/>
<source>Commiting changes to Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="433"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="455"/>
<source>Synchronizing with the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="481"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="503"/>
<source>Adding files/directories to the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="541"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="563"/>
<source>Removing files/directories from the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="599"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="621"/>
<source>Renaming {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="707"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="726"/>
<source>Taging in the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="737"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="756"/>
<source>Reverting changes</source>
<translation type="unfinished">Revenir avant les modifications</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="778"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="804"/>
<source>Merging</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="981"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1023"/>
<source>Mercurial command</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1154"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1200"/>
<source>Copying {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1247"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1378"/>
<source>Mercurial Log</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1247"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1378"/>
<source>Select number of entries to show.</source>
<translation type="unfinished">Sélectionner plusieurs entrées à afficher.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1322"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1453"/>
<source>Pulling from a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1354"/>
- <source>Pushing to a remote Mercurial repository</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1463"/>
- <source>Resolving files/directories</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1485"/>
- <source>Create Branch</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1485"/>
+ <source>Pushing to a remote Mercurial repository</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1599"/>
+ <source>Resolving files/directories</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1621"/>
+ <source>Create Branch</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1621"/>
<source>Enter branch name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1496"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1632"/>
<source>Creating branch in the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1567"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1703"/>
<source>Verifying the integrity of the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1591"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/>
<source>Showing the combined configuration settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1614"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/>
<source>Showing aliases for remote repositories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1773"/>
<source>Recovering from interrupted transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1856"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1999"/>
<source>Shall the working directory be updated?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1519"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1655"/>
<source>Showing current branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1768"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1911"/>
<source>Create changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1867"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2010"/>
<source>Apply changegroups</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1881"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2024"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1908"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/>
<source>Mercurial Bisect ({0})</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1820"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1963"/>
<source>Preview changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1660"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1796"/>
<source>Identifying project directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1685"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1821"/>
<source>Create .hgignore file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1685"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1821"/>
<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="1940"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2090"/>
<source>Removing files from the Mercurial repository only</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1993"/>
<source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1830"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1973"/>
<source>Identifying changegroup file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2146"/>
<source>Backing out changeset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1969"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2126"/>
<source>No revision given. Aborting...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1889"/>
<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="2014"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2171"/>
<source>Rollback last transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2009"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2166"/>
<source>Are you sure you want to rollback the last transaction?</source>
<translation type="unfinished"></translation>
</message>
@@ -16708,63 +16939,413 @@
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/>
+ <source>Select to not specify a specific revision</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="181"/>
+ <source>No revision selected</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="194"/>
+ <source>Commit data</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="200"/>
+ <source>Commit message:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="207"/>
+ <source>Enter the commit message or leave empty to use the default one</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="219"/>
+ <source>Commit Date:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="226"/>
+ <source>Enter optional date for the commit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="239"/>
+ <source>Commit User:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="246"/>
+ <source>Enter optional user for the commit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="258"/>
+ <source>Select to merge with parent of the project directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="261"/>
+ <source>Merge with current parent</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py" line="173"/>
+ <source>Backed out changeset <{0}>.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/>
- <source>Select to not specify a specific revision</source>
+ <source>Select to specify a revision by a bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="152"/>
- <source>No revision selected</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="165"/>
- <source>Commit data</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="171"/>
- <source>Commit message:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/>
- <source>Enter the commit message or leave empty to use the default one</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="190"/>
- <source>Commit Date:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="197"/>
- <source>Enter optional date for the commit</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="210"/>
- <source>Commit User:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="217"/>
- <source>Enter optional user for the commit</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="229"/>
- <source>Select to merge with parent of the project directory</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="232"/>
- <source>Merge with current parent</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py" line="76"/>
- <source>Backed out changeset <{0}>.</source>
+ <source>Bookmark:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="168"/>
+ <source>Enter a bookmark name</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>HgBookmarkDialog</name>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py" line="45"/>
+ <source>Define Bookmark</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="25"/>
+ <source>Name:</source>
+ <translation type="unfinished">Nom:</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="32"/>
+ <source>Enter the bookmark name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="45"/>
+ <source>Select a bookmark</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="54"/>
+ <source>Revision</source>
+ <translation type="unfinished">Révision</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="60"/>
+ <source>Select to specify a revision by number</source>
+ <translation type="unfinished">Sélectionner pour spécifier une révision par son numéro</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="63"/>
+ <source>Number</source>
+ <translation type="unfinished">Numéro</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="73"/>
+ <source>Enter a revision number</source>
+ <translation type="unfinished">Entrer un numéro de révision</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="102"/>
+ <source>Select to specify a revision by changeset id</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="105"/>
+ <source>Id:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="115"/>
+ <source>Enter a changeset id</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="122"/>
+ <source>Select to specify a revision by a tag</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="125"/>
+ <source>Tag:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="141"/>
+ <source>Enter a tag name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="151"/>
+ <source>Select to specify a revision by a branch</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="154"/>
+ <source>Branch:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="170"/>
+ <source>Enter a branch name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="180"/>
+ <source>Select to specify a revision by a bookmark</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="183"/>
+ <source>Bookmark:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="199"/>
+ <source>Enter a bookmark name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/>
+ <source>Select tip revision of repository</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="212"/>
+ <source>TIP</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py" line="42"/>
+ <source>Move Bookmark</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>HgBookmarkRenameDialog</name>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkRenameDialog.ui" line="14"/>
+ <source>Rename Bookmark</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkRenameDialog.ui" line="23"/>
+ <source>New Name:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkRenameDialog.ui" line="30"/>
+ <source>Enter the bookmark name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkRenameDialog.ui" line="37"/>
+ <source>Bookmark:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkRenameDialog.ui" line="50"/>
+ <source>Enter the bookmark name to be renamed</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>HgBookmarksInOutDialog</name>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="32"/>
+ <source><b>Bookmarks List</b>
+<p>This shows a list of the bookmarks.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="49"/>
+ <source>Name</source>
+ <translation type="unfinished">Nom</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="54"/>
+ <source>Changeset</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="68"/>
+ <source>Errors</source>
+ <translation type="unfinished">Erreurs</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="90"/>
+ <source>Input</source>
+ <translation type="unfinished">Entrée</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="112"/>
+ <source>Press to send the input to the hg process</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="115"/>
+ <source>&Send</source>
+ <translation type="unfinished">&Envoyer</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="118"/>
+ <source>Alt+S</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="125"/>
+ <source>Enter data to be sent to the hg process</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="132"/>
+ <source>Select to switch the input field to password mode</source>
+ <translation type="unfinished">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="135"/>
+ <source>&Password Mode</source>
+ <translation type="unfinished">Mode Mot de &Passe</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="138"/>
+ <source>Alt+P</source>
+ <translation type="unfinished">Alt+P</translation>
+ </message>
+ <message>
+ <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="50"/>
+ <source>Mercurial Outgoing Bookmarks</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="114"/>
+ <source>Process Generation Error</source>
+ <translation type="unfinished">Erreur du processus</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="114"/>
+ <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="146"/>
+ <source>no bookmarks found</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>HgBookmarksListDialog</name>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="14"/>
+ <source>Mercurial Bookmarks</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="17"/>
+ <source><b>Mercurial Bookmarks</b>
+<p>This dialog shows a list of the projects bookmarks.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="36"/>
+ <source><b>Bookmarks List</b>
+<p>This shows a list of the projects bookmarks.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="53"/>
+ <source>Revision</source>
+ <translation type="unfinished">Révision</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="58"/>
+ <source>Changeset</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="63"/>
+ <source>Status</source>
+ <translation type="unfinished">Etat (status)</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="68"/>
+ <source>Name</source>
+ <translation type="unfinished">Nom</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="82"/>
+ <source>Errors</source>
+ <translation type="unfinished">Erreurs</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="104"/>
+ <source>Input</source>
+ <translation type="unfinished">Entrée</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="126"/>
+ <source>Press to send the input to the hg process</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="129"/>
+ <source>&Send</source>
+ <translation type="unfinished">&Envoyer</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="132"/>
+ <source>Alt+S</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="139"/>
+ <source>Enter data to be sent to the hg process</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="146"/>
+ <source>Select to switch the input field to password mode</source>
+ <translation type="unfinished">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="149"/>
+ <source>&Password Mode</source>
+ <translation type="unfinished">Mode Mot de &Passe</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="152"/>
+ <source>Alt+P</source>
+ <translation type="unfinished">Alt+P</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="99"/>
+ <source>Process Generation Error</source>
+ <translation type="unfinished">Erreur du processus</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="99"/>
+ <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="131"/>
+ <source>no bookmarks defined</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -16841,28 +17422,43 @@
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="166"/>
+ <source>Select to not specify a specific revision</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="169"/>
+ <source>No revision selected</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="182"/>
+ <source>Select the compression type (empty for default)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="189"/>
+ <source>Select to bundle all changesets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="192"/>
+ <source>Bundle all changesets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="137"/>
- <source>Select to not specify a specific revision</source>
+ <source>Select to specify a revision by a bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="140"/>
- <source>No revision selected</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="153"/>
- <source>Select the compression type (empty for default)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="160"/>
- <source>Select to bundle all changesets</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="163"/>
- <source>Bundle all changesets</source>
+ <source>Bookmark:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="156"/>
+ <source>Enter a bookmark name</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -17221,12 +17817,12 @@
<translation type="unfinished">Sélectionner le champ à filtrer</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1046"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1060"/>
<source>Revision</source>
<translation type="unfinished">Révision</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1043"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1057"/>
<source>Author</source>
<translation type="unfinished">Auteur</translation>
</message>
@@ -17386,27 +17982,27 @@
<translation type="unfinished">Modifié</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="618"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="629"/>
<source>Process Generation Error</source>
<translation type="unfinished">Erreur du processus</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="618"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="629"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="454"/>
- <source>The hg process did not finish within 30s.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="457"/>
- <source>Could not start the hg executable.</source>
+ <source>The hg process did not finish within 30s.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="460"/>
+ <source>Could not start the hg executable.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="463"/>
<source>Mercurial Error</source>
<translation type="unfinished"></translation>
</message>
@@ -17460,6 +18056,11 @@
<source>Mercurial Log (Outgoing)</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="134"/>
+ <source>Bookmarks</source>
+ <translation type="unfinished">Signets</translation>
+ </message>
</context>
<context>
<name>HgLogDialog</name>
@@ -17539,94 +18140,100 @@
<translation type="unfinished">Révision</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="149"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="154"/>
<source>Process Generation Error</source>
<translation type="unfinished">Erreur du processus</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="149"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="154"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="220"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="225"/>
<source>No log available for '{0}'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="253"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="258"/>
<source>diff to {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="261"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="266"/>
<source>Branches: {0}<br />
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="263"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="268"/>
<source>Tags: {0}<br />
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="265"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="273"/>
<source>Parents: {0}<br />
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="267"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="275"/>
<source><i>Author: {0}</i><br />
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="270"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="278"/>
<source><i>Date: {0}, {1}</i><br />
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="284"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/>
<source>Added {0}<br />
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="290"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="298"/>
<source>Modified {0}<br />
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="296"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="304"/>
<source>Deleted {0}<br />
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="196"/>
- <source>The hg process did not finish within 30s.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="198"/>
- <source>Could not start the hg executable.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="201"/>
+ <source>The hg process did not finish within 30s.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="203"/>
+ <source>Could not start the hg executable.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="206"/>
<source>Mercurial Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="280"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="288"/>
<source>Added {0} (copied from {1})<br />
</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="271"/>
+ <source>Bookmarks: {0}<br />
+</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgMergeDialog</name>
@@ -17701,24 +18308,39 @@
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="166"/>
+ <source>Select to not specify a specific revision</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="169"/>
+ <source>No revision selected</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="182"/>
+ <source>Select to force the merge operation</source>
+ <translation type="unfinished">Cocher pour forcer l'opération de fusion</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="185"/>
+ <source>Enforce merge</source>
+ <translation type="unfinished">Forcer la fusion</translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="137"/>
- <source>Select to not specify a specific revision</source>
+ <source>Select to specify a revision by a bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="140"/>
- <source>No revision selected</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="153"/>
- <source>Select to force the merge operation</source>
- <translation type="unfinished">Cocher pour forcer l'opération de fusion</translation>
+ <source>Bookmark:</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="156"/>
- <source>Enforce merge</source>
- <translation type="unfinished">Forcer la fusion</translation>
+ <source>Enter a bookmark name</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -17966,1000 +18588,1005 @@
<context>
<name>HgProjectHelper</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="52"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="75"/>
<source>New from repository</source>
<translation type="unfinished">Nouveau à partir du référentiel</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="52"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="75"/>
<source>&New from repository...</source>
<translation type="unfinished">&Nouveau depuis un référentiel...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="55"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="78"/>
<source>Create (clone) a new project from a Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="58"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="81"/>
<source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="66"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="89"/>
<source>Show incoming log</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="70"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="93"/>
<source>Show the log of incoming changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="73"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="96"/>
<source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="80"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="103"/>
<source>Pull changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="84"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="107"/>
<source>Pull changes from a remote repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="87"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="110"/>
<source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="95"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/>
<source>Update from repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="95"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/>
<source>&Update from repository</source>
<translation type="unfinished">Mettre à jo&ur à partir du référentiel</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="99"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="122"/>
<source>Update the local project from the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="102"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/>
<source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="109"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="132"/>
<source>Commit changes to repository</source>
<translation type="unfinished">"Commiter" les modifications au référentiel</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="109"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="132"/>
<source>&Commit changes to repository...</source>
<translation type="unfinished">&Appliquer les changements dans le référentiel...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="113"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="136"/>
<source>Commit changes to the local project to the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="116"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="139"/>
<source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="124"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147"/>
<source>Show outgoing log</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="151"/>
<source>Show the log of outgoing changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="131"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="154"/>
<source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="138"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="161"/>
<source>Push changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="142"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165"/>
<source>Push changes to a remote repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="145"/>
- <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/>
+ <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="191"/>
<source>Export from repository</source>
<translation type="unfinished">Exporter du référentiel</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="191"/>
<source>&Export from repository...</source>
<translation type="unfinished">&Exporter du référentiel...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="172"/>
- <source>Export a project from the repository</source>
- <translation type="unfinished">Exporte un projet d'un référentiel VCS</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="175"/>
- <source><b>Export from repository</b><p>This exports a project from the repository.</p></source>
- <translation type="unfinished"><b>Exporter du référentiel</b><p>Exporte un projet d'un référentiel VCS.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/>
- <source>Add to repository</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/>
- <source>&Add to repository...</source>
- <translation type="unfinished">&Ajouter au référentiel...</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="185"/>
- <source>Add the local project to the repository</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="188"/>
- <source><b>Add to repository</b><p>This adds (imports) the local project to the repository.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="195"/>
- <source>Remove from repository (and disk)</source>
- <translation type="unfinished">Supprimer du référentiel (et du disque)</translation>
- </message>
- <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="195"/>
+ <source>Export a project from the repository</source>
+ <translation type="unfinished">Exporte un projet d'un référentiel VCS</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="198"/>
+ <source><b>Export from repository</b><p>This exports a project from the repository.</p></source>
+ <translation type="unfinished"><b>Exporter du référentiel</b><p>Exporte un projet d'un référentiel VCS.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205"/>
+ <source>Add to repository</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205"/>
+ <source>&Add to repository...</source>
+ <translation type="unfinished">&Ajouter au référentiel...</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/>
+ <source>Add the local project to the repository</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="211"/>
+ <source><b>Add to repository</b><p>This adds (imports) the local project to the repository.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="218"/>
+ <source>Remove from repository (and disk)</source>
+ <translation type="unfinished">Supprimer du référentiel (et du disque)</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="218"/>
<source>&Remove from repository (and disk)</source>
<translation type="unfinished">&Supprimer du référentiel (et du disque)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="199"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/>
<source>Remove the local project from the repository (and disk)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="202"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="225"/>
<source><b>Remove from repository</b><p>This removes the local project from the repository (and disk).</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="210"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="233"/>
<source>Show log</source>
<translation type="unfinished">Afficher le log</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="210"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="233"/>
<source>Show &log</source>
<translation type="unfinished">Afficher le &log</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="214"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/>
<source>Show the log of the local project</source>
<translation type="unfinished">Affiche le log du projet local</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="217"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240"/>
<source><b>Show log</b><p>This shows the log of the local project.</p></source>
<translation type="unfinished"><b>Afficher le log</b><p>Affiche le log du projet local</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="224"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="247"/>
<source>Show limited log</source>
<translation type="unfinished">Afficher un log limité</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/>
<source>Show a limited log of the local project</source>
<translation type="unfinished">Afficher un log limité du projet local</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="231"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/>
<source><b>Show limited log</b><p>This shows the log of the local project limited to a selectable number of entries.</p></source>
<translation type="unfinished"><b>Afficher un log limité</b><p>Affiche le log du projet limité aux entrées sélectionnées</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="239"/>
- <source>Show log browser</source>
- <translation type="unfinished">Afficher le navigateur de logs</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="243"/>
- <source>Show a dialog to browse the log of the local project</source>
- <translation type="unfinished">Affiche une fenêtre permettant de parcourir les logs du projet local</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/>
- <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source>
- <translation type="unfinished"><b>Navigateur de logs</b><p>Affiche une fenêtre permettant de parcourir les messages logs du projet local. La fenêtre n'affiche qu'un nombre limité d'entrées, mais un bouton permet d'afficher les logs plus anciens.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="255"/>
- <source>Show difference</source>
- <translation type="unfinished">Afficher les différences</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="255"/>
- <source>Show &difference</source>
- <translation type="unfinished">Afficher les &différences</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="259"/>
- <source>Show the difference of the local project to the repository</source>
- <translation type="unfinished">Affiche les différences entre le projet local et le référentiel</translation>
- </message>
- <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="262"/>
- <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source>
- <translation type="unfinished"><b>Afficher les différences</b><p>Affiche les différences du projet local avec le référentiel.</p></translation>
+ <source>Show log browser</source>
+ <translation type="unfinished">Afficher le navigateur de logs</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/>
+ <source>Show a dialog to browse the log of the local project</source>
+ <translation type="unfinished">Affiche une fenêtre permettant de parcourir les logs du projet local</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269"/>
+ <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source>
+ <translation type="unfinished"><b>Navigateur de logs</b><p>Affiche une fenêtre permettant de parcourir les messages logs du projet local. La fenêtre n'affiche qu'un nombre limité d'entrées, mais un bouton permet d'afficher les logs plus anciens.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/>
+ <source>Show difference</source>
+ <translation type="unfinished">Afficher les différences</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/>
+ <source>Show &difference</source>
+ <translation type="unfinished">Afficher les &différences</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="282"/>
+ <source>Show the difference of the local project to the repository</source>
+ <translation type="unfinished">Affiche les différences entre le projet local et le référentiel</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/>
+ <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source>
+ <translation type="unfinished"><b>Afficher les différences</b><p>Affiche les différences du projet local avec le référentiel.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="292"/>
<source>Show difference (extended)</source>
<translation type="unfinished">Afficher les différences (étendu)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="273"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/>
<source>Show the difference of revisions of the project to the repository</source>
<translation type="unfinished">Affiche les différences entre le référentiel et les différentes révisions du projet</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="276"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/>
<source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source>
<translation type="unfinished"><b>Afficher les différences (etendu)</b><p>Affiche les différences du projet entre différentes révisions.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="306"/>
<source>Show status</source>
<translation type="unfinished">Afficher l'état (status)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="306"/>
<source>Show &status</source>
<translation type="unfinished">Affich&er l'état VCS</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="287"/>
- <source>Show the status of the local project</source>
- <translation type="unfinished">Affiche l'état du projet local par rapport au référentiel VCS</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="290"/>
- <source><b>Show status</b><p>This shows the status of the local project.</p></source>
- <translation type="unfinished"><b>Afficher l'état VCS</b><p>Affiche l'état du projet local par rapport au référentiel VCS.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="297"/>
- <source>Show heads</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/>
- <source>Show the heads of the repository</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303"/>
- <source><b>Show heads</b><p>This shows the heads of the repository.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="310"/>
- <source>Show parents</source>
- <translation type="unfinished"></translation>
+ <source>Show the status of the local project</source>
+ <translation type="unfinished">Affiche l'état du projet local par rapport au référentiel VCS</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313"/>
- <source>Show the parents of the repository</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/>
- <source><b>Show parents</b><p>This shows the parents of the repository.</p></source>
+ <source><b>Show status</b><p>This shows the status of the local project.</p></source>
+ <translation type="unfinished"><b>Afficher l'état VCS</b><p>Affiche l'état du projet local par rapport au référentiel VCS.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="320"/>
+ <source>Show heads</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/>
- <source>Show tip</source>
+ <source>Show the heads of the repository</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="326"/>
- <source>Show the tip of the repository</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="329"/>
- <source><b>Show tip</b><p>This shows the tip of the repository.</p></source>
+ <source><b>Show heads</b><p>This shows the heads of the repository.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="333"/>
+ <source>Show parents</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="336"/>
+ <source>Show the parents of the repository</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="339"/>
+ <source><b>Show parents</b><p>This shows the parents of the repository.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="346"/>
+ <source>Show tip</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="349"/>
+ <source>Show the tip of the repository</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="352"/>
+ <source><b>Show tip</b><p>This shows the tip of the repository.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="359"/>
<source>Revert changes</source>
<translation type="unfinished">Revenir avant les modifications</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="336"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="359"/>
<source>Re&vert changes</source>
<translation type="unfinished">&Recharger le projet</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="363"/>
<source>Revert all changes made to the local project</source>
<translation type="unfinished">Recharger le projet et écraser toutes les modifications locales</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="343"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/>
<source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source>
<translation type="unfinished"><b>Recharger le projet</b><p>Recharge le projet et écrase toutes les modifications effectuées localement.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="373"/>
<source>Merge</source>
<translation type="unfinished">Fusionner</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="373"/>
<source>Mer&ge changes...</source>
<translation type="unfinished">&Fusionner les modifications...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354"/>
- <source>Merge changes of a revision into the local project</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="357"/>
- <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/>
- <source>Resolve conflicts</source>
- <translation type="unfinished">Résoudre les confits</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/>
- <source>Resolve con&flicts</source>
- <translation type="unfinished">Résoudre les con&fits</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367"/>
- <source>Resolve all conflicts of the local project</source>
- <translation type="unfinished">Résout tous les conflits du projet local</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="370"/>
- <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source>
- <translation type="unfinished"><b>Résolution des conflits</b><p>Résout tous les conflits VCS du projet local.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="377"/>
- <source>Tag in repository</source>
- <translation type="unfinished">Etiqueter au niveau du référentiel (tag)</translation>
- </message>
- <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="377"/>
+ <source>Merge changes of a revision into the local project</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380"/>
+ <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="387"/>
+ <source>Resolve conflicts</source>
+ <translation type="unfinished">Résoudre les confits</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="387"/>
+ <source>Resolve con&flicts</source>
+ <translation type="unfinished">Résoudre les con&fits</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/>
+ <source>Resolve all conflicts of the local project</source>
+ <translation type="unfinished">Résout tous les conflits du projet local</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/>
+ <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source>
+ <translation type="unfinished"><b>Résolution des conflits</b><p>Résout tous les conflits VCS du projet local.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/>
+ <source>Tag in repository</source>
+ <translation type="unfinished">Etiqueter au niveau du référentiel (tag)</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/>
<source>&Tag in repository...</source>
<translation type="unfinished">&Etiqueter dans le référentiel...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="381"/>
- <source>Tag the local project in the repository</source>
- <translation type="unfinished">Etiquette le projet local dans le référentiel</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="384"/>
- <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source>
- <translation type="unfinished"><b>Etiqueter dans le référentiel</b><p>Etiquette le projet local dans le référentiel (opération "tag").</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391"/>
- <source>List tags</source>
- <translation type="unfinished">Lister les étiquettes</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391"/>
- <source>List tags...</source>
- <translation type="unfinished">Lister les étiquettes...</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="394"/>
- <source>List tags of the project</source>
- <translation type="unfinished">Liste les étiquettes du projet</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="397"/>
- <source><b>List tags</b><p>This lists the tags of the project.</p></source>
- <translation type="unfinished"><b>Liste des étiquettes</b><p>Liste les étiquettes du projet.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="404"/>
- <source>List branches</source>
- <translation type="unfinished">Lister les branches</translation>
- </message>
- <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="404"/>
- <source>List branches...</source>
- <translation type="unfinished">Lister les branches...</translation>
+ <source>Tag the local project in the repository</source>
+ <translation type="unfinished">Etiquette le projet local dans le référentiel</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="407"/>
- <source>List branches of the project</source>
- <translation type="unfinished">Liste les branches du projet</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410"/>
- <source><b>List branches</b><p>This lists the branches of the project.</p></source>
- <translation type="unfinished"><b>Liste des branches</b><p>Effectue la liste de toutes les branches de développement du projet.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417"/>
- <source>Create branch</source>
- <translation type="unfinished"></translation>
+ <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source>
+ <translation type="unfinished"><b>Etiqueter dans le référentiel</b><p>Etiquette le projet local dans le référentiel (opération "tag").</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="414"/>
+ <source>List tags</source>
+ <translation type="unfinished">Lister les étiquettes</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="414"/>
+ <source>List tags...</source>
+ <translation type="unfinished">Lister les étiquettes...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417"/>
+ <source>List tags of the project</source>
+ <translation type="unfinished">Liste les étiquettes du projet</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/>
+ <source><b>List tags</b><p>This lists the tags of the project.</p></source>
+ <translation type="unfinished"><b>Liste des étiquettes</b><p>Liste les étiquettes du projet.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="427"/>
+ <source>List branches</source>
+ <translation type="unfinished">Lister les branches</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="427"/>
+ <source>List branches...</source>
+ <translation type="unfinished">Lister les branches...</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="430"/>
+ <source>List branches of the project</source>
+ <translation type="unfinished">Liste les branches du projet</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/>
+ <source><b>List branches</b><p>This lists the branches of the project.</p></source>
+ <translation type="unfinished"><b>Liste des branches</b><p>Effectue la liste de toutes les branches de développement du projet.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/>
+ <source>Create branch</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/>
<source>Create &branch...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/>
<source>Create a new branch for the local project in the repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="424"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/>
<source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/>
<source>Close branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/>
- <source>Close the current branch of the local project</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452"/>
- <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="472"/>
+ <source>Close the current branch of the local project</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/>
+ <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="495"/>
<source>Switch</source>
<translation type="unfinished">Basculer de version</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="472"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="495"/>
<source>S&witch...</source>
<translation type="unfinished">&Basculer de version...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="476"/>
- <source>Switch the working directory to another revision</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/>
- <source><b>Switch</b><p>This switches the working directory to another revision.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/>
- <source>Cleanup</source>
- <translation type="unfinished">Nettoyer</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/>
- <source>Cleanu&p</source>
- <translation type="unfinished">&Nettoyer</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/>
- <source>Cleanup the local project</source>
- <translation type="unfinished">Nettoyer le projet local</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/>
- <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source>
- <translation type="unfinished"><b>Nettoyer</b><p>Permet de nettoyer le projet local.</p></translation>
- </message>
- <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/>
- <source>Execute command</source>
- <translation type="unfinished">Exécuter une commande</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/>
- <source>E&xecute command...</source>
- <translation type="unfinished">E&xécuter une commande...</translation>
+ <source>Switch the working directory to another revision</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="502"/>
- <source>Execute an arbitrary Mercurial command</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/>
- <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source>
- <translation type="unfinished"></translation>
+ <source><b>Switch</b><p>This switches the working directory to another revision.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/>
+ <source>Cleanup</source>
+ <translation type="unfinished">Nettoyer</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/>
+ <source>Cleanu&p</source>
+ <translation type="unfinished">&Nettoyer</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/>
- <source>Command options</source>
- <translation type="unfinished">Options de commande</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/>
- <source>Command &options...</source>
- <translation type="unfinished">&Options de commande...</translation>
+ <source>Cleanup the local project</source>
+ <translation type="unfinished">Nettoyer le projet local</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515"/>
+ <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source>
+ <translation type="unfinished"><b>Nettoyer</b><p>Permet de nettoyer le projet local.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/>
+ <source>Execute command</source>
+ <translation type="unfinished">Exécuter une commande</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/>
+ <source>E&xecute command...</source>
+ <translation type="unfinished">E&xécuter une commande...</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/>
+ <source>Execute an arbitrary Mercurial command</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/>
+ <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/>
+ <source>Command options</source>
+ <translation type="unfinished">Options de commande</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/>
+ <source>Command &options...</source>
+ <translation type="unfinished">&Options de commande...</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/>
<source>Show the Mercurial command options</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="516"/>
- <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="523"/>
- <source>Configure</source>
- <translation type="unfinished">Configuration</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="523"/>
- <source>Configure...</source>
- <translation type="unfinished">Configuration...</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/>
- <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="529"/>
- <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="536"/>
- <source>Edit repository config</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/>
- <source>Edit repository config...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/>
- <source>Show an editor to edit the repository config file</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="542"/>
- <source><b>Edit repository config</b><p>Show an editor to edit the repository config file.</p></source>
- <translation type="unfinished"></translation>
+ <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="546"/>
+ <source>Configure</source>
+ <translation type="unfinished">Configuration</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546"/>
+ <source>Configure...</source>
+ <translation type="unfinished">Configuration...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/>
- <source>Show combined config settings</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/>
- <source>Show combined config settings...</source>
+ <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="552"/>
- <source>Show the combined config settings from all config files</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/>
- <source><b>Show combined config settings</b><p>This shows the combined config settings from all config files.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/>
- <source>Show paths</source>
+ <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="559"/>
+ <source>Edit repository config</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/>
+ <source>Edit repository config...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/>
- <source>Show paths...</source>
+ <source>Show an editor to edit the repository config file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565"/>
- <source>Show the aliases for remote repositories</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="568"/>
- <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="575"/>
- <source>Verify repository</source>
+ <source><b>Edit repository config</b><p>Show an editor to edit the repository config file.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/>
+ <source>Show combined config settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/>
+ <source>Show combined config settings...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575"/>
- <source>Verify repository...</source>
+ <source>Show the combined config settings from all config files</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="578"/>
- <source>Verify the integrity of the repository</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/>
- <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source>
+ <source><b>Show combined config settings</b><p>This shows the combined config settings from all config files.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/>
+ <source>Show paths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/>
+ <source>Show paths...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/>
- <source>Recover</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/>
- <source>Recover...</source>
+ <source>Show the aliases for remote repositories</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/>
- <source>Recover from an interrupted transaction</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/>
- <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="794"/>
- <source>Repository Administration</source>
+ <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="598"/>
+ <source>Verify repository</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/>
+ <source>Verify repository...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/>
+ <source>Verify the integrity of the repository</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/>
+ <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="611"/>
+ <source>Recover</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/>
+ <source>Recover...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/>
- <source>Create .hgignore</source>
+ <source>Recover from an interrupted transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/>
+ <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="817"/>
+ <source>Repository Administration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/>
+ <source>Create .hgignore</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/>
<source>Create a .hgignore file with default values</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="620"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/>
<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="650"/>
+ <source>Create changegroup</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="650"/>
+ <source>Create changegroup...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/>
+ <source>Create changegroup file collecting changesets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/>
+ <source>Apply changegroups</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/>
+ <source>Apply changegroups...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/>
+ <source>Apply one or several changegroup files</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="843"/>
+ <source>Changegroup Management</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/>
+ <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="698"/>
+ <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>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/>
+ <source>Show current branch</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="485"/>
+ <source>Show the current branch of the project</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/>
+ <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="706"/>
+ <source>Mark as "good"</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/>
+ <source>Mark a selectable changeset as good</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/>
+ <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="719"/>
+ <source>Mark as "bad"</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/>
+ <source>Mark a selectable changeset as bad</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="725"/>
+ <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="732"/>
+ <source>Skip</source>
+ <translation type="unfinished">Passer</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/>
+ <source>Skip the current changeset</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="738"/>
+ <source><b>Skip</b><p>This skips the current changeset.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="745"/>
+ <source>Reset</source>
+ <translation type="unfinished">Réinitialiser</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/>
+ <source>Reset the bisect search data</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="751"/>
+ <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="849"/>
+ <source>Bisect</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="706"/>
+ <source>Mark as "good"...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/>
+ <source>Mark as "bad"...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="664"/>
+ <source>Preview changegroup</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="664"/>
+ <source>Preview changegroup...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/>
+ <source>Identify</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/>
+ <source>Identify...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/>
- <source>Create changegroup</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/>
- <source>Create changegroup...</source>
+ <source>Identify the project directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/>
- <source>Create changegroup file collecting changesets</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/>
- <source>Apply changegroups</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/>
- <source>Apply changegroups...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/>
- <source>Apply one or several changegroup files</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="820"/>
- <source>Changegroup Management</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/>
- <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="675"/>
- <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>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="459"/>
- <source>Show current branch</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/>
- <source>Show the current branch of the project</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465"/>
- <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683"/>
- <source>Mark as "good"</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/>
- <source>Mark a selectable changeset as good</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/>
- <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="696"/>
- <source>Mark as "bad"</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/>
- <source>Mark a selectable changeset as bad</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702"/>
- <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="709"/>
- <source>Skip</source>
- <translation type="unfinished">Passer</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/>
- <source>Skip the current changeset</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/>
- <source><b>Skip</b><p>This skips the current changeset.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/>
- <source>Reset</source>
- <translation type="unfinished">Réinitialiser</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="725"/>
- <source>Reset the bisect search data</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/>
- <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="826"/>
- <source>Bisect</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683"/>
- <source>Mark as "good"...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/>
- <source>Mark as "bad"...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/>
- <source>Preview changegroup</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/>
- <source>Preview changegroup...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/>
- <source>Identify</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/>
- <source>Identify...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/>
- <source>Identify the project directory</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/>
<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="644"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/>
<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="647"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/>
<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="655"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="678"/>
<source>Identify changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="678"/>
<source>Identify changegroup...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/>
<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="661"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/>
<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="735"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758"/>
<source>Back out changeset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="738"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/>
<source>Back out changes of an earlier changeset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/>
<source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="153"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176"/>
<source>Push changes (force)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="180"/>
<source>Push changes to a remote repository with force option</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="160"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="183"/>
<source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="838"/>
<source>Specials</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/>
<source>Serve project repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/>
<source>Serve project repository...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/>
<source>Serve the project repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/>
<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="929"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/>
<source>Pull</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/>
<source>The project should be reread. Do this now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="455"/>
<source>Push new branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/>
<source>Push the current branch of the local project as a new named branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="438"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/>
<source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/>
<source>Rollback last transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="751"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="774"/>
<source>Rollback the last transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/>
<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>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/>
+ <source>Extensions</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgRevisionSelectionDialog</name>
@@ -19034,23 +19661,38 @@
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="178"/>
+ <source>Select tip revision of repository</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="181"/>
+ <source>TIP</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py" line="45"/>
+ <source>No revision selected</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py" line="46"/>
+ <source>Select to not specify a specific revision</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="149"/>
- <source>Select tip revision of repository</source>
+ <source>Select to specify a revision by a bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="152"/>
- <source>TIP</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py" line="35"/>
- <source>No revision selected</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py" line="36"/>
- <source>Select to not specify a specific revision</source>
+ <source>Bookmark:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="168"/>
+ <source>Enter a bookmark name</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -19067,90 +19709,105 @@
<translation type="unfinished">Révision &1</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="175"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="204"/>
<source>Select to specify a revision by number</source>
<translation type="unfinished">Sélectionner pour spécifier une révision par son numéro</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="178"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="207"/>
<source>Number</source>
<translation type="unfinished">Numéro</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="188"/>
- <source>Enter a revision number</source>
- <translation type="unfinished">Entrer un numéro de révision</translation>
- </message>
- <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="217"/>
+ <source>Enter a revision number</source>
+ <translation type="unfinished">Entrer un numéro de révision</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="246"/>
<source>Select to specify a revision by changeset id</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="220"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="249"/>
<source>Id:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="230"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="259"/>
<source>Enter a changeset id</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="237"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="266"/>
<source>Select to specify a revision by a tag</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="240"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="269"/>
<source>Tag:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="250"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="279"/>
<source>Enter a tag name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="260"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="289"/>
<source>Select to specify a revision by a branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="263"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="292"/>
<source>Branch:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="273"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="302"/>
<source>Enter a branch name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="283"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="341"/>
<source>Select tip revision of repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="286"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="344"/>
<source>TIP</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="296"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="354"/>
<source>Select revision before last commit</source>
<translation type="unfinished">Sélectionne la révision avant la dernière validation</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="299"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="357"/>
<source>PREV</source>
<translation type="unfinished">PREC</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="169"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="198"/>
<source>Revision &2</source>
<translation type="unfinished">Révision &2</translation>
</message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="312"/>
+ <source>Select to specify a revision by a bookmark</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="315"/>
+ <source>Bookmark:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="331"/>
+ <source>Enter a bookmark name</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgServeDialog</name>
@@ -46273,22 +46930,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="159"/>
+ <location filename="VCS/ProjectHelper.py" line="163"/>
<source>New Project</source>
<translation>Nouveau projet</translation>
</message>
<message>
- <location filename="VCS/ProjectHelper.py" line="297"/>
+ <location filename="VCS/ProjectHelper.py" line="305"/>
<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="316"/>
+ <location filename="VCS/ProjectHelper.py" line="324"/>
<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="172"/>
+ <location filename="VCS/ProjectHelper.py" line="176"/>
<source>Create project directory</source>
<translation>Création d'un répertoire projet</translation>
</message>
@@ -46298,37 +46955,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="247"/>
+ <location filename="VCS/ProjectHelper.py" line="251"/>
<source>New project from repository</source>
<translation>Nouveau projet à partir du référentiel</translation>
</message>
<message>
- <location filename="VCS/ProjectHelper.py" line="197"/>
+ <location filename="VCS/ProjectHelper.py" line="201"/>
<source>Select a project file to open.</source>
<translation>Sélectionner un fichier projet à ouvrir.</translation>
</message>
<message>
- <location filename="VCS/ProjectHelper.py" line="239"/>
+ <location filename="VCS/ProjectHelper.py" line="243"/>
<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="247"/>
+ <location filename="VCS/ProjectHelper.py" line="251"/>
<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="316"/>
+ <location filename="VCS/ProjectHelper.py" line="324"/>
<source>Import Project</source>
<translation>Importation de projet</translation>
</message>
<message>
- <location filename="VCS/ProjectHelper.py" line="369"/>
+ <location filename="VCS/ProjectHelper.py" line="377"/>
<source>Remove project from repository</source>
<translation>Supprimer le projet du référentiel</translation>
</message>
<message>
- <location filename="VCS/ProjectHelper.py" line="369"/>
+ <location filename="VCS/ProjectHelper.py" line="377"/>
<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>
@@ -46338,22 +46995,22 @@
<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="345"/>
+ <location filename="VCS/ProjectHelper.py" line="353"/>
<source>Update</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="VCS/ProjectHelper.py" line="345"/>
+ <location filename="VCS/ProjectHelper.py" line="353"/>
<source>The project should be reread. Do this now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="VCS/ProjectHelper.py" line="172"/>
+ <location filename="VCS/ProjectHelper.py" line="176"/>
<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="212"/>
+ <location filename="VCS/ProjectHelper.py" line="216"/>
<source>The project retrieved from the repository does not contain an eric project file (*.e4p). Create it?</source>
<translation type="unfinished"></translation>
</message>
@@ -49864,30 +50521,30 @@
<context>
<name>mercurial</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1034"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1076"/>
<source><tr><td><b>Parent #{0}</b></td><td></td></tr>
<tr><td><b>Changeset</b></td><td>{1}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1548"/>
<source><tr><td><b>Tags</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1420"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1556"/>
<source><tr><td><b>Branches</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1046"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1092"/>
<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>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1070"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1116"/>
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
@@ -49898,29 +50555,34 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1542"/>
<source><tr><td><b>Tip</b></td><td></td></tr>
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1412"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1544"/>
<source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1424"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/>
<source><tr><td><b>Parents</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1427"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1563"/>
<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>
</table></p></source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1552"/>
+ <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>pep8</name>
