--- a/src/eric7/i18n/eric7_fr.ts Wed Dec 04 10:45:31 2024 +0100 +++ b/src/eric7/i18n/eric7_fr.ts Wed Dec 04 11:29:15 2024 +0100 @@ -22702,6 +22702,89 @@ </message> </context> <context> + <name>Fastexport</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="183" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="174" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="133" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="113" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="57" /> + <source>Mercurial Fastexport</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="58" /> + <source><p>The output file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="107" /> + <source>Cancel</source> + <translation type="unfinished">Annuler</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="110" /> + <source>%v/%m Changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="116" /> + <source>Exporting repository (time remaining: {0}) ...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="134" /> + <source><p>The repository fastexport process sent an error message.</p><p>{0}</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="160" /> + <source><p>The repository fastexport process finished successfully.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="169" /> + <source><p>The repository fastexport process was cancelled.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="175" /> + <source><p>The repository fastexport process finished with exit code <b>{0}</b>.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="184" /> + <source><p>The repository fastexport process crashed.</p></source> + <translation type="unfinished" /> + </message> + </context> + <context> + <name>FastexportProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="37" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="35" /> + <source>Export to git</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="44" /> + <source>Export the repository as git fast-import stream.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="47" /> + <source><b>Export to git</b><p>This exports the repository as a git fast-import stream.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="79" /> + <source>Fastexport</source> + <translation type="unfinished" /> + </message> + </context> + <context> <name>FeaturePermissionBar</name> <message> <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="48" /> @@ -35370,456 +35453,456 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="305" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="309" /> <source>Create project repository</source> <translation>Créer un répertoire projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="306" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="310" /> <source>The project repository could not be created.</source> <translation>Le répertoire projet n'a pu être créé.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="340" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="344" /> <source>Creating Mercurial repository</source> <translation>Création en cour d'un répertoire Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="361" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="365" /> <source>Initial commit to Mercurial repository</source> <translation>Commit initial vers le dépot Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="407" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411" /> <source>Cloning project from a Mercurial repository</source> <translation>Clonage du projet à partir d'un dépot Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="518" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="522" /> <source>Commit Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="519" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="523" /> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished">Ce commit affecte des fichiers qui ont des modifications non enregistrées. Faut-il poursuivre le commit ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="582" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="586" /> <source>Committing changes to Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="681" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="685" /> <source>Synchronizing with the Mercurial repository</source> <translation>Synchronisation en cours avec le dépot Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="715" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="719" /> <source>Adding files/directories to the Mercurial repository</source> <translation>Ajouter des fichiers/dossier au dépot Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="776" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="780" /> <source>Removing files/directories from the Mercurial repository</source> <translation>Suppression en cours des fichiers/dossiers à partir du dépot Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="831" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="835" /> <source>Renaming {0}</source> <translation type="unfinished">Renommage {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="966" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="970" /> <source>Tagging in the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1013" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1002" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1017" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006" /> <source>Revert changes</source> <translation>Revenir avant les modifications</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1003" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1007" /> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1014" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1018" /> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1020" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024" /> <source>Reverting changes</source> <translation>Revenir avant les modifications</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1066" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1070" /> <source>Merging</source> <translation>Fusion en cours</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1105" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1097" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1109" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101" /> <source>Re-Merge</source> <translation type="unfinished">Re-fusionner</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1098" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1102" /> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1106" /> - <source>Do you really want to re-merge the project?</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1110" /> + <source>Do you really want to re-merge the project?</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1114" /> <source>Re-Merging</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1133" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137" /> <source>Current branch tip</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1316" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1320" /> <source>Mercurial command</source> <translation>Commande Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1494" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1498" /> <source>Copying {0}</source> <translation>Copie en cours {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1748" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1764" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1752" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743" /> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1761" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1765" /> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Le fichier <b>{0}</b> n'a pas pu être lu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2459" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2463" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2452" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2442" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1841" /> <source>Apply changegroups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1840" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1886" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1890" /> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2029" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2033" /> <source>Marking as 'unresolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2031" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2035" /> <source>Marking as 'resolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2053" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057" /> <source>Aborting uncommitted merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2081" /> <source>Creating branch in the Mercurial repository</source> <translation>Création en cours d'une branche sur le dépot Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2092" /> <source>Created new branch <{0}>.</source> <translation>Nouvelle branche créée <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2097" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2101" /> <source>Showing current branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2186" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190" /> <source>Verifying the integrity of the Mercurial repository</source> <translation>Vérification en cours de l'intégrité du dépot Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2202" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2206" /> <source>Showing the combined configuration settings</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2217" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221" /> <source>Showing aliases for remote repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2232" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236" /> <source>Recovering from interrupted transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2251" /> <source>Identifying project directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2293" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297" /> <source>Create .hgignore file</source> <translation>Créer un fichier .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2294" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2298" /> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Le fichier <b>{0}</b>existe déjà. L'écraser ?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2397" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2371" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2401" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2375" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2357" /> <source>Create changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2355" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2359" /> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2372" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2376" /> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2411" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2415" /> <source>Preview changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2440" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2413" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2444" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2417" /> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2449" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2453" /> <source>Shall the working directory be updated?</source> <translation>Faut-il mettre à jour le répertoire de travail ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485" /> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2503" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2507" /> <source>Mercurial Bisect ({0})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2529" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533" /> <source>Removing files from the Mercurial repository only</source> <translation>Supprimer les fichiers de dépot Mercurial uniquement</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2578" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2559" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2582" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2563" /> <source>Backing out changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2564" /> <source>No revision given. Aborting...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2589" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2590" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594" /> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663" /> <source>Import Patch</source> <translation>Importer un patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2709" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2713" /> <source>Export Patches</source> <translation>Exporter des patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2751" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2755" /> <source>Change Phase</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2806" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2810" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2845" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2849" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2855" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2859" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2865" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2869" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2889" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2893" /> <source>Create Unversioned Archive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2904" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2908" /> <source>Delete All Backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2905" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2909" /> <source><p>Do you really want to delete all backup bundles stored in the backup area?<br/><b>{0}</b></p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2996" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2976" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2965" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2980" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2969" /> <source>Add Sub-repository</source> <translation>Ajouter un sous-dépot</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3035" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2966" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3039" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2970" /> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2977" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2981" /> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3053" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2997" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3057" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3001" /> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3052" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3034" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3056" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3038" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3024" /> <source>Remove Sub-repositories</source> <translation>Supprimer un sous-répertoire</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3021" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3025" /> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3313" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3140" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3317" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3144" /> <source>Mercurial Command Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3141" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145" /> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3314" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3318" /> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3437" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3441" /> <source>Mercurial Bookmark</source> <translation>Signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3454" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3458" /> <source>Delete Bookmark</source> <translation>Supprimer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3459" /> <source>Select the bookmark to be deleted:</source> <translation>Selectionner le signet à supprimer :</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3466" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3470" /> <source>Delete Mercurial Bookmark</source> <translation>Supprimer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3493" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497" /> <source>Rename Mercurial Bookmark</source> <translation>Renommer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3535" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3539" /> <source>Move Mercurial Bookmark</source> <translation>Déplacer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3617" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3621" /> <source>Pull Bookmark</source> <translation>Récuperer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3618" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3622" /> <source>Select the bookmark to be pulled:</source> <translation>Sélectionner le signet à récuperer:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3634" /> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Récupérant le signet d'un dépôt Mercurial distant</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3658" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3662" /> <source>Push Bookmark</source> <translation>Envoyer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3659" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663" /> <source>Select the bookmark to be push:</source> <translation>Sélectionner le signet à envoyer:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3678" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>À envoyer le signet à un dépôt Mercurial distant</translation> </message> @@ -36665,42 +36748,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="98" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="100" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147" /> - <source>Did not receive the 'hello' message.</source> - <translation>N'a pas reçu le message 'hello'.</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="149" /> + <source>Did not receive the 'hello' message.</source> + <translation>N'a pas reçu le message 'hello'.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151" /> <source>Received data on unexpected channel.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="156" /> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="161" /> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="170" /> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="173" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="175" /> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="385" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="387" /> <source>For message see output dialog.</source> <translation type="unfinished" /> </message> @@ -37063,6 +37146,11 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="0" /> + <source>%v/%m</source> + <translation type="unfinished">%v/%m</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="0" /> <source>Errors</source> <translation>Erreurs</translation> </message> @@ -37106,6 +37194,11 @@ <source>Alt+P</source> <translation>Alt+P</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="207" /> + <source>Time remaining: {0}</source> + <translation type="unfinished" /> + </message> </context> <context> <name>HgDiffDialog</name> @@ -37285,6 +37378,69 @@ </message> </context> <context> + <name>HgFastexportConfigDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>fastexport Configuration</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the file for the exported marks.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the output file.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Revisions:</source> + <translation type="unfinished">Révisions :</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the file containing already exported marks.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Author Map:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Import Marks:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Export Marks:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Output File:</source> + <translation type="unfinished">Fichier de sortie:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the revisions, tags or branches to be exported (separated by comma).</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the author map file.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.py" line="42" /> + <source>Text Files (*.txt);;All Files (*)</source> + <translation type="unfinished">Fichiers texte (*.txt);;Tous les fichiers (*)</translation> + </message> + </context> + <context> <name>HgGpgSignDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="0" /> @@ -38995,190 +39151,181 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="305" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="309" /> <source>Other Functions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="331" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="335" /> <source>Extensions</source> <translation type="unfinished">Extensions</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="770" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="655" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="607" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="357" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="659" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="505" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="361" /> <source>Version Control</source> <translation>Contrôle de version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="786" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="517" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="373" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="790" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="521" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="377" /> <source>Commit changes to repository...</source> <translation>Committer les modifications dans le dépot...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="795" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="680" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="526" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="382" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="799" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="684" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="530" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="386" /> <source>Add to repository</source> <translation>Ajouter au dépot</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="801" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="686" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="532" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="388" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="805" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="690" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="536" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="392" /> <source>Remove from repository (and disk)</source> <translation>Supprimer du référentiel (et du disque)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1065" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1052" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="538" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="394" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1069" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1056" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="542" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398" /> <source>Remove from repository only</source> <translation>Supprimer du dépot uniquement</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="691" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="695" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403" /> <source>Copy</source> <translation>Copier</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="693" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="401" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="697" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="405" /> <source>Move</source> <translation>Déplacer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="698" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="406" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="702" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="410" /> <source>Show log browser</source> <translation>Afficher le navigateur de logs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="808" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="705" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="413" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="812" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="709" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="549" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="417" /> <source>Show status</source> <translation>Afficher l'état (status)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="815" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="712" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="552" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="420" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="819" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="716" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="424" /> <source>Show differences</source> <translation>Montrer les différences</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="426" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="430" /> <source>Show differences side-by-side</source> <translation>Montrer les différences côte à côte</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="821" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="718" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="558" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="432" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="722" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="562" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="436" /> <source>Show differences (extended)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="438" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="442" /> <source>Show differences side-by-side (extended)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="444" /> - <source>Show annotated file</source> - <translation>Afficher les fichiers annotés</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="448" /> - <source>Show annotated file with skip list</source> - <translation type="unfinished" /> + <source>Show annotated file</source> + <translation>Afficher les fichiers annotés</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="452" /> + <source>Show annotated file with skip list</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="456" /> <source>Create skip list file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="828" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="725" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="565" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="458" /> - <source>Revert changes</source> - <translation>Revenir avant les modifications</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="832" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="729" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="569" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="462" /> - <source>Conflicts resolved</source> - <translation type="unfinished">Conflits résolus</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="834" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="731" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="571" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="464" /> - <source>Conflicts unresolved</source> - <translation type="unfinished">Conflits non résolus</translation> + <source>Revert changes</source> + <translation>Revenir avant les modifications</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="836" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="733" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="573" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="466" /> - <source>Re-Merge</source> - <translation>Re-fusionner</translation> + <source>Conflicts resolved</source> + <translation type="unfinished">Conflits résolus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="735" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="575" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="468" /> + <source>Conflicts unresolved</source> + <translation type="unfinished">Conflits non résolus</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="840" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="737" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="577" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="470" /> + <source>Re-Merge</source> + <translation>Re-fusionner</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="844" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="741" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="581" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="474" /> <source>Select all local file entries</source> <translation>Sélectionner tous les fichiers locaux</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="843" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="740" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="580" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="473" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="847" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="744" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="477" /> <source>Select all versioned file entries</source> <translation>Sélectionner tous les fichiers ayant une version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="846" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="743" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="628" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="583" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="476" /> - <source>Select all local directory entries</source> - <translation>Sélectionner tous les répertoires locaux</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="850" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="747" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="587" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="480" /> - <source>Select all versioned directory entries</source> - <translation>Sélectionner tous les répertoires ayant une version</translation> + <source>Select all local directory entries</source> + <translation>Sélectionner tous les répertoires locaux</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="854" /> @@ -39186,22 +39333,31 @@ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="591" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484" /> + <source>Select all versioned directory entries</source> + <translation>Sélectionner tous les répertoires ayant une version</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="858" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="755" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="488" /> <source>Configure...</source> <translation>Configuration...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="969" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="973" /> <source>Create {0} file</source> <translation type="unfinished">Créer le fichier {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="970" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="974" /> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"><p>Le fichier <b>{0}</b>existe déjà. L'écraser ?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1066" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1053" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1070" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1057" /> <source>Do you really want to remove these files from the repository?</source> <translation>Voulez-vous vraiment supprimer ces fichiers du dépot ?</translation> </message> @@ -39209,1518 +39365,1518 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="131" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135" /> <source>New from repository</source> <translation>Nouveau à partir du référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="133" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="137" /> <source>&New from repository...</source> <translation>&Nouveau depuis un référentiel...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="140" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144" /> <source>Create (clone) a new project from a Mercurial repository</source> <translation>Créer (clone) un nouveau projet à partir d'un dépot Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="143" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147" /> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation><b>Nouvea à partir d'un dépot</b><p>Cela créé (clone) un nouveau projet local à partir d'un dépot Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="155" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="153" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157" /> <source>Show incoming log</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="161" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165" /> <source>Show the log of incoming changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="163" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="167" /> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="175" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="179" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="177" /> <source>Pull changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="181" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="185" /> <source>Pull changes from a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="183" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187" /> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="193" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="197" /> <source>Update from repository</source> <translation>Mise à jour à partir du dépot</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="195" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="199" /> <source>&Update from repository</source> <translation>Mettre à jo&ur à partir du dépot</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="202" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206" /> <source>Update the local project from the Mercurial repository</source> <translation>Mettre à jour le projet local à partir du dépot Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="209" /> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Mettre à jour à partir d'un dépot</b><p>Cela mets à jour le projet local à partir d'un dépot Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="215" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219" /> <source>Commit changes to repository</source> <translation>"Commiter" les modifications au référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="217" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221" /> <source>&Commit changes to repository...</source> <translation>&Appliquer les changements dans le référentiel...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="224" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228" /> <source>Commit changes to the local project to the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="227" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="231" /> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="239" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="243" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="241" /> <source>Show outgoing log</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="245" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="249" /> <source>Show the log of outgoing changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="247" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251" /> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="259" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="257" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261" /> <source>Push changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="265" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269" /> <source>Push changes to a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="267" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271" /> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="279" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="277" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281" /> <source>Push changes (force)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="290" /> <source>Push changes to a remote repository with force option</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="289" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293" /> <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" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303" /> <source>Export from repository</source> <translation>Exporter du référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="305" /> <source>&Export from repository...</source> <translation>&Exporter du référentiel...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="307" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311" /> <source>Export a project from the repository</source> <translation>Exporte un projet d'un référentiel VCS</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313" /> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><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="320" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="318" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="324" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322" /> <source>Show log browser</source> <translation>Afficher le navigateur de logs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="331" /> <source>Show a dialog to browse the log of the local project</source> <translation>Affiche une fenêtre permettant de parcourir les logs du projet local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="334" /> <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><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="341" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="345" /> <source>Show differences</source> <translation>Montrer les différences</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="343" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347" /> <source>Show &difference</source> <translation>Afficher les &différences</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354" /> <source>Show the difference of the local project to the repository</source> <translation>Affiche les différences entre le projet local et le référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="353" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="357" /> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"><b>Montrer les différences</b><p>Cela affiche les différences entre le projet local et le dépot.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="363" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367" /> <source>Show differences (extended)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="372" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376" /> <source>Show the difference of revisions of the project to the repository</source> <translation>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="375" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379" /> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="385" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389" /> <source>Show status</source> <translation>Afficher l'état (status)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="387" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391" /> <source>Show &status...</source> <translation>Montrer les &statuts...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="397" /> <source>Show the status of the local project</source> <translation>Affiche l'état du projet local par rapport au référentiel VCS</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="399" /> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><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="404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408" /> <source>Show Summary</source> <translation>Montrer le bilan</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410" /> <source>Show summary...</source> <translation>Montrer le bilan...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417" /> <source>Show summary information of the working directory status</source> <translation type="unfinished">Afficher le bilan du statut du répertoire de travail</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420" /> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426" /> - <source>Show heads</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="428" /> - <source>Show the heads of the repository</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="430" /> + <source>Show heads</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432" /> + <source>Show the heads of the repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434" /> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443" /> <source>Show parents</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450" /> <source>Show the parents of the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="448" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452" /> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457" /> - <source>Show tip</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="459" /> - <source>Show the tip of the repository</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461" /> + <source>Show tip</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463" /> + <source>Show the tip of the repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465" /> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471" /> <source>Revert changes</source> <translation>Revenir avant les modifications</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473" /> <source>Re&vert changes</source> <translation>&Recharger le projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="476" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="480" /> <source>Revert all changes made to the local project</source> <translation>Recharger le projet et écraser toutes les modifications locales</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483" /> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><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="2125" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2129" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492" /> <source>Merge</source> <translation>Fusionner</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494" /> <source>Mer&ge changes...</source> <translation>&Fusionner les modifications...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501" /> <source>Merge changes of a revision into the local project</source> <translation>Fusionne les modifications d'une révision dans le projet local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504" /> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Fusion</b><p>Cela fusionne les modifications d'une révision dans le projet local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="510" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514" /> <source>Commit Merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521" /> <source>Commit all the merged changes.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="519" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="523" /> <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="533" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="532" /> <source>Abort Merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540" /> <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543" /> <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553" /> <source>Re-Merge</source> <translation>Re-fusionner</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562" /> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565" /> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575" /> <source>Show conflicts</source> <translation>Montrer les conflits</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576" /> <source>Show conflicts...</source> <translation>Montrer les conflits...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="583" /> <source>Show a dialog listing all files with conflicts</source> <translation>Affiche une fenêtre listant tous les fichiers en conflit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586" /> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596" /> <source>Conflicts resolved</source> <translation>Conflits résolus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="597" /> <source>Con&flicts resolved</source> <translation>Con&flits résolus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604" /> <source>Mark all conflicts of the local project as resolved</source> <translation>Marquer tous les conflits du projet local comme résolus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607" /> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation><b>Conflits résolus</b><p>Ceci marque tous les conflits du projet local comme résolus.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617" /> <source>Conflicts unresolved</source> <translation>Conflits non résolus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625" /> <source>Mark all conflicts of the local project as unresolved</source> <translation>Marquer tous les conflits du projet local comme non résolus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628" /> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation><b>Conflits non résolus</b><p>Ceci marque tous les conflits du projet local comme non résolus.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638" /> <source>Tag in repository</source> <translation>Etiqueter au niveau du référentiel (tag)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="636" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640" /> <source>&Tag in repository...</source> <translation>&Etiqueter dans le référentiel...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646" /> <source>Tag the local project in the repository</source> <translation>Etiquette le projet local dans le référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648" /> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><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="653" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657" /> <source>List tags</source> <translation>Lister les étiquettes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658" /> <source>List tags...</source> <translation>Lister les étiquettes...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="664" /> <source>List tags of the project</source> <translation>Liste les étiquettes du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666" /> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Liste des étiquettes</b><p>Liste les étiquettes du projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672" /> <source>List branches</source> <translation>Lister les branches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673" /> <source>List branches...</source> <translation>Lister les branches...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="679" /> <source>List branches of the project</source> <translation>Liste les branches du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681" /> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><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="686" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690" /> <source>Create branch</source> <translation>Créer une branche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692" /> <source>Create &branch...</source> <translation>Créer une &branche...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699" /> <source>Create a new branch for the local project in the repository</source> <translation>Créer une nouvelle branche pour le projet local dans le dépot</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702" /> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712" /> <source>Push new branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721" /> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726" /> <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" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="734" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="738" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736" /> <source>Close branch</source> <translation>Fermer la branche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="745" /> <source>Close the current branch of the local project</source> <translation>Feme la branche courante du projet local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="744" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748" /> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Fermer la branche</b><p>Ceci feme la branche courante du projet local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757" /> <source>Show current branch</source> <translation>Montrer la branche courante</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765" /> <source>Show the current branch of the project</source> <translation>Montrer la branche courante du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768" /> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Montrer la branche courante</b><p>Ceci montre la branche courante du projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777" /> <source>Switch</source> <translation>Basculer de version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779" /> <source>S&witch...</source> <translation>&Basculer de version...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786" /> <source>Switch the working directory to another revision</source> <translation type="unfinished">Basculer le répertoire de travail sur une autre version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789" /> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="795" /> - <source>Cleanup</source> - <translation>Nettoyer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="795" /> - <source>Cleanu&p</source> - <translation>&Nettoyer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797" /> - <source>Cleanup the local project</source> - <translation>Nettoyer le projet local</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799" /> + <source>Cleanup</source> + <translation>Nettoyer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799" /> + <source>Cleanu&p</source> + <translation>&Nettoyer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801" /> + <source>Cleanup the local project</source> + <translation>Nettoyer le projet local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803" /> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Nettoyer</b><p>Permet de nettoyer le projet local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812" /> <source>Execute command</source> <translation>Exécuter une commande</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813" /> <source>E&xecute command...</source> <translation>E&xécuter une commande...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="820" /> <source>Execute an arbitrary Mercurial command</source> <translation>Executer une commande Mercurial arbitraire</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823" /> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Exécuter une commande</b><p>Ceci ouvre une fenêtre pour saisir une commande arbitraire Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833" /> <source>Configure</source> <translation>Configuration</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="830" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="834" /> <source>Configure...</source> <translation>Configuration...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="841" /> <source>Show the configuration dialog with the Mercurial page selected</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844" /> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="850" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854" /> <source>Edit user configuration</source> <translation>Éditer la configuration utilisateur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855" /> <source>Edit user configuration...</source> <translation>Éditer la configuration utilisateur...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862" /> <source>Show an editor to edit the user configuration file</source> <translation>Affiche un éditeur pour modifier le fichier de configuration utilisateur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865" /> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation><b>Éditer la configuration utilisateur</b><p>Affiche un éditeur pour modifier le fichier de configuration utilisateur.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="870" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874" /> <source>Edit repository configuration</source> <translation>Éditer la configuration du dépot</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="871" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875" /> <source>Edit repository configuration...</source> <translation>Éditer la configuration du dépot...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882" /> <source>Show an editor to edit the repository configuration file</source> <translation>Affiche un éditeur pour modifier le fichier de configuration du dépot</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885" /> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation><b>Éditer la configuration du dépot</b><p>Affiche un éditeur pour modifier le fichier de configuration du dépot.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="891" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895" /> <source>Show combined configuration settings</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896" /> <source>Show combined configuration settings...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903" /> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909" /> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919" /> <source>Show paths</source> <translation>Montrer les chemins</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="920" /> <source>Show paths...</source> <translation>Montrer les chemins...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927" /> <source>Show the aliases for remote repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="926" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930" /> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="935" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="939" /> <source>Verify repository</source> <translation>Vérifier le dépot</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940" /> <source>Verify repository...</source> <translation>Vérifier le dépot...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="946" /> <source>Verify the integrity of the repository</source> <translation>Vérifier l'intégrité du dépot</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948" /> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Vérifier le dépot</b><p>Ceci vérifie l'intégrité du dépot.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957" /> <source>Recover</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957" /> <source>Recover...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960" /> <source>Recover from an interrupted transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="959" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963" /> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972" /> <source>Identify</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973" /> <source>Identify...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979" /> <source>Identify the project directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="977" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981" /> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990" /> <source>Create .hgignore</source> <translation>Créer le .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998" /> <source>Create a .hgignore file with default values</source> <translation>Créer un fichier .hgignore avec les valeurs par défaut</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="997" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001" /> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation><b>Créer le .hgignore</b><p>Créer un fichier .hgignore avec les valeurs par défaut.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010" /> <source>Create changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1008" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1012" /> <source>Create changegroup...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1015" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019" /> <source>Create changegroup file collecting changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1018" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1022" /> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1028" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032" /> <source>Preview changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1030" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034" /> <source>Preview changegroup...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041" /> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1040" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044" /> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2259" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1050" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2263" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054" /> <source>Apply changegroups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056" /> <source>Apply changegroups...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1059" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063" /> <source>Apply one or several changegroup files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066" /> <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" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076" /> <source>Mark as "good"</source> <translation>Marquer comme "bon"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077" /> <source>Mark as "good"...</source> <translation>Marquer comme "bon"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1080" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1084" /> <source>Mark a selectable changeset as good</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087" /> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1092" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096" /> <source>Mark as "bad"</source> <translation>Marquer comme "mauvais"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1097" /> <source>Mark as "bad"...</source> <translation>Marquer comme "mauvais"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1099" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103" /> <source>Mark a selectable changeset as bad</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105" /> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1110" /> - <source>Skip</source> - <translation>Passer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1110" /> - <source>Skip...</source> - <translation>Passer...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1112" /> - <source>Skip a selectable changeset</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1114" /> + <source>Skip</source> + <translation>Passer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1114" /> + <source>Skip...</source> + <translation>Passer...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116" /> + <source>Skip a selectable changeset</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118" /> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120" /> - <source>Reset</source> - <translation>Réinitialiser</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1122" /> - <source>Reset the bisect search data</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124" /> + <source>Reset</source> + <translation>Réinitialiser</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126" /> + <source>Reset the bisect search data</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128" /> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1130" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134" /> <source>Back out changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142" /> <source>Back out changes of an earlier changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1141" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1145" /> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1155" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1157" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161" /> <source>Rollback the last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163" /> <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" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1181" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185" /> <source>Serve project repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186" /> <source>Serve project repository...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1188" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1192" /> <source>Serve the project repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1190" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194" /> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2316" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203" /> <source>Import Patch</source> <translation>Importer un patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1205" /> <source>Import Patch...</source> <translation>Importer un patch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1207" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211" /> <source>Import a patch from a patch file</source> <translation>Importer un patch à partir d'un fichier patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1209" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213" /> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation><b>Importer un patch</b><p>Ceci importe un patch à partir d'un fichier patch dans le projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1219" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223" /> <source>Export Patches</source> <translation>Exporter les patchs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1221" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1225" /> <source>Export Patches...</source> <translation>Exporter les patchs...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1227" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231" /> <source>Export revisions to patch files</source> <translation>Exporter les révisions vers les fichiers patchs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1229" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233" /> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation><b>Exporter les patchs</b><p>Ceci exporte les révisions vers les fichiers patchs.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1238" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1242" /> <source>Change Phase</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1239" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243" /> <source>Change Phase...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1245" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1249" /> <source>Change the phase of revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1247" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251" /> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2358" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1818" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1258" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2362" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1822" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1262" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1260" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1268" /> <source>Copies changesets from another branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270" /> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1278" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1277" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1281" /> <source>Continue Copying Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1289" /> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1288" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1292" /> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1299" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1298" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1303" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302" /> <source>Stop Copying Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1306" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1310" /> <source>Stop the interrupted copying session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1313" /> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1319" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1318" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1323" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322" /> <source>Abort Copying Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1326" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330" /> <source>Abort the interrupted copying session and rollback</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1329" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1333" /> <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1339" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1343" /> <source>Add</source> <translation>Ajouter</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1341" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1345" /> <source>Add...</source> <translation>Ajouter...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1347" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1351" /> <source>Add a sub-repository</source> <translation>Ajouter un sous-répertoire</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1349" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353" /> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation><b>Ajouter...</b><p>Ajouter un sous-répertoire au projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1355" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359" /> <source>Remove</source> <translation>Supprimer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1357" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361" /> <source>Remove...</source> <translation>Supprimer...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367" /> <source>Remove sub-repositories</source> <translation>Supprimer les sous-répertoires</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1365" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1369" /> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation><b>Supprimer...</b><p>Supprimer les sous-répertoires du projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1374" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378" /> <source>Create unversioned archive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1376" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1380" /> <source>Create unversioned archive...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1383" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1387" /> <source>Create an unversioned archive from the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1386" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1390" /> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1396" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1400" /> <source>List bookmarks</source> <translation>Lister les signets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1398" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1402" /> <source>List bookmarks...</source> <translation>Lister les signets ...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1408" /> <source>List bookmarks of the project</source> <translation>Lister les signets du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1406" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1410" /> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation><b>Lister les signets</b><p>Ceci liste tous les signets du projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1415" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419" /> <source>Define bookmark</source> <translation>Définir signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1417" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1421" /> <source>Define bookmark...</source> <translation>Définir signet ...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1424" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1428" /> <source>Define a bookmark for the project</source> <translation>Définir un signet pour le projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1427" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1431" /> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation><b>Définir un signet</b><p>Ceci défini un signet pour le projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1436" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1440" /> <source>Delete bookmark</source> <translation>Supprimer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1438" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1442" /> <source>Delete bookmark...</source> <translation>Supprimer signet ...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1449" /> <source>Delete a bookmark of the project</source> <translation>Supprimer un signet du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1448" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1452" /> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation><b>Supprimer signet</b><p>Ceci supprime un signet du projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1457" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1461" /> <source>Rename bookmark</source> <translation>Renommer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1459" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1463" /> <source>Rename bookmark...</source> <translation>Renommer signet ...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1466" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1470" /> <source>Rename a bookmark of the project</source> <translation>Renommer un signet du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1469" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1473" /> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation><b>Renommer signet</b><p>Ceci renome un signet du projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1478" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1482" /> <source>Move bookmark</source> <translation>Déplacer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1480" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1484" /> <source>Move bookmark...</source> <translation>Déplacer signet ...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1486" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1490" /> <source>Move a bookmark of the project</source> <translation>Déplacer un signet du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1488" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1492" /> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation><b>Déplacer signet</b><p>Ceci déplace un signet du projet dans un autre ensemble.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1500" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1498" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1504" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1502" /> <source>Show incoming bookmarks</source> <translation>Montrer nouveaux signets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1507" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1511" /> <source>Show a list of incoming bookmarks</source> <translation>Montrer la liste des nouveaux signets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1510" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1514" /> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation><b>Montrer les nouveaux signets</b><p>Cedi montre la liste des nouveaux signets disponibles dans le dépôt distant. </p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1522" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1520" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1526" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1524" /> <source>Pull bookmark</source> <translation>Télécharger signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1529" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1533" /> <source>Pull a bookmark from a remote repository</source> <translation>Télecharger un signet d'un répertoire distant</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1532" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1536" /> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation><b>Télécharger signet</b><p>Ceci télécharge un signe d'un répertoire distant dans le répertoire local. </p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1544" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1542" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1548" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1546" /> <source>Pull current bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1551" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1555" /> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1554" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1558" /> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1565" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1563" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1569" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1567" /> <source>Show outgoing bookmarks</source> <translation>Montrer signets sortants</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1572" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1576" /> <source>Show a list of outgoing bookmarks</source> <translation>Montrer la list des signets sortants</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1575" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1579" /> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation><b>Montrer les signets sortants</b><p>Ceci montre la liste des signets disponibles dans le répertoire local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1587" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1585" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1591" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1589" /> <source>Push bookmark</source> <translation>Envoyer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1594" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1598" /> <source>Push a bookmark to a remote repository</source> <translation>Envoyer un signet dans un répertoire distant</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1597" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1601" /> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation><b>Envoyer signet</b><p>Ceci envoie un signet depuis un répertoire local dans un répertoire distant. </p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1609" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1607" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1613" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1611" /> <source>Push current bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1616" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1620" /> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1619" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1623" /> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1631" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1629" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1635" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1633" /> <source>Push all bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1638" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1642" /> <source>Push all bookmarks to a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1641" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1645" /> <source><b>Push all bookmarks</b><p>This pushes all bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1652" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1650" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1656" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654" /> <source>Delete all backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1659" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1663" /> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1662" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1666" /> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1704" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1708" /> <source>Administration</source> <translation>Administration</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1729" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1733" /> <source>Specials</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1738" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1742" /> <source>Changegroup Management</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1745" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1749" /> <source>Patch Management</source> <translation>Gestion de patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1751" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1755" /> <source>Bisect</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1759" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1763" /> <source>Tags</source> <translation>Étiquettes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1766" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1770" /> <source>Branches</source> <translation>Branches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1775" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1779" /> <source>Bookmarks</source> <translation>Signets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1796" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1800" /> <source>Other Functions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1805" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1809" /> <source>Extensions</source> <translation type="unfinished">Extensions</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1827" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1831" /> <source>Sub-Repository</source> <translation>Sous-répertoire</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1832" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1836" /> <source>Merge Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1918" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1916" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1922" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1920" /> <source>Mercurial</source> <translation>Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2069" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2073" /> <source>Pull</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2406" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2390" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2375" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2359" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2338" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2317" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2260" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2070" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2410" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2394" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2379" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2363" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2074" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2337" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2341" /> <source>Revert Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2374" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2378" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2389" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2393" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2405" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2409" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> @@ -42931,6 +43087,101 @@ </message> </context> <context> + <name>HgUncommitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Commit Message</source> + <translation type="unfinished">Message de commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter the log message.</source> + <translation type="unfinished">Entrer un message log.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source><b>Log Message</b> +<p>Enter the log message for the uncommit action.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Recent commit messages</source> + <translation type="unfinished">Messages de commit récents</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select a recent commit message to use</source> + <translation type="unfinished">Sélectionner un message de commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to allow an empty commit after undoing it.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Allow empty commit after undoing commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to allow undoing the commit with outstanding changes.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Allow undoing commit with outstanding changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Author</source> + <translation type="unfinished">Auteur</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter author name to override the configured user:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter an author name in order to override the configured one</source> + <translation type="unfinished">Entrer le nom de l'auteur pour écraser celui configuré</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to give date and time information</source> + <translation type="unfinished">Cocher pour définir la date et heure</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Date and Time</source> + <translation type="unfinished">Date et heure</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Date/Time:</source> + <translation type="unfinished">Date/heure :</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter the date and time to be used</source> + <translation type="unfinished">Entrer la date et heure à utiliser</translation> + </message> + <message> + <source><b>Log Message</b> +<p>Enter the log message for the commit action.</p></source> + <translation type="vanished"><b> Message Log</b> +<p>Entrer un message log pour la mise à jour 'commit'.</p></translation> + </message> + </context> + <context> <name>HgUnshelveDataDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> @@ -43309,32 +43560,32 @@ <translation>Défaut</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="475" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="474" /> <source>Delete Host Fingerprint</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="476" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="475" /> <source><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source> <translation type="unfinished" /> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="591" /> + <source>Delete Host Minimum Protocol</source> + <translation>Supprimer le protocole minimum de l'hôte</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="592" /> - <source>Delete Host Minimum Protocol</source> - <translation>Supprimer le protocole minimum de l'hôte</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="593" /> <source><p>Shall the minimum protocol entry for host <b>{0}</b> really be deleted?</p></source> <translation><p>Faut il vraiment supprimer le protocole minimum de l'hôte <b>{0}</b> ?</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="655" /> + <source>Edit User Configuration</source> + <translation>Modifier la configuration utilisateur</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="656" /> - <source>Edit User Configuration</source> - <translation>Modifier la configuration utilisateur</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="657" /> <source>You will loose all changes made in this dialog. Shall the data be saved first?</source> <translation>Vous allez perdre toutes les modifications faites dans cette fenêtre. Faut-il sauvegarder d'abord ?</translation> </message> @@ -43413,17 +43664,17 @@ <context> <name>HgUtilities</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="130" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="132" /> <source>The hg process finished with the exit code {0}</source> <translation>Le processus hg s'est terminé avec le code de sortie {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="134" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="136" /> <source>The hg process did not finish within 30s.</source> <translation>Le processus hg n'a pas terminé dans les 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="140" /> <source>Could not start the hg executable.</source> <translation>Ne peut démarrer l'exécutable hg.</translation> </message> @@ -90706,6 +90957,66 @@ </message> </context> <context> + <name>Uncommit</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/uncommit.py" line="64" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + </context> + <context> + <name>UncommitProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="72" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="62" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="52" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="96" /> + <source>Uncommit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="126" /> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished">Le projet devrait être relu. Le faire maintenant ?</translation> + </message> + </context> + <context> + <name>UncommitProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="107" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="38" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="36" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="44" /> + <source>Undo the effect of a local commit.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="46" /> + <source><b>Undo Local Commit</b><p>This undoes the effect of a local commit, returning the affected files to their uncommitted state.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="79" /> + <source>Uncommit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="95" /> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished">Le projet devrait être relu. Le faire maintenant ?</translation> + </message> + </context> + <context> <name>UnittestExecutor</name> <message> <location filename="../Testing/Interfaces/UnittestExecutor.py" line="52" /> @@ -105817,32 +106128,32 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1385" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1389" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Modifications</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1957" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1393" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1961" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Étiquettes</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1963" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403" /> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Signets</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1406" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1974" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1412" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416" /> <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> @@ -105851,7 +106162,7 @@ <tr><td><b>Heure de soumission</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1431" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1435" /> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -105862,36 +106173,36 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1931" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935" /> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1942" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1949" /> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Suggestion</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1950" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1954" /> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Modifications</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1977" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1981" /> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Parents</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987" /> <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>